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

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