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

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

@@ -124,7 +124,8 @@
                   <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.dockUserName" placeholder="责任工程师" @click.native="choiceZRR('2')">
+                    <el-input v-model="roleForm.dockUserName" placeholder="责任工程师"
+                              @click.native="choiceZRR('2', '选择标准立项单位整车/系统总工', roleForm.dockUser)">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -299,7 +300,7 @@
         </div>
       </div>
       <div class="demo-drawer-footer">
-        <el-button size="mini" @click="closeDrawer">取消</el-button>
+        <el-button size="mini" @click="closeWorkDrawer">取消</el-button>
         <el-button type="primary" size="mini" @click="OkWork">带入</el-button>
       </div>
     </el-drawer>
@@ -589,6 +590,12 @@ export default {
     workChange(data) {
       this.workChangeList = data
     },
+    //工作组取消按钮
+    closeWorkDrawer(){
+      this.workModel = false
+      this.workSearch.workGroupName = ''
+      this.$refs.workGroup.clearSelection()
+    },
     OkWork(){
       if(this.workChangeList.length > 1 ){
         this.$message.warning('您只能选择一条数据进行带入')
@@ -601,6 +608,7 @@ export default {
           this.$refs.qblx_pageData.validateField('wgLeaderName')
         }
         this.workModel = false
+        this.workSearch.workGroupName = ''
         this.$refs.workGroup.clearSelection()
       }
     },
@@ -1014,7 +1022,7 @@ export default {
   height: 100%;
 
   /deep/ .el-upload-list__item-name {
-    margin-left: 48px;
+    //margin-left: 48px;
   }
 
   /deep/ .el-upload-list {

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

@@ -194,7 +194,7 @@
               :enterpriseStandard="true"
               :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
               :config="{attrName: '引用标准'}"
-              :labelWidth="'180px'"
+              :labelWidth="'150px'"
               v-model="qbfsForm.esMatingRelations"
             ></custom-input-for-all-standards2>
           </template>
@@ -675,8 +675,20 @@ export default {
       //必填人员校验规则
       roleFormRules: {
         dockUserName: [
-          { required: true, message: "请选择工作组组长", trigger: "change" }
-        ]
+          { required: true, message: "请选择标准立项单位整车/系统总工", trigger: "change" }
+        ],
+        countersignerName:[
+          {required: true, message:'请选择会签人员',  trigger: "change" }
+        ],
+        examineName:[
+          {required: true, message:'请选择标准体系工作组组长',  trigger: "change" }
+        ],
+        approverName:[
+          {required: true, message:'请选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长',  trigger: "change" }
+        ],
+        engineerName:[
+          {required: true, message:'请选择相关单位、工程研究总院标准法规部',  trigger: "change" }
+        ],
       },
       roleForm: {
         prcCreateUserName: this.$store.getters.userInfo.userName,

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

@@ -31,27 +31,33 @@ export default {
       const list = [
         {
           title: '待办流程',
-          name: 'ProcessCenter'
+          name: 'ProcessCenter',
+          permission:'4219fdb5e33dbbc84d845af98c947e66'
         },
         {
           title: '已办流程',
-          name: 'AlreadyProcess'
+          name: 'AlreadyProcess',
+          permission:'4f71b81686079ba2b7e3739d3994e0af'
         },
         {
           title: '已发流程',
-          name: 'AlreadySend'
+          name: 'AlreadySend',
+          permission:'b9abd00768c8ed97be89547c2da3f0eb'
         },
         {
           title: '监控流程',
           name: 'MonitorProcess',
+        permission:'e1eb3e91143c1cf356889e013e698672'
         },
         {
           title: '草稿',
-          name: 'TaskDraft'
+          name: 'TaskDraft',
+          permission:'fa19fb2dc2cf3055a64732dab6c40cb9'
         },
         {
           title: '新建流程',
-          name: 'NewProcess'
+          name: 'NewProcess',
+          permission:'b53e6722b33a37c0fa2d87a9b06cca40'
         },
       ]
 

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

@@ -247,7 +247,6 @@ export default {
       //草稿办理待开发
       const { prcType, id } = row
       const mes = JSON.parse(row.mes)
-      console.log(mes)
         this.$store.commit('setDetailMap', this.$route.path)
       switch (prcType) {
         // 标准入库、
@@ -899,6 +898,17 @@ export default {
             }
           })
           break
+        //企标制修订立项计划
+        case '26':
+          this.$router.push({
+            name: 'qbzxdlxStep1',
+            query: {
+              type: '26',
+              processName: '企标制修订立项计划',
+              bpnId: id
+            }
+          })
+          break
       }
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),

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

@@ -68,24 +68,26 @@
             </el-input>
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
-            <el-button v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary"
+            <el-button v-btn-permission="'6a1c8575a6ed7da8d441767c7e8dd407','e4aee670a804c8f26a2044c60800f835','da3564b242a91d112e50336ec5433c2e'" 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 v-btn-permission="'d55e2eb884449f04ecdb30f0523d965d'" class="common-button-default"
+            <el-button v-btn-permission="'855d8db42fd3e50f3f092f81f8c2c895' ,'149187e6e3a686a949a4119dadaafbef','bcbd7dae607dd0594b2d4c9c3a861b4f'" class="common-button-default"
                        @click="resetSelect" size="small">清空
             </el-button>
           </el-form-item>
 
           <el-button class="common-button-default export-button"
-                     v-btn-permission="'c7165a1baa667140f97e792971c89a71'"
+                     v-btn-permission="'4b5207b6ebff8f5ca7990dd6debf7f60' ,'f5ffaf2df95f03970c4846ba4b703730','14802475aba2684ed63af6ef50812937'"
                      size="small" @click="exportStandard()"
                      title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
                      icon="export"
           >导出
           </el-button>
-          <el-button type="primary" class="common-button-primary" size="mini" v-btn-permission="'670472f38fe27b192c7f7105847f38ce'" @click="selectMoreBtn">
+          <el-button type="primary" class="common-button-primary" size="mini"
+                     v-btn-permission="'5b26775620cf73b044d753bf1f07ceaf' , '39eb1c25f5865a14020708fe07ea4b5c','32d99dd10bef923935b0d19d3f2d2a90'"
+                     @click="selectMoreBtn">
             <i class="iconfont">&#xe7a5;</i>
             高级查询
           </el-button>
@@ -540,7 +542,6 @@ export default {
         XCXSSRQLAWS: '',
         //是否纳入认证清单
         isRelateAccess: '',
-        standType: 'INLAND',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -56,7 +56,7 @@
               type="primary"
               class="common-button-default export-button"
               size="mini" @click="exportStandard"
-              v-btn-permission="'b46217ac825d49933b0f7349ba924ea7'"
+              v-btn-permission="'2f211ed7ff6c273c690a52f890ea8008'"
               title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
               icon="export"
             >导出

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -114,7 +114,6 @@
                 label="章节名称">
         </el-table-column>
         <el-table-column
-                prop="content"
                 align="center"
                 label="修改意见内容(包括理由或依据)"
         >