From 5e6ca455c750b289781cecf9155a5bf2c2c39b0e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 19 六月 2023 14:39:05 +0800
Subject: [PATCH] 更改getSqlByValue方法
---
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue | 78 +++++++++++++++++++++++++++++++-------
1 files changed, 63 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index b6354df..28c5d8a 100644
--- a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
+++ b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -52,7 +52,8 @@
<div class="grid-content">
<el-select placeholder="璇烽�夋嫨" v-model="searchFormArrays[index].condition">
<el-option
- v-for="condition in item.fieldType=='text' ? searchConditions:switchSearchConditions"
+ v-for="condition in item.fieldType==='text' || item.fieldType==='combox' ?
+ item.fieldType==='text' ? searchConditions:switchSearchConditions:dateConditions"
:key="condition.value"
:label="condition.label"
:value="condition.value">
@@ -62,8 +63,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="璇疯緭鍏�"></el-input>
- <el-select v-else-if="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="璇疯緭鍏�" :display="item.display"></el-input>
+ <el-select v-else-if="item.fieldType==='combox'" v-model="searchFormArrays[index].fieldValue" placeholder="璇烽�夋嫨" :display="item.display">
<el-option
v-for="option in item.data"
:key="option.itemValue"
@@ -71,7 +72,20 @@
:value="option.itemValue">
</el-option>
</el-select>
- <el-switch v-else-if="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
+ <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"
+ v-model="searchFormArrays[index].fieldValue"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+ <vci-web-refer
+ v-else-if="item.fieldType==='refer'"
+ :referConfig="item.referConfigData || {}"
+ :value="searchFormArrays[index].fieldValue"
+ :disabled="item.referConfig.showField"
+ :display="item.display"
+ @setReferValue="setReferValue">
+ </vci-web-refer>
</div>
</el-col>
<el-col :span="2">
@@ -87,7 +101,9 @@
<script>
import { getDictionary } from "@/api/omd/enum";
+import vciWebRefer from '../refer/vciWebRefer.vue';
export default {
+ components: { vciWebRefer },
name: "advancedQuery",
props: {
// 瀵硅瘽妗嗘樉绀洪殣钘忔帶鍒�
@@ -106,7 +122,7 @@
// 瀵硅瘽妗嗘樉绀烘帶鍒�
isShowDialog: this.visible,
initOptions: [],
- // 瀛楁鏄緭鍏ユ绫诲瀷鐨勬潯浠舵暟缁�
+ // 瀛楁绫诲瀷鏄緭鍏ユ绫诲瀷鐨勬潯浠舵暟缁�
searchConditions: [
{
value: "_equal",
@@ -120,15 +136,9 @@
},{
value: "_notlike",
label: "涓嶅寘鍚�",
- },{
- value: "_ge", //澶т簬锛岄粯璁や负澶т簬绛変簬
- label: "澶т簬",
- },{
- value: "_le", //灏忎簬锛岄粯璁や负灏忎簬绛変簬
- label: "灏忎簬",
- },
+ }
],
- // 瀛楁鏄崟閫夋垨涓嬫媺妗嗙被鍨嬬殑鏉′欢鏁扮粍
+ // 瀛楁绫诲瀷鏄崟閫夋垨涓嬫媺妗嗙被鍨嬬殑鏉′欢鏁扮粍
switchSearchConditions: [
{
value: "_equal",
@@ -137,6 +147,22 @@
value: "_notequal",
label: "涓嶇瓑浜�",
}
+ ],
+ // 瀛楁绫诲瀷鏄棩鏈�
+ dateConditions: [
+ {
+ value: "_equal",
+ label: "绛変簬",
+ },{
+ value: "_notequal",
+ label: "涓嶇瓑浜�",
+ },{
+ value: "_ge", //澶т簬锛岄粯璁や负澶т簬绛変簬
+ label: "澶т簬",
+ },{
+ value: "_le", //灏忎簬锛岄粯璁や负灏忎簬绛変簬
+ label: "灏忎簬",
+ },
],
searchFormArrays: [],
fieldValue: '',
@@ -164,6 +190,16 @@
localStorage.setItem(item.comboxKey,JSON.stringify(res.data.data));
})
}
+ }else if(item.fieldType==='refer'){
+ item = Object.assign(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);
+ //console.log(item);
}
let add = {
queryField: String(item.queryField),
@@ -172,10 +208,19 @@
}
this.searchFormArrays.push(add)
});
+ console.log(this.initOptions);
//console.log(this.searchFormArrays);
}
},
methods: {
+
+ /** 涓哄弬鐓х被鍨嬫椂鍊奸�夋嫨涔嬪悗鐨勫鐞� */
+ setReferValue(data){
+ // if(data.field) {
+
+ // }
+ //console.log(data);
+ },
// 灞炴�у垏鎹㈡椂鏌ヨ鏉′欢鍜屾煡璇㈠�间篃闇�瑕佸杈撳叆妗嗚繘琛屽垏鎹�
// changeField(index) {
@@ -236,7 +281,7 @@
const searchConditions = this.searchFormArrays;
for(let index = 0; index < searchConditions.length; index++) {
//console.log(condtionParam['conditionMap['+searchConditions[index].queryField+']']+'' == 'undefined');
- if(searchConditions[index].fieldValue.trim() != '' || searchConditions[index].fieldValue+''==='false') {
+ if(searchConditions[index].fieldValue+'' != '' || searchConditions[index].fieldValue+''==='false') {
// 瀛樺湪鐩稿悓鐨勬煡璇㈡潯浠�
if(condtionParam['conditionMap['+searchConditions[index].queryField+']']+'' != 'undefined' ) {
this.$message.warning("瀛樺湪閲嶅鏌ヨ鏉′欢锛岃浠旂粏鏍稿!");
@@ -247,7 +292,7 @@
condtionParam['conditionMap['+searchConditions[index].queryField+searchConditions[index].condition+']'] = searchConditions[index].fieldValue;
}
}
- // 鏌ヨ鏉′欢娌℃湁鍑虹幇閲嶅灞炴�э紝骞朵笖杩囨护鎺変簡绌哄�硷紝浼犻�掔粰鐖剁粍浠�
+ // 鏌ヨ鏉′欢娌℃湁鍑虹幇閲嶅灞炴�э紝骞朵笖杩囨护鎺変簡绌哄�硷紝灏变紶閫掔粰鐖剁粍浠�
// console.log(condtionParam);
this.$emit('echoContion',condtionParam)
this.isShowDialog = false;
@@ -316,6 +361,9 @@
line-height: 40px;
height: 40px;
}
+ .grid-content > .el-date-editor.el-input, .el-date-editor.el-input__inner{
+ width: 100%;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3