From e71ba80f392d4dd481b0a7782f2fdbc973b345de Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 30 Jan 2024 15:20:59 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AE=A1=E6=89=B9=E7=AC=AC=E4=BA=8C?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=B2=A1=E6=9C=89=E5=AD=98=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81bug=E4=BF=AE=E5=A4=8D=202=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E5=88=AB=E5=AD=97=E4=BF=AE=E6=94=B9=203=E3=80=81=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow/components/entrust.vue      | 2 +-
 src/views/xgf/flow/components/flowInfo.vue     | 2 +-
 src/views/xgf/flow/components/flowInfoList.vue | 2 +-
 src/views/xgf/flow/components/flowStep.vue     | 9 +++++----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/xgf/flow/components/entrust.vue b/src/views/xgf/flow/components/entrust.vue
index 799927c..a712c10 100644
--- a/src/views/xgf/flow/components/entrust.vue
+++ b/src/views/xgf/flow/components/entrust.vue
@@ -53,7 +53,7 @@ export default {
       visible: false,
       loading: false,
       form: {
-        STATUS: null,
+        STATUS: '1',
         APPOINT_CORP_ID: '',
         APPOINT_CORP_NAME: '',
         APPOINT_DEPARTMENT_ID: null,
diff --git a/src/views/xgf/flow/components/flowInfo.vue b/src/views/xgf/flow/components/flowInfo.vue
index 7ffe2e4..cabc7cd 100644
--- a/src/views/xgf/flow/components/flowInfo.vue
+++ b/src/views/xgf/flow/components/flowInfo.vue
@@ -9,7 +9,7 @@
     <el-steps :space="200" :active="list.length" direction="vertical" finish-status="success">
       <el-step v-for="item in list" :key="item.FLOW_DETAIL_ID" :value="item.FLOW_DETAIL_ID" :title="item.SORT">
         <template slot="description">
-          <el-card class="box-card" style="width: 900px;">
+          <el-card class="box-card a" style="width: 900px;">
             <div slot="header" class="clearfix">
               <span>{{ item.STEP_NAME }}</span>
             </div>
diff --git a/src/views/xgf/flow/components/flowInfoList.vue b/src/views/xgf/flow/components/flowInfoList.vue
index 981ccf5..3b55422 100644
--- a/src/views/xgf/flow/components/flowInfoList.vue
+++ b/src/views/xgf/flow/components/flowInfoList.vue
@@ -15,7 +15,7 @@
       fit
       highlight-current-row>
       <el-table-column type="index" label="序号" width="50" align="center"/>
-      <el-table-column prop="CREATOR_TIME" label="用户名" align="center"/>
+      <el-table-column prop="CREATOR_TIME" label="审批流创建时间" align="center"/>
       <el-table-column label="操作" align="center" width="250">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
diff --git a/src/views/xgf/flow/components/flowStep.vue b/src/views/xgf/flow/components/flowStep.vue
index 84f449a..6eaba65 100644
--- a/src/views/xgf/flow/components/flowStep.vue
+++ b/src/views/xgf/flow/components/flowStep.vue
@@ -19,7 +19,7 @@
                 <el-col>
                   审批人：{{ item.APPOINT_USER_NAME }}
                 </el-col>
-                <el-col>
+                <el-col v-if="item.INDEX !== step">
                   审批人公司：{{ item.APPOINT_CORP_NAME }}
                 </el-col>
                 <el-col>
@@ -31,7 +31,7 @@
                 <el-col v-if="item.INDEX !== step">
                   审批时间：{{ item.APPOINT_TIME }}
                 </el-col>
-                <el-col v-if="item.APPOINT_OPINION">
+                <el-col v-if="item.APPOINT_OPINION && item.INDEX !== step">
                   审批意见：{{ item.APPOINT_OPINION }}
                 </el-col>
               </el-row>
@@ -42,7 +42,6 @@
     </el-steps>
     <div slot="footer" class="dialog-footer">
       <el-button @click="closeWindow">取 消</el-button>
-      <el-button :loading="loading" type="primary" @click="save">确 定</el-button>
     </div>
   </el-dialog>
 </template>
@@ -67,7 +66,8 @@ export default {
       form: {
         XGF_USER_ID: ''
       },
-      step: 0
+      step: 0,
+      endFlag: ''
     }
   },
   methods: {
@@ -81,6 +81,7 @@ export default {
       ).then((data) => {
         this.list = data.flow.info
         this.step = data.flow.STEP
+        this.step = data.flow.endFlag
         if (data.flow.endFlag === '1') {
           this.title = '审批中'
         }