From d8d21530f786badd547db5647de1e255a391b647 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Sun, 19 Dec 2021 15:07:39 +0800
Subject: [PATCH] commit

---
 src/components/index.js                       |  2 +
 src/components/phoneHistortTable/index.vue    | 94 +++++++++++++++++++
 src/pages/login/index.vue                     |  3 +
 .../processCenter/pages/phone/bzdy/step7.vue  | 63 +------------
 .../processCenter/pages/phone/bzdy/step8.vue  | 63 +------------
 .../processCenter/pages/phone/bzdy/step9.vue  | 63 +------------
 .../processCenter/pages/phone/bzjd/step4.vue  | 60 +-----------
 .../processCenter/pages/phone/bzjd/step5.vue  | 60 +-----------
 .../processCenter/pages/phone/bzjd/step6.vue  | 60 +-----------
 9 files changed, 105 insertions(+), 363 deletions(-)
 create mode 100644 src/components/phoneHistortTable/index.vue

diff --git a/src/components/index.js b/src/components/index.js
index 4d040a51b..cb817aa18 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -26,6 +26,7 @@ import MechanismTree from './mechanismTree'
 import SQTree from './SQTree'
 import OrgTable from './OrgTable'
 import MySelect from './mySelect'
+import PhoneHistortTable from './phoneHistortTable'
 
 import phoneRole from './phoneRole'
 
@@ -55,6 +56,7 @@ const install = function (Vue) {
   Vue.component('MechanismTree', MechanismTree)
   Vue.component('MySelect', MySelect)
   Vue.component('phoneRole', phoneRole)
+  Vue.component('PhoneHistortTable', PhoneHistortTable)
 }
 
 export default {
diff --git a/src/components/phoneHistortTable/index.vue b/src/components/phoneHistortTable/index.vue
new file mode 100644
index 000000000..977f23dcd
--- /dev/null
+++ b/src/components/phoneHistortTable/index.vue
@@ -0,0 +1,94 @@
+<template>
+    <div class="phoneHistortTable">
+        <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>
+</template>
+
+<script>
+    export default {
+        name: "phoneHistortTable",
+        data() {
+            return {
+                histortData: []
+            }
+        },
+        props: {
+            prcNum: { // 标题
+                type: String
+            }
+        },
+        methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
+        },
+        mounted () {
+            console.log(this.prcNum);
+            this.getHistoryData()
+        }
+    }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index a878c6ba2..e5556a532 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -182,6 +182,9 @@
                     window.sessionStorage.setItem('menuList', menuList); // del
                     if (hasHomeMenu) {
                         this.setMenu(JSON.stringify(menuList)).then(res => {
+                            if (this.showIETips) {//判断是否IE浏览器
+                                alert('检测到您使用的是IE浏览器,已经和时代脱轨了!建议您更换为谷歌浏览器或火狐浏览器')
+                            }
                             this.$router.push('/home2')
                         }, e => {
                             this.$message.warning('未获取到菜单')
diff --git a/src/pages/processCenter/pages/phone/bzdy/step7.vue b/src/pages/processCenter/pages/phone/bzdy/step7.vue
index 622d08ba1..4c8e29e1b 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step7.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step7.vue
@@ -112,68 +112,7 @@
             </el-collapse>
         </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"
-                        width="170"
-                        sortable="custom"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="assignee"
-                        label="任务受理人"
-                        align="center"
-                        width="120"
-                        sortable="custom"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="createTime"
-                        label="创建时间"
-                        width="120"
-                        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"
-                        width="120"
-                        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="审批意见"
-                        width="200"
-                        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>
+            <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
         </div>
         <ProcessFooter
                 show-submit
diff --git a/src/pages/processCenter/pages/phone/bzdy/step8.vue b/src/pages/processCenter/pages/phone/bzdy/step8.vue
index 824b425f5..14ee6fc03 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step8.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step8.vue
@@ -112,68 +112,7 @@
             </el-collapse>
         </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"
-                        width="170"
-                        sortable="custom"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="assignee"
-                        label="任务受理人"
-                        align="center"
-                        width="120"
-                        sortable="custom"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="createTime"
-                        label="创建时间"
-                        width="120"
-                        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"
-                        width="120"
-                        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="审批意见"
-                        width="200"
-                        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>
+            <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
         </div>
         <ProcessFooter
                 show-submit
diff --git a/src/pages/processCenter/pages/phone/bzdy/step9.vue b/src/pages/processCenter/pages/phone/bzdy/step9.vue
index dadc83ed7..5c0d84d12 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step9.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step9.vue
@@ -112,68 +112,7 @@
             </el-collapse>
         </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"
-                        width="170"
-                        sortable="custom"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="assignee"
-                        label="任务受理人"
-                        align="center"
-                        width="120"
-                        sortable="custom"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="createTime"
-                        label="创建时间"
-                        width="120"
-                        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"
-                        width="120"
-                        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="审批意见"
-                        width="200"
-                        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>
+            <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
         </div>
         <ProcessFooter
                 show-submit
diff --git a/src/pages/processCenter/pages/phone/bzjd/step4.vue b/src/pages/processCenter/pages/phone/bzjd/step4.vue
index 530b3f58b..da817bd75 100644
--- a/src/pages/processCenter/pages/phone/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/phone/bzjd/step4.vue
@@ -253,65 +253,7 @@
             </el-collapse>
         </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"
-                        width="130"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="assignee"
-                        label="任务受理人"
-                        align="center"
-                        width="130"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="createTime"
-                        label="创建时间"
-                        width="130"
-                        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="完成时间"
-                        width="130"
-                        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="流程信息"
-                        width="130"
-                        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>
+            <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
         </div>
         <ProcessFooter
                 show-submit
diff --git a/src/pages/processCenter/pages/phone/bzjd/step5.vue b/src/pages/processCenter/pages/phone/bzjd/step5.vue
index 477e00964..829bbc3b5 100644
--- a/src/pages/processCenter/pages/phone/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/phone/bzjd/step5.vue
@@ -253,65 +253,7 @@
             </el-collapse>
         </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"
-                        width="130"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="assignee"
-                        label="任务受理人"
-                        align="center"
-                        width="130"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="createTime"
-                        label="创建时间"
-                        width="130"
-                        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="完成时间"
-                        width="130"
-                        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="流程信息"
-                        width="130"
-                        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>
+            <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
         </div>
         <ProcessFooter
                 show-submit
diff --git a/src/pages/processCenter/pages/phone/bzjd/step6.vue b/src/pages/processCenter/pages/phone/bzjd/step6.vue
index 1abf42dab..45749cb27 100644
--- a/src/pages/processCenter/pages/phone/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/phone/bzjd/step6.vue
@@ -253,65 +253,7 @@
             </el-collapse>
         </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"
-                        width="130"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="assignee"
-                        label="任务受理人"
-                        align="center"
-                        width="130"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="createTime"
-                        label="创建时间"
-                        width="130"
-                        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="完成时间"
-                        width="130"
-                        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="流程信息"
-                        width="130"
-                        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>
+            <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
         </div>
         <ProcessFooter
                 show-submit