From f5fba15b13911207f3b8750d141b2463ce47d77c Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 09 六月 2023 14:21:50 +0800
Subject: [PATCH] 取消错误打印
---
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue | 122 ++++++++++++++++++++++++++--------------
1 files changed, 78 insertions(+), 44 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index d9e17d9..b6354df 100644
--- a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
+++ b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -14,7 +14,7 @@
destroy-on-close>
<div class="search-total">
<!-- 澶撮儴鎸夐挳鍖哄煙 -->
- <div class="dialog-search-button">
+ <div slot="title" class="dialog-search-button">
<el-button
type="primary"
size="small"
@@ -35,13 +35,12 @@
<el-row
v-for="(item,index) in initOptions"
:key="item.queryField"
- v-show="!item.hidden"
:span="24">
<el-col :span="5">
<div class="grid-content">
- <el-select placeholder="璇烽�夋嫨" v-model="searchFormArrays[index].queryField">
+ <el-select disabled placeholder="璇烽�夋嫨" v-model="searchFormArrays[index].queryField">
<el-option
- v-for="feildName in initOptions"
+ v-for="feildName in options"
:key="feildName.queryField"
:label="feildName.title"
:value="feildName.queryField">
@@ -55,7 +54,6 @@
<el-option
v-for="condition in item.fieldType=='text' ? searchConditions:switchSearchConditions"
:key="condition.value"
-
:label="condition.label"
:value="condition.value">
</el-option>
@@ -64,16 +62,16 @@
</el-col>
<el-col :span="12">
<div class="grid-content">
- <el-input v-show="item.fieldType==='text' || item.fieldType===''" v-model="searchFormArrays[index].fieldValue" type="text" placeholder="璇疯緭鍏�"></el-input>
- <el-select v-show="item.fieldType==='combox'" v-model="searchFormArrays[index].fieldValue" placeholder="璇烽�夋嫨">
+ <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.value"
- :label="option.key"
- :value="option.value">
+ :key="option.itemValue"
+ :label="option.itemName"
+ :value="option.itemValue">
</el-option>
</el-select>
- <el-switch v-show="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
+ <el-switch v-else-if="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
</div>
</el-col>
<el-col :span="2">
@@ -88,6 +86,7 @@
</template>
<script>
+import { getDictionary } from "@/api/omd/enum";
export default {
name: "advancedQuery",
props: {
@@ -101,10 +100,6 @@
type: "Object",
default: {},
},
- conditionMapParams: {
- type: "Object",
- default: {},
- },
},
data() {
return {
@@ -114,33 +109,37 @@
// 瀛楁鏄緭鍏ユ绫诲瀷鐨勬潯浠舵暟缁�
searchConditions: [
{
- value: "=",
+ value: "_equal",
label: "绛変簬",
},{
- value: "like",
- label: "鍖呭惈",
- },{
- value: "!=",
+ value: "_notequal",
label: "涓嶇瓑浜�",
},{
- value: ">",
- label: "澶т簬",
+ value: "_like",
+ label: "鍖呭惈",
},{
- value: "<",
+ value: "_notlike",
+ label: "涓嶅寘鍚�",
+ },{
+ value: "_ge", //澶т簬锛岄粯璁や负澶т簬绛変簬
+ label: "澶т簬",
+ },{
+ value: "_le", //灏忎簬锛岄粯璁や负灏忎簬绛変簬
label: "灏忎簬",
},
],
// 瀛楁鏄崟閫夋垨涓嬫媺妗嗙被鍨嬬殑鏉′欢鏁扮粍
switchSearchConditions: [
{
- value: "=",
+ value: "_equal",
label: "绛変簬",
},{
- value: "!=",
+ value: "_notequal",
label: "涓嶇瓑浜�",
- },
+ }
],
searchFormArrays: [],
+ fieldValue: '',
}
},
watch: {
@@ -153,23 +152,57 @@
// 灏唎ptions閰嶇疆璧嬪�煎埌data涓殑option涓紝閬垮厤娣辨祬鎷疯礉鐨勯棶棰樻墍浠ラ渶瑕佽浆json涔嬪悗鍐嶈祴鍊�
const data = JSON.stringify(this.options);
this.initOptions = JSON.parse(data);
- // console.log(this.initOptions);
+ //console.log(this.initOptions);
this.initOptions.forEach((item,index) => {
+ if(item.fieldType==='combox') {
+ let enumCach = JSON.parse(localStorage.getItem(item.comboxKey));
+ if(enumCach != null) {
+ item.data = enumCach;
+ }else {
+ getDictionary({code: item.comboxKey}).then(res=>{
+ item.data = res.data.data;
+ localStorage.setItem(item.comboxKey,JSON.stringify(res.data.data));
+ })
+ }
+ }
let add = {
queryField: String(item.queryField),
- condition: item.fieldType=='text' ? String("like"):String("="),
- fieldValue: item.fieldType=='truefalse' ? Boolean(false):String(''),
+ condition: item.fieldType==='text' ? String("_like"):String("_equal"),
+ fieldValue: item.fieldType==='truefalse' ? Boolean(false):String(""),
}
this.searchFormArrays.push(add)
});
//console.log(this.searchFormArrays);
}
},
- created () {
-
- },
methods: {
+
+ // 灞炴�у垏鎹㈡椂鏌ヨ鏉′欢鍜屾煡璇㈠�间篃闇�瑕佸杈撳叆妗嗚繘琛屽垏鎹�
+ // changeField(index) {
+ // //console.log(option,this.searchFormArrays[index],index);
+ // // 鎵惧埌鏁扮粍涓搴旂殑瑕佸垏鎹负鐨勯偅涓璞�
+ // let changeItem = this.options.filter((item)=>{
+ // return item.queryField == this.searchFormArrays[index].queryField;
+ // })[0]
+ // // 濡傛灉鏄痗ombox绫诲瀷鐨勮繕闇�瑕佸鏋氫妇绫诲瀷杩涜璇锋眰
+ // if(changeItem.fieldType==='combox' && changeItem.comboxKey != '') {
+ // changeItem.data = JSON.parse(localStorage.getItem(changeItem.comboxKey));
+ // }
+ // //console.log(changeItem.fieldType);
+ // // 灏嗗綋鍓嶅垏鎹㈢殑閰嶇疆椤硅祴鍊煎埌option鐨勫搴旂殑閭ｄ釜瀵硅薄杩涜瑕嗙洊
+ // this.initOptions[index] = changeItem;
+ // // 瑕嗙洊v-model鐨勫璞�
+ // this.searchFormArrays[index] = {
+ // queryField: String(changeItem.queryField),
+ // condition: changeItem.fieldType==='text' ? String("_like"):String("_equal"),
+ // fieldValue: changeItem.fieldType==='truefalse' ? Boolean(false):String(""),
+ // };
+ // //console.log(this.initOptions);
+ // //console.log(this.searchFormArrays);
+ // },
+
// 绉婚櫎鎼滅储妗�
+
removeInput(index){
//console.log(this.initOptions);
this.$delete(this.initOptions,index);
@@ -183,7 +216,7 @@
this.initOptions.forEach((item,index) => {
let add = {
queryField: String(item.queryField),
- condition:item.fieldType=='text' ? String("like"):String("="),
+ condition:item.fieldType=='text' ? String("_like"):String("_equal"),
fieldValue: item.fieldType=='truefalse' ? Boolean(false):String(''),
}
array.push(add)
@@ -203,22 +236,22 @@
const searchConditions = this.searchFormArrays;
for(let index = 0; index < searchConditions.length; index++) {
//console.log(condtionParam['conditionMap['+searchConditions[index].queryField+']']+'' == 'undefined');
- if(searchConditions[index].fieldValue != '' || searchConditions[index].fieldValue+''==='false') {
+ if(searchConditions[index].fieldValue.trim() != '' || searchConditions[index].fieldValue+''==='false') {
// 瀛樺湪鐩稿悓鐨勬煡璇㈡潯浠�
- if(condtionParam['conditionMap['+searchConditions[index].queryField+']']+''.trim() != 'undefined' ) {
+ if(condtionParam['conditionMap['+searchConditions[index].queryField+']']+'' != 'undefined' ) {
this.$message.warning("瀛樺湪閲嶅鏌ヨ鏉′欢锛岃浠旂粏鏍稿!");
+ console.log(condtionParam['conditionMap['+searchConditions[index].queryField+']']);
return false;
}
- condtionParam['conditionMap['+searchConditions[index].queryField+']'] = searchConditions[index].fieldValue;
+ //鎷兼帴鎴恗ap瀵硅薄锛屽皢鏌ヨ瀵硅薄鍜宑ondition鎷兼帴鍦ㄤ竴璧凤紝缁勬垚楂樼骇鏌ヨmap鐨刱ey
+ condtionParam['conditionMap['+searchConditions[index].queryField+searchConditions[index].condition+']'] = searchConditions[index].fieldValue;
}
}
- //鏌ヨ鏉′欢娌℃湁鍑虹幇閲嶅灞炴�э紝骞朵笖杩囨护鎺変簡绌哄�硷紝浼犻�掔粰鐖剁粍浠�
- //console.log(condtionParam);
- // if(){
-
- // }
- this.$emit('echoContion',condtionParam)
- },
+ // 鏌ヨ鏉′欢娌℃湁鍑虹幇閲嶅灞炴�э紝骞朵笖杩囨护鎺変簡绌哄�硷紝浼犻�掔粰鐖剁粍浠�
+ // console.log(condtionParam);
+ this.$emit('echoContion',condtionParam)
+ this.isShowDialog = false;
+ },
}
}
</script>
@@ -240,7 +273,8 @@
position: fixed;
display: block;
background-color: #fff;
- top: 90px;
+ // top: 10%;
+ margin-top: -30px;
width: 50%;
z-index: 1000;
}
--
Gitblit v1.9.3