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

src/pages/config/pages/attributeCustom/components/buss.vue

@@ -76,8 +76,8 @@
               <el-dropdown trigger="click" @command="handleCommand">
 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'QNDKHM2VNP8D938ZA9CQ'">编辑</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'18f50c76137df9b3112d07942b0d517f'">编辑</el-dropdown-item>
-                  <el-dropdown-item :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                  <el-dropdown-item :disabled="scope.row.isEdit==='1'"  v-btn-permission="'eca5a9d90a5de7bf86c349cd0e73b1cf'" :command="[scope.row, '删除']">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>

src/pages/config/pages/attributeCustom/components/laws.vue

@@ -76,8 +76,8 @@
               <el-dropdown trigger="click" @command="handleCommand">
 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'XFFUQ8ASE5SS9HGDGANZ'">编辑</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'b1e60ec7b60389713bf5b450ec2d1115'">编辑</el-dropdown-item>
-                  <el-dropdown-item :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                  <el-dropdown-item :disabled="scope.row.isEdit==='1'" v-btn-permission="'c157be4e073787ea6c4a04bd39686c2d'" :command="[scope.row, '删除']">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -331,7 +331,7 @@ export default {
           {required: true, message: '所属模块不能为空', trigger: 'change'}
         ],
         showIndex: [
-          { type: 'number', required: true, message: '请输入排序号', trigger: 'blur' },
+          { type: 'number', required: true, message: '不能为空且为正整数', trigger: 'blur' },
           { type: 'number', min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' }
         ]
       },

src/pages/config/pages/attributeCustom/components/stand.vue

@@ -2,8 +2,8 @@
 <template>
   <div class="attribute-custom v-class">
     <div class="action-bar1">
-      <el-button class="common-button-primary add-button" size="mini" v-btn-permission="''" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
+      <el-button class="common-button-primary add-button" size="mini" v-btn-permission="'df57f63c9e993bbfb2a4b400d5257577'" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
-      <el-button class="common-button-default" size="mini" v-btn-permission="''" @click="showDisplayLocationDialog">展示区域管理</el-button>
+      <el-button class="common-button-default" size="mini" v-btn-permission="'9557b51320a50728d7047448d01c57c6'" @click="showDisplayLocationDialog">展示区域管理</el-button>
     </div>
     <loading :loading="attributeDataLoading">数据处理中</loading>
     <div class="content">
@@ -76,8 +76,8 @@
               <el-dropdown trigger="click" @command="handleCommand">
 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item v-btn-permission="''" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
+                  <el-dropdown-item v-btn-permission="'abba040e019fad5092624ffd71a70372'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
-                  <el-dropdown-item :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                  <el-dropdown-item v-btn-permission="'730c9240a8f80bcdb88c71adb37f2aa7'" :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -199,7 +199,7 @@
       width="400px"
     >
       <div style="margin-bottom: 10px;">
-        <el-button class="common-button-primary add-button" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)">新增</el-button>
+        <el-button class="common-button-primary add-button" v-btn-permission="'e128da8f053dd19113e75772f2c70f29'" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)">新增</el-button>
       </div>
       <el-table
         :loading="displayLocationDialogTableConfig.loading"
@@ -230,8 +230,8 @@
               <el-dropdown trigger="click" @command="handleCommand2">
 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '修改']">修改</el-dropdown-item>
+                  <el-dropdown-item v-btn-permission="'2a788bca1cca66384e97f8ff722d4232'" :command="[scope.row, '修改']">修改</el-dropdown-item>
-                  <el-dropdown-item :disabled="scope.row.validFlag===1" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                  <el-dropdown-item v-btn-permission="'116a3f339f3600e639271d0073045912'" :disabled="scope.row.validFlag===1" :command="[scope.row, '删除']">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -330,7 +330,7 @@ export default {
           {required: true, message: '所属模块不能为空', trigger: 'change'}
         ],
         showIndex: [
-          { type: 'number', required: true, message: '请输入排序号', trigger: 'blur' },
+          { type: 'number', required: true, message: '不能为空且为正整数', trigger: 'blur' },
           { type: 'number', min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' }
         ]
       },

src/pages/config/pages/standLawsAttrManage/index.vue

@@ -39,10 +39,9 @@
           <el-form-item label="" class="search-item btn-box">
             <el-button
               class="common-button-default"
-              icon="el-icon-refresh-left"
               @click="resetSelect"
               size="mini"
-            ></el-button>
+            >清空</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -78,7 +77,7 @@
         }"
         @selection-change="handleSelectone"
       >
-        <el-table-column type="selection" width="55" align="center">
+        <el-table-column type="selection" :selectable="handleSelected" width="55" align="center">
         </el-table-column>
         <el-table-column prop="dictionaryCode" label="数据字典编码">
         </el-table-column>
@@ -406,6 +405,12 @@ export default {
         this.selectedList.push(data[i].id)
       }
     },
+    // 判断可选择的项
+    handleSelected(row, index) {
+      if (row.enable === '1') {
+        return true
+      }
+    },
     pageChange (page) {
       this.pageNo = page
       this.getAttrByPage()

src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrDetails.vue

@@ -17,26 +17,26 @@
                       clearable></el-input>
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
-            <el-button class="common-button-primary" type="primary" icon="el-icon-search" round @click="selectProductBtn"></el-button>
+            <el-button class="common-button-primary" type="primary" size="mini" @click="selectProductBtn">搜索</el-button>
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
-            <el-button class="common-button-default" icon="el-icon-refresh-left" @click="resetSelect" round></el-button>
+            <el-button class="common-button-default" size="mini"  @click="resetSelect" >清空</el-button>
           </el-form-item>
         </el-form>
       </div>
       <div class="right">
         <el-button class="common-button-primary add-button"
-                   v-btn-permission="'4UF7LY2ZSCFHBKYS7VE2'"
+                   v-btn-permission="'8969811dc465528909628a3a13529023'"
                    type="primary"
                    icon="add"
+                   size="small"
                    v-if="dictionaryId != 'ERDFGHGGJJ' && dictionaryId != 'D975E8V5KVQUY3DZFV7E' && dictionaryId != 'WQERWC39J4E8SV6WREP2'"
-                   round
                    @click="productAdd">新增</el-button>
         <el-button class="common-button-default delete-button"
-                   v-btn-permission="'7WBE2BGZ2F745MDQ8VVD'"
+                   v-btn-permission="'df889d64e87c977e4bc9f9a0851d4c27'"
-                   round
                    v-if="dictionaryId != 'ERDFGHGGJJ' && dictionaryId != 'D975E8V5KVQUY3DZFV7E' && dictionaryId != 'WQERWC39J4E8SV6WREP2'"
                    icon="delete"
+                   size="small"
                    @click="productBatchDel">删除</el-button>
       </div>
     </div>
@@ -85,8 +85,8 @@
                   <div v-if="relateDicId">
                     <el-dropdown-item :command="[scope.row, '查看']"  v-btn-permission="'AQCEYWZK8F4DL85BZPRB'">查看</el-dropdown-item>
                   </div>
-                  <el-dropdown-item :command="[scope.row, '编辑']"  v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== 'D975E8V5KVQUY3DZFV7E' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'"  v-btn-permission="'8DGUGJTPV32F9F478K4P'">编辑</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '编辑']"  v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== '48723deaa90798f56e939aea6aa49a23' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'"  v-btn-permission="'27e0f6cdfb3e2af446c36f9923e90d76'">编辑</el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']"  v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== 'D975E8V5KVQUY3DZFV7E' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'"  v-btn-permission="'7WBE2BGZ2F745MDQ8VVD'">删除</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '删除']"  v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== '982b2f92a26c3c91b6b868419f0e2d3b' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'"  v-btn-permission="'27e0f6cdfb3e2af446c36f9923e90d76'">删除</el-dropdown-item>
                   <!--                    <el-dropdown-item :command="[scope.row, '流程']">流程</el-dropdown-item>-->
                 </el-dropdown-menu>
               </el-dropdown>

src/pages/localTool/standContrast/index.vue

@@ -31,8 +31,8 @@
       </table-tools-bar>
       <div class="content">
         <div class="action-bar">
-          <el-button size="mini" v-btn-permission="''" @click="contrastStandFile" style="width:77px; height:32px;">比对</el-button>
+          <el-button size="mini" v-btn-permission="'36078b3c8e897f8c1b6d6974a612d0c7'" @click="contrastStandFile" style="width:77px; height:32px;">比对</el-button>
-          <el-button size="mini" v-btn-permission="''" @click="batchDelete"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
+          <el-button size="mini" v-btn-permission="'83981863baa8716bdcc9e52a1fb1d2dc'" @click="batchDelete"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
         </div>
         <div class="table-wrap">
           <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
@@ -120,8 +120,8 @@
                   <el-dropdown trigger="click" @command="handleCommand">
                     <i class="iconfont">&#xe61e;</i>
                     <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item v-btn-permission="''" :command="[scope.row, '查看']">查看</el-dropdown-item>
+                      <el-dropdown-item v-btn-permission="'13219b54a6f41280818e7ade5cf2cfad'" :command="[scope.row, '查看']">查看</el-dropdown-item>
-                      <el-dropdown-item v-btn-permission="''" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                      <el-dropdown-item v-btn-permission="'b6b048e926ecc9334cad769d4be7c4ec'" :command="[scope.row, '删除']">删除</el-dropdown-item>
 <!--                      <el-dropdown-item v-btn-permission="''" :command="[scope.row, '分享']">分享</el-dropdown-item>
                       <el-dropdown-item
                         v-if="scope.row.collectBtn"

src/pages/localTool/standContrast/pages/contrastDetails.vue

@@ -15,13 +15,13 @@
                 </el-formItem>
                 <el-formItem>
                   <el-button
-                    icon="el-icon-search"
                     type="primary"
                     size="mini"
                     class="common-button-primary"
                     @click="getSarFileSplitInfoEOPage">
+                    搜索
                   </el-button>
-                  <el-button size="mini" icon="el-icon-refresh-left" class="common-button-default" @click="clearSearchStand"></el-button>
+                  <el-button size="mini" class="common-button-default" @click="clearSearchStand">清空</el-button>
                 </el-formItem>
               </el-form>
             </div>
@@ -103,13 +103,13 @@
                 </el-formItem>
                 <el-formItem class="search-item">
                   <el-button
-                    icon="el-icon-search"
                     size="mini"
                     type="primary"
                     class="common-button-primary"
                     @click="getSarFileSplitInfoEOPage2">
+                    搜索
                   </el-button>
-                  <el-button size="mini" icon="el-icon-refresh-left" class="common-button-default" @click="clearSearchStand2"></el-button>
+                  <el-button size="mini" class="common-button-default" @click="clearSearchStand2">清空</el-button>
                 </el-formItem>
               </el-form>
             </div>

src/pages/localTool/standardRecognition/index.vue

@@ -4,10 +4,10 @@
     <div class="action-bar">
       <div slot="left">
         <!--          <el-button type="primary" @click="changeData">转化</Button>-->
-        <el-button size="mini" @click="uploadPdf" v-btn-permission="''"
+        <el-button size="mini" @click="uploadPdf" v-btn-permission="'f56e5f765a93c14cba88f8c3270388c6'"
           ><i class="iconfont">&#xe65d;</i>上传</el-button
         >
-        <el-button size="mini" @click="delData" v-btn-permission="''"
+        <el-button size="mini" @click="delData" v-btn-permission="'ef6262d0bf66a25633e903d76a93e579'"
           ><i class="iconfont">&#xe61b;</i>删除</el-button
         >
       </div>
@@ -106,13 +106,13 @@
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="[scope.row, '获取文件']" v-btn-permission=""
+                    <el-dropdown-item :command="[scope.row, '获取文件']" v-btn-permission="'018cb58e72025fc43a9bfe1bde00c14a'"
                       >获取文件</el-dropdown-item
                     >
-                    <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission=""
+                    <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'14bdb937d168478e65b139214e982a8c'"
                       >编辑</el-dropdown-item
                     >
-                    <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission=""
+                    <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'74cffbebad841dbe2e0597792e5aba3f'"
                       >删除</el-dropdown-item
                     >
 <!--                    <el-dropdown-item :command="[scope.row, '在线编辑']" v-btn-permission=""

src/pages/localTool/standardWarning.vue

@@ -29,7 +29,7 @@
                   </el-form>
                 </div>
                 <div class="content" style="height: 100%; padding-top: 5px; ">
-                  <el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
+                  <el-divider content-position="left" class="dynamic-child-title"></el-divider>
                   <el-table
                     :data="newItems"
                     :height="height"
@@ -59,7 +59,7 @@
                     </el-table-column>
                     <el-table-column prop="putTime" label="新车型实施日期" align="center" sortable>
                       <template slot-scope="scope">
-                        {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
+                        <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
                       </template>
                     </el-table-column>
                     <el-table-column prop="applyType" label="适用车型" align="center">
@@ -124,7 +124,7 @@
                     </el-table-column>
                     <el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>
                       <template slot-scope="scope">
-                        {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
+                        <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
                       </template>
                     </el-table-column>
                     <el-table-column prop="applyType" label="适用车型" align="center">
@@ -190,7 +190,7 @@
                     </el-table-column>
                     <el-table-column prop="putTime" label="实施日期" align="center" sortable>
                       <template slot-scope="scope">
-                        {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
+                        <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
                       </template>
                     </el-table-column>
                     <el-table-column prop="applyType" label="适用车型" align="center">
@@ -256,7 +256,7 @@
                     </el-table-column>
                     <el-table-column prop="putTime" label="实施日期" align="center" sortable>
                       <template slot-scope="scope">
-                        {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
+                        <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
                       </template>
                     </el-table-column>
                     <el-table-column prop="applyType" label="适用车型" align="center">

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

@@ -10,7 +10,7 @@
             <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;">
+            <div style="overflow: auto;">
                 <el-form
                         ref="bzzqyjForm"
                         :model="form"
@@ -49,6 +49,52 @@
                     </div>
                 </el-form>
             </div>
+            <ProcessTitle>
+                <template slot="title">拆分信息</template>
+            </ProcessTitle>
+            <div class="action-bar">
+                <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
+            </div>
+            <el-table border
+                      ref="selection"
+                      :data="itemList"
+                      tooltip-effect="dark"
+                      style="width: 100%;"
+                      height="100%"
+                      :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+                      @selection-change="handleSelectionChange"
+                      row-key="id">
+                <el-table-column type="selection" width="55" align="center"/>
+                <el-table-column
+                        prop="itemsNum"
+                        label="条款号"
+                        width="170"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itemsName"
+                        label="条款名称"
+                        width="170"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        label="条款内容"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="责任人"
+                        width="170"
+                        align="center">
+                    <template slot-scope="scope">
+                        <el-input v-model="scope.row.zrUserId" style="display: none;"/>
+                        <el-input v-model="scope.row.zrUserIdName" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <loading :loading="loading">数据获取中</loading>
             <el-collapse accordion>
                 <el-collapse-item title="意见填写">
                     <div style="margin: 10px 0;">
@@ -82,21 +128,6 @@
                                 </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">
@@ -126,7 +157,7 @@
         >
         </ProcessFooter>
         <el-drawer
-                title="标准征求意见数据库"
+                title="标准拆分数据库"
                 :visible.sync="listModel"
                 size="900px"
                 custom-class="demo-drawer"
@@ -234,14 +265,15 @@
                 size="800px">
             <el-tree
                     v-if="modalshowflag2"
-                    style="height: 100%; overflow: auto;"
                     node-key="id"
+                    style="height: 100%; overflow: auto;"
                     class="filter-tree"
                     :data="treeData"
                     :props="defaultProps"
                     :default-checked-keys="nodeList2"
                     highlight-current
                     check-strictly
+                    @check="drawerCheck2"
                     default-expand-all
                     :expand-on-click-node="false"
                     show-checkbox
@@ -265,6 +297,7 @@
         name: "bzjdStep1",
         data() {
             return {
+                loading: false,
                 standId: '',
                 commentText: '',
                 textarea: '', // 意见
@@ -303,8 +336,6 @@
                 roleForm: {
                     applyUserIdName: this.$store.getters.userInfo.userName,
                     applyUserId: this.$store.getters.userInfo.userId,
-                    zrUserId: '',
-                    zrUserIdName: '',
                     deptUserId: '',
                     deptUserIdName: ''
                 },
@@ -328,7 +359,10 @@
                     label: 'name'
                 },
                 roleRow: {},
-                itemList: []
+                itemList: [],
+                zrType: '',
+                zrIndex: '',
+                zrIdList: []
             }
         },
         components: {
@@ -401,6 +435,7 @@
             },
             enterDrawer() {
                 if (this.selectedList.length === 1) {
+                    this.loading = true
                     let deposit = new Map();
                     this.standInfoList.forEach(item => {
                         deposit.set(item.id, item);
@@ -427,9 +462,13 @@
                         _this: this
                     }, res => {
                         if (res.ok) {
+                            res.data.list.forEach(item => {
+                                item.zrUserId = ''
+                                item.zrUserIdName= ''
+                            })
                             this.itemList = res.data.list
-                            console.log(res);
                         }
+                        this.loading = false
                     })
                 } else if (this.selectedList.length > 1) {
                     this.$message.warning("只能选择一条数据进行带入");
@@ -470,12 +509,37 @@
                     this.roleRow = this.$refs.tree.getCheckedNodes()[0]
                 }
             },
-            choiceZRRS () {
+            drawerCheck2 (data) {
-                this.nodeList2 = []
+                var getlist = this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes());
-                if ( this.roleForm.zrUserId.length > 0) {
+                if(getlist.length == 1) {
-                    this.nodeList2 = this.roleForm.zrUserId.split(',')
+                    this.roleRow = getlist[0]
+                }else {
+                    this.$refs.tree2.setCheckedKeys([data.id]);
+                    this.roleRow = this.$refs.tree2.getCheckedNodes()[0]
+                }
+            },
+            handleSelectionChange (val) {
+                this.zrIdList = []
+                val.forEach( item => {
+                    this.zrIdList.push(item.id)
+                })
+            },
+            choiceZRRS (row, type, index) {
+                if (type === 1) {
+                    this.zrIndex= index
+                    this.zrType = type
+                    this.nodeList2.push(row)
+                    this.modalshowflag2 = true
+                } else {
+                    // 批量
+                    if (this.zrIdList.length > 0) {
+                        this.zrType = type
+                        this.nodeList2 = []
+                        this.modalshowflag2 = true
+                    } else {
+                     this.$message.warning('请选择要编辑的数据')
+                    }
                 }
-                this.modalshowflag2 = true
             },
             saveUserInfo2 () {
                 var idList = ''
@@ -488,8 +552,19 @@
                     idList += item.id
                     nameList += item.name
                 })
-                this.roleForm.zrUserId = idList
+                if (this.zrType == 1) {
-                this.roleForm.zrUserIdName = nameList
+                    this.itemList[this.zrIndex].zrUserId = idList
+                    this.itemList[this.zrIndex].zrUserIdName = nameList
+                } else {
+                    this.itemList.forEach( item => {
+                        this.zrIdList.forEach( items => {
+                            if (item.id === items) {
+                                item.zrUserId = idList
+                                item.zrUserIdName = nameList
+                            }
+                        })
+                    })
+                }
                 this.modalshowflag2 = false
             },
             cancleUserInfo2 () {
@@ -504,28 +579,38 @@
                     if (valid) {
                         this.$refs['Form'].validate((valid) => {
                             if (valid) {
-                                this.$http.get('lawss/activiti/startProcess', {
+                                let b = 0
-                                    type: '9'
+                                for (let a = 0; a < this.itemList.length; a++) {
-                                }, {}, res => {
+                                    if (!this.itemList[a].zrUserId) {
-                                    if (res.ok) {
+                                        b++
-                                        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('流程启动失败')
                                     }
-                                })
+                                }
+                                if (b > 0) {
+                                    this.$message.warning('请选择责任人')
+                                } else {
+                                    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('请完善人员信息')
                             }

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

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+    export default {
+        name: "step4"
+    }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+    export default {
+        name: "step5"
+    }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+    export default {
+        name: "step6"
+    }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -40,11 +40,25 @@
                 ></el-input>
               </el-form-item>
               <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">
-                <el-input
+<!--                <el-input-->
+<!--                  v-model="listForm.applyRegion"-->
+<!--                  placeholder="请输入适用区域"-->
+<!--                  clearable-->
+<!--                ></el-input>-->
+                <el-select
+                  width="120"
                   v-model="listForm.applyRegion"
-                  placeholder="请输入适用区域"
+                  placeholder="请选择"
-                  clearable
+                  filterable
-                ></el-input>
+                >
+                  <el-option
+                    v-for="item in countryOptions"
+                    :value="item.value"
+                    :key="item.value"
+                    :label="item.label"
+                  >
+                  </el-option>
+                </el-select>
               </el-form-item>
               <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
                 <el-input
@@ -163,7 +177,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>
@@ -627,21 +641,21 @@ export default {
       },
       formRules: {
         listType: [
-          { required: true, message: "请选择清单类型", trigger: "blur" }
+          { 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" }
+          { required: true, message: "请选择审批责任人", trigger: "change" }
         ]
       },
       dataList: [],//清单里的标准数据
@@ -842,7 +856,8 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      let json = this.listForm;
+      // let json = this.listForm;
+      let json = Object.assign(this.listForm, this.roleForm)
       json.zrUserId = this.$store.getters.userInfo.userId;
       json.jlUserId = this.$store.getters.userInfo.userId;
       // (如果是业务经理应该这样写 后续需要更改 例：json.jlUserId = this.roleForm.directorUser;)
@@ -958,7 +973,6 @@ export default {
               res.data=[]
           }
           this.dataList = res.data;
-          console.log(res.data);
           this.listForm.dataList = res.data;
           let formId = []
           this.dataList.map(item => {
@@ -979,7 +993,6 @@ export default {
       for (let i = 0; i < data.length; i++) {
         this.selectedList.push(data[i].id);
       }
-      console.log(this.selectedList);
     },
     //标准表格选择框改变
     selectStandChange(data) {
@@ -1024,18 +1037,18 @@ export default {
   },
   computed: {},
   mounted() {
+    //从数据库中查询下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+      _this: this
+    }, res => {
+      this.countryOptions = res.data.COUNTRY;
+    });
     this.selectionList();
     this.selectSign();
     this.getTree();
     for (let i = 0; i < this.dataList.length; i++) {
       this.standMap.set(this.dataList[i].id, this.dataList[i]);
     }
-    //从数据查询下拉框数据
-    this.$http.get("sys/dictype/getDicTypeListCode", "", {
-      _this: this
-    }, res => {
-      this.countryOptions = res.data.COUNTRY;
-    });
   }
 
 };

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

@@ -8,7 +8,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;">
           <ProcessTitle>
             <template slot="title">基础信息</template>
@@ -50,7 +50,7 @@
         </el-collapse-item>
       </el-collapse>
     </div>
-    <div class="content" v-if="active === '2'">
+    <div class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
         <el-timeline>
           <el-form
@@ -378,6 +378,7 @@ export default {
         this.$message.warning("请选择至少一条数据进行带入");
       }
     },
+    // 勾选事件
     selectedChange(val) {
       this.selectedList = val
     },
@@ -433,7 +434,7 @@ export default {
       this.modalshowflag = true
     },
     drawerCheck (data) {
-      var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+      let getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
       if(getlist.length == 1) {
         this.roleRow = getlist[0]
       }else {

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

@@ -364,7 +364,7 @@ export default {
       this.modalshowflag = false
     },
     //查询按钮
-      getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
+    getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
         this.realList = this.dataList.filter(item => {
           let matchId = true; // 标准号 筛选
           let matchName = true; // 项目名称 筛选

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

@@ -12,11 +12,11 @@
         <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
               size="small"
-              v-model="dataList.standId"
+              v-model="nonSearch.standId"
               placeholder="请输入"
               clearable
               :maxlength="100"></el-input>
@@ -24,13 +24,13 @@
           <el-form-item label="项目名称" class="search-item">
             <el-input
               size="small"
-              v-model="dataList.productName"
+              v-model="nonSearch.productName"
               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"
@@ -40,7 +40,7 @@
               <el-input
                 size="small"
                 slot="reference"
-                v-model="dataList.responseUnitShow"
+                v-model="nonSearch.responseUnitShow"
                 placeholder="根据责任部门查找"
                 readonly
                 clearable
@@ -64,7 +64,7 @@
               class="common-button-primary"
               size="mini"
               v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
-              @click="getTableByPage('dataList')">
+              @click="getTableByPage(nonSearch)">
               查询
             </el-button>
           </el-form-item>
@@ -120,7 +120,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="textarea">
+              v-model="commentText">
             </el-input>
           </div>
         </el-collapse-item>
@@ -129,8 +129,10 @@
     <ProcessFooter
       show-save
       show-submit
+      show-back
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
+      @back="handleSubmitNo"
       @save="handleSave"
       @submit="handleSubmit"
     >
@@ -174,10 +176,10 @@ export default {
   name: "wfhxzgStep3",
   data() {
     return {
-      textarea: '', // 意见
+      commentText: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
-      nonConformitySearch: {
+      nonSearch: {
         standId: '', // 标准号/名称
         productName: '', // 项目名称
         responsibleUnit: '' // 责任部门
@@ -243,6 +245,25 @@ export default {
       this.active = name
     },
 
+    handleSubmitNo() {
+      if (this.commentText) {
+        var json = this.json
+        json.actionFlag = 1
+        json.commentText = this.commentText
+        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 {
+        this.$message.warning('请输入反馈意见')
+      }
+    },
     // 保存按钮
     handleSave() {},
     // 提交按钮
@@ -317,11 +338,32 @@ export default {
       this.modalshowflag = false
     },
     //查询按钮
-    getTableByPage() {
+    getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
+      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) {
-      this.nonConformitySearch = {
+      this.nonSearch = {
         standId: '',
         productName: '',
         responsibleUnit: ''

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

@@ -12,11 +12,11 @@
         <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
               size="small"
-              v-model="dataList.standId"
+              v-model="nonSearch.standId"
               placeholder="请输入"
               clearable
               :maxlength="100"></el-input>
@@ -24,13 +24,13 @@
           <el-form-item label="项目名称" class="search-item">
             <el-input
               size="small"
-              v-model="dataList.productName"
+              v-model="nonSearch.productName"
               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"
@@ -40,7 +40,7 @@
               <el-input
                 size="small"
                 slot="reference"
-                v-model="dataList.responseUnitShow"
+                v-model="nonSearch.responseUnitShow"
                 placeholder="根据责任部门查找"
                 readonly
                 clearable
@@ -64,7 +64,7 @@
               class="common-button-primary"
               size="mini"
               v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
-              @click="getTableByPage('dataList')">
+              @click="getTableByPage(nonSearch)">
               查询
             </el-button>
           </el-form-item>
@@ -177,7 +177,7 @@ export default {
       textarea: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
-      nonConformitySearch: {
+      nonSearch: {
         standId: '', // 标准号/名称
         productName: '', // 项目名称
         responsibleUnit: '' // 责任部门
@@ -323,16 +323,37 @@ export default {
     },
 
     //未整改项抽屉中的查询按钮
-    getTableByPage() {
+    getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
+      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/wfhxzg/step5.vue

@@ -12,11 +12,11 @@
         <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
               size="small"
-              v-model="dataList.standId"
+              v-model="nonSearch.standId"
               placeholder="请输入"
               clearable
               :maxlength="100"></el-input>
@@ -24,13 +24,13 @@
           <el-form-item label="项目名称" class="search-item">
             <el-input
               size="small"
-              v-model="dataList.productName"
+              v-model="nonSearch.productName"
               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"
@@ -40,7 +40,7 @@
               <el-input
                 size="small"
                 slot="reference"
-                v-model="dataList.responseUnitShow"
+                v-model="nonSearch.responseUnitShow"
                 placeholder="根据责任部门查找"
                 readonly
                 clearable
@@ -64,7 +64,7 @@
               class="common-button-primary"
               size="mini"
               v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
-              @click="getTableByPage('dataList')">
+              @click="getTableByPage(nonSearch)">
               查询
             </el-button>
           </el-form-item>
@@ -141,7 +141,7 @@ export default {
       title: '', // 新增编辑抽屉标题
       saveLoading: false,
       ListModel: false, // 新增编辑抽屉开关
-      nonConformitySearch: {
+      nonSearch: {
         standId: '', // 标准号/名称
         productName: '', // 项目名称
         responsibleUnit: '' // 责任部门
@@ -231,16 +231,37 @@ export default {
       }
     },
     //未整改项抽屉中的查询按钮
-    getTableByPage() {
+    getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
+      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) {
-      this.nonConformitySearch = {
+      this.nonSearch = {
         standId: '',
         productName: '',
         responsibleUnit: ''
       }
-      this.getTableByPage()
+      this.getData()
     },
     // 分页事件
     pageChange (page) {

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

@@ -113,13 +113,13 @@
             :model="roleForm"
             :rules="roleFormRules"
             class="label-input-form">
-            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="发起流程"  placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
                   <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>

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

@@ -328,7 +328,6 @@ export default {
         implementer: ""
       },
       choiceForm: {}, //选择标准清单列表
-      countryOptions: [], //适用区域下拉框数据
       user1: "",
       user2: "",
       user3: "",

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

@@ -428,17 +428,19 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList (item) {
-      console.log(item.dataList);
+      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
         this.listForm['id'] = item.id
-        this.dataList = item.dataList
+        this.dataList = item.step3DTOS
+        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
       })
     },
-
-
     //驳回事件
     beforeBack () {
       this.listForm.fenFlag = '2'

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

@@ -518,17 +518,17 @@ export default {
                 prcType: row.prcType
               }
             })
-          // }else if(row.taskInfo === '标准法规部领导审核'){
+          }else if(row.taskInfo === '汇总审核'){
-          //   this.$router.push({
+            this.$router.push({
-          //     name: 'xmpgStep6',
+              name: 'xmpgStep6',
-          //     query: {
+              query: {
-          //       taskIds: row.taskIds,
+                taskIds: row.taskIds,
-          //       prcId: row.prcId,
+                prcId: row.prcId,
-          //       prcNum: row.prcNum,
+                prcNum: row.prcNum,
-          //       prcName: row.prcName,
+                prcName: row.prcName,
-          //       prcType: row.prcType
+                prcType: row.prcType
-          //     }
+              }
-          //   })
+            })
           }else if(row.taskInfo === '标准法规部领导审核'){
             this.$router.push({
               name: 'xmpgStep7',
@@ -613,6 +613,39 @@ export default {
                 prcType: row.prcType
               }
             })
+          } else if (row.taskInfo === '4') {
+            this.$router.push({
+              name: 'bzjdStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '5') {
+            this.$router.push({
+              name: 'bzjdStep5',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '6') {
+            this.$router.push({
+              name: 'bzjdStep6',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
       }
     },

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -208,6 +208,7 @@
           <el-table-column
             prop="code"
             fixed="left"
+            align="center"
             width="180px"
             label="标准号">
             <template slot-scope="scope">
@@ -218,22 +219,26 @@
           <el-table-column
             prop="standName"
             label="标准名称"
+            align="center"
             width="260px"
           >
           </el-table-column>
           <el-table-column
             prop="issueTime"
             sortable
+            align="center"
             label="发布日期">
           </el-table-column>
           <el-table-column
-            prop="xcxssrq"
+            prop="XCXSSRQ"
             sortable
+            align="center"
             label="新车型实施日期">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="zccssrq"
+            prop="ZCCSSRQ"
+            align="center"
             sortable
             label="在产车实施日期">
           </el-table-column>
@@ -241,6 +246,7 @@
             show-overflow-tooltip
             prop="textStatus"
             width="120px"
+            align="center"
             label="文本状态">
           </el-table-column>
         </el-table>
@@ -323,6 +329,7 @@
         <el-table-column
           width="180px"
           fixed="left"
+          align="center"
           label="标准号">
           <template slot-scope="scope">
             <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
@@ -331,31 +338,86 @@
         </el-table-column>
         <el-table-column
           prop="standName"
-          label="标准名称"
+          label="中文名称"
-          width="260px"
+          align="center"
+          fixed="left"
+          width="180px"
         >
         </el-table-column>
         <el-table-column
           prop="issueTime"
-          sortable
+          align="center"
-          label="发布日期">
+          width="180px"
+          label="英文名称">
         </el-table-column>
         <el-table-column
-          prop="xcxssrq"
+          prop="issueTime"
+          align="center"
+          width="180px"
+          label="适用车型">
+        </el-table-column>
+        <el-table-column
+          prop="issueTime"
+          align="center"
+          width="180px"
+          label="能源类型">
+        </el-table-column>
+        <el-table-column
+          prop="issueTime"
           sortable
-          label="新车型实施日期">
+          align="center"
+          width="210px"
+          label="标准实施日期">
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="zccssrq"
           sortable
+          width="210px"
+          align="center"
           label="在产车实施日期">
         </el-table-column>
+        <el-table-column
+          prop="XCXSSRQ"
+          sortable
+          align="center"
+          width="210px"
+          label="新车型实施日期">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="zccssrq"
+          width="210px"
+          align="center"
+          label="责任部门">
+        </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="textStatus"
-          width="120px"
+          width="180px"
-          label="文本状态">
+          align="center"
+          label="适用产品线">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          width="210px"
+          align="center"
+          label="乘用车VPPS中文名称">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          align="center"
+          width="210px"
+          label="卡车VPPS编码">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          align="center"
+          width="210px"
+          label="卡车VPPS中文名称">
         </el-table-column>
         <el-table-column>
           <template slot-scope="scope">
@@ -1174,6 +1236,7 @@ export default {
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, {
         _this: this
       }, res =>{
+        console.log(res.data.list);
         this.sarAccessInfoSearchList = res.data.list
       }, e => {
 
@@ -1634,6 +1697,7 @@ export default {
       this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, {
         _this: this
       }, res => {
+        console.log(res.data);
         this.sarAccessInfoList = res.data
       }, e => {
 

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -71,21 +71,21 @@
             </el-popover>
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
-            <el-button class="common-button-primary" type="primary" size="small" @click="selectProductBtn">查询
+            <el-button  v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary" type="primary" size="small" @click="selectProductBtn">查询
             </el-button>
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
-            <el-button class="common-button-default" @click="resetSelect" size="small">清空</el-button>
+            <el-button  v-btn-permission="'d55e2eb884449f04ecdb30f0523d965d'" class="common-button-default" @click="resetSelect" size="small">清空</el-button>
           </el-form-item>
 
           <el-button class="common-button-default export-button"
-                     v-btn-permission="'25859ea5afacb2ad49705f5daefe0d23'"
+                     v-btn-permission="'c7165a1baa667140f97e792971c89a71'"
                      size="small" @click="exportStandard()"
                      title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
                      icon="export"
           >导出
           </el-button>
-          <el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn"><i
+          <el-button type="primary" v-btn-permission="'670472f38fe27b192c7f7105847f38ce'" class="common-button-primary" size="mini" @click="selectMoreBtn"><i
             class="iconfont">&#xe7a5;</i>高级查询
           </el-button>
         </el-form>
@@ -111,42 +111,98 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="code"
+            prop="standNumber"
             fixed="left"
             width="180px"
+            align="center"
             label="标准号">
             <template slot-scope="scope">
-              <a v-if="scope.row.resId" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.code }}</a>
+              <a v-if="scope.row.resId" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
-              <span v-else>{{ scope.row.code }}</span>
+              <span v-else>{{ scope.row.standNumber }}</span>
             </template>
           </el-table-column>
           <el-table-column
             prop="standName"
-            label="标准名称"
+            label="中文名称"
-            width="260px"
+            align="center"
+            fixed="left"
+            width="180px"
           >
           </el-table-column>
           <el-table-column
-            prop="isSubTime"
+            prop="issueTime"
-            sortable
+            align="center"
-            label="发布日期">
+            width="180px"
+            label="英文名称">
           </el-table-column>
           <el-table-column
-            prop="newPutTime"
+            prop="issueTime"
+            align="center"
+            width="180px"
+            label="适用车型">
+          </el-table-column>
+          <el-table-column
+            prop="issueTime"
+            align="center"
+            width="180px"
+            label="能源类型">
+          </el-table-column>
+          <el-table-column
+            prop="issueTime"
             sortable
+            align="center"
+            width="210px"
+            label="标准实施日期">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="zccssrq"
+            sortable
+            width="210px"
+            align="center"
+            label="在产车实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrq"
+            sortable
+            align="center"
+            width="210px"
             label="新车型实施日期">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="prodPutTime"
+            prop="zccssrq"
-            sortable
+            width="210px"
-            label="在产车实施日期">
+            align="center"
+            label="责任部门">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="proEssessUser"
+            prop="textStatus"
-            width="120px"
+            width="180px"
-            label="文本状态">
+            align="center"
+            label="适用产品线">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="textStatus"
+            width="210px"
+            align="center"
+            label="乘用车VPPS中文名称">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="textStatus"
+            align="center"
+            width="210px"
+            label="卡车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="textStatus"
+            align="center"
+            width="210px"
+            label="卡车VPPS中文名称">
           </el-table-column>
         </el-table>
         <pagination :page="standardForm.page" :total="standardFormTotal" @pageChange="pageChange"

src/router/index.js

@@ -618,6 +618,33 @@ const routes = [
           title: '标准解读流程'
         }
       },
+      {
+        path: '/bzjdStep4',
+        name: 'bzjdStep4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准解读流程'
+        }
+      },
+      {
+        path: '/bzjdStep5',
+        name: 'bzjdStep5',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step5.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准解读流程'
+        }
+      },
+      {
+        path: '/bzjdStep6',
+        name: 'bzjdStep6',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step6.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准解读流程'
+        }
+      },
     ]
   },
   // 本地工具

src/sysConfig/index.js

@@ -7,7 +7,7 @@
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.10.248'
-const devIp = '192.168.10.250'
+const devIp = '192.168.10.252'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'