From 6fe44ba132909336b00b3373978f788621632748 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 17 七月 2023 14:28:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue | 143 +++++++++++++++++++++++------------------------
1 files changed, 69 insertions(+), 74 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index 2114700..eea22b8 100644
--- a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
+++ b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -10,6 +10,8 @@
width="55vw"
style="height: 115vh; margin-top: -10vh; overflow: hidden"
:visible.sync="isShowDialog"
+ lock-scroll
+ :close-on-click-modal="false"
@close="recoverPage">
<div class="search-total">
<!-- 澶撮儴鎸夐挳鍖哄煙 -->
@@ -82,7 +84,7 @@
:value="searchFormArrays[index].fieldValue"
:text="item.showField"
:display="!item.hidden"
- @setReferValue="setReferValue">
+ @setReferValue="val=>setReferValue(val,index)">
</vci-web-refer>
</div>
</el-col>
@@ -189,67 +191,76 @@
},
// 瀵硅瘽妗嗗唴瀹规覆鏌撻厤缃�
options(){
- // 灏唎ptions閰嶇疆璧嬪�煎埌data涓殑option涓紝閬垮厤娣辨祬鎷疯礉鐨勯棶棰樻墍浠ラ渶瑕佽浆json涔嬪悗鍐嶈祴鍊�
- const data = JSON.stringify(this.options);
- this.initOptions = JSON.parse(data);
- //console.log(this.initOptions);
- //console.log(this.initOptions);
- if(this.initOptions.length > 0){
- 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));
- })
- }
- }else if(item.fieldType==='refer'){
- this.$set(item,"referConfigData",{
- title: item.referConfig.textField,
- showField: item.showField || item.field,
- field: item.field,
- placeholder: item.inputTip || '',
- 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(''),
- }
- this.searchFormArrays.push(add)
- });
- }
- //console.log(this.initOptions);
- //console.log(this.searchFormArrays);
+ this.initData();
}
},
methods: {
+ initData(){
+ // 灏唎ptions閰嶇疆璧嬪�煎埌data涓殑option涓紝閬垮厤娣辨祬鎷疯礉鐨勯棶棰樻墍浠ラ渶瑕佽浆json涔嬪悗鍐嶈祴鍊�
+ const data = JSON.stringify(this.options);
+ this.initOptions = JSON.parse(data);
+ //console.log(this.initOptions);
+ if(this.initOptions.length > 0){
+ let array = [];
+ 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));
+ })
+ }
+ }else if(item.fieldType==='refer'){
+ this.$set(item,"referConfigData",{
+ title: item.title,
+ showField: item.showField || item.field,
+ field: item.field,
+ placeholder: item.inputTip || '',
+ options: Object.assign(item.referConfig,{width:"80%"}),
+ })
+ //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(''),
+ }
+ array.push(add)
+ });
+ this.searchFormArrays = array;
+ }
+ //console.log(this.initOptions);
+ //console.log(this.searchFormArrays);
+ },
+
/** 涓哄弬鐓х被鍨嬫椂鍊奸�夋嫨涔嬪悗鐨勫鐞� */
- setReferValue(data){
- // if(data.field) {
-
- // }
- console.log(data);
+ 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);
},
// 灞炴�у垏鎹㈡椂鏌ヨ鏉′欢鍜屾煡璇㈠�间篃闇�瑕佸杈撳叆妗嗚繘琛屽垏鎹�
@@ -285,22 +296,7 @@
},
// 閲嶇疆褰撳墠鐣岄潰鐨勮緭鍏ユ
resetInput(){
- const data = JSON.stringify(this.options);
- this.initOptions = JSON.parse(data);
- if(this.initOptions.length > 0){
- let array = [];
- this.initOptions.forEach((item,index) => {
- let add = {
- queryField: String(item.queryField),
- condition:item.fieldType=='text' ? String("_like"):String("_equal"),
- fieldValue: item.fieldType=='truefalse' ? Boolean(false):String(''),
- }
- array.push(add)
- });
- this.searchFormArrays = array;
- }
- //console.log(this.initOptions);
- //console.log(this.searchFormArrays);
+ this.initData();
},
// 鎭㈠椤甸潰
recoverPage(){
@@ -396,6 +392,5 @@
.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