From f09e05514d9a9e2623cfa73c4de1ffa98bb30bf8 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期二, 23 一月 2024 10:09:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 42f2440..44bc9d7 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -18,7 +18,7 @@
<span v-if="tableHeadFindData.length > 0 ">
<el-select slot="prepend" v-model="keyWordFind" placeholder="璇烽�夋嫨" size="small" @change="searchChange">
<el-option v-for="item in tableHeadFindData" :key="item.id" :label="item.label"
- :value="item.prop"></el-option>
+ :value="item.query"></el-option>
</el-select>
<el-input v-if="!isTimeStatus" v-model="WupinFindValue"
placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�" size="small" style="width: 180px; margin-left: 5px; margin-top: 10px"
@@ -318,7 +318,6 @@
key: "oid",
label: "name",
},
- tableHeadFindDatas: [],
applyvisible: false,
amendvisible: false,
addvisible: false,
@@ -396,7 +395,10 @@
},
tableHeadDataFateher: {
handler(newval, oldval) {
- this.options = newval.tableDefineVO.seniorQueryColumns
+ // console.log(newval)
+ if (newval.length > 0) {
+ this.options = newval.tableDefineVO.seniorQueryColumns
+ }
}
},
codeClassifyOid: {
@@ -408,16 +410,20 @@
tableDataArray: {
handler(newval, oldval) {
this.tableData = newval;
- this.searchResults = newval
+ this.searchResults = newval;
this.doLayout();
- this.fileOptions = {
- ownbizOid: "0",
- ownbizBtm: "0",
- fileDocClassify: '!=processAuditSuggest',
- fileDocClassifyName: '',
- hasDownload: true,
- hasUpload: true,
- height: 'auto'
+ if (newval.length > 0) {
+ this.fileOptions = {
+ ownbizOid: "0",
+ ownbizBtm: "0",
+ fileDocClassify: '!=processAuditSuggest',
+ fileDocClassifyName: '',
+ hasDownload: true,
+ hasUpload: true,
+ height: 'auto'
+ }
+ } else {
+ this.fileOptions = {};
}
},
},
@@ -448,7 +454,6 @@
// console.log(record)
// }
})
- this.tableHeadFindDatas = newval;
if (newval) {
this.CodeArray = [];
if (newval.find(item => item.prop === 'id')) {
@@ -1145,8 +1150,10 @@
tableFindInp() {
this.isLoading = true;
try {
+ this.conditionMap = {};
// 瀛樺偍鏌ヨ鏉′欢锛屼富瑕佹槸涓轰簡鐐瑰嚮椤电爜鏃跺甫涓婅繖涓潯浠�
this.conditionMap["conditionMap[" + this.keyWordFind + "]"] = '*' + this.WupinFindValue + '*';
+ console.log(this.conditionMap)
TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
@@ -1201,7 +1208,7 @@
.main {
display: flex;
flex-direction: column;
- height: calc(100vh - 150px);
+ height: calc(100vh - 145px);
min-height: 400px;
}
--
Gitblit v1.9.3