From c48c1a085137ab9970877ede443c6a9c359c454c Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期四, 21 九月 2023 11:36:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue |   40 +++++++++++++++++++++++++---------------
 1 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue
index 8247fdc..fa3ea8d 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue
@@ -1,5 +1,5 @@
 <template>
-  <avue-input-tree ref="referTree" :props="props" :disabled="disabled" :lazy="lazy" :tree-load="treeLoad" :node-click="nodeClick" :checked="checked" :leaf-only="referConfig.onlyLeaf" :multiple="isMuti" v-model="value" :placeholder="title" :dic="treeData"></avue-input-tree>
+  <avue-input-tree ref="referTree" :props="props" :disabled="disabled" :lazy="lazy" :tree-load="treeLoad" :node-click="nodeClick" :checked="checked" :blur="valueChange" :leaf-only="referConfig.onlyLeaf" :multiple="isMuti" v-model="value" :placeholder="title" :dic="treeData"></avue-input-tree>
 </template>
 
 <script>
@@ -25,7 +25,7 @@
       },
       treeUrl: this.referConfig.options.url || '/api/ubcs-code/mdmEngineController/defaultReferTree',
       treeData: [],
-      selectionList: [],
+      checkedData:[],
       currentNode:{},
       params: {},
       loadType: {'all': 'all', 'node': 'node'},
@@ -34,8 +34,6 @@
   },
   created() {
     this.getParams();
-    // console.log('referConfig:')
-    // console.log(this.referConfig)
   },
   mounted() {
     if(!this.lazy){
@@ -79,20 +77,20 @@
       queryParams['loadType'] = this.options.loadType;
       queryParams['multipleSelect'] = this.isMuti;
       queryParams['isMuti'] = queryParams['multipleSelect'];
-      if (this.options.remoteSort && this.options.initSort) {
+      if (this.options.initSort) {
         queryParams['order'] = this.options.initSort.type;//鏂规硶
         queryParams['sort'] = this.options.initSort.field;//瀛楁
-      }
-      if (this.options.rootParams) {
-        for (var key in this.options.rootParams) {
-          queryParams[key] = this.options.rootParams[key];
-        }
       }
       if(this.options.sortField){
         queryParams['sort'] = this.options.sortField;//瀛楁
       }
       if(this.options.sortType){
         queryParams['order'] = this.options.sortType;//鏂规硶
+      }
+      if (this.options.rootParams) {
+        for (var key in this.options.rootParams) {
+          queryParams[key] = this.options.rootParams[key];
+        }
       }
       if (this.options.conditionParams) {
         //璇存槑鏄墿灞曞睘鎬�
@@ -125,7 +123,6 @@
           queryParams['replaceMap["' + key + '"]'] = this.options.replaceParams[key];//鏂扮殑鏂瑰紡
         }
       }
-      queryParams['parentValue']='\\IN(SELECT oid from PL_CODE_CLASSIFY where id =\'hesuanfenlei\')'
       this.params=queryParams;
 
     },
@@ -179,9 +176,14 @@
       if(!this.isMuti) {
         this.setValue({checkedNodes:[data]})
       }
-     },
+    },
     checked(checkedNode, checkedData) {
-      this.setValue(checkedData)
+      this.checkedData=checkedData
+    },
+    valueChange(){
+      if(this.isMuti){
+        // this.setValue(this.checkedData)
+      }
     },
     setValue:function (checkedData){
       var value = [];
@@ -201,8 +203,16 @@
         }
         text.push(tempRaw.join(textSep));
       }
+      let mapFields =this.referConfig.fieldMap || {};
+      try {
+        if(!validatenull(this.options.mapFields)){
+          mapFields =Object.assign(this.referConfig.fieldMap,JSON.parse(this.options.mapFields)) ;
+        }
+      }catch (e) {
+
+      }
       this.value = value.join(',');
-      this.text = text.join(',')
+      this.text = text.join(',');
       this.$emit("setValue", {
         field: this.referConfig.field,
         showField: this.referConfig.showField,
@@ -210,7 +220,7 @@
         text: this.text || '',
         isTreeMuti:this.isMuti,
         rawData: checkedData.checkedNodes,
-        fieldMap:this.referConfig.fieldMap
+        fieldMap:mapFields
       });
     }
   },

--
Gitblit v1.9.3