From 5c76e3a777225e491e4ae86465a55e9f8a4635c8 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 6 Dec 2023 16:52:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E5=9F=B9=E8=AE=AD?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow_audit/index.vue |  9 +--------
 src/views/xgf/flow_audit/users.vue | 18 +++++++-----------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/views/xgf/flow_audit/index.vue b/src/views/xgf/flow_audit/index.vue
index 4284de7..2cc1e97 100644
--- a/src/views/xgf/flow_audit/index.vue
+++ b/src/views/xgf/flow_audit/index.vue
@@ -20,13 +20,6 @@
             />
           </el-form-item>
         </el-col>
-        <!--        <el-col :span="6">-->
-        <!--          <el-form-item label="申请状态">-->
-        <!--            <el-select v-model="AUDIT_STATUS" placeholder="请选择申请状态" clearable >-->
-        <!--              <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />-->
-        <!--            </el-select>-->
-        <!--          </el-form-item>-->
-        <!--        </el-col>-->
         <el-col :span="4">
           <el-form-item label-width="10px">
             <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
@@ -65,7 +58,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" width="200">
         <template slot-scope="{row}">
-          <el-button v-if="(row.AUDIT_STATUS === 1 || row.AUDIT_STATUS === 0 ) && (row.MANAGER_USER_ID == USER_ID && row.managerCount != row.USER_COUNT ) || (row.TERRITORIALITY_USER_ID == USER_ID && row.territorialityCount != row.USER_COUNT ) " type="success" icon="el-icon-edit" size="mini" @click="handleAudit(row.TRAININGBATCH_ID)">审核</el-button>
+          <el-button v-if="(row.AUDIT_STATUS === 1 || row.AUDIT_STATUS === 0 ) && (row.MANAGER_USER_ID === USER_ID && row.managerCount !== row.USER_COUNT ) || (row.TERRITORIALITY_USER_ID === USER_ID && row.territorialityCount !== row.USER_COUNT ) " type="success" icon="el-icon-edit" size="mini" @click="handleAudit(row.TRAININGBATCH_ID)">审核</el-button>
           <el-button v-else type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row.TRAININGBATCH_ID)">查看</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/xgf/flow_audit/users.vue b/src/views/xgf/flow_audit/users.vue
index d20cafb..57b707d 100644
--- a/src/views/xgf/flow_audit/users.vue
+++ b/src/views/xgf/flow_audit/users.vue
@@ -9,12 +9,6 @@
       width="60%">
       <div class="level-title mt-20" style="display: flex;justify-content: space-between;">
         <h1>申请信息</h1>
-        <!--        <span v-if="pd.AUDIT_STATUS === 0">股份公司待审核</span>-->
-        <!--        <span v-if="pd.AUDIT_STATUS === 1">分公司待审核</span>-->
-        <!--        <span v-if="pd.AUDIT_STATUS === 2">培训中</span>-->
-        <!--        <span v-if="pd.AUDIT_STATUS === 3">培训完成</span>-->
-        <!--        <span v-if="pd.AUDIT_STATUS === -1">股份公司审核未通过</span>-->
-        <!--        <span v-if="pd.AUDIT_STATUS === -2">分公司审核未通过</span>-->
       </div>
       <table class="table-ui" style="margin-bottom: 20px;">
         <tr>
@@ -79,7 +73,7 @@
               size="mini"
               @click="getUserInfo(row)">电子合格证
             </el-button>
-            <el-button v-if="(row.STATUS === 0 || row.STATUS === 1) && viewState ==='1' && ((row.MANAGER_USER_ID == USER_ID && row.MANAGER_STATE === 9 ) || (row.TERRITORIALITY_USER_ID == USER_ID && row.TERRITORIALITY_STATE === 9)) && row.SUPERVISION_STATE != 0 && row.MANAGER_STATE != 0 && row.TERRITORIALITY_STATE != 0" type="success" icon="el-icon-edit" size="mini" @click="examineShow(row)">审核</el-button>
+            <el-button v-if="(row.STATUS === 0 || row.STATUS === 1) && viewState ==='1' && ((row.MANAGER_USER_ID === USER_ID && row.MANAGER_STATE === 9 && row.STEP_STATUS === '1' ) || (row.TERRITORIALITY_USER_ID === USER_ID && row.TERRITORIALITY_STATE === 9 && (row.STEP_STATUS === '0' || !row.STEP_STATUS))) && row.SUPERVISION_STATE != 0 && row.MANAGER_STATE != 0 && row.TERRITORIALITY_STATE != 0" type="success" icon="el-icon-edit" size="mini" @click="examineShow(row)">审核</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -251,9 +245,6 @@
           <td>{{ item.REVIEW_TIME }}</td>
           <th>有效期</th>
           <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
-
-          <!--          &lt;!&ndash;          <td v-if="!userEntryForm.TRAIN_AREA">暂无</td>&ndash;&gt;-->
-          <!--          &lt;!&ndash;          <td v-else style="color: #04a9f5; cursor: pointer" @click="showQRCode(userEntryForm.USER_ID)">查看</td>&ndash;&gt;-->
         </tr>
       </table>
       <div slot="footer" class="dialog-footer">
@@ -423,6 +414,7 @@ export default {
       this.form.USER_COUNT = this.pd.USER_COUNT
       this.form.type = '2'
       this.form.USER_ID = row.USER_ID
+      this.form.STEP_STATUS = row.STEP_STATUS
       this.dialogVisible = true
     },
     // 提交审批意见
@@ -438,7 +430,6 @@ export default {
           return
         }
       }
-
       requestFN(
         '/flowTrain/approveUser', { ...this.form }
       ).then((data) => {
@@ -524,6 +515,11 @@ export default {
         !(row.SUPERVISION_STATE === 0 || row.MANAGER_STATE === 0 || row.TERRITORIALITY_STATE === 0)) {
         return '评审中'
       }
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.STEP_STATUS === '3') {
+        return 'warning-row'
+      }
     }
   }
 }