From 32f4bb41c82ded759e7db18c9fa449b1442f15c8 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期三, 21 六月 2023 16:39:12 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index 733f77b..559522b 100644
--- a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
+++ b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -192,8 +192,9 @@
// 灏唎ptions閰嶇疆璧嬪�煎埌data涓殑option涓紝閬垮厤娣辨祬鎷疯礉鐨勯棶棰樻墍浠ラ渶瑕佽浆json涔嬪悗鍐嶈祴鍊�
const data = JSON.stringify(this.options);
this.initOptions = JSON.parse(data);
- //console.log(this.initOptions);
- this.initOptions.forEach((item,index) => {
+ //console.log(this.initOptions);
+ if(this.initOptions.length > 0){
+ this.initOptions.forEach((item,index) => {
if(item.fieldType==='combox') {
let enumCach = JSON.parse(localStorage.getItem(item.comboxKey));
if(enumCach != null) {
@@ -206,7 +207,7 @@
}
}else if(item.fieldType==='refer'){
this.$set(item,"referConfigData",{
- title: item.referConfig.textField,
+ title: item.title,
showField: item.showField || item.field,
field: item.field,
placeholder: item.inputTip || '',
@@ -235,6 +236,7 @@
}
this.searchFormArrays.push(add)
});
+ }
//console.log(this.initOptions);
//console.log(this.searchFormArrays);
}
@@ -284,8 +286,9 @@
resetInput(){
const data = JSON.stringify(this.options);
this.initOptions = JSON.parse(data);
- let array = [];
- this.initOptions.forEach((item,index) => {
+ if(this.initOptions.length > 0){
+ let array = [];
+ this.initOptions.forEach((item,index) => {
let add = {
queryField: String(item.queryField),
condition:item.fieldType=='text' ? String("_like"):String("_equal"),
@@ -293,7 +296,8 @@
}
array.push(add)
});
- this.searchFormArrays = array;
+ this.searchFormArrays = array;
+ }
//console.log(this.initOptions);
//console.log(this.searchFormArrays);
},
--
Gitblit v1.9.3