From a6291fa7ad2fd57d94ad728785156cf288550d85 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 25 八月 2023 11:10:01 +0800
Subject: [PATCH] 接口配置页面
---
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index eea22b8..12fed90 100644
--- a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
+++ b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -4,7 +4,7 @@
3銆佺敤鎴疯緭鍏ョ殑鍊间細浠onditionMap[field]鐨勬牸寮忔嫾鎺ュソ杩涜鍥炰紶锛岀劧鍚庡氨闇�瑕佷娇鐢ㄧ殑鍦版柟鑷杩涜鏌ヨ鐨勮皟鐢紱
-->
<template>
- <el-dialog
+ <el-dialog
title="楂樼骇鏌ヨ"
append-to-body
width="55vw"
@@ -15,15 +15,15 @@
@close="recoverPage">
<div class="search-total">
<!-- 澶撮儴鎸夐挳鍖哄煙 -->
- <div slot="title" class="dialog-search-button">
- <el-button
- type="primary"
+ <div slot="title" class="dialog-search-button">
+ <el-button
+ type="primary"
size="small"
icon="el-icon-search"
@click="searchSubmit">
鏌ヨ
</el-button>
- <el-button
+ <el-button
type="warning"
size="small"
icon="el-icon-refresh"
@@ -33,7 +33,7 @@
</div>
<!-- 椤甸潰涓讳綋鍐呭鍖哄煙 -->
<div class="search-content">
- <el-row
+ <el-row
v-for="(item,index) in initOptions"
:key="item.queryField"
:span="24">
@@ -67,9 +67,9 @@
<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"
- :label="option.itemName"
- :value="option.itemValue">
+ :key="option.itemValue || option.value"
+ :label="option.itemName || option.label"
+ :value="option.itemValue || option.value">
</el-option>
</el-select>
<el-switch v-else-if="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
@@ -174,7 +174,7 @@
label: "涓嶇瓑浜�",
},{
value: "_ge", //澶т簬锛岄粯璁や负澶т簬绛変簬
- label: "澶т簬",
+ label: "澶т簬",
},{
value: "_le", //灏忎簬锛岄粯璁や负灏忎簬绛変簬
label: "灏忎簬",
@@ -205,7 +205,7 @@
let array = [];
this.initOptions.forEach((item,index) => {
if(item.fieldType==='combox') {
- let enumCach = JSON.parse(localStorage.getItem(item.comboxKey));
+ let enumCach = item.data || JSON.parse(localStorage.getItem(item.comboxKey));
if(enumCach != null) {
item.data = enumCach;
}else {
@@ -223,22 +223,22 @@
options: Object.assign(item.referConfig,{width:"80%"}),
})
//console.log(item.referConfigData.options);
- //console.log(item);
+ //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==='combox'|| item.fieldType==='truefalse'){
+ conditions = this.switchSearchConditions;
}else if (item.fieldType==='datetime') {
- conditions = this.switchSearchConditions;
+ conditions = this.dateConditions;
}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"),
@@ -254,13 +254,10 @@
/** 涓哄弬鐓х被鍨嬫椂鍊奸�夋嫨涔嬪悗鐨勫鐞� */
setReferValue(data,index){
- // console.log(index);
if(data.field) {
this.searchFormArrays[index][data.fieldValue] = data.value || '';
this.initOptions[index][data.showField] = data.text || '';
}
- // console.log(this.initOptions[index][data.showField]);
- // console.log(data);
},
// 灞炴�у垏鎹㈡椂鏌ヨ鏉′欢鍜屾煡璇㈠�间篃闇�瑕佸杈撳叆妗嗚繘琛屽垏鎹�
@@ -288,7 +285,7 @@
// },
// 绉婚櫎鎼滅储妗�
-
+
removeInput(index){
//console.log(this.initOptions);
this.$delete(this.initOptions,index);
@@ -324,7 +321,7 @@
console.log(condtionParam);
this.$emit('echoContion',condtionParam)
this.isShowDialog = false;
- },
+ },
}
}
</script>
@@ -336,7 +333,7 @@
min-height: 70vh;
// margin-left: 35px;
margin-top: -8px;
- overflow-y: auto;
+ overflow-y: auto;
height: 70vh;
}
.dialog-search-button {
@@ -393,4 +390,4 @@
width: 100%;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3