From d50e99452642146b1e9d676356ac29b87368e063 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Thu, 21 Dec 2023 19:55:08 +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/train/training_record/index.vue | 3 ++-
 src/views/xgf/flow_audit/index.vue        | 6 +++---
 src/views/xgf/flow_audit/users.vue        | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/train/training_record/index.vue b/src/views/train/training_record/index.vue
index 029f402..60e981c 100644
--- a/src/views/train/training_record/index.vue
+++ b/src/views/train/training_record/index.vue
@@ -114,7 +114,8 @@ export default {
           VERIFY_START_TIME: this.dates[0],
           VERIFY_END_TIME: this.dates[1],
           XGF_NAME: this.XGF_NAME,
-          USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID
+          USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID,
+          STEP_STATUS: '3'
         }
       ).then((data) => {
         this.listLoading = false
diff --git a/src/views/xgf/flow_audit/index.vue b/src/views/xgf/flow_audit/index.vue
index 6be2821..e730ca8 100644
--- a/src/views/xgf/flow_audit/index.vue
+++ b/src/views/xgf/flow_audit/index.vue
@@ -41,8 +41,8 @@ flowTrain/batchList<template>
       <el-table-column prop="SUPERVISION_USER_NAME" label="安全监督部人员" />
       <el-table-column prop="MANAGER_DEPARTMENT_NAME" label="主管部门" />
       <el-table-column prop="MANAGER_USER_NAME" label="主管部门人员" />
-      <el-table-column prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" />
-      <el-table-column prop="TERRITORIALITY_USER_NAME" label="属地管理部门人员" />
+      <el-table-column v-if="false" prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" />
+      <el-table-column v-if="false" prop="TERRITORIALITY_USER_NAME" label="属地管理部门人员" />
       <el-table-column prop="TRAIN_DATE" label="申请年份" >
         <template slot-scope="{row}">
           {{ new Date(row.CREATTIME).getFullYear() }}
@@ -128,7 +128,7 @@ export default {
           AUDIT_STATUS: this.AUDIT_STATUS,
           TYPE: 2,
           USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID,
-          notStepStuatus: '3'
+          NU_STEP_STATUS: '3'
         }
       ).then((data) => {
         this.listLoading = false
diff --git a/src/views/xgf/flow_audit/users.vue b/src/views/xgf/flow_audit/users.vue
index 9a70de3..1b17f25 100644
--- a/src/views/xgf/flow_audit/users.vue
+++ b/src/views/xgf/flow_audit/users.vue
@@ -36,7 +36,7 @@
           <th>审核时间</th>
           <td>{{ pd.MANAGER_TIME }}</td>
         </tr>
-        <tr>
+        <tr v-if="pd.TERRITORIALITY_DEPARTMENT_NAME && pd.TERRITORIALITY_DEPARTMENT_NAME !== ''">
           <th>集团单位</th>
           <td>{{ pd.TERRITORIALITY_DEPARTMENT_NAME }}</td>
           <th>审核人员</th>
@@ -75,7 +75,7 @@
           <template slot-scope="{row}">
             <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">查看</el-button>
             <el-button v-if="row.STATUS === 2" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>
-            <el-button v-if="row[pd.step] === 9" type="success" icon="el-icon-edit" size="mini" @click="examineShow(row)">审核</el-button>
+            <el-button v-if="(row[pd.step] === 9 && row.RESULT_STATUS === '1')" type="success" icon="el-icon-edit" size="mini" @click="examineShow(row)">审核</el-button>
           </template>
         </el-table-column>
       </el-table>