From a79582f0c67ddc681d2804669455ae13c64de8f9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 26 十二月 2023 20:20:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 42f2440..14f0d6b 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,
@@ -448,7 +447,6 @@
// console.log(record)
// }
})
- this.tableHeadFindDatas = newval;
if (newval) {
this.CodeArray = [];
if (newval.find(item => item.prop === 'id')) {
@@ -1145,8 +1143,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,
--
Gitblit v1.9.3