From acb7c4c272aa02c2ed24cde72db429defef9fb8f Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 27 七月 2023 13:54:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/Master/MasterTransfer.vue |   37 +++++++++++++++++++++++++++++++++----
 1 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
index 1663b08..5af0fcb 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
@@ -118,17 +118,46 @@
         if(this.selectRow.length<=0){
           this.$message.warning('璇烽�夋嫨瑕佸鍑虹殑妯℃澘')
         }else {
+          //宸查�夋嫨澶氶��
           const selectList=[]
-          let exportArr=[]
+          //宸查�夋嫨灞炴��
+          let exportArr={}
+          const ids = this.selectRow.map(item => item.oid).join(',')
           this.selectRow.forEach(item=>{
             selectList.push(
              item.oid
             )
           })
-          exportArr=this.value.map(index => this.tableHeadData[index].prop);
-          exportCode({codeClassifyOid:this.codeClassifyOid,'conditionMap[oid]':selectList,'attrIdIndexMap[index]':exportArr}).then(res=>{
-            console.log(res)
+          this.value.map(index => this.tableHeadData[index].prop).forEach((item, index) => {
+            exportArr[`attrIdIndexMap[${index}]`] = item
           })
+          exportCode({codeClassifyOid:this.codeClassifyOid,'conditionMap[oid]':ids,...exportArr}).then(res=>{
+            console.log('res',res)
+            const filename = '涓嬭浇.xlsx'; // 涓嬭浇鐨勬枃浠跺悕
+            const blob = new Blob([res.data], { type: 'application/vnd.ms-excel' });
+            const a = document.createElement('a');
+            const url = window.URL.createObjectURL(blob);
+            a.href = url;
+            a.download = filename;
+            a.style.display = 'none';
+            document.body.appendChild(a);
+            a.click();
+            document.body.removeChild(a);
+            window.URL.revokeObjectURL(url);
+
+            // const filename = '涓嬭浇.xlsx'; // 涓嬭浇鐨勬枃浠跺悕
+            // const blob = new Blob([response.data], { type: 'application/vnd.ms-excel' });
+            //
+            // const url = window.URL.createObjectURL(blob);
+            // const link = document.createElement('a');
+            // link.href = url;
+            // link.setAttribute('download', filename);
+            // document.body.appendChild(link);
+            // link.click();
+            // document.body.removeChild(link);
+            // URL.revokeObjectURL(url);
+          })
+
         }
       };
     },

--
Gitblit v1.9.3