From 82f3c53bea71625b884e5902f005f817765971a8 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 17 May 2024 16:32:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=200517=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ApprovalFlow/deviceChangeOrderDestroy.vue | 11 ++++++++---
src/components/ApprovalFlow/index.vue | 11 ++++++++---
src/views/dev/deviceRepairApplyHall.vue | 12 +++++-------
src/views/dev/js/deviceRepairApplyHall.js | 8 ++++++--
4 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/src/components/ApprovalFlow/deviceChangeOrderDestroy.vue b/src/components/ApprovalFlow/deviceChangeOrderDestroy.vue
index 014e0f0d..882dba92 100644
--- a/src/components/ApprovalFlow/deviceChangeOrderDestroy.vue
+++ b/src/components/ApprovalFlow/deviceChangeOrderDestroy.vue
@@ -22,9 +22,14 @@
'待审核' : activity.approvalStatus == 3 ? '通过' : activity.approvalStatus == 4 ? '拒绝' : '审核中'
}}
-
- 审批意见：{{ activity.approvalOpinion }}
-
+
+
+ 审批意见：{{ activity.approvalOpinion }}
+
+
+ 审核
+
+
diff --git a/src/components/ApprovalFlow/index.vue b/src/components/ApprovalFlow/index.vue
index 35465cb5..15394789 100644
--- a/src/components/ApprovalFlow/index.vue
+++ b/src/components/ApprovalFlow/index.vue
@@ -22,9 +22,14 @@
'待审核' : activity.approvalStatus == 3 ? '通过' : activity.approvalStatus == 4 ? '拒绝' : '审核中'
}}
-
- 审批意见：{{ activity.approvalOpinion }}
-
+
+
+ 审批意见：{{ activity.approvalOpinion }}
+
+
+ 审核
+
+
diff --git a/src/views/dev/deviceRepairApplyHall.vue b/src/views/dev/deviceRepairApplyHall.vue
index 8b9f2a55..525720c9 100644
--- a/src/views/dev/deviceRepairApplyHall.vue
+++ b/src/views/dev/deviceRepairApplyHall.vue
@@ -221,23 +221,21 @@
-
-
+
-
-
-
+
diff --git a/src/views/dev/js/deviceRepairApplyHall.js b/src/views/dev/js/deviceRepairApplyHall.js
index 45083a0b..0cb36b03 100644
--- a/src/views/dev/js/deviceRepairApplyHall.js
+++ b/src/views/dev/js/deviceRepairApplyHall.js
@@ -30,6 +30,7 @@ let diagnosisData = {
repairFlag: true,
innerFlag: true,
repairDeptCode: null,
+ repairUserId: '',
repairUserName: '',
repairUserPhone: '',
diagnosisInfo: '',
@@ -87,7 +88,7 @@ export default {
message: "维修部门不能为空",
trigger: ["change", "blur"]
}],
- repairUserName: [{
+ repairUserId: [{
required: true,
validator: this.repairUserNameValid,
message: "维修人姓名不能为空",
@@ -129,6 +130,9 @@ export default {
repairInfo(row) {
this.repairId = row.repairId
},
+ handleEmployeeSelect(value){
+ this.diagnosisData.repairUserName = this.userlist.find(user => user.userId == value).employeeName;
+ },
commitFunc() {
this.$refs.saveForm.validate(b => {
if (!b) {
@@ -156,7 +160,7 @@ export default {
},
repairUserNameValid(rule, value, callback) {
if (this.diagnosisData?.repairFlag) {
- if (!this.diagnosisData.repairUserName) {
+ if (!this.diagnosisData.repairUserId) {
callback(new Error("维修人姓名不能为空"))
}
}