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

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

@@ -156,13 +156,11 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <cus-tom-data-picker-group
-                    :key="'ssrq'"
                     :config="{attrName:'实施日期(标准文本)',attrField:'ssrq'}"
                     v-model="form.ssrq"
                     :disabled="false"
                 ></cus-tom-data-picker-group>
                 <cus-tom-data-picker-group
-                    :key="'zccssrq'"
                     :config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
                     v-model="form.zccssrq"
                     :disabled="false"
@@ -184,7 +182,6 @@
               </el-col>
               <el-col :span="12">
                 <cus-tom-data-picker-group
-                    :key="'xcxssrq'"
                     :config="{attrName:'新车型实施日期(标准文本)',attrField:'xcxssrq'}"
                     v-model="form.xcxssrq"
                     :disabled="false">
@@ -750,7 +747,6 @@
                 <template>
                   <custom-select-array
                       style="margin-left: -12px"
-                      :key="applyArcticOptions.options"
                       :config="applyArcticOptions"
                       v-model="form['cllx']"
                   ></custom-select-array>
@@ -759,7 +755,6 @@
                 <template>
                   <custom-select-array
                       style="margin-left: -12px"
-                      :key="categoryOptions.options"
                       :config="categoryOptions"
                       v-model="form['nylx']"
                   ></custom-select-array>
@@ -868,7 +863,6 @@
                 <!--适用产品线-->
                 <template>
                   <custom-select-array
-                      :key="sycpxOptions.options"
                       style="margin-left: -12px"
                       :config="sycpxOptions"
                       v-model="form['sycpx']"
@@ -888,7 +882,6 @@
                 <!--适用认证-->
                 <template>
                   <custom-select-array
-                      :key="applyAuthOptions.options"
                       style="margin-left: -12px"
                       :config="applyAuthOptions"
                       v-model="form['syrz']"
@@ -948,15 +941,6 @@
                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                   <el-input v-model="form.wssmr" placeholder="选择我司署名人" @click.native="choiceZRRS('wssmr', '选择我司署名人', form.wssmr)">
                   </el-input>
-<!--                  <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple>-->
-<!--                      <el-option-->
-<!--                              v-for="item in wssmrOptions"-->
-<!--                              placeholder="请选择"-->
-<!--                              :key="item.value"-->
-<!--                              :value="item.value"-->
-<!--                              :label="item.label"-->
-<!--                      ></el-option>-->
-<!--                  </el-select>-->
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
                   <el-select v-model="form.cysd" placeholder="请选择我司参与深度">
@@ -1428,6 +1412,7 @@ export default {
   },
   data () {
     return {
+      modalShowRoleFlag: false,
       fileList: [],
       caFileList: [],
       FBGBJBDFileList: [],
@@ -1684,6 +1669,7 @@ export default {
       drawerModal: false,
       nodeList: [],
       selectPeople:'',
+      nodeList2: []
     }
   },
   computed: {
@@ -1803,7 +1789,6 @@ export default {
       }
     },
     choiceZRRS (type, title, id) {
-      console.log('2077',title)
       this.nodeList = []
       this.nodeList.push(id)
       this.userType = type

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -109,7 +109,7 @@
                                 align="center"
                                 width="150">
                             <template slot-scope="scope">
-                                <div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
+                                <div>{{ getMap1(scope.row.planStatus)}}</div>
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -687,6 +687,15 @@
         props: {},
         watch: {},
         methods: {
+            getMap1(item){
+                const map = new Map();
+                map.set('0','未开始')
+                map.set('1','制定中')
+                map.set('2','修订中')
+                map.set('3','已取消')
+                map.set('4','已完成')
+                return map.get(item)
+            },
             TXJGcloseDrawer () {
                 this.TXJGmodal = false
             },

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -1659,7 +1659,7 @@
         :urlChild="urlChild"
         :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
         :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>
-      <tree-select-new
+      <tree-select-module
         width="500"
         :lazy=true
         :multiple=true
@@ -1669,7 +1669,9 @@
         :url="url"
         :urlChild="urlChild"
         :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
-        :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-new>
+        :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
+        @popoverHideCancel="popoverHideModelCancel()">
+      </tree-select-module>
       <!-- 导入失败 -->
       <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
         <p slot="title" style="color:#f60">
@@ -1740,6 +1742,7 @@ import {interfaceUrl} from "@/sysConfig";
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 import store from "@/store";
+import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
 import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
 
 
@@ -1765,6 +1768,7 @@ export default {
     CustomDatePickWithText2,
     TreeSelect,
     TreeSelectNew,
+    treeSelectModule,
     ProcessTitle
   },
   data() {
@@ -2587,7 +2591,8 @@ export default {
       this.modalShowFlag3 = false
     },
     popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
-      if (checkedData) {
+      console.log(checkedData)
+      if (checkedData  && checkedData.length != 0) {
         if (checkedData.length > 0) {
           this.sarStandardsInfoEO.DYBXH = checkedData.map(item => item.model).join(",")
           this.sarStandardsInfoEO.DYMC = checkedData.map(item => item.name).join(",")
@@ -2595,8 +2600,8 @@ export default {
           this.sarStandardsInfoEO.DYBXH = checkedData.model
           this.sarStandardsInfoEO.DYMC = checkedData.name
         }
+        this.modalShowFlag4 = false
       }
-      this.modalShowFlag4 = false
       this.$forceUpdate()
     }, popoverHideModelCancel() {
       this.modalShowFlag4 = false