From d13b7e6b3be44457be036d4b850d9010373542b1 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Sat, 8 Feb 2025 14:02:15 +0800
Subject: [PATCH] =?UTF-8?q?2025-02-08=20=E7=BB=B4=E4=BF=AE=E7=A1=AE?=
=?UTF-8?q?=E8=AE=A4=E6=96=B0=E5=A2=9E=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/main-sidebar.vue | 5 ++--
.../modules/eam/eamWorkOrderForDefect.vue | 29 ++++++++++++++++---
.../reportWorkOrder/reportDefectOrder.vue | 2 +-
3 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue
index 8c49048..a5396c2 100644
--- a/src/views/main-sidebar.vue
+++ b/src/views/main-sidebar.vue
@@ -8,8 +8,9 @@
:collapseTransition="false"
class="site-sidebar__menu">
diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue
index 5b879a1..a43e1a0 100644
--- a/src/views/modules/eam/eamWorkOrderForDefect.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect.vue
@@ -399,14 +399,27 @@
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
保存
关闭
@@ -1178,6 +1191,8 @@
orderNo: '',
functionType: '',
confirmResult: '',
+ confirmAssessment: '',
+ confirmRemark: '',
confirmBy: ''
},
confirmDefectModal: false
@@ -1593,6 +1608,8 @@
planID: row.planID,
functionType: row.functionType,
confirmResult: 'Y',
+ confirmAssessment: '优秀',
+ confirmRemark: '',
confirmBy: this.$store.state.user.name
}
this.confirmDefectModal = true
@@ -1601,7 +1618,11 @@
// 确认结果
confirmDefectOrder () {
if (this.confirmData.confirmResult === '' || this.confirmData.confirmResult == null) {
- this.$message.warning('请选择维修结果！')
+ this.$message.warning('请选择确认结果！')
+ return
+ }
+ if (this.confirmData.confirmAssessment === '' || this.confirmData.confirmAssessment == null) {
+ this.$message.warning('请选择维修评估！')
return
}
confirmDefectOrder(this.confirmData).then(({data}) => {
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
index 8ac1c05..72e511e 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
@@ -45,7 +45,7 @@
-
+