From 1a3807e155537be25c5bc0440778ff1f83fe08cb Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 19 六月 2023 14:51:39 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index a1afbc7..28c5d8a 100644
--- a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
+++ b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -63,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"
@@ -72,12 +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-date-picker v-else-if="item.fieldType==='date'"
+ <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">
@@ -93,7 +101,9 @@
<script>
import { getDictionary } from "@/api/omd/enum";
+import vciWebRefer from '../refer/vciWebRefer.vue';
export default {
+ components: { vciWebRefer },
name: "advancedQuery",
props: {
// 瀵硅瘽妗嗘樉绀洪殣钘忔帶鍒�
@@ -180,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),
@@ -188,11 +208,20 @@
}
this.searchFormArrays.push(add)
});
+ console.log(this.initOptions);
//console.log(this.searchFormArrays);
}
},
methods: {
+ /** 涓哄弬鐓х被鍨嬫椂鍊奸�夋嫨涔嬪悗鐨勫鐞� */
+ setReferValue(data){
+ // if(data.field) {
+
+ // }
+ //console.log(data);
+ },
+
// 灞炴�у垏鎹㈡椂鏌ヨ鏉′欢鍜屾煡璇㈠�间篃闇�瑕佸杈撳叆妗嗚繘琛屽垏鎹�
// changeField(index) {
// //console.log(option,this.searchFormArrays[index],index);
--
Gitblit v1.9.3