From 7e0f9d22643c4b73501265601fbda10243129e24 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 22 Dec 2023 17:07:44 +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/components/list.vue        |  2 +-
 src/views/xgf/flow/components/sendUtil.vue    |  4 ++++
 src/views/xgf/flowApply/components/list.vue   |  2 +-
 .../xgf/flowApply/components/userInfo.vue     | 22 +++++++++----------
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/views/xgf/flow/components/list.vue b/src/views/xgf/flow/components/list.vue
index 636a33f..bf01575 100644
--- a/src/views/xgf/flow/components/list.vue
+++ b/src/views/xgf/flow/components/list.vue
@@ -7,7 +7,7 @@
             <el-input v-model="KEYWORDS" placeholder="请输入用户名"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="false" :span="6">
           <el-form-item label="培训状态">
             <el-select v-model="STATUS" placeholder="请选择培训状态" style="width: 100%;" clearable>
               <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value"/>
diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue
index a7fdb5b..cd9aab3 100644
--- a/src/views/xgf/flow/components/sendUtil.vue
+++ b/src/views/xgf/flow/components/sendUtil.vue
@@ -46,6 +46,10 @@ export default {
     beforeClose() {
     },
     sendMessage(row) {
+      if (this.value) {
+        this.$message.error('请选择是否通过')
+        return
+      }
       requestFN(
         '/xgf/user/approve',
         {
diff --git a/src/views/xgf/flowApply/components/list.vue b/src/views/xgf/flowApply/components/list.vue
index f5ec2c4..785481a 100644
--- a/src/views/xgf/flowApply/components/list.vue
+++ b/src/views/xgf/flowApply/components/list.vue
@@ -7,7 +7,7 @@
             <el-input v-model="KEYWORDS" placeholder="请输入用户名"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col v-if="false" :span="6">
           <el-form-item label="培训状态">
             <el-select v-model="STATUS" placeholder="请选择培训状态" style="width: 100%;" clearable>
               <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value"/>
diff --git a/src/views/xgf/flowApply/components/userInfo.vue b/src/views/xgf/flowApply/components/userInfo.vue
index 7f497ec..a3cc60a 100644
--- a/src/views/xgf/flowApply/components/userInfo.vue
+++ b/src/views/xgf/flowApply/components/userInfo.vue
@@ -200,23 +200,23 @@
                 <template slot-scope="props">
                   <el-row>
                     <el-form label-position="left" inline class="demo-table-expand">
-                      <el-col :span="5">
+                      <el-col v-if="false" :span="5">
                         <el-form-item label="属地管理部门">
                           <span>{{ props.row.TERRITORIALITY_DEPARTMENT_NAME }}</span>
                         </el-form-item>
                       </el-col>
-                      <el-col :span="5">
+                      <el-col v-if="false" :span="5">
                         <el-form-item label="审批人">
                           <span>{{ props.row.TERRITORIALITY_USER_NAME }}</span>
                         </el-form-item>
                       </el-col>
-                      <el-col :span="5">
+                      <el-col v-if="false" :span="5">
                         <el-form-item 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-col v-if="false" :span="9">
                         <el-form-item label="审批意见">
                           <span>{{ props.row.TERRITORIALITY_OPINION }}</span>
                         </el-form-item>
@@ -233,7 +233,7 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="5">
-                        <el-form-item label="审批人">
+                        <el-form-item label="审批结果">
                           <span v-if="props.row.MANAGER_STATE === 0">不通过</span>
                           <span v-if="props.row.MANAGER_STATE ===1">通过</span>
                         </el-form-item>
@@ -255,7 +255,7 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="5">
-                        <el-form-item label="审批人">
+                        <el-form-item label="审批结果">
                           <span v-if="props.row.SUPERVISION_STATE === 0">不通过</span>
                           <span v-if="props.row.SUPERVISION_STATE ===1">通过</span>
                         </el-form-item>
@@ -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>