Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

src/components/navMenu/index.vue

@@ -125,11 +125,11 @@ export default {
             // // //   title: '本地产品/项目库',
             // // //   path: '/localProductsOrProjectLibrary'
             // // // },
-            // {
+            {
-            //   title: '企业标准库',
+              title: '企业标准库',
-            //   path: '/enterpriseStandardDatabase',
+              path: '/enterpriseStandardDatabase',
-            //   menuId: '3YVZP8R4TC'
+              menuId: '01ed8f752748227777b3572d56ee9ab5'
-            // },
+            },
             // {
             //   title: '企标制修订计划',
             //   path: '/enterBSysRevPlanManaLib',
@@ -303,7 +303,7 @@ export default {
             {
               title: '菜单管理',
               path: '/menuManage',
-              menuId: '82665e94d406c6fc0d1f627e5880230b'
+              menuId: '87b8b4f5817a7829696e63185c744d52'
             },
             {
               title: '链接管理',

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 v-btn-permission="'38e362493fd7603dc7fddd1f3ac8971c'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
-                                        <el-dropdown-item :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>

src/pages/processCenter/pages/components/ProcessMixin.vue

@@ -22,7 +22,7 @@ export default {
               },
               {
                   label:'标准清单发布/更新流程',
-                  value: '6'
+                  value: '4'
               },
               {
                   label: '项目合规评估流程',

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>

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>

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>

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>

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()
         }
     }

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()
         }
     }

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;

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;

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>

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()
         }

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()
         }
     }

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()
         }
     }

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()
         }
     }

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()
         }
     }

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -1248,15 +1248,15 @@
                     // 适用范围
                     txlb: '', // 体系类别
                     gkdw: '', // 归口管理部门
-                    qcdw: [], // 起草单位
+                    qcdw: '', // 起草单位
-                    wssmr: [], // 我司署名人
+                    wssmr: '', // 我司署名人
                     cysd: '', // 我司参与深度
-                    cllx: [], // 适用车型
+                    cllx: '', // 适用车型
-                    nylx: [],// 能源类型
+                    nylx: '',// 能源类型
-                    sycpx: [],// 适用产品线
+                    sycpx: '',// 适用产品线
-                    syrz: [], // 适用认证
+                    syrz: '', // 适用认证
-                    zrbm: [], // 责任部门
+                    zrbm: '', // 责任部门
-                    zrgcs: [], // 责任工程师
+                    zrgcs: '', // 责任工程师
                     cycvppsbm: '', // 关联模块--乘用车VPPS编码
                     cycvppscn: '', // 关联模块--乘用车vpps中文名称
                     kccvppsbm: '', // 关联模块--卡车VPPS编码
@@ -1452,15 +1452,15 @@
                         // 适用范围
                         txlb: '', // 体系类别
                         gkdw: '', // 归口管理部门
-                        qcdw: [], // 起草单位
+                        qcdw: '', // 起草单位
-                        wssmr: [], // 我司署名人
+                        wssmr: '', // 我司署名人
                         cysd: '', // 我司参与深度
-                        cllx: [], // 适用车型
+                        cllx: '', // 适用车型
-                        nylx: [],// 能源类型
+                        nylx: '',// 能源类型
-                        sycpx: [],// 适用产品线
+                        sycpx: '',// 适用产品线
-                        syrz: [], // 适用认证
+                        syrz: '', // 适用认证
-                        zrbm: [], // 责任部门
+                        zrbm: '', // 责任部门
-                        zrgcs: [], // 责任工程师
+                        zrgcs: '', // 责任工程师
                         cycvppsbm: '', // 关联模块--乘用车VPPS编码
                         cycvppscn: '', // 关联模块--乘用车vpps中文名称
                         kccvppsbm: '', // 关联模块--卡车VPPS编码

src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue

@@ -242,57 +242,19 @@
         </div>
       </div>
     </el-drawer>
-    <el-drawer
+    <Role-tree
-            :title="drawerTitle"
+            is-title="选择责任部门对接人"
-            :visible.sync="modalshowflag"
+            :is-visible.sync="modalshowflag2"
-            :wrapperClosable="false"
+            @checkedRole="checkedRole2"
-            size="800px">
+            :nodeList="nodeList2"
-      <el-tree
+    ></Role-tree>
-              v-if="modalshowflag"
+    <Role-tree
-              node-key="id"
+            check-box
-              style="height: 100%; overflow: auto;"
+            :is-title="drawerTitle"
-              class="filter-tree"
+            :is-visible.sync="modalshowflag"
-              :data="treeData"
+            @checkedRole="checkedRole"
-              :props="defaultProps"
+            :nodeList="nodeList"
-              :default-checked-keys="nodeList"
+    ></Role-tree>
-              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>
   </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) {
+    checkedRole2 (data) {
-      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 () {
       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 () {
+    checkedRole (data) {
-      this.modalshowflag2 = false
+      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

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
+        <Role-tree
-                title="选择责任人"
+                is-title="选择责任部门对接人"
-                :visible.sync="modalshowflag"
+                :is-visible.sync="modalshowflag"
-                :wrapperClosable="false"
+                @checkedRole="checkedRole2"
-                size="800px">
+                :nodeList="nodeList"
-            <el-tree
+        ></Role-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>
     </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()
         }
     }

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()
         }
     }

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()
         }
     }

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()
         }
     }

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()
         }
     }

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()
         }
     }

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()
         }
     }

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()
         }
     }

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"

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"

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"

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -764,13 +764,13 @@
               <el-form :model="sarConfigStandSearch" :inline="true" class="label-input-form">
                 <el-formItem label="标准类别" prop="standSort" class="search-item">
                   <el-select v-model="sarConfigStandSearch.standSort" placeholder="根据标准类别查找"
-                             @keyup.enter.native="searchConfiguraStand" clearable>
+                             @keyup.enter.native="searchConfiguraStand(true)" clearable>
                     <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}
                     </el-option>
                   </el-select>
                 </el-formItem>
                 <el-formItem label="标准号/名称" prop="standNumber" class="search-item">
-                  <el-input v-model="sarConfigStandSearch.standNumber" @keyup.enter.native="searchConfiguraStand"
+                  <el-input v-model="sarConfigStandSearch.standNumber" @keyup.enter.native="searchConfiguraStand(true)"
                             placeholder="根据标准号/名称查找" clearable/>
                 </el-formItem>
                 <el-form-item label="" class="search-item btn-box">

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -4,27 +4,43 @@
 <!--左侧树-->
     <div class="tree-content" :class="{ 'tree-closed': sideClose }" >
       <div class="tree">
-        <laws-tree :zNodes="lawsZNodes"
+          <el-tree
-                   ref="enterpriseStandardTree"
+                  ref="tree"
-                   treeDivId="enterpriseStandardTree"
+                  node-key="id"
-                   :deptSelect = true
+                  class="filter-tree"
-                   showRMenu
+                  :props="props"
-                   autoSelect
+                  :data="treeList"
-                   add-id="TB9979T4Y4"
+                  highlight-current
-                   edit-id="AES4L4E52G"
+                  @node-click="treeClick"
-                   remove-id="4PP7QBKXSQ"
+                  default-expand-all
-                   :drag="hasPermissionDrag"
+                  :expand-on-click-node="false">
-                   drag-bind=".drag-table"
+                <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
-                   :hideRMenuNode="['wdsc']"
+                        <span> {{ node.label}} </span>
-                   drag-dom="drag-row"
+                        <span>
-                   v-if="treeReload"
+                          <el-button
-                   @treeAdd="(treeId, treeNode) => clickDropMenu('newMenu', treeNode)"
+                                  type="text"
-                   @treeEdit="(treeId, treeNode) => clickDropMenu('editMenu', treeNode)"
+                                  size="mini"
-                   @treeClick="(treeId, treeNode) => treeClick(treeNode)"
+                                  v-show="data.show"
-                   @treeRightClick="(treeId, treeNode) => treeRightClick(treeNode)"
+                                  @click="() => append(data)">
-                   @treeRemove="(treeId, treeNode) => clickDropMenu('deleteMenu', treeNode)"
+                            新增
-                   @drag="drag"
+                          </el-button>
-        ></laws-tree>
+                          <el-button
+                                  type="text"
+                                  size="mini"
+                                  v-show="data.show"
+                                  @click="() => update(data)">
+                            编辑
+                          </el-button>
+                          <el-button
+                                  type="text"
+                                  size="mini"
+                                  v-show="data.showDel"
+                                  @click="() => remove(node, data)">
+                            删除
+                          </el-button>
+                        </span>
+                      </span>
+          </el-tree>
       </div>
       <div class="tree-collapse" @click="treeCollapse" :class="{ 'tree-close': sideClose }">
         <!--切换折叠样式-->
@@ -860,6 +876,64 @@
       }"
         @confirm="isTreeOk"
     ></org-table>
+      <!-- 新建抽屉 -->
+      <el-drawer
+              :wrapperClosable="false"
+              :title="productTitle"
+              :visible.sync="productModal"
+              size="800px"
+              :before-close="closeDrawer"
+              label-width="130px"
+      >
+          <div class="demo-drawer-content">
+              <el-form :model="productModelAdd"
+                       ref="productModelAdd"
+                       :rules="productRules"
+                       class="label-input-form"
+                       label-width="130px">
+                  <el-row>
+                      <el-col>
+                          <el-form-item label="菜单名称" prop="menuName" class="add-form-item">
+                              <el-input v-model.trim="productModelAdd.menuName" placeholder="请输入菜单名称" clearable></el-input>
+                          </el-form-item>
+                      </el-col>
+                      <el-col>
+                          <el-form-item label="排序号" prop="displaySeq" class="add-form-item">
+                              <el-input v-model.number="productModelAdd.displaySeq"
+                                        number
+                                        placeholder="请输入排序号"
+                                        :maxlength="4"
+                                        clearable></el-input>
+                          </el-form-item>
+                      </el-col>
+                      <el-col>
+                          <el-form-item v-if="modalType === 2" label="上级菜单" prop="parentIdsName" class="add-form-item">
+                              <el-input v-model="productModelAdd.parentIdsName" disabled
+                                        clearable></el-input>
+                          </el-form-item>
+                      </el-col>
+                      <el-col>
+                          <el-form-item label="描述" prop="remarks" class="add-form-item">
+                              <el-input v-model.trim="productModelAdd.remarks"
+                                        placeholder="请输入描述"
+                                        clearable></el-input>
+                          </el-form-item>
+                      </el-col>
+                  </el-row>
+              </el-form>
+          </div>
+          <div class="demo-drawer-footer">
+              <el-button
+                      class="common-button-primary"
+                      icon="el-icon-check"
+                      type="primary"
+                      @click="saveProduct('productModelAdd')">提交</el-button>
+              <el-button
+                      class="common-button-default"
+                      icon="el-icon-close"
+                      @click="closeModal">取消</el-button>
+          </div>
+      </el-drawer>
   </div>
 </template>
 
@@ -893,6 +967,60 @@ export default {
   },
   data () {
     return {
+      props: {
+        label: 'menuName',
+      children: 'children'
+      },
+        productModal: false, // 模态框是否打开
+        modalType: '',
+        productTitle: '', // 模态框标题
+        // 规范
+        productRules: {
+            menuName: [
+                {required: true, message: '一级菜单不能为空', trigger: 'blur'},
+                {type: 'string', max: 100, message: '最多输入100位', trigger: 'blur'}
+            ],
+            displaySeq: [
+                {type: 'number', required: true, message: '排序号不能为空且为正整数', trigger: 'blur'},
+                {type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'}
+            ],
+            remarks: [
+                {type: 'string', max: 500, message: '最多输入500位', trigger: 'blur'}
+            ],
+            dicTypeName: [
+                {required: true, message: '选项不能为空', trigger: 'blur'},
+                {type: 'string', max: 100, message: '最多输入100位', trigger: 'blur'}
+            ],
+            showIndex: [
+                {type: 'number', required: true, message: '排序号不能为空且为正整数', trigger: 'blur'},
+                {type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'}
+            ],
+            describes: [
+                {type: 'string', max: 500, message: '最多输入500位', trigger: 'blur'}
+            ]
+        },
+        productModelAdd: {
+            id : "",
+            sorDivide : "INLAND_STAND",
+            menuName : "",
+            parentId : null,
+            parentIds : null,
+            parentIdsName : "",
+            displaySeq : "",
+            validFlag : "",
+            creationTime : "",
+            modifyTime : "",
+            remarks : "",
+            children : [],
+            // 模态框信息
+            dicTypeName: '',
+            showIndex: '',
+            // 描述
+            describes: '',
+            // 唯一辨识
+            dicId: ""
+        },
+      treeList: [],
       standId: '',
       visibleOrgTable: false,
       visibleShare: false,
@@ -1423,6 +1551,183 @@ export default {
     }
   },
   methods: {
+      closeModal () {
+          this.productModal = false
+          this.closeDrawer()
+      },
+      // 提交新增/修改
+      saveProduct (name) {
+          this.$refs[name].validate((valid) => {
+              if (valid) {
+                  if (this.modalType === 1) {
+                      this.$http.postData('sarResource/ts-resource/add', this.productModelAdd, {
+                          _this: this
+                      }, res => {
+                          if (res.ok) {
+                              this.selectMenuList()
+                              this.productModal = false
+                              this.productModelAdd = {
+                                  // 模态框信息
+                                  dicTypeName: '',
+                                  showIndex: '',
+                                  // 描述
+                                  describes: '',
+                                  // 唯一辨识
+                                  dicId: this.$route.params.id
+                              }
+                          } else {
+                              this.productModal = true
+                          }
+                      }, e => {})
+                  } else if (this.modalType === 2) {
+                      this.$http.putData('sarResource/ts-resource', this.productModelAdd, {
+                          _this: this
+                      }, res => {
+                          this.selectMenuList()
+                          this.productModal = false
+                          this.productModelAdd = {
+                              // 模态框信息
+                              dicTypeName: '',
+                              showIndex: '',
+                              // 描述
+                              describes: '',
+                              // 唯一辨识
+                              dicId: this.$route.params.id
+                          }
+                      }, e => {
+                      })
+                  }
+              } else {
+              }
+          })
+      },
+      closeDrawer () {
+          this.$nextTick(() => {
+              this.$refs['productModelAdd'].resetFields()
+              this.productModelAdd = {
+                  // 模态框信息
+                  dicTypeName: '',
+                  showIndex: '',
+                  // 描述
+                  describes: '',
+                  // 唯一辨识
+                  dicId: this.$route.params.id
+              }
+          })
+          this.productModal = false
+      },
+      // 查询二级菜单
+      selectMenuList () {
+          this.$http.get('sarResource/ts-resource', {
+              sorDivide: 'BUSINESS_STAND'
+          }, {}, res => {
+              if (res.ok) {
+                  this.treeList = res.data
+              }
+          })
+      },
+      // 查询二级菜单
+      selectChildMenu (row) {
+          this.$http.get('sarResource/ts-resource/getMenuById', {
+              menuId: row.id
+          }, {}, res => {
+              if (res.ok) {
+                  if(this.modalType === 1){
+                      let idsName = ""
+                      if(row.parentIds !== null){
+                          if(row.parentIds.indexOf(res.data.id) != -1){
+                              this.productModelAdd.parentIds = row.parentIds
+                          }else {
+                              this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id
+                              idsName = row.parentIdsName + ',' + res.data.menuName
+                          }
+                      }else {
+                          this.productModelAdd.parentIds = res.data.id
+                          idsName = res.data.menuName;
+                      }
+                      this.productModelAdd.parentId = res.data.id
+                      this.productModelAdd.parentIdsName = idsName
+                      this.$forceUpdate()
+                  }else {
+                      this.productModelAdd = res.data
+                  }
+              }
+          })
+      },
+      update(data) {
+          this.modalType = 2
+          this.selectChildMenu(data)
+          this.productModal = true
+          this.productTitle = '编辑信息'
+          // const newChild = { id: this.id++, label: 'testtest', children: [] };
+          // if (!data.children) {
+          //     this.$set(data, 'children', []);
+          // }
+          // data.children.push(newChild);
+      },
+
+      append(data) {
+          this.modalType = 1
+          this.selectChildMenu(data)
+          this.productModal = true
+          this.productTitle = '新增下级菜单信息'
+          this.productModelAdd.dicTypeCode = ''
+          // const newChild = { id: this.id++, label: 'testtest', children: [] };
+          // if (!data.children) {
+          //     this.$set(data, 'children', []);
+          // }
+          // data.children.push(newChild);
+      },
+
+      remove(node, data) {
+          this.$confirm('是否删除菜单?', '提示', {
+              confirmButtonText: '确定',
+              confirmButtonClass: 'common-button-primary',
+              cancelButtonText: '取消',
+              roundButton: true,
+              type: 'warning'
+          }).then(() => {
+              this.$http.delete("sarResource/ts-resource", {
+                  resourceId: data.id
+              }, res => {
+              }, e => {
+                  if(e.ok){
+                      this.$message({
+                          type: 'success',
+                          message: "删除成功"
+                      })
+                      this.selectMenuList()
+                  }else {
+                      this.$message({
+                          type: 'warning',
+                          message: e.message
+                      })
+                  }
+              })
+          }).catch(() => {
+              this.$refs.selections.clearSelection()
+              this.$message({
+                  type: 'info',
+                  message: '已取消删除'
+              })
+          })
+          // const parent = node.parent;
+          // const children = parent.data.children || parent.data;
+          // const index = children.findIndex(d => d.id === data.id);
+          // children.splice(index, 1);
+      },
+      // 树节点鼠标移入移出
+      mouseenter(data){
+          console.log(data)
+          this.$set(data, 'show', true)
+          if(data.parentId !== null){
+              this.$set(data, 'showDel', true)
+          }
+      },
+      mouseleave(data){
+          this.$set(data, 'show', false)
+          this.$set(data, 'showDel', false)
+      },
     /**
      * @description: 起草人名称展示
      * @author: chenxiaoxi
@@ -3147,7 +3452,7 @@ export default {
   mounted () {
     this.treeReload = true
     // 进入页面后查询树形结构目录
-    this.selectMenu()
+    this.selectMenuList()
     // 查询各下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
@@ -3194,7 +3499,7 @@ export default {
     height: 100%;
     //background: #fff;
     .tree-content {
-      width: 16%;
+      width: 20%;
       position: relative;
       /*height: 100%;*/
       background: #fff;

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="1"> 项目计划开始时间: <span class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD')}}</span></el-col>
-            <el-col :span="5" :push="2">项目计划完成时间: <span class="valueColor">{{localProEO.projectEndDate  }} </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;