From 3e9c5f210a3b10c3db68c6f44b3049f8d6178ddc Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Fri, 15 Sep 2023 21:27:43 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E5=88=BB=E5=AD=97=E8=BE=93=E9=80=81?= =?UTF-8?q?=E7=BA=BF=E4=BB=BB=E5=8A=A1=E4=B8=8B=E5=8F=91=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/sql/0901维护.sql | 2 +- .../deviceFile/equipmentfile/AddDialog.vue | 2 +- .../deviceFile/equipmentfile/index.vue | 2 +- .../device_manage/repair/devicevprs/index.vue | 29 +++++++++++++++++++ .../upkeep/devicemaintenancepa/index.vue | 2 +- .../em/devicefaultclass/index.vue | 2 +- .../em/devicelubricateitems/index.vue | 2 +- .../em/devicemaintain/index.vue | 4 +-- .../em/devicerepairitems/index.vue | 2 +- .../em/devicesportcheckitems/index.vue | 2 +- 10 files changed, 39 insertions(+), 10 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/resources/sql/0901维护.sql b/mes/hd/nladmin-system/src/main/resources/sql/0901维护.sql index eaef5099..cf67c241 100644 --- a/mes/hd/nladmin-system/src/main/resources/sql/0901维护.sql +++ b/mes/hd/nladmin-system/src/main/resources/sql/0901维护.sql @@ -6,8 +6,8 @@ INSERT INTO `hl_one_mes`.`sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, INSERT INTO `hl_one_mes`.`sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1697426251763027968', 'stor_type', '仓库性质', '备件库', '5', 0, NULL, NULL, NULL, NULL, '1694303357524643840', '管理员', '2023-09-01 09:48:49', '1694303357524643840', '管理员', '2023-09-01 09:48:49'); - -- 移库单 + INSERT INTO `hl_one_mes`.`sys_code_rule_detail`(`id`, `type`, `init_value`, `current_value`, `max_value`, `step`, `fillchar`, `format`, `length`, `sort_num`, `remark`, `code_rule_id`, `is_active`, `is_delete`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('bbadbd46d70d411391213d35c7f99c5f', '01', 'YK', 'YK', '', '', '', '', NULL, 1, '', 'c9674fd7ef1e4569a3fb32a05ba511cd', '1', '0', 0, '', '2022-01-06 08:54:58', 0, '', '2022-01-06 08:55:25'); INSERT INTO `hl_one_mes`.`sys_code_rule_detail`(`id`, `type`, `init_value`, `current_value`, `max_value`, `step`, `fillchar`, `format`, `length`, `sort_num`, `remark`, `code_rule_id`, `is_active`, `is_delete`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('af1de297ebe34c059f74b7dc1c462c67', '02', '20230912', '20230912', '', '', '', 'yyyyMMdd', NULL, 2, '', 'c9674fd7ef1e4569a3fb32a05ba511cd', '1', '0', 0, '', '2022-01-06 08:55:31', 0, '', ''); INSERT INTO `hl_one_mes`.`sys_code_rule_detail`(`id`, `type`, `init_value`, `current_value`, `max_value`, `step`, `fillchar`, `format`, `length`, `sort_num`, `remark`, `code_rule_id`, `is_active`, `is_delete`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('bbadbd46d70d411391213d35c7f99c5f', '01', 'YK', 'YK', '', '', '', '', NULL, 1, '', 'c9674fd7ef1e4569a3fb32a05ba511cd', '1', '0', 0, '', '2022-01-06 08:54:58', 0, '', '2022-01-06 08:55:25'); diff --git a/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/AddDialog.vue b/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/AddDialog.vue index 4552cd2b..b17e19b3 100644 --- a/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/AddDialog.vue +++ b/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/AddDialog.vue @@ -365,7 +365,7 @@ export default { }, queryClassId() { const param = { - 'class_idStr': this.class_idStr + 'class_idStr': '2' } crudClassstandard.queryClassById(param).then(res => { this.classes = res.content.map(obj => { diff --git a/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/index.vue b/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/index.vue index 61d6527e..7ff8f1bf 100644 --- a/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/index.vue +++ b/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/index.vue @@ -357,7 +357,7 @@ export default { }, queryClassId() { const param = { - 'class_idStr': this.class_idStr + 'class_idStr': '2' } crudClassstandard.queryClassById(param).then(res => { this.classes = res.content.map(obj => { diff --git a/mes/qd/src/views/wms/device_manage/repair/devicevprs/index.vue b/mes/qd/src/views/wms/device_manage/repair/devicevprs/index.vue index aa8ff758..c79383c0 100644 --- a/mes/qd/src/views/wms/device_manage/repair/devicevprs/index.vue +++ b/mes/qd/src/views/wms/device_manage/repair/devicevprs/index.vue @@ -78,6 +78,7 @@ type="success" icon="el-icon-position" size="mini" + :disabled="is_disabled(crud.selections)" @click="repair" > 维修 @@ -88,6 +89,7 @@ type="success" icon="el-icon-position" size="mini" + :disabled="is_disabled(crud.selections)" @click="notRepair" > 不维修 @@ -315,6 +317,21 @@ export default { [CRUD.HOOK.beforeRefresh]() { return true }, + // 下发按钮禁用条件 + is_disabled(rows) { + debugger + this.checkrows = rows + if (this.checkrows.length == 0){ + return true + } + for (let i = 0; i < this.checkrows.length; i++) { + if (this.checkrows[i].status !=='01'){ + return true + } + } + return false + }, + hand(value) { this.crud.toQuery() }, @@ -371,6 +388,12 @@ export default { this.crud.notify('请勾选需要操作的记录！') return false } + for (let i = 0; i < this.checkrows.length; i++) { + if (this.checkrows[i].status!=='01'){ + this.crud.notify('只能提交生成状态的报修单', CRUD.NOTIFICATION_TYPE.WARNING) + return false + } + } crudDevicerepairrequest.repair({ rows: this.checkrows}).then(res => { this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery() @@ -382,6 +405,12 @@ export default { this.crud.notify('请勾选需要操作的记录！') return false } + for (let i = 0; i < this.checkrows.length; i++) { + if (this.checkrows[i].status!=='01'){ + this.crud.notify('只能提交生成状态的报修单', CRUD.NOTIFICATION_TYPE.WARNING) + return false + } + } crudDevicerepairrequest.notRepair({ rows: this.checkrows}).then(res => { this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery() diff --git a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenancepa/index.vue b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenancepa/index.vue index d28b2506..087973a4 100644 --- a/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenancepa/index.vue +++ b/mes/qd/src/views/wms/device_manage/upkeep/devicemaintenancepa/index.vue @@ -181,7 +181,7 @@ export default { end_flag: true, confirm_flag: true, classes: [], - class_idStr: null, + class_idStr: '2', materOpt_code: '23', openParam: null, executeDialog: false, diff --git a/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/index.vue b/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/index.vue index 8d787805..6f373197 100644 --- a/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/index.vue +++ b/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/index.vue @@ -215,7 +215,7 @@ export default { }, queryClassId() { const param = { - 'class_idStr': this.class_idStr + 'class_idStr': '2' } crudClassstandard.queryClassById(param).then(res => { this.classes = res.content.map(obj => { diff --git a/mes/qd/src/views/wms/masterdata_manage/em/devicelubricateitems/index.vue b/mes/qd/src/views/wms/masterdata_manage/em/devicelubricateitems/index.vue index 8e666333..1d03dac1 100644 --- a/mes/qd/src/views/wms/masterdata_manage/em/devicelubricateitems/index.vue +++ b/mes/qd/src/views/wms/masterdata_manage/em/devicelubricateitems/index.vue @@ -289,7 +289,7 @@ export default { }, queryClassId() { const param = { - 'class_idStr': this.class_idStr + 'class_idStr': '2' } crudClassstandard.queryClassById(param).then(res => { this.classes = res.content.map(obj => { diff --git a/mes/qd/src/views/wms/masterdata_manage/em/devicemaintain/index.vue b/mes/qd/src/views/wms/masterdata_manage/em/devicemaintain/index.vue index 8d1a0a6f..b7d6d9a9 100644 --- a/mes/qd/src/views/wms/masterdata_manage/em/devicemaintain/index.vue +++ b/mes/qd/src/views/wms/masterdata_manage/em/devicemaintain/index.vue @@ -203,7 +203,7 @@ export default { data() { return { classes: [], - class_idStr: null, + class_idStr: '2', materOpt_code: '23', itemLevelList: [ { 'label': '日常', 'value': '01' }, @@ -289,7 +289,7 @@ export default { }, queryClassId() { const param = { - 'class_idStr': this.class_idStr + 'class_idStr': '2' } crudClassstandard.queryClassById(param).then(res => { this.classes = res.content.map(obj => { diff --git a/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/index.vue b/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/index.vue index ecea78cf..e35142f2 100644 --- a/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/index.vue +++ b/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/index.vue @@ -214,7 +214,7 @@ export default { }, queryClassId() { const param = { - 'class_idStr': this.class_idStr + 'class_idStr': '2' } crudClassstandard.queryClassById(param).then(res => { this.classes = res.content.map(obj => { diff --git a/mes/qd/src/views/wms/masterdata_manage/em/devicesportcheckitems/index.vue b/mes/qd/src/views/wms/masterdata_manage/em/devicesportcheckitems/index.vue index 426ed6f7..ff1c4c46 100644 --- a/mes/qd/src/views/wms/masterdata_manage/em/devicesportcheckitems/index.vue +++ b/mes/qd/src/views/wms/masterdata_manage/em/devicesportcheckitems/index.vue @@ -289,7 +289,7 @@ export default { }, queryClassId() { const param = { - 'class_idStr': this.class_idStr + 'class_idStr': '2' } crudClassstandard.queryClassById(param).then(res => { this.classes = res.content.map(obj => {