From afa2dd8a752e1129190b3586d01f1fcbcbb76035 Mon Sep 17 00:00:00 2001
From: Caps <452713115@qq.com>
Date: Mon, 27 Apr 2020 14:16:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/shop/IncreaseDataCompany.vue |  9 ++++++---
 src/pages/shop/IncreaseDataStaff.vue   | 25 ++++++++++++++++++++-----
 src/pages/shop/IncreaseDataStore.vue   |  7 +++++--
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/pages/shop/IncreaseDataCompany.vue b/src/pages/shop/IncreaseDataCompany.vue
index 488b935..1675183 100644
--- a/src/pages/shop/IncreaseDataCompany.vue
+++ b/src/pages/shop/IncreaseDataCompany.vue
@@ -22,7 +22,7 @@
                         <Button type="primary" @click="generalizeOfRetail">查询</Button>
                     </i-col>
                     <div style="text-align: right;padding-right: 20px;float: right">
-                        <Button type="primary" @click="exportZeroExtend">导出数据</Button>
+                        <Button type="primary" @click="exportZeroExtend" :loading="loading" >导出数据</Button>
                     </div>
                 </Row>
             </i-col>
@@ -42,6 +42,7 @@
         name: "IncreaseDataCompany",
         data() {
             return {
+                loading:false,
                 selectedCompany: null,
                 companyList: [],
                 columns1: [
@@ -221,6 +222,7 @@
             },
             //零推广导出
             exportZeroExtend: function(){
+                this.loading = true;
                 if(this.selectDate[0] === ""){
                     this.$Message.info("请选择日期");
                     return
@@ -234,7 +236,8 @@
                     endTime: this.selectDate[1],
                     orgId: orgId,
                     pageNum: 1,
-                    pageSize: this.totalSize
+                    pageSize: this.totalSize,
+                    userId:JSON.parse(sessionStorage.getItem("loginInfo")).userId
                 };
                 let that = this;
                 let originAllData = [];
@@ -244,7 +247,7 @@
                     }
                     data = data.data.results.dataVOS;
                     if(data && data.length > 0){
-                        that.totalSize = data[0].totalSize;
+                        that.loading = false;
                         for(let i=0;i<data.length;i++){
                             let entity = data[i];
                             entity.index = i+1;
diff --git a/src/pages/shop/IncreaseDataStaff.vue b/src/pages/shop/IncreaseDataStaff.vue
index 2714e07..18a17fe 100644
--- a/src/pages/shop/IncreaseDataStaff.vue
+++ b/src/pages/shop/IncreaseDataStaff.vue
@@ -40,7 +40,7 @@
                     </i-col>
 
                     <div style="text-align: right;padding-right: 20px;float: right">
-                        <Button type="primary" @click="exportData">导出数据</Button>
+                        <Button type="primary"  :loading="loading"  @click="exportZeroExtend">导出数据</Button>
                     </div>
                 </Row>
             </i-col>
@@ -132,6 +132,7 @@
                 pageNum: 1,
                 pageSize: 10,
                 selectDate:[],
+                loading:false,
             }
         },
         mounted: function () {
@@ -326,19 +327,33 @@
             },
             //零推广导出
             exportZeroExtend: function(){
+                this.loading = true;
                 if(this.selectDate[0] === ""){
                     this.$Message.info("请选择日期");
                     return
                 }
+                let sellerId = this.selectedStaff;
+                if(this.selectedStaff === "-1"){
+                    sellerId = null;
+                }
+                let shopId = this.selectedStore;
+                if(this.selectedStore === "-1"){
+                    shopId = null;
+                }
+                let orgId = this.selectedCompany;
+                if(this.selectedCompany === "-1"){
+                    orgId = null;
+                }
                 let that = this;
                 let request = {
                     startTime:this.selectDate[0],
                     endTime:this.selectDate[1],
-                    orgId:this.selectedCompany,
-                    shopId:this.selectedStore,
-                    sellerId:this.selectedStaff,
+                    orgId:orgId,
+                    shopId:shopId,
+                    sellerId:sellerId,
                     pageNum:this.pageNum,
                     pageSize:this.pageSize,
+                    userId:JSON.parse(sessionStorage.getItem("loginInfo")).userId
                 };
                 let originAllData = [];
                 IncreaseData.generalizeOfSeller(request,function (data) {
@@ -347,7 +362,7 @@
                     }
                     data = data.data.results.dataVOS;
                     if(data && data.length > 0){
-                        that.totalSize = data[0].totalSize;
+                        that.loading = false;
                         for(let i=0;i<data.length;i++){
                             let entity = data[i];
                             entity.index = i+1;
diff --git a/src/pages/shop/IncreaseDataStore.vue b/src/pages/shop/IncreaseDataStore.vue
index c7748bf..3672ea1 100644
--- a/src/pages/shop/IncreaseDataStore.vue
+++ b/src/pages/shop/IncreaseDataStore.vue
@@ -31,7 +31,7 @@
                         <Button type="primary" @click="generalizeOfStore">查询</Button>
                     </i-col>
                     <div style="text-align: right;padding-right: 20px;float: right">
-                        <Button type="primary" @click="exportZeroExtend">导出数据</Button>
+                        <Button :loading="loading" type="primary" @click="exportZeroExtend">导出数据</Button>
                     </div>
                 </Row>
             </i-col>
@@ -113,6 +113,7 @@
                 totalSize: 0,
                 pageNum: 1,
                 pageSize: 10,
+                loading:false
             }
         },
         mounted: function () {
@@ -248,6 +249,7 @@
             },
             //零推广导出
             exportZeroExtend: function () {
+                this.loading = true;
                 if (this.selectDate[0] === "") {
                     this.$Message.info("请选择日期");
                     return
@@ -267,6 +269,7 @@
                     shopId: shopId,
                     pageNum: this.pageNum,
                     pageSize: this.totalSize,
+                    userId:JSON.parse(sessionStorage.getItem("loginInfo")).userId
                 };
                 let that = this;
                 let originAllData = [];
@@ -276,7 +279,7 @@
                     }
                     data = data.data.results.dataVOS;
                     if (data && data.length > 0) {
-                        that.totalSize = data[0].totalSize;
+                        that.loading = false;
                         for (let i = 0; i < data.length; i++) {
                             let entity = data[i];
                             entity.index = i + 1;