From 3d828ba07224d1935f47cb0c20dcb959281361d6 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 07 十二月 2023 14:06:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 4157faa..92973d5 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -578,24 +578,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);
});
},
//鏍囧噯鐢宠
--
Gitblit v1.9.3