From 829bfe3e8376f20f90a4b2361c9a8c3ed0e80d45 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 06 十二月 2023 17:21:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Master/MasterTransfer.vue | 63 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
index 0088dc4..6c7c8d5 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
@@ -1,5 +1,6 @@
<template>
- <el-dialog :close-on-click-modal="false" :visible.sync="dialogPush" append-to-body style="width: 1550px; margin: auto" title="瀵煎嚭"
+ <el-dialog :close-on-click-modal="false" :visible.sync="dialogPush" append-to-body style="width: 1550px; margin: auto"
+ title="瀵煎嚭"
@close="escHandler">
<div style="margin-bottom: 20px;">
<div>
@@ -9,8 +10,7 @@
<el-radio :label="1">鍏ㄩ儴</el-radio>
<el-radio :label="2">椤电爜</el-radio>
</el-radio-group>
- <span v-if="radio === 2" style="margin-left: 20px;"><el-input v-model="pageExport"
- style="width: 150px"></el-input> 锛堣緭鍏ラ〉鐮佹垨鑰呴〉闈㈣寖鍥达紝濡傦細1-10)锛�</span>
+ <span v-if="radio === 2" style="margin-left: 20px;"><el-input v-model="pageExport" style="width: 150px"></el-input> 锛堣緭鍏ラ〉鐮佹垨鑰呴〉闈㈣寖鍥达紝濡傦細1-10锛�</span>
</div>
</div>
<div style="text-align: center">
@@ -112,7 +112,7 @@
},
value: {
handler(newval, oldval) {
- console.log('value', newval)
+ // console.log('value', newval)
}
}
},
@@ -120,6 +120,22 @@
mounted() {
},
methods: {
+ handlerFile(res){
+ let reader = new FileReader();
+ reader.readAsText(res.data);
+ reader.onload = (result) =>{
+ try {
+ let resData = JSON.parse(result.target.result); // 瑙ｆ瀽瀵硅薄鎴愬姛
+ if (resData.code != 200) {
+ this.$message.error(resData.msg);
+ }
+ } catch (err) {
+ // console.log("err",err)// 瑙ｆ瀽鎴愬璞″け璐ワ紝璇存槑鏄甯哥殑鏂囦欢娴�
+ func.downloadFileByBlobHandler(res);
+ this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
+ }
+ };
+ },
escHandler() {
this.$emit('update:visible', false);
this.value = [];
@@ -157,11 +173,8 @@
'conditionMap[oid]': this.ids, ...this.exportArrTwo,
limit: -1
}).then(res => {
- // console.log('res',res)
- if (res) {
- func.downloadFileByBlobHandler(res);
- this.escHandler()
- }
+ this.handlerFile(res);
+ this.escHandler();
})
} else {
@@ -170,10 +183,9 @@
'conditionMap[oid]': this.ids, ...this.exportArr
}).then(res => {
// console.log('res',res)
- if (res) {
- func.downloadFileByBlobHandler(res);
- this.escHandler()
- }
+ this.handlerFile(res);
+ this.escHandler();
+
})
}
@@ -185,19 +197,15 @@
this.exportArrTwo[`attrIdIndexMap[${index}]`] = prop;
});
exportCode({codeClassifyOid: this.codeClassifyOid, ...this.exportArrTwo, limit: -1}).then(res => {
- // console.log('res',res)
if (res) {
func.downloadFileByBlobHandler(res);
- this.escHandler()
+ this.escHandler();
}
})
} else {
exportCode({codeClassifyOid: this.codeClassifyOid, ...this.exportArr, limit: -1}).then(res => {
- // console.log('res',res)
- if (res) {
- func.downloadFileByBlobHandler(res);
- this.escHandler()
- }
+ this.handlerFile(res);
+ this.escHandler();
})
}
} else if (this.radio === 2) {
@@ -233,10 +241,9 @@
endPage: end
}).then((res) => {
// console.log('res',res)
- if (res) {
- func.downloadFileByBlobHandler(res);
- this.escHandler()
- }
+ this.handlerFile(res);
+ this.escHandler();
+
});
} else {
this.tableHeadData.map(item => item.prop)
@@ -249,11 +256,9 @@
page: start,
endPage: end
}).then(res => {
- // console.log('res',res)
- if (res) {
- func.downloadFileByBlobHandler(res);
- this.escHandler()
- }
+ console.log('res',res)
+ this.handlerFile(res);
+ this.escHandler();
})
}
}
--
Gitblit v1.9.3