From fdaad68c0715d6f7858b956071e3b01cd543a5cd Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 19 六月 2023 20:32:18 +0800
Subject: [PATCH] 高级查询组件增加refer类型条件框
---
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue | 63 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index 28c5d8a..733f77b 100644
--- a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
+++ b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -10,8 +10,7 @@
width="55vw"
style="height: 115vh; margin-top: -10vh; overflow: hidden"
:visible.sync="isShowDialog"
- @close="recoverPage"
- destroy-on-close>
+ @close="recoverPage">
<div class="search-total">
<!-- 澶撮儴鎸夐挳鍖哄煙 -->
<div slot="title" class="dialog-search-button">
@@ -52,8 +51,7 @@
<div class="grid-content">
<el-select placeholder="璇烽�夋嫨" v-model="searchFormArrays[index].condition">
<el-option
- v-for="condition in item.fieldType==='text' || item.fieldType==='combox' ?
- item.fieldType==='text' ? searchConditions:switchSearchConditions:dateConditions"
+ v-for="condition in item.conditions"
:key="condition.value"
:label="condition.label"
:value="condition.value">
@@ -63,8 +61,8 @@
</el-col>
<el-col :span="12">
<div class="grid-content">
- <el-input v-if="item.fieldType==='text' || item.fieldType===''" v-model="searchFormArrays[index].fieldValue" type="text" placeholder="璇疯緭鍏�" :display="item.display"></el-input>
- <el-select v-else-if="item.fieldType==='combox'" v-model="searchFormArrays[index].fieldValue" placeholder="璇烽�夋嫨" :display="item.display">
+ <el-input v-if="item.fieldType==='text' || item.fieldType===''" v-model="searchFormArrays[index].fieldValue" type="text" placeholder="璇疯緭鍏�"></el-input>
+ <el-select v-else-if="item.fieldType==='combox'" v-model="searchFormArrays[index].fieldValue" placeholder="璇烽�夋嫨">
<el-option
v-for="option in item.data"
:key="option.itemValue"
@@ -72,8 +70,8 @@
:value="option.itemValue">
</el-option>
</el-select>
- <el-switch v-else-if="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue" :display="item.display"></el-switch>
- <el-date-picker v-else-if="item.fieldType==='datetime'" :display="item.display"
+ <el-switch v-else-if="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
+ <el-date-picker v-else-if="item.fieldType==='datetime'"
v-model="searchFormArrays[index].fieldValue"
type="date"
placeholder="閫夋嫨鏃ユ湡">
@@ -82,8 +80,8 @@
v-else-if="item.fieldType==='refer'"
:referConfig="item.referConfigData || {}"
:value="searchFormArrays[index].fieldValue"
- :disabled="item.referConfig.showField"
- :display="item.display"
+ :text="item.showField"
+ :display="!item.hidden"
@setReferValue="setReferValue">
</vci-web-refer>
</div>
@@ -148,6 +146,22 @@
label: "涓嶇瓑浜�",
}
],
+ // 鍙傜収绫诲瀷鐨勬潯浠舵暟缁�
+ referSearchConditions: [
+ {
+ value: "_equal",
+ label: "绛変簬",
+ },{
+ value: "_notequal",
+ label: "涓嶇瓑浜�",
+ },{
+ value: "_like",
+ label: "鍖呭惈",
+ },{
+ value: "_notlike",
+ label: "涓嶅寘鍚�",
+ }
+ ],
// 瀛楁绫诲瀷鏄棩鏈�
dateConditions: [
{
@@ -191,24 +205,37 @@
})
}
}else if(item.fieldType==='refer'){
- item = Object.assign(item,{referConfigData:{
+ this.$set(item,"referConfigData",{
title: item.referConfig.textField,
showField: item.showField || item.field,
field: item.field,
placeholder: item.inputTip || '',
- options: item.referConfig,
- }})
- //console.log(item.referConfigData.options.type);
+ options: Object.assign(item.referConfig,{width:'100%'}),
+ })
+ //console.log(item.referConfigData.options);
//console.log(item);
}
+ // TODO: 杩欏効淇敼涓�涓嬪弬鐓х殑鏌ヨ鏉′欢
+ let conditions = [];
+ if(item.fieldType==='text'){
+ conditions = this.searchConditions;
+ }else if (item.fieldType==='combox'){
+ conditions = this.dateConditions;
+ }else if (item.fieldType==='datetime') {
+ conditions = this.switchSearchConditions;
+ }else {
+ conditions = this.referSearchConditions;
+ }
+ // console.log(conditions);
+ this.$set(item,"conditions",conditions)
let add = {
queryField: String(item.queryField),
condition: item.fieldType==='text' ? String("_like"):String("_equal"),
- fieldValue: item.fieldType==='truefalse' ? Boolean(false):String(""),
+ fieldValue: item.fieldType==='truefalse' ? Boolean(false):String(''),
}
this.searchFormArrays.push(add)
});
- console.log(this.initOptions);
+ //console.log(this.initOptions);
//console.log(this.searchFormArrays);
}
},
@@ -219,7 +246,7 @@
// if(data.field) {
// }
- //console.log(data);
+ console.log(data);
},
// 灞炴�у垏鎹㈡椂鏌ヨ鏉′欢鍜屾煡璇㈠�间篃闇�瑕佸杈撳叆妗嗚繘琛屽垏鎹�
@@ -293,7 +320,7 @@
}
}
// 鏌ヨ鏉′欢娌℃湁鍑虹幇閲嶅灞炴�э紝骞朵笖杩囨护鎺変簡绌哄�硷紝灏变紶閫掔粰鐖剁粍浠�
- // console.log(condtionParam);
+ console.log(condtionParam);
this.$emit('echoContion',condtionParam)
this.isShowDialog = false;
},
--
Gitblit v1.9.3