From 2b744d8ff16735bd8ade260315d5e80321004264 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 22 Dec 2023 17:07:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8Bbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow_audit/userInfo.vue | 19 ++++++++++---------
 src/views/xgf/flow_audit/users.vue    |  6 ++++++
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/views/xgf/flow_audit/userInfo.vue b/src/views/xgf/flow_audit/userInfo.vue
index 7f497ec..7e60d14 100644
--- a/src/views/xgf/flow_audit/userInfo.vue
+++ b/src/views/xgf/flow_audit/userInfo.vue
@@ -201,23 +201,23 @@
                   <el-row>
                     <el-form label-position="left" inline class="demo-table-expand">
                       <el-col :span="5">
-                        <el-form-item label="属地管理部门">
+                        <el-form-item v-if="false" label="属地管理部门">
                           <span>{{ props.row.TERRITORIALITY_DEPARTMENT_NAME }}</span>
                         </el-form-item>
                       </el-col>
                       <el-col :span="5">
-                        <el-form-item label="审批人">
+                        <el-form-item v-if="false" label="审批人">
                           <span>{{ props.row.TERRITORIALITY_USER_NAME }}</span>
                         </el-form-item>
                       </el-col>
                       <el-col :span="5">
-                        <el-form-item label="审批结果">
+                        <el-form-item v-if="false" label="审批结果">
                           <span v-if="props.row.TERRITORIALITY_STATE === 0">不通过</span>
                           <span v-if="props.row.TERRITORIALITY_STATE ===1">通过</span>
                         </el-form-item>
                       </el-col>
                       <el-col :span="9">
-                        <el-form-item label="审批意见">
+                        <el-form-item v-if="false" label="审批意见">
                           <span>{{ props.row.TERRITORIALITY_OPINION }}</span>
                         </el-form-item>
                       </el-col>
@@ -269,9 +269,9 @@
                   </el-row>
                 </template>
               </el-table-column>
-              <el-table-column prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" align="center"/>
-              <el-table-column prop="TERRITORIALITY_USER_NAME" label="审批人" align="center"/>
-              <el-table-column prop="TERRITORIALITY_STATE" label="审批结果" align="center">
+              <el-table-column v-if="false" prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" align="center"/>
+              <el-table-column v-if="false" prop="TERRITORIALITY_USER_NAME" label="审批人" align="center"/>
+              <el-table-column v-if="false" prop="TERRITORIALITY_STATE" label="审批结果" align="center">
                 <template slot-scope="{row}">
                   <span v-if="row.TERRITORIALITY_STATE === 0">不通过</span>
                   <span v-if="row.TERRITORIALITY_STATE ===1">通过</span>
@@ -279,7 +279,7 @@
               </el-table-column>
               <el-table-column prop="MANAGER_DEPARTMENT_NAME" label="主管部门" align="center"/>
               <el-table-column prop="MANAGER_USER_NAME" label="审批人" align="center"/>
-              <el-table-column prop="MANAGER_STATE" label="审批人" align="center">
+              <el-table-column prop="MANAGER_STATE" label="审批结果" align="center">
                 <template slot-scope="{row}">
                   <span v-if="row.MANAGER_STATE === 0">不通过</span>
                   <span v-if="row.MANAGER_STATE ===1">通过</span>
@@ -287,7 +287,7 @@
               </el-table-column>
               <el-table-column prop="SUPERVISION_DEPARTMENT_NAME" label="安全监督部门" align="center"/>
               <el-table-column prop="SUPERVISION_USER_NAME" label="审批人" align="center"/>
-              <el-table-column prop="SUPERVISION_STATE" label="审批人" align="center">
+              <el-table-column prop="SUPERVISION_STATE" label="审批结果" align="center">
                 <template slot-scope="{row}">
                   <span v-if="row.SUPERVISION_STATE === 0">不通过</span>
                   <span v-if="row.SUPERVISION_STATE ===1">通过</span>
@@ -341,6 +341,7 @@ export default {
   },
   methods: {
     init(e) {
+      console.log(e)
       this.visible = true
       this.heirloom = JSON.parse(JSON.stringify(e))
       this.getUserInfoById(this.heirloom)
diff --git a/src/views/xgf/flow_audit/users.vue b/src/views/xgf/flow_audit/users.vue
index 1b17f25..8587907 100644
--- a/src/views/xgf/flow_audit/users.vue
+++ b/src/views/xgf/flow_audit/users.vue
@@ -291,6 +291,12 @@ export default {
       }
     },
     comfirm() {
+      for (let i = 0; i < this.userList.length; i++) {
+        if ((this.userList[i][this.pd.step] === 9 && this.userList[i].RESULT_STATUS === '1')) {
+          this.$message.error('还有人员未审批')
+          return
+        }
+      }
       this.$confirm('确定提交审批吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',