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

src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue

@@ -278,7 +278,7 @@ export default {
       },
       formRules: {
         nextStatus: [
-          { required: true, message: "请选择下一步状态", trigger: "change" }
+          { required: true, message: "", trigger: "change" }
         ]
       },
       associationOptions: [{

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue

@@ -42,11 +42,23 @@
             </el-form-item>
             <el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
               <el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订类型">
-                <el-option label="制定完成" value="制定完成"></el-option>
+                <el-option label="制定" value="制定"></el-option>
-                <el-option label="制定中" value="制定中"></el-option>
+                <el-option label="修订" value="修订"></el-option>
-                <el-option label="未制定" value="未制定"></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-input
+                style="display: none;"
+                v-model="qbfsForm.rqbJson">
+              </el-input>
+              <el-input
+                clearable
+                v-model="qbfsForm.rqbName"
+                placeholder="请选择代替企标编号"
+                readonly
+                @click.native="choiceQYBZ">
+              </el-input>
+            </el-form-item>
             <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
                           class="add-form-item form-item-disabled">
               <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
@@ -380,9 +392,9 @@ export default {
     }
   },
   mounted(){
-    if(this.qbfsForm.passFlag){
+    // if(this.qbfsForm.passFlag){
-      this.qbfsForm = {}
+    //   this.qbfsForm = {}
-    }
+    // }
     //查询下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue

@@ -46,6 +46,19 @@
                <el-option label="修订" value="2"></el-option>
              </el-select>
            </el-form-item>
+           <el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+             <el-input
+               style="display: none;"
+               v-model="qbfsForm.rqbJson">
+             </el-input>
+             <el-input
+               clearable
+               v-model="qbfsForm.rqbName"
+               placeholder="请选择代替企标编号"
+               readonly
+               @click.native="choiceQYBZ">
+             </el-input>
+           </el-form-item>
            <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
                          class="add-form-item form-item-disabled">
              <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
@@ -401,9 +414,9 @@ export default {
     }
   },
   mounted(){
-    if(this.qbfsForm.passFlag){
+    // if(this.qbfsForm.passFlag){
-      this.qbfsForm = {}
+    //   this.qbfsForm = {}
-    }
+    // }
     //查询下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue

@@ -139,7 +139,7 @@
         <custom-input-for-all-standards2
           class="classDisplay"
           :config="{attrName: '采用标准'}"
-          :labelWidth="'180px'"
+          :labelWidth="'150px'"
           v-model="qbfsForm.esStandRelations"
         ></custom-input-for-all-standards2>
       </template>
@@ -160,7 +160,7 @@
           :enterpriseStandard="true"
           :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
           :config="{attrName: '引用标准'}"
-          :labelWidth="'180px'"
+          :labelWidth="'150px'"
           v-model="qbfsForm.esMatingRelations"
         ></custom-input-for-all-standards2>
       </template>
@@ -550,9 +550,9 @@ export default {
   },
   mounted(){
     this.getWorkData()
-    if(this.qbfsForm.passFlag){
+    // if(this.qbfsForm.passFlag){
-      this.qbfsForm = {}
+    //   this.qbfsForm = {}
-    }
+    // }
     //查询下拉框数据
      this.$http.get('sys/dictype/getDicTypeListCode', '',{
        _this: this

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -70,6 +70,19 @@
                 <el-option label="修订" value="修订"></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-input
+                style="display: none;"
+                v-model="qbfsForm.rqbJson">
+              </el-input>
+              <el-input
+                clearable
+                v-model="qbfsForm.rqbName"
+                placeholder="请选择代替企标编号"
+                readonly
+                @click.native="choiceQYBZ">
+              </el-input>
+            </el-form-item>
             <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
                           class="add-form-item form-item-disabled">
               <el-select v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
@@ -101,7 +114,7 @@
                 :enterpriseStandard="true"
                 :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
                 :config="{attrName: '引用标准'}"
-                :labelWidth="'180px'"
+                :labelWidth="'150px'"
                 v-model="qbfsForm.esMatingRelations"
               ></custom-input-for-all-standards2>
             </template>
@@ -712,9 +725,9 @@ export default {
     }
   },
   mounted() {
-    if(this.qbfsForm.passFlag){
+    // if(this.qbfsForm.passFlag){
-      this.qbfsForm = {}
+    //   this.qbfsForm = {}
-    }
+    // }
     //查询下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
@@ -801,6 +814,13 @@ export default {
     },
     TXJGenterDrawer () {
       let list = this.$refs.TXJGTree.getCheckedNodes()
+      if(list.length > 0){
+        let parenList = list.filter ( item => item.parentId === null || item.parentId === '');
+        if (parenList.length > 0) {
+          this.$message.error('请选择二级及以下目录')
+          return
+        }
+      }
       let id = ''
       let name = ''
       list.map(item => {

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue

@@ -46,6 +46,19 @@
                 <el-option label="修订" value="修订"></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-input
+                style="display: none;"
+                v-model="qbfsForm.rqbJson">
+              </el-input>
+              <el-input
+                clearable
+                v-model="qbfsForm.rqbName"
+                placeholder="请选择代替企标编号"
+                readonly
+                @click.native="choiceQYBZ">
+              </el-input>
+            </el-form-item>
             <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
                           class="add-form-item form-item-disabled">
               <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
@@ -389,9 +402,9 @@ export default {
     }
   },
   mounted(){
-    if(this.qbfsForm.passFlag){
+    // if(this.qbfsForm.passFlag){
-      this.qbfsForm = {}
+    //   this.qbfsForm = {}
-    }
+    // }
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
     }, res => {

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

@@ -529,6 +529,7 @@ export default {
               this.$refs["roleForm"].validate((valid) => {
                 if (valid) {
                   this.isSubmit = true;
+                  qbzxdFrom.commentText = this.commentText;
                   var json = Object.assign(qbzxdFrom, this.roleForm);
                   this.$http.post("lawss/activiti/completeTask", {
                     taskIds: this.$route.query.taskIds,

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>
@@ -228,6 +229,7 @@
       title="选择工作组组长"
       :visible.sync="workModel"
       size="900px"
+      @close="closeWorkDrawer"
       custom-class="demo-drawer"
     >
       <div class="demo-drawer-content">
@@ -260,14 +262,14 @@
                 </el-form-item>
               </el-form>
             </div>
+            <loading :loading="tableLoading">数据加载中...</loading>
             <el-table
               ref="workGroup"
               :data="workData"
               tooltip-effect="dark"
               border
               style="width: 100%; flex: auto;"
-              class="drag-table"
+              class="table-height"
-              height="100%"
               @selection-change="workChange"
               :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}">
@@ -299,7 +301,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>
@@ -350,7 +352,7 @@
         :before-upload="beforeUpload"
         :action="importExcelUrl"
         :file-list="defaultFileList"
-        accept=".xlsx"
+        accept=".xls"
         name="file"
         ref="importFileAboutStand">
         <div style="padding: 20px 0">
@@ -379,6 +381,7 @@ export default {
   name: "qbzxdlxStep1",
   data() {
     return {
+      tableLoading: false,
       importModalshowflag: false,  //导入弹窗
       showUploadlist: true, // 导入过程中新增数据时，如果数据错误，不出现导入列表
       importExcelUrl: 'api/att/attFile/upload', // 导入EXCEL文档
@@ -589,6 +592,13 @@ export default {
     workChange(data) {
       this.workChangeList = data
     },
+    //工作组取消按钮
+    closeWorkDrawer(){
+      this.workModel = false
+      this.workSearch.workGroupName = ''
+      this.getWorkData()
+      this.$refs.workGroup.clearSelection()
+    },
     OkWork(){
       if(this.workChangeList.length > 1 ){
         this.$message.warning('您只能选择一条数据进行带入')
@@ -601,6 +611,7 @@ export default {
           this.$refs.qblx_pageData.validateField('wgLeaderName')
         }
         this.workModel = false
+        this.workSearch.workGroupName = ''
         this.$refs.workGroup.clearSelection()
       }
     },
@@ -614,10 +625,12 @@ export default {
       }, res => {
         this.workData = res.data.records;
         this.total = res.data.total;
+        this.tableLoading = false
       }, e => {
       });
     },
     choiceLeader(){
+      this.getWorkData()
       this.workModel = true
     },
     choiceZRBM(type, title, id) {
@@ -1014,7 +1027,7 @@ export default {
   height: 100%;
 
   /deep/ .el-upload-list__item-name {
-    margin-left: 48px;
+    //margin-left: 48px;
   }
 
   /deep/ .el-upload-list {
@@ -1106,6 +1119,10 @@ export default {
       border: 0;
     }
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 
 </style>

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

@@ -25,6 +25,7 @@
           <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
             <div class="file-box" v-if="fileList.length > 0">
               <p v-for="item in fileList"
+                 style="margin-left: 10px;"
                  :key="item.id" @click.stop="clickButtonToUpload2(item.id)"> {{ item.name }}
                 <i
                   title="下载"
@@ -173,7 +174,7 @@
             <custom-input-for-all-standards2
               class="classDisplay"
               :config="{attrName: '采用标准'}"
-              :labelWidth="'180px'"
+              :labelWidth="'150px'"
               v-model="qbfsForm.esStandRelations"
             ></custom-input-for-all-standards2>
           </template>
@@ -194,7 +195,7 @@
               :enterpriseStandard="true"
               :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
               :config="{attrName: '引用标准'}"
-              :labelWidth="'180px'"
+              :labelWidth="'150px'"
               v-model="qbfsForm.esMatingRelations"
             ></custom-input-for-all-standards2>
           </template>
@@ -675,8 +676,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/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

@@ -542,7 +542,6 @@ export default {
         XCXSSRQLAWS: '',
         //是否纳入认证清单
         isRelateAccess: '',
-        standType: 'INLAND',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,

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

@@ -71,8 +71,8 @@
           <el-form :modal="sarBussionessSearch" :inline="true" class="high-search-form" label-width="110px">
             <el-row>
               <el-col :span="8">
-                <el-form-item label="标准号" class="search-item">
+                <el-form-item label="企标编号" class="search-item">
-                  <el-input v-model="sarBussionessSearch.standCode" placeholder="根据标准号查找" clearable :maxlength="100"></el-input>
+                  <el-input v-model="sarBussionessSearch.standCode" placeholder="根据企标编号查找" clearable :maxlength="100"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -187,11 +187,11 @@
                 <!--                    <el-option v-for="opt in standSortOptions" :value="opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
                 <!--                  </el-select>-->
                 <!--                </el-form-item>-->
-                <el-formItem label="标准号" prop="numberName" class="search-item">
+                <el-formItem label="企标编号" prop="numberName" class="search-item">
-                  <el-input v-model="sarBussionessSearch.standCode" clearable placeholder="根据标准号查找" :maxlength="100"/>
+                  <el-input v-model="sarBussionessSearch.standCode" clearable placeholder="根据企标编号查找" :maxlength="100"/>
                 </el-formItem>
-                <el-formItem label="标准名称" prop="standName" class="search-item">
+                <el-formItem label="中文名称" prop="standName" class="search-item">
-                  <el-input v-model="sarBussionessSearch.standName" clearable placeholder="根据标准名称查找" :maxlength="100"/>
+                  <el-input v-model="sarBussionessSearch.standName" clearable placeholder="根据中文名称查找" :maxlength="100"/>
                 </el-formItem>
                 <el-form-item class="search-item btn-box">
                   <el-button
@@ -571,10 +571,17 @@
                     <el-input
                       :config="field"
                       clearable
+                      :title="sarBussionessStandEO[field.attrField]"
                       v-model="sarBussionessStandEO[field.attrField]"
-                      :disabled="formdisableflag" placeholder="选择起草部门"
+                      :disabled="formdisableflag" placeholder="选择起草部门">
-                      @click.native="choiceQCDW('QCDWId', '起草部门', sarBussionessStandEO.QCDWId)">
                     </el-input>
+                    <el-button
+                            type="primary"
+                            size="mini"
+                            style="position:absolute;top: 10px;right: 0;"
+                            @click="choiceQCDW('QCDWId', '起草部门', sarBussionessStandEO.QCDW)"
+                            class="common-button-primary">手动查找
+                    </el-button>
                   </el-form-item>
                 </template>
                 <!--起草人QCRBUSS-->
@@ -585,7 +592,7 @@
                     class="add-form-item"
                   >
                     <template slot="label">起草人</template>
-                    <el-input v-model="sarBussionessStandEO[field.attrField]" placeholder="选择起草人" @click.native="choiceQCR('QCRBUSS', '选择起草人', sarBussionessStandEO[field.attrField])">
+                    <el-input v-model="sarBussionessStandEO[field.attrField]" :title="sarBussionessStandEO[field.attrField]" placeholder="选择起草人" @click.native="choiceQCR('QCRBUSS', '选择起草人', sarBussionessStandEO[field.attrField])">
                     </el-input>
                     <!--                      <el-input-->
                     <!--                          :key="field.attrField"-->
@@ -1076,11 +1083,6 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="中文名称" class="add-form-item form-item-disabled">
-                  <el-input v-model="sarBussionessSearch.standName"
-                            placeholder="请输入企标名称"
-                            clearable></el-input>
-                </el-form-item>
                 <el-form-item label="英文名称" title="企标英文名称" class="add-form-item form-item-disabled">
                   <el-input v-model="sarBussionessSearch.standEnName"
                             placeholder="请输入企标英文名称"
@@ -1121,10 +1123,6 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="企标编号" class="add-form-item form-item-disabled">
-                  <el-input v-model="sarBussionessSearch.standCode" clearable
-                            placeholder="请输入企标编号"></el-input>
-                </el-form-item>
                 <el-form-item label="标准年份" class="add-form-item form-item-disabled">
                   <el-input v-model.number="sarBussionessSearch.standYear"
                             placeholder="请输入标准年份"
@@ -3532,9 +3530,20 @@ export default {
       // $('#deptBtn').click()
       $('#deptBtn2').click()
     },
-    choiceQCR(type, title, id) {
+    choiceQCR(type, title, nameId) {
-      this.nodeList = []
+      this.nodeList2 = []
-      this.nodeList.push(id)
+      if (nameId) {
+        let nameId1 = nameId.split(',')
+        let idList = []
+        nameId1.forEach(item => {
+          let a, b
+          a = item.substring(item.indexOf('(') +1)
+          b = a.substring(0, a.lastIndexOf(')'))
+          idList.push(b)
+        })
+        idList = idList.join(',')
+        this.nodeList2.push(idList)
+      }
       this.userType = type
       this.drawerTitle = title
       this.modalShowRoleFlag = true
@@ -3565,7 +3574,9 @@ export default {
     },
     choiceQCDW(type, title, id) {
       this.nodeListZRBM = []
-      this.nodeListZRBM.push(id)
+      if(this.sarBussionessStandEO.QCDWID && this.sarBussionessStandEO.QCDWID.length > 0){
+        this.nodeListZRBM = this.sarBussionessStandEO.QCDWID.split(',')
+      }
       this.drawerTitle = title
       this.modalshowflagZRBM = true
     },
@@ -3586,7 +3597,16 @@ export default {
         this.sarBussionessSearch.QCDW = nameList
       }
       this.$set(this.sarBussionessStandEO, 'QCDWId', idList)
-      this.$set(this.sarBussionessStandEO, 'QCDW', nameList)
+      let tNameList = (this.sarBussionessStandEO.QCDW === null || this.sarBussionessStandEO.QCDW === '') ? nameList : this.sarBussionessStandEO.QCDW+','+nameList
+      const arr=new Set()
+      let permission = tNameList.split(",");
+      permission.forEach((item, index) => {
+        arr.add(item)
+      })
+
+      let nameNew=Array.from(arr).join(',')
+      this.$set(this.sarBussionessStandEO, 'QCDW', nameNew)
+
       if (this.sarBussionessStandEO.QCRBUSS) {
         this.$refs.sarBussionessStandForm.validateField('QCDW')
       }