From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue b/src/views/eam/modules/dailyInspectionStandard/AuditApprovalModal.vue
index 8f89e78..9abab04 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: '璇疯緭鍏ュ鎵规剰瑙�!' },
]
},
},
@@ -171,14 +171,17 @@
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) {
- that.$message.success(res.message);
+ that.$message.success("椹冲洖鎴愬姛锛�");
that.$emit('ok');
} else {
that.$message.warning(res.message);
@@ -200,12 +203,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