相关方流程记录功能开发

src/views/xgf/flow/components/flowInfo.vue

@@ -3,7 +3,7 @@
     v-if="visible"
     :visible.sync="visible"
     :before-close="handleClose"
-    :append-to-body="true"
+    :append-to-body="appendToBody"
     title="审批流程"
     width="60%">
     <el-steps :space="200" :active="list.length" direction="vertical" finish-status="success">
@@ -15,18 +15,24 @@
             </div>
             <div>
               <el-row>
-                <el-col>
+                <el-col v-if="item.APPROVER_NAME">
                   审批人：{{ item.APPROVER_NAME }}
                 </el-col>
                 <el-col>
                   审批状态：{{ item.PASS_FLAG === '1' ? '同意' : '不同意' }}
                 </el-col>
                 <el-col>
-                  审批时间：{{ item.APPROVER_TIME }}
+                  审批人归属公司：{{ item.APPROVER_CORPINFO_NAME }}
                 </el-col>
                 <el-col>
+                  审批时间：{{ item.APPROVER_TIME }}
+                </el-col>
+                <el-col v-if="item.APPROVER_OPINION">
                   审批意见：{{ item.APPROVER_OPINION }}
                 </el-col>
+                <el-col v-if="item.END_FLAG === '1'" style="color: red; font-weight: bold;font-size: large">
+                  审批结束
+                </el-col>
               </el-row>
             </div>
           </el-card>
@@ -35,7 +41,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>
@@ -45,9 +50,9 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 export default {
   props: {
-    corpInfo: {
+    appendToBody: {
-      type: String,
+      type: Boolean,
-      default: ''
+      default: false
     }
   },
   data() {

src/views/xgf/flow/components/flowInfoList.vue

@@ -24,9 +24,8 @@
     </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"/>
+    <flow-info ref="flowInfo" append-to-body/>
   </el-dialog>
 </template>
 

src/views/xgf/flow/components/flowStep.vue

@@ -2,9 +2,10 @@
   <el-dialog
     v-if="visible"
     :visible.sync="visible"
+    :v-loading="loading"
     :before-close="handleClose"
     :append-to-body="true"
-    title="审批流程"
+    :title="title"
     width="60%">
     <el-steps :space="200" :active="+step" direction="vertical" finish-status="success">
       <el-step v-for="item in list" :key="item.INDEX" :value="item.INDEX" :title="item.INDEX">
@@ -16,15 +17,21 @@
             <div>
               <el-row>
                 <el-col>
-                  审批人：{{ item.APPOINT_DEPARTMENT_NAME }}
+                  审批人：{{ item.APPOINT_USER_NAME }}
+                </el-col>
+                <el-col>
+                  审批人公司：{{ item.APPOINT_CORP_NAME }}
+                </el-col>
+                <el-col>
+                  审批人部门：{{ item.APPOINT_DEPARTMENT_NAME }}
                 </el-col>
                 <el-col>
                   审批状态：{{ item.APPOINT_STATUS === '1' ? '同意' : item.APPOINT_STATUS === '0' ? '不同意' : '' }}
                 </el-col>
                 <el-col>
-                  审批时间：{{ item.APPOINT_USER_NAME }}
+                  审批时间：{{ item.APPOINT_TIME }}
                 </el-col>
-                <el-col>
+                <el-col v-if="item.APPOINT_OPINION">
                   审批意见：{{ item.APPOINT_OPINION }}
                 </el-col>
               </el-row>
@@ -56,6 +63,7 @@ export default {
       visible: false,
       loading: false,
       list: [],
+      title: '审批流程',
       form: {
         XGF_USER_ID: ''
       },
@@ -64,8 +72,6 @@ export default {
   },
   methods: {
     init(e) {
-      this.visible = true
-      this.loading = false
       this.form.XGF_USER_ID = e.XGF_USER_ID
       this.getInfo()
     },
@@ -75,6 +81,17 @@ export default {
       ).then((data) => {
         this.list = data.flow.info
         this.step = data.flow.STEP
+        if (data.flow.endFlag === '1') {
+          this.title = '审批中'
+        }
+        if (data.flow.endFlag === '2') {
+          this.title = '审批结束'
+        }
+        if (data.flow.endFlag === '-2') {
+          this.title = '审批驳回'
+        }
+        this.visible = true
+        this.loading = false
       }).catch((e) => {
         console.log(e)
       })

src/views/xgf/flowList/components/list.vue

@@ -41,9 +41,11 @@
       <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="150">
+      <el-table-column label="操作" align="center" width="350">
         <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="handleShowStep(row)">审批记录</el-button>
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShowFlow(row)">审批流程</el-button>
           <el-button v-if="false" 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>
@@ -59,6 +61,8 @@
     <user-info ref="userInfos" append-to-body/>
     <send-util ref="sendUtil" append-to-body @refresh="getList"/>
     <apply ref="apply" append-to-body @refresh="getList"/>
+    <flow-info-list ref="flowInfo" />
+    <flow-step ref="flowStep" append-to-body/>
   </div>
 </template>
 
@@ -71,9 +75,11 @@ import apply from './apply'
 import user from './user.vue'
 import SendUtil from './sendUtil.vue'
 import UserInfo from '../../flowApply/components/userInfo.vue'
+import FlowStep from '../../flow/components/flowStep.vue'
+import FlowInfoList from '../../flow/components/flowInfoList.vue'
 
 export default {
-  components: { UserInfo, SendUtil, Pagination, apply, vueQr, user },
+  components: { FlowInfoList, FlowStep, UserInfo, SendUtil, Pagination, apply, vueQr, user },
   directives: { waves },
   data() {
     return {
@@ -156,6 +162,12 @@ export default {
     handleShow(row) {
       this.$refs.userInfos.init(row)
     },
+    handleShowStep(row) {
+      this.$refs.flowStep.init(row)
+    },
+    handleShowFlow(row) {
+      this.$refs.flowInfo.init(row)
+    },
     approve(row) {
       this.$refs.sendUtil.init(row)
     },