From 425780f49a269acad70419f25f824b9e5f3c1f22 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 18 十月 2023 16:46:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index be3715f..fa4fa40 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 @@
lock-scroll
class="avue-dialog avue-dialog--top"
top="-3%"
- :close-on-click-modal="false"
+ destroy-on-close
@close="recoverPage">
<div class="search-total">
<!-- 澶撮儴鎸夐挳鍖哄煙 -->
@@ -209,7 +209,7 @@
this.initOptions.forEach((item,index) => {
if(item.fieldType==='combox') {
let enumCach = item.data || JSON.parse(localStorage.getItem(item.comboxKey));
- if(enumCach != null) {
+ if(enumCach != null && enumCach.length > 0) {
item.data = enumCach;
}else {
getDictionary({code: item.comboxKey}).then(res=>{
--
Gitblit v1.9.3