Merge remote-tracking branch 'origin/develop' into develop

src/pages/config/pages/mechanismManage/index.vue

@@ -70,9 +70,12 @@
             label="所属岗位">
           </el-table-column>
           <el-table-column
-            prop="state"
             label="状态"
             width="170px">
+            <template slot-scope="scope">
+              <div v-if="scope.row.disableFlag === '1'">已禁用</div>
+              <div v-else>已启用</div>
+            </template>
           </el-table-column>
           <el-table-column
             label="操作"

src/pages/home1/components/searchGroup/index.vue

@@ -2,26 +2,27 @@
 <template>
   <div class="search-group">
     <el-select
-      v-model="selectKey"
+      v-model="checkState"
       class="search-group-item"
       placeholder="请选择"
     >
       <el-option
         v-for="item in jumpPage"
-        :key="item.selectKey"
+        :key="item.value"
         :label="item.label"
-        :value="item.selectKey"
+        :value="item.value"
       ></el-option>
     </el-select>
 
     <div class="search-condition">
       <el-input
-        v-model="keywords"
+        @keyup.native.enter="search"
+        v-model="checkContent">
         type="text"
         placeholder="请输入关键词"
         clearable
       ></el-input>
-      <el-button class="primary_button" type="primary">搜索</el-button>
+      <el-button class="primary_button" type="primary" @click="search">搜索</el-button>
     </div>
   </div>
 </template>
@@ -33,36 +34,50 @@ export default {
   mixins: [],
   data() {
     return {
-      selectKey: '',
+      // 当前查询状态
-      keywords: '',
+      checkState: 'All',
+      // 查询内容
+      checkContent: '',
       jumpPage: [
         {
-          selectKey: '选项1',
+          label: '全部',
-          label: '国内外标准法规',
+          value: 'All'
         },
         {
-          selectKey: '选项2',
+          label: '国内标准法规',
-          label: '研究报告',
+          value: 'stand'
+        },
+        {
+          label: '海外标准法规', // value没改
+          value: 'bussstand'
+        },
+        {
+          label: '国内外政策',
+          value: 'laws'
         },
         {
-          selectKey: '选项3',
           label: '企业标准',
-        },
+          value: 'enterprise'
-        {
+        }
-          selectKey: '选项4',
-          label: '动态&通知',
-        },
-        {
-          selectKey: '选项5',
-          label: '流程中心',
-        },
       ],
     }
   },
   computed: {},
   watch: {},
-  mounted() {},
+  methods: {
-  methods: {},
+    search() {
+      this.$router.push({
+        name: 'StandardSearch',
+        params: {
+          selectKey: this.checkState,
+          searchValue: this.checkContent || undefined
+        }
+      })
+    },
+  },
+  mounted(){
+
+  },
 }
 </script>
 

src/pages/home1/components/solicitopinions/index.vue

@@ -43,12 +43,13 @@ export default {
        } )
     },
     standForComments (item) {
+      this.$store.commit('setDetailMap',this.$router.path)
       this.$router.push({
-           name:'standardForComments',
+        name: 'consultationDetails',
-           params: {
+        query: {
-             id: item.id
+          item: item
         }
-         },)
+      })
     },
   },
 }

src/pages/localTool/standAutoSplit/index.vue

@@ -108,21 +108,21 @@
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="''">查看</el-dropdown-item>
-                    <el-dropdown-item
+<!--                    <el-dropdown-item-->
-                        v-if="scope.row.collectBtn"
+<!--                        v-if="scope.row.collectBtn"-->
-                        :command="[scope.row, '收藏']"
+<!--                        :command="[scope.row, '收藏']"-->
-                        v-btn-permission="''"
+<!--                        v-btn-permission="''"-->
-                    >
+<!--                    >-->
-                      收藏
+<!--                      收藏-->
-                    </el-dropdown-item>
+<!--                    </el-dropdown-item>-->
-                    <el-dropdown-item
+<!--                    <el-dropdown-item-->
-                        v-else
+<!--                        v-else-->
-                        :command="[scope.row, '取消收藏']"
+<!--                        :command="[scope.row, '取消收藏']"-->
-                        v-btn-permission="''"
+<!--                        v-btn-permission="''"-->
-                    >
+<!--                    >-->
-                      取消收藏
+<!--                      取消收藏-->
-                    </el-dropdown-item>
+<!--                    </el-dropdown-item>-->
-                    <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="''">分享</el-dropdown-item>
+<!--                    <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="''">分享</el-dropdown-item>-->
 <!--                    <el-dropdown-item :command="[scope.row, '关联']">关联</el-dropdown-item>-->
                     <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>
                   </el-dropdown-menu>

src/pages/personal/pages/individual-plate/index.vue

@@ -192,7 +192,7 @@ export default {
       height:100% !important;
     }
     .el-transfer-panel__list.is-filterable {
-      height: 360px;
+      height: calc(~'100% - 100px');
       padding-top: 0;
       overflow-y: auto;
     }

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

@@ -91,7 +91,7 @@
                   <h4>流程发起人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人"></el-input>
+                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -101,8 +101,8 @@
                 <el-form-item prop="dockUserName" style="margin-bottom: 0">
                   <h4>责任部门对接人</h4>
                   <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.dockUserList" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" placeholder="选择责任人" @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
+                    <el-input v-model="roleForm.dockUserName" placeholder="选择责任人" @click.native="choiceZRRS">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -154,6 +154,31 @@
         @submit="handleSubmit"
     >
     </ProcessFooter>
+    <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>
     <el-drawer
             :title="drawerTitle"
             :visible.sync="modalshowflag"
@@ -247,7 +272,7 @@ export default {
       roleForm: {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.userId,
-        dockUser: '',
+        dockUserList: '',
         responUserList: '',
         ministerUser: '',
         directorUser: '',
@@ -274,6 +299,9 @@ export default {
       },
       fileUrl: 'api/att/attFile/upload',
       fileMadel: false,
+      nodeList2: [],
+      modalshowflag2: false,
+
     }
   },
   components: {
@@ -282,6 +310,31 @@ export default {
     ProcessTitle
   },
   methods: {
+    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 => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.name
+      })
+      this.roleForm.dockUserList = idList
+      this.roleForm.dockUserName = nameList
+      this.modalshowflag2 = false
+    },
+    cancleUserInfo2 () {
+      this.modalshowflag2 = false
+    },
     // 导入按钮 上传之前的钩子
     beginImportFile (file) {
       var filename = file.name
@@ -372,6 +425,7 @@ export default {
         if (valid) {
           this.$refs['Form'].validate((valid) => {
             if (valid) {
+              this.isSubmit = true
               this.$http.get('lawss/activiti/startProcess', {
                 type: '2'
               }, {}, res => {
@@ -391,6 +445,7 @@ export default {
                 } else {
                   this.$message.warning('流程启动失败')
                 }
+                this.isSubmit = false
               })
             } else {
               return this.$message.warning('请完善人员信息')

src/pages/processCenter/pages/creatProcess/bzdy/step2.vue

@@ -200,6 +200,7 @@
             handleSubmit() {
                 this.$refs['qbkwForm'].validate((valid) => {
                     if (valid) {
+                        this.isSubmit = true
                         var json = this.json
                         json.commentText = this.commentText
                         json.responUserList = this.form.responUserList
@@ -213,6 +214,7 @@
                                 this.$message.success('提交成功')
                                 this.$router.push('/processCenter')
                             }
+                            this.isSubmit = false
                         })
                     } else {
                         return this.$message.warning('请完善基础信息')

src/pages/processCenter/pages/creatProcess/bzdy/step3.vue

@@ -209,6 +209,7 @@
             handleSubmit() {
                 this.$refs['qbkwForm'].validate((valid) => {
                     if (valid) {
+                        this.isSubmit = true
                         var json = this.json
                         json.commentText = this.commentText
                         json.fileId = this.form.fileId
@@ -222,6 +223,7 @@
                                 this.$message.success('提交成功')
                                 this.$router.push('/processCenter')
                             }
+                            this.isSubmit = false
                         })
                     } else {
                         return this.$message.warning('请完善基础信息')

src/pages/processCenter/pages/creatProcess/bzdy/step4.vue

@@ -141,6 +141,7 @@
             },
             handleSave() {},
             handleSubmit() { // 同意
+                this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
                 json.commentText = this.commentText
@@ -153,10 +154,12 @@
                         this.$message.success('提交成功')
                         this.$router.push('/processCenter')
                     }
+                    this.isSubmit = false
                 })
             },
             handleSubmitNo() {
                 if (this.commentText) {
+                    this.isSubmit = true
                     var json = this.json
                     json.actionFlag = 1
                     json.commentText = this.commentText
@@ -169,6 +172,7 @@
                             this.$message.success('驳回成功')
                             this.$router.push('/processCenter')
                         }
+                        this.isSubmit = false
                     })
                 } else {
                     this.$message.warning('请输入反馈意见')

src/pages/processCenter/pages/creatProcess/bzdy/step5.vue

@@ -233,6 +233,7 @@
             handleSubmit() {
                 this.$refs['qbkwForm'].validate((valid) => {
                     if (valid) {
+                        this.isSubmit = true
                         var json = this.json
                         json.commentText = this.commentText
                         json.hzfileId = this.form.hzfileId
@@ -246,6 +247,7 @@
                                 this.$message.success('提交成功')
                                 this.$router.push('/processCenter')
                             }
+                            this.isSubmit = false
                         })
                     }
                 })

src/pages/processCenter/pages/creatProcess/bzdy/step6.vue

@@ -229,6 +229,7 @@
             },
             handleSave() {},
             handleSubmit() {
+                this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
                 json.commentText = this.commentText
@@ -241,10 +242,12 @@
                         this.$message.success('提交成功')
                         this.$router.push('/processCenter')
                     }
+                    this.isSubmit = false
                 })
             },
             handleSubmitNo() {
                 if (this.commentText) {
+                    this.isSubmit = true
                     var json = this.json
                     json.actionFlag = 1
                     json.commentText = this.commentText
@@ -257,6 +260,7 @@
                             this.$message.success('驳回成功')
                             this.$router.push('/processCenter')
                         }
+                        this.isSubmit = false
                     })
                 } else {
                     this.$message.warning('请输入反馈意见')

src/pages/processCenter/pages/creatProcess/bzdy/step7.vue

@@ -229,6 +229,7 @@
             },
             handleSave() {},
             handleSubmit() {
+                this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
                 json.commentText = this.commentText
@@ -241,10 +242,12 @@
                         this.$message.success('提交成功')
                         this.$router.push('/processCenter')
                     }
+                    this.isSubmit = false
                 })
             },
             handleSubmitNo() {
                 if (this.commentText) {
+                    this.isSubmit = true
                     var json = this.json
                     json.commentText = this.commentText
                     json.actionFlag = 1
@@ -257,6 +260,7 @@
                             this.$message.success('驳回成功')
                             this.$router.push('/processCenter')
                         }
+                        this.isSubmit = false
                     })
                 } else {
                     this.$message.warning('请输入反馈意见')

src/pages/processCenter/pages/creatProcess/bzdy/step8.vue

@@ -229,6 +229,7 @@
             },
             handleSave() {},
             handleSubmit() {
+                this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
                 json.commentText = this.commentText
@@ -241,10 +242,12 @@
                         this.$message.success('提交成功')
                         this.$router.push('/processCenter')
                     }
+                    this.isSubmit = false
                 })
             },
             handleSubmitNo() {
                 if (this.commentText) {
+                    this.isSubmit = true
                     var json = this.json
                     json.commentText = this.commentText
                     json.actionFlag = 1
@@ -257,6 +260,7 @@
                             this.$message.success('驳回成功')
                             this.$router.push('/processCenter')
                         }
+                        this.isSubmit = false
                     })
                 } else {
                     this.$message.warning('请输入反馈意见')

src/pages/processCenter/pages/creatProcess/bzdy/step9.vue

@@ -229,6 +229,7 @@
             },
             handleSave() {},
             handleSubmit() {
+                this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
                 json.commentText = this.commentText
@@ -241,10 +242,12 @@
                         this.$message.success('提交成功')
                         this.$router.push('/processCenter')
                     }
+                    this.isSubmit = false
                 })
             },
             handleSubmitNo() {
                 if (this.commentText) {
+                    this.isSubmit = true
                     var json = this.json
                     json.commentText = this.commentText
                     json.actionFlag = 1
@@ -257,6 +260,7 @@
                             this.$message.success('驳回成功')
                             this.$router.push('/processCenter')
                         }
+                        this.isSubmit = false
                     })
                 } else {
                     this.$message.warning('请输入反馈意见')

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

@@ -0,0 +1,615 @@
+<template>
+    <div class="bzjdStep1">
+        <!--    标准征求意见流程-->
+        <ProcessHeader toggle>
+            <template slot="proName">标准解读流程</template>
+            <template slot="proNode">申请人发起流程</template>
+        </ProcessHeader>
+        <div class="headerTabs">
+            <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+            <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
+        </div>
+        <div class="content" v-show="active === '1'">
+            <div style="flex: auto; overflow: auto;">
+                <el-form
+                        ref="bzzqyjForm"
+                        :model="form"
+                        class="label-input-form"
+                        label-width="210px"
+                >
+                    <ProcessTitle>
+                        <template slot="title">基础信息</template>
+                    </ProcessTitle>
+                    <div class="prc-content-border">
+                        <el-row :gutter="24">
+                            <el-col :span="24">
+                                <el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
+                                    <div class="addButton">
+                                        <el-button  size="small" type="primary" @click="addZqyjList">带入</el-button>
+                                    </div>
+                                </el-form-item>
+                                <el-form-item label="标准号/政策号" prop="cid" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.number"
+                                            placeholder="请输入标准编号"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="标准名称/政策名称" prop="cname" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.name"
+                                            placeholder="请输入标准名称"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-form>
+            </div>
+            <el-collapse accordion>
+                <el-collapse-item title="意见填写">
+                    <div style="margin: 10px 0;">
+                        <el-input
+                                type="textarea"
+                                :rows="3"
+                                resize="none"
+                                placeholder="请输入意见"
+                                v-model="commentText">
+                        </el-input>
+                    </div>
+                </el-collapse-item>
+            </el-collapse>
+        </div>
+        <div class="content" v-show="active === '2'">
+            <div class="block" style="padding-top: 20px;">
+                <el-timeline>
+                    <el-form
+                            ref="Form"
+                            :model="roleForm"
+                            :rules="roleFormRules"
+                            class="label-input-form">
+                        <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.applyUserId ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="applyUserId" style="margin-bottom: 0">
+                                    <h4>流程发起人</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.applyUserId" style="display: none;"/>
+                                        <el-input v-model="roleForm.applyUserIdName" placeholder="流程发起人" disabled/>
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                        <el-timeline-item timestamp="对接部门责任人" placement="top" :color="roleForm.zrUserId ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="zrUserId" style="margin-bottom: 0">
+                                    <h4>对接部门责任人</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.zrUserId" style="display: none;"/>
+                                        <el-input
+                                                v-model="roleForm.zrUserIdName"
+                                                placeholder="选择责任部门对接人"
+                                                @click.native="choiceZRRS">
+                                        </el-input>
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                        <el-timeline-item timestamp="批准解读流程" placement="top" :color="roleForm.deptUserId ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="deptUserId" style="margin-bottom: 0">
+                                    <h4>标准法规部部长</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.deptUserId" style="display: none;"/>
+                                        <el-input
+                                                v-model="roleForm.deptUserIdName"
+                                                placeholder="选择标准法规部部长·"
+                                                @click.native="choiceZRR('deptUserId', '选择标准法规部部长', roleForm.deptUserId)"
+                                        />
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                    </el-form>
+                </el-timeline>
+            </div>
+        </div>
+        <ProcessFooter
+                show-save
+                show-submit
+                :submitLoading="isSubmit"
+                :saveLoading="saveLoading"
+                @save="handleSave"
+                @submit="handleSubmit"
+        >
+        </ProcessFooter>
+        <el-drawer
+                title="标准征求意见数据库"
+                :visible.sync="listModel"
+                size="900px"
+                custom-class="demo-drawer"
+        >
+            <div class="standardForComments">
+                <div class="content">
+                    <!-- 顶部工具栏 -->
+                    <table-tools-bar>
+                        <div slot="left">
+                            <div class="search-area">
+                                <el-form :model="standCommonlySearch" inline class="label-input-form">
+                                    <el-formItem label="标准号/名称" class="search-item">
+                                        <el-input v-model="standCommonlySearch.numOrName" class="s-c-input" placeholder="请输入标准号/名称" clearable :maxlength="100"></el-input>
+                                    </el-formItem>
+                                    <el-formItem class="search-item btn-box">
+                                        <el-button
+                                                type="primary"
+                                                size="mini"
+                                                class="common-button-primary"
+
+                                                @click="sarStandCompareHisInfo">查询</el-button>
+                                        <el-button
+                                                class="common-button-default"
+                                                size="mini"
+                                                @click="clearSearchStand">清空</el-button>
+                                    </el-formItem>
+                                </el-form>
+                            </div>
+                        </div>
+                    </table-tools-bar>
+                    <div class="table-wrap">
+                        <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
+                            <el-table
+                                    ref="selection"
+                                    :data="standInfoList"
+                                    tooltip-effect="dark"
+                                    style="width: 100%;padding:0 0 20px 0;"
+                                    height="100%"
+                                    border
+                                    @selection-change="handleSelection"
+                                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                                <el-table-column type="selection" width="55" align="center"/>
+                                <el-table-column
+                                        prop="showNumber"
+                                        label="标准号/政策号"
+                                        width="170"
+                                        align="center">
+                                    <template slot-scope="scope">
+                                        <div v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNumSplit }}</div>
+                                        <div v-else>{{ scope.row.showNumber }}</div>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column
+                                        prop="standName"
+                                        label="标准名称/政策名称"
+                                        show-overflow-tooltip
+                                        align="center">
+                                    <template slot-scope="scope">
+                                        <span v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNameSplit }}</span>
+                                        <span v-else>{{ scope.row.standName }}</span>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                    </div>
+                </div>
+                <pagination :page="standCommonlySearch.page" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+                <loading :loading="spinShow">数据加载中……</loading>
+                <div class="demo-drawer-footer">
+                    <el-button size="mini" @click="closeDrawer">取消</el-button>
+                    <el-button type="primary" size="mini" @click="enterDrawer">带入</el-button>
+                </div>
+            </div>
+        </el-drawer>
+        <el-drawer
+                :title="drawerTitle"
+                :visible.sync="modalshowflag"
+                :wrapperClosable="false"
+                size="800px">
+            <el-tree
+                    v-if="modalshowflag"
+                    node-key="id"
+                    style="height: 100%; overflow: auto;"
+                    class="filter-tree"
+                    :data="treeData"
+                    :props="defaultProps"
+                    :default-checked-keys="nodeList"
+                    highlight-current
+                    check-strictly
+                    @check="drawerCheck"
+                    default-expand-all
+                    :expand-on-click-node="false"
+                    show-checkbox
+                    ref="tree">
+            </el-tree>
+            <div id="roleFormButton" class="demo-drawer-footer">
+                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
+            </div>
+        </el-drawer>
+        <el-drawer
+                title="选择责任部门对接人"
+                :visible.sync="modalshowflag2"
+                :wrapperClosable="false"
+                size="800px">
+            <el-tree
+                    v-if="modalshowflag2"
+                    style="height: 100%; overflow: auto;"
+                    node-key="id"
+                    class="filter-tree"
+                    :data="treeData"
+                    :props="defaultProps"
+                    :default-checked-keys="nodeList2"
+                    highlight-current
+                    check-strictly
+                    default-expand-all
+                    :expand-on-click-node="false"
+                    show-checkbox
+                    ref="tree2">
+            </el-tree>
+            <div id="roleFormButton2" class="demo-drawer-footer">
+                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>
+            </div>
+        </el-drawer>
+    </div>
+</template>
+
+
+<script>
+    import ProcessHeader from '../../components/ProcessHeader'
+    import ProcessFooter from '../../components/ProcessFooter'
+    import ProcessTitle from '../../components/ProcessTitle'
+
+    export default {
+        name: "bzjdStep1",
+        data() {
+            return {
+                standId: '',
+                commentText: '',
+                textarea: '', // 意见
+                title: '', // 新增抽屉标题
+                listModel: false, // 新增抽屉开关
+                active: '1', // 默认显示
+                isSubmit: false,
+                saveLoading: false,
+                // 基础信息form表单
+                form: {
+                    number: '',
+                    name: '',
+                    id: '',
+                },
+                formRules: {
+                    number: [
+                        { required: true, message: '请输入标准号/政策号', trigger: 'change' },
+                    ],
+                    name: [
+                        { required: true, message: '请输入标准名称/政策名称', trigger: 'change' },
+                    ],
+                },
+                // 标准征求意见数据可库
+                standCommonlySearch: {
+                    numOrName: '',
+                    page: 1,
+                    pageSize: this.$store.getters.userInfo.configContent,
+                    result: '1'
+                },
+                spinShow: false,
+                standInfoList: [],
+                tableHeight: null,
+                total: 0,
+                selectedList: [],
+                data: [],
+                roleForm: {
+                    applyUserIdName: this.$store.getters.userInfo.userName,
+                    applyUserId: this.$store.getters.userInfo.userId,
+                    zrUserId: '',
+                    zrUserIdName: '',
+                    deptUserId: '',
+                    deptUserIdName: ''
+                },
+                roleFormRules: {
+                    zrUserId: [
+                        { required: true, message: '请选择责任部门对接人', trigger: 'change' },
+                    ],
+                    deptUserId: [
+                        { required: true, message: '请选择标准法规部部长', trigger: 'change' },
+                    ],
+                },
+                treeData: [],
+                nodeList: [],
+                nodeList2: [],
+                type: '',
+                drawerTitle: '',
+                modalshowflag: false,
+                modalshowflag2: false,
+                defaultProps: {
+                    children: 'children',
+                    label: 'name'
+                },
+                roleRow: {},
+                itemList: []
+            }
+        },
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle
+        },
+        mounted () {
+            this.getTree()
+            this.sarStandCompareHis()
+            this.tableHeight = $('.content').height() - 44
+            window.onresize = () => {
+                this.tableHeight = $('.content').height() - 44
+            }
+        },
+        methods: {
+            addZqyjList() {
+                this.title = '标准拆分数据库'
+                this.listModel = true
+            },
+            /** 标准征求意见库方法*
+             * **********************************************/
+            // 清空
+            clearSearchStand () {
+                this.standCommonlySearch.page = 1
+                this.standCommonlySearch.start = ''
+                this.standCommonlySearch.end = ''
+                this.standCommonlySearch.categorg = ''
+                this.standCommonlySearch.cname = ''
+                this.sarStandCompareHis()
+            },
+            // 搜索
+            sarStandCompareHisInfo() {
+                this.splitInfoPage = 1
+                this.sarStandCompareHis()
+            },
+            // 查询表格
+            sarStandCompareHis () {
+                this.spinShow = true
+                var form = this.standCommonlySearch
+                this.$http.get('lawss/sarFileSplitInfo/getSarFileSplitInfoEOPage', form, {
+                    _this: this
+                }, res => {
+                    this.standInfoList = res.data.list
+                    this.total = res.data.total
+                    this.spinShow = false
+                }, e => {
+                })
+            },
+            pageChange (page) {
+                this.standCommonlySearch.page = page
+                this.sarStandCompareHis()
+            },
+            // 分页每页显示数改变后方法
+            pageSizeChange (pageSize) {
+                this.$store.getters.userInfo.configContent = pageSize
+                this.standCommonlySearch.size = pageSize
+                this.sarStandCompareHis()
+            },
+            /** 选择带入数据的方法操作
+             * */
+            handleSelection(data) {
+                this.selectedList = [];
+                for (let i = 0; i < data.length; i++) {
+                    this.selectedList.push(data[i].id);
+                }
+            },
+            closeDrawer() {
+                this.listModel = false
+            },
+            enterDrawer() {
+                if (this.selectedList.length === 1) {
+                    let deposit = new Map();
+                    this.standInfoList.forEach(item => {
+                        deposit.set(item.id, item);
+                    });
+                    let bringData = [];
+                    for (let i = 0; i < this.selectedList.length; i++) {
+                        bringData.push(deposit.get(this.selectedList[i]));
+                    }
+                    if (bringData[0].splitStatus === '0') {
+                        this.form.number = bringData[0].standNumSplit
+                        this.form.name = bringData[0].standNameSplit
+                    } else {
+                        this.form.number = bringData[0].showNumber
+                        this.form.name = bringData[0].standName
+                    }
+                    this.form.id = bringData[0].id
+                    this.standId = bringData[0].standId
+                    this.listModel = false;
+                    this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
+                        infoId: this.form.id,
+                        page: 1,
+                        pageSize: 9999
+                    }, {
+                        _this: this
+                    }, res => {
+                        if (res.ok) {
+                            this.itemList = res.data.list
+                            console.log(res);
+                        }
+                    })
+                } else if (this.selectedList.length > 1) {
+                    this.$message.warning("只能选择一条数据进行带入");
+                } else {
+                    this.$message.warning("请选择一条数据进行带入");
+                }
+            },
+            /*** **********************************************/
+            /** 流程节点负责人的选择 *****************************/
+            choiceZRR (type, title, id) {
+                this.nodeList = []
+                this.nodeList.push(id)
+                this.type = type
+                this.drawerTitle = title
+                this.modalshowflag = true
+            },
+            getTree () {
+                this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
+                    this.treeData = res.data
+                })
+            },
+            saveUserInfo () {
+                if (this.type === 'deptUserId') {
+                    this.roleForm.deptUserId = this.roleRow.id
+                    this.roleForm.deptUserIdName = 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.zrUserId.length > 0) {
+                    this.nodeList2 = this.roleForm.zrUserId.split(',')
+                }
+                this.modalshowflag2 = true
+            },
+            saveUserInfo2 () {
+                var idList = ''
+                var nameList = ''
+                this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => {
+                    if (nameList.length > 0) {
+                        nameList += ','
+                        idList += ','
+                    }
+                    idList += item.id
+                    nameList += item.name
+                })
+                this.roleForm.zrUserId = idList
+                this.roleForm.zrUserIdName = nameList
+                this.modalshowflag2 = false
+            },
+            cancleUserInfo2 () {
+                this.modalshowflag2 = false
+            },
+            handleTabs(name) {
+                this.active = name
+            },
+            handleSave() {},
+            handleSubmit() {
+                this.$refs['bzzqyjForm'].validate((valid) => {
+                    if (valid) {
+                        this.$refs['Form'].validate((valid) => {
+                            if (valid) {
+                                this.$http.get('lawss/activiti/startProcess', {
+                                    type: '9'
+                                }, {}, res => {
+                                    if (res.ok) {
+                                        var json = Object.assign(this.form, this.roleForm)
+                                        json.commentText = this.commentText
+                                        json.standInData = this.standId
+                                        json.itemList = this.itemList
+                                        this.$http.post('lawss/activiti/completeTask', {
+                                            json: JSON.stringify(json),
+                                            taskId: res.data,
+                                            userId: this.$store.getters.userInfo.userId
+                                        }, {}, res => {
+                                            if (res.success) {
+                                                this.$message.success('流程发起成功')
+                                                this.$router.push('/processCenter')
+                                            }
+                                        })
+                                    } else {
+                                        this.$message.warning('流程启动失败')
+                                    }
+                                })
+                            } else {
+                                return this.$message.warning('请完善人员信息')
+                            }
+                        })
+                    } else {
+                        return this.$message.warning('请完善基础信息')
+                    }
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/style';
+    @import '~@/assets/styles/mixins';
+    .bzjdStep1 {
+        /deep/.el-drawer__container {
+            .prc-content-border {
+                border: none;
+                padding: 0 20px 0;
+            }
+        }
+        position: relative;
+        height: 100%;
+        .headerTabs {
+            height: 52px;
+            display: flex;
+            align-items: center;
+            position: absolute;
+            top: 0;
+            right: 10px;
+            .headerTabsItem {
+                border: 1px solid #c1c1c1;
+                padding: 0 5px;
+                height: 30px;
+                line-height: 30px;
+                cursor: pointer;
+            }
+            .active {
+                border: 1px solid #E6A23C;
+                color: #fff;
+                background: #E6A23C;
+            }
+        }
+        .content {
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            height: calc(~'100% - 107px');
+            overflow: auto;
+        }
+        .standardForComments {
+            height: 100%;
+            background: #fff;
+            .el-divider--horizontal {
+                display: block;
+                height: 1px;
+                width: 100%;
+                margin: 0;
+            }
+            flex-direction: column;
+            .action-bar {
+                margin-bottom: 5px;
+                padding: 0;
+            }
+            .content {
+                flex: auto;
+                overflow: hidden;
+                display: flex;
+                flex-direction: column;
+                .table-wrap {
+                    flex: auto;
+                    overflow: hidden;
+                    position: relative;
+                }
+            }
+            & > .pagination {
+                position: static;
+                /deep/.pagination-slot {
+                    padding: 0;
+                }
+            }
+        }
+    }
+</style>
+

src/pages/processCenter/pages/creatProcess/bzjd/step2.vue

@@ -0,0 +1,297 @@
+<template>
+    <div class="bzjdStep2">
+        <!--    标准调研流程-->
+        <ProcessHeader toggle>
+            <template slot="proName">标准征求意见流程</template>
+            <template slot="proNode">对接人选择责任人</template>
+        </ProcessHeader>
+        <div class="headerTabs">
+            <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+        </div>
+        <div class="content" v-show="active === '1'">
+            <div style="flex: auto; overflow: auto;">
+                <el-form
+                        ref="bzzqyjForm"
+                        :model="form"
+                        :rules="formRules"
+                        class="label-input-form"
+                        label-width="210px"
+                >
+                    <ProcessTitle>
+                        <template slot="title">基础信息</template>
+                    </ProcessTitle>
+                    <div class="prc-content-border">
+                        <el-row :gutter="24">
+                            <el-col :span="24">
+                                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.number"
+                                            placeholder="请输入标准编号"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.name"
+                                            placeholder="请输入标准名称"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="执行人" prop="responUserList" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="form.zxUserId"
+                                            style="display: none;"
+                                            clearable
+                                    ></el-input>
+                                    <el-input v-model="form.zxUserIdName" placeholder="请选择执行人" @click.native="choiceZRR"></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-form>
+            </div>
+            <el-collapse accordion>
+                <el-collapse-item title="意见填写">
+                    <div style="margin: 10px 0;">
+                        <el-input
+                                type="textarea"
+                                :rows="3"
+                                resize="none"
+                                placeholder="请输入意见"
+                                v-model="commentText">
+                        </el-input>
+                    </div>
+                </el-collapse-item>
+            </el-collapse>
+        </div>
+        <ProcessFooter
+                show-save
+                show-submit
+                :submitLoading="isSubmit"
+                :saveLoading="saveLoading"
+                @save="handleSave"
+                @submit="handleSubmit"
+        >
+        </ProcessFooter>
+        <el-drawer
+                title="选择责任人"
+                :visible.sync="modalshowflag"
+                :wrapperClosable="false"
+                size="800px">
+            <el-tree
+                    v-if="modalshowflag"
+                    style="height: 100%; overflow: auto;"
+                    node-key="id"
+                    class="filter-tree"
+                    :data="treeData"
+                    :props="defaultProps"
+                    :default-checked-keys="nodeList"
+                    highlight-current
+                    check-strictly
+                    default-expand-all
+                    :expand-on-click-node="false"
+                    show-checkbox
+                    ref="tree">
+            </el-tree>
+            <div id="roleFormButton" class="demo-drawer-footer">
+                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
+            </div>
+        </el-drawer>
+    </div>
+</template>
+
+<script>
+    import ProcessHeader from '../../components/ProcessHeader'
+    import ProcessFooter from '../../components/ProcessFooter'
+    import ProcessTitle from '../../components/ProcessTitle'
+    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+
+    export default {
+        name: "bzjdStep2",
+        data() {
+            return {
+                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: '', // 意见
+                ListModel: false, // 新增编辑抽屉开关
+                active: '1', // 默认显示
+                isSubmit: false,
+                saveLoading: false,
+                form: {
+                    number: '', // 编号
+                    name: '', // 结束日期
+                    zxUserId: '',
+                    zxUserIdName: ''
+                },
+                formRules: {
+                    zxUserId: [
+                        { required: true, message: '请选择执行人', trigger: 'change' },
+                    ]
+                },
+                json: {}
+            }
+        },
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle
+        },
+        methods: {
+            saveUserInfo () {
+                var idList = ''
+                var nameList = ''
+                this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()).forEach( item => {
+                    if (nameList.length > 0) {
+                        nameList += ','
+                        idList += ','
+                    }
+                    idList += item.id
+                    nameList += item.name
+                })
+                this.form.zxUserId = idList
+                this.form.zxUserIdName = nameList
+                this.modalshowflag = false
+            },
+            cancleUserInfo () {
+                this.modalshowflag = false
+            },
+            choiceZRR () {
+                this.nodeList = []
+                if (this.form.zxUserId.length > 0) {
+                    this.nodeList = this.form.zxUserId.split(',')
+                }
+                this.modalshowflag = true
+            },
+            getTree () {
+                this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
+                    this.treeData = res.data
+                })
+            },
+            handleTabs(name) {
+                this.active = name
+            },
+            handleSave() {},
+            handleSubmit() {
+                this.$refs['bzzqyjForm'].validate((valid) => {
+                    if (valid) {
+                        var json = this.json
+                        json.commentText = this.commentText
+                        var arr = this.form.zxUserId.split(',')
+                        var newArr = []
+                        arr.forEach(item => {
+                            var json1 = {}
+                            json1.id = item
+                            newArr.push(json1)
+                        })
+                        json.zxUserId = newArr
+                        json.zxUserIdName = this.form.zxUserIdName
+                        this.$http.post('lawss/activiti/completeTask', {
+                            json: JSON.stringify(json),
+                            taskId: this.taskIds,
+                            userId: this.$store.getters.userInfo.userId
+                        }, {}, res => {
+                            if (res.success) {
+                                this.$message.success('提交成功')
+                                this.$router.push('/processCenter')
+                            }
+                        })
+                    } else {
+                        return this.$message.warning('请完善基础信息')
+                    }
+                })
+            },
+            getData() {
+                return new Promise((resolve, reject) => {
+                    inboundLiaisonDetail({
+                        taskIds: this.taskIds,
+                        pId: this.pId
+                    }).then(res => {
+                        let data = JSON.parse(res.mesg)
+                        this.form.number = data.number
+                        this.form.name = data.name
+                        this.json = data
+                    }).catch(e => {
+                    })
+                })
+            },
+        },
+        mounted () {
+            this.getTree()
+            this.getData()
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/style';
+    .bzjdStep2 {
+        /deep/.el-drawer__container {
+            .prc-content-border {
+                border: none;
+                padding: 0 20px 0;
+            }
+        }
+        .fileClass {
+            cursor: pointer;
+        }
+        .fileClass:hover{
+            color: #0c91e5;
+        }
+        position: relative;
+        height: 100%;
+        .headerTabs {
+            height: 52px;
+            display: flex;
+            align-items: center;
+            position: absolute;
+            top: 0;
+            right: 10px;
+            .headerTabsItem {
+                border: 1px solid #c1c1c1;
+                padding: 0 5px;
+                height: 30px;
+                line-height: 30px;
+                cursor: pointer;
+            }
+            .active {
+                border: 1px solid #E6A23C;
+                color: #fff;
+                background: #E6A23C;
+            }
+        }
+        .content {
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            height: calc(~'100% - 103px');
+            overflow: auto;
+            .tableTitle {
+                margin-bottom: 10px;
+                height: 30px;
+                line-height: 30px;
+                position: relative;
+                font-size: 13px;
+                font-weight: bold;
+                .tableButton {
+                    position: absolute;
+                    right: 0;
+                    top: 0;
+                }
+            }
+        }
+    }
+</style>

src/pages/processCenter/pages/creatProcess/bzjd/step3.vue

@@ -0,0 +1,297 @@
+<template>
+    <div class="bzjdStep3">
+        <!--    标准调研流程-->
+        <ProcessHeader toggle>
+            <template slot="proName">标准征求意见流程</template>
+            <template slot="proNode">对接人选择责任人</template>
+        </ProcessHeader>
+        <div class="headerTabs">
+            <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+        </div>
+        <div class="content" v-show="active === '1'">
+            <div style="flex: auto; overflow: auto;">
+                <el-form
+                        ref="bzzqyjForm"
+                        :model="form"
+                        :rules="formRules"
+                        class="label-input-form"
+                        label-width="210px"
+                >
+                    <ProcessTitle>
+                        <template slot="title">基础信息</template>
+                    </ProcessTitle>
+                    <div class="prc-content-border">
+                        <el-row :gutter="24">
+                            <el-col :span="24">
+                                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.number"
+                                            placeholder="请输入标准编号"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.name"
+                                            placeholder="请输入标准名称"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="执行人" prop="responUserList" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="form.zxUserId"
+                                            style="display: none;"
+                                            clearable
+                                    ></el-input>
+                                    <el-input v-model="form.zxUserIdName" placeholder="请选择执行人" @click.native="choiceZRR"></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-form>
+            </div>
+            <el-collapse accordion>
+                <el-collapse-item title="意见填写">
+                    <div style="margin: 10px 0;">
+                        <el-input
+                                type="textarea"
+                                :rows="3"
+                                resize="none"
+                                placeholder="请输入意见"
+                                v-model="commentText">
+                        </el-input>
+                    </div>
+                </el-collapse-item>
+            </el-collapse>
+        </div>
+        <ProcessFooter
+                show-save
+                show-submit
+                :submitLoading="isSubmit"
+                :saveLoading="saveLoading"
+                @save="handleSave"
+                @submit="handleSubmit"
+        >
+        </ProcessFooter>
+        <el-drawer
+                title="选择责任人"
+                :visible.sync="modalshowflag"
+                :wrapperClosable="false"
+                size="800px">
+            <el-tree
+                    v-if="modalshowflag"
+                    style="height: 100%; overflow: auto;"
+                    node-key="id"
+                    class="filter-tree"
+                    :data="treeData"
+                    :props="defaultProps"
+                    :default-checked-keys="nodeList"
+                    highlight-current
+                    check-strictly
+                    default-expand-all
+                    :expand-on-click-node="false"
+                    show-checkbox
+                    ref="tree">
+            </el-tree>
+            <div id="roleFormButton" class="demo-drawer-footer">
+                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
+            </div>
+        </el-drawer>
+    </div>
+</template>
+
+<script>
+    import ProcessHeader from '../../components/ProcessHeader'
+    import ProcessFooter from '../../components/ProcessFooter'
+    import ProcessTitle from '../../components/ProcessTitle'
+    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+
+    export default {
+        name: "bzjdStep3",
+        data() {
+            return {
+                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: '', // 意见
+                ListModel: false, // 新增编辑抽屉开关
+                active: '1', // 默认显示
+                isSubmit: false,
+                saveLoading: false,
+                form: {
+                    number: '', // 编号
+                    name: '', // 结束日期
+                    zxUserId: '',
+                    zxUserIdName: ''
+                },
+                formRules: {
+                    zxUserId: [
+                        { required: true, message: '请选择执行人', trigger: 'change' },
+                    ]
+                },
+                json: {}
+            }
+        },
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle
+        },
+        methods: {
+            saveUserInfo () {
+                var idList = ''
+                var nameList = ''
+                this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()).forEach( item => {
+                    if (nameList.length > 0) {
+                        nameList += ','
+                        idList += ','
+                    }
+                    idList += item.id
+                    nameList += item.name
+                })
+                this.form.zxUserId = idList
+                this.form.zxUserIdName = nameList
+                this.modalshowflag = false
+            },
+            cancleUserInfo () {
+                this.modalshowflag = false
+            },
+            choiceZRR () {
+                this.nodeList = []
+                if (this.form.zxUserId.length > 0) {
+                    this.nodeList = this.form.zxUserId.split(',')
+                }
+                this.modalshowflag = true
+            },
+            getTree () {
+                this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
+                    this.treeData = res.data
+                })
+            },
+            handleTabs(name) {
+                this.active = name
+            },
+            handleSave() {},
+            handleSubmit() {
+                this.$refs['bzzqyjForm'].validate((valid) => {
+                    if (valid) {
+                        var json = this.json
+                        json.commentText = this.commentText
+                        var arr = this.form.zxUserId.split(',')
+                        var newArr = []
+                        arr.forEach(item => {
+                            var json1 = {}
+                            json1.id = item
+                            newArr.push(json1)
+                        })
+                        json.zxUserId = newArr
+                        json.zxUserIdName = this.form.zxUserIdName
+                        this.$http.post('lawss/activiti/completeTask', {
+                            json: JSON.stringify(json),
+                            taskId: this.taskIds,
+                            userId: this.$store.getters.userInfo.userId
+                        }, {}, res => {
+                            if (res.success) {
+                                this.$message.success('提交成功')
+                                this.$router.push('/processCenter')
+                            }
+                        })
+                    } else {
+                        return this.$message.warning('请完善基础信息')
+                    }
+                })
+            },
+            getData() {
+                return new Promise((resolve, reject) => {
+                    inboundLiaisonDetail({
+                        taskIds: this.taskIds,
+                        pId: this.pId
+                    }).then(res => {
+                        let data = JSON.parse(res.mesg)
+                        this.form.number = data.number
+                        this.form.name = data.name
+                        this.json = data
+                    }).catch(e => {
+                    })
+                })
+            },
+        },
+        mounted () {
+            this.getTree()
+            this.getData()
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/style';
+    .bzjdStep3 {
+        /deep/.el-drawer__container {
+            .prc-content-border {
+                border: none;
+                padding: 0 20px 0;
+            }
+        }
+        .fileClass {
+            cursor: pointer;
+        }
+        .fileClass:hover{
+            color: #0c91e5;
+        }
+        position: relative;
+        height: 100%;
+        .headerTabs {
+            height: 52px;
+            display: flex;
+            align-items: center;
+            position: absolute;
+            top: 0;
+            right: 10px;
+            .headerTabsItem {
+                border: 1px solid #c1c1c1;
+                padding: 0 5px;
+                height: 30px;
+                line-height: 30px;
+                cursor: pointer;
+            }
+            .active {
+                border: 1px solid #E6A23C;
+                color: #fff;
+                background: #E6A23C;
+            }
+        }
+        .content {
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            height: calc(~'100% - 103px');
+            overflow: auto;
+            .tableTitle {
+                margin-bottom: 10px;
+                height: 30px;
+                line-height: 30px;
+                position: relative;
+                font-size: 13px;
+                font-weight: bold;
+                .tableButton {
+                    position: absolute;
+                    right: 0;
+                    top: 0;
+                }
+            }
+        }
+    }
+</style>

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

@@ -9,7 +9,7 @@
       <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-if="active == '1'">
+    <div class="content" v-show ="active === '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>

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

@@ -29,7 +29,7 @@
                     <el-button  size="small" type="primary" @click="addZqyjList">选择征求意见</el-button>
                   </div>
                 </el-form-item>
-                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="标准号" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                           disabled
                           v-model="form.cid"
@@ -47,7 +47,6 @@
                 </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
-                          disabled
                           v-model="form.endTime"
                           type="date"
                           placeholder="请选择结束日期">
@@ -177,34 +176,34 @@
           <table-tools-bar>
             <div slot="left">
               <div class="search-area">
-                <el-form :model="standCommonlySearch" inline class="label-input-form">
+<!--                <el-form :model="standCommonlySearch" inline class="label-input-form">-->
-                  <el-formItem label="类别" class="search-item">
+<!--&lt;!&ndash;                  <el-formItem label="类别" class="search-item">&ndash;&gt;-->
-                    <el-input v-model="standCommonlySearch.categorg" class="s-c-input" placeholder="标准/政策" clearable :maxlength="100"></el-input>
+<!--&lt;!&ndash;                    <el-input v-model="standCommonlySearch.categorg" class="s-c-input" placeholder="标准/政策" clearable :maxlength="100"></el-input>&ndash;&gt;-->
-                  </el-formItem>
+<!--&lt;!&ndash;                  </el-formItem>&ndash;&gt;-->
-                  <el-formItem label="关键字" class="search-item">
+<!--&lt;!&ndash;                  <el-formItem label="关键字" class="search-item">&ndash;&gt;-->
-                    <el-input v-model="standCommonlySearch.cname" class="s-c-input" placeholder="请输入关键字" clearable :maxlength="100"></el-input>
+<!--&lt;!&ndash;                    <el-input v-model="standCommonlySearch.cname" class="s-c-input" placeholder="请输入关键字" clearable :maxlength="100"></el-input>&ndash;&gt;-->
-                  </el-formItem>
+<!--&lt;!&ndash;                  </el-formItem>&ndash;&gt;-->
-                  <el-formItem label="开始日期" class="search-item">
+<!--&lt;!&ndash;                  <el-formItem label="开始日期" class="search-item">&ndash;&gt;-->
-                    <el-datePicker v-model="standCommonlySearch.start" :editable="false"
+<!--&lt;!&ndash;                    <el-datePicker v-model="standCommonlySearch.start" :editable="false"&ndash;&gt;-->
-                                   placeholder="请选择开始日期"></el-datePicker>
+<!--&lt;!&ndash;                                   placeholder="请选择开始日期"></el-datePicker>&ndash;&gt;-->
-                  </el-formItem>
+<!--&lt;!&ndash;                  </el-formItem>&ndash;&gt;-->
-                  <el-formItem label="结束日期" class="search-item">
+<!--&lt;!&ndash;                  <el-formItem label="结束日期" class="search-item">&ndash;&gt;-->
-                    <el-datePicker v-model="standCommonlySearch.end" :editable="false"
+<!--&lt;!&ndash;                    <el-datePicker v-model="standCommonlySearch.end" :editable="false"&ndash;&gt;-->
-                                   placeholder="请选择结束日期"></el-datePicker>
+<!--&lt;!&ndash;                                   placeholder="请选择结束日期"></el-datePicker>&ndash;&gt;-->
-                  </el-formItem>
+<!--&lt;!&ndash;                  </el-formItem>&ndash;&gt;-->
-                  <el-formItem class="search-item btn-box">
+<!--                  <el-formItem class="search-item btn-box">-->
-                    <el-button
+<!--                    <el-button-->
-                            type="primary"
+<!--                            type="primary"-->
-                            size="mini"
+<!--                            size="mini"-->
-                            class="common-button-primary"
+<!--                            class="common-button-primary"-->
 
-                            @click="sarStandCompareHisInfo">查询</el-button>
+<!--                            @click="sarStandCompareHisInfo">查询</el-button>-->
-                    <el-button
+<!--                    <el-button-->
-                            class="common-button-default"
+<!--                            class="common-button-default"-->
-                            size="mini"
+<!--                            size="mini"-->
-                            @click="clearSearchStand">清空</el-button>
+<!--                            @click="clearSearchStand">清空</el-button>-->
-                  </el-formItem>
+<!--                  </el-formItem>-->
-                </el-form>
+<!--                </el-form>-->
               </div>
             </div>
           </table-tools-bar>
@@ -220,10 +219,17 @@
                 @selection-change="handleSelection"
                 :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
                 <el-table-column type="selection" width="55" align="center"/>
-                <el-table-column prop="category" label="标准" align="center"/>
+                <el-table-column label="标准号" align="center">
-                <el-table-column prop="cname" label="标准名称/政策名称" align="center"/>
+                  <template slot-scope="scope">
-                <el-table-column prop="endTime" label="征求意见周期" align="center"/>
+                    <div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
-                <el-table-column prop="startTime" label="上传时间" align="center"/>
+                    <div v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="cname" label="标准名称" align="center">
+                  <template slot-scope="scope">
+                    <div>{{ scope.row.standName }}</div>
+                  </template>
+                </el-table-column>
               </el-table>
             </div>
           </div>
@@ -326,12 +332,12 @@ export default {
       },
       // 标准征求意见数据可库
       standCommonlySearch: {
-        categorg: '',
+        // categorg: '',
-        cname: '',
+        // cname: '',
-        start: '',
+        // start: '',
-        end: '',
+        // end: '',
         page: 1,
-        size: this.$store.getters.userInfo.configContent
+        pageSize: this.$store.getters.userInfo.configContent
       },
       spinShow: false,
       standInfoList: [],
@@ -394,7 +400,7 @@ export default {
   },
   methods: {
     addZqyjList() {
-      this.title = '标准征求意见库'
+      this.title = '国内外标准库'
       this.listModel = true
     },
     /** 标准征求意见库方法*
@@ -416,15 +422,23 @@ export default {
     // 查询表格
     sarStandCompareHis () {
       this.spinShow = true
-      var form = this.standCommonlySearch
+      var formData = this.standCommonlySearch
-      this.$http.get('slrs/sar-public-idea/SelectAllPage', form, {
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
                 _this: this
               }, res => {
-        this.standInfoList = res.data.records
+        this.standInfoList = res.data.list
-        this.total = res.data.total
+        this.total = res.data.count
         this.spinShow = false
-      }, e => {
       })
+      // var form = this.standCommonlySearch
+      // this.$http.get('slrs/sar-public-idea/SelectAllPage', form, {
+      //   _this: this
+      // }, res => {
+      //   this.standInfoList = res.data.records
+      //   this.total = res.data.total
+      //   this.spinShow = false
+      // }, e => {
+      // })
     },
     pageChange (page) {
       this.standCommonlySearch.page = page
@@ -457,9 +471,12 @@ export default {
         for (let i = 0; i < this.selectedList.length; i++) {
           bringData.push(deposit.get(this.selectedList[i]));
         }
-        this.form.cid = bringData[0].cid
+        if (bringData[0].standYear) {
-        this.form.cname = bringData[0].cname;
+          this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear
-        this.form.endTime = bringData[0].endTime;
+        } else {
+          this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber
+        }
+        this.form.cname = bringData[0].standName;
         this.listModel = false;
       } else if (this.selectedList.length > 1) {
         this.$message.warning("只能选择一条数据进行带入");
@@ -540,6 +557,7 @@ export default {
         if (valid) {
           this.$refs['Form'].validate((valid) => {
             if (valid) {
+              this.isSubmit = true
               this.$http.get('lawss/activiti/startProcess', {
                 type: '3'
               }, {}, res => {
@@ -559,6 +577,7 @@ export default {
                 } else {
                   this.$message.warning('流程启动失败')
                 }
+                this.isSubmit = false
               })
             } else {
               return this.$message.warning('请完善人员信息')

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

@@ -197,6 +197,7 @@
             handleSubmit() {
                 this.$refs['bzzqyjForm'].validate((valid) => {
                     if (valid) {
+                        this.isSubmit = true
                         var json = this.json
                         json.commentText = this.commentText
                         json.responUserList = this.form.responUserList
@@ -210,6 +211,7 @@
                                 this.$message.success('提交成功')
                                 this.$router.push('/processCenter')
                             }
+                            this.isSubmit = false
                         })
                     } else {
                         return this.$message.warning('请完善基础信息')

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

@@ -257,6 +257,7 @@
                     } else if (c > 0) {
                         this.$message.warning('请输入意见内容')
                     } else {
+                        this.isSubmit = true
                         var json = this.json
                         json.commentText = this.commentText
                         json.info = this.data
@@ -270,6 +271,7 @@
                                 this.$message.success('提交成功')
                                 this.$router.push('/processCenter')
                             }
+                            this.isSubmit = false
                         })
                     }
                 }

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

@@ -175,6 +175,7 @@
             },
             handleSave() {},
             handleSubmit() {
+                this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
                 json.commentText = this.commentText
@@ -187,6 +188,7 @@
                         this.$message.success('提交成功')
                         this.$router.push('/processCenter')
                     }
+                    this.isSubmit = false
                 })
             },
             handleSubmitNo () {

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

@@ -241,6 +241,7 @@
                     } else if (c > 0) {
                         this.$message.warning('请输入意见内容')
                     } else {
+                        this.isSubmit = true
                         var json = this.json
                         json.oldinfo = this.oldData
                         json.commentText = this.commentText
@@ -253,6 +254,7 @@
                                 this.$message.success('提交成功')
                                 this.$router.push('/processCenter')
                             }
+                            this.isSubmit = false
                         })
                     }
                 }

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

@@ -238,6 +238,7 @@
                     } else if (c > 0) {
                         this.$message.warning('请输入意见内容')
                     } else {
+                        this.isSubmit = true
                         var json = this.json
                         json.actionFlag = 0
                         json.commentText = this.commentText
@@ -250,12 +251,14 @@
                                 this.$message.success('提交成功')
                                 this.$router.push('/processCenter')
                             }
+                            this.isSubmit = false
                         })
                     }
                 }
             },
             handleSubmitNo() {
                 if (this.commentText) {
+                    this.isSubmit = true
                     var json = this.json
                     json.actionFlag = 1
                     json.commentText = this.commentText
@@ -268,6 +271,7 @@
                             this.$message.success('驳回成功')
                             this.$router.push('/processCenter')
                         }
+                        this.isSubmit = false
                     })
                 } else {
                     this.$message.warning('请输入反馈意见')

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

@@ -241,6 +241,7 @@
                     } else if (c > 0) {
                         this.$message.warning('请输入意见内容')
                     } else {
+                        this.isSubmit = true
                         var json = this.json
                         json.actionFlag = 0
                         json.commentText = this.commentText
@@ -253,12 +254,14 @@
                                 this.$message.success('提交成功')
                                 this.$router.push('/processCenter')
                             }
+                            this.isSubmit = false
                         })
                     }
                 }
             },
             handleSubmitNo() {
                 if (this.commentText) {
+                    this.isSubmit = true
                     var json = this.json
                     json.actionFlag = 1
                     json.commentText = this.commentText
@@ -271,6 +274,7 @@
                             this.$message.success('驳回成功')
                             this.$router.push('/processCenter')
                         }
+                        this.isSubmit = false
                     })
                 } else {
                     this.$message.warning('请输入反馈意见')

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

@@ -241,6 +241,7 @@
                     } else if (c > 0) {
                         this.$message.warning('请输入意见内容')
                     } else {
+                        this.isSubmit = true
                         var json = this.json
                         json.actionFlag = 0
                         json.commentText = this.commentText
@@ -253,12 +254,14 @@
                                 this.$message.success('提交成功')
                                 this.$router.push('/processCenter')
                             }
+                            this.isSubmit = false
                         })
                     }
                 }
             },
             handleSubmitNo() {
                 if (this.commentText) {
+                    this.isSubmit = true
                     var json = this.json
                     json.actionFlag = 1
                     json.commentText = this.commentText
@@ -271,6 +274,7 @@
                             this.$message.success('驳回成功')
                             this.$router.push('/processCenter')
                         }
+                        this.isSubmit = false
                     })
                 } else {
                     this.$message.warning('请输入反馈意见')

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

@@ -241,6 +241,7 @@
                     } else if (c > 0) {
                         this.$message.warning('请输入意见内容')
                     } else {
+                        this.isSubmit = true
                         var json = this.json
                         json.actionFlag = 0
                         json.commentText = this.commentText
@@ -253,12 +254,14 @@
                                 this.$message.success('提交成功')
                                 this.$router.push('/processCenter')
                             }
+                            this.isSubmit = false
                         })
                     }
                 }
             },
             handleSubmitNo() {
                 if (this.commentText) {
+                    this.isSubmit = true
                     var json = this.json
                     json.actionFlag = 1
                     json.commentText = this.commentText
@@ -271,6 +274,7 @@
                             this.$message.success('驳回成功')
                             this.$router.push('/processCenter')
                         }
+                        this.isSubmit = false
                     })
                 } else {
                     this.$message.warning('请输入反馈意见')

src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue

@@ -12,23 +12,23 @@
         <ProcessTitle>
           <template slot="title">基础信息</template>
         </ProcessTitle>
-        <el-form :modal="dataList" inline class="label-input-form">
+        <el-form :modal="nonSearch" inline class="label-input-form">
             <el-form-item label="标准号/标准名称" class="search-item">
-              <el-input v-model="dataList.standId"
+              <el-input v-model="nonSearch.standId"
                 size="small"
                 placeholder="请输入"
                 clearable
                 :maxlength="100"></el-input>
             </el-form-item>
             <el-form-item label="项目名称" class="search-item">
-              <el-input v-model="dataList.productName"
+              <el-input v-model="nonSearch.productName"
                 size="small"
                 placeholder="请输入"
                 clearable
                 :maxlength="100"></el-input>
             </el-form-item>
           <el-form-item label="责任部门" class="search-item">
-              <el-input v-model="dataList.responsibleUnit" v-show="false"/>
+              <el-input v-model="nonSearch.responsibleUnit" v-show="false"/>
               <el-popover
                 placement="bottom"
                 popper-class="user-dept-popper"
@@ -38,7 +38,7 @@
                 <el-input
                   size="small"
                   slot="reference"
-                  v-model="dataList.responseUnitShow"
+                  v-model="nonSearch.responseUnitShow"
                   placeholder="根据责任部门查找"
                   readonly
                   clearable
@@ -62,7 +62,7 @@
                 class="common-button-primary"
                 size="mini"
                 v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
-                @click="getTableByPage">
+                @click="getTableByPage(nonSearch)">
                 查询
               </el-button>
             </el-form-item>
@@ -105,15 +105,15 @@
           <el-table-column prop="dutyEngineer" label="责任工程师"/>
           <el-table-column label="选择分发责任人" prop="dutyPeopleInfo">
               <template slot-scope="scope">
-                <span v-if="scope.row.show">
                   <el-input
+                    style="display: none"
                     v-model="scope.row.dutyPeopleInfo"
                     size="mini"
                     placeholder="请输入内容"
-                    @click.native="choiceDuty"
                     />
-                </span>
+                <div v-if="scope.row.dutyPeopleInfo"  class="fileClass">
-                <span v-else>{{scope.row.dutyPeopleInfo}}</span>
+                  {{ scope.row.dutyPeopleInfo || '-'}}
+                </div>
             </template>
           </el-table-column>
         </el-table>
@@ -187,7 +187,7 @@ export default {
       ListModel: false, // 新增编辑抽屉开关
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
-      nonConformitySearch: {
+      nonSearch: {
         standId: '', // 标准号/名称
         productName: '', // 项目名称
         responsibleUnit: '' // 责任部门
@@ -206,15 +206,6 @@ export default {
       myLoading: false,
       // 责任部门
       zNodesSItem: [],
-      unqualidiedData: [{
-        standId: '',
-        productName: '',
-        itemsNum: '',
-        itemsName: '',
-        planCloseTime: '',
-        responsibleUnit: '',
-        dutyEngineer: ''
-      }],
       clearSelection: false,
       nodeList: [],
       drawerTitle: '', //drawer标题
@@ -243,12 +234,20 @@ export default {
   created() {
     this.getData()
     this.getTree()
+  },
+  watch: {
+    nonSearch(val) {
+      this.nonSearch = val
+    }
   },
     methods: {
     getData() {
       const params = {
         taskIds: this.taskIds,
         pId: this.pId,
+        standId: '', // 标准号/名称
+        productName: '', // 项目名称
+        responsibleUnit: '' // 责任部门
       }
       inboundLiaisonDetail(params).then(res => {
         const processForm = JSON.parse(res.mesg)
@@ -261,30 +260,19 @@ export default {
       })
     },
     // 批量选择分发责任人
-    dutyEngineerList() {
+    dutyEngineerList(id) {
       if (this.multipleSelection.length === 0) {
         this.$message.warning("请选择至少一条数据进行分发责任人");
       } else {
-        this.multipleSelection.map((i, index)=> {
+        this.nodeList = []
-          i.show = true
+        this.nodeList.push(id)
-          this.$set(this.dataList, i, index)
+        this.modalshowflag = true
-        })
       }
     },
     // 选择勾选项的集合
     handleSelectionChange(value) {
       this.multipleSelection = value
-    },
+      console.log(value)
-    // 选择分发责任人时
-    choiceDuty(type, title, id) {
-      this.nodeList = []
-      this.nodeList.push(id)
-      this.type = type
-      this.drawerTitle = title
-      this.modalshowflag = true
-    },
-    selectPeople(row) {
-      this.modalshowflag = true
     },
     handleTabs(name) {
       this.active = name
@@ -313,10 +301,7 @@ export default {
       }
       let json = {
         dockUserList: list,
-        // engineer: this.$store.getters.userInfo.userId,
-        // standardInfoList: list[0].standardInfoList,
       }
-      console.log(json)
       let flag=false
       this.dataList.forEach(item => {
         if (item.dutyPeopleInfo === '') {
@@ -364,19 +349,13 @@ export default {
     // 流程节点负责人抽屉保存按钮
     saveUserInfo () {
       // 选取负责人时的操作
-      for (let i = 0; i < this.multipleSelection.length; i++ ) {
+      this.multipleSelection.forEach(item => {
-        this.multipleSelection[i].dutyPeopleInfo = this.roleRow[0].name
+        item.dutyPeopleInfo = this.roleRow[0].name
-        this.multipleSelection[i].dutyPeopleInfoId = this.roleRow[0].id
+        item.dutyPeopleInfoId = this.roleRow[0].id
-        for (let b = 0; b < this.multipleSelection.length; b++) {
-          this.dataList[b].dutyPeopleInfo = this.multipleSelection[i].dutyPeopleInfo
-          this.dataList[b].dutyPeopleInfoId = this.multipleSelection[i].dutyPeopleInfoId
-          this.dataList.forEach(val=> {
-            val.show = false
       })
-        }
       this.lastDataList = this.dataList
       this.$refs.multipleTable.clearSelection();
-      }
+      // 选取流程信息完成
       this.roleForm.dutyUserInfoName = this.roleRow.name
       this.modalshowflag = false
     },
@@ -385,17 +364,37 @@ export default {
       this.modalshowflag = false
     },
     //查询按钮
-    getTableByPage() {
+      getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
-      this.getData()
+        this.realList = this.dataList.filter(item => {
+          let matchId = true; // 标准号 筛选
+          let matchName = true; // 项目名称 筛选
+          let matchUnit = true; // 部门 筛选
+
+          if (standId) {
+            const keysId = standId
+              .toUpperCase() // 转大写
+              .replace(' ', '') // 删掉空格
+              .split('') // 切割成 单个字
+            matchId = keysId.every(key => item.standId.toUpperCase().includes(key));
+          }
+          if (productName) {
+            matchName = item.productName === productName;
+          }
+          if (responsibleUnit) {
+            matchUnit = item.responsibleUnit === responsibleUnit;
+          }
+          return matchId && matchName && matchUnit;
+        })
+        this.dataList = this.realList
       },
     // 清空 查询条件
-    clearAllSearch (search = true) {
+    clearAllSearch () {
-      this.nonConformitySearch = {
+      this.nonSearch = {
         standId: '',
         productName: '',
         responsibleUnit: ''
       }
-      this.getTableByPage()
+      this.getData()
     },
     // 分页事件
     pageChange (page) {

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

@@ -9,7 +9,7 @@
       <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-if="active == '1'">
+    <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
@@ -17,6 +17,7 @@
         <el-form
           :model="listForm"
           :rules="formRules"
+          ref="listForm"
           class="label-input-form prc-content-border"
           label-width="150px"
         >
@@ -39,18 +40,17 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="认证工程师" prop="certifiedEngineer" class="add-form-item form-item-disabled">
+              <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
                 <el-input
-                  v-model="listForm.certifiedEngineer"
+                  v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
                   clearable
                   @click.native="choiceZRR(null,'certifiedEngineer', '选择认证工程师', roleForm.certifiedEngineer)"
                 ></el-input>
-                <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
               </el-form-item>
-              <el-form-item label="质量工程师" prop="qualityEngineer" class="add-form-item form-item-disabled">
+              <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
-                  v-model="listForm.qualityEngineer"
+                  v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
                   clearable
                   @click.native="choiceZRR(null,'qualityEngineer', '选择质量工程师', roleForm.qualityEngineer)"
@@ -109,7 +109,7 @@
       <div class="block" style="padding-top: 20px;">
         <el-timeline>
           <el-form
-            ref="Form"
+            ref="roleForm"
             :model="roleForm"
             :rules="roleFormRules"
             class="label-input-form">
@@ -139,12 +139,12 @@
             </el-timeline-item>
             <el-timeline-item timestamp="标准法规部领导审批" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="directorUserName" style="margin-bottom: 0">
+                <el-form-item prop="ministerUserName" style="margin-bottom: 0">
                   <h4>标准法规部领导</h4>
                   <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.directorUserName" placeholder="请选择标准法规部领导"
+                    <el-input v-model="roleForm.ministerUserName" placeholder="请选择标准法规部领导"
-                              @click.native="choiceZRR(null,'directorUser', '选择标准法规部领导', roleForm.directorUser)"></el-input>
+                              @click.native="choiceZRR(null,'ministerUser', '选择标准法规部领导', roleForm.ministerUser)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -354,26 +354,35 @@ export default {
         startUser: this.$store.getters.userInfo.id,
         qualityEngineer: "",
         certifiedEngineer:"",
+        qualityEngineerName: "",
+        certifiedEngineerName:"",
         distributePerson: "",
+        dockUser:'',
+        ministerUser:"",
+        dockUserName:'',
+        ministerUserName:"",
       },
       formRules: {
-        listType: [
+        standName: [
-          { required: true, message: "请选择清单类型", trigger: "blur" }
+          { required: true, message: "请填写标准名称", trigger: "change" }
+        ],
+        standNumber: [
+          { required: true, message: "请填写标准编号", trigger: "change" }
+        ],
+        qualityEngineer: [
+          { required: true, message: "请选择质量工程师", trigger: "change" }
+        ],
+        certifiedEngineer: [
+          { required: true, message: "请选择认证工程师", trigger: "change" }
         ],
-        listName: [
-          { required: true, message: "请填写清单名称", trigger: "change" }
-        ]
       },
       roleFormRules: {
-        // dockUserName: [
+        dockUserName: [
-        //   { required: true, message: "请选择会签责任人", trigger: "blur" }
+          { required: true, message: "请选择业务经理", trigger: "change" }
-        // ],
+        ],
         ministerUserName: [
-          { required: true, message: "请选择修订责任人", trigger: "blur" }
+          { required: true, message: "请选择标准法规部领导", trigger: "change" }
         ],
-        directorUserName: [
-          { required: true, message: "请选择审批责任人", trigger: "blur" }
-        ]
       },
       ListModel: false, //选择拆分标准抽屉状态
       treeData: [], // 人员数据
@@ -440,16 +449,16 @@ export default {
       } else 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;
       } else if (this.type === "qualityEngineer") {
-        this.listForm.qualityEngineer = this.roleRow.name;
+        this.roleForm.qualityEngineer = this.roleRow.id;
+        this.roleForm.qualityEngineerName = this.roleRow.name;
+        this.listForm.qualityEngineer = this.roleForm.qualityEngineer;
+        this.listForm.qualityEngineerName = this.roleForm.qualityEngineerName;
       } else if (this.type === "certifiedEngineer") {
-        this.listForm.certifiedEngineer = this.roleRow.name;
+        this.roleForm.certifiedEngineer = this.roleRow.id;
+        this.roleForm.certifiedEngineerName = this.roleRow.name;
+        this.listForm.certifiedEngineer = this.roleForm.certifiedEngineer;
+        this.listForm.certifiedEngineerName = this.roleForm.certifiedEngineerName;
       } else if (this.type === "distributePerson") {
         this.listForm.distributePerson = this.roleRow.name;
         this.listForm.dataList[this.dsadadadsada].distributePersonId=this.roleRow.id
@@ -527,16 +536,16 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      let json = this.listForm;
+      var json = Object.assign(this.listForm, this.roleForm)
-      json.zrUserId = this.$store.getters.userInfo.userId;
-      json.jlUserId = this.$store.getters.userInfo.userId;
-      json.applyUpdUserId = this.$store.getters.userInfo.userId;
-      json.approvalOpinion = "";
-      json.prcCreateUser = this.$store.getters.userInfo.userId;
-      json.prcCreateUserName = this.$store.getters.userInfo.account;
       json.prcCreateUser = this.$store.getters.userInfo.userId;
       json.prcCreateUserName = this.$store.getters.userInfo.account;
       json.standId = this.listForm.standId;
+      json.XCXSSRQ =  this.sarAccessListDatas[0].attrInfoMap.XCXSSRQ
+      json.ZCCSSRQ =  this.sarAccessListDatas[0].attrInfoMap.ZCCSSRQ
+      this.$refs['listForm'].validate((valid) => {
+        if (valid) {
+          this.$refs['roleForm'].validate((valid) => {
+            if (valid) {
               this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
                 _this: this
               }, res => {
@@ -555,6 +564,14 @@ export default {
                   });
                 }
               });
+            } else {
+              return this.$message.warning("请完善人员信息");
+            }
+          });
+        } else {
+          return this.$message.warning("请完善基础信息");
+        }
+      });
     },
     //选择拆分标准取消事件
     closeDrawer() {
@@ -600,7 +617,9 @@ export default {
       this.standList = data;
     },
     choiceZRR(scope,type, title, id) {
-      if(scope!=null)this.dsadadadsada=scope.$index;
+      if(scope!=null){
+        this.dsadadadsada = scope.$index;
+      }
       this.nodeList = [];
       this.nodeList.push(id);
       this.type = type;
@@ -632,8 +651,7 @@ export default {
       }, {
         _this: this
       }, res => {
-        console.log(res.data.records);
+        this.productData = res.data;
-        this.productData = res.data.records;
         this.totalNo = res.data.total;
       }, e => {
 

src/pages/processCenter/pages/creatProcess/xmpg/step2.vue

@@ -9,7 +9,7 @@
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
-    <div class="content" v-if="active == '1'">
+    <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
@@ -35,16 +35,16 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="认证工程师" prop="certifiedEngineer" class="add-form-item form-item-disabled">
+              <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
                 <el-input
-                  v-model="listForm.certifiedEngineer"
+                  v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="质量工程师" prop="qualityEngineer" class="add-form-item form-item-disabled">
+              <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
-                  v-model="listForm.qualityEngineer"
+                  v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
                   clearable
                 ></el-input>
@@ -110,7 +110,7 @@
       </div>
     </div>
 
-    <div class="content" v-if="active === '3'">
+    <div class="content" v-show="active === '3'">
       <div class="flow-list">
         <el-table
           height="100%"
@@ -234,6 +234,8 @@ export default {
         standName: "",//标准名称
         certifiedEngineer: "", //认证工程师
         qualityEngineer: "", //质量工程师
+        certifiedEngineerName: "", //认证工程师
+        qualityEngineerName: "", //质量工程师
         breakdownList: [{
           applyArctic: "",
           busStandCover: "",
@@ -302,6 +304,7 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
+          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg)
             this.getFormFieldList(processForm)

src/pages/processCenter/pages/creatProcess/xmpg/step3.vue

@@ -9,7 +9,7 @@
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
-    <div class="content" v-if="active == '1'">
+    <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
@@ -35,16 +35,16 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="认证工程师" prop="certifiedEngineer" class="add-form-item form-item-disabled">
+              <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
                 <el-input
-                  v-model="listForm.certifiedEngineer"
+                  v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="质量工程师" prop="qualityEngineer" class="add-form-item form-item-disabled">
+              <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
-                  v-model="listForm.qualityEngineer"
+                  v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
                   clearable
                 ></el-input>
@@ -97,6 +97,16 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="xCXSSRQ"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="zCCSSRQ"
+            align="center"
+            label="在产车实施日期">
+          </el-table-column>
           <el-table-column
             fixed="right"
             prop="implementer"
@@ -145,7 +155,7 @@
       </div>
     </div>
 
-    <div class="content" v-if="active === '3'">
+    <div class="content" v-show="active === '3'">
       <div class="flow-list">
         <el-table
           height="100%"
@@ -382,7 +392,13 @@ export default {
             distributePerson: item.pepdtos[i].distributePerson,
             distributePersonId: item.pepdtos[i].distributePersonId,
             uname: item.pepdtos[i].uname,
-            projectManager: item.pepdtos[i].projectManager
+            projectManager: item.pepdtos[i].projectManager,
+            certifiedEngineer: item.pepdtos[i].certifiedEngineer,
+            qualityEngineer: item.pepdtos[i].qualityEngineer,
+            standNumber: item.pepdtos[i].standNumber,
+            standName: item.pepdtos[i].standName,
+            xCXSSRQ:  item.pepdtos[i].xCXSSRQ,
+            zCCSSRQ:  item.pepdtos[i].zCCSSRQ,
           });
         }
       }

src/pages/processCenter/pages/creatProcess/xmpg/step4.vue

@@ -3,13 +3,13 @@
   <div class="xmpg-step4">
     <ProcessHeader toggle>
       <template slot="proName">项目合规评估流程</template>
-      <template slot="proNode">分发责任人分发任务</template>
+      <template slot="proNode">落实人填写评估反馈</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
-    <div class="content" v-if="active == '1'">
+    <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
@@ -75,90 +75,166 @@
           <el-table-column
             prop="productLine"
             align="center"
+            width="200"
             label="产品线">
           </el-table-column>
           <el-table-column
             prop="projectNumber"
             align="center"
+            width="200"
             label="项目编号">
           </el-table-column>
           <el-table-column
             prop="projectName"
             align="center"
+            width="200"
             label="项目名称">
           </el-table-column>
           <el-table-column
             prop="itemNum"
             align="center"
+            width="200"
             label="条款号">
           </el-table-column>
           <el-table-column
             prop="itemsName"
+            width="200"
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="xCXSSRQ"
+            width="200"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="zCCSSRQ"
+            width="200"
+            align="center"
+            label="在产车实施日期">
+          </el-table-column>
           <el-table-column
             prop="productType"
-            width="450"
             align="center"
             label="在研产品">
-            <el-table-column
-              prop="researchImplementationTime"
-              align="center"
-              label="实施时间">
-            </el-table-column>
             <el-table-column
               prop="researchCompliance"
               align="center"
+              width="160"
               label="合规">
+              <template slot-scope="scope">
+                <el-input
+                  v-model="dataList[scope.$index].complianceReasons"
+                  placeholder="请输入合规原因"
+                >
+                </el-input>
+              </template>
             </el-table-column>
             <el-table-column
               align="center"
+              width="160"
               prop="researchNonCompliance"
               label="不合规">
               <el-table-column
                 prop="researchNonCompliance"
                 align="center"
+                width="160"
                 label="不合规项目">
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="dataList[scope.$index].noCompliance"
+                    placeholder="请输入不合规项目"
+                  >
+                  </el-input>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="researchCountermeasures"
                 align="center"
+                width="160"
                 label="应对措施">
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="dataList[scope.$index].countermeasures"
+                    placeholder="请输入应对措施"
+                  >
+                  </el-input>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="researchCompletionTime"
                 align="center"
+                width="160"
                 label="完成时间">
+                <template slot-scope="scope">
+                  <el-date-picker
+                    v-model="dataList[scope.$index].completionTime"
+                    type="date"
+                    placeholder="选择日期">
+                  </el-date-picker>
+                </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
           <el-table-column
             align="center"
-            width="450"
             label="在产产品">
-            <el-table-column
-              prop="productionImplementationTime"
-              align="center"
-              label="实施时间">
-            </el-table-column>
             <el-table-column
               prop="productionCompliance"
               align="center"
+              width="160"
               label="合规(具体情况)">
+              <template slot-scope="scope">
+                <el-input
+                  v-model="dataList[scope.$index].zcComplianceReasons"
+                  placeholder="请输入合规原因"
+                >
+                </el-input>
+              </template>
             </el-table-column>
             <el-table-column
               align="center"
+              width="160"
               label="不合规">
+              <el-table-column
+                prop="productionNonCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="dataList[scope.$index].zcNoCompliance"
+                    placeholder="请输入不合规项目"
+                  >
+                  </el-input>
+                </template>
+              </el-table-column>
               <el-table-column
                 prop="productionCountermeasures"
                 align="center"
+                width="160"
                 label="应对措施">
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="dataList[scope.$index].zcCountermeasures"
+                    placeholder="请输入应对措施"
+                  >
+                  </el-input>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="productionCompletionTime"
                 align="center"
+                width="160"
                 label="完成时间">
+                <template slot-scope="scope">
+                  <el-date-picker
+                    v-model="dataList[scope.$index].zcCompletionTime"
+                    type="date"
+                    placeholder="选择日期">
+                  </el-date-picker>
+                </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
@@ -188,7 +264,7 @@
       </div>
     </div>
 
-    <div class="content" v-if="active === '3'">
+    <div class="content" v-show="active === '3'">
       <div class="flow-list">
         <el-table
           height="100%"
@@ -285,6 +361,7 @@ export default {
   },
   data() {
     return {
+
       detailData: [],
       sarProStateTableHeight: null, // 项目列表高度
       // 当前流程类型(1待办/2已办)
@@ -307,24 +384,62 @@ export default {
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
       listForm: {
-        listType: "", //区分是哪个清单
+          standNumber: "", //标准编号
-        listName: "", //清单名称
+          standName: "",//标准名称
-        applyRegion: "", //适用区域
+          certifiedEngineer: "", //认证工程师
-        descriptionList: "", //清单说明
+          qualityEngineer: "", //质量工程师
-        enclosure: "", //附件
-        inforlist: "",//用来存放标准的id
         dataList: [{
-          standNumber: "", //标准号
+          projectManager: '',
-          cnName: "", //中文名称
+          itemsName: '',
-          enName: "", //英文名称
+          uname: '',
-          isSubTime: "", //发布日期
+          projectNumber: '',
-          newCarTime: "", //新车型实施日期
+          implementer: '',
-          oldCarTime: "", //在产车实施日期
+          implementerId: '',
-          applyCar: "", //适用车型
+          productLine: '',
-          textState: "", //文本状态
+          itemNum:'',
-          id: ""
+          distributePerson:'',
+          projectName:'',
+          distributePersonId:'',
+          complianceReasons:'', //在研合规原因
+          noCompliance:'', //在研不合规项目
+          countermeasures:'', //在研应对措施
+          completionTime:'', //在研完成时间
+          zcComplianceReasons: '', //在产的合规原因
+          zcNoCompliance:'', //在产不合规项目
+          zcCountermeasures:'', //在产的应对措施
+          zcCompletionTime:'', //在产的完成时间
         }]
       },
+      // listForm: {
+      //   standNumber: "", //标准编号
+      //   standName: "",//标准名称
+      //   certifiedEngineer: "", //认证工程师
+      //   qualityEngineer: "", //质量工程师
+      //   dataList: [{
+      //     certifiedEngineer: '',
+      //     projectManager: '',
+      //     standNumber: '',
+      //     itemsName: '',
+      //     uname: '',
+      //     projectNumber: '',
+      //     implementer: '',
+      //     implementerId: '',
+      //     productLine: '',
+      //     itemNum:'',
+      //     qualityEngineer: '',
+      //     distributePerson:'',
+      //     projectName:'',
+      //     standName:'',
+      //     distributePersonId:'',
+      //     complianceReasons:'', //在研合规原因
+      //     noCompliance:'', //在研不合规项目
+      //     countermeasures:'', //在研应对措施
+      //     completionTime:'', //在研完成时间
+      //     zcComplianceReasons: '', //在产的合规原因
+      //     zcCountermeasures:'', //在产的应对措施
+      //     zcCompletionTime:'', //在产的完成时间
+      //   }]
+      // },
       choiceForm: {}, //选择标准清单列表
       countryOptions: [], //适用区域下拉框数据
       user1: "",
@@ -358,6 +473,7 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
+          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg)
             this.getFormFieldList(processForm)
@@ -375,8 +491,11 @@ export default {
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
         this.listForm['id'] = item.id
-        this.listForm.dataList = item.dataList
+        this.dataList = item.step3DTOS
-        this.dataList = item.dataList
+        this.listForm.standName = item.step3DTOS[0].standName
+        this.listForm.standNumber = item.step3DTOS[0].standNumber
+        this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
+        this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer
       })
     },
 
@@ -394,6 +513,7 @@ export default {
       this.listForm.approvalOpinion = "";
       this.listForm.standId = this.listForm.standId;
       this.listForm.signFlag = "";
+      this.listForm.dataList = this.dataList
       const json = JSON.stringify(this.listForm);
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,

src/pages/processCenter/pages/creatProcess/xmpg/step5.vue

@@ -1,13 +1,579 @@
+<!--评估流程 - 分析审批 -->
 <template>
+  <div class="xmpg-step5">
+    <ProcessHeader toggle>
+      <template slot="proName">项目合规评估流程</template>
+      <template slot="proNode">分发责任人审批</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standNumber"
+                  placeholder="请输入标准编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standName"
+                  placeholder="请输入标准名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineer" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.certifiedEngineer"
+                  placeholder="请选择认证工程师"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineer" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.qualityEngineer"
+                  placeholder="请选择质量工程师"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <div class="tableTitle">
+        </div>
+        <el-table
+          ref="multipleTable"
+          :data="dataList"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          @selection-change="selectStandChange"
+          :height="sarProStateTableHeight"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="productLine"
+            align="center"
+            width="200"
+            label="产品线">
+          </el-table-column>
+          <el-table-column
+            prop="projectNumber"
+            align="center"
+            width="200"
+            label="项目编号">
+          </el-table-column>
+          <el-table-column
+            prop="projectName"
+            align="center"
+            width="200"
+            label="项目名称">
+          </el-table-column>
+          <el-table-column
+            prop="itemNum"
+            align="center"
+            width="200"
+            label="条款号">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
+          </el-table-column>
+          <el-table-column
+            prop="xCXSSRQ"
+            width="200"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="zCCSSRQ"
+            width="200"
+            align="center"
+            label="在产车实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="productType"
+            align="center"
+            label="在研产品">
+            <el-table-column
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
+              <el-table-column
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="在产产品">
+            <el-table-column
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              label="不合规">
+              <el-table-column
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="implementer"
+            label="落实人">
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="distributePerson"
+            label="责任人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
 
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="审批意见"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{scope.row.commentText}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+
+    <ProcessFooter
+      show-back
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
 </template>
 
 <script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail } from "api/process";
+
 export default {
-  name: "xmpgStep5"
+  name: "xmpgStep5",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      detailData: [],
+      sarProStateTableHeight: null, // 项目列表高度
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      loading: false,
+      dataList: [],
+      active: "1",
+      userId:this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      listType: "country",  //选择的清单类型
+      isSubmit: false,
+      saveLoading: false,
+      tabValue: "listOfCountries",
+      selectedList: [],  //选择清单的选择框
+      selectList: [], //选择标准的选择框
+      bringData: [],
+      commentText: "", //填写会签意见
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      listForm: {
+        fenFlag: '1',  //1为通过 其他为驳回
+        standNumber: "", //标准编号
+        standName: "",//标准名称
+        certifiedEngineer: "", //认证工程师
+        qualityEngineer: "", //质量工程师
+        breakdownList: [{    //分解单数据
+          implementer: "",
+          applyArctic: "",
+          busStandCover: "",
+          claimType: "",
+          id: "",
+          itemsName: "",
+          itemsNum: "",
+          responsibleUnit: "",
+          standId: "",
+          svpps: ""
+        }],
+        dataList: [{
+          implementer: "",
+          projectLine: "", //产品线
+          uname: "",//产品线责任人
+          distributePerson: "", //分发责任人
+          distributePersonId: "", //分发责任人id
+          id: "",
+          sarStandProjectLibraries: [{
+            projectManager: "",
+            projectLevel: "",
+            projectNumber: "",
+            projectEndDate: "",
+            currentNode: "",
+            projectGroup: "",
+            productLine: "",
+            projectClassification: "",
+            projectStatus: "",
+            projectStartDate: "",
+            id: "",
+            projectName: "",
+            projectPlatfor: ""
+          }]
+        }]
+      },
+      choiceForm: {}, //选择标准清单列表
+      countryOptions: [], //适用区域下拉框数据
+      user1: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: "",
+      standMap: new Map()
+    };
+  },
+  methods: {
+    processTable () {
+      this.$http.get('lawss/activiti/get_list_by_instance', {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : '',
+        shunxu: this.shunxu
+      }, {
+        loading: 'loading',
+        _this: this
+      }, res => {
+        this.detailData = res
+      }, e => {})
+    },
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          console.log(res.mesg);
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      console.log(item.dataList);
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item))
+        this.listForm.prcNum = this.prcNum
+        this.listForm.prcName = this.prcName
+        this.listForm['id'] = item.id
+        this.dataList = item.dataList
+      })
+    },
+
+
+    //驳回事件
+    beforeBack () {
+      this.listForm.fenFlag = '2'
+      this.handleSubmit()
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
+      this.listForm.commentText = this.commentText;
+      this.listForm.standId = this.listForm.standId;
+      this.listForm.fenFlag = "1";
+      this.listForm.dataList = this.dataList
+      const json = JSON.stringify(this.listForm);
+      console.log(json);
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+      }, e => {
+
+      });
+    },
+    //标准表格选择框改变
+    selectStandChange(data) {
+      this.selectList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectList.push(data[i].id);
+      }
+    },
+    selectThree() {
+
+    },
+    pageChange(page) {
+      this.page = page;
+      this.searchData();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = this.$store.getters.userInfo.configContent;
+      this.searchData();
+    }
+  },
+  computed: {
+    listNoDataText () {
+      return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+    },
+  },
+  mounted() {
+    this.processTable()
+    this.getData()
+    // console.log(this.$store.getters.getHandleInfo);
+  }
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
 
+.xmpg-step5 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
 </style>
+
+

src/pages/processCenter/pages/creatProcess/xmpg/step6.vue

@@ -1,13 +1,581 @@
+<!--评估流程 - 产品线责任人审批 -->
 <template>
+  <div class="xmpg-step6">
+    <ProcessHeader toggle>
+      <template slot="proName">项目合规评估流程</template>
+      <template slot="proNode">产品线责任人审批</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standNumber"
+                  placeholder="请输入标准编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standName"
+                  placeholder="请输入标准名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineer" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.certifiedEngineer"
+                  placeholder="请选择认证工程师"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineer" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.qualityEngineer"
+                  placeholder="请选择质量工程师"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <div class="tableTitle">
+        </div>
+        <el-table
+          ref="multipleTable"
+          :data="dataList"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          @selection-change="selectStandChange"
+          :height="sarProStateTableHeight"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="productLine"
+            align="center"
+            width="200"
+            label="产品线">
+          </el-table-column>
+          <el-table-column
+            prop="projectNumber"
+            align="center"
+            width="200"
+            label="项目编号">
+          </el-table-column>
+          <el-table-column
+            prop="projectName"
+            align="center"
+            width="200"
+            label="项目名称">
+          </el-table-column>
+          <el-table-column
+            prop="itemNum"
+            align="center"
+            width="200"
+            label="条款号">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
+          </el-table-column>
+          <el-table-column
+            prop="xCXSSRQ"
+            width="200"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="zCCSSRQ"
+            width="200"
+            align="center"
+            label="在产车实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="productType"
+            align="center"
+            label="在研产品">
+            <el-table-column
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
+              <el-table-column
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="在产产品">
+            <el-table-column
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              label="不合规">
+              <el-table-column
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="implementer"
+            label="落实人">
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="distributePerson"
+            label="责任人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
 
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="审批意见"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{scope.row.commentText}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+
+    <ProcessFooter
+      show-back
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
 </template>
 
 <script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail } from "api/process";
+
 export default {
-  name: "xmpgStep6"
+  name: "xmpgStep6",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      detailData: [],
+      sarProStateTableHeight: null, // 项目列表高度
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      loading: false,
+      dataList: [],
+      active: "1",
+      userId:this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      listType: "country",  //选择的清单类型
+      isSubmit: false,
+      saveLoading: false,
+      tabValue: "listOfCountries",
+      selectedList: [],  //选择清单的选择框
+      selectList: [], //选择标准的选择框
+      bringData: [],
+      commentText: "", //填写会签意见
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      listForm: {
+        fenFlag: '1',  //1为通过 其他为驳回
+        standNumber: "", //标准编号
+        standName: "",//标准名称
+        certifiedEngineer: "", //认证工程师
+        qualityEngineer: "", //质量工程师
+        breakdownList: [{    //分解单数据
+          implementer: "",
+          applyArctic: "",
+          busStandCover: "",
+          claimType: "",
+          id: "",
+          itemsName: "",
+          itemsNum: "",
+          responsibleUnit: "",
+          standId: "",
+          svpps: ""
+        }],
+        dataList: [{
+          implementer: "",
+          projectLine: "", //产品线
+          uname: "",//产品线责任人
+          distributePerson: "", //分发责任人
+          distributePersonId: "", //分发责任人id
+          id: "",
+          sarStandProjectLibraries: [{
+            projectManager: "",
+            projectLevel: "",
+            projectNumber: "",
+            projectEndDate: "",
+            currentNode: "",
+            projectGroup: "",
+            productLine: "",
+            projectClassification: "",
+            projectStatus: "",
+            projectStartDate: "",
+            id: "",
+            projectName: "",
+            projectPlatfor: ""
+          }]
+        }]
+      },
+      choiceForm: {}, //选择标准清单列表
+      countryOptions: [], //适用区域下拉框数据
+      user1: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: "",
+      standMap: new Map()
+    };
+  },
+  methods: {
+    processTable () {
+      this.$http.get('lawss/activiti/get_list_by_instance', {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : '',
+        shunxu: this.shunxu
+      }, {
+        loading: 'loading',
+        _this: this
+      }, res => {
+        this.detailData = res
+      }, e => {})
+    },
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          console.log(res.mesg);
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      console.log(item.dataList);
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item))
+        this.listForm.prcNum = this.prcNum
+        this.listForm.prcName = this.prcName
+        this.listForm['id'] = item.id
+        this.dataList = item.dataList
+      })
+    },
+
+
+    //驳回事件
+    beforeBack () {
+      this.listForm.fenFlag = '2'
+      this.handleSubmit()
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
+      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
+      this.listForm.commentText = this.commentText;
+      this.listForm.standId = this.listForm.standId;
+      this.listForm.fenFlag = "1";
+      this.listForm.dataList = this.dataList
+      const json = JSON.stringify(this.listForm);
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+      }, e => {
+
+      });
+    },
+    //标准表格选择框改变
+    selectStandChange(data) {
+      this.selectList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectList.push(data[i].id);
+      }
+    },
+    selectThree() {
+
+    },
+    pageChange(page) {
+      this.page = page;
+      this.searchData();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = this.$store.getters.userInfo.configContent;
+      this.searchData();
+    }
+  },
+  computed: {
+    listNoDataText () {
+      return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+    },
+  },
+  mounted() {
+    this.processTable()
+    this.getData()
+    // console.log(this.$store.getters.getHandleInfo);
+  }
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
 
+.xmpg-step6 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
 </style>
+
+

src/pages/processCenter/pages/creatProcess/xmpg/step7.vue

@@ -1,13 +1,581 @@
+<!--评估流程 - 标准法规部领导审批 -->
 <template>
+  <div class="xmpg-step7">
+    <ProcessHeader toggle>
+      <template slot="proName">项目合规评估流程</template>
+      <template slot="proNode">标准法规部领导审批</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standNumber"
+                  placeholder="请输入标准编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standName"
+                  placeholder="请输入标准名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineer" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.certifiedEngineer"
+                  placeholder="请选择认证工程师"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineer" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.qualityEngineer"
+                  placeholder="请选择质量工程师"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <div class="tableTitle">
+        </div>
+        <el-table
+          ref="multipleTable"
+          :data="dataList"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          @selection-change="selectStandChange"
+          :height="sarProStateTableHeight"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="productLine"
+            align="center"
+            width="200"
+            label="产品线">
+          </el-table-column>
+          <el-table-column
+            prop="projectNumber"
+            align="center"
+            width="200"
+            label="项目编号">
+          </el-table-column>
+          <el-table-column
+            prop="projectName"
+            align="center"
+            width="200"
+            label="项目名称">
+          </el-table-column>
+          <el-table-column
+            prop="itemNum"
+            align="center"
+            width="200"
+            label="条款号">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
+          </el-table-column>
+          <el-table-column
+            prop="xCXSSRQ"
+            width="200"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="zCCSSRQ"
+            width="200"
+            align="center"
+            label="在产车实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="productType"
+            align="center"
+            label="在研产品">
+            <el-table-column
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
+              <el-table-column
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="在产产品">
+            <el-table-column
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              label="不合规">
+              <el-table-column
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="implementer"
+            label="落实人">
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="distributePerson"
+            label="责任人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
 
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="审批意见"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{scope.row.commentText}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+
+    <ProcessFooter
+      show-back
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
 </template>
 
 <script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail } from "api/process";
+
 export default {
-  name: "xmpgStep7"
+  name: "xmpgStep7",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      detailData: [],
+      sarProStateTableHeight: null, // 项目列表高度
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      loading: false,
+      dataList: [],
+      active: "1",
+      userId:this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      listType: "country",  //选择的清单类型
+      isSubmit: false,
+      saveLoading: false,
+      tabValue: "listOfCountries",
+      selectedList: [],  //选择清单的选择框
+      selectList: [], //选择标准的选择框
+      bringData: [],
+      commentText: "", //填写会签意见
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      listForm: {
+        fenFlag: '1',  //1为通过 其他为驳回
+        standNumber: "", //标准编号
+        standName: "",//标准名称
+        certifiedEngineer: "", //认证工程师
+        qualityEngineer: "", //质量工程师
+        breakdownList: [{    //分解单数据
+          implementer: "",
+          applyArctic: "",
+          busStandCover: "",
+          claimType: "",
+          id: "",
+          itemsName: "",
+          itemsNum: "",
+          responsibleUnit: "",
+          standId: "",
+          svpps: ""
+        }],
+        dataList: [{
+          implementer: "",
+          projectLine: "", //产品线
+          uname: "",//产品线责任人
+          distributePerson: "", //分发责任人
+          distributePersonId: "", //分发责任人id
+          id: "",
+          sarStandProjectLibraries: [{
+            projectManager: "",
+            projectLevel: "",
+            projectNumber: "",
+            projectEndDate: "",
+            currentNode: "",
+            projectGroup: "",
+            productLine: "",
+            projectClassification: "",
+            projectStatus: "",
+            projectStartDate: "",
+            id: "",
+            projectName: "",
+            projectPlatfor: ""
+          }]
+        }]
+      },
+      choiceForm: {}, //选择标准清单列表
+      countryOptions: [], //适用区域下拉框数据
+      user1: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: "",
+      standMap: new Map()
+    };
+  },
+  methods: {
+    processTable () {
+      this.$http.get('lawss/activiti/get_list_by_instance', {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : '',
+        shunxu: this.shunxu
+      }, {
+        loading: 'loading',
+        _this: this
+      }, res => {
+        this.detailData = res
+      }, e => {})
+    },
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          console.log(res.mesg);
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      console.log(item.dataList);
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item))
+        this.listForm.prcNum = this.prcNum
+        this.listForm.prcName = this.prcName
+        this.listForm['id'] = item.id
+        this.dataList = item.dataList
+      })
+    },
+
+
+    //驳回事件
+    beforeBack () {
+      this.listForm.fenFlag = '2'
+      this.handleSubmit()
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
+      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
+      this.listForm.commentText = this.commentText;
+      this.listForm.standId = this.listForm.standId;
+      this.listForm.fenFlag = "1";
+      this.listForm.dataList = this.dataList
+      const json = JSON.stringify(this.listForm);
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+      }, e => {
+
+      });
+    },
+    //标准表格选择框改变
+    selectStandChange(data) {
+      this.selectList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectList.push(data[i].id);
+      }
+    },
+    selectThree() {
+
+    },
+    pageChange(page) {
+      this.page = page;
+      this.searchData();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = this.$store.getters.userInfo.configContent;
+      this.searchData();
+    }
+  },
+  computed: {
+    listNoDataText () {
+      return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+    },
+  },
+  mounted() {
+    this.processTable()
+    this.getData()
+    // console.log(this.$store.getters.getHandleInfo);
+  }
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
 
+.xmpg-step7 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
 </style>
+
+

src/pages/processCenter/pages/newProcess/index.vue

@@ -12,6 +12,7 @@
         <div class="process-name" @click="handleCreateProcess('6')">标准清单发布/更新流程</div>
         <div class="process-name" @click="handleCreateProcess('7')">项目合规评估流程</div>
         <div class="process-name" @click="handleCreateProcess('8')">未符合项整改流程</div>
+        <div class="process-name" @click="handleCreateProcess('9')">标准解读流程</div>
       </div>
     </div>
     <div v-if="zcgllc">
@@ -98,6 +99,10 @@ export default {
           })
           break
         case '9':
+          // 标准解读流程
+          this.$router.push({
+            name:'bzjdStep1'
+          })
           break
         case '10':
           break

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -344,7 +344,6 @@ export default {
             })
           }
           break;
-          break
         case '3':
           if (row.taskInfo === '责任对接人选择责任人') {
             this.$router.push({
@@ -497,6 +496,50 @@ export default {
                 prcType: row.prcType
               }
             })
+          }else if(row.taskInfo === '合规性评估'){
+            this.$router.push({
+              name: 'xmpgStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '分发责任人审核'){
+            this.$router.push({
+              name: 'xmpgStep5',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          // }else if(row.taskInfo === '标准法规部领导审核'){
+          //   this.$router.push({
+          //     name: 'xmpgStep6',
+          //     query: {
+          //       taskIds: row.taskIds,
+          //       prcId: row.prcId,
+          //       prcNum: row.prcNum,
+          //       prcName: row.prcName,
+          //       prcType: row.prcType
+          //     }
+          //   })
+          }else if(row.taskInfo === '标准法规部领导审核'){
+            this.$router.push({
+              name: 'xmpgStep7',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
           break
         //未符合项整改流程
@@ -547,6 +590,30 @@ export default {
             })
           }
           break
+        case '9':
+          if (row.taskInfo === '选择执行人') {
+            this.$router.push({
+              name: 'bzjdStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '填写解读分析') {
+            this.$router.push({
+              name: 'bzjdStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
       }
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue

@@ -295,19 +295,18 @@ export default {
     },
     // 批量删除
     deleteSarAccess(flag, id) {
-      if (flag === "delOne") {
+      if (flag === 'delOne') {
         this.selectedList = [];
         this.selectedList[0] = id;
       }
-      if (!this.selectedList.length) {
+      if (this.selectedList.length === 0) {
-        this.$message.warning("请选择要删除的数据");
+        this.$message.warning('请选择要删除的数据')
       } else {
-        this.$confirm("确认删除选中数据？", "确认删除", {
+        this.$confirm('确定删除这些数据？', '提示', {
-          confirmButtonText: "确定",
+          confirmButtonText: '确定',
-          cancelButtonText: "取消",
+          confirmButtonClass: 'common-button-primary',
-          confirmButtonClass: "common-button-primary",
+          cancelButtonText: '取消',
-          roundButton: false,
+          type: 'warning',
-          type: "warning"
         }).then(() => {
           const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(',')}`
           this.$http.postDelete(URL, {}, res => {
@@ -317,7 +316,8 @@ export default {
           }, e => {
           });
         }).catch(() => {
-        });
+
+        })
       }
     },
     // 表格选择框

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue

@@ -300,31 +300,31 @@ export default {
         name: "OtherAddEit"
       });
     },
-    // 删除
+    //批量删除
     deleteSarAccess(flag, id) {
-      if (flag === "delOne") {
+      if (flag === 'delOne') {
         this.selectedList = [];
         this.selectedList[0] = id;
       }
       if (this.selectedList.length === 0) {
-        this.$message.warning("请选择要删除的数据");
+        this.$message.warning('请选择要删除的数据')
       } else {
-        this.$confirm("确认删除这些数据？", "提示", {
+        this.$confirm('确定删除这些数据？', '提示', {
-          confirmButtonText: "确认",
+          confirmButtonText: '确定',
-          confirmButtonClass: "common-button-primary",
+          confirmButtonClass: 'common-button-primary',
-          cancelButtonText: "取消",
+          cancelButtonText: '取消',
-          type: "warning"
+          type: 'warning',
         }).then(() => {
-          const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(",")}`;
+          const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(',')}`
           this.$http.postDelete(URL, {}, res => {
             this.searchSarAccess();
             this.selectedList = [];
-            this.$message.success("删除成功");
+            this.$message.success('删除成功')
           }, e => {
           });
         }).catch(() => {
 
-        });
+        })
       }
     },
     // 表格选择框

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue

@@ -309,7 +309,7 @@ export default {
         this.selectedList = [];
         this.selectedList[0] = id;
       }
-      if (this.selectedList === 0) {
+      if (this.selectedList.length === 0) {
         this.$message.warning('请选择要删除的数据')
       } else {
         this.$confirm('确定删除这些数据？', '提示', {
@@ -329,7 +329,6 @@ export default {
 
         })
       }
-
     },
     // 表格选择框
     selectOne(data) {

src/pages/searchCenter/pages/standardSearch.vue

@@ -363,6 +363,10 @@ export default {
   mounted() {
     //查询所有选项
     this.queryOptions();
+    let globalInputSearch = this.$route.params.searchValue
+    if (globalInputSearch !== 'allvalue') {
+      this.keywords = globalInputSearch
+    }
 
   },
   unmounted() {

src/router/index.js

@@ -591,6 +591,33 @@ const routes = [
           title: '标准调研流程'
         }
       },
+      {
+        path: '/bzjdStep1',
+        name: 'bzjdStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准解读流程'
+        }
+      },
+      {
+        path: '/bzjdStep2',
+        name: 'bzjdStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准解读流程'
+        }
+      },
+      {
+        path: '/bzjdStep3',
+        name: 'bzjdStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准解读流程'
+        }
+      },
     ]
   },
   // 本地工具