From 0ffd5117f3b33000d821bdf20a8fd81f9a964447 Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Thu, 10 Mar 2022 11:08:09 +0800
Subject: [PATCH] zx

---
 src/views/SaleRank/CitySale/index.vue  |  8 ++---
 src/views/SaleRank/CitySale/tbEvent.js | 47 ++++++++++++++++++--------
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/views/SaleRank/CitySale/index.vue b/src/views/SaleRank/CitySale/index.vue
index 0df3b85..a3f436f 100644
--- a/src/views/SaleRank/CitySale/index.vue
+++ b/src/views/SaleRank/CitySale/index.vue
@@ -5,10 +5,10 @@
         </v-label-div>
         <div class="d2">
             <v-tab-group :value="tValue" :style="{ background: 'transparent' }" :btns="btnTimes" @change="handlerTime"></v-tab-group>
-            <a-select class="choose-brand" v-model="form.sBrand" placeholder="请选择品牌" @dropdownVisibleChange="brandDrawer" :dropdownMatchSelectWidth="false" allowClear>
+            <a-select class="choose-series" v-model="form.sBrand" placeholder="请选择品牌" @dropdownVisibleChange="brandDrawer" :dropdownMatchSelectWidth="false" allowClear>
                   <div slot="dropdownRender"></div>
               </a-select>
-              <a-select class="choose-brand" v-model="form.sSeriesName" placeholder="请选择车型" allowClear>
+              <a-select class="choose-series" v-model="form.sSeriesName" placeholder="请选择车型" allowClear>
                   <a-select-option v-for="(item,index) in seriesList" :value="item.name" :key="index">
                       {{item.name}}
                   </a-select-option>
@@ -19,7 +19,7 @@
                   </a-select-option>
               </a-select>
             <a-month-picker style="width: 160px;margin-left:20px" v-model="selTime[0]" :disabled-date="disabledDate" valueFormat="YYYY-MM" placeholder="请选择开始日期"></a-month-picker>
-            <a-month-picker style="width: 160px;margin-left:40px" v-model="selTime[1]" :disabled-date="disabledDate" valueFormat="YYYY-MM" placeholder="请选择结束日期"></a-month-picker>
+            <a-month-picker style="width: 160px;margin-left:20px" v-model="selTime[1]" :disabled-date="disabledDate" valueFormat="YYYY-MM" placeholder="请选择结束日期"></a-month-picker>
             <a-button @click="onSearch" style="margin-left: 40px" type="primary">查询</a-button>
         </div>
         <div class="d3">
@@ -197,9 +197,9 @@ export default {
 
 .choose-brand {
     width: 150px;
+    margin-left: 16px;
 }
 .choose-series {
     width: 150px;
-    margin-right: 16px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/SaleRank/CitySale/tbEvent.js b/src/views/SaleRank/CitySale/tbEvent.js
index 2ec84d5..57e9c0f 100644
--- a/src/views/SaleRank/CitySale/tbEvent.js
+++ b/src/views/SaleRank/CitySale/tbEvent.js
@@ -63,6 +63,21 @@ export default {
     //切换类型
     handlerTime(activeIndex) {
         this.activeIndex = activeIndex
+        if(this.activeIndex == 0) {
+            getSalesType1(this.form).then(res => {
+                let data = res.data;
+                this.pagination.total = res.totalNum
+                this.tbData = data
+                this.tableLoad = false;
+            });
+        } else {
+            getSalesType0(this.form).then(res => {
+                let data = res.data;
+                this.pagination2.total = res.totalNum
+                this.tbData2 = data;
+                this.tableLoad = false;
+            })
+        }
     },
     //返回
     goBack() {
@@ -76,18 +91,20 @@ export default {
         this.tableLoad = true;
         this.form.sStartTime = this.selTime[0];
         this.form.sEndTime = this.selTime[1];
-        getSalesType1(this.form).then(res => {
-            let data = res.data;
-            this.pagination.total = res.totalNum
-            this.tbData = data
-            this.tableLoad = false;
-        });
-        getSalesType0(this.form).then(res => {
-            let data = res.data;
-            this.pagination2.total = res.totalNum
-            this.tbData2 = data;
-            this.tableLoad = false;
-        })
+        if(this.activeIndex == 0) {
+            getSalesType1(this.form).then(res => {
+                let data = res.data;
+                this.pagination.total = res.totalNum
+                this.tbData = data
+            });
+        } else {
+            getSalesType0(this.form).then(res => {
+                let data = res.data;
+                this.pagination2.total = res.totalNum
+                this.tbData2 = data;
+            })
+        }
+        this.tableLoad = false;
     },
     //点击明细
     onSalePro(record) {
@@ -98,7 +115,8 @@ export default {
             sEndTime: this.form.sEndTime,
             sBrandType: this.form.sBrandType,
             iPageIndex: 1,
-            sProv: record.key
+            sProv: record.key,
+            sBrand: this.form.sBrand
         }
         let o = {
             sBrand: this.form.sBrand,
@@ -126,7 +144,8 @@ export default {
             sEndTime: this.form.sEndTime,
             sBrandType: this.form.sBrandType,
             iPageIndex: 1,
-            sCity: record.key
+            sCity: record.key,
+            sBrand: this.form.sBrand
         }
         getSalesType6(obj).then(res => {
             let data = res.data;