From 075cc6cdfe236118fcd25dbfa5285aa4c412d342 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 14 十一月 2023 11:21:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 2a5807d..77ae0da 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -6,15 +6,15 @@
<div>
</div>
<el-row style="width: 100%;margin-bottom: 10px">
- <div style="margin-bottom: 10px">
- <el-button v-for="(item, index) in masterVrBtnList"
- v-if="!['PREVIEW', 'DELETEFILE', 'revisefile', 'DOWNLOADFILE', 'UPLOADFILE'].includes(item.uniqueFlag)"
- :key="index" plain size="small"
- type="primary"
- @click="handleBtnClick(item)">{{
- item.name
- }}
- </el-button>
+ <div style="margin-bottom: 10px" >
+ <el-button v-for="(item, index) in masterVrBtnList"
+ v-if="!['PREVIEW', 'DELETEFILE', 'revisefile', 'DOWNLOADFILE', 'UPLOADFILE'].includes(item.uniqueFlag)"
+ :key="index" plain size="small"
+ type="primary"
+ @click="handleBtnClick(item)">{{
+ item.name
+ }}
+ </el-button>
<span v-if="tableHeadFindData.length > 0">
<el-select slot="prepend" v-model="keyWordFind" placeholder="璇烽�夋嫨" size="small">
<el-option v-for="item in tableHeadFindData" :key="item.id" :label="item.label"
@@ -424,9 +424,7 @@
},
tableHeadBtnData: {
handler(newval) {
- if (newval.length !== 0) {
this.masterVrBtnList = newval
- }
},
deep: true
},
@@ -499,10 +497,21 @@
if (uniqueFlag === 'receiveEditApply') return this.receiveEditApply()
// 鐩镐技椤规煡璇�
// if(uniqueFlag === 'CODEEDIT') return this.similarHandler()
+ // 鏍囧噯鐢宠
+ if (uniqueFlag === 'CODEAPPLY') return this.codeApplyHandler()
+ // 鏍囧噯淇
+ if (uniqueFlag === 'CODEAMEND') return this.codeAMENDHandler()
});
},
+ //鏍囧噯鐢宠
+ codeApplyHandler(){
+ console.log('1')
+ },
+ //鏍囧噯淇
+ codeAMENDHandler(){
+ console.log('2')
+ },
addSaveHandler(){
-
this.$nextTick(() => {
this.addvisible = true;
});
@@ -693,25 +702,24 @@
});
const endTime = performance.now();
this.elapsedTime = Math.floor(endTime - startTime) * 1;
- console.log(this.elapsedTime)
this.page.total = res.data.total;
this.data = res.data.data;
this.tableData = res.data.data;
},
async handleSizeChange(val) {
- this.isLoading = true;
- await this.CrudRend();
this.page.pageSize = val;
this.$emit("pageSize", val);
+ this.isLoading = true;
+ await this.CrudRend();
this.isLoading = false;
},
async handleCurrentChange(val) {
- this.isLoading = true;
- await this.CrudRend();
this.page.currentPage = val;
this.$emit("currentPage", val);
+ this.isLoading = true;
+ await this.CrudRend();
this.isLoading = false;
},
// 鐩戝惉鍗曞厓鏍肩偣鍑讳簨浠跺苟瀛樺偍姝ｅ湪缂栬緫鐨勮
@@ -868,7 +876,7 @@
},
//澧炲姞淇濆瓨
AddSumbit(val) {
- //console.log(val)
+ // console.log('val',val)
if(func.notEmpty(val.ts)) {
val.ts = func.formattedDateTime(val.ts);
//console.log(val.ts);
--
Gitblit v1.10.0