From c8734d0ac2c08056c04a331fc567305a24f0ee18 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Mon, 23 Oct 2023 14:08:29 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E8=AE=BE=E5=A4=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E4=BA=BA=E5=91=98=E5=8D=95=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rest/DevicelubricatemstController.java | 8 + .../impl/DevicelubricatemstServiceImpl.java | 1 + .../lubricate/wql/EM_BIDEVICELUBRICATE_01.wql | 7 +- .../rest/DevicerepairmstController.java | 8 + .../impl/DevicerepairmstServiceImpl.java | 3 +- .../repair/wql/EM_BI_DEVICEREPAIR_01.wql | 5 + .../rest/DevicesportcheckmstController.java | 9 + .../impl/DevicesportcheckmstServiceImpl.java | 2 + .../wql/EM_BIDEVICESPORTCHECK_01.wql | 7 +- .../rest/DevicemaintenancemstController.java | 8 + .../impl/DevicemaintenancemstServiceImpl.java | 1 + .../upkeep/wql/EM_BIDEVICEMAINTENANCE_01.wql | 8 +- .../impl/StIvtIostorinvCpOutServiceImpl.java | 1 + .../lubricate/devicelubricate/index2.vue | 334 +++++++++++++++++ .../devicelubricateplan/ItemDialog.vue | 10 + .../repair/devicerepair/index2.vue | 332 +++++++++++++++++ .../repair/devicerepairplan/ItemDialog.vue | 12 +- .../sportcheck/devicesportcheck/index2.vue | 334 +++++++++++++++++ .../devicesportcheckplan/ItemDialog.vue | 10 + .../upkeep/devicemaintenance/index2.vue | 336 ++++++++++++++++++ .../devicemaintenanceplan/ItemDialog.vue | 10 + 21 files changed, 1439 insertions(+), 7 deletions(-) create mode 100644 mes/qd/src/views/wms/device_manage/lubricate/devicelubricate/index2.vue create mode 100644 mes/qd/src/views/wms/device_manage/repair/devicerepair/index2.vue create mode 100644 mes/qd/src/views/wms/device_manage/sportcheck/devicesportcheck/index2.vue create mode 100644 mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/index2.vue diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/rest/DevicelubricatemstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/rest/DevicelubricatemstController.java index 31306081..ad0a5732 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/rest/DevicelubricatemstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/rest/DevicelubricatemstController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.common.utils.SecurityUtils; import org.nl.wms.device_manage.lubricate.service.DevicelubricatemstService; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -33,6 +34,13 @@ public class DevicelubricatemstController { public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicelubricatemstService.queryAll(whereJson, page), HttpStatus.OK); } + @GetMapping("/byuser") + @ApiOperation("润滑单维护查询") + public ResponseEntity querybyuser(@RequestParam Map whereJson, Pageable page) { + whereJson.put("update_optname", SecurityUtils.getCurrentNickName()); + whereJson.put("invstatus", "03"); + return new ResponseEntity<>(devicelubricatemstService.queryAll(whereJson, page), HttpStatus.OK); + } @GetMapping("/query") @ApiOperation("润滑单审核查询") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/service/impl/DevicelubricatemstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/service/impl/DevicelubricatemstServiceImpl.java index c9e1bef6..7bbfc30f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/service/impl/DevicelubricatemstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/service/impl/DevicelubricatemstServiceImpl.java @@ -61,6 +61,7 @@ public class DevicelubricatemstServiceImpl implements DevicelubricatemstService map.put("invstatus", invstatus); map.put("begin_time", begin_time); map.put("end_time", end_time); + map.put("update_optname", MapUtil.getStr(whereJson, "update_optname")); if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%" + device_code + "%"); if (ObjectUtil.isNotEmpty(maint_code)) map.put("maint_code", "%" + maint_code + "%"); //处理物料当前节点的所有子节点 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/wql/EM_BIDEVICELUBRICATE_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/wql/EM_BIDEVICELUBRICATE_01.wql index 133e65b6..dfc521af 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/wql/EM_BIDEVICELUBRICATE_01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/wql/EM_BIDEVICELUBRICATE_01.wql @@ -21,6 +21,7 @@ 输入.maint_code TYPEAS s_string 输入.invstatus TYPEAS s_string 输入.begin_time TYPEAS s_string + 输入.update_optname TYPEAS s_string 输入.end_time TYPEAS s_string 输入.maint_object TYPEAS s_string 输入.deptIds TYPEAS f_string @@ -87,6 +88,10 @@ mst.maintenancecycle = 输入.maintenancecycle ENDOPTION + OPTION 输入.update_optname <> "" + mst.update_optname = 输入.update_optname + ENDOPTION + OPTION 输入.begin_time <> "" mst.plan_start_date >= 输入.begin_time ENDOPTION @@ -281,4 +286,4 @@ ENDSELECT ENDPAGEQUERY - ENDIF \ No newline at end of file + ENDIF diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairmstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairmstController.java index 15e6ae61..a1b3c359 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairmstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/rest/DevicerepairmstController.java @@ -9,6 +9,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.anno.Log; import org.nl.common.utils.RedissonUtils; +import org.nl.common.utils.SecurityUtils; import org.nl.wms.device_manage.repair.service.DevicerepairmstService; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -38,6 +39,13 @@ public class DevicerepairmstController { public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicerepairmstService.queryAll(whereJson, page), HttpStatus.OK); } + @GetMapping("/byuser") + @ApiOperation("查询维修单维护") + public ResponseEntity querybyuser(@RequestParam Map whereJson, Pageable page) { + whereJson.put("update_optname", SecurityUtils.getCurrentNickName()); + whereJson.put("invstatus", "03"); + return new ResponseEntity<>(devicerepairmstService.queryAll(whereJson, page), HttpStatus.OK); + } @GetMapping("/query") @ApiOperation("查询维修单维护2") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairmstServiceImpl.java index 2b0753ff..1d5c37fc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairmstServiceImpl.java @@ -84,6 +84,7 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { map.put("invstatus",invstatus); map.put("begin_time",begin_time); map.put("end_time",end_time); + map.put("update_optname",MapUtil.getStr(whereJson, "update_optname")); if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code","%"+device_code+"%"); if (ObjectUtil.isNotEmpty(repair_code)) map.put("repair_code","%"+repair_code+"%"); //处理物料当前节点的所有子节点 @@ -428,13 +429,11 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { private void createIos(JSONObject whereJson) { JSONObject mst = whereJson.getJSONObject("form2"); JSONArray tableDataDtl = mst.getJSONArray("tableDataDtl"); - // 准备参数 mst.put("biz_date", DateUtil.now()); mst.put("tableData", tableDataDtl); mst.put("source_id", whereJson.getString("repair_code")); mst.put("remark", "由维修单创建"); - emBiIostorinvOutService.create(mst); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/wql/EM_BI_DEVICEREPAIR_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/wql/EM_BI_DEVICEREPAIR_01.wql index 4a81e164..1b1e515e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/wql/EM_BI_DEVICEREPAIR_01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/wql/EM_BI_DEVICEREPAIR_01.wql @@ -23,6 +23,7 @@ 输入.begin_time TYPEAS s_string 输入.end_time TYPEAS s_string 输入.device_bom_id TYPEAS s_string + 输入.update_optname TYPEAS s_string 输入.material_id TYPEAS s_string 输入.sparepart_only_id TYPEAS s_string 输入.material_code TYPEAS s_string @@ -95,6 +96,10 @@ mst.maintenancecycle = 输入.maintenancecycle ENDOPTION + OPTION 输入.update_optname <> "" + mst.update_optname = 输入.update_optname + ENDOPTION + OPTION 输入.begin_time <> "" mst.plan_start_date >= 输入.begin_time ENDOPTION diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/rest/DevicesportcheckmstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/rest/DevicesportcheckmstController.java index af719cba..16e01d78 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/rest/DevicesportcheckmstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/rest/DevicesportcheckmstController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.common.utils.SecurityUtils; import org.nl.wms.device_manage.sportcheck.service.DevicesportcheckmstService; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -34,6 +35,14 @@ public class DevicesportcheckmstController { return new ResponseEntity<>(devicesportcheckmstService.queryAll(whereJson, page), HttpStatus.OK); } + @GetMapping("/byuser") + @ApiOperation("查询人员点检单") + public ResponseEntity querybyuser(@RequestParam Map whereJson, Pageable page) { + whereJson.put("update_optname", SecurityUtils.getCurrentNickName()); + whereJson.put("invstatus", "03"); + return new ResponseEntity<>(devicesportcheckmstService.queryAll(whereJson, page), HttpStatus.OK); + } + @GetMapping("/query") @ApiOperation("点检单审核查询") public ResponseEntity query2(@RequestParam Map whereJson, Pageable page) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/service/impl/DevicesportcheckmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/service/impl/DevicesportcheckmstServiceImpl.java index aaacb92f..3f13d86e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/service/impl/DevicesportcheckmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/service/impl/DevicesportcheckmstServiceImpl.java @@ -54,6 +54,7 @@ public class DevicesportcheckmstServiceImpl implements DevicesportcheckmstServic String invstatus = MapUtil.getStr(whereJson, "invstatus"); String begin_time = MapUtil.getStr(whereJson, "begin_time"); String end_time = MapUtil.getStr(whereJson, "end_time"); + String update_optname = MapUtil.getStr(whereJson, "update_optname"); HashMap map = new HashMap<>(); map.put("flag", "1"); @@ -61,6 +62,7 @@ public class DevicesportcheckmstServiceImpl implements DevicesportcheckmstServic map.put("invstatus", invstatus); map.put("begin_time", begin_time); map.put("end_time", end_time); + map.put("update_optname", update_optname); if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%" + device_code + "%"); if (ObjectUtil.isNotEmpty(maint_code)) map.put("maint_code", "%" + maint_code + "%"); //处理物料当前节点的所有子节点 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/wql/EM_BIDEVICESPORTCHECK_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/wql/EM_BIDEVICESPORTCHECK_01.wql index 2623b5eb..e68b9101 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/wql/EM_BIDEVICESPORTCHECK_01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/wql/EM_BIDEVICESPORTCHECK_01.wql @@ -19,6 +19,7 @@ 输入.maintenancecycle TYPEAS s_string 输入.maint_id TYPEAS s_string 输入.maint_code TYPEAS s_string + 输入.update_optname TYPEAS s_string 输入.invstatus TYPEAS s_string 输入.begin_time TYPEAS s_string 输入.end_time TYPEAS s_string @@ -87,6 +88,10 @@ mst.maintenancecycle = 输入.maintenancecycle ENDOPTION + OPTION 输入.update_optname <> "" + mst.update_optname = 输入.update_optname + ENDOPTION + OPTION 输入.begin_time <> "" mst.plan_start_date >= 输入.begin_time ENDOPTION @@ -281,4 +286,4 @@ ENDSELECT ENDPAGEQUERY - ENDIF \ No newline at end of file + ENDIF diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenancemstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenancemstController.java index ad7f154f..f3989ddf 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenancemstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/rest/DevicemaintenancemstController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.common.utils.SecurityUtils; import org.nl.wms.device_manage.upkeep.service.DevicemaintenancemstService; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -34,6 +35,13 @@ public class DevicemaintenancemstController { public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(devicemaintenancemstService.queryAll(whereJson, page), HttpStatus.OK); } + @GetMapping("/byuser") + @ApiOperation("保养单维护查询") + public ResponseEntity querybyuser(@RequestParam Map whereJson, Pageable page) { + whereJson.put("update_optname", SecurityUtils.getCurrentNickName()); + whereJson.put("invstatus", "03"); + return new ResponseEntity<>(devicemaintenancemstService.queryAll(whereJson, page), HttpStatus.OK); + } @GetMapping("/query") @ApiOperation("保养单审核查询") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenancemstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenancemstServiceImpl.java index d5511f4a..a1c17cf3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenancemstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenancemstServiceImpl.java @@ -62,6 +62,7 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ map.put("invstatus", invstatus); map.put("begin_time", begin_time); map.put("end_time", end_time); + map.put("update_optname", MapUtil.getStr(whereJson, "update_optname")); if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%" + device_code + "%"); if (ObjectUtil.isNotEmpty(maint_code)) map.put("maint_code", "%" + maint_code + "%"); //处理物料当前节点的所有子节点 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/wql/EM_BIDEVICEMAINTENANCE_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/wql/EM_BIDEVICEMAINTENANCE_01.wql index e2b2bf32..08711db6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/wql/EM_BIDEVICEMAINTENANCE_01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/wql/EM_BIDEVICEMAINTENANCE_01.wql @@ -19,6 +19,7 @@ 输入.maintenancecycle TYPEAS s_string 输入.maint_id TYPEAS s_string 输入.maint_code TYPEAS s_string + 输入.update_optname TYPEAS s_string 输入.invstatus TYPEAS s_string 输入.begin_time TYPEAS s_string 输入.end_time TYPEAS s_string @@ -87,6 +88,11 @@ mst.maintenancecycle = 输入.maintenancecycle ENDOPTION + + OPTION 输入.update_optname <> "" + mst.update_optname = 输入.update_optname + ENDOPTION + OPTION 输入.begin_time <> "" mst.plan_start_date >= 输入.begin_time ENDOPTION @@ -281,4 +287,4 @@ ENDSELECT ENDPAGEQUERY - ENDIF \ No newline at end of file + ENDIF diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java index bce089d3..a0285f08 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java @@ -575,6 +575,7 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + diff --git a/mes/qd/src/views/wms/device_manage/lubricate/devicelubricateplan/ItemDialog.vue b/mes/qd/src/views/wms/device_manage/lubricate/devicelubricateplan/ItemDialog.vue index 44c48ed3..b7ac63e2 100644 --- a/mes/qd/src/views/wms/device_manage/lubricate/devicelubricateplan/ItemDialog.vue +++ b/mes/qd/src/views/wms/device_manage/lubricate/devicelubricateplan/ItemDialog.vue @@ -171,6 +171,10 @@ export default { methods: { open() { this.query.material_type_id = this.openParam.material_type_id + const data = {} + data.id = this.openParam.material_type_id + data.parent_id = '2' + this.getSubTypes(data) this.crud.toQuery() }, clickChange(item) { @@ -236,6 +240,12 @@ export default { }) } }, + getSubTypes(id) { + crudClassstandard.getClassSuperior2(id).then(res => { + const date = res.content + this.classes = date + }) + }, queryClassId() { const param = { 'class_idStr': '2' diff --git a/mes/qd/src/views/wms/device_manage/repair/devicerepair/index2.vue b/mes/qd/src/views/wms/device_manage/repair/devicerepair/index2.vue new file mode 100644 index 00000000..fb8fa6f9 --- /dev/null +++ b/mes/qd/src/views/wms/device_manage/repair/devicerepair/index2.vue @@ -0,0 +1,332 @@ + + + + + diff --git a/mes/qd/src/views/wms/device_manage/repair/devicerepairplan/ItemDialog.vue b/mes/qd/src/views/wms/device_manage/repair/devicerepairplan/ItemDialog.vue index 5f1a8b43..a0f2d98a 100644 --- a/mes/qd/src/views/wms/device_manage/repair/devicerepairplan/ItemDialog.vue +++ b/mes/qd/src/views/wms/device_manage/repair/devicerepairplan/ItemDialog.vue @@ -137,13 +137,15 @@ export default { crudMaterialbase.getMaterOptType(param).then(res => { this.class_idStr = res.class_idStr this.crud.query.class_idStr = this.class_idStr - this.queryClassId() }) }, methods: { open() { this.query.material_type_id = this.openParam.material_type_id - this.crud.toQuery() + const data = {} + data.id = this.openParam.material_type_id + data.parent_id = '2' + this.getSubTypes(data) }, clickChange(item) { this.tableRadio = item @@ -199,6 +201,12 @@ export default { }) } }, + getSubTypes(id) { + crudClassstandard.getClassSuperior2(id).then(res => { + const date = res.content + this.classes = date + }) + }, queryClassId() { const param = { 'class_idStr': '2' diff --git a/mes/qd/src/views/wms/device_manage/sportcheck/devicesportcheck/index2.vue b/mes/qd/src/views/wms/device_manage/sportcheck/devicesportcheck/index2.vue new file mode 100644 index 00000000..2e3e0594 --- /dev/null +++ b/mes/qd/src/views/wms/device_manage/sportcheck/devicesportcheck/index2.vue @@ -0,0 +1,334 @@ + + + + + diff --git a/mes/qd/src/views/wms/device_manage/sportcheck/devicesportcheckplan/ItemDialog.vue b/mes/qd/src/views/wms/device_manage/sportcheck/devicesportcheckplan/ItemDialog.vue index 7af9fbe0..a8384327 100644 --- a/mes/qd/src/views/wms/device_manage/sportcheck/devicesportcheckplan/ItemDialog.vue +++ b/mes/qd/src/views/wms/device_manage/sportcheck/devicesportcheckplan/ItemDialog.vue @@ -171,6 +171,10 @@ export default { methods: { open() { this.query.material_type_id = this.openParam.material_type_id + const data = {} + data.id = this.openParam.material_type_id + data.parent_id = '2' + this.getSubTypes(data) this.crud.toQuery() }, clickChange(item) { @@ -236,6 +240,12 @@ export default { }) } }, + getSubTypes(id) { + crudClassstandard.getClassSuperior2(id).then(res => { + const date = res.content + this.classes = date + }) + }, queryClassId() { const param = { 'class_idStr': '2' diff --git a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/index2.vue b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/index2.vue new file mode 100644 index 00000000..dff4ffdd --- /dev/null +++ b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/index2.vue @@ -0,0 +1,336 @@ + + + + + diff --git a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/ItemDialog.vue b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/ItemDialog.vue index 3334adad..3c7b3356 100644 --- a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/ItemDialog.vue +++ b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/ItemDialog.vue @@ -171,6 +171,10 @@ export default { methods: { open() { this.query.material_type_id = this.openParam.material_type_id + const data = {} + data.id = this.openParam.material_type_id + data.parent_id = '2' + this.getSubTypes(data) this.crud.toQuery() }, clickChange(item) { @@ -236,6 +240,12 @@ export default { }) } }, + getSubTypes(id) { + crudClassstandard.getClassSuperior2(id).then(res => { + const date = res.content + this.classes = date + }) + }, queryClassId() { const param = { 'class_idStr': '2'