From 745788de65a3d325fdf9324c8786ff1734803bcf Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Thu, 7 Dec 2023 15:02:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2bug=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/index.vue |  3 +--
 src/views/xgf/flow_audit/users.vue | 11 +++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/xgf/flow_audit/index.vue b/src/views/xgf/flow_audit/index.vue
index c9158cf..7093da1 100644
--- a/src/views/xgf/flow_audit/index.vue
+++ b/src/views/xgf/flow_audit/index.vue
@@ -58,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 === 0 || row.AUDIT_STATUS === -2) && (row.SUPERVISION_USER_ID === USER_ID && row.supervisionCount !== row.USER_COUNT ) " type="success" icon="el-icon-edit" size="mini" @click="handleAudit(row)">审核</el-button>
+          <el-button v-if="(row.AUDIT_STATUS === 0 || row.AUDIT_STATUS === -2) && (row.supervisionCount !== row.USER_COUNT ) " type="success" icon="el-icon-edit" size="mini" @click="handleAudit(row)">审核</el-button>
           <el-button v-else type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">查看</el-button>
         </template>
       </el-table-column>
@@ -149,7 +149,6 @@ export default {
           ENDTIME: this.dates[1],
           TRAIN_CORP_DEPTS: this.TRAIN_CORP_DEPTS.join(','),
           AUDIT_STATUS: this.AUDIT_STATUS,
-          TYPE: 2,
           USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID
         }
       ).then((data) => {
diff --git a/src/views/xgf/flow_audit/users.vue b/src/views/xgf/flow_audit/users.vue
index 959622b..1a5cbe0 100644
--- a/src/views/xgf/flow_audit/users.vue
+++ b/src/views/xgf/flow_audit/users.vue
@@ -24,7 +24,7 @@
           <th>安全监督部门</th>
           <td>{{ pd.SUPERVISION_DEPT_NAME }}</td>
           <th>审核人员</th>
-          <td>{{ pd.SUPERVISION_USER_USERNAME }}</td>
+          <td>{{ pd.SUPERVISION_USER_NAME }}</td>
           <th>审核时间</th>
           <td>{{ pd.SUPERVISION_TIME }}</td>
         </tr>
@@ -32,7 +32,7 @@
           <th>主管部门</th>
           <td>{{ pd.MANAGER_DEPT_NAME }}</td>
           <th>审核人员</th>
-          <td>{{ pd.MANAGER_USER_USERNAME }}</td>
+          <td>{{ pd.MANAGER_USER_NAME }}</td>
           <th>审核时间</th>
           <td>{{ pd.MANAGER_TIME }}</td>
         </tr>
@@ -40,7 +40,7 @@
           <th>管理部门</th>
           <td>{{ pd.ERRITORIALITY_DEPT_NAME }}</td>
           <th>审核人员</th>
-          <td>{{ pd.ERRITORIALITY_USER_USERNAME }}</td>
+          <td>{{ pd.ERRITORIALITY_USER_NAME }}</td>
           <th>审核时间</th>
           <td>{{ pd.TERRITORIALITY_TIME }}</td>
         </tr>
@@ -83,7 +83,7 @@
               @click="getUserInfo(row)">电子合格证
             </el-button>
             <el-button
-              v-if="(row.STATUS === 0 ||row.STATUS === 1 )&& viewState ==='1' && row.SUPERVISION_STATE === 9 && row.STEP_STATUS === '2'"
+              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.SUPERVISION_USER_ID === USER_ID && row.SUPERVISION_STATE === 9 && row.STEP_STATUS === '2') || (row.TERRITORIALITY_USER_ID === USER_ID && row.TERRITORIALITY_STATE === 9 && (row.STEP_STATUS === '0' || !row.STEP_STATUS)))"
               type="success"
               icon="el-icon-edit"
               size="mini"
@@ -302,6 +302,7 @@ export default {
   data() {
     return {
       config: config,
+      USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID,
       userInfoDialog: false,
       userDetailForm: {},
       imgUrl: '',
@@ -323,6 +324,7 @@ export default {
       dialogVisible: false,
       form: {
         TRAINUSERS_ID: '', // 培训批次 详情id
+        TRAININGBATCH_ID: '',
         USER_COUNT: '', // 批次的人数
         type: '',
         IS_STATE: 1,
@@ -419,6 +421,7 @@ export default {
       this.form.type = '1'
       this.form.USER_ID = row.USER_ID
       this.dialogVisible = true
+      this.form.TRAININGBATCH_ID = this.TRAININGBATCH_ID
     },
     // 提交审批意见
     approve() {