From 14d9c5a74dac33c40f96a4bd17216f1991de8ea8 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期六, 09 九月 2023 14:21:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue | 47 ++++++++++++++++++-----------------------------
1 files changed, 18 insertions(+), 29 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue
index d5f82cb..3000eba 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" :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" :leaf-only="referConfig.onlyLeaf" :multiple="isMuti" v-model="value" :placeholder="title" :dic="treeData"></avue-input-tree>
</template>
<script>
@@ -8,7 +8,7 @@
export default {
name: "vciWebReferTree",
- props:["referConfig","value","text","title"],
+ props:["referConfig","value","text","title","disabled"],
data() {
return {
options: this.referConfig.options,
@@ -34,8 +34,8 @@
},
created() {
this.getParams();
- console.log('referConfig:')
- console.log(this.referConfig)
+ // console.log('referConfig:')
+ // console.log(this.referConfig)
},
mounted() {
if(!this.lazy){
@@ -119,6 +119,7 @@
queryParams['replaceMap["' + key + '"]'] = this.options.replaceParams[key];//鏂扮殑鏂瑰紡
}
}
+ queryParams['parentValue']='\\IN(SELECT oid from PL_CODE_CLASSIFY where id =\'hesuanfenlei\')'
this.params=queryParams;
},
@@ -150,56 +151,44 @@
},
nodeClick(data, node, nodeComp){
if(!this.isMuti) {
- //涓嶈鐢╳atch鐩戝惉value鍊硷紝浼氭壘涓嶅埌text
- this.value = data[this.config.valueField];
- this.text = data[this.config.textField];
- this.currentNode = data;
- this.$emit("setValue", {
- field: this.referConfig.field,
- showField: this.referConfig.showField,
- value: this.value,
- text: this.text,
- rawData: [this.currentNode]
- });
+ this.setValue({checkedNodes:[data]})
}
},
- checked:(checkedNode, checkedData)=> {
- debugger;
- /*
- * this鐢ㄦ椂濮嬬粓瑕佹姤閿欙紝鍙兘鍏堟敞閲�
+ checked(checkedNode, checkedData) {
+ this.setValue(checkedData)
+ },
+ setValue:function (checkedData){
var value = [];
var text = [];
const textSep =this.config.textSep;
for(var j =0;j<checkedData.checkedNodes.length;j++){
const item=checkedData.checkedNodes[j];
- var v=this.config.valueField.indexOf("attribute.")>=0?item.attributes[this.config.valueField.replace("attribute.","")]:(item.attributes[this.config.valueField] || item[this.config.valueField])
+ var v=this.config.valueField.indexOf("attribute.")>=0?(item.attributes[this.config.valueField.replace("attribute.","")] || item.attributes.data[this.config.valueField.replace("attribute.","")]):(item.attributes[this.config.valueField] || item[this.config.valueField] || item.attributes.data[this.config.valueField])
value.push(v);
var tempRaw = [];
var textFieldArray = this.config.textField.split(",");
for (var i = 0; i < textFieldArray.length; i++) {//鏄剧ず鐨勫瓧娈靛彲鑳芥湁澶氫釜
if (!validatenull(textFieldArray[i])) {
- var t=textFieldArray[i].indexOf("attribute.")>=0?item.attributes[textFieldArray[i].replace("attribute.","")]:(item.attributes[textFieldArray[i]] || item[textFieldArray[i]])
+ var t=textFieldArray[i].indexOf("attribute.")>=0?(item.attributes[textFieldArray[i].replace("attribute.","")] ||item.attributes.data[textFieldArray[i].replace("attribute.","")]):(item.attributes[textFieldArray[i]] || item[textFieldArray[i]] || item.attributes.data[textFieldArray[i]])
tempRaw.push(t);
}
}
text.push(tempRaw.join(textSep));
}
this.value = value.join(',');
- this.text = text.join(',')*/
-
- this.value=checkedData.checkedKeys;
+ this.text = text.join(',')
this.$emit("setValue", {
field: this.referConfig.field,
showField: this.referConfig.showField,
value: this.value,
- text: this.text,
- isTreeMuti:true,
- rawData: checkedData.checkedNodes
+ text: this.text || '',
+ isTreeMuti:this.isMuti,
+ rawData: checkedData.checkedNodes,
+ fieldMap:this.referConfig.fieldMap
});
}
},
- watch:{
- }
+ watch:{}
}
</script>
--
Gitblit v1.9.3