From 8af77c02ea0b787bb61589ec153021ca464c8081 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Mon, 29 Jan 2024 13:20:27 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B5=81=E7=A8=8B=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=94=99=E8=AF=AFbug=E4=BF=AE=E6=94=B9=202?=
 =?UTF-8?q?=E3=80=81=E6=89=93=E5=9B=9E=E5=90=8E=E6=97=A0=E6=B3=95=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9bug=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/flowInfo.vue    | 78 ++++++++++++++++
 .../xgf/flow/components/flowInfoList.vue      | 88 +++++++++++++++++++
 src/views/xgf/flow/components/list.vue        | 10 ++-
 .../xgf/flowList/components/sendUtil.vue      |  2 +-
 4 files changed, 175 insertions(+), 3 deletions(-)
 create mode 100644 src/views/xgf/flow/components/flowInfo.vue
 create mode 100644 src/views/xgf/flow/components/flowInfoList.vue

diff --git a/src/views/xgf/flow/components/flowInfo.vue b/src/views/xgf/flow/components/flowInfo.vue
new file mode 100644
index 0000000..0f7a130
--- /dev/null
+++ b/src/views/xgf/flow/components/flowInfo.vue
@@ -0,0 +1,78 @@
+<template>
+  <el-dialog
+    v-if="visible"
+    :visible.sync="visible"
+    :before-close="handleClose"
+    :append-to-body="true"
+    title="审批流程"
+    width="60%">
+    <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;">
+            <div slot="header" class="clearfix">
+              <span>{{ item.STEP_NAME }}</span>
+            </div>
+            <div>
+              <el-row>
+                <el-col>
+                  审批人：{{ item.APPROVER_NAME }}
+                </el-col>
+                <el-col>
+                  审批状态：{{ item.PASS_FLAG === '1' ? '同意' : '不同意' }}
+                </el-col>
+                <el-col>
+                  审批时间：{{ item.APPROVER_TIME }}
+                </el-col>
+                <el-col>
+                  审批意见：{{ item.APPROVER_OPINION }}
+                </el-col>
+              </el-row>
+            </div>
+          </el-card>
+        </template>
+      </el-step>
+    </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>
+
+<script>
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+export default {
+  props: {
+    corpInfo: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      loading: false,
+      list: [],
+      form: {
+        XGF_USER_ID: ''
+      }
+    }
+  },
+  methods: {
+    init(e) {
+      this.visible = true
+      this.loading = false
+      this.list = e.flow
+    },
+    handleClose() {
+      this.visible = false
+      this.$emit('finish', '')
+    },
+    closeWindow() {
+      this.handleClose()
+    }
+  }
+}
+</script>
diff --git a/src/views/xgf/flow/components/flowInfoList.vue b/src/views/xgf/flow/components/flowInfoList.vue
new file mode 100644
index 0000000..0f5c959
--- /dev/null
+++ b/src/views/xgf/flow/components/flowInfoList.vue
@@ -0,0 +1,88 @@
+<template>
+  <el-dialog
+    v-if="visible"
+    :visible.sync="visible"
+    :before-close="handleClose"
+    :append-to-body="true"
+    title="审批流程"
+    width="60%">
+    <el-table
+      ref="multipleTable"
+      :data="list"
+      :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+      tooltip-effect="dark"
+      border
+      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 label="操作" align="center" width="250">
+        <template slot-scope="{row}">
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="closeWindow">取 消</el-button>
+      <el-button :loading="loading" type="primary" @click="save">确 定</el-button>
+    </div>
+    <flow-info ref="flowInfo" :corp-info="corpInfo" @finish="handleClose"/>
+  </el-dialog>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import FlowInfo from './flowInfo.vue'
+
+export default {
+  components: {
+    FlowInfo,
+    Treeselect
+  },
+  props: {
+    corpInfo: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      loading: false,
+      list: [],
+      form: {
+        XGF_USER_ID: ''
+      }
+    }
+  },
+  methods: {
+    init(e) {
+      this.visible = true
+      this.loading = false
+      this.form.XGF_USER_ID = e.XGF_USER_ID
+      this.getInfo()
+    },
+    getInfo() {
+      requestFN(
+        '/xgf/user/getApproveInfo', this.form
+      ).then((data) => {
+        this.list = data.list
+      }).catch((e) => {
+        console.log(e)
+      })
+    },
+    handleShow(row) {
+      this.$refs.flowInfo.init(row)
+    },
+    handleClose() {
+      this.visible = false
+      this.$emit('finish', '')
+    },
+    closeWindow() {
+      this.handleClose()
+    }
+  }
+}
+</script>
diff --git a/src/views/xgf/flow/components/list.vue b/src/views/xgf/flow/components/list.vue
index c8d608d..0d7c352 100644
--- a/src/views/xgf/flow/components/list.vue
+++ b/src/views/xgf/flow/components/list.vue
@@ -39,9 +39,10 @@
       <el-table-column prop="USERNAME" label="用户名" align="center"/>
       <el-table-column prop="NAME" label="姓名" align="center"/>
       <el-table-column prop="BELONG_TO_CORP_NAME" label="外派公司名称" align="center"/>
-      <el-table-column label="操作" align="center" width="250">
+      <el-table-column label="操作" align="center" width="450">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleFlowShow(row)">流程详情</el-button>
           <el-button v-if="row.power_flag === '1'" type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button>
           <el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>
         </template>
@@ -56,6 +57,7 @@
     <user ref="userInfo" append-to-body/>
     <user-info ref="userInfos" append-to-body/>
     <send-util ref="sendUtil" append-to-body @refresh="getList"/>
+    <flow-info-list ref="flowInfo" :corp-info="corpInfo" @finish="handleClose"/>
   </div>
 </template>
 
@@ -68,9 +70,10 @@ import apply from './apply'
 import user from './user.vue'
 import SendUtil from './sendUtil.vue'
 import UserInfo from '../../flowApply/components/userInfo.vue'
+import FlowInfoList from './flowInfoList.vue'
 
 export default {
-  components: { UserInfo, SendUtil, Pagination, apply, vueQr, user },
+  components: { FlowInfoList, UserInfo, SendUtil, Pagination, apply, vueQr, user },
   directives: { waves },
   data() {
     return {
@@ -162,6 +165,9 @@ export default {
     handleShow(row) {
       this.$refs.userInfos.init(row)
     },
+    handleFlowShow(row) {
+      this.$refs.flowInfo.init(row)
+    },
     approve(row) {
       this.$refs.sendUtil.init(row)
     },
diff --git a/src/views/xgf/flowList/components/sendUtil.vue b/src/views/xgf/flowList/components/sendUtil.vue
index 6048cfe..a7fdb5b 100644
--- a/src/views/xgf/flowList/components/sendUtil.vue
+++ b/src/views/xgf/flowList/components/sendUtil.vue
@@ -1,4 +1,4 @@
-  <template>
+<template>
   <div>
     <el-dialog :visible.sync="visible" :append-to-body="appendToBody" :before-close="beforeClose" title="头像" width="370px" destroy-on-close>
       <el-form>