From f02a461cd0e0c6ad326cd71e3af733e3292407fc Mon Sep 17 00:00:00 2001 From: xiejun <309858992@qq.com> Date: 星期五, 29 十二月 2023 13:31:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 63 ++++++++++++++++++------------- 1 files changed, 36 insertions(+), 27 deletions(-) diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue index 0b05661..f18267a 100644 --- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue +++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue @@ -17,20 +17,21 @@ </el-button> <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> + <el-option v-for="item in tableHeadFindData" :key="item.id" :label="item.label" + :value="item.query"></el-option> </el-select> - <el-input v-model="WupinFindValue" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�" - size="small" style="width: 180px; margin-left: 5px; margin-top: 10px" v-if="!isTimeStatus" + <el-input v-if="!isTimeStatus" v-model="WupinFindValue" + placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�" size="small" style="width: 180px; margin-left: 5px; margin-top: 10px" @keyup.enter.native="tableFindInp"></el-input> </span> - <span class="block" v-if="tableHeadFindData.length > 0 && isTimeStatus"> + <span v-if="tableHeadFindData.length > 0 && isTimeStatus" class="block"> <el-date-picker v-model="dateValue" + placeholder="閫夋嫨鏃ユ湡" size="small" - type="date" style="margin-left: 5px" - @change="dateChange" - placeholder="閫夋嫨鏃ユ湡"> + type="date" + @change="dateChange"> </el-date-picker> </span> <span v-if="tableHeadFindData.length > 0" style="margin-left: 10px"> @@ -265,9 +266,9 @@ }, data() { return { - isTimeStatus:false, - isTimeName:'', - dateValue:"", + isTimeStatus: false, + isTimeName: '', + dateValue: "", //鎵归噺缂栬緫瀵硅瘽妗� bulkeditvisible: false, LinkVisible: false, @@ -317,7 +318,6 @@ key: "oid", label: "name", }, - tableHeadFindDatas: [], applyvisible: false, amendvisible: false, addvisible: false, @@ -395,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: { @@ -407,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 = {}; } }, }, @@ -439,14 +446,14 @@ if (_index == 0) { this.keyWordFind = record.queryField; - }; + } + ; // if(record.fieldType === "datetime"){ // this.isTimeStatus = true; // console.log(this.isTimeStatus) // console.log(record) // } }) - this.tableHeadFindDatas = newval; if (newval) { this.CodeArray = []; if (newval.find(item => item.prop === 'id')) { @@ -1029,7 +1036,7 @@ templateOid: this.templateOid, codeClassifyOid: this.codeClassifyOid, ...val, - page: this.page.currentPage = 1,/** 姣忔鐐瑰嚮楂樼骇鏌ヨ閮藉簲璇ヤ粠绗竴椤靛紑濮�*/ + page: this.page.currentPage = 1, /** 姣忔鐐瑰嚮楂樼骇鏌ヨ閮藉簲璇ヤ粠绗竴椤靛紑濮�*/ limit: this.page.pageSize }); this.tableData = res.data.data; @@ -1118,8 +1125,8 @@ }); // console.log(this.isTimeStatus) }, - dateChange(val){ - if(val){ + dateChange(val) { + if (val) { const momentDate = moment(this.dateValue); const dateString = momentDate.format("yyyy-MM-DD"); this.isLoading = true; @@ -1129,7 +1136,7 @@ codeClassifyOid: this.codeClassifyOid, page: this.page.currentPage, limit: this.page.pageSize, - ['conditionMap[' + this.keyWordFind + ']']: dateString + ['conditionMap[' + this.keyWordFind + ']']: dateString }).then(res => { this.tableData = res.data.data; this.page.total = res.data.total; @@ -1143,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, -- Gitblit v1.9.3