代码更新

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/auToTask/AutoCreateUpkeep.java

@@ -60,6 +60,7 @@ public class AutoCreateUpkeep {
                             param.put("plan_start_date",jsonPlanMst.getString("plan_start_date"));
                             param.put("source_bill_id",jsonPlanMst.getString("maint_plan_id"));
                             param.put("source_bill_code",jsonPlanMst.getString("maint_plan_code"));
+                            param.put("maint_object",jsonPlanMst.getString("maint_object"));
 
                             // 计算 当前日期 - 保养计划日期 后的天数
                             String num = String.valueOf(NumberUtil.sub(today, plan_start_date));
@@ -96,6 +97,8 @@ public class AutoCreateUpkeep {
                             param.put("plan_start_date",jsonPlanMst.getString("plan_start_date"));
                             param.put("source_bill_id",jsonPlanMst.getString("maint_plan_id"));
                             param.put("source_bill_code",jsonPlanMst.getString("maint_plan_code"));
+                            param.put("maint_object",jsonPlanMst.getString("maint_object"));
+
                             // 计算 当前日期 - 保养实际结束 后的天数
                             String num = String.valueOf(NumberUtil.sub(today, rep_real_end_date));
 
@@ -152,6 +155,7 @@ public class AutoCreateUpkeep {
         jsonMainMst.put("maintenancecycle",json.getString("maintenancecycle"));
         jsonMainMst.put("invstatus","01");
         jsonMainMst.put("plan_start_date",json.getString("plan_start_date"));
+        jsonMainMst.put("maint_object",json.getString("maint_object"));
         jsonMainMst.put("detail_count",planDtlArr.size());
         jsonMainMst.put("source_bill_id",json.get("source_bill_id"));
         jsonMainMst.put("source_bill_type","BYJH");

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/rest/DevicemaintenancemstController.java

@@ -35,8 +35,8 @@ public class DevicemaintenancemstController {
     private final DevicemaintenancemstService devicemaintenancemstService;
 
     @GetMapping
-    @Log("查询设备保养单")
+    @Log("查询设备保养单(维修班)")
-    @ApiOperation("查询设备保养单")
+    @ApiOperation("查询设备保养单(维修班)")
     //@PreAuthorize("@el.check('devicemaintenancemst:list')")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
         return new ResponseEntity<>(devicemaintenancemstService.queryAll(whereJson, page), HttpStatus.OK);
@@ -52,13 +52,29 @@ public class DevicemaintenancemstController {
 
 
     @GetMapping("query3")
-    @Log("查询设备保养单")
+    @Log("查询设备保养单填报（维修班）")
-    @ApiOperation("查询设备保养单")
+    @ApiOperation("查询设备保养单填报（维修班）")
     //@PreAuthorize("@el.check('devicemaintenancemst:list')")
     public ResponseEntity<Object> query3(@RequestParam Map whereJson, Pageable page) {
         return new ResponseEntity<>(devicemaintenancemstService.query3(whereJson, page), HttpStatus.OK);
     }
 
+    @GetMapping("query4")
+    @Log("查询设备保养单(班组)")
+    @ApiOperation("查询设备保养单(班组)")
+    //@PreAuthorize("@el.check('devicemaintenancemst:list')")
+    public ResponseEntity<Object> query4(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(devicemaintenancemstService.query4(whereJson, page), HttpStatus.OK);
+    }
+
+    @GetMapping("query5")
+    @Log("查询设备保养单填报（班组）")
+    @ApiOperation("查询设备保养单填报（班组）")
+    //@PreAuthorize("@el.check('devicemaintenancemst:list')")
+    public ResponseEntity<Object> query5(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(devicemaintenancemstService.query5(whereJson, page), HttpStatus.OK);
+    }
+
     @PostMapping
     @Log("新增设备保养单")
     @ApiOperation("新增设备保养单")

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/DevicemaintenancemstService.java

@@ -146,4 +146,22 @@ public interface DevicemaintenancemstService {
      * @return Map<String, Object>
      */
     Map<String, Object> query3(Map whereJson, Pageable page);
+
+    /**
+     * 查询数据分页
+     *
+     * @param whereJson 条件
+     * @param page      分页参数
+     * @return Map<String, Object>
+     */
+    Map<String, Object> query4(Map whereJson, Pageable page);
+
+    /**
+     * 查询数据分页
+     *
+     * @param whereJson 条件
+     * @param page      分页参数
+     * @return Map<String, Object>
+     */
+    Map<String, Object> query5(Map whereJson, Pageable page);
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenancemstServiceImpl.java

@@ -169,6 +169,7 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
         jsonMst.put("maintenancecycle", whereJson.getString("maintenancecycle"));
         jsonMst.put("invstatus", "01");
         jsonMst.put("plan_start_date", whereJson.getString("plan_start_date"));
+        jsonMst.put("maint_object", whereJson.getString("maint_object"));
         jsonMst.put("detail_count", tableData.size());
         jsonMst.put("input_optid", currentUserId);
         jsonMst.put("input_optname", nickName);
@@ -203,6 +204,7 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
         jsonMst.put("devicerecord_id", whereJson.get("devicerecord_id"));
         jsonMst.put("maintenancecycle", whereJson.getString("maintenancecycle"));
         jsonMst.put("plan_start_date", whereJson.getString("plan_start_date"));
+        jsonMst.put("maint_object", whereJson.getString("maint_object"));
         jsonMst.put("detail_count", tableData.size());
         mstTab.update(jsonMst);
 
@@ -531,6 +533,7 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
         String invstatus = MapUtil.getStr(whereJson, "invstatus");
         String begin_time = MapUtil.getStr(whereJson, "begin_time");
         String end_time = MapUtil.getStr(whereJson, "end_time");
+        String maint_object = MapUtil.getStr(whereJson, "maint_object");
 
         HashMap<String, String> map = new HashMap<>();
         map.put("flag", "4");
@@ -538,6 +541,39 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
         map.put("invstatus", invstatus);
         map.put("begin_time", begin_time);
         map.put("end_time", end_time);
+        map.put("maint_object", maint_object);
+        if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%" + device_code + "%");
+        if (ObjectUtil.isNotEmpty(maint_code)) map.put("maint_code", "%" + maint_code + "%");
+        //处理物料当前节点的所有子节点
+        if (!StrUtil.isEmpty(material_type_id)) {
+            map.put("material_type_id", material_type_id);
+            String classIds = classstandardService.getChildIdStr(material_type_id);
+            map.put("classIds", classIds);
+        } else if (ObjectUtil.isNotEmpty(class_idStr)) {
+            String classIds = classstandardService.getAllChildIdStr(class_idStr);
+            map.put("classIds", classIds);
+        }
+        JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCE001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time DESC");
+        return json;
+    }
+
+    @Override
+    public Map<String, Object> query4(Map whereJson, Pageable page) {
+        String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
+        String class_idStr = MapUtil.getStr(whereJson, "class_idStr");
+        String device_code = MapUtil.getStr(whereJson, "device_code");
+        String maintenancecycle = MapUtil.getStr(whereJson, "maintenancecycle");
+        String maint_code = MapUtil.getStr(whereJson, "maint_code");
+        String invstatus = MapUtil.getStr(whereJson, "invstatus");
+        String begin_time = MapUtil.getStr(whereJson, "begin_time");
+        String end_time = MapUtil.getStr(whereJson, "end_time");
+
+        HashMap<String, String> map = new HashMap<>();
+        map.put("flag", "5");
+        map.put("maintenancecycle", maintenancecycle);
+        map.put("invstatus", invstatus);
+        map.put("begin_time", begin_time);
+        map.put("end_time", end_time);
         if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%" + device_code + "%");
         if (ObjectUtil.isNotEmpty(maint_code)) map.put("maint_code", "%" + maint_code + "%");
         //处理物料当前节点的所有子节点
@@ -553,4 +589,38 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
         return json;
     }
 
+    @Override
+    public Map<String, Object> query5(Map whereJson, Pageable page) {
+        String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
+        String class_idStr = MapUtil.getStr(whereJson, "class_idStr");
+        String device_code = MapUtil.getStr(whereJson, "device_code");
+        String maintenancecycle = MapUtil.getStr(whereJson, "maintenancecycle");
+        String maint_code = MapUtil.getStr(whereJson, "maint_code");
+        String invstatus = MapUtil.getStr(whereJson, "invstatus");
+        String begin_time = MapUtil.getStr(whereJson, "begin_time");
+        String end_time = MapUtil.getStr(whereJson, "end_time");
+        String maint_object = MapUtil.getStr(whereJson, "maint_object");
+
+        HashMap<String, String> map = new HashMap<>();
+        map.put("flag", "6");
+        map.put("maintenancecycle", maintenancecycle);
+        map.put("invstatus", invstatus);
+        map.put("begin_time", begin_time);
+        map.put("end_time", end_time);
+        map.put("maint_object", maint_object);
+        if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%" + device_code + "%");
+        if (ObjectUtil.isNotEmpty(maint_code)) map.put("maint_code", "%" + maint_code + "%");
+        //处理物料当前节点的所有子节点
+        if (!StrUtil.isEmpty(material_type_id)) {
+            map.put("material_type_id", material_type_id);
+            String classIds = classstandardService.getChildIdStr(material_type_id);
+            map.put("classIds", classIds);
+        } else if (ObjectUtil.isNotEmpty(class_idStr)) {
+            String classIds = classstandardService.getAllChildIdStr(class_idStr);
+            map.put("classIds", classIds);
+        }
+        JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCE001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time DESC");
+        return json;
+    }
+
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java

@@ -56,6 +56,7 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla
         String is_active = MapUtil.getStr(whereJson, "is_active");
         String begin_time = MapUtil.getStr(whereJson, "begin_time");
         String end_time = MapUtil.getStr(whereJson, "end_time");
+        String maint_object = MapUtil.getStr(whereJson, "maint_object");
         String class_idStr = (String) whereJson.get("class_idStr");
 
         HashMap<String, String> map = new HashMap<>();
@@ -64,6 +65,7 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla
         map.put("is_active", is_active);
         map.put("begin_time", begin_time);
         map.put("end_time", end_time);
+        map.put("maint_object", maint_object);
         if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code","%"+device_code+"%");
         if (ObjectUtil.isNotEmpty(maint_plan_code)) map.put("maint_plan_code","%"+maint_plan_code+"%");
         //处理物料当前节点的所有子节点
@@ -132,6 +134,7 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla
         jsonMst.put("devicerecord_id", whereJson.getString("devicerecord_id"));
         jsonMst.put("maintenancecycle", whereJson.getString("maintenancecycle"));
         jsonMst.put("plan_start_date", whereJson.getString("plan_start_date"));
+        jsonMst.put("maint_object", whereJson.getString("maint_object"));
         jsonMst.put("detail_count", tableData.size());
         jsonMst.put("create_id", currentUserId);
         jsonMst.put("create_name", nickName);
@@ -174,6 +177,7 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla
         jsonMst.put("devicerecord_id", whereJson.getString("devicerecord_id"));
         jsonMst.put("maintenancecycle", whereJson.getString("maintenancecycle"));
         jsonMst.put("plan_start_date", whereJson.getString("plan_start_date"));
+        jsonMst.put("maint_object", whereJson.getString("maint_object"));
         jsonMst.put("detail_count", tableData.size());
         jsonMst.put("update_optid", currentUserId);
         jsonMst.put("update_optname", nickName);
@@ -334,6 +338,7 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla
         jsonMst.put("devicerecord_id", whereJson.getString("devicerecord_id"));
         jsonMst.put("maintenancecycle", whereJson.getString("maintenancecycle"));
         jsonMst.put("plan_start_date", whereJson.getString("plan_start_date"));
+        jsonMst.put("maint_object", whereJson.getString("maint_object"));
         jsonMst.put("detail_count", tableData.size());
         jsonMst.put("create_id", currentUserId);
         jsonMst.put("create_name", nickName);

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql

@@ -22,6 +22,7 @@
 	输入.invstatus					    TYPEAS s_string
 	输入.begin_time					    TYPEAS s_string
 	输入.end_time					    TYPEAS s_string
+	输入.maint_object					TYPEAS s_string
 
 
 [临时表]
@@ -65,6 +66,7 @@
             WHERE
                 mst.is_delete = '0'
                 AND file.is_delete = '0'
+                AND mst.maint_object = '02'
 
                 OPTION 输入.device_code <> ""
                     (file.device_code like 输入.device_code or
@@ -193,6 +195,7 @@
             WHERE
                 mst.is_delete = '0'
                 AND file.is_delete = '0'
+                AND mst.maint_object = '02'
                 AND mst.invstatus not in ('01')
 
                 OPTION 输入.device_code <> ""
@@ -213,6 +216,237 @@
                     mst.maintenancecycle = 输入.maintenancecycle
                 ENDOPTION
 
+                OPTION 输入.maint_object <> ""
+                    mst.maint_object = 输入.maint_object
+                ENDOPTION
+
+                OPTION 输入.begin_time <> ""
+                    mst.plan_start_date >= 输入.begin_time
+                ENDOPTION
+
+                OPTION 输入.end_time <> ""
+                    mst.plan_start_date <= 输入.end_time
+                ENDOPTION
+
+                OPTION 输入.invstatus <> ""
+                    mst.invstatus = 输入.invstatus
+                ENDOPTION
+
+            UNION
+
+			SELECT
+            	mst.*,
+            	class.class_name,
+            	file.device_code,
+            	file.device_name,
+            	file.extend_code,
+                d1.name AS dept_name,
+                d2.name AS use_name
+            FROM
+            	EM_BI_DeviceMaintenanceMst mst
+            	LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
+            	LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
+                LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
+                LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
+            WHERE
+                mst.is_delete = '0'
+                AND file.is_delete = '0'
+                AND mst.maint_object = '01'
+                AND mst.invstatus in ('04')
+
+                OPTION 输入.device_code <> ""
+                    (file.device_code like 输入.device_code or
+                    file.device_name like 输入.device_code)
+                ENDOPTION
+
+                OPTION 输入.maint_code <> ""
+                    (mst.maint_code like 输入.maint_code or
+                    mst.maint_code like 输入.maint_code)
+                ENDOPTION
+
+                OPTION 输入.classIds <> ""
+                    class.class_id in 输入.classIds
+                ENDOPTION
+
+                OPTION 输入.maintenancecycle <> ""
+                    mst.maintenancecycle = 输入.maintenancecycle
+                ENDOPTION
+
+                OPTION 输入.maint_object <> ""
+                    mst.maint_object = 输入.maint_object
+                ENDOPTION
+
+                OPTION 输入.begin_time <> ""
+                    mst.plan_start_date >= 输入.begin_time
+                ENDOPTION
+
+                OPTION 输入.end_time <> ""
+                    mst.plan_start_date <= 输入.end_time
+                ENDOPTION
+
+                OPTION 输入.invstatus <> ""
+                    mst.invstatus = 输入.invstatus
+                ENDOPTION
+
+			ENDSELECT
+		ENDPAGEQUERY
+	ENDIF
+
+	IF 输入.flag = "5"
+		PAGEQUERY
+			SELECT
+            	mst.*,
+            	class.class_name,
+            	file.device_code,
+            	file.device_name,
+            	file.extend_code,
+                d1.name AS dept_name,
+                d2.name AS use_name
+            FROM
+            	EM_BI_DeviceMaintenanceMst mst
+            	LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
+            	LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
+                LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
+                LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
+            WHERE
+                mst.is_delete = '0'
+                AND file.is_delete = '0'
+                AND mst.maint_object = '01'
+
+                OPTION 输入.device_code <> ""
+                    (file.device_code like 输入.device_code or
+                    file.device_name like 输入.device_code)
+                ENDOPTION
+
+                OPTION 输入.maint_code <> ""
+                    (mst.maint_code like 输入.maint_code or
+                    mst.maint_code like 输入.maint_code)
+                ENDOPTION
+
+                OPTION 输入.classIds <> ""
+                    class.class_id in 输入.classIds
+                ENDOPTION
+
+                OPTION 输入.maintenancecycle <> ""
+                    mst.maintenancecycle = 输入.maintenancecycle
+                ENDOPTION
+
+                OPTION 输入.begin_time <> ""
+                    mst.plan_start_date >= 输入.begin_time
+                ENDOPTION
+
+                OPTION 输入.end_time <> ""
+                    mst.plan_start_date <= 输入.end_time
+                ENDOPTION
+
+                OPTION 输入.invstatus <> ""
+                    mst.invstatus = 输入.invstatus
+                ENDOPTION
+
+			ENDSELECT
+		ENDPAGEQUERY
+	ENDIF
+
+	IF 输入.flag = "6"
+		PAGEQUERY
+			SELECT
+            	mst.*,
+            	class.class_name,
+            	file.device_code,
+            	file.device_name,
+            	file.extend_code,
+                d1.name AS dept_name,
+                d2.name AS use_name
+            FROM
+            	EM_BI_DeviceMaintenanceMst mst
+            	LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
+            	LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
+                LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
+                LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
+            WHERE
+                mst.is_delete = '0'
+                AND file.is_delete = '0'
+                AND mst.maint_object = '01'
+                AND mst.invstatus not in ('01')
+
+                OPTION 输入.device_code <> ""
+                    (file.device_code like 输入.device_code or
+                    file.device_name like 输入.device_code)
+                ENDOPTION
+
+                OPTION 输入.maint_code <> ""
+                    (mst.maint_code like 输入.maint_code or
+                    mst.maint_code like 输入.maint_code)
+                ENDOPTION
+
+                OPTION 输入.classIds <> ""
+                    class.class_id in 输入.classIds
+                ENDOPTION
+
+                OPTION 输入.maintenancecycle <> ""
+                    mst.maintenancecycle = 输入.maintenancecycle
+                ENDOPTION
+
+                OPTION 输入.maint_object <> ""
+                    mst.maint_object = 输入.maint_object
+                ENDOPTION
+
+                OPTION 输入.begin_time <> ""
+                    mst.plan_start_date >= 输入.begin_time
+                ENDOPTION
+
+                OPTION 输入.end_time <> ""
+                    mst.plan_start_date <= 输入.end_time
+                ENDOPTION
+
+                OPTION 输入.invstatus <> ""
+                    mst.invstatus = 输入.invstatus
+                ENDOPTION
+
+            UNION
+
+			SELECT
+            	mst.*,
+            	class.class_name,
+            	file.device_code,
+            	file.device_name,
+            	file.extend_code,
+                d1.name AS dept_name,
+                d2.name AS use_name
+            FROM
+            	EM_BI_DeviceMaintenanceMst mst
+            	LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
+            	LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
+                LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
+                LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
+            WHERE
+                mst.is_delete = '0'
+                AND file.is_delete = '0'
+                AND mst.maint_object = '02'
+                AND mst.invstatus in ('04')
+
+                OPTION 输入.device_code <> ""
+                    (file.device_code like 输入.device_code or
+                    file.device_name like 输入.device_code)
+                ENDOPTION
+
+                OPTION 输入.maint_code <> ""
+                    (mst.maint_code like 输入.maint_code or
+                    mst.maint_code like 输入.maint_code)
+                ENDOPTION
+
+                OPTION 输入.classIds <> ""
+                    class.class_id in 输入.classIds
+                ENDOPTION
+
+                OPTION 输入.maintenancecycle <> ""
+                    mst.maintenancecycle = 输入.maintenancecycle
+                ENDOPTION
+
+                OPTION 输入.maint_object <> ""
+                    mst.maint_object = 输入.maint_object
+                ENDOPTION
+
                 OPTION 输入.begin_time <> ""
                     mst.plan_start_date >= 输入.begin_time
                 ENDOPTION

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN001.wql

@@ -25,6 +25,7 @@
 	输入.is_active					    TYPEAS s_string
 	输入.begin_time					    TYPEAS s_string
 	输入.end_time					    TYPEAS s_string
+	输入.maint_object					TYPEAS s_string
 
 
 [临时表]
@@ -95,6 +96,10 @@
                     mst.plan_start_date <= 输入.end_time
                 ENDOPTION
 
+                OPTION 输入.maint_object <> ""
+                    mst.maint_object = 输入.maint_object
+                ENDOPTION
+
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF

mes/qd/src/views/wms/sb/upkeep/devicemaintenance/AddDialog.vue

@@ -20,19 +20,19 @@
 
     <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="120px" label-suffix=":">
       <el-row>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="单据号" prop="maint_code">
             <el-input v-model="form.maint_code" style="width: 200px;" disabled placeholder="系统自动生成" />
           </el-form-item>
         </el-col>
 
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="业务日期" prop="plan_start_date">
             <el-date-picker v-model="form.plan_start_date" type="date" placeholder="选择日期" style="width: 200px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
           </el-form-item>
         </el-col>
 
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="保养类型" prop="maintenancecycle">
             <el-select
               v-model="form.maintenancecycle"
@@ -52,14 +52,31 @@
       </el-row>
 
       <el-row>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="设备" prop="devicerecord_id">
             <el-input v-model="form.device_code" :disabled="true" style="width: 200px;">
               <el-button slot="append" icon="el-icon-plus" @click="putDevice" :disabled="crud.status.view > 0" />
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="16">
+        <el-col :span="6">
+          <el-form-item label="保养对象" prop="maint_object">
+            <el-select
+              v-model="form.maint_object"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in objectList"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="备注" prop="remark">
             <el-input v-model="form.remark" style="width: 580px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
           </el-form-item>
@@ -118,7 +135,7 @@
     </el-card>
 
     <DeviceDialog :dialog-show.sync="deviceDialog" :is-single="true" @tableChanged2="tableChanged2"/>
-    <ItemDialog :dialog-show.sync="itemDialog" :is-single="false" @tableChanged1="tableChanged1"/>
+    <ItemDialog :dialog-show.sync="itemDialog" :is-single="false" :open-param="openParam" @tableChanged1="tableChanged1"/>
   </el-dialog>
 </template>
 
@@ -126,9 +143,12 @@
 
 const defaultForm = {
   maint_code: null,
+  maint_object: null,
   devicerecord_id: null,
   maintenancecycle: '02',
   plan_start_date: null,
+  material_type_id: null,
+  device_code: null,
   tableData: []
 }
 
@@ -163,6 +183,9 @@ export default {
       dialogVisible: false,
       deviceDialog: false,
       itemDialog: false,
+      objectList: [
+        { 'label': '维修班', 'value': '02' }
+      ],
       rules: {
         plan_start_date: [
           { required: true, message: '计划开始日期不能为空', trigger: 'blur' }
@@ -172,6 +195,9 @@ export default {
         ],
         devicerecord_id: [
           { required: true, message: '设备不能为空', trigger: 'blur' }
+        ],
+        maint_object: [
+          { required: true, message: '保养对象不能为空', trigger: 'blur' }
         ]
       }
     }
@@ -224,6 +250,7 @@ export default {
       this.deviceDialog = true
     },
     putItem() {
+      this.openParam = this.form
       this.itemDialog = true
     },
     tableChanged1(row) {
@@ -247,7 +274,8 @@ export default {
     },
     tableChanged2(row) {
       this.form.devicerecord_id = row.devicerecord_id
-      this.form.device_code = row.device_code
+      this.form.material_type_id = row.material_type_id
+      this.form.device_code = row.device_name + '-' + row.device_code
     },
     delRow(index, rows) {
       rows.splice(index, 1)

mes/qd/src/views/wms/sb/upkeep/devicemaintenance/index.vue

@@ -115,6 +115,7 @@
         <el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
         <el-table-column prop="dept_name" label="归属部门" show-overflow-tooltip />
         <el-table-column prop="use_name" label="使用班组" show-overflow-tooltip />
+        <el-table-column prop="maint_object" label="保养对象" :formatter="formatMainObject"/>
         <el-table-column prop="invstatus" label="单据状态" show-overflow-tooltip :formatter="formatInvsName" />
         <el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatMainName" />
         <el-table-column prop="plan_start_date" label="计划保养日期" width="150px" />
@@ -163,7 +164,7 @@ import {downloadFile} from "@/utils";
 
 export default {
   name: 'Devicemaintenance',
-  dicts: ['EM_DEVICE_BY_INVSTATUS', 'EM_DEVICE_BY_INVTYPE'],
+  dicts: ['EM_DEVICE_BY_INVSTATUS', 'EM_DEVICE_BY_INVTYPE', 'EM_DEVICE_MAINT_OBJECT'],
   components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect, DateRangePicker },
   mixins: [presenter(), header(), crud()],
   cruds() {
@@ -210,6 +211,9 @@ export default {
     hand(value) {
       this.crud.toQuery()
     },
+    formatMainObject(row, cloum) {
+      return this.dict.label.EM_DEVICE_MAINT_OBJECT[row.maint_object]
+    },
     formatInvsName(row, cloum) {
       return this.dict.label.EM_DEVICE_BY_INVSTATUS[row.invstatus]
     },

mes/qd/src/views/wms/sb/upkeep/devicemaintenancegrid/AddDialog.vue

@@ -0,0 +1,311 @@
+<template>
+  <el-dialog
+    :title="crud.status.title"
+    append-to-body
+    fullscreen
+    :before-close="crud.cancelCU"
+    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
+  >
+    <el-row v-show="crud.status.cu > 0" :gutter="20">
+      <el-col :span="20" style="border: 1px solid white">
+        <span />
+      </el-col>
+      <el-col :span="4">
+        <span>
+          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
+          <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
+        </span>
+      </el-col>
+    </el-row>
+
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="120px" label-suffix=":">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="单据号" prop="maint_code">
+            <el-input v-model="form.maint_code" style="width: 200px;" disabled placeholder="系统自动生成" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <el-form-item label="业务日期" prop="plan_start_date">
+            <el-date-picker v-model="form.plan_start_date" type="date" placeholder="选择日期" style="width: 200px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="6">
+          <el-form-item label="保养类型" prop="maintenancecycle">
+            <el-select
+              v-model="form.maintenancecycle"
+              disabled
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in dict.EM_DEVICE_BY_INVTYPE"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="设备" prop="devicerecord_id">
+            <el-input v-model="form.device_code" :disabled="true" style="width: 200px;">
+              <el-button slot="append" icon="el-icon-plus" @click="putDevice" :disabled="crud.status.view > 0" />
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="保养对象" prop="maint_object">
+            <el-select
+              v-model="form.maint_object"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in objectList"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" style="width: 580px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <div class="crud-opts2">
+      <span class="role-span">项目明细</span>
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left" />
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-check"
+          size="mini"
+          @click="putItem"
+          :disabled="crud.status.view > 0"
+        >
+          添加项目
+        </el-button>
+      </span>
+    </div>
+
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="table2"
+        :data="form.tableData"
+        style="width: 100%;"
+        max-height="500"
+        border
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      >
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column show-overflow-tooltip prop="maint_item_code" label="保养项目编号" align="center" />
+        <el-table-column show-overflow-tooltip prop="maint_item_name" label="保养项目名称" align="center" />
+        <el-table-column show-overflow-tooltip prop="item_level" label="保养等级" align="center" :formatter="formatLevel" />
+        <el-table-column show-overflow-tooltip prop="contents" label="保养内容" align="center" />
+        <el-table-column show-overflow-tooltip prop="requirement" 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" :disabled="crud.status.view > 0" class="input-with-select" />
+          </template>
+        </el-table-column>
+
+        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete" :disabled="crud.status.view > 0" @click.native.prevent="delRow(scope.$index, form.tableData)" />
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+
+    <DeviceDialog :dialog-show.sync="deviceDialog" :is-single="true" @tableChanged2="tableChanged2"/>
+    <ItemDialog :dialog-show.sync="itemDialog" :is-single="false" :open-param="openParam" @tableChanged1="tableChanged1"/>
+  </el-dialog>
+</template>
+
+<script>
+
+const defaultForm = {
+  maint_code: null,
+  maint_object: null,
+  devicerecord_id: null,
+  maintenancecycle: '02',
+  plan_start_date: null,
+  material_type_id: null,
+  device_code: null,
+  tableData: []
+}
+
+import crudDevicemaintenancemst from '@/api/wms/sb/devicemaintenancemst'
+import DeviceDialog from '@/views/wms/sb/upkeep/devicemaintenanceplan/DeviceDialog'
+import ItemDialog from '@/views/wms/sb/upkeep/devicemaintenanceplan/ItemDialog'
+import CRUD, { form, crud } from '@crud/crud'
+
+export default {
+  name: 'AddDialog',
+  dicts: ['EM_DEVICE_BY_INVTYPE'],
+  components: { ItemDialog, DeviceDialog },
+  mixins: [form(defaultForm), crud()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: Object
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      deviceDialog: false,
+      itemDialog: false,
+      objectList: [
+        { 'label': '班组', 'value': '01' }
+      ],
+      rules: {
+        plan_start_date: [
+          { required: true, message: '计划开始日期不能为空', trigger: 'blur' }
+        ],
+        maintenancecycle: [
+          { required: true, message: '保养周期不能为空', trigger: 'blur' }
+        ],
+        devicerecord_id: [
+          { required: true, message: '设备不能为空', trigger: 'blur' }
+        ],
+        maint_object: [
+          { required: true, message: '保养对象不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    [CRUD.HOOK.beforeSubmit]() {
+      const arr = this.form.tableData
+      if (arr.length === 0) {
+        this.crud.notify('明细不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+    },
+    [CRUD.HOOK.afterToEdit]() {
+      const data = {
+        'maint_id': this.form.maint_id
+      }
+      crudDevicemaintenancemst.getDtl(data).then(res => {
+        this.form.tableData = res
+      })
+    },
+    [CRUD.HOOK.afterToView]() {
+      const data = {
+        'maint_id': this.form.maint_id
+      }
+      crudDevicemaintenancemst.getDtl(data).then(res => {
+        this.form.tableData = res
+      })
+    },
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done()
+        })
+        .catch(_ => {
+        })
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    formatLevel(row, cloum) {
+      if (row.item_level === '01') {
+        return '日常'
+      } else if (row.item_level === '02') {
+        return '一级'
+      } else if (row.item_level === '03') {
+        return '二级'
+      }
+    },
+    putDevice() {
+      this.deviceDialog = true
+    },
+    putItem() {
+      this.openParam = this.form
+      this.itemDialog = true
+    },
+    tableChanged1(row) {
+      const arr = row
+      const data = this.form.tableData
+      arr.forEach((item) => {
+        if (this.form.tableData.length !== 0) {
+          this.fla = false
+          for (let i = 0; i < data.length; i++) {
+            if (data[i].maint_item_id === item.maint_item_id) {
+              this.fla = true
+            }
+          }
+          if (this.fla === false) {
+            this.form.tableData.push(item)
+          }
+        } else {
+          this.form.tableData.push(item)
+        }
+      })
+    },
+    tableChanged2(row) {
+      this.form.devicerecord_id = row.devicerecord_id
+      this.form.material_type_id = row.material_type_id
+      this.form.device_code = row.device_name + '-' + row.device_code
+    },
+    delRow(index, rows) {
+      rows.splice(index, 1)
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .el-dialog__title2 {
+  line-height: 24px;
+  font-size:20px;
+  color:#303133;
+}
+
+.crud-opts2 .role-span {
+  padding: 10px 0px 10px 0px;
+}
+.crud-opts2 .crud-opts-form {
+  padding: 10px 0px 0px 20px;
+}
+
+.input-with-select  {
+  background-color: #fff;
+}
+</style>

mes/qd/src/views/wms/sb/upkeep/devicemaintenancegrid/index.vue

@@ -0,0 +1,277 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="110px"
+          label-suffix=":"
+        >
+          <el-form-item label="设备类别">
+            <treeselect
+              v-model="query.material_type_id"
+              :load-options="loadClass"
+              :options="classes"
+              style="width: 200px;"
+              placeholder="请选择"
+            />
+          </el-form-item>
+          <el-form-item label="设备">
+            <el-input
+              v-model="query.device_code"
+              clearable
+              size="mini"
+              placeholder="请输入设备编码、名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="保养类型">
+            <el-select
+              v-model="query.maintenancecycle"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.EM_DEVICE_BY_INVTYPE"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="单据编码">
+            <el-input
+              v-model="query.maint_code"
+              clearable
+              size="mini"
+              placeholder="请输入单据编码、名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="日期">
+            <date-range-picker v-model="query.createTime" class="date-item" />
+          </el-form-item>
+          <el-form-item label="状态">
+            <el-select
+              v-model="query.invstatus"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.EM_DEVICE_BY_INVSTATUS"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="crud.selections.length !== 1"
+          @click="putIn"
+        >
+          提交
+        </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="crud.selections.length !== 1"
+          @click="createExcel"
+        >
+          生成保养单
+        </el-button>
+      </crudOperation>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="false" prop="maint_id" label="保养单标识" />
+        <el-table-column prop="maint_code" label="保养单号" width="120px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.maint_code }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="device_code" label="设备编码" show-overflow-tooltip />
+        <el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
+        <el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
+        <el-table-column prop="dept_name" label="归属部门" show-overflow-tooltip />
+        <el-table-column prop="use_name" label="使用班组" show-overflow-tooltip />
+        <el-table-column prop="maint_object" label="保养对象" :formatter="formatMainObject" />
+        <el-table-column prop="invstatus" label="单据状态" show-overflow-tooltip :formatter="formatInvsName" />
+        <el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatMainName" />
+        <el-table-column prop="plan_start_date" label="计划保养日期" width="150px" />
+        <el-table-column prop="input_optname" label="创建人" />
+        <el-table-column prop="input_time" label="创建时间" width="150px" />
+        <el-table-column prop="update_optname" label="保养人" />
+        <el-table-column prop="real_start_date" label="开始时间" width="150px" />
+        <el-table-column prop="real_end_date" label="结束时间" width="150px" />
+        <el-table-column prop="confirm_optname" label="确认人" />
+        <el-table-column prop="confirm_time" label="确认时间" width="150px" />
+        <el-table-column prop="audit_optname" label="审核人" />
+        <el-table-column prop="audit_time" label="审核时间" width="150px" />
+        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+              :disabled-edit="scope.row.invstatus !== '01'"
+              :disabled-dle="scope.row.invstatus !== '01'"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <AddDialog />
+  </div>
+</template>
+
+<script>
+import crudDevicemaintenancemst from '@/api/wms/sb/devicemaintenancemst'
+import CRUD, { presenter, header, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import crudClassstandard from '@/api/wms/basedata/master/classstandard'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
+import DateRangePicker from '@/components/DateRangePicker'
+import AddDialog from '@/views/wms/sb/upkeep/devicemaintenancegrid/AddDialog'
+import { download } from '@/api/data'
+import { downloadFile } from '@/utils'
+
+export default {
+  name: 'Devicemaintenancegrid',
+  dicts: ['EM_DEVICE_BY_INVSTATUS', 'EM_DEVICE_BY_INVTYPE', 'EM_DEVICE_MAINT_OBJECT'],
+  components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect, DateRangePicker },
+  mixins: [presenter(), header(), crud()],
+  cruds() {
+    return CRUD({
+      title: '设备保养单',
+      url: 'api/devicemaintenancemst/query4',
+      idField: 'maint_id',
+      sort: 'maint_id,desc',
+      crudMethod: { ...crudDevicemaintenancemst },
+      optShow: {
+        add: true,
+        edit: false,
+        del: false,
+        download: false,
+        reset: true
+      }
+    })
+  },
+  data() {
+    return {
+      classes: [],
+      class_idStr: null,
+      materOpt_code: '23',
+      permission: {
+      }
+    }
+  },
+  created() {
+    const param = {
+      'materOpt_code': this.materOpt_code
+    }
+    crudMaterialbase.getMaterOptType(param).then(res => {
+      this.class_idStr = res.class_idStr
+      this.crud.query.class_idStr = this.class_idStr
+      this.crud.toQuery()
+      this.queryClassId()
+    })
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    hand(value) {
+      this.crud.toQuery()
+    },
+    formatMainObject(row, cloum) {
+      return this.dict.label.EM_DEVICE_MAINT_OBJECT[row.maint_object]
+    },
+    formatInvsName(row, cloum) {
+      return this.dict.label.EM_DEVICE_BY_INVSTATUS[row.invstatus]
+    },
+    formatMainName(row, cloum) {
+      return this.dict.label.EM_DEVICE_BY_INVTYPE[row.maintenancecycle]
+    },
+    putIn() {
+      const _selectData = this.$refs.table.selection
+      const data = _selectData[0]
+      if (data.invstatus !== '01') {
+        return this.crud.notify('只能对生成状态的单据提交', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      crudDevicemaintenancemst.putIn(data).then(res => {
+        this.crud.notify('提交成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
+    },
+    loadClass({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    },
+    queryClassId() {
+      const param = {
+        'class_idStr': this.class_idStr
+      }
+      crudClassstandard.queryClassById(param).then(res => {
+        this.classes = res.content.map(obj => {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
+    },
+    createExcel() {
+      const _selectData = this.$refs.table.selection
+      const data = _selectData[0]
+      download('api/devicemaintenancemst/createExcel', { 'maint_id': data.maint_id }).then(result => {
+        const name = data.maint_code + '保养工单'
+        this.crud.toQuery()
+        downloadFile(result, name, 'xlsx')
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -73,6 +73,22 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="保养对象">
+            <el-select
+              v-model="query.maint_object"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.EM_DEVICE_MAINT_OBJECT"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
@@ -132,6 +148,7 @@
         <el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
         <el-table-column prop="dept_name" label="所属部门" show-overflow-tooltip />
         <el-table-column prop="use_name" label="使用班组" show-overflow-tooltip />
+        <el-table-column prop="maint_object" label="保养对象" show-overflow-tooltip :formatter="formatMainObject"/>
         <el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
         <el-table-column prop="invstatus" label="单据状态" show-overflow-tooltip :formatter="formatInvsName" />
         <el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatMainName" />
@@ -171,7 +188,7 @@ import StartDialog from '@/views/wms/sb/upkeep/devicemaintenancepa/StartDialog'
 
 export default {
   name: 'Devicemaintenancepa',
-  dicts: ['EM_DEVICE_BY_INVSTATUS', 'EM_DEVICE_BY_INVTYPE'],
+  dicts: ['EM_DEVICE_BY_INVSTATUS', 'EM_DEVICE_BY_INVTYPE', 'EM_DEVICE_MAINT_OBJECT'],
   components: { ExecuteDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect, DateRangePicker, StartDialog },
   mixins: [presenter(), header(), crud()],
   cruds() {
@@ -225,6 +242,9 @@ export default {
     hand(value) {
       this.crud.toQuery()
     },
+    formatMainObject(row, cloum) {
+      return this.dict.label.EM_DEVICE_MAINT_OBJECT[row.maint_object]
+    },
     formatInvsName(row, cloum) {
       return this.dict.label.EM_DEVICE_BY_INVSTATUS[row.invstatus]
     },
@@ -331,7 +351,10 @@ export default {
           if ('01,02,04,05,99'.includes(rows[i].invstatus)) {
             this.end_flag = true
           }
-          if ('01,02,03,05,99'.includes(rows[i].invstatus)) {
+          // if ('01,02,03,05,99'.includes(rows[i].invstatus)) {
+          //   this.confirm_flag = true
+          // }
+          if (rows[i].maint_object !== '01') {
             this.confirm_flag = true
           }
           if (rows.length > 1) {

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

@@ -0,0 +1,228 @@
+<template>
+  <el-dialog
+    title="保养单执行"
+    append-to-body
+    :visible.sync="dialogVisible"
+    fullscreen
+    :before-close="handleClose"
+    destroy-on-close
+    @close="close"
+  >
+    <el-row :gutter="24">
+      <el-col :span="18" style="border: 1px solid white">
+        <span />
+      </el-col>
+      <el-col :span="6">
+        <span>
+          <el-button icon="el-icon-check" size="mini" type="primary" @click="submitAndEnd">保存并结束</el-button>
+          <el-button icon="el-icon-check" size="mini" type="primary" @click="submitMain">保存</el-button>
+          <el-button icon="el-icon-close" size="mini" type="info" @click="close">关闭</el-button>
+        </span>
+      </el-col>
+    </el-row>
+
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="120px" label-suffix=":">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="单据号" prop="maint_code">
+            <el-input v-model="form.maint_code" style="width: 200px;" disabled placeholder="系统自动生成" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="业务日期" prop="plan_start_date">
+            <el-date-picker v-model="form.plan_start_date" type="date" placeholder="选择日期" style="width: 200px" value-format="yyyy-MM-dd" disabled />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="保养类型" prop="maintenancecycle">
+            <el-select
+              v-model="form.maintenancecycle"
+              disabled
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in dict.EM_DEVICE_BY_INVTYPE"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="设备档案" prop="devicerecord_id">
+            <el-input v-model="form.devicerecord_id" :disabled="true" style="width: 200px;"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="保养人" prop="update_optname">
+            <el-input v-model="form.update_optname" style="width: 200px;"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="16">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" style="width: 580px;" rows="2" type="textarea" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <div class="crud-opts2">
+      <span class="role-span">项目明细</span>
+    </div>
+
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="table2"
+        :data="form.tableData"
+        style="width: 100%;"
+        max-height="500"
+        border
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      >
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column show-overflow-tooltip prop="maint_item_code" label="保养项目编号" align="center" />
+        <el-table-column show-overflow-tooltip prop="maint_item_name" label="保养项目名称" align="center" />
+        <el-table-column show-overflow-tooltip prop="item_level" label="保养等级" align="center" :formatter="formatLevel" />
+        <el-table-column show-overflow-tooltip prop="contents" label="保养内容" align="center" />
+        <el-table-column show-overflow-tooltip prop="requirement" label="要求" align="center" />
+        <el-table-column show-overflow-tooltip prop="dtl_remark" label="备注" align="center" />
+        <el-table-column prop="isfinish" label="是否完成" align="center">
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.isfinish"
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in dict.IS_OR_NOT"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+
+  </el-dialog>
+</template>
+<script>
+
+import CRUD, { crud } from '@crud/crud'
+import crudDevicemaintenancemst from '@/api/wms/sb/devicemaintenancemst'
+export default {
+  name: 'ExecuteDialog',
+  dicts: ['EM_DEVICE_BY_INVTYPE', 'IS_OR_NOT'],
+  mixins: [crud()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: Object
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+        this.form = this.openParam.form
+        this.form.tableData = this.openParam.tableData
+      }
+    }
+  },
+  data() {
+    return {
+      form: {
+        tableData: []
+      },
+      dialogVisible: false
+    }
+  },
+  methods: {
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done()
+        })
+        .catch(_ => {
+        })
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    formatLevel(row, cloum) {
+      if (row.item_level === '01') {
+        return '日常'
+      } else if (row.item_level === '02') {
+        return '一级'
+      } else if (row.item_level === '03') {
+        return '二级'
+      }
+    },
+    submitMain() {
+      const data = this.form
+      if (this.form.update_optname === '') {
+        return this.crud.notify('保养人不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      crudDevicemaintenancemst.submitMain(data).then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+        this.dialogVisible = false
+      })
+    },
+    submitAndEnd() {
+      const data = this.form
+      if (this.form.update_optname === '') {
+        return this.crud.notify('保养人不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      crudDevicemaintenancemst.endMaintain(data).then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.dialogVisible = false
+        this.crud.toQuery()
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .el-dialog__title2 {
+  line-height: 24px;
+  font-size:20px;
+  color:#303133;
+}
+
+.crud-opts2 .role-span {
+  padding: 10px 0px 10px 0px;
+}
+.crud-opts2 .crud-opts-form {
+  padding: 10px 0px 0px 20px;
+}
+
+.input-with-select  {
+  background-color: #fff;
+}
+
+</style>

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

@@ -0,0 +1,111 @@
+<template>
+  <el-dialog
+    title="开始维修"
+    append-to-body
+    :visible.sync="dialogVisible"
+    :before-close="handleClose"
+    width="550px"
+    destroy-on-close
+    @close="close"
+  >
+    <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-input v-model="form4.update_optname" style="width: 200px;" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button icon="el-icon-check" size="mini" type="primary" @click="submitResuft">保存</el-button>
+      <el-button icon="el-icon-close" size="mini" type="info" @click="close">关闭</el-button>
+    </span>
+
+  </el-dialog>
+</template>
+<script>
+
+import CRUD, { crud } from '@crud/crud'
+import crudDevicemaintenancemst from '@/api/wms/sb/devicemaintenancemst'
+export default {
+  name: 'StartDialog',
+  mixins: [crud()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: Object
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+        this.form4 = this.openParam
+      }
+    }
+  },
+  data() {
+    return {
+      form4: {
+      },
+      dialogVisible: false
+    }
+  },
+  methods: {
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done()
+        })
+        .catch(_ => {
+        })
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    submitResuft() {
+      if (!this.form4.update_optname) {
+        return this.crud.notify('保养人不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      const data = this.form4
+      crudDevicemaintenancemst.startMaintain(data).then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.dialogVisible = false
+        this.crud.toQuery()
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .el-dialog__title2 {
+  line-height: 24px;
+  font-size:20px;
+  color:#303133;
+}
+
+.crud-opts2 .role-span {
+  padding: 10px 0px 10px 0px;
+}
+.crud-opts2 .crud-opts-form {
+  padding: 10px 0px 0px 20px;
+}
+
+.input-with-select  {
+  background-color: #fff;
+}
+
+</style>

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

@@ -0,0 +1,380 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="110px"
+          label-suffix=":"
+        >
+          <el-form-item label="设备类别">
+            <treeselect
+              v-model="query.material_type_id"
+              :load-options="loadClass"
+              :options="classes"
+              style="width: 200px;"
+              placeholder="请选择"
+            />
+          </el-form-item>
+          <el-form-item label="设备">
+            <el-input
+              v-model="query.device_code"
+              clearable
+              size="mini"
+              placeholder="请输入设备编码、名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="保养类型">
+            <el-select
+              v-model="query.maintenancecycle"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.EM_DEVICE_BY_INVTYPE"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="单据编码">
+            <el-input
+              v-model="query.maint_code"
+              clearable
+              size="mini"
+              placeholder="请输入单据编码、名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="日期">
+            <date-range-picker v-model="query.createTime" class="date-item" />
+          </el-form-item>
+          <el-form-item label="状态">
+            <el-select
+              v-model="query.invstatus"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.EM_DEVICE_BY_INVSTATUS"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="保养对象">
+            <el-select
+              v-model="query.maint_object"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.EM_DEVICE_MAINT_OBJECT"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="start_flag"
+          @click="startMaintain"
+        >
+          开始保养
+        </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"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="end_flag"
+          @click="endMaintain"
+        >
+          结束保养
+        </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="confirm_flag"
+          @click="confirmMaintain"
+        >
+          保养验收
+        </el-button>
+      </crudOperation>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="mySelectionChange">
+        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="false" prop="maint_id" label="保养单标识" />
+        <el-table-column prop="maint_code" label="保养单号" width="120px" show-overflow-tooltip />
+        <el-table-column prop="device_code" label="设备编码" show-overflow-tooltip />
+        <el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
+        <el-table-column prop="dept_name" label="所属部门" show-overflow-tooltip />
+        <el-table-column prop="use_name" label="使用班组" show-overflow-tooltip />
+        <el-table-column prop="maint_object" label="保养对象" show-overflow-tooltip :formatter="formatMainObject"/>
+        <el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
+        <el-table-column prop="invstatus" label="单据状态" show-overflow-tooltip :formatter="formatInvsName" />
+        <el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatMainName" />
+        <el-table-column prop="plan_start_date" label="计划保养日期" width="150px" />
+        <el-table-column prop="input_optname" label="创建人" />
+        <el-table-column prop="input_time" label="创建时间" width="150px" />
+        <el-table-column prop="update_optname" label="保养人" />
+        <el-table-column prop="real_start_date" label="开始时间" width="150px" />
+        <el-table-column prop="real_end_date" label="结束时间" width="150px" />
+        <el-table-column prop="confirm_optname" label="确认人" />
+        <el-table-column prop="confirm_time" label="确认时间" width="150px" />
+        <el-table-column prop="audit_optname" label="审核人" />
+        <el-table-column prop="audit_time" label="审核时间" width="150px" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <ExecuteDialog :dialog-show.sync="executeDialog" :open-param="openParam" />
+    <StartDialog :dialog-show.sync="startDialog" :open-param="openParam" />
+  </div>
+</template>
+
+<script>
+import crudDevicemaintenancemst from '@/api/wms/sb/devicemaintenancemst'
+import CRUD, { presenter, header, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import crudClassstandard from '@/api/wms/basedata/master/classstandard'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
+import DateRangePicker from '@/components/DateRangePicker'
+import ExecuteDialog from '@/views/wms/sb/upkeep/devicemaintenancepagrid/ExecuteDialog'
+import StartDialog from '@/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog'
+
+export default {
+  name: 'Devicemaintenancepagrid',
+  dicts: ['EM_DEVICE_BY_INVSTATUS', 'EM_DEVICE_BY_INVTYPE', 'EM_DEVICE_MAINT_OBJECT'],
+  components: { ExecuteDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect, DateRangePicker, StartDialog },
+  mixins: [presenter(), header(), crud()],
+  cruds() {
+    return CRUD({
+      title: '保养单填报',
+      url: 'api/devicemaintenancemst/query5',
+      idField: 'maint_id',
+      sort: 'maint_id,desc',
+      crudMethod: { ...crudDevicemaintenancemst },
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        download: false,
+        reset: true
+      }
+    })
+  },
+  data() {
+    return {
+      start_flag: true,
+      execu_flag: true,
+      end_flag: true,
+      confirm_flag: true,
+      classes: [],
+      class_idStr: null,
+      materOpt_code: '23',
+      openParam: null,
+      executeDialog: false,
+      startDialog: false,
+      permission: {
+      }
+    }
+  },
+  created() {
+    const param = {
+      'materOpt_code': this.materOpt_code
+    }
+    crudMaterialbase.getMaterOptType(param).then(res => {
+      this.class_idStr = res.class_idStr
+      this.crud.query.class_idStr = this.class_idStr
+      this.crud.toQuery()
+      this.queryClassId()
+    })
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    hand(value) {
+      this.crud.toQuery()
+    },
+    formatMainObject(row, cloum) {
+      return this.dict.label.EM_DEVICE_MAINT_OBJECT[row.maint_object]
+    },
+    formatInvsName(row, cloum) {
+      return this.dict.label.EM_DEVICE_BY_INVSTATUS[row.invstatus]
+    },
+    formatMainName(row, cloum) {
+      return this.dict.label.EM_DEVICE_BY_INVTYPE[row.maintenancecycle]
+    },
+    loadClass({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    },
+    queryClassId() {
+      const param = {
+        'class_idStr': this.class_idStr
+      }
+      crudClassstandard.queryClassById(param).then(res => {
+        this.classes = res.content.map(obj => {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
+    },
+    startMaintain() {
+      const _selectData = this.$refs.table.selection
+      const data = _selectData[0]
+      if (data.invstatus !== '02') {
+        return this.crud.notify('只能对提交状态的单据开始', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      this.openParam = data
+      this.startDialog = true
+    },
+    endMaintain() {
+      const _selectData = this.$refs.table.selection
+      const data = _selectData[0]
+      if (data.invstatus !== '03') {
+        return this.crud.notify('只能对开始状态的单据结束', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      crudDevicemaintenancemst.getDtl(data).then(res => {
+        this.openParam = {
+          'form': data,
+          'tableData': res
+        }
+        this.executeDialog = true
+      })
+      // crudDevicemaintenancemst.endMaintain(data).then(res => {
+      //   this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      //   this.crud.toQuery()
+      // })
+    },
+    executeMaintain() {
+      const _selectData = this.$refs.table.selection
+      const data = _selectData[0]
+      if (data.invstatus !== '03') {
+        return this.crud.notify('只能对开始状态的单据执行', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      crudDevicemaintenancemst.getDtl(data).then(res => {
+        this.openParam = {
+          'form': data,
+          'tableData': res
+        }
+        this.executeDialog = true
+      })
+    },
+    confirmMaintain() {
+      const _selectData = this.$refs.table.selection
+      const data = _selectData[0]
+      if (data.invstatus !== '04') {
+        return this.crud.notify('只能对结束状态的单据确认', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      crudDevicemaintenancemst.confirmMaintain(data).then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
+    },
+    mySelectionChange(rows) {
+      this.buttonChange(rows)
+    },
+    // 处理按钮是否显示
+    buttonChange(rows) {
+      if (rows.length !== 0) {
+        this.start_flag = false
+        this.execu_flag = false
+        this.end_flag = false
+        this.confirm_flag = false
+        for (let i = 0; i < rows.length; i++) {
+          if ('01,03,04,05,99'.includes(rows[i].invstatus)) {
+            this.start_flag = true
+          }
+          if ('01,02,04,05,99'.includes(rows[i].invstatus)) {
+            this.execu_flag = true
+          }
+          if ('01,02,04,05,99'.includes(rows[i].invstatus)) {
+            this.end_flag = true
+          }
+          // if ('01,02,03,05,99'.includes(rows[i].invstatus)) {
+          //   this.confirm_flag = true
+          // }
+          if (rows[i].maint_object !== '02') {
+            this.confirm_flag = true
+          }
+          if (rows.length > 1) {
+            this.handleCurrentChange()
+          }
+        }
+      } else {
+        this.handleCurrentChange()
+      }
+    },
+    handleCurrentChange() {
+      this.start_flag = true
+      this.execu_flag = true
+      this.end_flag = true
+      this.confirm_flag = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/AddDialog.vue

@@ -65,7 +65,24 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="18">
+        <el-col :span="6">
+          <el-form-item label="保养对象" prop="maint_object">
+            <el-select
+              v-model="form.maint_object"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in dict.EM_DEVICE_MAINT_OBJECT"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="备注" prop="remark">
             <el-input v-model="form.remark" style="width: 580px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
           </el-form-item>
@@ -133,7 +150,7 @@
     </el-card>
 
     <DeviceDialog :dialog-show.sync="deviceDialog" :is-single="true" @tableChanged2="tableChanged2"/>
-    <ItemDialog :dialog-show.sync="itemDialog" :is-single="false" @tableChanged1="tableChanged1"/>
+    <ItemDialog :dialog-show.sync="itemDialog" :is-single="false" :open-param="openParam" @tableChanged1="tableChanged1"/>
   </el-dialog>
 </template>
 
@@ -141,6 +158,8 @@
 
 const defaultForm = {
   maint_plan_code: null,
+  material_type_id: null,
+  maint_object: null,
   maint_plan_name: null,
   devicerecord_id: null,
   maintenancecycle: null,
@@ -157,7 +176,7 @@ import CRUD, { form, crud } from '@crud/crud'
 
 export default {
   name: 'AddDialog',
-  dicts: ['EM_DEVICE_BY_CYCLE'],
+  dicts: ['EM_DEVICE_BY_CYCLE', 'EM_DEVICE_MAINT_OBJECT'],
   components: { ItemDialog, DeviceDialog },
   mixins: [form(defaultForm), crud()],
   props: {
@@ -193,6 +212,9 @@ export default {
         ],
         devicerecord_id: [
           { required: true, message: '设备不能为空', trigger: 'blur' }
+        ],
+        maint_object: [
+          { required: true, message: '保养对象不能为空', trigger: 'blur' }
         ]
       }
     }
@@ -228,6 +250,7 @@ export default {
       this.deviceDialog = true
     },
     putItem() {
+      this.openParam = this.form
       this.itemDialog = true
     },
     formatLevel(row, cloum) {
@@ -260,7 +283,8 @@ export default {
     },
     tableChanged2(row) {
       this.form.devicerecord_id = row.devicerecord_id
-      this.form.device_code = row.device_code
+      this.form.device_code = row.device_name + '-' + row.device_code
+      this.form.material_type_id = row.material_type_id
     },
     delRow(index, rows) {
       rows.splice(index, 1)

mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/CopyAddDialog.vue

@@ -68,7 +68,24 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="18">
+        <el-col :span="6">
+          <el-form-item label="保养对象" prop="maint_object">
+            <el-select
+              v-model="form1.maint_object"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in dict.EM_DEVICE_MAINT_OBJECT"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="备注" prop="remark">
             <el-input v-model="form1.remark" style="width: 580px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
           </el-form-item>
@@ -125,7 +142,7 @@
     </el-card>
 
     <DeviceDialog :dialog-show.sync="deviceDialog" :is-single="true" @tableChanged2="tableChanged2"/>
-    <ItemDialog :dialog-show.sync="itemDialog" :is-single="false" @tableChanged1="tableChanged1"/>
+    <ItemDialog :dialog-show.sync="itemDialog" :is-single="false" :open-param="openParam" @tableChanged1="tableChanged1"/>
 
   </el-dialog>
 </template>
@@ -138,7 +155,7 @@ import CRUD, { crud } from '@crud/crud'
 
 export default {
   name: 'CopyAddDialog',
-  dicts: ['EM_DEVICE_BY_CYCLE'],
+  dicts: ['EM_DEVICE_BY_CYCLE', 'EM_DEVICE_MAINT_OBJECT'],
   components: { ItemDialog, DeviceDialog },
   mixins: [crud()],
   props: {
@@ -189,6 +206,7 @@ export default {
       this.crud.toQuery()
     },
     putDevice() {
+      this.openParam = this.form1
       this.deviceDialog = true
     },
     putItem() {
@@ -224,12 +242,14 @@ export default {
     },
     tableChanged2(row) {
       this.form1.devicerecord_id = row.devicerecord_id
-      this.form1.device_code = row.device_code
+      this.form1.device_code = row.device_name + '-' + row.device_code
+      this.form1.material_type_id = row.material_type_id
     },
     delRow(index, rows) {
       rows.splice(index, 1)
     },
     submit() {
+      debugger
       const data = this.form1
       if (data.maint_plan_name === null) {
         return this.crud.notify('计划名称不能为空', CRUD.NOTIFICATION_TYPE.INFO)
@@ -243,6 +263,9 @@ export default {
       if (data.plan_start_date === null) {
         return this.crud.notify('计划开始日期不能为空', CRUD.NOTIFICATION_TYPE.INFO)
       }
+      if (data.maint_object === '') {
+        return this.crud.notify('保养对象不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+      }
       if (data.tableData.length === 0) {
         return this.crud.notify('明细不能为空', CRUD.NOTIFICATION_TYPE.INFO)
       }

mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/ItemDialog.vue

@@ -6,6 +6,7 @@
     destroy-on-close
     width="1000px"
     @close="close"
+    @open="open"
   >
     <el-form
       :inline="true"
@@ -128,6 +129,9 @@ export default {
     isSingle: {
       type: Boolean,
       default: true
+    },
+    openParam: {
+      type: Object
     }
   },
   data() {
@@ -161,11 +165,14 @@ 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()
     })
   },
   methods: {
+    open() {
+      this.query.material_type_id = this.openParam.material_type_id
+      this.crud.toQuery()
+    },
     clickChange(item) {
       this.tableRadio = item
     },

mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue

@@ -73,6 +73,22 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="保养对象">
+            <el-select
+              v-model="query.maint_object"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.EM_DEVICE_MAINT_OBJECT"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
@@ -111,6 +127,7 @@
         <el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
         <el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
         <el-table-column prop="maintenancecycle" label="保养周期" :formatter="formatMainName"/>
+        <el-table-column prop="maint_object" label="保养对象" :formatter="formatMainObject"/>
         <el-table-column prop="detail_count" label="明细数" />
         <el-table-column prop="plan_start_date" label="计划开始日期" width="150px" />
         <el-table-column prop="real_start_date" label="实际开始日期" width="150px" />
@@ -154,7 +171,7 @@ import CopyAddDialog from '@/views/wms/sb/upkeep/devicemaintenanceplan/CopyAddDi
 
 export default {
   name: 'Devicemaintenanceplan',
-  dicts: ['IS_OR_NOT', 'EM_DEVICE_BY_CYCLE'],
+  dicts: ['IS_OR_NOT', 'EM_DEVICE_BY_CYCLE', 'EM_DEVICE_MAINT_OBJECT'],
   components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect, DateRangePicker, CopyAddDialog },
   mixins: [presenter(), header(), crud()],
   cruds() {
@@ -229,6 +246,9 @@ export default {
     formatMainName(row, cloum) {
       return this.dict.label.EM_DEVICE_BY_CYCLE[row.maintenancecycle]
     },
+    formatMainObject(row, cloum) {
+      return this.dict.label.EM_DEVICE_MAINT_OBJECT[row.maint_object]
+    },
     copyAdd() {
       const _selectData = this.$refs.table.selection
       const data = {