From 7a183c3f1d2ebf073d370e4df0289c6a8b708010 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 23 Dec 2021 16:53:55 +0800
Subject: [PATCH] commit

---
 .../pages/creatProcess/bzdy/step7.vue         |  2 +-
 .../pages/creatProcess/zcch/step2.vue         | 71 ++++++++++++++++++-
 .../pages/creatProcess/zcch/step3.vue         | 71 ++++++++++++++++++-
 .../pages/creatProcess/zchh/step2.vue         | 71 ++++++++++++++++++-
 .../pages/creatProcess/zcrh/step2.vue         | 71 ++++++++++++++++++-
 .../pages/creatProcess/zcrh/step3.vue         | 71 ++++++++++++++++++-
 .../pages/creatProcess/zcrh/step4.vue         | 71 ++++++++++++++++++-
 7 files changed, 421 insertions(+), 7 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
index 536d2f62d..836fcb971 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
@@ -112,7 +112,7 @@
                     </el-table>
                 </div>
                 <el-collapse accordion>
-                    <el-collapse-item title="流程信息">
+                    <el-collapse-item title="审批意见">
                         <div style="margin: 10px 0;">
                             <el-input
                                     type="textarea"
diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step2.vue b/src/pages/processCenter/pages/creatProcess/zcch/step2.vue
index e48c4c26c..02bc371e8 100644
--- a/src/pages/processCenter/pages/creatProcess/zcch/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcch/step2.vue
@@ -5,7 +5,8 @@
             <template slot="proNode">法规部部长审批</template>
         </ProcessHeader>
         <div class="headerTabs">
-            <div class="headerTabsItem active">基础信息</div>
+            <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+            <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
         </div>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -209,6 +210,65 @@
                 </el-collapse>
             </div>
         </div>
+        <div class="content" v-show="active === '2'">
+            <el-table
+                    height="100%"
+                    ref="selection"
+                    :data="histortData"
+                    tooltip-effect="dark"
+                    style="width: 100%"
+                    border
+                    row-key="id"
+                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                <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 HH:mm:ss') : '' }}</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 HH:mm:ss') : '' }}</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>
+        </div>
         <ProcessFooter
                 show-submit
                 show-back
@@ -237,6 +297,7 @@
         },
         data() {
             return {
+                histortData: [],
                 commentText: '',
                 isSubmit: false,
                 saveLoading: false,
@@ -268,6 +329,13 @@
             }
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             getData() {
                 return new Promise((resolve, reject) => {
                     inboundLiaisonDetail({
@@ -368,6 +436,7 @@
         },
         mounted() {
             this.getData()
+            this.getHistoryData()
         }
     };
 </script>
diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step3.vue b/src/pages/processCenter/pages/creatProcess/zcch/step3.vue
index e282e2226..5e3e82d31 100644
--- a/src/pages/processCenter/pages/creatProcess/zcch/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcch/step3.vue
@@ -5,7 +5,8 @@
             <template slot="proNode">公司副总审批</template>
         </ProcessHeader>
         <div class="headerTabs">
-            <div class="headerTabsItem active">基础信息</div>
+            <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+            <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
         </div>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -209,6 +210,65 @@
                 </el-collapse>
             </div>
         </div>
+        <div class="content" v-show="active === '2'">
+            <el-table
+                    height="100%"
+                    ref="selection"
+                    :data="histortData"
+                    tooltip-effect="dark"
+                    style="width: 100%"
+                    border
+                    row-key="id"
+                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                <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 HH:mm:ss') : '' }}</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 HH:mm:ss') : '' }}</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>
+        </div>
         <ProcessFooter
                 show-submit
                 show-back
@@ -237,6 +297,7 @@
         },
         data() {
             return {
+                histortData: [],
                 commentText: '',
                 isSubmit: false,
                 saveLoading: false,
@@ -268,6 +329,13 @@
             }
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             getData() {
                 return new Promise((resolve, reject) => {
                     inboundLiaisonDetail({
@@ -342,6 +410,7 @@
             },
         },
         mounted() {
+            this.getHistoryData()
             this.getData()
         }
     };
diff --git a/src/pages/processCenter/pages/creatProcess/zchh/step2.vue b/src/pages/processCenter/pages/creatProcess/zchh/step2.vue
index 33a994a10..46def0a2d 100644
--- a/src/pages/processCenter/pages/creatProcess/zchh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/zchh/step2.vue
@@ -5,7 +5,8 @@
             <template slot="proNode">发起流程</template>
         </ProcessHeader>
         <div class="headerTabs">
-            <div class="headerTabsItem active" >基础信息</div>
+            <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+            <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
         </div>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -246,6 +247,65 @@
                 </el-collapse>
             </div>
         </div>
+        <div class="content" v-show="active === '2'">
+            <el-table
+                    height="100%"
+                    ref="selection"
+                    :data="histortData"
+                    tooltip-effect="dark"
+                    style="width: 100%"
+                    border
+                    row-key="id"
+                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                <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 HH:mm:ss') : '' }}</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 HH:mm:ss') : '' }}</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>
+        </div>
         <ProcessFooter
                 show-submit
                 show-back
@@ -274,6 +334,7 @@
         },
         data() {
             return {
+                histortData: [],
                 commentText: '',
                 isSubmit: false,
                 saveLoading: false,
@@ -327,6 +388,13 @@
             }
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             updataFj (item) {
                 window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
             },
@@ -405,6 +473,7 @@
             },
         },
         mounted() {
+            this.getHistoryData()
             this.getData()
         }
     };
diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue
index c6f415184..5ddf8e5dd 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue
@@ -5,7 +5,8 @@
             <template slot="proNode">法规部部长审批</template>
         </ProcessHeader>
         <div class="headerTabs">
-            <div class="headerTabsItem active">基础信息</div>
+            <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+            <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
         </div>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -184,6 +185,65 @@
                 </el-collapse>
             </div>
         </div>
+        <div class="content" v-show="active === '2'">
+            <el-table
+                    height="100%"
+                    ref="selection"
+                    :data="histortData"
+                    tooltip-effect="dark"
+                    style="width: 100%"
+                    border
+                    row-key="id"
+                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                <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 HH:mm:ss') : '' }}</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 HH:mm:ss') : '' }}</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>
+        </div>
         <ProcessFooter
                 show-submit
                 show-back
@@ -207,6 +267,7 @@
         name: "zcrhStep2",
         data() {
             return {
+                histortData: [],
                 json: {},
                 isSubmit: false,
                 foldFormFlag: true,
@@ -231,6 +292,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json
@@ -300,6 +368,7 @@
             },
         },
         mounted () {
+            this.getHistoryData()
             this.getData()
         }
     }
diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue
index 5035bd5bb..8b3de2982 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue
@@ -5,7 +5,8 @@
             <template slot="proNode">法规认证部副总监审批</template>
         </ProcessHeader>
         <div class="headerTabs">
-            <div class="headerTabsItem active">基础信息</div>
+            <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+            <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
         </div>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -184,6 +185,65 @@
                 </el-collapse>
             </div>
         </div>
+        <div class="content" v-show="active === '2'">
+            <el-table
+                    height="100%"
+                    ref="selection"
+                    :data="histortData"
+                    tooltip-effect="dark"
+                    style="width: 100%"
+                    border
+                    row-key="id"
+                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                <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 HH:mm:ss') : '' }}</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 HH:mm:ss') : '' }}</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>
+        </div>
         <ProcessFooter
                 show-submit
                 show-back
@@ -207,6 +267,7 @@
         name: "zcrhStep3",
         data() {
             return {
+                histortData: [],
                 json: {},
                 isSubmit: false,
                 foldFormFlag: true,
@@ -231,6 +292,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json
@@ -300,6 +368,7 @@
             },
         },
         mounted () {
+            this.getHistoryData()
             this.getData()
         }
     }
diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue
index 4a3e36791..d8220c590 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue
@@ -5,7 +5,8 @@
             <template slot="proNode">公司副总审批</template>
         </ProcessHeader>
         <div class="headerTabs">
-            <div class="headerTabsItem active">基础信息</div>
+            <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+            <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
         </div>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -184,6 +185,65 @@
                 </el-collapse>
             </div>
         </div>
+        <div class="content" v-show="active === '2'">
+            <el-table
+                    height="100%"
+                    ref="selection"
+                    :data="histortData"
+                    tooltip-effect="dark"
+                    style="width: 100%"
+                    border
+                    row-key="id"
+                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                <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 HH:mm:ss') : '' }}</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 HH:mm:ss') : '' }}</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>
+        </div>
         <ProcessFooter
                 show-submit
                 show-back
@@ -207,6 +267,7 @@
         name: "zcrhStep4",
         data() {
             return {
+                histortData: [],
                 json: {},
                 isSubmit: false,
                 foldFormFlag: true,
@@ -231,6 +292,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json
@@ -300,6 +368,7 @@
             },
         },
         mounted () {
+            this.getHistoryData()
             this.getData()
         }
     }