From bcda085984bccc8f3d6d2b9c6498578cc1210f83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Tue, 5 Aug 2025 13:38:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=AE=A1=E6=A0=B8=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/eam/eamWorkOrderForApprove.vue | 13 +++++++------
 src/views/modules/eam/eamWorkOrderForDefect.vue  | 10 +++++-----
 src/views/modules/eam/eamWorkOrderForDefect2.vue | 10 +++++-----
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/views/modules/eam/eamWorkOrderForApprove.vue b/src/views/modules/eam/eamWorkOrderForApprove.vue
index 9886d11..c126c9b 100644
--- a/src/views/modules/eam/eamWorkOrderForApprove.vue
+++ b/src/views/modules/eam/eamWorkOrderForApprove.vue
@@ -205,6 +205,7 @@
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
         <el-button type="primary" @click="submitModel(1)">通过</el-button>
         <el-button type="primary" @click="submitModel(2)">退回</el-button>
+        <el-button  @click="submitModelFlag = false">取消</el-button>
       </el-footer>
     </el-dialog>
 
@@ -1550,12 +1551,6 @@
       },
       // 确认审核
       submitModel (param) {
-        if (this.submitData.difficultyLevel === ''||this.submitData.difficultyLevel == null) {
-          this.$alert('请选择难度等级！', '提示', {
-            confirmButtonText: '确定'
-          })
-          return false
-        }
         // submitDefect(this.submitData).then(({data}) => {
         //   if (data && data.code === 0) {
         //     this.getDataList()
@@ -1574,6 +1569,12 @@
         //   }
         // })
         if (param === 1) {
+          if (this.submitData.difficultyLevel === ''||this.submitData.difficultyLevel == null) {
+            this.$alert('请选择难度等级！', '提示', {
+              confirmButtonText: '确定'
+            })
+            return false
+          }
           submitDefect(this.submitData).then(({data}) => {
             if (data && data.code === 0) {
               this.getDataList()
diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue
index c59a051..63f05d0 100644
--- a/src/views/modules/eam/eamWorkOrderForDefect.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect.vue
@@ -216,7 +216,7 @@
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
         <el-button type="primary" @click="submitModel(1)">通过</el-button>
         <el-button type="primary" @click="submitModel(2)">退回</el-button>
-<!--        <el-button type="primary" @click="submitModelFlag = false">取消</el-button>-->
+        <el-button @click="submitModelFlag = false">取消</el-button>
       </el-footer>
     </el-dialog>
 
@@ -2186,11 +2186,11 @@ export default {
 
     // 确认审核
     submitModel (param) {
-      if (this.submitData.difficultyLevel === '' || this.submitData.difficultyLevel == null) {
-        this.$message.warning('请选择难度等级！')
-        return
-      }
       if (param === 1) {
+        if (this.submitData.difficultyLevel === '' || this.submitData.difficultyLevel == null) {
+          this.$message.warning('请选择难度等级！')
+          return
+        }
         submitDefect(this.submitData).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()
diff --git a/src/views/modules/eam/eamWorkOrderForDefect2.vue b/src/views/modules/eam/eamWorkOrderForDefect2.vue
index 23aae3e..1391c8e 100644
--- a/src/views/modules/eam/eamWorkOrderForDefect2.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect2.vue
@@ -216,7 +216,7 @@
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
         <el-button type="primary" @click="submitModel(1)">通过</el-button>
         <el-button type="primary" @click="submitModel(2)">退回</el-button>
-<!--        <el-button type="primary" @click="submitModelFlag = false">取消</el-button>-->
+        <el-button  @click="submitModelFlag = false">取消</el-button>
       </el-footer>
     </el-dialog>
 
@@ -2188,11 +2188,11 @@ export default {
 
     // 确认审核
     submitModel (param) {
-      if (this.submitData.difficultyLevel === '' || this.submitData.difficultyLevel == null) {
-        this.$message.warning('请选择难度等级！')
-        return
-      }
       if (param === 1) {
+        if (this.submitData.difficultyLevel === '' || this.submitData.difficultyLevel == null) {
+          this.$message.warning('请选择难度等级！')
+          return
+        }
         submitDefect(this.submitData).then(({data}) => {
           if (data && data.code === 0) {
             this.getDataList()