优化

mes/qd/src/views/wms/basedata/em/devicebom/AddDialog.vue

@@ -215,13 +215,21 @@ export default {
         this.form.tableData = res
       })
     },
-    [CRUD.HOOK.afterToView]() {
+    [CRUD.HOOK.afterToView](crud, form) {
       const data = {
         'device_bom_id': this.form.device_bom_id
       }
       crudDevicebom.getDtl(data).then(res => {
         this.form.tableData = res
       })
+      if (!form.device_bom_code) {
+        this.queryClassId()
+      } else {
+        const data = {}
+        data.id = form.material_type_id
+        data.goal_id = this.classBj_id
+        this.getSubTypes(data)
+      }
     },
     [CRUD.HOOK.afterToCU](crud, form) {
       if (!form.device_bom_code) {

mes/qd/src/views/wms/pf/acceptmark/index.vue

@@ -46,19 +46,19 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="mark_code" width="150px" label="牌号" align="center">
+        <el-table-column prop="material_code" label="碳化钨编码" width="120" align="center"  />
+        <el-table-column prop="material_name" width="120" label="碳化钨名称" align="center">
           <template slot-scope="scope">
-            <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.mark_code }}</el-link>
+            <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.material_name }}</el-link>
           </template>
         </el-table-column>
+        <el-table-column prop="mark_code" width="150px" label="牌号" align="center" />
         <el-table-column prop="c_balance" label="碳平衡" width="90px" align="center" :formatter="crud.formatQlNum4" />
         <el-table-column prop="liquid_rate" label="液料比" width="60" align="center" :formatter="crud.formatNum2" />
         <el-table-column prop="ball_rate" label="球料比" width="60" align="center" :formatter="crud.formatNum2" />
         <el-table-column prop="ball_speed" label="球磨转速(RPM)" width="120px" align="center" :formatter="crud.formatNum2" />
         <el-table-column prop="ball_time" label="研磨时间(h)" width="90px" align="center" :formatter="crud.formatNum2" />
         <el-table-column prop="accept_qty" label="标准重量(g)" width="90px" align="center" :formatter="crud.formatNum2" />
-        <el-table-column prop="material_code" label="碳化钨编码" width="120" align="center"  />
-        <el-table-column prop="material_name" label="碳化钨名称" width="120" align="center"  />
         <el-table-column prop="detail_count" label="明细数" align="center" min-width="60" />
         <el-table-column prop="remark" label="备注" align="center"  min-width="135" />
         <el-table-column prop="create_name" label="创建人" align="center" min-width="80" />

mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/StartDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="开始维修"
+    title="开始保养"
     append-to-body
     :visible.sync="dialogVisible"
     :before-close="handleClose"

mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="开始维修"
+    title="开始保养"
     append-to-body
     :visible.sync="dialogVisible"
     :before-close="handleClose"