From 814aef91c8adca61538f5abfda2c7676caa50832 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 09 十一月 2023 14:39:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 106 ++++++++++++++++++++++++----------------------------
1 files changed, 49 insertions(+), 57 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 77e879a..bdcca1e 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -11,7 +11,7 @@
v-if="!['PREVIEW', 'DELETEFILE', 'revisefile', 'DOWNLOADFILE', 'UPLOADFILE'].includes(item.uniqueFlag)"
:key="index" plain size="small"
type="primary"
- @click="handelBtnClick(item)">{{
+ @click="handleBtnClick(item)">{{
item.name
}}
</el-button>
@@ -167,6 +167,7 @@
import {validatenull} from "@/util/validate";
import fileInHtml from "@/components/file/inHtml.vue";
import {getUserInfo} from "@/api/system/user";
+import func from "@/util/func";
export default {
components: {
@@ -318,7 +319,8 @@
hasUpload: true,
height: 110
},
- result: ''
+ result: '',
+ elapsedTime:'',
};
},
computed: {
@@ -328,7 +330,7 @@
oids.push(ele.oid);
});
return oids;
- }
+ },
},
created() {
// const index = this.$route.query.id.indexOf('@name=') + '@name='.length;
@@ -469,10 +471,10 @@
openVis(visible) {
this[visible] = true
},
- handelBtnClick(event) {
+ handleBtnClick(event) {
const {uniqueFlag} = event
this.$nextTick(() => {
- if (uniqueFlag === 'CODEADD') return this.addvisible = true
+ if (uniqueFlag === 'CODEADD') return this.addSaveHandler()
if (uniqueFlag === 'CODEEDIT') return this.editHandler()
if (uniqueFlag === 'CODEBATCHADD') return this.openBatchImport('batchImportApply')
if (uniqueFlag === 'CODEIMPORTHISTORY') return this.openBatchImport('historyImport')
@@ -499,6 +501,12 @@
// if(uniqueFlag === 'CODEEDIT') return this.similarHandler()
});
},
+ addSaveHandler(){
+
+ this.$nextTick(() => {
+ this.addvisible = true;
+ });
+ },
//鐢宠闆嗗洟鐮佹暟鎹�
applyGroupCode() {
if (this.selectRow.length <= 0) {
@@ -674,21 +682,36 @@
});
}
},
- handleSizeChange(val) {
- this.isLoading = true;
- setTimeout(() => {
- this.page.pageSize = val;
- this.$emit("pageSize", val);
- this.CrudRend();
- }, 3000);
+ async CrudRend() {
+ this.elapsedTime = 0;
+ const startTime = performance.now();
+ const res = await TableData({
+ templateOid: this.templateOid,
+ codeClassifyOid: this.codeClassifyOid,
+ page: this.page.currentPage,
+ limit: this.page.pageSize,
+ });
+ const endTime = performance.now();
+ this.elapsedTime = Math.floor(endTime - startTime) * 1;
+ this.page.total = res.data.total;
+ this.data = res.data.data;
+ this.tableData = res.data.data;
},
- handleCurrentChange(val) {
+
+ async handleSizeChange(val) {
+ this.page.pageSize = val;
+ this.$emit("pageSize", val);
this.isLoading = true;
- setTimeout(() => {
- this.page.currentPage = val;
- this.$emit("currentPage", val);
- this.CrudRend();
- }, 3000);
+ await this.CrudRend();
+ this.isLoading = false;
+ },
+
+ async handleCurrentChange(val) {
+ this.page.currentPage = val;
+ this.$emit("currentPage", val);
+ this.isLoading = true;
+ await this.CrudRend();
+ this.isLoading = false;
},
// 鐩戝惉鍗曞厓鏍肩偣鍑讳簨浠跺苟瀛樺偍姝ｅ湪缂栬緫鐨勮
handleCellClick(row, column) {
@@ -740,43 +763,6 @@
}
})
},
- //琛ㄦ牸澶存覆鏌�
- CrudHeaderRend() {
- if (this.codeClassifyOid != "") {
- MasterTable({
- codeClassifyOid: this.codeClassifyOid
- }).then((res) => {
- this.options = res.data.tableDefineVO.seniorQueryColumns;
- this.List = res.data.tableDefineVO.cols[0];
- this.List.forEach((item) => {
- let columnItem = {
- label: item.title,
- prop: item.queryField,
- type: this.columnType[item.type],
- sortable: item.sort,
- width: item.minWidth,
- };
- this.option.column.push(columnItem);
- this.option.column = this.tableHeadData;
- this.templateOid = res.data.tableDefineVO.oid;
- this.$emit("templateOid", this.templateOid);
- });
- });
- }
- },
- //琛ㄦ牸鏁版嵁
- CrudRend() {
- TableData({
- templateOid: this.templateOid,
- codeClassifyOid: this.codeClassifyOid,
- page: this.page.currentPage,
- limit: this.page.pageSize,
- }).then((res) => {
- this.page.total = res.data.total;
- this.data = res.data.data;
- this.tableData = res.data.data;
- });
- },
// 鎺掑簭
sortChange(val) {
// console.log(val)
@@ -881,6 +867,11 @@
},
//澧炲姞淇濆瓨
AddSumbit(val) {
+ //console.log(val)
+ if(func.notEmpty(val.ts)) {
+ val.ts = func.formattedDateTime(val.ts);
+ //console.log(val.ts);
+ }
addSaveCode(val).then(res => {
this.$nextTick(() => {
this.addvisible = false;
@@ -929,7 +920,8 @@
limit: this.page.pageSize,
['conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
}).then(res => {
- this.tableData = res.data.data
+ this.tableData = res.data.data;
+ // this.page.total = res.data.data.total;
})
}
@@ -940,7 +932,7 @@
<style lang="scss" scoped>
//鍥哄畾鍒楅珮搴�
/deep/ .el-table__fixed {
- height: 550px!important;
+ height: calc(100vh - 370px)!important;
}
// 婊氬姩鏉℃牱寮忎慨鏀�
// 婊氬姩鏉＄殑瀹藉害
--
Gitblit v1.10.0