From e0bb3bfe3cbe216eb398490de7569445ca5df14d Mon Sep 17 00:00:00 2001 From: qismyq Date: Tue, 24 Oct 2023 14:59:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E7=A8=BD=E6=A0=B8=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=AE=BE=E5=A4=87=E6=88=96=E8=80=85=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E6=97=B6=E7=9B=AE=E6=A0=87=E5=80=BCinput=E6=A1=86?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E5=86=85=E5=AE=B9=202.=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E5=BC=B9=E7=AA=97=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/erp/ZSelectEquipmentBasics.vue | 2 ++ .../audit/apply/modules/EquipmentAuditModal.vue | 5 +++-- .../modules/EquipmentCheckDetailModal.vue | 10 +++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/components/erp/ZSelectEquipmentBasics.vue b/src/components/erp/ZSelectEquipmentBasics.vue index 98f4f37c..ff9d45e4 100644 --- a/src/components/erp/ZSelectEquipmentBasics.vue +++ b/src/components/erp/ZSelectEquipmentBasics.vue @@ -5,6 +5,7 @@ placeholder="请选择设备" readOnly :disabled="disabled" + enterButton @search="onSearchEquipment"> @@ -47,6 +48,7 @@ export default { }, methods: { onSearchEquipment() { + console.log(11111) this.$refs.selectModal.show() }, selectOK(idstr, row) { diff --git a/src/pages/erp/equipment/audit/apply/modules/EquipmentAuditModal.vue b/src/pages/erp/equipment/audit/apply/modules/EquipmentAuditModal.vue index b48724da..41d336c8 100644 --- a/src/pages/erp/equipment/audit/apply/modules/EquipmentAuditModal.vue +++ b/src/pages/erp/equipment/audit/apply/modules/EquipmentAuditModal.vue @@ -33,8 +33,8 @@ - - + + @@ -206,6 +206,7 @@ export default { }, changeType(val) { this.targetType = val + this.form.targetId = '' }, areaChange(val, path, area) { this.form.targetId = area.id diff --git a/src/pages/erp/equipment/spotcheck/checkCategory/modules/EquipmentCheckDetailModal.vue b/src/pages/erp/equipment/spotcheck/checkCategory/modules/EquipmentCheckDetailModal.vue index 3d329f2c..f912711e 100644 --- a/src/pages/erp/equipment/spotcheck/checkCategory/modules/EquipmentCheckDetailModal.vue +++ b/src/pages/erp/equipment/spotcheck/checkCategory/modules/EquipmentCheckDetailModal.vue @@ -91,11 +91,11 @@ - - - - - + + + + + -- Gitee From 8726dce87ffa2a30cc5bb6142a7729d76b33e7cb Mon Sep 17 00:00:00 2001 From: qismyq Date: Mon, 4 Dec 2023 17:01:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=82=B9=E6=A3=80=E4=BF=9D=E5=85=BBfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/equipment/audit/apply/EquipmentAuditList.vue | 2 +- .../checkPlan/EquipmentCheckPlanDetailList.vue | 10 +++++----- .../modules/EquipmentCheckPlanDetailModal.vue | 10 +++++----- .../checkPlan/modules/EquipmentCheckPlanModal.vue | 3 ++- .../checkTask/EquipmentCheckTaskDetailList.vue | 10 +++++----- .../modules/EquipmentCheckTaskDetailModal.vue | 10 +++++----- .../upkeep/plan/EquipmentUpkeepPlanDetailList.vue | 2 +- .../plan/modules/EquipmentUpkeepPlanDetailModal.vue | 10 +++++----- .../upkeep/task/EquipmentUpkeepTaskDetailList.vue | 4 ++-- .../task/modules/EquipmentUpkeepTaskDetailModal.vue | 10 +++++----- 10 files changed, 36 insertions(+), 35 deletions(-) diff --git a/src/pages/erp/equipment/audit/apply/EquipmentAuditList.vue b/src/pages/erp/equipment/audit/apply/EquipmentAuditList.vue index e2a7ab9e..9993342b 100644 --- a/src/pages/erp/equipment/audit/apply/EquipmentAuditList.vue +++ b/src/pages/erp/equipment/audit/apply/EquipmentAuditList.vue @@ -89,7 +89,7 @@ 详情 - + 删除 diff --git a/src/pages/erp/equipment/spotcheck/checkPlan/EquipmentCheckPlanDetailList.vue b/src/pages/erp/equipment/spotcheck/checkPlan/EquipmentCheckPlanDetailList.vue index 7066d0a3..f1f261d3 100644 --- a/src/pages/erp/equipment/spotcheck/checkPlan/EquipmentCheckPlanDetailList.vue +++ b/src/pages/erp/equipment/spotcheck/checkPlan/EquipmentCheckPlanDetailList.vue @@ -141,11 +141,11 @@ export default { title: '估计用时(分钟)', field: 'evaluateTime' }, - { - title: '标准图片', - field: 'pic'/* , - slots: { default: 'img' } */ - }, + // { + // title: '标准图片', + // field: 'pic'/* , + // slots: { default: 'img' } */ + // }, { title: '操作', field: 'operation', width: 120, fixed: 'right', slots: { default: 'action' }} ], url: { diff --git a/src/pages/erp/equipment/spotcheck/checkPlan/modules/EquipmentCheckPlanDetailModal.vue b/src/pages/erp/equipment/spotcheck/checkPlan/modules/EquipmentCheckPlanDetailModal.vue index d7897dfe..c1e47bce 100644 --- a/src/pages/erp/equipment/spotcheck/checkPlan/modules/EquipmentCheckPlanDetailModal.vue +++ b/src/pages/erp/equipment/spotcheck/checkPlan/modules/EquipmentCheckPlanDetailModal.vue @@ -88,11 +88,11 @@ - - - - - + + + + + diff --git a/src/pages/erp/equipment/spotcheck/checkPlan/modules/EquipmentCheckPlanModal.vue b/src/pages/erp/equipment/spotcheck/checkPlan/modules/EquipmentCheckPlanModal.vue index 2cf34241..d38fba4b 100644 --- a/src/pages/erp/equipment/spotcheck/checkPlan/modules/EquipmentCheckPlanModal.vue +++ b/src/pages/erp/equipment/spotcheck/checkPlan/modules/EquipmentCheckPlanModal.vue @@ -96,7 +96,7 @@ @@ -212,6 +212,7 @@ export default { }, departChange(value, row) { this.form.targetName = row.deptName + this.form.target = row.id }, validateDuplicate: debounce(function(rule, value, callback) { if (!value || this.editType === 'edit') { diff --git a/src/pages/erp/equipment/spotcheck/checkTask/EquipmentCheckTaskDetailList.vue b/src/pages/erp/equipment/spotcheck/checkTask/EquipmentCheckTaskDetailList.vue index 8b287eb1..c929bb6d 100644 --- a/src/pages/erp/equipment/spotcheck/checkTask/EquipmentCheckTaskDetailList.vue +++ b/src/pages/erp/equipment/spotcheck/checkTask/EquipmentCheckTaskDetailList.vue @@ -143,11 +143,11 @@ export default { title: '估计用时（分钟）', field: 'evaluateTime' }, - { - title: '标准图片', - field: 'pic', - scopedSlots: { customRender: 'imgSlot' } - }, + // { + // title: '标准图片', + // field: 'pic', + // scopedSlots: { customRender: 'imgSlot' } + // }, { title: '实际值', field: 'actualVaule', diff --git a/src/pages/erp/equipment/spotcheck/checkTask/modules/EquipmentCheckTaskDetailModal.vue b/src/pages/erp/equipment/spotcheck/checkTask/modules/EquipmentCheckTaskDetailModal.vue index 32d729ed..f8fff315 100644 --- a/src/pages/erp/equipment/spotcheck/checkTask/modules/EquipmentCheckTaskDetailModal.vue +++ b/src/pages/erp/equipment/spotcheck/checkTask/modules/EquipmentCheckTaskDetailModal.vue @@ -88,11 +88,11 @@ - - - - - + + + + + diff --git a/src/pages/erp/equipment/upkeep/plan/EquipmentUpkeepPlanDetailList.vue b/src/pages/erp/equipment/upkeep/plan/EquipmentUpkeepPlanDetailList.vue index 6bc61028..77c8f5ff 100644 --- a/src/pages/erp/equipment/upkeep/plan/EquipmentUpkeepPlanDetailList.vue +++ b/src/pages/erp/equipment/upkeep/plan/EquipmentUpkeepPlanDetailList.vue @@ -102,7 +102,7 @@ export default { { title: '告警阈值', field: 'warnValue' }, { title: '预警阈值', field: 'earlyWarnValue' }, { title: '估计用时(分钟)', field: 'evaluateTime' }, - { title: '标准图片', field: 'pic', slots: { default: 'downloadImg' }}, + // { title: '标准图片', field: 'pic', slots: { default: 'downloadImg' }}, { title: '操作', field: 'operation', width: 120, fixed: 'right', slots: { default: 'action' }} ], url: { diff --git a/src/pages/erp/equipment/upkeep/plan/modules/EquipmentUpkeepPlanDetailModal.vue b/src/pages/erp/equipment/upkeep/plan/modules/EquipmentUpkeepPlanDetailModal.vue index b64831b5..8208f38a 100644 --- a/src/pages/erp/equipment/upkeep/plan/modules/EquipmentUpkeepPlanDetailModal.vue +++ b/src/pages/erp/equipment/upkeep/plan/modules/EquipmentUpkeepPlanDetailModal.vue @@ -79,11 +79,11 @@ - - - - - + + + + + diff --git a/src/pages/erp/equipment/upkeep/task/EquipmentUpkeepTaskDetailList.vue b/src/pages/erp/equipment/upkeep/task/EquipmentUpkeepTaskDetailList.vue index af9a563e..c4ae8268 100644 --- a/src/pages/erp/equipment/upkeep/task/EquipmentUpkeepTaskDetailList.vue +++ b/src/pages/erp/equipment/upkeep/task/EquipmentUpkeepTaskDetailList.vue @@ -100,9 +100,9 @@ export default { { title: '预警阈值', field: 'earlyWarnValue', width: 100 }, { title: '属性单位', field: 'attributeUnit', formatter: 'dictText', width: 100 }, { title: '估计用时（分钟）', field: 'evaluateTime', width: 100 }, - { title: '标准图片', field: 'pic', slots: { default: 'downloadImg' }, width: 80 }, + // { title: '标准图片', field: 'pic', slots: { default: 'downloadImg' }, width: 80 }, { title: '实际值', field: 'actualVaule', width: 100 }, - { title: '现场图片', field: 'actualPic', slots: { default: 'downloadActualPic' }, width: 80 }, + // { title: '现场图片', field: 'actualPic', slots: { default: 'downloadActualPic' }, width: 80 }, { title: '是否异常', field: 'isAbnormal', formatter: 'dictText', width: 100 }, { title: '异常描述', field: 'abnormalRemark', width: 100 }, { title: '操作', field: 'operation', width: 120, fixed: 'right', slots: { default: 'action' }} diff --git a/src/pages/erp/equipment/upkeep/task/modules/EquipmentUpkeepTaskDetailModal.vue b/src/pages/erp/equipment/upkeep/task/modules/EquipmentUpkeepTaskDetailModal.vue index 58c3c942..f05edc75 100644 --- a/src/pages/erp/equipment/upkeep/task/modules/EquipmentUpkeepTaskDetailModal.vue +++ b/src/pages/erp/equipment/upkeep/task/modules/EquipmentUpkeepTaskDetailModal.vue @@ -79,11 +79,11 @@ - - - - - + + + + + -- Gitee