代码更新

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/rest/DevicerepairmstController.java

@@ -50,6 +50,22 @@ public class DevicerepairmstController {
         return new ResponseEntity<>(devicerepairmstService.query(whereJson, page), HttpStatus.OK);
     }
 
+    @GetMapping("/query3")
+    @Log("查询维修单维护3")
+    @ApiOperation("查询维修单维护3")
+    //@PreAuthorize("@el.check('devicerepairmst:list')")
+    public ResponseEntity<Object> query3(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(devicerepairmstService.query3(whereJson, page), HttpStatus.OK);
+    }
+
+    @GetMapping("/query4")
+    @Log("查询维修单维护4")
+    @ApiOperation("查询维修单维护4")
+    //@PreAuthorize("@el.check('devicerepairmst:list')")
+    public ResponseEntity<Object> query4(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(devicerepairmstService.query4(whereJson, page), HttpStatus.OK);
+    }
+
     @GetMapping("/queryBom")
     @Log("查询备件bom")
     @ApiOperation("查询备件bom")

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/DevicerepairmstService.java

@@ -183,4 +183,23 @@ public interface DevicerepairmstService {
     Map<String, Object> queryBom(Map whereJson, Pageable page);
 
     void createExcel(Map whereJson, HttpServletResponse response);
+
+    /**
+     * 查询数据分页
+     *
+     * @param whereJson 条件
+     * @param page      分页参数
+     * @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);
+
 }

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

@@ -881,4 +881,68 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
 
     }
 
+    @Override
+    public Map<String, Object> query3(Map whereJson, Pageable page) {
+        String device_code = MapUtil.getStr(whereJson, "device_code");
+        String repair_code = MapUtil.getStr(whereJson, "repair_code");
+        String maintenancecycle = MapUtil.getStr(whereJson, "maintenancecycle");
+        String invstatus = MapUtil.getStr(whereJson, "invstatus");
+        String begin_time = MapUtil.getStr(whereJson, "begin_time");
+        String end_time = MapUtil.getStr(whereJson, "end_time");
+        String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
+        String class_idStr = (String) whereJson.get("class_idStr");
+
+        HashMap<String, String> map = new HashMap<>();
+        map.put("flag", "7");
+        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(repair_code)) map.put("repair_code","%"+repair_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_BI_DEVICEREPAIR001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time DESC");
+        return json;
+    }
+
+    @Override
+    public Map<String, Object> query4(Map whereJson, Pageable page) {
+        String device_code = MapUtil.getStr(whereJson, "device_code");
+        String repair_code = MapUtil.getStr(whereJson, "repair_code");
+        String maintenancecycle = MapUtil.getStr(whereJson, "maintenancecycle");
+        String invstatus = MapUtil.getStr(whereJson, "invstatus");
+        String begin_time = MapUtil.getStr(whereJson, "begin_time");
+        String end_time = MapUtil.getStr(whereJson, "end_time");
+        String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
+        String class_idStr = (String) whereJson.get("class_idStr");
+
+        HashMap<String, String> map = new HashMap<>();
+        map.put("flag", "8");
+        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(repair_code)) map.put("repair_code","%"+repair_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_BI_DEVICEREPAIR001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time DESC");
+        return json;
+    }
+
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql

@@ -253,6 +253,116 @@
 		ENDPAGEQUERY
 	ENDIF
 
+	IF 输入.flag = "7"
+		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_DeviceRepairMst 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.invstatus not in ('01')
+
+                OPTION 输入.device_code <> ""
+                    (file.device_code like 输入.device_code or
+                    file.device_name like 输入.device_code)
+                ENDOPTION
+
+                OPTION 输入.repair_code <> ""
+                    (mst.repair_code like 输入.repair_code or
+                    mst.repair_code like 输入.repair_code)
+                ENDOPTION
+
+                OPTION 输入.classIds <> ""
+                    class.class_id in 输入.classIds
+                ENDOPTION
+
+                OPTION 输入.invstatus <> ""
+                    mst.invstatus = 输入.invstatus
+                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
+
+			ENDSELECT
+		ENDPAGEQUERY
+	ENDIF
+
+	IF 输入.flag = "8"
+		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_DeviceRepairMst 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.invstatus in ('03','04','05')
+
+                OPTION 输入.device_code <> ""
+                    (file.device_code like 输入.device_code or
+                    file.device_name like 输入.device_code)
+                ENDOPTION
+
+                OPTION 输入.repair_code <> ""
+                    (mst.repair_code like 输入.repair_code or
+                    mst.repair_code like 输入.repair_code)
+                ENDOPTION
+
+                OPTION 输入.classIds <> ""
+                    class.class_id in 输入.classIds
+                ENDOPTION
+
+                OPTION 输入.invstatus <> ""
+                    mst.invstatus = 输入.invstatus
+                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
+
+			ENDSELECT
+		ENDPAGEQUERY
+	ENDIF
+
 
 
 

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

@@ -50,6 +50,15 @@ public class DevicemaintenancemstController {
         return new ResponseEntity<>(devicemaintenancemstService.query2(whereJson, page), HttpStatus.OK);
     }
 
+
+    @GetMapping("query3")
+    @Log("查询设备保养单")
+    @ApiOperation("查询设备保养单")
+    //@PreAuthorize("@el.check('devicemaintenancemst:list')")
+    public ResponseEntity<Object> query3(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(devicemaintenancemstService.query3(whereJson, page), HttpStatus.OK);
+    }
+
     @PostMapping
     @Log("新增设备保养单")
     @ApiOperation("新增设备保养单")

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

@@ -137,4 +137,13 @@ public interface DevicemaintenancemstService {
      * @param whereJson /
      */
     void createExcel(Map whereJson, HttpServletResponse response);
+
+    /**
+     * 查询数据分页
+     *
+     * @param whereJson 条件
+     * @param page      分页参数
+     * @return Map<String, Object>
+     */
+    Map<String, Object> query3(Map whereJson, Pageable page);
 }

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

@@ -519,4 +519,36 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
 
     }
 
+    @Override
+    public Map<String, Object> query3(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", "4");
+        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 + "%");
+        //处理物料当前节点的所有子节点
+        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), "mst.input_time DESC");
+        return json;
+    }
+
 }

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

@@ -8,7 +8,9 @@ import com.alibaba.fastjson.JSON;
 import lombok.RequiredArgsConstructor;
 import org.nl.exception.BadRequestException;
 import org.nl.modules.security.service.dto.JwtUserDto;
+import org.nl.modules.system.service.DeptService;
 import org.nl.modules.system.util.CodeUtil;
+import org.nl.utils.SpringContextHolder;
 import org.nl.wms.basedata.master.service.ClassstandardService;
 import org.nl.wms.sb.upkeep.service.DevicemaintenanceplanmstService;
 import org.nl.wms.sb.upkeep.service.dto.DevicemaintenanceplanmstDto;
@@ -219,11 +221,25 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> queryDevice(Map whereJson, Pageable page) {
+        DeptService deptService = SpringContextHolder.getBean(DeptService.class);
         String device_code = MapUtil.getStr(whereJson, "device_code");
-
+        // 查询设备档案
         HashMap<String, String> map = new HashMap<>();
         map.put("flag", "2");
         if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%"+device_code+"%");
+
+        String dept_id = MapUtil.getStr(whereJson, "dept_id");
+        if (!StrUtil.isEmpty(dept_id)) {
+            String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id));
+            map.put("deptIds", deptIds);
+        }
+
+        String use_id = MapUtil.getStr(whereJson, "use_id");
+        if (!StrUtil.isEmpty(use_id)) {
+            String useIds = deptService.getChildIdStr(Long.parseLong(use_id));
+            map.put("useIds", useIds);
+        }
+
         JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCEPLAN001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "file.update_time DESC");
         return json;
     }

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

@@ -53,11 +53,15 @@
             	class.class_name,
             	file.device_code,
             	file.device_name,
-            	file.extend_code
+            	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'
@@ -111,7 +115,7 @@
             WHERE
                 mst.is_delete = '0'
                 AND file.is_delete = '0'
-                AND mst.invstatus in (05,99)
+                AND mst.invstatus in ('07','99')
 
                 OPTION 输入.device_code <> ""
                     (file.device_code like 输入.device_code or
@@ -170,5 +174,60 @@
 		ENDQUERY
 	ENDIF
 
+	IF 输入.flag = "4"
+		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.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 输入.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
+
 
 

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

@@ -15,6 +15,8 @@
 	#################################################
 	输入.flag					        TYPEAS s_string
 	输入.classIds					    TYPEAS f_string
+	输入.deptIds					        TYPEAS f_string
+	输入.useIds					        TYPEAS f_string
 	输入.device_code					    TYPEAS s_string
 	输入.maintenancecycle			    TYPEAS s_string
 	输入.maint_plan_id				    TYPEAS s_string
@@ -101,11 +103,15 @@
 			SELECT
             	file.*,
             	class.class_name,
-            	work.workprocedure_name
+            	work.workprocedure_name,
+                d1.name AS dept_name,
+                d2.name AS use_name
             FROM
             	EM_BI_EquipmentFile file
             	LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
             	LEFT JOIN pdm_bi_workprocedure work ON file.workprocedure_id = work.workprocedure_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
                 file.is_delete = '0'
                 AND file.status not in (90,91)
@@ -115,6 +121,14 @@
                     file.device_name like 输入.device_code)
                 ENDOPTION
 
+               OPTION 输入.deptIds <> ""
+                    d1.dept_id in 输入.deptIds
+                ENDOPTION
+
+                OPTION 输入.useIds <> ""
+                    d2.dept_id in 输入.useIds
+                ENDOPTION
+
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF

mes/qd/src/views/wms/sb/re/specialaccount/index.vue

@@ -244,9 +244,10 @@ export default {
       const vnowDate = b + c + x
       // 将字符串转换成int类型进行相减
       const a = parseInt(vDateStr) - parseInt(vnowDate)
+      debugger
       // 进行比较符合条件表格就变化颜色
       const stylejson = {}
-      if (a < 15) {
+      if (a < 30) {
         stylejson.background = '#e0838f'
         stylejson.color = 'green'
         return stylejson

mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue

@@ -152,6 +152,8 @@
         <el-table-column prop="repair_code" label="维修单号" width="120px" show-overflow-tooltip />
         <el-table-column prop="device_code" label="设备编码" width="120px" 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="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
         <el-table-column prop="invstatus" label="单据状态" :formatter="formatStatusName"/>
         <el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatTypeName"/>
@@ -204,7 +206,7 @@ export default {
   cruds() {
     return CRUD({
       title: '维修单填报',
-      url: 'api/devicerepairmst',
+      url: 'api/devicerepairmst/query3',
       idField: 'repair_id',
       sort: 'repair_id,desc',
       crudMethod: { ...crudDevicerepairmst },

mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue

@@ -158,7 +158,7 @@ export default {
   cruds() {
     return CRUD({
       title: '委外维修',
-      url: 'api/devicerepairmst',
+      url: 'api/devicerepairmst/query4',
       idField: 'repair_id',
       sort: 'repair_id,desc',
       crudMethod: { ...crudDevicerepairmst },

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

@@ -130,6 +130,8 @@
         <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="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" />
@@ -173,7 +175,7 @@ export default {
   cruds() {
     return CRUD({
       title: '保养单填报',
-      url: 'api/devicemaintenancemst',
+      url: 'api/devicemaintenancemst/query3',
       idField: 'maint_id',
       sort: 'maint_id,desc',
       crudMethod: { ...crudDevicemaintenancemst },

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

@@ -23,6 +23,24 @@
           @keyup.enter.native="crud.toQuery"
         />
       </el-form-item>
+      <el-form-item label="所属部门">
+        <treeselect
+          v-model="query.dept_id"
+          :load-options="loadDepts"
+          :options="depts"
+          style="width: 200px;"
+          placeholder="请选择"
+        />
+      </el-form-item>
+      <el-form-item label="使用班组">
+        <treeselect
+          v-model="query.use_id"
+          :load-options="loadDepts"
+          :options="depts"
+          style="width: 200px;"
+          placeholder="请选择"
+        />
+      </el-form-item>
       <rrOperation />
     </el-form>
 
@@ -50,6 +68,8 @@
       <el-table-column prop="device_name" label="设备名称" min-width="130" show-overflow-tooltip />
       <el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
       <el-table-column prop="class_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="device_spec" label="规格" min-width="130" show-overflow-tooltip />
       <el-table-column prop="device_model" label="型号" show-overflow-tooltip />
       <el-table-column prop="supplier_name" label="供应商" show-overflow-tooltip />
@@ -73,10 +93,13 @@ import CRUD, { header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
 import crudDevicemaintenanceplanmst from '@/api/wms/sb/devicemaintenanceplanmst'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { getDepts } from '@/api/system/dept'
 
 export default {
   name: 'Device',
-  components: { rrOperation, pagination },
+  components: { rrOperation, pagination, Treeselect },
   cruds() {
     return CRUD({
       title: '设备',
@@ -99,6 +122,8 @@ export default {
       dialogVisible: false,
       tableRadio: null,
       checkrow: null,
+      class_idStr: null,
+      depts: [],
       rows: [],
       XLList: []
     }
@@ -110,6 +135,9 @@ export default {
       }
     }
   },
+  created() {
+    this.getDepts()
+  },
   methods: {
     clickChange(item) {
       this.tableRadio = item
@@ -155,6 +183,32 @@ export default {
       this.crud.resetQuery(false)
       this.$emit('update:dialogShow', false)
       this.$emit('tableChanged2', this.rows)
+    },
+    // 获取弹窗内部门数据
+    loadDepts({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        getDepts({ enabled: true, pid: parentNode.id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 200)
+        })
+      }
+    },
+    getDepts() {
+      getDepts({ enabled: true }).then(res => {
+        this.depts = res.content.map(function(obj) {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
     }
   }
 }