From 982b2b30475f4e45ffea51690e3457b3ae81fa9e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 29 八月 2023 19:21:19 +0800
Subject: [PATCH] 提交代码
---
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue | 73 +++++++++++++++---------------------
1 files changed, 31 insertions(+), 42 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index 12fed90..fa4fa40 100644
--- a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
+++ b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -7,11 +7,14 @@
<el-dialog
title="楂樼骇鏌ヨ"
append-to-body
- width="55vw"
- style="height: 115vh; margin-top: -10vh; overflow: hidden"
+ width="46vw"
+ style="height: 100vh;overflow: hidden"
+ v-dialogDrag
:visible.sync="isShowDialog"
lock-scroll
- :close-on-click-modal="false"
+ class="avue-dialog avue-dialog--top"
+ top="-3%"
+ destroy-on-close
@close="recoverPage">
<div class="search-total">
<!-- 澶撮儴鎸夐挳鍖哄煙 -->
@@ -37,7 +40,7 @@
v-for="(item,index) in initOptions"
:key="item.queryField"
:span="24">
- <el-col :span="5">
+ <el-col :span="6">
<div class="grid-content">
<el-select disabled placeholder="璇烽�夋嫨" v-model="searchFormArrays[index].queryField">
<el-option
@@ -88,7 +91,7 @@
</vci-web-refer>
</div>
</el-col>
- <el-col :span="2">
+ <el-col :span="1">
<div class="grid-content">
<i class="el-icon-close" @click="removeInput(index)"></i>
</div>
@@ -206,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=>{
@@ -327,26 +330,12 @@
</script>
<style lang="scss" scoped>
-
.search-total {
- border-radius: 4px;
- min-height: 70vh;
- // margin-left: 35px;
- margin-top: -8px;
- overflow-y: auto;
- height: 70vh;
+ border-radius: 4px;
+ margin-top: -10px;
}
.dialog-search-button {
- border-top: 1px solid #E9E7E7;
- border-bottom: 1px solid #E9E7E7;
- padding: 10px 10px 10px;
- position: fixed;
- display: block;
- background-color: #fff;
- // top: 10%;
- margin-top: -30px;
- width: 50%;
- z-index: 1000;
+ margin-bottom: 15px;
}
// .search-total > .search-content > .el-row{
// margin-bottom: 5px;
@@ -355,39 +344,39 @@
// }
// }
.search-total > .search-content {
- margin-top: 40px;
}
.search-total > .search-content > .el-row > .el-col {
- border-radius: 4px;
+ border-radius: 4px;
}
.search-total > .search-content > .el-row > .el-col > .grid-content {
- border-radius: 4px;
- min-height: 36px;
+ border-radius: 4px;
+ min-height: 36px;
}
.search-total > .search-content > .el-row > .el-col {
- margin-right: 6px;
- &:last-child {
- margin-right: 0;
- }
+ margin-right: 6px;
+ &:last-child {
+ margin-right: 0;
+ }
}
.grid-content > .el-icon-close {
- font-size: 35px;
- cursor: pointer;
- color: rgb(222, 130, 105);
+ font-size: 30px;
+ line-height: 40px;
+ cursor: pointer;
+ color: rgb(222, 130, 105);
}
- .grid-content > .el-icon-close:hover{
- font-size: 38px;
- color: rgb(219, 52, 6);
+ .grid-content > .el-icon-close:hover {
+ font-size: 30px;
+ color: rgb(219, 52, 6);
}
.grid-content > .el-select {
- width: 100%;
+ width: 100%;
}
.grid-content > .el-switch {
- line-height: 40px;
- height: 40px;
+ line-height: 40px;
+ height: 40px;
}
- .grid-content > .el-date-editor.el-input, .el-date-editor.el-input__inner{
- width: 100%;
+ .grid-content > .el-date-editor.el-input, .el-date-editor.el-input__inner {
+ width: 100%;
}
</style>
--
Gitblit v1.9.3