From 51453805bae17ac96ae7be39d9f6dcb8f05b8e54 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 04 八月 2023 18:44:54 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/Master/MasterTransfer.vue |   96 ++++++++++++++++++++++++++++++++++--------------
 1 files changed, 68 insertions(+), 28 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
index b876bab..24ea436 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
@@ -57,6 +57,7 @@
         data: []
       },
       exportArr:{},
+      exportArrTwo:{},
       ids:""
     };
   },
@@ -68,7 +69,6 @@
     //琛ㄥご鏁版嵁 鐢ㄦ潵娓叉煋绌挎妗�
     tableHeadData: {
       handler(newval, oldval) {
-        console.log(newval)
         if (newval) {
           // 娓呯┖data鏁扮粍
           this.data = [];
@@ -80,7 +80,6 @@
               key: index,
             });
           });
-          console.log(this.data)
           // excel琛ㄦ牸鏁版嵁杞崲
           this.option.column[0].children = newval.map(obj => {
             return {
@@ -107,6 +106,11 @@
     codeClassifyOid:{
       handler(newval,oldval){
       }
+    },
+    value:{
+      handler(newval,oldval){
+        console.log('value',newval)
+      }
     }
   },
   computed:{
@@ -125,9 +129,6 @@
       this.$emit('update:visible', false);
     },
     handleExcel(){
-      if(this.value <= 0){
-        this.$message.warning('璇烽�夋嫨灞炴��')
-      }else {
         this.value.map(index => this.tableHeadData[index].prop).forEach((item, index) => {
           this.exportArr[`attrIdIndexMap[${index}]`] = item
         })
@@ -139,30 +140,58 @@
             const selectList=[]
             //宸查�夋嫨灞炴��
             let exportArr={}
-            const ids = this.selectRow.map(item => item.oid).join(',')
+            this.ids = this.selectRow.map(item => item.oid).join(',')
             this.selectRow.forEach(item=>{
               selectList.push(
                 item.oid
               )
             })
-            exportCode({codeClassifyOid:this.codeClassifyOid,'conditionMap[oid]':this.ids,...this.exportArr}).then(res=>{
+            if(this.value <= 0){
+              this.tableHeadData.map(item => item.prop)
+                .forEach((prop, index) => {
+                  this.exportArrTwo[`attrIdIndexMap[${index}]`] = prop;
+                });
+              exportCode({codeClassifyOid:this.codeClassifyOid,'conditionMap[oid]':this.ids,...this.exportArrTwo,limit:-1}).then(res=>{
+                // console.log('res',res)
+                if(res){
+                  func.downloadFileByBlobHandler(res);
+                  this.escHandler()
+                }
+              })
+            }else {
+
+              exportCode({codeClassifyOid:this.codeClassifyOid,'conditionMap[oid]':this.ids,...this.exportArr}).then(res=>{
+                // console.log('res',res)
+                if(res){
+                  func.downloadFileByBlobHandler(res);
+                  this.escHandler()
+                }
+              })
+
+            }
+            }
+        }else if(this.radio === 1){
+          if(this.value <= 0){
+            this.tableHeadData.map(item => item.prop)
+              .forEach((prop, index) => {
+                this.exportArrTwo[`attrIdIndexMap[${index}]`] = prop;
+              });
+            exportCode({codeClassifyOid:this.codeClassifyOid,...this.exportArrTwo,limit:-1}).then(res=>{
               // console.log('res',res)
               if(res){
-                func.downloadFileByBlob(res);
+                func.downloadFileByBlobHandler(res);
                 this.escHandler()
               }
             })
-
+          }else {
+            exportCode({codeClassifyOid:this.codeClassifyOid,...this.exportArr,limit:-1}).then(res=>{
+              // console.log('res',res)
+              if(res){
+                func.downloadFileByBlobHandler(res);
+                this.escHandler()
+              }
+            })
           }
-        }else if(this.radio === 1){
-          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.downloadFileByBlob(res);
-              this.escHandler()
-            }
-          })
         }else if(this.radio === 2){
           const input = this.pageExport.trim();
           let start, end;
@@ -188,17 +217,28 @@
               return;
             }
           }
-          exportCode({ codeClassifyOid: this.codeClassifyOid, ...this.exportArr, limit: this.limit, page: start, endPage: end }).then((res) => {
-            // console.log('res',res)
-            if (res) {
-              func.downloadFileByBlobHandler(res);
-              this.escHandler()
-            }
-          });
+          if(this.value >=1 ){
+            exportCode({ codeClassifyOid: this.codeClassifyOid, ...this.exportArr, limit: this.limit, page: start, endPage: end }).then((res) => {
+              // console.log('res',res)
+              if (res) {
+                func.downloadFileByBlobHandler(res);
+                this.escHandler()
+              }
+            });
+          }else {
+            this.tableHeadData.map(item => item.prop)
+              .forEach((prop, index) => {
+                this.exportArrTwo[`attrIdIndexMap[${index}]`] = prop;
+              });
+            exportCode({codeClassifyOid:this.codeClassifyOid,...this.exportArrTwo,limit:this.limit,page: start, endPage: end}).then(res=>{
+              // console.log('res',res)
+              if(res){
+                func.downloadFileByBlobHandler(res);
+                this.escHandler()
+              }
+            })
+          }
         }
-
-      }
-
     },
   }
 }

--
Gitblit v1.9.3