From 130526f87310ef8c455e680ef4f35b03a8e59b8d Mon Sep 17 00:00:00 2001
From: yf <428080876@qq.com>
Date: Tue, 22 Jun 2021 16:36:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step2.vue         | 96 ++++++++++++++++++-
 1 file changed, 94 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index bf4171d2c..0e94664d4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -7,7 +7,8 @@
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-            <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
+            <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+<!--            <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div>-->
         </div>
         <div class="content" v-if="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -581,6 +582,75 @@
                 </el-timeline>
             </div>
         </div>
+        <div class="content" v-if="active === '3'">
+          <div class="flow-list">
+            <el-table
+                height="100%"
+                ref="selection"
+                :data="detailData"
+                tooltip-effect="dark"
+                style="width: 100%"
+                border
+                row-key="id"
+                :no-data-text="listNoDataText"
+                :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+            >
+              <el-table-column
+                  type="selection"
+                  width="55"
+                  align="center">
+              </el-table-column>
+              <el-table-column
+                  prop="name"
+                  label="任务步骤"
+                  align="center"
+                  sortable="custom"
+              >
+              </el-table-column>
+              <el-table-column
+                  prop="assignee"
+                  label="任务受理人"
+                  align="center"
+                  sortable="custom"
+              >
+              </el-table-column>
+              <el-table-column
+                  prop="createTime"
+                  label="创建时间"
+                  sortable="custom"
+                  align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                  prop="endTime"
+                  label="完成时间"
+                  align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                  prop="comment"
+                  label="审批意见"
+                  align="center">
+                <template slot-scope="scope">
+            <span>{{scope.row.commentText}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                  prop="completeFlag"
+                  label="状态"
+                  align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+            <loading :loading="loading">流程列表加载中</loading>
+          </div>
+        </div>
         <ProcessFooter
                 show-save
                 show-submit
@@ -602,11 +672,14 @@
         name: "bzrkStep2",
         data () {
             return {
+              // 当前流程类型(1待办/2已办)
+              processType: 1,
+                detailData: [],
                 userId:this.$store.getters.userInfo.userId,
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
                 approvalOpinion: '', // 通过/驳回
-                textarea: '', // 意见
+                commentText: '', // 意见
                 title: '', // 新增编辑抽屉标题
                 ListModel: false, // 新增编辑抽屉开关
                 active: '1', // 默认显示
@@ -673,6 +746,7 @@
                     chjl: '', // 参会记录
                     //流程信息
                     prcNum:'',
+                    commentText:'',
                     prcName:'',
                     standType: '',
                 }, // 标准信息
@@ -705,7 +779,24 @@
             ProcessFooter,
             ProcessTitle
         },
+      computed: {
+        listNoDataText () {
+          return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+        },
+      },
         methods: {
+          processTable () {
+            this.$http.get('lawss/activiti/get_list_by_instance', {
+              prcNum: this.$route.query.prcNum,
+              sortWord: this.shunxu ? this.paixu : '',
+              shunxu: this.shunxu
+            }, {
+              loading: 'loading',
+              _this: this
+            }, res => {
+              this.detailData = res
+            }, e => {})
+          },
             getData() {
                 return new Promise((resolve, reject) => {
                     inboundLiaisonDetail({
@@ -791,6 +882,7 @@
         },
         mounted () {
             this.getData()
+          this.processTable()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {
                 _this: this
             }, res => {