From 02611cd19ef961dedee41f74eb3df13b002993aa Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 十二月 2023 17:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 249 +++++++++++++++++++++++++++----------------------
1 files changed, 136 insertions(+), 113 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 80377c8..6abed72 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -46,15 +46,15 @@
<el-table-column v-if="tableData.length != 0" fixed label="搴忓彿" type="index" width="55">
</el-table-column>
<!-- 鐢熷懡鍛ㄦ湡-->
- <el-table-column v-for="(item,index) in lcstatusArray"
- v-if=" lcstatusArray.length >= 0 && !item.hidden"
- key="index" :show-overflow-tooltip="true" :sortable="item.sortable"
- :width="item.width" align="center" label="鐢熷懡鍛ㄦ湡鍊�"
- prop="lcstatus">
- <template slot-scope="scope">
- <span>{{ scope.row.lcstatus_text }}</span>
- </template>
- </el-table-column>
+ <!-- <el-table-column v-for="(item,index) in lcstatusArray"-->
+ <!-- v-if=" lcstatusArray.length >= 0 && !item.hidden"-->
+ <!-- key="index" :show-overflow-tooltip="true" :sortable="item.sortable"-->
+ <!-- :width="item.width" align="center" label="鐢熷懡鍛ㄦ湡鍊�"-->
+ <!-- prop="lcstatus">-->
+ <!-- <template slot-scope="scope">-->
+ <!-- <span>{{ scope.row.lcstatus_text }}</span>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<!-- 缂栧彿-->
<el-table-column v-for="(item, index) in CodeArray" v-if="CodeArray.length !== 0 && !item.hidden"
key="index" :label="item.label" :prop="item.prop"
@@ -67,25 +67,15 @@
</template>
</el-table-column>
<el-table-column v-for="item in this.tableHeadFindData"
- v-if="!item.hidden && item.prop !== 'id' && item.prop !== 'lcstatus' && Object.keys(item.referConfig).length <= 0"
+ v-if="!item.hidden && item.prop !== 'id'"
:key="item.id"
:formatter="item.formatter"
- :label="item.label" :prop="item.prop"
+ :label="item.label"
+ :prop="item.prop"
:show-overflow-tooltip="true"
:sortable="item.sortable"
:width="item.width"
align="center">
- </el-table-column>
- <!-- 鍙傜収鏁版嵁-->
- <el-table-column v-for="(item,index) in referArray"
- v-if="item.referConfig && Object.keys(item.referConfig).length > 0 && !item.hidden"
- :key="index"
- :label="item.title" :show-overflow-tooltip="true"
- :sortable="item.sortable" :width="item.width" align="center"
- prop="jiliangdw">
- <template slot-scope="scope">
- <span>{{ scope.row.jiliangdwname }}</span>
- </template>
</el-table-column>
</el-table>
</div>
@@ -293,7 +283,6 @@
btmtype: '',
code: "",
type: '',
- // this.visibleDeactivate ?'ENABLE':this.visibleEnable ? 'DISABLE' :this.visibleRecovery ? 'ROLLBACK' :'PUBLIC'
processName: "",
vars: {
codeClassifyOid: "",
@@ -355,17 +344,10 @@
},
// 涓绘暟鎹寜閽�
masterVrBtnList: [],
- fileOptions: {
- ownbizOid: "0",
- ownbizBtm: "0",
- fileDocClassify: '!=processAuditSuggest',
- fileDocClassifyName: '',
- hasDownload: true,
- hasUpload: true,
- height: 110
- },
+ fileOptions: {},
result: '',
elapsedTime: '',
+ conditionMap: [],
};
},
computed: {
@@ -414,6 +396,15 @@
this.tableData = newval;
this.searchResults = newval
this.doLayout();
+ this.fileOptions = {
+ ownbizOid: "0",
+ ownbizBtm: "0",
+ fileDocClassify: '!=processAuditSuggest',
+ fileDocClassifyName: '',
+ hasDownload: true,
+ hasUpload: true,
+ height: 'auto'
+ }
},
},
tableHeadFindData: {
@@ -434,7 +425,7 @@
}
if (_index == 0) {
- this.keyWordFind = record.queryField
+ this.keyWordFind = record.queryField;
}
})
this.tableHeadFindDatas = newval;
@@ -474,6 +465,7 @@
templateOid: {
handler(newval, oldval) {
this.fileOptions.ownbizOid = "0";
+ this.statusSelect = 'all'
},
deep: true,
},
@@ -485,11 +477,15 @@
},
},
methods: {
+ // 缃┖鏌ヨ鏉′欢
+ resetConditionMap() {
+ this.conditionMap = {};
+ },
+
CodeLinkHandler(row) {
this.LinkObject = row;
this.LinkVisible = true;
this.LinkList = Object.keys(row).map(property => property)
-
},
//鐘舵�佹悳绱�
cellSelectHandler(row) {
@@ -501,6 +497,7 @@
},
cellStatusFind(lcstatus) {
this.isLoading = true;
+ this.conditionMap["conditionMap[lcstatus]"] = lcstatus;
TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
@@ -578,24 +575,27 @@
exportGroupCodeExcel({
codeClassifyOid: this.codeClassifyOid,
}).then(res => {
- let reader = new FileReader();
- reader.readAsText(res.data)
- reader.onload = (result) =>{
- try {
- let resData = JSON.parse(result.target.result); // 瑙ｆ瀽瀵硅薄鎴愬姛
- if (!resData.success) {
- console.log("resData",resData)
- this.$message.error(resData.msg);
- this.isLoading = false;
- }
- } catch (err) {
- // console.log("err",err)// 瑙ｆ瀽鎴愬璞″け璐ワ紝璇存槑鏄甯哥殑鏂囦欢娴�
- func.downloadFileByBlobHandler(res);
- this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
- this.isLoading = false;
- }
- };
-
+ // let reader = new FileReader();
+ // reader.readAsText(res.data);
+ // reader.onload = () => {
+ // try {
+ // let resData = JSON.parse(reader.result); // 瑙ｆ瀽瀵硅薄鎴愬姛
+ // if (!resData.success) {
+ // this.$message.error(resData.msg);
+ // this.isLoading = false;
+ // }
+ // } catch (err) {
+ // // 瑙ｆ瀽鎴愬璞″け璐ワ紝璇存槑鏄甯哥殑鏂囦欢娴�
+ // func.downloadFileByBlobHandler(res);
+ // this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
+ // this.isLoading = false;
+ // }
+ // };
+ func.downloadFileByBlobHandler(res);
+ this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
+ this.isLoading = false;
+ }).catch(error => {
+ this.$message.error(error);
});
},
//鏍囧噯鐢宠
@@ -857,6 +857,7 @@
codeClassifyOid: this.codeClassifyOid,
page: this.page.currentPage,
limit: this.page.pageSize,
+ ...this.conditionMap, /**甯︿笂鍒嗛〉鏌ヨ鏉′欢 */
});
const endTime = performance.now();
this.elapsedTime = Math.floor(endTime - startTime) * 1;
@@ -918,7 +919,7 @@
});
});
},
- // 灏嗘鍦ㄧ紪杈戠殑琛岀殑鐘舵�佸彉涓� null 锛屽嵆閫�鍑虹紪杈戠姸鎬�
+ //灏嗘鍦ㄧ紪杈戠殑琛岀殑鐘舵�佸彉涓� null 锛屽嵆閫�鍑虹紪杈戠姸鎬�
saveRow() {
this.editingRow = null;
},
@@ -931,40 +932,46 @@
})
},
// 鎺掑簭
- sortChange(val) {
- // console.log(val)
- this.isLoading = true;
- let order = "";
- if (val.order == "ascending") {
- order = "asc";
- } else {
- order = "desc";
+ async sortChange(val) {
+ try {
+ this.isLoading = true;
+ const order = val.order == 'ascending' ? 'asc' : 'desc';
+ const {data} = await TableData({
+ templateOid: this.templateOid,
+ codeClassifyOid: this.codeClassifyOid,
+ order: order,
+ sort: val.prop,
+ page: this.page.currentPage,
+ limit: this.page.pageSize,
+ ...this.conditionMap
+ });
+ this.data = data.data;
+ } finally {
+ this.isLoading = false;
}
- TableData({
- templateOid: this.templateOid,
- codeClassifyOid: this.codeClassifyOid,
- order: order,
- sort: val.prop,
- page: this.page.currentPage,
- limit: this.page.pageSize,
- }).then((res) => {
- setTimeout(() => {
- this.data = res.data.data;
- this.isLoading = false;
- }, 100);
- });
},
//鍒嗛〉鍒锋柊
async onLoad(val) {
- await TableData({
- templateOid: this.templateOid,
- codeClassifyOid: this.codeClassifyOid,
- page: this.page.currentPage,
- limit: this.page.pageSize,
- }).then((res) => {
+ this.isLoading = true;
+ try {
+ let conditionMap = {};
+ if (this.statusSelect !== 'all') {
+ conditionMap.lcstatus = this.statusSelect;
+ }
+ const res = await TableData({
+ templateOid: this.templateOid,
+ codeClassifyOid: this.codeClassifyOid,
+ page: this.page.currentPage,
+ limit: this.page.pageSize,
+ conditionMap
+ });
this.tableData = res.data.data;
- this.doLayout()
- });
+ this.doLayout();
+ } catch (error) {
+ this.$message.error(error)
+ } finally {
+ this.isLoading = false;
+ }
},
//澶氶��
handleSelectionChange(list) {
@@ -997,42 +1004,53 @@
this.findvisible = true;
},
// 楂樼骇鏌ヨ
- echoContion(val) {
- FindData({
- templateOid: this.templateOid,
- codeClassifyOid: this.codeClassifyOid,
- ...val,
- }).then((res) => {
+ async echoContion(val) {
+ this.conditionMap = val;
+ try {
+ const res = await FindData({
+ templateOid: this.templateOid,
+ codeClassifyOid: this.codeClassifyOid,
+ ...val,
+ page: this.page.currentPage = 1,/** 姣忔鐐瑰嚮楂樼骇鏌ヨ閮藉簲璇ヤ粠绗竴椤靛紑濮�*/
+ limit: this.page.pageSize
+ });
this.tableData = res.data.data;
this.page.total = res.data.total
- });
+ } catch (error) {
+
+ }
},
//鐩镐技椤规煡璇�
similarHandler() {
if (this.selectRow.length <= 0) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
- } else if (this.selectRow.length > 1) {
- this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�");
- } else {
- this.similarVisible = true;
+ return;
}
+ if (this.selectRow.length > 1) {
+ this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�");
+ return;
+ }
+ this.similarVisible = true;
},
//鏁版嵁鏇存敼
DataChange() {
if (this.selectRow.length <= 0) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
- } else if (this.selectRow.length > 1) {
- this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�");
- } else if (this.selectRow[0].lcstatus != "Released") {
- this.$message.warning("鍙湁鐘舵�佷负宸插彂甯冪殑鏁版嵁鎵嶈兘杩涜鏁版嵁鏇存敼");
- } else {
- this.DataVisible = true;
- this.rowOid = this.selectRow[0]['oid']
+ return
}
+ if (this.selectRow.length > 1) {
+ this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�");
+ return;
+ }
+ if (this.selectRow[0].lcstatus != "Released") {
+ this.$message.warning("鍙湁鐘舵�佷负宸插彂甯冪殑鏁版嵁鎵嶈兘杩涜鏁版嵁鏇存敼");
+ return;
+ }
+ this.DataVisible = true;
+ this.rowOid = this.selectRow[0]['oid']
},
//澧炲姞淇濆瓨
AddSumbit(val) {
- // console.log('val',val)
if (func.notEmpty(val.ts)) {
val.ts = func.formattedDateTime(val.ts);
//console.log(val.ts);
@@ -1075,17 +1093,22 @@
//杈撳叆鍥炶溅鎼滅储
tableFindInp() {
this.isLoading = true;
- TableData({
- templateOid: this.templateOid,
- codeClassifyOid: this.codeClassifyOid,
- page: this.page.currentPage,
- limit: this.page.pageSize,
- ['conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
- }).then(res => {
- this.tableData = res.data.data;
- this.page.total = res.data.total;
+ try {
+ // 瀛樺偍鏌ヨ鏉′欢锛屼富瑕佹槸涓轰簡鐐瑰嚮椤电爜鏃跺甫涓婅繖涓潯浠�
+ this.conditionMap["conditionMap[" + this.keyWordFind + "]"] = '*' + this.WupinFindValue + '*';
+ TableData({
+ templateOid: this.templateOid,
+ codeClassifyOid: this.codeClassifyOid,
+ page: this.page.currentPage,
+ limit: this.page.pageSize,
+ ['conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
+ }).then(res => {
+ this.tableData = res.data.data;
+ this.page.total = res.data.total;
+ })
+ } finally {
this.isLoading = false;
- })
+ }
}
}
@@ -1095,7 +1118,7 @@
<style lang="scss" scoped>
//鍥哄畾鍒楅珮搴�
/deep/ .el-table__fixed {
- height: calc(100vh - 370px) !important;
+ height: calc(100vh - 365px) !important;
}
// 婊氬姩鏉℃牱寮忎慨鏀�
@@ -1133,7 +1156,7 @@
.top {
overflow-y: scroll;
- min-height: 55%;
+ min-height: 40%;
}
.bottom {
--
Gitblit v1.9.3