From 6823af0eaaf56b5541a3ee693cb32a989a2b296e Mon Sep 17 00:00:00 2001
From: liuhuaizhi <liuhuaizhi@91isoft.com>
Date: Thu, 22 Jul 2021 13:22:41 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix(45716=20=E8=BD=A6=E5=9E=8B=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=EF=BC=8C=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=EF=BC=8C=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E6=97=B6=E9=97=B4=E5=90=97=EF=BC=8C=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E5=8F=AA=E6=98=BE=E7=A4=BA=E5=B9=B4=E6=9C=88=E6=97=A5=20):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../localProductsOrProjectLibrary/pages/details.vue         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 88ed4d9b9..ba58aec42 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -24,8 +24,8 @@
           </el-row>
           <el-row style="margin-top: 10px">
             <el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.projectManager }} </span></el-col>
-            <el-col :span="5" :push="1"> 项目计划开始时间: <span class="valueColor">{{ localProEO.projectStartDate}}</span></el-col>
-            <el-col :span="5" :push="2">项目计划完成时间: <span class="valueColor">{{localProEO.projectEndDate  }} </span></el-col>
+            <el-col :span="5" :push="1"> 项目计划开始时间: <span class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD')}}</span></el-col>
+            <el-col :span="5" :push="2">项目计划完成时间: <span class="valueColor">{{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} </span></el-col>
           </el-row>
         </div>
       </el-card>
@@ -420,7 +420,7 @@ export default {
     okStand() {
       let _this = this;
       if (this.standList.length < 1) {
-        _this.$message.warning("请选择需要添加进清单的数据");
+        _this.$message.warning("请选择标准");
       } else {
         for (let i=0;i<this.dataList.length;i++){
           let newStand = false;

From 36e5704827402893e7f516d57a02933a042fe8df Mon Sep 17 00:00:00 2001
From: yangzijiao <yangzijiao@123.com>
Date: Thu, 22 Jul 2021 13:35:16 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/roleManage/index.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue
index ffe6f3326..993e50efe 100644
--- a/src/pages/config/pages/roleManage/index.vue
+++ b/src/pages/config/pages/roleManage/index.vue
@@ -32,14 +32,16 @@
                            class="common-button-primary add-button"
                            @click="roleAdd"
                            v-btn-permission="'93e75b6ec0b2b6b0b40d2b11adeba88a'"
-                           size="mini">配置角色资源</el-button>
+                           size="mini">配置角色权限</el-button>
                 <el-button type="primary"
                            class="common-button-primary add-button"
                            @click="roleAddData"
+                           v-btn-permission="'bb2571b08179edb36880aae169cb2e54'"
                            size="mini">配置数据权限</el-button>
                 <el-button type="primary"
                            class="common-button-primary add-button"
                            @click="RolesAdd(1)"
+                           v-btn-permission="'3e0cee86b3522d4233df8f1f11ab02c7'"
                            size="mini">新增角色</el-button>
             </div>
             <div class="content">
@@ -93,8 +95,8 @@
                                 <el-dropdown trigger="click" @command="handleCommand">
                                     <i class="iconfont">&#xe61e;</i>
                                     <el-dropdown-menu slot="dropdown">
-                                        <el-dropdown-item :command="[scope.row, '编辑']">编辑</el-dropdown-item>
-                                        <el-dropdown-item :command="[scope.row, '删除']">删除</el-dropdown-item>
+                                        <el-dropdown-item v-btn-permission="'38e362493fd7603dc7fddd1f3ac8971c'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
+                                        <el-dropdown-item v-btn-permission="'025368d14944c4c4c86da29109b5f383'" :command="[scope.row, '删除']">删除</el-dropdown-item>
                                     </el-dropdown-menu>
                                 </el-dropdown>
                             </div>

From 5a053ad174d472ca2fb407359400b969521d9aa9 Mon Sep 17 00:00:00 2001
From: yangzijiao <yangzijiao@123.com>
Date: Thu, 22 Jul 2021 13:40:19 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/navMenu/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index d5b998e22..2e85d241d 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -303,7 +303,7 @@ export default {
             {
               title: '菜单管理',
               path: '/menuManage',
-              menuId: '82665e94d406c6fc0d1f627e5880230b'
+              menuId: '87b8b4f5817a7829696e63185c744d52'
             },
             {
               title: '链接管理',

From a7ac33f6ed422f9aa4df278061f5dc9d5d3ccc79 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 22 Jul 2021 13:59:21 +0800
Subject: [PATCH 4/6] commit

---
 .../pages/creatProcess/bzdy/step2.vue         |  75 ++++++++-
 .../pages/creatProcess/bzdy/step3.vue         |  69 ++++++++
 .../pages/creatProcess/bzdy/step4.vue         |  69 ++++++++
 .../pages/creatProcess/bzdy/step5.vue         |  69 ++++++++
 .../pages/creatProcess/bzdy/step6.vue         |  69 ++++++++
 .../pages/creatProcess/bzdy/step7.vue         |  69 ++++++++
 .../pages/creatProcess/bzdy/step8.vue         |  75 ++++++++-
 .../pages/creatProcess/bzdy/step9.vue         |  75 ++++++++-
 .../pages/creatProcess/bzjd/step2.vue         |  69 ++++++++
 .../pages/creatProcess/bzjd/step3.vue         |  69 ++++++++
 .../pages/creatProcess/bzjd/step4.vue         |  69 ++++++++
 .../pages/creatProcess/bzjd/step5.vue         |  69 ++++++++
 .../pages/creatProcess/bzjd/step6.vue         |  69 ++++++++
 .../pages/creatProcess/bzzqyj/step1.vue       | 147 +++++-------------
 .../pages/creatProcess/bzzqyj/step2.vue       | 121 +++++++++-----
 .../pages/creatProcess/bzzqyj/step3.vue       |  69 ++++++++
 .../pages/creatProcess/bzzqyj/step4.vue       |  69 ++++++++
 .../pages/creatProcess/bzzqyj/step5.vue       |  69 ++++++++
 .../pages/creatProcess/bzzqyj/step6.vue       |  69 ++++++++
 .../pages/creatProcess/bzzqyj/step7.vue       |  69 ++++++++
 .../pages/creatProcess/bzzqyj/step8.vue       |  69 ++++++++
 .../pages/creatProcess/bzzqyj/step9.vue       |  69 ++++++++
 .../tabComponents/alreadyProcess/index.vue    |   3 +
 .../tabComponents/alreadySend/index.vue       |   3 +
 .../tabComponents/monitorProcess/index.vue    |   3 +
 25 files changed, 1516 insertions(+), 159 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
index 299d6dbe8..1c406b205 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -74,6 +75,65 @@
                 </el-collapse-item>
             </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"
+                        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>
+        </div>
         <ProcessFooter
                 show-submit
                 :submitLoading="isSubmit"
@@ -101,6 +161,7 @@
         name: "bzdyStep2",
         data() {
             return {
+                histortData: [],
                 commentText: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
@@ -134,6 +195,16 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
+            updateFile () {
+                window.location.href = '/api/att/attFile/downloadFile?fileId=' + this.form.model
+            },
             checkedRole2 (data) {
                 var idList = ''
                 var nameList = ''
@@ -148,9 +219,6 @@
                 this.form.responUserList = idList
                 this.form.responUserListName = nameList
             },
-            updateFile () {
-                window.location.href = '/api/att/attFile/downloadFile?fileId=' + this.form.model
-            },
             choiceZRR () {
                 this.nodeList2 = []
                 if ( this.form.responUserList.length > 0) {
@@ -205,6 +273,7 @@
         },
         mounted () {
             this.getData()
+            this.getHistoryData()
         }
     }
 </script>
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
index b12708de0..e334f183f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -86,6 +87,65 @@
                 </el-collapse-item>
             </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"
+                        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>
+        </div>
         <ProcessFooter
                 show-save
                 show-submit
@@ -126,6 +186,7 @@
         name: "bzdyStep3",
         data() {
             return {
+                histortData: [],
                 commentText: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
@@ -158,6 +219,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             updateFile () {
                 window.location.href = '/api/att/attFile/downloadFile?fileId=' + this.form.model
             },
@@ -249,6 +317,7 @@
         },
         mounted () {
             this.getData()
+            this.getHistoryData()
         }
     }
 </script>
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
index 11c25dc64..59b79f820 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -74,6 +75,65 @@
                 </el-collapse-item>
             </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"
+                        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>
+        </div>
         <ProcessFooter
                 show-save
                 show-submit
@@ -100,6 +160,7 @@
         name: "bzdyStep4",
         data() {
             return {
+                histortData: [],
                 commentText: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
@@ -133,6 +194,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             updateFile (fileId) {
                 window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId
             },
@@ -199,6 +267,7 @@
         },
         mounted () {
             this.getData()
+            this.getHistoryData()
         }
     }
 </script>
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
index d4156d554..4ddf7e974 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -113,6 +114,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') : '' }}</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>
+        </div>
         <ProcessFooter
                 show-save
                 show-submit
@@ -153,6 +213,7 @@
         name: "bzdyStep5",
         data() {
             return {
+                histortData: [],
                 commentText: '',
                 tableData: [],
                 taskIds: this.$route.query.taskIds,
@@ -182,6 +243,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             updateFile (fileId) {
                 window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId
             },
@@ -272,6 +340,7 @@
         },
         mounted () {
             this.getData()
+            this.getHistoryData()
         }
     }
 </script>
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
index 76ab545cb..d9e652faa 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -108,6 +109,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') : '' }}</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>
+        </div>
         <ProcessFooter
                 show-submit
                 show-back
@@ -150,6 +210,7 @@
         name: "bzdyStep6",
         data() {
             return {
+                histortData: [],
                 commentText: '',
                 tableData: [],
                 taskIds: this.$route.query.taskIds,
@@ -180,6 +241,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             updateFile (fileId) {
                 window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId
             },
@@ -285,6 +353,7 @@
             },
         },
         mounted () {
+            this.getHistoryData()
             this.getData()
         }
     }
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
index a9fb712bb..699657b95 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -108,6 +109,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') : '' }}</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>
+        </div>
         <ProcessFooter
                 show-submit
                 show-back
@@ -150,6 +210,7 @@
         name: "bzdyStep7",
         data() {
             return {
+                histortData: [],
                 commentText: '',
                 tableData: [],
                 taskIds: this.$route.query.taskIds,
@@ -180,6 +241,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             updateFile (fileId) {
                 window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId
             },
@@ -285,6 +353,7 @@
             },
         },
         mounted () {
+            this.getHistoryData()
             this.getData()
         }
     }
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
index 2dcffae27..220de8e65 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="bzdyStep7">
+    <div class="bzdyStep8">
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准调研流程</template>
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -108,6 +109,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') : '' }}</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>
+        </div>
         <ProcessFooter
                 show-submit
                 approval
@@ -147,9 +207,10 @@
     import {inboundLiaisonDetail} from 'api/process'
 
     export default {
-        name: "bzdyStep7",
+        name: "bzdyStep8",
         data() {
             return {
+                histortData: [],
                 commentText: '',
                 tableData: [],
                 taskIds: this.$route.query.taskIds,
@@ -180,6 +241,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             updateFile (fileId) {
                 window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId
             },
@@ -285,6 +353,7 @@
             },
         },
         mounted () {
+            this.getHistoryData()
             this.getData()
         }
     }
@@ -292,7 +361,7 @@
 
 <style lang="less" scoped>
     @import '~@/assets/styles/style';
-    .bzdyStep7 {
+    .bzdyStep8 {
         /deep/.el-drawer__container {
             .prc-content-border {
                 border: none;
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
index 9d5374da9..91fa08324 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="bzdyStep7">
+    <div class="bzdyStep9">
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准调研流程</template>
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -108,6 +109,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') : '' }}</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>
+        </div>
         <ProcessFooter
                 show-submit
                 show-back
@@ -147,9 +207,10 @@
     import {inboundLiaisonDetail} from 'api/process'
 
     export default {
-        name: "bzdyStep7",
+        name: "bzdyStep9",
         data() {
             return {
+                histortData: [],
                 commentText: '',
                 tableData: [],
                 taskIds: this.$route.query.taskIds,
@@ -180,6 +241,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             updateFile (fileId) {
                 window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId
             },
@@ -285,6 +353,7 @@
             },
         },
         mounted () {
+            this.getHistoryData()
             this.getData()
         }
     }
@@ -292,7 +361,7 @@
 
 <style lang="less" scoped>
     @import '~@/assets/styles/style';
-    .bzdyStep7 {
+    .bzdyStep9 {
         /deep/.el-drawer__container {
             .prc-content-border {
                 border: none;
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index fe5b7963d..ebf12321b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="overflow: auto;">
@@ -137,6 +138,65 @@
                 </el-collapse-item>
             </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"
+                        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>
+        </div>
         <ProcessFooter
                 show-save
                 show-submit
@@ -185,6 +245,7 @@
         name: "bzjdStep2",
         data() {
             return {
+                histortData: [],
                 sarType: '',
                 zxIndex: '',
                 zxType: '',
@@ -222,6 +283,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             drawerCheck2 (data) {
                 var getlist = this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes());
                 if(getlist.length == 1) {
@@ -349,6 +417,7 @@
             },
         },
         mounted () {
+            this.getHistoryData()
             this.getTree()
             this.getData()
         }
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 16e4c64d7..ec3179f4c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="overflow: auto;">
@@ -217,6 +218,65 @@
                 </el-collapse-item>
             </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"
+                        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>
+        </div>
         <ProcessFooter
                 show-save
                 show-submit
@@ -299,6 +359,7 @@
         name: "bzjdStep3",
         data() {
             return {
+                histortData: [],
                 plForm: {
                     technicalRequir: '', // 核心技术要求
                     changePoint: '', // 国内标准的差异点
@@ -334,6 +395,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             saveUserInfo () {
                 for( let a = 0; a < this.itemList.length; a++) {
                     for ( let b = 0; b < this.idList.length; b++) {
@@ -462,6 +530,7 @@
             },
         },
         mounted () {
+            this.getHistoryData()
             this.getData()
         }
     }
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index 3e40ba328..4d68f687d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="overflow: auto;">
@@ -190,6 +191,65 @@
                 </el-collapse-item>
             </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"
+                        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>
+        </div>
         <ProcessFooter
                 show-save
                 show-submit
@@ -215,6 +275,7 @@
         name: "bzjdStep4",
         data() {
             return {
+                histortData: [],
                 sarType: '',
                 itemList: [],
                 loading: false,
@@ -240,6 +301,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             handleTabs(name) {
                 this.active = name
             },
@@ -298,6 +366,7 @@
             },
         },
         mounted () {
+            this.getHistoryData()
             this.getData()
         }
     }
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index 72c8cca77..d8fbe2523 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="overflow: auto;">
@@ -190,6 +191,65 @@
                 </el-collapse-item>
             </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"
+                        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>
+        </div>
         <ProcessFooter
                 show-save
                 show-submit
@@ -215,6 +275,7 @@
         name: "bzjdStep5",
         data() {
             return {
+                histortData: [],
                 sarType: '',
                 itemList: [],
                 loading: false,
@@ -240,6 +301,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             handleTabs(name) {
                 this.active = name
             },
@@ -298,6 +366,7 @@
             },
         },
         mounted () {
+            this.getHistoryData()
             this.getData()
         }
     }
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index 93d7edd9b..c29c8e39e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="overflow: auto;">
@@ -191,6 +192,65 @@
                 </el-collapse-item>
             </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"
+                        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>
+        </div>
         <ProcessFooter
                 show-save
                 show-submit
@@ -216,6 +276,7 @@
         name: "bzjdStep6",
         data() {
             return {
+                histortData: [],
                 sarType: '',
                 itemList: [],
                 loading: false,
@@ -241,6 +302,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             handleTabs(name) {
                 this.active = name
             },
@@ -299,6 +367,7 @@
             },
         },
         mounted () {
+            this.getHistoryData()
             this.getData()
         }
     }
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index 4189c2423..4ba5eb275 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -242,57 +242,19 @@
         </div>
       </div>
     </el-drawer>
-    <el-drawer
-            :title="drawerTitle"
-            :visible.sync="modalshowflag"
-            :wrapperClosable="false"
-            size="800px">
-      <el-tree
-              v-if="modalshowflag"
-              node-key="id"
-              style="height: 100%; overflow: auto;"
-              class="filter-tree"
-              :data="treeData"
-              :props="defaultProps"
-              :default-checked-keys="nodeList"
-              highlight-current
-              check-strictly
-              @check="drawerCheck"
-              default-expand-all
-              :expand-on-click-node="false"
-              show-checkbox
-              ref="tree">
-      </el-tree>
-      <div id="roleFormButton" class="demo-drawer-footer">
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
-        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
-      </div>
-    </el-drawer>
-    <el-drawer
-            title="选择责任部门对接人"
-            :visible.sync="modalshowflag2"
-            :wrapperClosable="false"
-            size="800px">
-      <el-tree
-              v-if="modalshowflag2"
-              style="height: 100%; overflow: auto;"
-              node-key="id"
-              class="filter-tree"
-              :data="treeData"
-              :props="defaultProps"
-              :default-checked-keys="nodeList2"
-              highlight-current
-              check-strictly
-              default-expand-all
-              :expand-on-click-node="false"
-              show-checkbox
-              ref="tree2">
-      </el-tree>
-      <div id="roleFormButton2" class="demo-drawer-footer">
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
-        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>
-      </div>
-    </el-drawer>
+    <Role-tree
+            is-title="选择责任部门对接人"
+            :is-visible.sync="modalshowflag2"
+            @checkedRole="checkedRole2"
+            :nodeList="nodeList2"
+    ></Role-tree>
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="modalshowflag"
+            @checkedRole="checkedRole"
+            :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -370,18 +332,12 @@ export default {
           { required: true, message: '请选择工程研究院院长', trigger: 'change' },
         ]
       },
-      treeData: [],
       nodeList: [],
       nodeList2: [],
       type: '',
       drawerTitle: '',
       modalshowflag: false,
       modalshowflag2: false,
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      roleRow: {},
       standSortOptions: [],
     }
   },
@@ -391,7 +347,6 @@ export default {
     ProcessTitle
   },
   mounted () {
-    this.getTree()
     this.sarStandCompareHis()
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
@@ -491,54 +446,10 @@ export default {
     },
     /*** **********************************************/
     /** 流程节点负责人的选择 *****************************/
-    choiceZRR (type, title, id) {
-      this.nodeList = []
-      this.nodeList.push(id)
-      this.type = type
-      this.drawerTitle = title
-      this.modalshowflag = true
-    },
-    getTree () {
-      this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
-        this.treeData = res.data
-      })
-    },
-    saveUserInfo () {
-      if (this.type === 'ministerUser') {
-        this.roleForm.ministerUser = this.roleRow.id
-        this.roleForm.ministerUserName = this.roleRow.name
-      } else if (this.type === 'directorUser') {
-        this.roleForm.directorUser = this.roleRow.id
-        this.roleForm.directorUserName = this.roleRow.name
-      } else if (this.type === 'presidentUser') {
-        this.roleForm.presidentUser = this.roleRow.id
-        this.roleForm.presidentUserName = this.roleRow.name
-      }
-      this.modalshowflag = false
-    },
-    cancleUserInfo () {
-      this.modalshowflag = false
-    },
-    drawerCheck (data) {
-      var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
-      if(getlist.length == 1) {
-        this.roleRow = getlist[0]
-      }else {
-        this.$refs.tree.setCheckedKeys([data.id]);
-        this.roleRow = this.$refs.tree.getCheckedNodes()[0]
-      }
-    },
-    choiceZRRS () {
-      this.nodeList2 = []
-      if ( this.roleForm.dockUserList.length > 0) {
-        this.nodeList2 = this.roleForm.dockUserList.split(',')
-      }
-      this.modalshowflag2 = true
-    },
-    saveUserInfo2 () {
+    checkedRole2 (data) {
       var idList = ''
       var nameList = ''
-      this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => {
+      data.forEach( item => {
         if (nameList.length > 0) {
           nameList += ','
           idList += ','
@@ -548,10 +459,32 @@ export default {
       })
       this.roleForm.dockUserList = idList
       this.roleForm.dockUserListName = nameList
-      this.modalshowflag2 = false
     },
-    cancleUserInfo2 () {
-      this.modalshowflag2 = false
+    checkedRole (data) {
+      if (this.type === 'ministerUser') {
+        this.roleForm.ministerUser = data[0].id
+        this.roleForm.ministerUserName = data[0].name
+      } else if (this.type === 'directorUser') {
+        this.roleForm.directorUser = data[0].id
+        this.roleForm.directorUserName = data[0].name
+      } else if (this.type === 'presidentUser') {
+        this.roleForm.presidentUser = data[0].id
+        this.roleForm.presidentUserName = data[0].name
+      }
+    },
+    choiceZRRS () {
+      this.nodeList2 = []
+      if ( this.roleForm.dockUserList.length > 0) {
+        this.nodeList2 = this.roleForm.dockUserList.split(',')
+      }
+      this.modalshowflag2 = true
+    },
+    choiceZRR (type, title, id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.type = type
+      this.drawerTitle = title
+      this.modalshowflag = true
     },
     handleTabs(name) {
       this.active = name
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
index 6c33b73fb..06eb9fd69 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -74,6 +75,65 @@
                 </el-collapse-item>
             </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"
+                        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>
+        </div>
         <ProcessFooter
                 show-save
                 show-submit
@@ -83,31 +143,12 @@
                 @submit="handleSubmit"
         >
         </ProcessFooter>
-        <el-drawer
-                title="选择责任人"
-                :visible.sync="modalshowflag"
-                :wrapperClosable="false"
-                size="800px">
-            <el-tree
-                    v-if="modalshowflag"
-                    style="height: 100%; overflow: auto;"
-                    node-key="id"
-                    class="filter-tree"
-                    :data="treeData"
-                    :props="defaultProps"
-                    :default-checked-keys="nodeList"
-                    highlight-current
-                    check-strictly
-                    default-expand-all
-                    :expand-on-click-node="false"
-                    show-checkbox
-                    ref="tree">
-            </el-tree>
-            <div id="roleFormButton" class="demo-drawer-footer">
-                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
-                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
-            </div>
-        </el-drawer>
+        <Role-tree
+                is-title="选择责任部门对接人"
+                :is-visible.sync="modalshowflag"
+                @checkedRole="checkedRole2"
+                :nodeList="nodeList"
+        ></Role-tree>
     </div>
 </template>
 
@@ -121,17 +162,12 @@
         name: "bzzqyjStep2",
         data() {
             return {
+                histortData: [],
                 commentText: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
-                roleRow: {},
                 nodeList: [],
                 type: '',
-                defaultProps: {
-                    children: 'children',
-                    label: 'name'
-                },
-                treeData: [], // 人员数据
                 modalshowflag: false, // drawer开关
                 drawerTitle: '', //drawer标题
                 textarea: '', // 意见
@@ -160,10 +196,17 @@
             ProcessTitle
         },
         methods: {
-            saveUserInfo () {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
+            checkedRole2 (data) {
                 var idList = ''
                 var nameList = ''
-                this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()).forEach( item => {
+                data.forEach( item => {
                     if (nameList.length > 0) {
                         nameList += ','
                         idList += ','
@@ -173,10 +216,7 @@
                 })
                 this.form.responUserList = idList
                 this.form.responUserListName = nameList
-                this.modalshowflag = false
-            },
-            cancleUserInfo () {
-                this.modalshowflag = false
+
             },
             choiceZRR () {
                 this.nodeList = []
@@ -185,11 +225,6 @@
                 }
                 this.modalshowflag = true
             },
-            getTree () {
-                this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
-                    this.treeData = res.data
-                })
-            },
             handleTabs(name) {
                 this.active = name
             },
@@ -235,7 +270,7 @@
             },
         },
         mounted () {
-            this.getTree()
+            this.getHistoryData()
             this.getData()
         }
     }
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index 793a68287..3f2da573d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -123,6 +124,65 @@
                 </el-collapse-item>
             </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"
+                        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>
+        </div>
         <ProcessFooter
                 show-save
                 show-submit
@@ -145,6 +205,7 @@
         name: "bzzqyjStep3",
         data() {
             return {
+                histortData: [],
                 idList: [],
                 data: [],
                 commentText: '',
@@ -184,6 +245,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             handleSelectionChange (val) {
                 this.idList = []
                 val.forEach( item => {
@@ -293,6 +361,7 @@
             },
         },
         mounted () {
+            this.getHistoryData()
             this.getData()
         }
     }
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index 270c67bb6..bdc9dbb10 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -106,6 +107,65 @@
                 </el-collapse-item>
             </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"
+                        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>
+        </div>
         <ProcessFooter
                 show-save
                 show-submit
@@ -132,6 +192,7 @@
         name: "bzzqyjStep4",
         data() {
             return {
+                histortData: [],
                 data: [],
                 commentText: '',
                 taskIds: this.$route.query.taskIds,
@@ -170,6 +231,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             handleTabs(name) {
                 this.active = name
             },
@@ -229,6 +297,7 @@
             },
         },
         mounted () {
+            this.getHistoryData()
             this.getData()
         }
     }
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index 242bb8b39..83c9a4840 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -148,6 +149,65 @@
                 </el-collapse-item>
             </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"
+                        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>
+        </div>
         <ProcessFooter
                 show-save
                 show-submit
@@ -170,6 +230,7 @@
         name: "bzzqyjStep5",
         data() {
             return {
+                histortData: [],
                 oldData: [],
                 data: [],
                 commentText: '',
@@ -209,6 +270,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             changeInput (index) {
                 this.data[index].type = true
             },
@@ -282,6 +350,7 @@
             },
         },
         mounted () {
+            this.getHistoryData()
             this.getData()
         }
     }
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
index a04ced37a..000becab1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -123,6 +124,65 @@
                 </el-collapse-item>
             </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"
+                        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>
+        </div>
         <ProcessFooter
                 show-save
                 show-submit
@@ -149,6 +209,7 @@
         name: "bzzqyjStep6",
         data() {
             return {
+                histortData: [],
                 oldData: [],
                 data: [],
                 commentText: '',
@@ -188,6 +249,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             stateText (row) {
                 if (row === '1') {
                     return '上报'
@@ -302,6 +370,7 @@
             },
         },
         mounted () {
+            this.getHistoryData()
             this.getData()
         }
     }
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index 4b003a4c5..4bd4a2c47 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -123,6 +124,65 @@
                 </el-collapse-item>
             </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"
+                        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>
+        </div>
         <ProcessFooter
                 show-save
                 show-submit
@@ -149,6 +209,7 @@
         name: "bzzqyjStep7",
         data() {
             return {
+                histortData: [],
                 oldData: [],
                 data: [],
                 commentText: '',
@@ -188,6 +249,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             upload (row, title) {
                 var params = {
                     columnName: {
@@ -302,6 +370,7 @@
             },
         },
         mounted () {
+            this.getHistoryData()
             this.getData()
         }
     }
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
index 4a2cd66fd..a201de14c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -123,6 +124,65 @@
                 </el-collapse-item>
             </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"
+                        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>
+        </div>
         <ProcessFooter
                 show-save
                 show-submit
@@ -149,6 +209,7 @@
         name: "bzzqyjStep8",
         data() {
             return {
+                histortData: [],
                 oldData: [],
                 data: [],
                 commentText: '',
@@ -188,6 +249,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             upload (row, title) {
                 var params = {
                     columnName: {
@@ -302,6 +370,7 @@
             },
         },
         mounted () {
+            this.getHistoryData()
             this.getData()
         }
     }
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
index f7756a3c9..e161c4605 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
@@ -7,6 +7,7 @@
         </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>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -123,6 +124,65 @@
                 </el-collapse-item>
             </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"
+                        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>
+        </div>
         <ProcessFooter
                 show-save
                 show-submit
@@ -149,6 +209,7 @@
         name: "bzzqyjStep9",
         data() {
             return {
+                histortData: [],
                 oldData: [],
                 data: [],
                 commentText: '',
@@ -188,6 +249,13 @@
             ProcessTitle
         },
         methods: {
+            getHistoryData () {
+                this.$http.get('lawss/activiti/get_list_by_instance', {
+                    prcNum: this.$route.query.prcNum,
+                }, {}, res => {
+                    this.histortData = res
+                }, e => {})
+            },
             upload (row, title) {
                 var params = {
                     columnName: {
@@ -302,6 +370,7 @@
             },
         },
         mounted () {
+            this.getHistoryData()
             this.getData()
         }
     }
diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
index a139dea98..2e9643307 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
@@ -82,6 +82,9 @@
                   align="center"
                   width="180"
           >
+            <template slot-scope="scope">
+              <span>{{ getPrcName(scope.row.prcType) }}</span>
+            </template>
           </el-table-column>
           <el-table-column
                   prop="prcName"
diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
index ec7c033cb..647a5fd38 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
@@ -82,6 +82,9 @@
                   align="center"
                   width="180"
           >
+            <template slot-scope="scope">
+              <span>{{ getPrcName(scope.row.prcType) }}</span>
+            </template>
           </el-table-column>
           <el-table-column
                   prop="prcName"
diff --git a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
index 43a7c2803..32338e042 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
@@ -82,6 +82,9 @@
                   align="center"
                   width="180"
           >
+            <template slot-scope="scope">
+              <span>{{ getPrcName(scope.row.prcType) }}</span>
+            </template>
           </el-table-column>
           <el-table-column
                   prop="prcName"

From c7aebd4698779d10ee1a1c008e711ca608a3088a Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 22 Jul 2021 14:23:23 +0800
Subject: [PATCH 5/6] commit

---
 src/pages/processCenter/pages/creatProcess/bzjd/step1.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index 3a9d1d190..1ac24ea1b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -54,21 +54,21 @@
                                 <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
                                     <el-input
                                             disabled
-                                            v-model="form.itemsName1"
+                                            v-model="form.itemsNum1"
                                             clearable
                                     ></el-input>
                                 </el-form-item>
                                 <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
                                     <el-input
                                             disabled
-                                            v-model="form.name1"
+                                            v-model="form.itemsName1"
                                             clearable
                                     ></el-input>
                                 </el-form-item>
                                 <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
                                     <el-input
                                             disabled
-                                            v-model="form.name1"
+                                            v-model="form.itemsName1"
                                             clearable
                                     ></el-input>
                                 </el-form-item>

From 2b1677d62b2bb677612eb70105b5172d53fe5214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 22 Jul 2021 14:34:57 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg/step2.vue         |   2 -
 .../pages/creatProcess/xmpg2/step1.vue        | 400 +++++++++++++---
 .../pages/creatProcess/xmpg2/step2.vue        | 433 +++++++++++++++++-
 .../pages/creatProcess/xmpg2/step3.vue        | 406 ++++++++++++++++
 .../pages/creatProcess/xmpg2/step4.vue        |  13 +
 .../pages/creatProcess/xmpg2/step5.vue        |  13 +
 .../pages/creatProcess/xmpg2/step6.vue        |  13 +
 .../tabComponents/processCenter/index.vue     |  16 +
 src/router/index.js                           |  36 ++
 9 files changed, 1265 insertions(+), 67 deletions(-)
 create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index 3643f6062..307ae7832 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -55,8 +55,6 @@
         <process-title>
           <template slot="title">填写信息</template>
         </process-title>
-        <div class="tableTitle">
-        </div>
         <el-table
           :data="dataList"
           border
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index 5ef4d2c7b..a9de06a77 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -26,14 +26,14 @@
               <el-form-item label="选择项目" prop="orgName" class="add-form-item form-item-disabled">
                 <el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">选择项目</el-button>
               </el-form-item>
-              <el-form-item label="项目编号" prop="standNumber" class="add-form-item form-item-disabled">
+              <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.projectNumber"
                   placeholder="请输入项目编号"
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="项目名称" prop="standName" class="add-form-item form-item-disabled">
+              <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.projectName"
                   placeholder="请输入项目名称"
@@ -75,27 +75,36 @@
           >
           </el-table-column>
           <el-table-column
-            prop="SSRQ"
+            prop="ssrq"
             width="190px"
             align="center"
             sortable
             label="标准实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
-            prop="XCXSSRQGJ"
+            prop="xcxssrqgj"
             width="190px"
             align="center"
             label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
-            prop="ZCCSSRQGJ"
+            prop="zccssrqgj"
             align="center"
             sortable
             width="190px"
             label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
-            prop="ZRBM"
+            prop="zrbm"
             label="责任部门"
             align="center"
             width="180px"
@@ -103,29 +112,29 @@
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="KCCVPPSBM"
+            prop="kccvppsbm"
             width="180px"
             align="center"
             label="卡车VPPS编码">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="KCCVPPSCN"
+            prop="kccvppscn"
             width="180px"
             align="center"
             label="卡车vpps中文名称">
           </el-table-column>
           <el-table-column
-            prop="CYCVPPSBM"
+            prop="cycvppsbm"
             width="180px"
             align="center"
-            label="乘车VPPS编码">
+            label="乘用车VPPS编码">
           </el-table-column>
           <el-table-column
-            prop="CYCVPPSBM"
+            prop="cycvppscn"
             width="180px"
             align="center"
-            label="乘车vpps中文名称">
+            label="乘用车vpps中文名称">
           </el-table-column>
         </el-table>
       </div>
@@ -134,7 +143,7 @@
       <div class="block" style="padding-top: 20px;">
         <el-timeline>
           <el-form
-            ref="Form"
+            ref="roleForm"
             :model="roleForm"
             :rules="roleFormRules"
             class="label-input-form">
@@ -155,19 +164,22 @@
                   <h4>审批责任人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.serviceManager" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.serviceManagerName" placeholder="标准法规业务经理"@click.native="choiceZRR('serviceManager', '选择业务经理', roleForm.serviceManager)">
+                    <el-input v-model="roleForm.serviceManagerName" placeholder="标准法规业务经理"
+                              @click.native="choiceZRR('serviceManager', '选择业务经理', roleForm.serviceManager)">
                     </el-input>
                   </div>
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择工程经理进行转办" placement="top" :color="roleForm.engineeringManager ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="选择工程经理进行转办" placement="top"
+                              :color="roleForm.engineeringManager ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="engineeringManagerName" style="margin-bottom: 0">
                   <h4>工程经理</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.engineeringManager" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.engineeringManagerName" placeholder="选择工程经理" @click.native="choiceZRR('engineeringManager', '选择工程经理', roleForm.engineeringManager)"></el-input>
+                    <el-input v-model="roleForm.engineeringManagerName" placeholder="选择工程经理"
+                              @click.native="choiceZRR('engineeringManager', '选择工程经理', roleForm.engineeringManager)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -178,7 +190,8 @@
                   <h4>标准法规部部长</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.statuteMinister" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.statuteMinisterName" placeholder="选择标准法规部部长" @click.native="choiceZRR('statuteMinister', '选择技术管理中心主任', roleForm.statuteMinister)"></el-input>
+                    <el-input v-model="roleForm.statuteMinisterName" placeholder="选择标准法规部部长"
+                              @click.native="choiceZRR('statuteMinister', '选择技术管理中心主任', roleForm.statuteMinister)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -194,6 +207,111 @@
         :nodeList="nodeList"
       ></Role-tree>
     </div>
+    <ProcessFooter
+      show-save
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!-- 选择项目抽屉-->
+    <el-drawer
+      title="选择项目"
+      :visible.sync="projectModel"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="demo-drawer-content">
+        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <div class="left">
+              <el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                <el-form-item label="项目编号" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.projectNumber"
+                    placeholder="请输入项目编号"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="项目名称" class="search-item search-item-last">
+                  <el-input
+                    v-model="projectSearch.projectName"
+                    placeholder="请输入项目名称"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    :loading="searching"
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
+                    @click="getProjectData">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                    @click="clearSearch">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
+            <el-table
+              :data="ProjectDatas"
+              tooltip-effect="dark"
+              style="width: 100%"
+              border
+              height="100%"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+              @selection-change="selectListChange"
+              ref="selection"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center" />
+              <el-table-column
+                prop="projectNumber"
+                align="center"
+                label="项目编号"
+              />
+              <el-table-column
+                prop="projectName"
+                align="center"
+                label="项目名称"
+              />
+              <el-table-column
+                prop="projectClassification"
+                align="center"
+                label="项目分类"
+              />
+              <el-table-column
+                prop="projectManager"
+                align="center"
+                label="项目经理"
+              />
+            </el-table>
+          </div>
+          <pagination
+            :page="page"
+            :pageSize="pageSize"
+            :total="total"
+            @pageChange="pageChange"
+            @pageSizeChange="pageSizeChange"
+          />
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="closeDrawer">取消</el-button>
+        <el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
@@ -202,22 +320,28 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import { saveTaskFirst } from "api/process";
+
 export default {
   name: "xmpg2Step1",
   components: {
     ProcessFooter,
     ProcessHeader,
-    ProcessTitle,
+    ProcessTitle
   },
- data(){
+  data() {
     return {
-      active: '1',  //当前选中的type
+      active: "1",  //当前选中的type
+      isSubmit: false,
+      saveLoading: false,
       //表单的数据
       listForm: {
-        projectNumber:'',  //项目编号
-        projectName:'',   //项目名称
+        projectNumber: "",  //项目编号
+        projectName: "",  //项目名称
+        dataList: [], //项目下的标准数据
+        breakdownList: [], //标准下的分解单数据
       },
-      dataList:[], //下面标准的数据
+      dataList: [], //下面标准的数据
+      breakdownList: [], //标准下的条款数据
       //表单的验证
       formRules: {
         projectNumber: [
@@ -225,68 +349,220 @@ export default {
         ],
         projectName: [
           { required: true, message: "请填写项目名称", trigger: "change" }
-        ],
+        ]
       },
       //选人的验证
-      roleFormRules:{
-        serviceManagerName:[
-          {required: true, message:"请选择业务经理", trigger:"change"}
+      roleFormRules: {
+        serviceManagerName: [
+          { required: true, message: "请选择业务经理", trigger: "change" }
         ],
         engineeringManagerName: [
-          {required: true, message:"请选择工程经理", trigger:"change"}
+          { required: true, message: "请选择工程经理", trigger: "change" }
         ],
         statuteMinisterName: [
-          {required: true, message:"请选择法规部部长", trigger:"cahnge"}
-        ],
+          { required: true, message: "请选择法规部部长", trigger: "cahnge" }
+        ]
       },
       //选择人的数据
       roleForm: {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.userId,
-        serviceManager:'', //业务经理
-        serviceManagerName:'',
-        engineeringManager:'', //工程经理
-        engineeringManagerName:'',
-        statuteMinister:'', //标准法规部部长
-        statuteMinisterName:'',
+        serviceManager: "", //业务经理
+        serviceManagerName: "",
+        engineeringManager: "", //工程经理
+        engineeringManagerName: "",
+        statuteMinister: "", //标准法规部部长
+        statuteMinisterName: ""
       },
       modalshowflag: false, // drawer开关
-      drawerTitle: '', //drawer标题
+      drawerTitle: "", //drawer标题
       nodeList: [],
-    }
- },
+      projectModel: false,  //项目抽屉开关
+      projectId: "", //项目id 用来查询标准
+      standId: [], //标准id 用来条款
+      searching: false,
+      //项目检索条件
+      projectSearch: {
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        projectNumber: "",
+        projectName: ""
+      },
+      //项目数据
+      ProjectDatas: [],
+      page: 1,
+      pageSize: this.$store.getters.userInfo.configContent,
+      total: 0,
+      //存放被勾选的项目的数据
+      selectedList: []
+    };
+  },
   methods: {
     //tab发生变化
-    handleTabs(type){
-      this.active = type
+    handleTabs(type) {
+      this.active = type;
     },
     //点击选择项目事件
-    choiceShow(){
+    choiceShow() {
+      this.projectModel = true;
+    },
+    //获取项目数据
+    getProjectData() {
+      this.$http.get("sarStandProjectLibrary/queryProject", {
+        ...this.projectSearch
+      }, {
+        _this: this
+      }, res => {
+        this.ProjectDatas = res.data.Maintenance.records;
+      });
 
     },
-    //标准的多选框改变
-    selectStandChange(){
-
+    //点击清空按钮事件
+    clearSearch() {
+      this.projectSearch = {
+        projectName: "",
+        projectNumber: ""
+      };
+      this.getProjectData();
     },
-    choiceZRR (type, title, id) {
-      this.nodeList = []
-      this.nodeList.push(id)
-      this.type = type
-      this.drawerTitle = title
-      this.modalshowflag = true
-    },
-    checkedRole (data) {
-      if (this.type === 'serviceManager') {
-        this.roleForm.serviceManager = data[0].id
-        this.roleForm.serviceManagerName = data[0].name
-      } else if (this.type === 'engineeringManager') {
-        this.roleForm.engineeringManager = data[0].id
-        this.roleForm.engineeringManagerName = data[0].name
-      } else if (this.type === 'statuteMinister') {
-        this.roleForm.statuteMinister = data[0].id
-        this.roleForm.statuteMinisterName = data[0].name
+    //带入项目确定事件
+    OkDrawer() {
+      if (this.selectedList.length > 1) {
+        this.$message.warning("您只能选择一条数据进行带入");
+      } else if (this.selectedList.length === 0) {
+        this.$message.warning("请选择一条数据进行带入");
+      } else {
+        this.projectId = this.selectedList[0].id;
+        this.listForm.projectNumber = this.selectedList[0].projectNumber;
+        this.listForm.projectName = this.selectedList[0].projectName;
+        this.getStandData();
+        this.projectModel = false;
       }
     },
+    //带入项目取消事件
+    closeDrawer() {
+      this.projectModel = false;
+    },
+    //查询项目下的标准
+    getStandData() {
+      this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
+        _this: this
+      }, res => {
+        this.listForm.dataList = res.data.records;
+        this.dataList = res.data.records;
+        let ids = [];
+        this.dataList.forEach(item => {
+          ids.push(item.standId);
+        });
+        this.standId = ids.join(",");
+        this.getClauseData();
+      });
+    },
+    //查询标准下的条款
+    getClauseData() {
+      this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
+          ids: this.standId,
+          type: "FBGBJBD"
+        },
+        {
+          _this: this
+        }, res => {
+          this.listForm.breakdownList = res.data
+        });
+    },
+    //标准的多选框改变
+    selectStandChange(data) {
+    },
+    //项目的多选框改变
+    selectListChange(data) {
+      this.selectedList = data;
+    },
+    pageChange(page) {
+
+    },
+    pageSizeChange(pageSize) {
+
+    },
+    //流程保存事件
+    handleSave(){
+      this.saveLoading = true
+      let _formData = new FormData()
+      _formData.append('id', this.bpnId || '')
+      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      _formData.append('prcType', '2')
+      _formData.append('json', JSON.stringify({
+        form: this.form,
+        roleForm: this.roleForm,
+        commentText: this.commentText
+      }))
+      saveTaskFirst(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
+    },
+    //流程提交事件
+    handleSubmit(){
+          var json = Object.assign(this.listForm, this.roleForm)
+          json.prcCreateUser = this.$store.getters.userInfo.userId;
+          json.prcCreateUserName = this.$store.getters.userInfo.account;
+          json.standId = this.listForm.standId;
+          this.$refs['listForm'].validate((valid) => {
+            if (valid) {
+              this.$refs['roleForm'].validate((valid) => {
+                if (valid) {
+                  this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+                    _this: this
+                  }, res => {
+                    if (res.ok) {
+                      this.$http.post("lawss/activiti/completeTask", {
+                        taskIds: res.data,
+                        userId: this.$store.getters.userInfo.userId,
+                        json: JSON.stringify(json)
+                      }, {
+                        _this: this
+                      }, res => {
+                        if (res.success) {
+                          this.$message.success(res.message);
+                          this.$router.push("/processCenter");
+                        }
+                      });
+                    }
+                  });
+                } else {
+                  return this.$message.warning("请完善人员信息");
+                }
+              });
+            } else {
+              return this.$message.warning("请完善基础信息");
+            }
+          });
+    },
+    choiceZRR(type, title, id) {
+      this.nodeList = [];
+      this.nodeList.push(id);
+      this.type = type;
+      this.drawerTitle = title;
+      this.modalshowflag = true;
+    },
+    checkedRole(data) {
+      if (this.type === "serviceManager") {
+        this.roleForm.serviceManager = data[0].id;
+        this.roleForm.serviceManagerName = data[0].name;
+      } else if (this.type === "engineeringManager") {
+        this.roleForm.engineeringManager = data[0].id;
+        this.roleForm.engineeringManagerName = data[0].name;
+      } else if (this.type === "statuteMinister") {
+        this.roleForm.statuteMinister = data[0].id;
+        this.roleForm.statuteMinisterName = data[0].name;
+      }
+    }
+  },
+  mounted() {
+    this.getProjectData();
   }
 };
 </script>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
index a61c3a4a4..d94d6d0a7 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
@@ -1,13 +1,440 @@
 <template>
-
+  <div class="xmpg-step2">
+    <ProcessHeader toggle>
+      <template slot="proName">项目合规评估流程-项目</template>
+      <template slot="proNode">业务经理审批流程</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectNumber"
+                  placeholder="请输入项目编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectName"
+                  placeholder="请输入项目名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title style="margin-top:5px; margin-bottom: 5px">
+          <template slot="title">填写信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          ref="selection"
+          height="70%"
+          style="width: 100%; border:1px solid #ccc"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="standName"
+            align="center"
+            label="中文名称"
+            width="180px"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="standEnName"
+            label="英文名称"
+            align="center"
+            width="180px"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="190px"
+            align="center"
+            sortable
+            label="标准实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrqgj"
+            width="190px"
+            align="center"
+            label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zccssrqgj"
+            align="center"
+            sortable
+            width="190px"
+            label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zrbm"
+            label="责任部门"
+            align="center"
+            width="180px"
+          >
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="kccvppsbm"
+            width="180px"
+            align="center"
+            label="卡车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="kccvppscn"
+            width="180px"
+            align="center"
+            label="卡车vpps中文名称">
+          </el-table-column>
+          <el-table-column
+            prop="cycvppsbm"
+            width="180px"
+            align="center"
+            label="乘用车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            prop="cycvppscn"
+            width="180px"
+            align="center"
+            label="乘用车vpps中文名称">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list" style="height: 100%">
+        <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"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </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-back
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
 </template>
 
 <script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail } from "api/process";
+
 export default {
-  name: "xmpg2Step2"
+  name: "xmpg2Step2",
+  components: {
+    ProcessTitle,
+    ProcessHeader,
+    ProcessFooter
+  },
+  data() {
+    return {
+      active: "1",
+      loading: false,
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      isSubmit: false,
+      saveLoading: false,
+      //表单的数据
+      listForm: {
+        BZFlag: " ", //1审批通过 其他为驳回
+        projectNumber: "",  //项目编号
+        projectName: "",  //项目名称
+        dataList: [], //项目下的标准数据
+        breakdownList: [] //标准下的分解单数据
+      },
+      dataList: [], //展示的标准数据
+      commentText: "", //审批意见
+      detailData: [],//流程历史数据
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId
+    };
+  },
+  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 => {
+      });
+    },
+    //tab改变
+    handleTabs(type) {
+      this.active = type;
+    },
+    //获取数据
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          console.log(res.mesg);
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    //动态表单读取
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item));
+        this.listForm.prcNum = this.prcNum;
+        this.listForm.prcName = this.prcName;
+        this.listForm["id"] = item.id;
+        this.listForm.dataList = item.dataList;
+        this.dataList = item.dataList;
+        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        this.listForm.breakdownList = item.breakdownList;
+      });
+    },
+    //驳回事件
+    beforeBack() {
+      this.listForm.BZFlag = "2";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+      }, e => {
+      });
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.BZFlag = "1";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      console.log(json);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+      }, e => {
+      });
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+  }
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
 
+.xmpg-step2 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
new file mode 100644
index 000000000..90639dc8e
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
@@ -0,0 +1,406 @@
+<template>
+  <div class="xmpg-step2">
+    <ProcessHeader toggle>
+      <template slot="proName">项目合规评估流程-项目</template>
+      <template slot="proNode">工程经理进行转办</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectNumber"
+                  placeholder="请输入项目编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectName"
+                  placeholder="请输入项目名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title style="margin-top:5px; margin-bottom: 5px">
+          <template slot="title">填写信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          ref="selection"
+          height="70%"
+          style="width: 100%; border:1px solid #ccc"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="standName"
+            align="center"
+            label="中文名称"
+            width="180px"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="standEnName"
+            label="英文名称"
+            align="center"
+            width="180px"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="190px"
+            align="center"
+            sortable
+            label="标准实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrqgj"
+            width="190px"
+            align="center"
+            label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zccssrqgj"
+            align="center"
+            sortable
+            width="190px"
+            label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zrbm"
+            label="责任部门"
+            align="center"
+            width="180px"
+          >
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="kccvppsbm"
+            width="180px"
+            align="center"
+            label="卡车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="kccvppscn"
+            width="180px"
+            align="center"
+            label="卡车vpps中文名称">
+          </el-table-column>
+          <el-table-column
+            prop="cycvppsbm"
+            width="180px"
+            align="center"
+            label="乘用车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            prop="cycvppscn"
+            width="180px"
+            align="center"
+            label="乘用车vpps中文名称">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list" style="height: 100%">
+        <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"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </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-back
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail } from "api/process";
+
+export default {
+  name: "xmpg2Step3",
+  components: {
+    ProcessTitle,
+    ProcessHeader,
+    ProcessFooter
+  },
+  data() {
+    return {
+      active: "1",
+      loading: false,
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      isSubmit: false,
+      saveLoading: false,
+      //表单的数据
+      listForm: {
+        projectNumber: "",  //项目编号
+        projectName: "",  //项目名称
+        dataList: [], //项目下的标准数据
+        breakdownList: [] //标准下的分解单数据
+      },
+      dataList: [], //展示的标准数据
+      commentText: "", //审批意见
+      detailData: [] //流程历史数据
+    };
+  },
+  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 => {
+      });
+    },
+    //tab改变
+    handleTabs(type) {
+      this.active = type;
+    },
+    //获取数据
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          console.log(res.mesg);
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    //动态表单读取
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item));
+        this.listForm.prcNum = this.prcNum;
+        this.listForm.prcName = this.prcName;
+        this.listForm["id"] = item.id;
+        this.listForm.dataList = item.dataList;
+        this.dataList = item.dataList;
+        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        this.listForm.breakdownList = item.breakdownList;
+      });
+    },
+    //驳回事件
+    beforeBack() {
+
+    },
+    //提交事件
+    handleSubmit() {
+
+    },
+  },
+
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.xmpg-step2 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
new file mode 100644
index 000000000..d72a29695
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "xmpg2Step4"
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
new file mode 100644
index 000000000..aadb150b8
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "xmpg2Step5"
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
new file mode 100644
index 000000000..60a93e5dc
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "xmpg2Step6"
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 81daee6cb..1e44638e8 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -216,6 +216,7 @@ export default {
     dealWith (row) { // 办理
       this.setHandleInfo(JSON.stringify(row))
       const prcType = row.prcType
+      console.log(prcType);
       switch(prcType) {
         case '1':
           if (row.taskInfo === '标准法规业务经理审批') {
@@ -542,6 +543,21 @@ export default {
             })
           }
           break
+        //项目评估流程-项目
+          case '6':
+            if(row.taskInfo === '标准法规部业务经理审批'){
+              this.$router.push({
+                name: 'xmpg2Step2',
+                query: {
+                  taskIds: row.taskIds,
+                  prcId: row.prcId,
+                  prcNum: row.prcNum,
+                  prcName: row.prcName,
+                  prcType: row.prcType
+                }
+              })
+            }
+            break
         //未符合项整改流程
         case '8' :
           if(row.taskInfo === '下发至标准法规工程师'){
diff --git a/src/router/index.js b/src/router/index.js
index 3e7dd9d26..1e81556bc 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -357,6 +357,42 @@ const routes = [
           title: '项目合规评估流程-项目'
         }
       },
+      {
+        path: '/xmpg2Step3',
+        name: 'xmpg2Step3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目合规评估流程-项目'
+        }
+      },
+      {
+        path: '/xmpg2Step4',
+        name: 'xmpg2Step4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目合规评估流程-项目'
+        }
+      },
+      {
+        path: '/xmpg2Step5',
+        name: 'xmpg2Step5',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step5.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目合规评估流程-项目'
+        }
+      },
+      {
+        path: '/xmpg2Step6',
+        name: 'xmpg2Step6',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step6.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目合规评估流程-项目'
+        }
+      },
       {
         path: '/wfhxzgStep1',
         name: 'wfhxzgStep1',