lilei %!s(int64=2) %!d(string=hai) anos
pai
achega
eb11ede9b2
Modificáronse 41 ficheiros con 408 adicións e 97 borrados
  1. 10 1
      src/views/allocationManagement/transfersPrint/list.vue
  2. 12 3
      src/views/common/chooseDealer.vue
  3. 15 4
      src/views/dealerManagement/businessOwnerSettings/list.vue
  4. 16 5
      src/views/dealerManagement/businessOwnerSettings/settingsIndex.vue
  5. 11 4
      src/views/dealerManagement/dealerZoneSearch/list.vue
  6. 8 1
      src/views/dealerManagement/merchantInfoManagement/list.vue
  7. 11 7
      src/views/expenseManagement/expenseReimbursement/epenseDetailModal.vue
  8. 11 2
      src/views/expenseManagement/expenseReimbursementDetail/list.vue
  9. 10 1
      src/views/financialManagement/collectionDetailStatic/list.vue
  10. 20 13
      src/views/reportData/actualSalesReport/list.vue
  11. 20 13
      src/views/reportData/allCountryCostReport/list.vue
  12. 10 1
      src/views/reportData/allocationDetails/list.vue
  13. 18 11
      src/views/reportData/allocationPresentation/list.vue
  14. 8 1
      src/views/reportData/billingBackReport/list.vue
  15. 8 1
      src/views/reportData/billingOrderReport/list.vue
  16. 8 1
      src/views/reportData/billingReturnReport/list.vue
  17. 10 1
      src/views/reportData/hPriceDifferenceDetailReport/list.vue
  18. 8 1
      src/views/reportData/regionTypeSalesReport/list.vue
  19. 8 1
      src/views/reportData/returnGoodsPresentation/list.vue
  20. 8 1
      src/views/reportData/returnSlipReport/list.vue
  21. 8 1
      src/views/reportData/salesAmountReport/list.vue
  22. 8 1
      src/views/reportData/salesDetails/list.vue
  23. 10 1
      src/views/reportData/salesOrderTotal/list.vue
  24. 8 1
      src/views/reportData/salesPresentation/list.vue
  25. 8 1
      src/views/reportData/salesReturnDetailReport/list.vue
  26. 8 1
      src/views/reportData/salesReturnReport/list.vue
  27. 8 1
      src/views/reportData/salesReturnsReport/list.vue
  28. 8 1
      src/views/reportData/salesSlipReport/list.vue
  29. 8 1
      src/views/reportData/transferReturnDetailReport/list.vue
  30. 11 2
      src/views/reportData/transferReturnReport/list.vue
  31. 10 1
      src/views/salesManagement/examineVerify/list.vue
  32. 10 1
      src/views/salesManagement/matchSendOutOrder/list.vue
  33. 10 1
      src/views/salesManagement/outboundOrder/list.vue
  34. 10 1
      src/views/salesManagement/pushOrderManagement/list.vue
  35. 10 1
      src/views/salesManagement/salesCollection/list.vue
  36. 3 2
      src/views/salesManagement/salesQuery/list.vue
  37. 10 1
      src/views/salesManagement/sendOutOrder/list.vue
  38. 8 1
      src/views/salesManagement/shortageStatisticsC/list.vue
  39. 10 1
      src/views/salesManagement/stockPrint/list.vue
  40. 10 1
      src/views/salesReturnManagement/salesReturn/list.vue
  41. 2 2
      vue.config.js

+ 10 - 1
src/views/allocationManagement/transfersPrint/list.vue

@@ -61,7 +61,7 @@
                 </a-col>
                 <a-col :md="3" :sm="24">
                   <a-form-item label="所在区域">
-                    <subarea id="allocateBillList-subarea" v-model="queryParam.subareaSn"></subarea>
+                    <subarea id="allocateBillList-subarea" ref="subarea" @change="subareaChange"></subarea>
                   </a-form-item>
                 </a-col>
                 <a-col :md="3" :sm="24">
@@ -195,6 +195,7 @@ export default {
         checkStatus: undefined,
         printState: 'NO_PRINT',
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         shippingAddrProvinceSn: undefined
       },
       currentTab: 2,
@@ -266,6 +267,10 @@ export default {
       this.queryParam.beginDate = date[0]
       this.queryParam.endDate = date[1]
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.$refs.rangeDate.resetDate(this.time)
@@ -277,8 +282,12 @@ export default {
       this.queryParam.receiverName = ''
       this.queryParam.receiverSn = undefined
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
       this.$refs.receiverSn.resetForm()
+      if(this.advanced){
+        this.$refs.subarea.clearData()
+      }
       this.queryParam.printState = this.currentTab == 2 ? 'NO_PRINT' : undefined
       this.$refs.table.refresh(true)
     },

+ 12 - 3
src/views/common/chooseDealer.vue

@@ -21,7 +21,7 @@
           </a-col>
           <a-col :md="8" :sm="24" v-if="pageType!='viewDealers'">
             <a-form-item label="所在区域/分区">
-              <subarea id="chooseDealer-subarea" v-model="queryParam.subareaSn"></subarea>
+              <subarea id="chooseDealer-subarea" ref="subarea" @change="subareaChange"></subarea>
             </a-form-item>
           </a-col>
           <div v-else>
@@ -114,7 +114,9 @@ export default {
         auditState: undefined,
         provinceSn: undefined,
         citySn: undefined,
-        districtSn: undefined
+        districtSn: undefined,
+        subareaSn: undefined,
+        subareaAreaSn: undefined
       },
       tableHeight: 0,
       disabled: false, //  查询、重置按钮是否可操作
@@ -176,6 +178,10 @@ export default {
       this.$refs.table.clearSelected()
       this.spinning = false
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.queryParam = {
@@ -185,8 +191,11 @@ export default {
         auditState: undefined,
         provinceSn: undefined,
         citySn: undefined,
-        districtSn: undefined
+        districtSn: undefined,
+        subareaSn: undefined,
+        subareaAreaSn: undefined
       }
+      this.$refs.subarea.clearData()
       this.$refs.table.refresh(true)
       this.$refs.table.clearSelected()
     },

+ 15 - 4
src/views/dealerManagement/businessOwnerSettings/list.vue

@@ -7,7 +7,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="人员类型">
-                <subarea id="businessOwnerSettings-subareaSn" v-model="queryParam.subareaSn"></subarea>
+                <subarea id="businessOwnerSettings-subareaSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -72,6 +72,7 @@ export default {
       tableHeight: 0,
       queryParam: {
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         dealerName: ''
       },
       columns: [
@@ -84,9 +85,9 @@ export default {
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        // this.disabled = true
-        // this.spinning = true
-        return subareaQueryIncludeAreaAll(parameter).then(res => {
+        this.disabled = true
+        this.spinning = true
+        return subareaQueryIncludeAreaAll(Object.assign(parameter,this.queryParam)).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -113,8 +114,18 @@ export default {
     handleAdd () {
       this.openAddModal = true
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
+      this.queryParam = {
+        subareaSn: undefined,
+        subareaAreaSn: undefined,
+        dealerName: ''
+      }
+      this.$refs.subarea.clearData()
       this.$refs.table.refresh(true)
     },
     // 删除

+ 16 - 5
src/views/dealerManagement/businessOwnerSettings/settingsIndex.vue

@@ -24,7 +24,7 @@
                     <a-row :gutter="15">
                       <a-col :md="6" :sm="24">
                         <a-form-model-item label="所在区域/分区">
-                          <subarea id="areaSet-subareaSn" v-model="queryParam.subareaSn"></subarea>
+                          <subarea id="areaSet-subareaSn" ref="subarea" v-model="queryParam.subareaSn" @change="subareaChange"></subarea>
                         </a-form-model-item>
                       </a-col>
                       <a-col :md="6" :sm="24">
@@ -105,6 +105,7 @@ export default {
       tableHeight: 0,
       queryParam: {
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         dealerName: ''
       },
       columns: [
@@ -124,9 +125,9 @@ export default {
       showBrandModal: false,
       ChooseClassifyPos: null,
       loadData: parameter => {
-        // this.disabled = true
-        // this.spinning = true
-        return subareaQueryIncludeAreaAll(parameter).then(res => {
+        this.disabled = true
+        this.spinning = true
+        return subareaQueryIncludeAreaAll(Object.assign(parameter,this.queryParam)).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -143,8 +144,18 @@ export default {
     }
   },
   methods: {
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     resetSearchForm () {
-
+      this.queryParam = {
+        subareaSn: undefined,
+        subareaAreaSn: undefined,
+        dealerName: ''
+      }
+      this.$refs.subarea.clearData()
+      this.$refs.table.refresh(true)
     },
     openAreaModal () {
       this.openChooseArea = true

+ 11 - 4
src/views/dealerManagement/dealerZoneSearch/list.vue

@@ -7,7 +7,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="所在区域/分区">
-                <subarea id="dealerZoneSearch-subareaSn" v-model="queryParam.subareaSn"></subarea>
+                <subarea id="dealerZoneSearch-subareaSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -74,6 +74,7 @@ export default {
       tableHeight: 0,
       queryParam: {
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         dealerName: '',
         customerName: ''
       },
@@ -87,9 +88,9 @@ export default {
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        // this.disabled = true
-        // this.spinning = true
-        return subareaQueryIncludeAreaAll(parameter).then(res => {
+        this.disabled = true
+        this.spinning = true
+        return subareaQueryIncludeAreaAll(Object.assign(parameter,this.queryParam)).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -118,11 +119,17 @@ export default {
         _this.exportLoading = false
       })
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.dealerName = ''
       this.queryParam.customerName = ''
+      this.$refs.subarea.clearData()
       this.$refs.table.refresh(true)
     },
     pageInit () {

+ 8 - 1
src/views/dealerManagement/merchantInfoManagement/list.vue

@@ -7,7 +7,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-item label="区域">
-                <subarea id="merchantInfoManagementList-subarea" v-model="queryParam.subareaSn"></subarea>
+                <subarea id="merchantInfoManagementList-subarea" ref="subarea" @change="subareaChange"></subarea>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -128,6 +128,7 @@ export default {
         nameLike: '', //  商户名称、别名
         dealerType: undefined, //  商户类型
         subareaSn: undefined, //  区域
+        subareaAreaSn: undefined, // 分区
         auditState: undefined, // 审核状态
         cooperateFlag: undefined //  合作状态
       },
@@ -179,15 +180,21 @@ export default {
     }
   },
   methods: {
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置列表
     resetSearchForm () {
       this.queryParam = {
         nameLike: '', //  商户名称、别名
         dealerType: undefined, //  商户类型
         subareaSn: undefined, //  区域
+        subareaAreaSn: undefined, // 分区
         auditState: undefined, // 审核状态
         cooperateFlag: undefined //  合作状态
       }
+      this.$refs.subarea.clearData()
       this.$refs.table.refresh(true)
     },
     // 刷新当前列表

+ 11 - 7
src/views/expenseManagement/expenseReimbursement/epenseDetailModal.vue

@@ -201,6 +201,9 @@ export default {
           this.form.cityName = ''
           this.form.subareaNameList = ''
           this.form.subareaSnList = ''
+          this.form.subareaSn = ''
+          this.form.subareaAreaSn = ''
+          this.$refs.subareaBox.clearData()
         }
       }
       this.$nextTick(() => {
@@ -208,11 +211,10 @@ export default {
       })
     },
     // 分区
-    subareaChange (v, row) {
-      const arr = []
-      console.log(v, row)
-      row.map(item => arr.push(item.subareaName))
-      this.form.subareaNameList = arr
+    subareaChange(val, row){
+      this.form.subareaName = row.subareaName
+      this.form.subareaSn = val[0] ? val[0] : undefined
+      this.form.subareaAreaSn = val[1] ? val[1] : undefined
     },
     // 省
     provinceChange (v, row) {
@@ -318,8 +320,9 @@ export default {
         id: undefined,
         accountType: undefined, // 记帐类型
         accountNameSn: undefined, //  记账名称
-        subareaSnList: undefined, //  所属区域
-        subareaNameList: undefined,
+        subareaName: undefined,
+        subareaSn: undefined, //  区域
+        subareaAreaSn: undefined, // 分区
         provinceSn: undefined, // 省份
         provinceName: '',
         citySn: undefined, // 市
@@ -337,6 +340,7 @@ export default {
       this.form.cityName = ''
       this.form.expenseAccountSn = this.expenseAccountSn
       this.form.expenseAccountNo = this.expenseAccountNo
+      this.$refs.subareaBox.clearData()
     }
   },
   watch: {

+ 11 - 2
src/views/expenseManagement/expenseReimbursementDetail/list.vue

@@ -75,7 +75,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="所属区域">
-                  <subarea id="expenseReimbursementDetailList-subarea" v-model="queryParam.subareaSn"></subarea>
+                  <subarea id="expenseReimbursementDetailList-subarea" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -228,7 +228,8 @@ export default {
         splitObjType: undefined, // 费用承担方类型
         splitObjSn: undefined, //  费用承担方
         childSplitObjSn: undefined, // 费用承担人
-        subareaSn: undefined,
+        subareaSn: undefined, //  区域
+        subareaAreaSn: undefined, // 分区
         provinceName: '',
         cityName: '',
         provinceSn: undefined,
@@ -345,6 +346,10 @@ export default {
         _this.spinning = false
       })
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     // 重置
     resetSearchForm () {
       this.$refs.rangeDate.resetDate(this.time)
@@ -365,12 +370,16 @@ export default {
         splitObjSn: undefined, //  费用承担方
         childSplitObjSn: undefined, // 费用承担人
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         provinceName: '',
         cityName: '',
         provinceSn: undefined,
         citySn: undefined
       }
       this.expenseTypes = []
+      if(this.advanced){
+        this.$refs.subarea.clearData()
+      }
       this.$refs.table.refresh(true)
     },
     pageInit () {

+ 10 - 1
src/views/financialManagement/collectionDetailStatic/list.vue

@@ -105,7 +105,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="所属区域">
-                  <subarea id="collectionDetail-subarea" v-model="queryParam.subareaSn"></subarea>
+                  <subarea id="collectionDetail-subarea" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -239,6 +239,7 @@ export default {
         bankAccount: undefined,
         bankName: undefined,
         subareaSn: undefined,
+        subareaAreaSn: undefined, // 分区
         provinceSn: undefined,
         printStatus: undefined,
         invoiceStatus: undefined,
@@ -451,6 +452,10 @@ export default {
       this.$refs.table.refresh(true)
       this.$refs.table.clearSelected()
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       // 审核日期
@@ -485,12 +490,16 @@ export default {
       this.queryParam.bankName = undefined
       this.queryParam.bankAccount = undefined
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.provinceSn = undefined
       this.queryParam.invoiceDateType = undefined
       this.queryParam.invoiceDate = ''
       this.queryParam.printStatus = undefined
       this.queryParam.invoiceStatus = undefined
       this.queryParam.payerType = undefined
+      if(this.advanced){
+        this.$refs.subarea.clearData()
+      }
       this.searchForm()
     },
     //  导出

+ 20 - 13
src/views/reportData/actualSalesReport/list.vue

@@ -35,7 +35,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="所在区域">
-                <subarea id="actualSalesReportList-allocateTypeSn" v-model="queryParam.dealer.subareaSn"></subarea>
+                <subarea id="actualSalesReportList-allocateTypeSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
@@ -146,12 +146,13 @@ export default {
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
         dealer: {
-          'dealerSn': undefined,
-          'provinceSn': undefined,
-          'citySn': undefined,
-          'districtSn': undefined,
-          'subareaSn': undefined,
-          'dealerLevel': undefined
+          dealerSn: undefined,
+          provinceSn: undefined,
+          citySn: undefined,
+          districtSn: undefined,
+          subareaSn: undefined,
+          subareaAreaSn: undefined, // 分区
+          dealerLevel: undefined
         }
       },
       rules: {
@@ -448,6 +449,10 @@ export default {
     custChange (val) {
       this.queryParam.dealer.dealerSn = val.key
     },
+    subareaChange(val){
+      this.queryParam.dealer.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.dealer.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.time = [
@@ -458,16 +463,18 @@ export default {
       this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.dealer = {
-        'dealerSn': undefined,
-        'provinceSn': undefined,
-        'citySn': undefined,
-        'districtSn': undefined,
-        'subareaSn': undefined,
-        'dealerLevel': undefined
+        dealerSn: undefined,
+        provinceSn: undefined,
+        citySn: undefined,
+        districtSn: undefined,
+        subareaSn: undefined,
+        subareaAreaSn: undefined, // 分区
+        dealerLevel: undefined
       }
       this.totalData = null
       if (this.advanced) {
         this.$refs.areaList.clearData()
+        this.$refs.subarea.clearData()
       }
       this.$refs.custList.resetForm()
       this.$refs.ruleForm.resetFields()

+ 20 - 13
src/views/reportData/allCountryCostReport/list.vue

@@ -18,7 +18,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="所在区域">
-                <subarea id="returnGoodsPresentationList-subareaSn" v-model="queryParam.dealer.subareaSn"></subarea>
+                <subarea id="returnGoodsPresentationList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24" v-if="activeKey == 0">
@@ -115,12 +115,13 @@ export default {
         beginDate: '',
         endDate: '',
         dealer: {
-          'dealerName': '',
-          'provinceSn': undefined,
-          'citySn': undefined,
-          'districtSn': undefined,
-          'subareaSn': undefined,
-          'dealerLevel': undefined
+          dealerName: '',
+          provinceSn: undefined,
+          citySn: undefined,
+          districtSn: undefined,
+          subareaSn: undefined,
+          subareaAreaSn: undefined, // 分区
+          dealerLevel: undefined
         }
       },
       addrProvinceList: [], //  省下拉
@@ -453,6 +454,10 @@ export default {
         }
       })
     },
+    subareaChange(val){
+      this.queryParam.dealer.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.dealer.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.time = []
@@ -460,14 +465,16 @@ export default {
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
       this.queryParam.dealer = {
-        'dealerName': '',
-        'provinceSn': undefined,
-        'citySn': undefined,
-        'districtSn': undefined,
-        'subareaSn': undefined,
-        'dealerLevel': undefined
+        dealerName: '',
+        provinceSn: undefined,
+        citySn: undefined,
+        districtSn: undefined,
+        subareaSn: undefined,
+        subareaAreaSn: undefined, // 分区
+        dealerLevel: undefined
       }
       this.totalData = null
+      this.$refs.subarea.clearData()
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()
     },

+ 10 - 1
src/views/reportData/allocationDetails/list.vue

@@ -74,7 +74,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
-                  <subarea id="allocationDetailsList-subarea" v-model="queryParam.subareaSn"></subarea>
+                  <subarea id="allocationDetailsList-subarea" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -185,6 +185,7 @@ export default {
         dealerName: '',
         dealerLevel: undefined,
         subareaSn: undefined,
+        subareaAreaSn: undefined, // 分区
         dealerProvinceSn: undefined
       },
       productType: [],
@@ -328,6 +329,10 @@ export default {
         }
       })
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.time = [
@@ -352,9 +357,13 @@ export default {
       this.queryParam.dealerName = ''
       this.queryParam.dealerLevel = undefined
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.dealerProvinceSn = undefined
       this.productType = []
       this.allocateTypeVal = []
+      if(this.advanced){
+        this.$refs.subarea.clearData()
+      }
       this.$refs.ruleForm.resetFields()
       this.totalData = null
       this.$refs.table.clearTable()

+ 18 - 11
src/views/reportData/allocationPresentation/list.vue

@@ -41,7 +41,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
-                  <subarea id="allocationPresentationList-subareaSn" v-model="queryParam.dealer.subareaSn"></subarea>
+                  <subarea id="allocationPresentationList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -162,11 +162,12 @@ export default {
         allocateNo: '',
         targetName: '',
         dealer: {
-          'provinceSn': undefined,
-          'citySn': undefined,
-          'districtSn': undefined,
-          'subareaSn': undefined,
-          'dealerLevel': undefined
+          provinceSn: undefined,
+          citySn: undefined,
+          districtSn: undefined,
+          subareaSn: undefined,
+          subareaAreaSn: undefined, // 分区
+          dealerLevel: undefined
         }
       },
       rules: {
@@ -304,6 +305,10 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
+    subareaChange(val){
+      this.queryParam.dealer.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.dealer.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.time = []
@@ -313,15 +318,17 @@ export default {
       this.queryParam.allocateNo = ''
       this.queryParam.targetName = ''
       this.queryParam.dealer = {
-        'provinceSn': undefined,
-        'citySn': undefined,
-        'districtSn': undefined,
-        'subareaSn': undefined,
-        'dealerLevel': undefined
+        provinceSn: undefined,
+        citySn: undefined,
+        districtSn: undefined,
+        subareaSn: undefined,
+        subareaAreaSn: undefined, // 分区
+        dealerLevel: undefined
       }
       this.totalData = null
       if (this.advanced) {
         this.$refs.areaList.clearData()
+        this.$refs.subarea.clearData()
       }
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()

+ 8 - 1
src/views/reportData/billingBackReport/list.vue

@@ -23,7 +23,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="所在区域/分区">
-                <subarea id="billingBackReportList-subareaSn" v-model="queryParam.subareaSn"></subarea>
+                <subarea id="billingBackReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -102,6 +102,7 @@ export default {
         beginDate: '',
         endDate: '',
         subareaSn: undefined,
+        subareaAreaSn: undefined, // 分区
         supplier: {
           supplierSn: undefined,
           supplierName: undefined,
@@ -180,6 +181,10 @@ export default {
         }
       })
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.$refs.ruleForm.resetFields()
@@ -193,6 +198,8 @@ export default {
       this.queryParam.supplier.citySn = undefined
       this.queryParam.supplier.districtSn = undefined
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
+      this.$refs.subarea.clearData()
       this.$refs.areaList.clearData()
       this.$refs.table.clearTable()
     },

+ 8 - 1
src/views/reportData/billingOrderReport/list.vue

@@ -28,7 +28,7 @@
             </a-col>
             <a-col :md="5" :sm="24">
               <a-form-model-item label="所在区域/分区">
-                <subarea id="billingOrderReport-subareaSn" v-model="queryParam.subareaSn"></subarea>
+                <subarea id="billingOrderReport-subareaSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
             <a-col :md="5" :sm="24">
@@ -107,6 +107,7 @@ export default {
         beginDate: '',
         endDate: '',
         subareaSn: undefined,
+        subareaAreaSn: undefined, // 分区
         sparePartsReturnNo: undefined,
         supplier: {
           supplierSn: undefined,
@@ -185,6 +186,10 @@ export default {
         }
       })
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.$refs.ruleForm.resetFields()
@@ -196,9 +201,11 @@ export default {
       this.queryParam.supplier.citySn = undefined
       this.queryParam.supplier.districtSn = undefined
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.sparePartsReturnNo = undefined
       this.queryParam.supplier.supplierName = undefined
       this.queryParam.supplier.supplierSn = undefined
+      this.$refs.subarea.clearData()
       this.$refs.areaList.clearData()
       this.$refs.table.clearTable()
     },

+ 8 - 1
src/views/reportData/billingReturnReport/list.vue

@@ -35,7 +35,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="所在区域">
-                <subarea id="billingReturnReportList-subareaSn" v-model="queryParam.subareaSn"></subarea>
+                <subarea id="billingReturnReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
@@ -129,6 +129,7 @@ export default {
         citySn: undefined,
         districtSn: undefined,
         subareaSn: undefined,
+        subareaAreaSn: undefined, // 分区
         dealerLevel: undefined
       },
       rules: {
@@ -221,6 +222,10 @@ export default {
     custChange (val) {
       this.queryParam.dealerSn = val.key
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.time = [
@@ -235,10 +240,12 @@ export default {
       this.queryParam.citySn = undefined
       this.queryParam.districtSn = undefined
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.dealerLevel = undefined
       this.totalData = null
       if (this.advanced) {
         this.$refs.areaList.clearData()
+        this.$refs.subarea.clearData()
       }
       this.$refs.custList.resetForm()
       this.$refs.ruleForm.resetFields()

+ 10 - 1
src/views/reportData/hPriceDifferenceDetailReport/list.vue

@@ -56,7 +56,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
-                  <subarea id="hPriceDifferenceDetailList-subareaSn" v-model="queryParam.dealer.subareaSn"></subarea>
+                  <subarea id="hPriceDifferenceDetailList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -159,6 +159,7 @@ export default {
           dealerSn: undefined,
           dealerLevel: undefined,
           subareaSn: undefined, //  区域
+          subareaAreaSn: undefined, // 分区
           provinceSn: undefined
         },
         product: {
@@ -306,6 +307,10 @@ export default {
       this.queryParam.product.productTypeSn2 = val[1] ? val[1] : ''
       this.queryParam.product.productTypeSn3 = val[2] ? val[2] : ''
     },
+    subareaChange(val){
+      this.queryParam.dealer.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.dealer.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.time = [
@@ -319,6 +324,7 @@ export default {
       this.queryParam.dealer.dealerSn = undefined
       this.queryParam.dealer.dealerLevel = undefined
       this.queryParam.dealer.subareaSn = undefined
+      this.queryParam.dealer.subareaAreaSn = undefined
       this.queryParam.dealer.provinceSn = undefined
       this.queryParam.product.brandType = ''
       this.queryParam.product.productBrandSn = ''
@@ -328,6 +334,9 @@ export default {
       this.queryParam.bizType = undefined
       this.productType = []
       this.totalData = null
+      if(this.advanced){
+        this.$refs.subarea.clearData()
+      }
       this.$refs.custList.resetForm()
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()

+ 8 - 1
src/views/reportData/regionTypeSalesReport/list.vue

@@ -29,7 +29,7 @@
             </a-col>
             <a-col :md="6" :sm="24" v-if="activeKey==0">
               <a-form-model-item label="所在区域">
-                <subarea id="returnGoodsPresentationList-subareaSn" v-model="queryParam.subareaSn"></subarea>
+                <subarea id="returnGoodsPresentationList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced && activeKey==0">
@@ -102,6 +102,7 @@ export default {
         endDate: '',
         dealerProvinceSn: undefined,
         subareaSn: undefined,
+        subareaAreaSn: undefined, // 分区
         salesStatusType: 'REAL_SALES'
       },
       disabled: false, //  查询、重置按钮是否可操作
@@ -205,6 +206,10 @@ export default {
         }
       })
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.$refs.ruleForm.resetFields()
@@ -214,7 +219,9 @@ export default {
       this.queryParam.endDate = ''
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.salesStatusType = 'REAL_SALES'
+      this.$refs.subarea.clearData()
       this.$refs.table.clearTable()
     },
     //  导出

+ 8 - 1
src/views/reportData/returnGoodsPresentation/list.vue

@@ -41,7 +41,7 @@
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
-                  <subarea id="returnGoodsPresentationList-subareaSn" v-model="queryParam.dealer.subareaSn"></subarea>
+                  <subarea id="returnGoodsPresentationList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -130,6 +130,7 @@ export default {
           'citySn': undefined,
           'districtSn': undefined,
           'subareaSn': undefined,
+          'subareaAreaSn': undefined, // 分区
           'dealerLevel': undefined
         }
       },
@@ -216,6 +217,10 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
+    subareaChange(val){
+      this.queryParam.dealer.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.dealer.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.time = []
@@ -229,10 +234,12 @@ export default {
         'citySn': undefined,
         'districtSn': undefined,
         'subareaSn': undefined,
+        'subareaAreaSn': undefined,
         'dealerLevel': undefined
       }
       this.totalData = null
       if (this.advanced) {
+        this.$refs.subarea.clearData()
         this.$refs.areaList.clearData()
       }
       this.$refs.ruleForm.resetFields()

+ 8 - 1
src/views/reportData/returnSlipReport/list.vue

@@ -41,7 +41,7 @@
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
-                  <subarea id="returnSlipReportList-subareaSn" v-model="queryParam.subareaSn"></subarea>
+                  <subarea id="returnSlipReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -134,6 +134,7 @@ export default {
         citySn: undefined,
         districtSn: undefined,
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         dealerLevel: undefined,
         salesReturnBillNo: ''
       },
@@ -231,6 +232,10 @@ export default {
     custChange (val) {
       this.queryParam.dealerSn = val.key
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.time = [
@@ -245,11 +250,13 @@ export default {
       this.queryParam.citySn = undefined
       this.queryParam.districtSn = undefined
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.dealerLevel = undefined
       this.queryParam.salesReturnBillNo = ''
       this.$refs.custList.resetForm()
       this.totalData = null
       if (this.advanced) {
+        this.$refs.subarea.clearData()
         this.$refs.areaList.clearData()
       }
       this.$refs.ruleForm.resetFields()

+ 8 - 1
src/views/reportData/salesAmountReport/list.vue

@@ -35,7 +35,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="所在区域">
-                <subarea id="salesAmountReportList-allocateTypeSn" v-model="queryParam.dealer.subareaSn"></subarea>
+                <subarea id="salesAmountReportList-allocateTypeSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
@@ -131,6 +131,7 @@ export default {
           'citySn': undefined,
           'districtSn': undefined,
           'subareaSn': undefined,
+          'subareaAreaSn': undefined, // 分区
           'dealerLevel': undefined
         }
       },
@@ -222,6 +223,10 @@ export default {
     custChange (val) {
       this.queryParam.dealer.dealerSn = val.key
     },
+    subareaChange(val){
+      this.queryParam.dealer.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.dealer.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.time = [
@@ -237,9 +242,11 @@ export default {
         'citySn': undefined,
         'districtSn': undefined,
         'subareaSn': undefined,
+        'subareaAreaSn': undefined, // 分区
         'dealerLevel': undefined
       }
       this.totalData = null
+      this.$refs.subarea.clearData()
       if (this.advanced) {
         this.$refs.areaList.clearData()
       }

+ 8 - 1
src/views/reportData/salesDetails/list.vue

@@ -66,7 +66,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
-                  <subarea id="salesDetailsList-subareaSn" v-model="queryParam.subareaSn"></subarea>
+                  <subarea id="salesDetailsList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -171,6 +171,7 @@ export default {
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         dealerProvinceSn: undefined,
         dealerCitySn: undefined,
         dealerCountySn: undefined
@@ -291,6 +292,10 @@ export default {
     custChange (val) {
       this.queryParam.dealerSn = val.key
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.time = [
@@ -311,10 +316,12 @@ export default {
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
       if(this.advanced){
+        this.$refs.subarea.clearData()
         this.$refs.areaList.clearData()
       }
       this.productType = []

+ 10 - 1
src/views/reportData/salesOrderTotal/list.vue

@@ -55,7 +55,7 @@
               </a-col>
               <a-col :md="5" :sm="24">
                 <a-form-model-item label="所在区域">
-                  <subarea id="salesOrderTotalList-subareaSn" v-model="queryParam.subareaSn"></subarea>
+                  <subarea id="salesOrderTotalList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="5" :sm="24">
@@ -155,6 +155,7 @@ export default {
         dealerLevel: undefined,
         operatorSn: undefined,
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         dealerProvinceSn: undefined
       },
       rules: {
@@ -282,6 +283,10 @@ export default {
     custChange (val) {
       this.queryParam.dealerSn = val.key
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.time = [
@@ -296,8 +301,12 @@ export default {
       this.queryParam.dealerLevel = undefined
       this.queryParam.operatorSn = undefined
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.dealerProvinceSn = undefined
       this.totalData = null
+      if(this.advanced){
+        this.$refs.subarea.clearData()
+      }
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()
     },

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

@@ -41,7 +41,7 @@
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
-                  <subarea id="salesPresentationList-subareaSn" v-model="queryParam.dealer.subareaSn"></subarea>
+                  <subarea id="salesPresentationList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -131,6 +131,7 @@ export default {
           'citySn': undefined,
           'districtSn': undefined,
           'subareaSn': undefined,
+          'subareaAreaSn': undefined,
           'dealerLevel': undefined
         }
       },
@@ -220,6 +221,10 @@ export default {
     custChange (val) {
       this.queryParam.dealer.dealerSn = val.key
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.time = []
@@ -233,10 +238,12 @@ export default {
         'citySn': undefined,
         'districtSn': undefined,
         'subareaSn': undefined,
+        'subareaAreaSn': undefined,
         'dealerLevel': undefined
       }
       this.totalData = null
       if (this.advanced) {
+        this.$refs.subarea.clearData()
         this.$refs.areaList.clearData()
       }
       this.$refs.custList.resetForm()

+ 8 - 1
src/views/reportData/salesReturnDetailReport/list.vue

@@ -66,7 +66,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
-                  <subarea id="salesReturnDetailList-subareaSn" v-model="queryParam.subareaSn"></subarea>
+                  <subarea id="salesReturnDetailList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -173,6 +173,7 @@ export default {
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         dealerProvinceSn: undefined,
         dealerCitySn: undefined,
         dealerCountySn: undefined
@@ -333,6 +334,10 @@ export default {
       this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
       this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.time = [
@@ -353,11 +358,13 @@ export default {
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
       this.productType = []
       if (this.advanced) {
+        this.$refs.subarea.clearData()
         this.$refs.areaList.clearData()
       }
       this.totalData = null

+ 8 - 1
src/views/reportData/salesReturnReport/list.vue

@@ -35,7 +35,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="所在区域">
-                <subarea id="salesReturnReportList-subareaSn" v-model="queryParam.subareaSn"></subarea>
+                <subarea id="salesReturnReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
@@ -151,6 +151,7 @@ export default {
         citySn: undefined,
         districtSn: undefined,
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         dealerLevel: undefined
       },
       rules: {
@@ -445,6 +446,10 @@ export default {
     custChange (val) {
       this.queryParam.dealerSn = val.key
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.time = [
@@ -459,8 +464,10 @@ export default {
       this.queryParam.citySn = undefined
       this.queryParam.districtSn = undefined
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.dealerLevel = undefined
       this.totalData = null
+      this.$refs.subarea.clearData()
       if (this.advanced) {
         this.$refs.areaList.clearData()
       }

+ 8 - 1
src/views/reportData/salesReturnsReport/list.vue

@@ -24,7 +24,7 @@
             </a-col>
             <a-col :md="4" :sm="24">
               <a-form-model-item label="所在区域">
-                <subarea id="salesReturnsReportList-subareaSn" v-model="queryParam.subareaSn"></subarea>
+                <subarea id="salesReturnsReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
@@ -135,6 +135,7 @@ export default {
         endDate: getDate.getCurrMonthDays().endtime,
         salesReturnBillNo: '',
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         dealerSn: '',
         dealerLevel: undefined,
         dealerProvinceSn: undefined,
@@ -271,6 +272,10 @@ export default {
     custChange (val) {
       this.queryParam.dealerSn = val.key
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.time = [
@@ -282,11 +287,13 @@ export default {
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.salesReturnBillNo = ''
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.dealerSn = undefined
       this.queryParam.dealerLevel = undefined
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
+      this.$refs.subarea.clearData()
       if (this.advanced) {
         this.$refs.custList.resetForm()
         this.$refs.areaList.clearData()

+ 8 - 1
src/views/reportData/salesSlipReport/list.vue

@@ -41,7 +41,7 @@
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
-                  <subarea id="salesSlipReportList-allocateTypeSn" v-model="queryParam.dealer.subareaSn"></subarea>
+                  <subarea id="salesSlipReportList-allocateTypeSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -137,6 +137,7 @@ export default {
           'citySn': undefined,
           'districtSn': undefined,
           'subareaSn': undefined,
+          'subareaAreaSn': undefined,
           'dealerLevel': undefined
         }
       },
@@ -228,6 +229,10 @@ export default {
     custChange (val) {
       this.queryParam.dealer.dealerSn = val.key
     },
+    subareaChange(val){
+      this.queryParam.dealer.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.dealer.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.time = [
@@ -244,10 +249,12 @@ export default {
         'citySn': undefined,
         'districtSn': undefined,
         'subareaSn': undefined,
+        'subareaAreaSn': undefined,
         'dealerLevel': undefined
       }
       this.totalData = null
       if (this.advanced) {
+        this.$refs.subarea.clearData()
         this.$refs.areaList.clearData()
       }
       this.$refs.custList.resetForm()

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

@@ -44,7 +44,7 @@
             </a-col>
             <a-col :md="4" :sm="24">
               <a-form-model-item label="所在区域">
-                <subarea id="allocateReturnDetailReport-subareaSn" v-model="queryParam.subareaSn"></subarea>
+                <subarea id="allocateReturnDetailReport-subareaSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
             <a-col :md="4" :sm="24">
@@ -179,6 +179,7 @@ export default {
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         provinceSn: undefined
       },
       productType: [],
@@ -303,6 +304,10 @@ export default {
     custChange (val) {
       this.queryParam.dealerSn = val.key
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.time = [
@@ -327,8 +332,10 @@ export default {
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.provinceSn = undefined
       this.productType = []
+      this.$refs.subarea.clearData()
       this.totalData = null
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()

+ 11 - 2
src/views/reportData/transferReturnReport/list.vue

@@ -45,7 +45,7 @@
               </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-model-item label="所在区域">
-                  <subarea id="transferReturnReportList-subareaSn" v-model="queryParam.subareaSn"></subarea>
+                  <subarea id="transferReturnReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
             </template>
@@ -139,7 +139,8 @@ export default {
         allocateSortSn: undefined,
         allocateReturnTypeSn: undefined,
         targetType: undefined,
-        subareaSn: undefined
+        subareaSn: undefined,
+        subareaAreaSn: undefined,
       },
       rules: {
         'time': [{ required: true, message: '请选择退货完成日期', trigger: 'change' }]
@@ -257,6 +258,10 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.queryParam.time = [
@@ -273,7 +278,11 @@ export default {
       this.queryParam.allocateReturnTypeSn = undefined
       this.queryParam.targetType = undefined
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.totalData = null
+      if(this.advanced){
+        this.$refs.subarea.clearData()
+      }
       this.allocateTypeVal = []
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()

+ 10 - 1
src/views/salesManagement/examineVerify/list.vue

@@ -55,7 +55,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
-                  <subarea id="examineVerifyList-subarea" v-model="queryParam.subareaSn"></subarea>
+                  <subarea id="examineVerifyList-subarea" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -190,6 +190,7 @@ export default {
         printStatus: undefined, //  打印状态
         billStatus: undefined, //  业务状态
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         shippingAddrProvinceSn: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
@@ -261,6 +262,10 @@ export default {
       this.queryParam.beginDate = date[0]
       this.queryParam.endDate = date[1]
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.$refs.rangeDate.resetDate(this.time)
@@ -274,7 +279,11 @@ export default {
       this.queryParam.billStatus = undefined
       this.queryParam.printStatus = undefined
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
+      if(this.advanced){
+        this.$refs.subarea.clearData()
+      }
       this.$refs.table.refresh(true)
     },
     //  审核

+ 10 - 1
src/views/salesManagement/matchSendOutOrder/list.vue

@@ -72,7 +72,7 @@
                 </a-col>
                 <a-col :md="4" :sm="24">
                   <a-form-model-item label="所在区域">
-                    <subarea id="matchSoo-subarea" v-model="queryParam.subareaSn"></subarea>
+                    <subarea id="matchSoo-subarea" ref="subarea" @change="subareaChange"></subarea>
                   </a-form-model-item>
                 </a-col>
                 <a-col :md="4" :sm="24">
@@ -184,6 +184,7 @@ export default {
         dispatchBillNo: '', //  备货单号
         billStatus: undefined, //  业务状态
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         voidFlag: undefined,
         shippingAddrProvinceSn: undefined,
         checkStatus: undefined
@@ -282,6 +283,10 @@ export default {
         }
       })
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     // 重置
     resetSearchForm () {
       this.time = []
@@ -301,10 +306,14 @@ export default {
         dispatchBillNo: '', //  备货单号
         billStatus: undefined, //  业务状态
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         voidFlag: undefined,
         shippingAddrProvinceSn: undefined,
         checkStatus: undefined
       }
+      if(this.advanced){
+        this.$refs.subarea.clearData()
+      }
       this.$refs.table.refresh(true)
     },
     pageInit () {

+ 10 - 1
src/views/salesManagement/outboundOrder/list.vue

@@ -61,7 +61,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
-                  <subarea id="outboundOrderList-subarea" v-model="queryParam.subareaSn"></subarea>
+                  <subarea id="outboundOrderList-subarea" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -204,6 +204,7 @@ export default {
         outBizNo: '',
         state: undefined, //  状态
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         shippingAddrProvinceSn: undefined,
         sendFlag: undefined
       },
@@ -280,6 +281,10 @@ export default {
       this.$refs.table.clearSelected() // 清空表格选中项
       this.$refs.table.refresh(true)
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.$refs.rangeDate.resetDate(this.time)
@@ -291,8 +296,12 @@ export default {
       this.queryParam.stockOutNo = ''
       this.queryParam.outBizNo = ''
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
       this.queryParam.sendFlag = undefined
+      if(this.advanced){
+        this.$refs.subarea.clearData()
+      }
       this.$refs.table.refresh(true)
     },
     //  详情

+ 10 - 1
src/views/salesManagement/pushOrderManagement/list.vue

@@ -77,7 +77,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
-                  <subarea id="pushOrder-subarea" v-model="queryParam.subareaSn"></subarea>
+                  <subarea id="pushOrder-subarea" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -223,6 +223,7 @@ export default {
         dispatchBillNo: '', //  备货单号
         billStatus: undefined, //  业务状态
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         voidFlag: undefined,
         shippingAddrProvinceSn: undefined,
         printStatus: undefined,
@@ -340,6 +341,10 @@ export default {
         }
       })
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     // 重置
     resetSearchForm () {
       this.$refs.rangeDate.resetDate(this.time)
@@ -354,9 +359,13 @@ export default {
       this.queryParam.billStatus = undefined
       this.queryParam.voidFlag = undefined
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
       this.queryParam.printStatus = undefined
       this.queryParam.checkStatus = undefined
+      if(this.advanced){
+        this.$refs.subarea.clearData()
+      }
       this.$refs.table.refresh(true)
     },
     pageInit () {

+ 10 - 1
src/views/salesManagement/salesCollection/list.vue

@@ -104,7 +104,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="所在区域">
-                  <subarea id="salesCollectionList-subarea" v-model="queryParam.subareaSn"></subarea>
+                  <subarea id="salesCollectionList-subarea" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -246,6 +246,7 @@ export default {
         settleStyle: undefined,
         keepType: undefined,
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         billStatus: undefined,
         settleState: undefined,
         voidFlag: undefined,
@@ -348,6 +349,10 @@ export default {
       this.$refs.table.refresh(true)
       this.$refs.table.clearSelected()
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.auditDate = []
@@ -370,6 +375,7 @@ export default {
       this.queryParam.settleStyle = undefined
       this.queryParam.keepType = undefined
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.billStatus = undefined
       this.queryParam.settleState = undefined
       this.queryParam.voidFlag = undefined
@@ -377,6 +383,9 @@ export default {
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
       this.queryParam.checkStatus = undefined
+      if(this.advanced){
+        this.$refs.subarea.clearData()
+      }
       this.$refs.table.refresh(true)
       this.$refs.table.clearSelected()
     },

+ 3 - 2
src/views/salesManagement/salesQuery/list.vue

@@ -294,6 +294,7 @@ export default {
         financialStatus: undefined, //  财务状态
         salesBillSource: undefined,
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         shippingAddrProvinceSn: undefined
       },
       totalData: {
@@ -411,8 +412,8 @@ export default {
       this.queryParam.buyerSn = val.key
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : ''
-      this.queryParam.subareaAreaSn = val[1] ? val[1] : ''
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
     },
     // 新增
     handleAdd () {

+ 10 - 1
src/views/salesManagement/sendOutOrder/list.vue

@@ -55,7 +55,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
-                  <subarea id="sendOut-subarea" v-model="queryParam.subareaSn"></subarea>
+                  <subarea id="sendOut-subarea" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -179,6 +179,7 @@ export default {
         transportState: undefined, //  物流状态
         receiveFlag: undefined, // 收货状态
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         provinceSn: undefined
       },
       totalData: {
@@ -269,6 +270,10 @@ export default {
         _this.spinning = false
       })
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     // 重置
     resetSearchForm () {
       this.time = []
@@ -285,7 +290,11 @@ export default {
       this.queryParam.transportState = undefined
       this.queryParam.receiveFlag = undefined
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.provinceSn = undefined
+      if(this.advanced){
+        this.$refs.subarea.clearData()
+      }
       this.$refs.table.refresh(true)
     },
     pageInit () {

+ 8 - 1
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -28,7 +28,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="区域">
-                  <subarea id="shortageStatisticsCList-subarea" v-model="queryParam.subareaSn"></subarea>
+                  <subarea id="shortageStatisticsCList-subarea" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -153,6 +153,7 @@ export default {
         endDate: getDate.getCurrMonthDays().endtime,
         buyerSn: undefined,
         subareaSn: undefined, //  区域
+        subareaAreaSn: undefined,
         productName: '',
         productCode: '',
         productTypeSn1: '', //  产品一级分类
@@ -261,6 +262,10 @@ export default {
         }
       })
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.$refs.rangeDate.resetDate(this.time)
@@ -269,8 +274,10 @@ export default {
       this.queryParam.buyerSn = undefined
       if (this.advanced) {
         this.$refs.custList.resetForm()
+        this.$refs.subarea.clearData()
       }
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.productName = ''
       this.queryParam.productCode = ''
       this.queryParam.productTypeSn1 = ''

+ 10 - 1
src/views/salesManagement/stockPrint/list.vue

@@ -75,7 +75,7 @@
                 </a-col>
                 <a-col :md="3" :sm="24">
                   <a-form-model-item label="所在区域">
-                    <subarea id="stockPrint-subarea" v-model="queryParam.subareaSn"></subarea>
+                    <subarea id="stockPrint-subarea" ref="subarea" @change="subareaChange"></subarea>
                   </a-form-model-item>
                 </a-col>
                 <a-col :md="3" :sm="24">
@@ -228,6 +228,7 @@ export default {
         dispatchBillNo: '', //  备货单号
         billStatus: undefined, //  业务状态
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         shippingAddrProvinceSn: undefined,
         voidFlag: 0,
         printStatus: 'NO_PRINT'
@@ -384,6 +385,10 @@ export default {
       this.tipData = row
       this.showInfoModal = true
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     // 重置
     resetSearchForm () {
       this.time = []
@@ -398,9 +403,13 @@ export default {
       this.queryParam.dispatchBillNo = ''
       this.queryParam.billStatus = undefined
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
       this.queryParam.voidFlag = this.currentTab == 1 ? '' : '0'
       this.queryParam.printStatus = this.currentTab == 1 ? '' : 'NO_PRINT'
+      if (this.advanced) {
+        this.$refs.subarea.clearData()
+      }
       this.$refs.table.refresh(true)
     },
     pageInit () {

+ 10 - 1
src/views/salesReturnManagement/salesReturn/list.vue

@@ -66,7 +66,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
-                  <subarea id="salesReturn-subarea" v-model="queryParam.subareaSn"></subarea>
+                  <subarea id="salesReturn-subarea" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -248,6 +248,7 @@ export default {
         syncFlag: undefined, // 是否同步给客户
         billStatus: undefined, // 业务状态
         subareaSn: undefined,
+        subareaAreaSn: undefined,
         shippingAddrProvinceSn: undefined,
         salesReturnBillSource: undefined
       },
@@ -388,6 +389,10 @@ export default {
         this.spinning = false
       })
     },
+    subareaChange(val){
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
     resetSearchForm () {
       this.$refs.rangeCreateDate.resetDate(this.createDate)
       this.queryParam.beginDate = getDate.getThreeMonthDays().starttime
@@ -403,9 +408,13 @@ export default {
       this.queryParam.purchaseReturnApplyNo = ''
       this.queryParam.billStatus = undefined
       this.queryParam.subareaSn = undefined
+      this.queryParam.subareaAreaSn = undefined
       this.queryParam.syncFlag = undefined
       this.queryParam.salesReturnBillSource = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
+      if (this.advanced) {
+        this.$refs.subarea.clearData()
+      }
       this.$refs.table.refresh(true)
     },
     pageInit () {

+ 2 - 2
vue.config.js

@@ -107,9 +107,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.0.216:80/ocs-admin',
+        // target: 'http://192.168.0.216:80/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        // target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
+        target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {