From 9ef45569a87b3472b6083e35d0802f110fcbe86d Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Fri, 4 Jul 2025 14:30:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extensionRequestApproval/index.vue                    | 2 +-
 src/views/pro/apply/supervisorEnterApply.vue              | 2 +-
 src/views/pro/supervisor/admission/index.vue              | 1 +
 src/views/pro/supervisorPersonManage/addPersonnel.vue     | 8 ++++++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue b/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue
index ea93a78..b7caf5e 100644
--- a/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue
+++ b/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue
@@ -259,7 +259,7 @@ export default {
       let title = '整改回传'
       if (type === 1) {
         isApprove = true
-        title = '隐患整改审批'
+        title = '延期申请审批'
       } else if (type === 2) {
         isRectify = true
         title = '整改回传'
diff --git a/src/views/pro/apply/supervisorEnterApply.vue b/src/views/pro/apply/supervisorEnterApply.vue
index 1ea1ddd..154373d 100644
--- a/src/views/pro/apply/supervisorEnterApply.vue
+++ b/src/views/pro/apply/supervisorEnterApply.vue
@@ -1487,7 +1487,7 @@ export default {
                     personType: jsonData[i][6] === '监理负责人' ? '1' : '2',
                     sex: jsonData[i][2] === '男' ? '0' : '1',
                   }
-                  const isDuplicate = this.excelData.some(item => item.arg5 === rowData.arg5)
+                  const isDuplicate = this.excelData.some(item => item.arg5 && item.arg5 === rowData.arg5)
                   if (isDuplicate) {
                     this.errorPhone.push(rowData.arg5)
                   }
diff --git a/src/views/pro/supervisor/admission/index.vue b/src/views/pro/supervisor/admission/index.vue
index e70165f..0d36f4c 100644
--- a/src/views/pro/supervisor/admission/index.vue
+++ b/src/views/pro/supervisor/admission/index.vue
@@ -397,6 +397,7 @@ export default {
     },
     //重置按钮
     resetQuery() {
+      this.queryParams.consName = undefined
       this.loading = true
       this.resetForm('personQueryForm')
       this.handleQuery()
diff --git a/src/views/pro/supervisorPersonManage/addPersonnel.vue b/src/views/pro/supervisorPersonManage/addPersonnel.vue
index 90edebb..f47e567 100644
--- a/src/views/pro/supervisorPersonManage/addPersonnel.vue
+++ b/src/views/pro/supervisorPersonManage/addPersonnel.vue
@@ -152,6 +152,9 @@
             <el-button type="primary" @click="submitForm" v-preventReClick="5000">确 定</el-button>
             <el-button @click="cancel">取 消</el-button>
           </div>
+          <div slot="footer" class="dialog-footer" v-else style="float: right">
+            <el-button type="primary" @click="onHandleCancel">关闭</el-button>
+          </div>
         </div>
       </el-tab-pane>
       <!-- <el-tab-pane label="审批信息" name="second">
@@ -469,6 +472,11 @@ export default {
     cancel() {
       this.$tab.closePage()
     },
+
+    onHandleCancel() {
+      this.$router.go(-1)
+      this.$tab.closePage()
+    },
   },
 }
 </script>