diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/GenCodeService.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/GenCodeService.java
index b98d83ec..56285e73 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/GenCodeService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/GenCodeService.java
@@ -24,6 +24,8 @@ public interface GenCodeService {
 
     public String codeDemo(Map form);
 
+    public String codeDemo2(Map form);
+
     public String queryIdByCode(String code);
 
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java
index e874ac2c..7085fbab 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java
@@ -167,6 +167,81 @@ public class GenCodeServiceImpl implements GenCodeService {
         return demo;
     }
 
+    @Override
+    public String codeDemo2(Map form) {
+        String code = (String) form.get("code");
+        String id = this.queryIdByCode(code);
+        //如果flag=1就执行更新数据库的操作
+        String flag = (String) form.get("flag");
+        WQLObject wo = WQLObject.getWQLObject("sys_code_rule_detail");
+        JSONArray ja = wo.query("code_rule_id = '" + id + "'", " sort_num,type FOR UPDATE").getResultJSONArray(0);
+        String demo = "";
+        boolean is_same = true;
+        for (int i = 0; i < ja.size(); i++) {
+            String value = "";
+            JSONObject jo = ja.getJSONObject(i);
+            //固定直接取值
+            if (jo.getString("type").equals("01")) {
+                value = jo.getString("init_value");
+            }
+            //日期判断数据库的值与当前值是否相同来决定顺序的值
+            if (jo.getString("type").equals("02")) {
+                String current_value = jo.getString("current_value");
+                Date date = DateUtil.date();
+                String format = jo.getString("format");
+                String now_date = DateUtil.format(date, format);
+                if (!now_date.equals(current_value)) {
+                    is_same = false;
+                }
+                if (flag.equals("1")) {
+                    jo.put("init_value", now_date);
+                    jo.put("current_value", now_date);
+                }
+                value = now_date;
+            }
+            //顺序的值：如果日期一样就+步长，等于最大值就归为初始值；日期不一样就归为初始值
+            if (jo.getString("type").equals("03")) {
+                String num_value = "";
+                int step = jo.getInteger("step");
+                Long max_value = jo.getLong("max_value");
+                if (!is_same || (jo.getLongValue("current_value") + step > max_value)) {
+                    num_value = jo.getString("init_value");
+                } else {
+                    num_value = (jo.getInteger("current_value") + step) + "";
+                }
+                int size = num_value.length();
+                int length = jo.getInteger("length");
+                String fillchar = jo.getString("fillchar");
+                for (int m = 0; m < (length - size); m++) {
+                    value += fillchar;
+                }
+                value += num_value;
+                if (flag.equals("1")) {
+                    if (!is_same) {
+                        int init_value = jo.getInteger("init_value");
+                        if (StrUtil.isEmpty((init_value + ""))) {
+                            throw new BadRequestException("请完善编码数值的初始值！");
+                        }
+                        jo.put("current_value", init_value + "");
+                    } else {
+                        int num_curr = jo.getInteger("current_value");
+                        if (num_curr >= max_value) {
+                            num_curr = jo.getInteger("init_value");
+                            jo.put("current_value", num_curr + "");
+                        }else{
+                            jo.put("current_value", (num_curr + step) + "");
+                        }
+                    }
+                }
+            }
+            demo += value;
+            if (flag.equals("1")) {
+                wo.update(jo);
+            }
+        }
+        return demo;
+    }
+
     @Override
     public String queryIdByCode(String code) {
         JSONObject jo = WQLObject.getWQLObject("sys_code_rule").query("code = '" + code + "'").uniqueResult(0);
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java
index 982cd1b0..13781205 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java
@@ -16,4 +16,13 @@ public class CodeUtil {
         return service.codeDemo(map);
     }
 
+    public  static synchronized String getNewCode2(String ruleCode){
+        GenCodeService service=new GenCodeServiceImpl();
+        String flag = "1";
+        HashMap<String,String> map = new HashMap<>();
+        map.put("flag",flag);
+        map.put("code",ruleCode);
+        return service.codeDemo2(map);
+    }
+
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/BucketrecordServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/BucketrecordServiceImpl.java
index 3b66705e..39f0aad4 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/BucketrecordServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/BucketrecordServiceImpl.java
@@ -91,7 +91,11 @@ public class BucketrecordServiceImpl implements BucketrecordService {
                 String storagevehicle_code2 = jo.getString("storagevehicle_code");
                 if(ObjectUtil.isNotEmpty(storagevehicle_code2)){
                     JSONObject base_point = sch_base_point.query("vehicle_code='"+storagevehicle_code2+"'").uniqueResult(0);
-                    jo.put("point_code",base_point.getString("point_code"));
+                    if(base_point!=null){
+                        jo.put("point_code",base_point.getString("point_code"));
+                    }else{
+                        jo.put("point_code","");
+                    }
                 }else{
                     jo.put("point_code","");
                 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java
index d50a0391..98a59854 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java
@@ -119,7 +119,7 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
                 // 插入主表
                 json.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId());
                 json.put("workordercard_id",json.getString("workorder_id"));
-                String workorder_code = CodeUtil.getNewCode("GL_CODE");
+                String workorder_code = CodeUtil.getNewCode2("GL_CODE");
                 json.put("workorder_code", workorder_code);
                 json.put("is_delete", "0");
                 json.put("create_id", currentUserId);
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java
index d2f22388..d7bb51a2 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java
@@ -307,7 +307,7 @@ public class InitformulaServiceImpl implements InitformulaService {
         JSONArray tableDtl = whereJson.getJSONArray("tableDtl");
         JSONObject Formula_01 = new JSONObject();
         long formula_id = IdUtil.getSnowflake(1, 1).nextId();
-        String formula_code = CodeUtil.getNewCode("PF_CODE");
+        String formula_code = CodeUtil.getNewCode2("PF_CODE");
         Formula_01.put("formula_id",formula_id);
         Formula_01.put("formula_code",formula_code);
         Formula_01.put("workorder_id",order.getString("workorder_id"));
@@ -427,7 +427,7 @@ public class InitformulaServiceImpl implements InitformulaService {
         if("1".equals(whereJson.getString("is_again_put")) && tabledis.size()>0){
             JSONObject Formula_02 = new JSONObject();
             long formula_id2 = IdUtil.getSnowflake(1, 1).nextId();
-            String formula_code2 = CodeUtil.getNewCode("PF_CODE");
+            String formula_code2 = CodeUtil.getNewCode2("PF_CODE");
             Formula_02.put("formula_id",formula_id2);
             Formula_02.put("formula_code",formula_code2);
             Formula_02.put("workorder_id",order.getString("workorder_id"));
@@ -609,7 +609,7 @@ public class InitformulaServiceImpl implements InitformulaService {
         JSONArray tableDtl = whereJson.getJSONArray("tableDtl");
         JSONObject Formula_01 = new JSONObject();
         long formula_id = IdUtil.getSnowflake(1, 1).nextId();
-        String formula_code = CodeUtil.getNewCode("PF_CODE");
+        String formula_code = CodeUtil.getNewCode2("PF_CODE");
         Formula_01.put("formula_id",formula_id);
         Formula_01.put("formula_code",formula_code);
         Formula_01.put("workorder_id",order.getString("workorder_id"));
@@ -729,7 +729,7 @@ public class InitformulaServiceImpl implements InitformulaService {
         if("1".equals(whereJson.getString("is_again_put")) && tabledis.size()>0){
             JSONObject Formula_02 = new JSONObject();
             long formula_id2 = IdUtil.getSnowflake(1, 1).nextId();
-            String formula_code2 = CodeUtil.getNewCode("PF_CODE");
+            String formula_code2 = CodeUtil.getNewCode2("PF_CODE");
             Formula_02.put("formula_id",formula_id2);
             Formula_02.put("formula_code",formula_code2);
             Formula_02.put("workorder_id",order.getString("workorder_id"));
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenancemstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenancemstServiceImpl.java
index 3b463c68..15912f64 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenancemstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenancemstServiceImpl.java
@@ -274,6 +274,7 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
         JSONObject jsonMainMst = mainMstTab.query("maint_id = '" + whereJson.getString("maint_id") + "'").uniqueResult(0);
         jsonMainMst.put("invstatus", "03");
         jsonMainMst.put("update_optname",whereJson.getString("update_optname") );
+        jsonMainMst.put("update_optname",whereJson.getString("update_optname") );
         jsonMainMst.put("real_start_date", DateUtil.now());
         mainMstTab.update(jsonMainMst);
 
diff --git a/mes/qd/src/views/wms/basedata/em/bjsafeivt/index.vue b/mes/qd/src/views/wms/basedata/em/bjsafeivt/index.vue
index 16e94f9e..5192ff82 100644
--- a/mes/qd/src/views/wms/basedata/em/bjsafeivt/index.vue
+++ b/mes/qd/src/views/wms/basedata/em/bjsafeivt/index.vue
@@ -82,7 +82,7 @@
               size="small"
               :controls="false"
               controls-position="right"
-              precision="3"
+              precision="1"
               :min="0"
               @change="change($event,crud.data[scope.$index],scope.$index)"
             />
@@ -95,7 +95,7 @@
               size="small"
               :controls="false"
               controls-position="right"
-              precision="3"
+              precision="1"
               :min="0"
               @change="change($event,crud.data[scope.$index],scope.$index)"
             />
diff --git a/mes/qd/src/views/wms/basedata/em/devicebom/AddDialog.vue b/mes/qd/src/views/wms/basedata/em/devicebom/AddDialog.vue
index 04dc3831..72500166 100644
--- a/mes/qd/src/views/wms/basedata/em/devicebom/AddDialog.vue
+++ b/mes/qd/src/views/wms/basedata/em/devicebom/AddDialog.vue
@@ -71,16 +71,6 @@
         >
           添加物料
         </el-button>
-<!--        <el-button
-          slot="left"
-          class="filter-item"
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          @click="delRow"
-        >
-          删除一行
-        </el-button>-->
       </span>
     </div>
 
@@ -96,10 +86,10 @@
         :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
       >
         <el-table-column type="index" label="序号" width="55" align="center" />
-        <el-table-column show-overflow-tooltip v-if="false" prop="material_id" label="物料id" align="center" />
-        <el-table-column show-overflow-tooltip v-if="false" prop="base_unit_id" label="单位id" align="center" />
-        <el-table-column show-overflow-tooltip prop="material_code" label="备件物料编码" align="center" />
-        <el-table-column show-overflow-tooltip prop="material_name" label="备件物料名称" align="center" />
+        <el-table-column  v-if="false" prop="material_id" label="物料id" align="center" />
+        <el-table-column  v-if="false" prop="base_unit_id" label="单位id" align="center" />
+        <el-table-column  prop="material_code" label="备件物料编码" align="center" />
+        <el-table-column  prop="material_name" label="备件物料名称" align="center" />
         <el-table-column prop="qty" label="标准数量" align="center">
           <template slot-scope="scope">
             <el-input-number
@@ -112,7 +102,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column show-overflow-tooltip prop="base_unit_id_name" label="单位" align="center" />
+        <el-table-column  prop="base_unit_id_name" label="单位" align="center" />
         <el-table-column prop="dtl_remark" label="备注" align="center">
           <template slot-scope="scope">
             <el-input v-show="!scope.row.edit" v-model="scope.row.dtl_remark" class="input-with-select" :disabled="crud.status.view > 0" />
@@ -194,8 +184,6 @@ export default {
     }
     crudMaterialbase.getMaterOptType(param).then(res => {
       this.class_idStr = res.class_idStr
-      // this.crud.query.class_idStr = this.class_idStr
-      // this.crud.toQuery()
       this.queryClassId()
     })
     const data = {
@@ -236,7 +224,6 @@ export default {
       })
     },
     [CRUD.HOOK.afterToCU](crud, form) {
-      debugger
       if (!form.device_bom_code) {
         this.queryClassId()
       } else {
@@ -247,9 +234,7 @@ export default {
       }
     },
     getSubTypes(id) {
-      debugger
       crudClassstandard.getClassSuperior2(id).then(res => {
-        debugger
         const date = res.content
         this.buildClass(date)
         this.classes = date
diff --git a/mes/qd/src/views/wms/basedata/em/devicefaultclass/index.vue b/mes/qd/src/views/wms/basedata/em/devicefaultclass/index.vue
index d6d9a446..74dbc3a5 100644
--- a/mes/qd/src/views/wms/basedata/em/devicefaultclass/index.vue
+++ b/mes/qd/src/views/wms/basedata/em/devicefaultclass/index.vue
@@ -41,7 +41,7 @@
           <el-row>
             <el-col span="12">
               <el-form-item label="故障编码:" prop="device_faultclass_code">
-                <el-input v-model="form.device_faultclass_name" style="width: 280px;" disabled placeholder="系统生成" />
+                <el-input v-model="form.device_faultclass_code" style="width: 280px;" disabled placeholder="系统生成" />
               </el-form-item>
             </el-col>
             <el-col span="12">
diff --git a/mes/qd/src/views/wms/basedata/em/devicemaintain/index.vue b/mes/qd/src/views/wms/basedata/em/devicemaintain/index.vue
index 1f4c5a95..7019a54b 100644
--- a/mes/qd/src/views/wms/basedata/em/devicemaintain/index.vue
+++ b/mes/qd/src/views/wms/basedata/em/devicemaintain/index.vue
@@ -251,6 +251,17 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
+    [CRUD.HOOK.afterToCU](crud, form) {
+      debugger
+      if (!form.maint_item_code) {
+        this.queryClassId()
+      } else {
+        const data = {}
+        data.id = form.material_type_id
+        data.goal_id = this.classBj_id
+        this.getSubTypes(data)
+      }
+    },
     changeQuery() {
       this.crud.toQuery()
     },
@@ -290,6 +301,25 @@ export default {
           return obj
         })
       })
+    },
+    getSubTypes(id) {
+      debugger
+      crudClassstandard.getClassSuperior2(id).then(res => {
+        debugger
+        const date = res.content
+        this.buildClass(date)
+        this.classes = date
+      })
+    },
+    buildClass(classes) {
+      classes.forEach(data => {
+        if (data.children) {
+          this.buildClass(data.children)
+        }
+        if (data.hasChildren && !data.children) {
+          data.children = null
+        }
+      })
     }
   }
 }
diff --git a/mes/qd/src/views/wms/basedata/em/devicerepairitems/index.vue b/mes/qd/src/views/wms/basedata/em/devicerepairitems/index.vue
index e237cd11..c26b5410 100644
--- a/mes/qd/src/views/wms/basedata/em/devicerepairitems/index.vue
+++ b/mes/qd/src/views/wms/basedata/em/devicerepairitems/index.vue
@@ -187,6 +187,16 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
+    [CRUD.HOOK.afterToCU](crud, form) {
+      if (!form.repair_item_code) {
+        this.queryClassId()
+      } else {
+        const data = {}
+        data.id = form.material_type_id
+        data.goal_id = this.classBj_id
+        this.getSubTypes(data)
+      }
+    },
     loadClass({ action, parentNode, callback }) {
       if (action === LOAD_CHILDREN_OPTIONS) {
         crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
@@ -214,6 +224,25 @@ export default {
           return obj
         })
       })
+    },
+    getSubTypes(id) {
+      debugger
+      crudClassstandard.getClassSuperior2(id).then(res => {
+        debugger
+        const date = res.content
+        this.buildClass(date)
+        this.classes = date
+      })
+    },
+    buildClass(classes) {
+      classes.forEach(data => {
+        if (data.children) {
+          this.buildClass(data.children)
+        }
+        if (data.hasChildren && !data.children) {
+          data.children = null
+        }
+      })
     }
   }
 }
diff --git a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
index 756fc189..d11149ca 100644
--- a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
+++ b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
@@ -33,11 +33,11 @@
             <el-date-picker
               v-model="query.createTime"
               type="daterange"
-              @input="onInput()"
               value-format="yyyy-MM-dd HH:mm:ss"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               :default-time="['00:00:00', '23:59:59']"
+              @input="onInput()"
               @change="mytoQuery"
             />
           </el-form-item>
@@ -246,8 +246,8 @@
             />
           </template>
         </el-table-column>
-        <el-table-column :selectable="checkboxT"  type="selection" min-width="35" />
-        <el-table-column prop="workorder_date" min-width="83" label="工令日期" :formatter="workorder_dateFormat"/>
+        <el-table-column :selectable="checkboxT" type="selection" min-width="35" />
+        <el-table-column prop="workorder_date" min-width="83" label="工令日期" :formatter="workorder_dateFormat" />
         <el-table-column prop="workorder_code" min-width="130" label="工令号">
           <template slot-scope="scope">
             <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.workorder_code }}</el-link>
@@ -255,28 +255,28 @@
         </el-table-column>
         <el-table-column prop="org_id" :formatter="orgFormat" min-width="105" label="所属组织" />
         <el-table-column prop="workorder_type" :formatter="bill_typeFormat" min-width="75" label="工令类型" />
-        <el-table-column  :formatter="stateFormat" min-width="75" prop="status" label="工令状态" />
-        <el-table-column prop="device_name" min-width="80" label="设备"/>
-        <el-table-column prop="material_code" min-width="130" label="物料编码"/>
-        <el-table-column prop="old_mark" min-width="100" label="牌号"/>
+        <el-table-column :formatter="stateFormat" min-width="75" prop="status" label="工令状态" />
+        <el-table-column prop="device_name" min-width="80" label="设备" />
+        <el-table-column prop="material_code" min-width="130" label="物料编码" />
+        <el-table-column prop="old_mark" min-width="100" label="牌号" />
         <el-table-column :formatter="seriesFormat" min-width="65" prop="product_series_id" label="系列" />
-        <el-table-column prop="pcsn" min-width="85" label="批次"/>
-        <el-table-column prop="workorder_qty" min-width="75" label="计划重量" :formatter="crud.formatNum0"/>
+        <el-table-column prop="pcsn" min-width="85" label="批次" />
+        <el-table-column prop="workorder_qty" min-width="75" label="计划重量" :formatter="crud.formatNum0" />
         <el-table-column prop="bill_qty" min-width="90" label="开单总重量" :formatter="crud.formatNum3" />
-        <el-table-column prop="productin_qty" min-width="90" label="实投总重量" :formatter="crud.formatNum3"/>
-        <el-table-column prop="qty_unit_name" min-width="75" label="单位"/>
-        <el-table-column prop="planstart_time" min-width="100"  label="计划开始时间" :formatter="workorder_dateFormat"/>
-        <el-table-column prop="planend_time" min-width="100"  label="计划结束时间" :formatter="planend_timeFormat" />
-        <el-table-column prop="realstart_time" min-width="135" label="实际开始时间"/>
-        <el-table-column prop="realend_time" min-width="135" label="实际结束时间"/>
-        <el-table-column   min-width="70" prop="source_bill_type"  :formatter="workorder_typeFormat2" label="源类型" />
+        <el-table-column prop="productin_qty" min-width="90" label="实投总重量" :formatter="crud.formatNum3" />
+        <el-table-column prop="qty_unit_name" min-width="75" label="单位" />
+        <el-table-column prop="planstart_time" min-width="100" label="计划开始时间" :formatter="workorder_dateFormat" />
+        <el-table-column prop="planend_time" min-width="100" label="计划结束时间" :formatter="planend_timeFormat" />
+        <el-table-column prop="realstart_time" min-width="135" label="实际开始时间" />
+        <el-table-column prop="realend_time" min-width="135" label="实际结束时间" />
+        <el-table-column min-width="70" prop="source_bill_type" :formatter="workorder_typeFormat2" label="源类型" />
         <el-table-column prop="source_bill_code" label="来源单据编号" min-width="105" />
         <el-table-column min-width="75" prop="workprocedure_id" label="当前工序" :formatter="seriesFormat2" />
-        <el-table-column prop="startwork_name" min-width="60" label="开工人"/>
-        <el-table-column prop="endwork_name" min-width="60" label="完工人"/>
-        <el-table-column prop="create_name" min-width="60" label="创建人"/>
-        <el-table-column prop="update_optname" min-width="60" label="修改人"/>
-        <el-table-column prop="remark" min-width="180" label="备注"/>
+        <el-table-column prop="startwork_name" min-width="60" label="开工人" />
+        <el-table-column prop="endwork_name" min-width="60" label="完工人" />
+        <el-table-column prop="create_name" min-width="60" label="创建人" />
+        <el-table-column prop="update_optname" min-width="60" label="修改人" />
+        <el-table-column prop="remark" min-width="180" label="备注" />
       </el-table>
       <!--分页组件-->
       <pagination />
@@ -297,16 +297,16 @@ import pagination from '@crud/Pagination'
 import AddDialog from '@/views/wms/pdm/produce/workorder/AddDialog'
 import ViewDialog from '@/views/wms/pdm/produce/workorder/ViewDialog'
 import ChangeDialog from '@/views/wms/pdm/produce/workorder/ChangeDialog'
-import crudseriesProcessRoute from "@/api/wms/pdm/seriesProcessRoute";
-import {getLodop} from "@/assets/js/lodop/LodopFuncs";
-import Date from "@/utils/datetime";
-import crudWorkProcedure from "@/api/wms/basedata/pdm/workProcedure";
+import crudseriesProcessRoute from '@/api/wms/pdm/seriesProcessRoute'
+import { getLodop } from '@/assets/js/lodop/LodopFuncs'
+import Date from '@/utils/datetime'
+import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
 import { download } from '@/api/data'
 import { downloadFile } from '@/utils'
 import producetask from '@/api/wms/pdm/producetask'
 
 export default {
-  name: 'workorder',
+  name: 'Workorder',
   components: { ChangeDialog, ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination },
   cruds() {
     return CRUD({ title: '工令',
@@ -378,7 +378,7 @@ export default {
       return row.status !== '10'
     },
     [CRUD.HOOK.beforeRefresh]() {
-      if(this.query_flag){
+      if (this.query_flag) {
         this.crud.query.begin_time = (new Date()).strftime('%F', 'zh')
         this.crud.query.end_time = (new Date().daysLater(2)).strftime('%F', 'zh')
         this.query_flag = false
@@ -413,16 +413,14 @@ export default {
           if (rows[i].status > '40' || rows.length !== 1) {
             this.change_flag = true
           }
-          //选择工令标识的工令状态必须为50开工,选择工令标识的工序任务状态必须全为99结束生产
-          if (rows[i].status !== '50') {//后台校验工序任务
+          if (rows[i].status !== '50') { // 后台校验工序任务
             this.confirm_flag = true
           }
-          //选择工令标识，若产品工艺路线第一个工序为配粉，工令状态必须40已开单； 否则，工令状态必须20已提交
-          if (!'40,20'.includes(rows[i].status)) {//后台校验首道工序
+          if (!'40,20'.includes(rows[i].status)) { // 后台校验首道工序
             this.open_flag = true
           }
         }
-      }else{
+      } else {
         this.handleCurrentChange()
       }
     },
@@ -476,7 +474,7 @@ export default {
     },
     typeChange() {
       this.checkrows = this.$refs.table.selection
-      if(this.checkrows.length !== 1 ){
+      if (this.checkrows.length !== 1) {
         this.crud.notify('只能勾选一条记录修改工令类型！')
         return false
       }
@@ -488,13 +486,17 @@ export default {
     },
     submit(status) {
       this.checkrows = this.$refs.table.selection
-      if(this.checkrows.length === 0 ){
+      if (this.checkrows.length === 0) {
         this.crud.notify('请勾选需要操作的记录！')
         return false
       }
-      workorder.submit({ 'status': status, rows: this.checkrows}).then(res => {
+      this.crud.loading = true
+      workorder.submit({ 'status': status, rows: this.checkrows }).then(res => {
         this.crud.notify('操作成功！')
+        this.crud.loading = false
         this.querytable()
+      }).catch(() => {
+        this.crud.loading = false
       })
     },
     downdData() {
@@ -508,31 +510,42 @@ export default {
     },
     openWork() {
       this.checkrows = this.$refs.table.selection
-      if(this.checkrows.length === 0 ){
+      if (this.checkrows.length === 0) {
         this.crud.notify('请勾选需要操作的记录！')
         return false
       }
-      workorder.openWork({ rows: this.checkrows}).then(res => {
+      this.open_flag = true
+      this.crud.loading = true
+      workorder.openWork({ rows: this.checkrows }).then(res => {
         this.crud.notify('操作成功！')
+        this.crud.loading = false
+        this.open_flag = false
         this.querytable()
+      }).catch(() => {
+        this.crud.loading = false
+        this.open_flag = false
       })
     },
     confirmWork() {
       this.checkrows = this.$refs.table.selection
-      if(this.checkrows.length === 0 ){
+      if (this.checkrows.length === 0) {
         this.crud.notify('请勾选需要操作的记录！')
         return false
       }
-      workorder.confirmWork({ rows: this.checkrows}).then(res => {
+      this.crud.loading = true
+      workorder.confirmWork({ rows: this.checkrows }).then(res => {
         this.crud.notify('操作成功！')
+        this.crud.loading = false
         this.querytable()
+      }).catch(() => {
+        this.crud.loading = false
       })
     },
-    mytoQuery(array1){
-      if(array1 === null){
+    mytoQuery(array1) {
+      if (array1 === null) {
         this.crud.query.begin_time = ''
         this.crud.query.end_time = ''
-      }else{
+      } else {
         this.crud.query.begin_time = array1[0]
         this.crud.query.end_time = array1[1]
       }
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairrequest/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairrequest/index.vue
index 30e49081..71e1f0ac 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepairrequest/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairrequest/index.vue
@@ -133,6 +133,7 @@ export default {
   name: 'Devicerepairrequest',
   components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker, Treeselect, PicDialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
+  dicts: ['EM_FAULT_LEVEL'],
   cruds() {
     return CRUD({
       title: '设备报修处理',
@@ -212,14 +213,8 @@ export default {
         })
       })
     },
-    formaLevelName(row, cloum) {
-      if (row.fault_level === '01') {
-        return '一级'
-      } else if (row.fault_level === '02') {
-        return '二级'
-      } else if (row.fault_level === '03') {
-        return '三级'
-      }
+    formaLevelName(row) {
+      return this.dict.label.EM_FAULT_LEVEL[row.fault_level]
     },
     formatStatusName(row, cloum) {
       if (row.status === '01') {
diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/StartDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/StartDialog.vue
index 368fb58e..1fa6aaf9 100644
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/StartDialog.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/StartDialog.vue
@@ -11,7 +11,7 @@
     <el-form ref="form" :inline="true" :model="form4" size="mini" label-width="120px" label-suffix=":">
       <el-row>
         <el-col :span="24">
-          <el-form-item label="维修人" prop="update_optname">
+          <el-form-item label="保养人" prop="update_optname">
             <el-input v-model="form4.update_optname" style="width: 200px;" />
           </el-form-item>
         </el-col>
diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog.vue
index 368fb58e..1fa6aaf9 100644
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog.vue
@@ -11,7 +11,7 @@
     <el-form ref="form" :inline="true" :model="form4" size="mini" label-width="120px" label-suffix=":">
       <el-row>
         <el-col :span="24">
-          <el-form-item label="维修人" prop="update_optname">
+          <el-form-item label="保养人" prop="update_optname">
             <el-input v-model="form4.update_optname" style="width: 200px;" />
           </el-form-item>
         </el-col>
diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/index.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/index.vue
index 2d502a83..dac84c7b 100644
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/index.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/index.vue
@@ -114,17 +114,6 @@
         >
           开始保养
         </el-button>
- <!--       <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-position"
-          size="mini"
-          :disabled="execu_flag"
-          @click="executeMaintain"
-        >
-          保养执行
-        </el-button>-->
         <el-button
           slot="right"
           class="filter-item"