From d55fef9c7205b412cadc99c2bb2dea9329b7a2c9 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期三, 31 七月 2024 09:39:19 +0800 Subject: [PATCH] 1、公司级与分厂级看板调整OEE图表样式 2、各看板中的饼图图表增加随分辨率变化而改变自身半径功能,从而更清晰的展示内容标题指示箭头 3、OEE综合效率分析页面新增车间字段 --- src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue b/src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue index 5d3d0eb..a876e96 100644 --- a/src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue +++ b/src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue @@ -127,12 +127,12 @@ validatorRules: { auditFeedback: { rules: [ - { required: true, message: '璇疯緭鍏ュ鏍告剰瑙�!' }, + { required: false, message: '璇疯緭鍏ュ鏍告剰瑙�!' }, ] }, approvalFeedback: { rules: [ - { required: true, message: '璇疯緭鍏ュ鎵规剰瑙�!' }, + { required: false, message: '璇疯緭鍏ュ鎵规剰瑙�!' }, ] }, }, @@ -157,7 +157,9 @@ this.model = Object.assign({}, record); this.visible = true; this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'num', 'auditFeedback', 'approvalFeedback')); + this.form.setFieldsValue(pick(this.model, 'num')); + this.form.setFieldsValue({ auditFeedback: "" }); + this.form.setFieldsValue({ approvalFeedback: "" }); }, 200); }, @@ -171,10 +173,13 @@ let formData = Object.assign(this.model, values); if (this.model.approvalStatus == '1') { formData.approvalStatus = '2' + formData.disUda2 = "椹冲洖" } else if (this.model.approvalStatus == '3') { formData.approvalStatus = '4' + formData.disUda3 = "椹冲洖" } else if (this.model.approvalStatus == '4') { formData.approvalStatus = '2' + formData.disUda2 = "椹冲洖" } requestPut(this.url.auditApproval, formData, { id: this.model.id }).then((res) => { if (res.success) { @@ -200,12 +205,16 @@ let formData = Object.assign(this.model, values); if (this.model.approvalStatus == '1') { formData.approvalStatus = '3' + formData.disUda2 = "閫氳繃" } else if (this.model.approvalStatus == '2') { formData.approvalStatus = '3' + formData.disUda2 = "閫氳繃" } else if (this.model.approvalStatus == '3') { formData.approvalStatus = '5' + formData.disUda3 = "閫氳繃" } else if (this.model.approvalStatus == '4') { formData.approvalStatus = '3' + formData.disUda2 = "閫氳繃" } requestPut(this.url.auditApproval, formData, { id: this.model.id }).then((res) => { if (res.success) { -- Gitblit v1.9.3