From 9d96f11fb1de77d1ad4fb0be04a10ae8eb7f46c9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 04 八月 2023 17:52:08 +0800
Subject: [PATCH] 提交代码
---
Source/UBCS-WEB/src/components/Master/MasterTransfer.vue | 56 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
index cdb319c..14a58c6 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
@@ -66,28 +66,31 @@
this.dialogPush = this.visible;
},
//琛ㄥご鏁版嵁 鐢ㄦ潵娓叉煋绌挎妗�
- tableHeadData:{
- handler(newval,oldval){
+ tableHeadData: {
+ handler(newval, oldval) {
console.log(newval)
- if(newval){
- //excel琛ㄥご鏁版嵁杞崲
- this.tableHeadFindData=newval.map(obj => obj.label);
- this.tableHeadFindData.forEach((city, index) => {
- this.data.push({
- label: city,
- key: index,
- });
- });
- //excel琛ㄦ牸鏁版嵁杞崲
- this.option.column[0].children=newval.map(obj => {
- return {
- label: obj.label,
- prop: obj.prop
- }
- })
- }
+ if (newval) {
+ // 娓呯┖data鏁扮粍
+ this.data = [];
+ // excel琛ㄥご鏁版嵁杞崲
+ this.tableHeadFindData = newval.map(obj => obj.label);
+ this.tableHeadFindData.forEach((city, index) => {
+ this.data.push({
+ label: city,
+ key: index,
+ });
+ });
+ console.log(this.data)
+ // excel琛ㄦ牸鏁版嵁杞崲
+ this.option.column[0].children = newval.map(obj => {
+ return {
+ label: obj.label,
+ prop: obj.prop
+ }
+ })
+ }
}
-},
+ },
tableData(){
// 灏嗗�奸噷闈㈢殑true鎴杅alse鏀瑰彉涓烘槸鎴栧惁
this.option.data = this.tableData.map(obj => {
@@ -130,7 +133,14 @@
})
if(this.radio === 0){
if(this.selectRow.length<=0){
- this.$message.warning('璇烽�夋嫨瑕佸鍑虹殑妯℃澘')
+ this.ids=this.tableData.map(item => item.oid).join(',')
+ exportCode({codeClassifyOid:this.codeClassifyOid,...this.exportArr,limit:-1}).then(res=>{
+ // console.log('res',res)
+ if(res){
+ func.downloadFileByBlobHandler(res);
+ this.escHandler()
+ }
+ })
}else {
//宸查�夋嫨澶氶��
const selectList=[]
@@ -145,7 +155,7 @@
exportCode({codeClassifyOid:this.codeClassifyOid,'conditionMap[oid]':this.ids,...this.exportArr}).then(res=>{
// console.log('res',res)
if(res){
- func.downloadFileByBlob(res);
+ func.downloadFileByBlobHandler(res);
this.escHandler()
}
})
@@ -156,7 +166,7 @@
exportCode({codeClassifyOid:this.codeClassifyOid,...this.exportArr,limit:-1}).then(res=>{
// console.log('res',res)
if(res){
- func.downloadFileByBlob(res);
+ func.downloadFileByBlobHandler(res);
this.escHandler()
}
})
--
Gitblit v1.9.3