Browse Source

bug修复

lilei 2 năm trước cách đây
mục cha
commit
ae62a38afb

+ 2 - 2
src/views/allocationManagement/transfersPrint/list.vue

@@ -59,12 +59,12 @@
                     ></v-select>
                   </a-form-item>
                 </a-col>
-                <a-col :md="3" :sm="24">
+                <a-col :md="4" :sm="24">
                   <a-form-item label="所在区域">
                     <subarea id="allocateBillList-subarea" ref="subarea" @change="subareaChange"></subarea>
                   </a-form-item>
                 </a-col>
-                <a-col :md="3" :sm="24">
+                <a-col :md="4" :sm="24">
                   <a-form-item label="地区">
                     <Area id="allocateBillList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
                   </a-form-item>

+ 9 - 9
src/views/reportData/actualSalesReport/list.vue

@@ -124,15 +124,15 @@ export default {
         ],
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         dealer: {
           dealerSn: undefined,
           provinceSn: undefined,
           citySn: undefined,
           districtSn: undefined,
-          subareaArea:{
-            subareaSn: undefined,
-            subareaAreaSn: undefined
-          },
           dealerLevel: undefined
         }
       },
@@ -225,8 +225,8 @@ export default {
       this.queryParam.dealer.dealerSn = val.key
     },
     subareaChange (val) {
-      this.queryParam.dealer.subareaArea.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.dealer.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
+      this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     //  重置
     resetSearchForm () {
@@ -242,11 +242,11 @@ export default {
         provinceSn: undefined,
         citySn: undefined,
         districtSn: undefined,
-        subareaArea:{
+        dealerLevel: undefined
+      }
+      this.queryParam.subareaArea = {
           subareaSn: undefined,
           subareaAreaSn: undefined
-        },
-        dealerLevel: undefined
       }
       this.totalData = null
       if (this.advanced) {

+ 9 - 9
src/views/reportData/allCountryCostReport/list.vue

@@ -114,15 +114,15 @@ export default {
         time: [],
         beginDate: '',
         endDate: '',
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         dealer: {
           dealerName: '',
           provinceSn: undefined,
           citySn: undefined,
           districtSn: undefined,
-          subareaArea:{
-            subareaSn: undefined,
-            subareaAreaSn: undefined
-          },
           dealerLevel: undefined
         }
       },
@@ -450,8 +450,8 @@ export default {
       })
     },
     subareaChange(val){
-      this.queryParam.dealer.subareaArea.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.dealer.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
+      this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     //  重置
     resetSearchForm () {
@@ -464,11 +464,11 @@ export default {
         provinceSn: undefined,
         citySn: undefined,
         districtSn: undefined,
-        subareaArea:{
+        dealerLevel: undefined
+      }
+      this.queryParam.subareaArea = {
           subareaSn: undefined,
           subareaAreaSn: undefined
-        },
-        dealerLevel: undefined
       }
       this.totalData = null
       this.$refs.subarea.clearData()

+ 10 - 10
src/views/reportData/allocationPresentation/list.vue

@@ -161,14 +161,14 @@ export default {
         endDate: '',
         allocateNo: '',
         targetName: '',
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         dealer: {
           provinceSn: undefined,
           citySn: undefined,
           districtSn: undefined,
-          subareaArea:{
-            subareaSn: undefined,
-            subareaAreaSn: undefined
-          },
           dealerLevel: undefined
         }
       },
@@ -309,8 +309,8 @@ export default {
       this.queryParam.endDate = date[1] || ''
     },
     subareaChange(val){
-      this.queryParam.dealer.subareaArea.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.dealer.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
+      this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     //  重置
     resetSearchForm () {
@@ -320,14 +320,14 @@ export default {
       this.queryParam.endDate = ''
       this.queryParam.allocateNo = ''
       this.queryParam.targetName = ''
+      this.queryParam.subareaArea = {
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        }
       this.queryParam.dealer = {
         provinceSn: undefined,
         citySn: undefined,
         districtSn: undefined,
-        subareaArea:{
-          subareaSn: undefined,
-          subareaAreaSn: undefined
-        },
         dealerLevel: undefined
       }
       this.totalData = null

+ 8 - 8
src/views/reportData/hPriceDifferenceDetailReport/list.vue

@@ -158,12 +158,12 @@ export default {
         dealer: {
           dealerSn: undefined,
           dealerLevel: undefined,
-          subareaArea:{
-            subareaSn: undefined,
-            subareaAreaSn: undefined
-          },
           provinceSn: undefined
         },
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         product: {
           brandType: undefined,
           productBrandSn: undefined, //  产品品牌
@@ -311,8 +311,8 @@ export default {
       this.queryParam.product.productTypeSn3 = val[2] ? val[2] : ''
     },
     subareaChange(val){
-      this.queryParam.dealer.subareaArea.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.dealer.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
+      this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     //  重置
     resetSearchForm () {
@@ -326,8 +326,8 @@ export default {
       this.queryParam.bizNo = ''
       this.queryParam.dealer.dealerSn = undefined
       this.queryParam.dealer.dealerLevel = undefined
-      this.queryParam.dealer.subareaArea.subareaSn = undefined
-      this.queryParam.dealer.subareaArea.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.dealer.provinceSn = undefined
       this.queryParam.product.brandType = ''
       this.queryParam.product.productBrandSn = ''

+ 10 - 10
src/views/reportData/returnGoodsPresentation/list.vue

@@ -124,15 +124,15 @@ export default {
         beginDate: '',
         endDate: '',
         salesReturnBillNo: '',
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         dealer: {
           'dealerName': '',
           'provinceSn': undefined,
           'citySn': undefined,
           'districtSn': undefined,
-          'subareaArea':{
-            'subareaSn': undefined,
-            'subareaAreaSn': undefined, // 分区
-          },
           'dealerLevel': undefined
         }
       },
@@ -220,8 +220,8 @@ export default {
       this.queryParam.endDate = date[1] || ''
     },
     subareaChange(val){
-      this.queryParam.dealer.subareaArea.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.dealer.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
+      this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     //  重置
     resetSearchForm () {
@@ -230,15 +230,15 @@ export default {
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
       this.queryParam.salesReturnBillNo = ''
+      this.queryParam.subareaArea = {
+        subareaSn: undefined,
+        subareaAreaSn: undefined
+      }
       this.queryParam.dealer = {
         'dealerName': '',
         'provinceSn': undefined,
         'citySn': undefined,
         'districtSn': undefined,
-        'subareaArea':{
-          'subareaSn': undefined,
-          'subareaAreaSn': undefined,
-         },
         'dealerLevel': undefined
       }
       this.totalData = null

+ 8 - 8
src/views/reportData/salesPresentation/list.vue

@@ -125,15 +125,15 @@ export default {
         beginDate: '',
         endDate: '',
         salesBillNo: '',
+        'subareaArea':{
+            'subareaSn': undefined,
+            'subareaAreaSn': undefined,
+        },
         dealer: {
           'dealerSn': undefined,
           'provinceSn': undefined,
           'citySn': undefined,
           'districtSn': undefined,
-          'subareaArea':{
-            'subareaSn': undefined,
-            'subareaAreaSn': undefined,
-          },
           'dealerLevel': undefined
         }
       },
@@ -234,15 +234,15 @@ export default {
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
       this.queryParam.salesBillNo = ''
+      this.queryParam.subareaArea = {
+          'subareaSn': undefined,
+          'subareaAreaSn': undefined,
+         }
       this.queryParam.dealer = {
         'dealerSn': undefined,
         'provinceSn': undefined,
         'citySn': undefined,
         'districtSn': undefined,
-        'subareaArea':{
-          'subareaSn': undefined,
-          'subareaAreaSn': undefined,
-         },
         'dealerLevel': undefined
       }
       this.totalData = null

+ 4 - 4
src/views/reportData/salesReturnsReport/list.vue

@@ -22,13 +22,13 @@
                 <a-input id="salesReturnsReportList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-model-item label="所在区域">
                 <subarea id="salesReturnsReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
+              <a-col :md="5" :sm="24">
                 <a-form-model-item label="客户名称">
                   <custList id="salesReturnsReportList-dealerName" ref="custList" :itemSn="queryParam.dealerSn" @change="custChange"></custList>
                 </a-form-model-item>
@@ -44,13 +44,13 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <a-col :md="5" :sm="24">
                 <a-form-model-item label="地区">
                     <AreaList id="salesReturnsReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="8" :sm="24" style="margin-bottom: 10px;">
+            <a-col :md="7" :sm="24" style="margin-bottom: 10px;">
               <a-button
                 type="primary"
                 class="button-info"

+ 1 - 1
src/views/reportData/transferReturnDetailReport/list.vue

@@ -42,7 +42,7 @@
                   placeholder="请选择调拨退货对象类型"></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="所在区域">
                 <subarea id="allocateReturnDetailReport-subareaSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>

+ 1 - 1
src/views/reportData/transferReturnReport/list.vue

@@ -43,7 +43,7 @@
                     placeholder="请选择调拨退货对象类型"></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="transferReturnReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>