Browse Source

修改bug 11:43

chenrui 2 years ago
parent
commit
ae62cb1019
40 changed files with 472 additions and 379 deletions
  1. 10 6
      src/views/allocationManagement/transfersPrint/list.vue
  2. 10 6
      src/views/common/chooseDealer.vue
  3. 0 4
      src/views/dealerManagement/businessOwnerSettings/list.vue
  4. 154 150
      src/views/dealerManagement/businessOwnerSettings/settingsIndex.vue
  5. 8 6
      src/views/dealerManagement/dealerZoneSearch/list.vue
  6. 10 6
      src/views/dealerManagement/merchantInfoManagement/list.vue
  7. 10 6
      src/views/expenseManagement/expenseReimbursementDetail/list.vue
  8. 8 6
      src/views/financialManagement/collectionDetailStatic/list.vue
  9. 10 6
      src/views/reportData/actualSalesReport/list.vue
  10. 10 6
      src/views/reportData/allCountryCostReport/list.vue
  11. 8 6
      src/views/reportData/allocationDetails/list.vue
  12. 10 6
      src/views/reportData/allocationPresentation/list.vue
  13. 8 6
      src/views/reportData/billingBackReport/list.vue
  14. 8 6
      src/views/reportData/billingOrderReport/list.vue
  15. 8 6
      src/views/reportData/billingReturnReport/list.vue
  16. 8 6
      src/views/reportData/hPriceDifferenceDetailReport/list.vue
  17. 8 6
      src/views/reportData/regionTypeSalesReport/list.vue
  18. 10 6
      src/views/reportData/returnGoodsPresentation/list.vue
  19. 8 6
      src/views/reportData/returnSlipReport/list.vue
  20. 8 9
      src/views/reportData/salesAmountReport/list.vue
  21. 8 6
      src/views/reportData/salesDetails/list.vue
  22. 8 6
      src/views/reportData/salesOrderTotal/list.vue
  23. 10 6
      src/views/reportData/salesPresentation/list.vue
  24. 8 6
      src/views/reportData/salesReturnDetailReport/list.vue
  25. 8 6
      src/views/reportData/salesReturnReport/list.vue
  26. 8 6
      src/views/reportData/salesReturnsReport/list.vue
  27. 8 4
      src/views/reportData/salesSlipReport/list.vue
  28. 8 6
      src/views/reportData/transferReturnDetailReport/list.vue
  29. 8 6
      src/views/reportData/transferReturnReport/list.vue
  30. 8 6
      src/views/salesManagement/examineVerify/list.vue
  31. 10 6
      src/views/salesManagement/matchSendOutOrder/list.vue
  32. 8 6
      src/views/salesManagement/outboundOrder/list.vue
  33. 8 6
      src/views/salesManagement/pushOrderManagement/list.vue
  34. 8 6
      src/views/salesManagement/salesCollection/list.vue
  35. 8 6
      src/views/salesManagement/salesQuery/list.vue
  36. 8 6
      src/views/salesManagement/sendOutOrder/list.vue
  37. 8 6
      src/views/salesManagement/shortageStatisticsC/list.vue
  38. 8 6
      src/views/salesManagement/stockPrint/list.vue
  39. 8 6
      src/views/salesReturnManagement/salesReturn/list.vue
  40. 2 2
      vue.config.js

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

@@ -194,8 +194,10 @@ export default {
         receiverSn: undefined,
         checkStatus: undefined,
         printState: 'NO_PRINT',
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         shippingAddrProvinceSn: undefined
       },
       currentTab: 2,
@@ -268,8 +270,10 @@ export default {
       this.queryParam.endDate = date[1]
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+      this.queryParam.subareaArea={
+        subareaSn: val[0] ? val[0] : undefined,
+        subareaAreaSn: val[1] ? val[1] : undefined
+      }
     },
     //  重置
     resetSearchForm () {
@@ -281,8 +285,8 @@ export default {
       this.queryParam.allocateNo = ''
       this.queryParam.receiverName = ''
       this.queryParam.receiverSn = undefined
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
       this.$refs.receiverSn.resetForm()
       if(this.advanced){

+ 10 - 6
src/views/common/chooseDealer.vue

@@ -122,8 +122,10 @@ export default {
         provinceSn: undefined,
         citySn: undefined,
         districtSn: undefined,
-        subareaSn: undefined,
-        subareaAreaSn: undefined
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
       },
       chooseInfo: [],
       tableHeight: 0,
@@ -195,8 +197,8 @@ export default {
       this.spinning = false
     },
     subareaChange (val) {
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -208,8 +210,10 @@ export default {
         provinceSn: undefined,
         citySn: undefined,
         districtSn: undefined,
-        subareaSn: undefined,
-        subareaAreaSn: undefined
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        }
       }
       this.$refs.subarea.clearData()
       this.$refs.table.refresh(true)

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

@@ -120,10 +120,6 @@ 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 = {

+ 154 - 150
src/views/dealerManagement/businessOwnerSettings/settingsIndex.vue

@@ -1,57 +1,57 @@
-<template>
-  <div class="categorySet-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <div ref="headerBar">
-        <a-page-header :ghost="false" :backIcon="false" class="header-bar">
-          <!-- 自定义的二级文字标题 -->
-          <template slot="subTitle">
-            <span class="subTitle-word text-overflow" style="max-width:300px;">用户姓名:{{ decodeURI($route.query.name) }}</span>
-            <a-button id="purchaseNewOrderEdit-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
-          </template>
-        </a-page-header>
-      </div>
-      <a-card size="small" :bordered="false" class="categorySet-cont">
-        <div :style="{ height: tableHeight+84.5+'px' }">
-          <a-tabs default-active-key="1" @change="handleTabs">
-            <a-tab-pane key="1" tab="设置管辖区域">
-              <div class="areaSet-wrap">
-                <div class="table-page-search-wrapper newTableSearchName" >
-                  <div class="areaSet-btnGroup" style="margin-bottom:20px;">
-                    <a-button type="primary" class="button-error" @click="openAreaModal" ghost>选择区域</a-button>
-                    <a-button type="primary" class="button-error" @click="openDealerModal" ghost>选择经销商</a-button>
-                  </div>
-                  <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-                    <a-row :gutter="15">
-                      <a-col :md="6" :sm="24">
-                        <a-form-model-item label="所在区域/分区">
-                          <subarea id="chooseDealer-subarea" ref="subarea" @change="subareaChange"></subarea>
-                        </a-form-model-item>
-                      </a-col>
-                      <a-col :md="6" :sm="24">
-                        <a-form-item label="经销商名称">
-                          <a-input id="areaSet-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入经销商名称"/>
-                        </a-form-item>
-                      </a-col>
-                      <a-col :md="6" :sm="24">
-                        <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="areaSet-refresh">查询</a-button>
-                        <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="areaSet-reset">重置</a-button>
-                      </a-col>
-                    </a-row>
-                  </a-form>
-                </div>
-                <a-spin :spinning="spinning" tip="Loading...">
+<template>
+  <div class="categorySet-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <div ref="headerBar">
+        <a-page-header :ghost="false" :backIcon="false" class="header-bar">
+          <!-- 自定义的二级文字标题 -->
+          <template slot="subTitle">
+            <span class="subTitle-word text-overflow" style="max-width:300px;">用户姓名:{{ decodeURI($route.query.name) }}</span>
+            <a-button id="purchaseNewOrderEdit-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
+          </template>
+        </a-page-header>
+      </div>
+      <a-card size="small" :bordered="false" class="categorySet-cont">
+        <div :style="{ height: tableHeight+84.5+'px' }">
+          <a-tabs default-active-key="1" @change="handleTabs">
+            <a-tab-pane key="1" tab="设置管辖区域">
+              <div class="areaSet-wrap">
+                <div class="table-page-search-wrapper newTableSearchName" >
+                  <div class="areaSet-btnGroup" style="margin-bottom:20px;">
+                    <a-button type="primary" class="button-error" @click="openAreaModal" ghost>选择区域</a-button>
+                    <a-button type="primary" class="button-error" @click="openDealerModal" ghost>选择经销商</a-button>
+                  </div>
+                  <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+                    <a-row :gutter="15">
+                      <a-col :md="6" :sm="24">
+                        <a-form-model-item label="所在区域/分区">
+                          <subarea id="chooseDealer-subarea" ref="subarea" @change="subareaChange"></subarea>
+                        </a-form-model-item>
+                      </a-col>
+                      <a-col :md="6" :sm="24">
+                        <a-form-item label="经销商名称">
+                          <a-input id="areaSet-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入经销商名称"/>
+                        </a-form-item>
+                      </a-col>
+                      <a-col :md="6" :sm="24">
+                        <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="areaSet-refresh">查询</a-button>
+                        <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="areaSet-reset">重置</a-button>
+                      </a-col>
+                    </a-row>
+                  </a-form>
+                </div>
+                <a-spin :spinning="spinning" tip="Loading...">
                   <!-- 列表 -->
-                  <!-- :showPagination="false" -->
-                  <s-table
-                    class="sTable fixPagination"
-                    ref="table"
-                    size="small"
-                    :rowKey="(record) => record.id"
-                    :columns="columns"
-                    :data="loadData"
+                  <!-- :showPagination="false" -->
+                  <s-table
+                    class="sTable fixPagination"
+                    ref="table"
+                    size="small"
+                    :rowKey="(record) => record.id"
+                    :columns="columns"
+                    :data="loadData"
                     :defaultLoadData="false"
                     :style="{ height: tableHeight-100+'px' }"
-                    :scroll="{ y: tableHeight-180 }"
+                    :scroll="{ y: tableHeight-180 }"
                     bordered>
                     <!-- 操作 -->
                     <template slot="action" slot-scope="text, record">
@@ -63,20 +63,20 @@
                       >
                         删除
                       </a-button>
-                    </template>
-                  </s-table>
-                </a-spin>
-              </div>
-            </a-tab-pane>
-            <a-tab-pane key="2" tab="设置管辖品类" force-render>
-              <categorySet ref="setCategory"></categorySet>
-            </a-tab-pane>
-          </a-tabs>
-        </div>
-      </a-card>
-      <!-- 选择区域 -->
-      <chooseAreaModal
-        ref="partQuery"
+                    </template>
+                  </s-table>
+                </a-spin>
+              </div>
+            </a-tab-pane>
+            <a-tab-pane key="2" tab="设置管辖品类" force-render>
+              <categorySet ref="setCategory"></categorySet>
+            </a-tab-pane>
+          </a-tabs>
+        </div>
+      </a-card>
+      <!-- 选择区域 -->
+      <chooseAreaModal
+        ref="partQuery"
         :showModal="openChooseArea"
         :chooseData="newChooseData"
         @ok="handleArea"
@@ -92,7 +92,7 @@
         :wrap-style="{ position: 'absolute' }"
         @close="openChooseDealer = false">
         <div class="dealerModalCon">
-          <chooseDealer ref="dealerChoose" :chooseInfo="chooseInfo" @plAdd="handleAddDealer"></chooseDealer>
+          <chooseDealer ref="dealerChoose" @plAdd="handleAddDealer"></chooseDealer>
         </div>
       </a-drawer>
     </a-spin>
@@ -110,17 +110,20 @@ import subarea from '@/views/common/subarea.js'
 export default {
   name: 'SettingsIndex',
   mixins: [commonMixin],
-  components: { STable, categorySet, chooseAreaModal, chooseDealer, subarea },
-  data () {
-    return {
-      openChooseArea: false, // 选择区域弹窗
-      openChooseDealer: false, // 选择经销商弹窗
-      spinning: false,
-      tableHeight: 0,
-      queryParam: {
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
-        dealerName: ''
+  components: { STable, categorySet, chooseAreaModal, chooseDealer, subarea },
+  data () {
+    return {
+      openChooseArea: false,
+      openChooseDealer: false,
+      spinning: false,
+      tableHeight: 0,
+      queryParam: {
+        hasDetail: 0,
+        subareaArea: {
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
+        dealerName: ''
       },
       newChooseData: {// 区域分区回显
         checked: [],
@@ -135,14 +138,14 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ],
       disabled: false, //  查询、重置按钮是否可操作
-      chooseInfo: [], // 回显选中经销商信息
-      loadData: parameter => {
-        this.disabled = true
+      chooseInfo: [], // 回显选中经销商信息
+      loadData: parameter => {
+        this.disabled = true
         this.spinning = true
-        this.queryParam.userSn = this.$route.query.sn
-        return bizuserScopeQueryPage(Object.assign(parameter, this.queryParam)).then(res => {
-          let data
-          if (res.status == 200) {
+        this.queryParam.userSn = this.$route.query.sn
+        return bizuserScopeQueryPage(Object.assign(parameter, this.queryParam)).then(res => {
+          let data
+          if (res.status == 200) {
             data = res.data
             const no = (data.pageNo - 1) * data.pageSize
             this.total = data.count || 0
@@ -150,13 +153,13 @@ export default {
               data.list[i].no = no + i + 1
             }
           }
-          this.disabled = false
-          this.spinning = false
-          return data
-        })
-      }
-    }
-  },
+          this.disabled = false
+          this.spinning = false
+          return data
+        })
+      }
+    }
+  },
   methods: {
     // 选择区域>分区
     handleArea (con) {
@@ -193,22 +196,23 @@ export default {
         this.$refs.setCategory.pageInit()
       }
     },
-    // 所在区域分区查询
+    // 所在区域分区查询
     subareaChange (val) {
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
-      this.queryParam = {
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
-        dealerName: ''
+    resetSearchForm () {
+      this.queryParam = {
+        subareaArea: {
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
+        dealerName: ''
       }
       this.$refs.subarea.clearData()
       this.$refs.table.refresh(true)
     },
-    // 选择区域
+    // 选择区域
     async openAreaModal (params = {}) {
       this.$refs.partQuery.pageInit()
       const _this = this
@@ -254,10 +258,10 @@ export default {
     },
     // 经销商
     handleAddDealer (list) {
      const newData = []
      list.forEach(con => {
        const obj = {}
-        obj.userSn = this.$route.query.sn
        obj.bizType = 'dealer'
        obj.bizSn = con
        newData.push(obj)
      })
      this.saveChooseData(newData)
    },
-    //  删除
-    handleDel (row) {
-      const _this = this
+        obj.userSn = this.$route.query.sn
        obj.bizType = 'dealer'
        obj.bizSn = con
        newData.push(obj)
      })
      this.saveChooseData(newData)
    },
+    //  删除
+    handleDel (row) {
+      const _this = this
       this.$confirm({
         title: '提示',
         content: '删除后不可恢复,确定要进行删除吗?',
@@ -274,49 +278,49 @@ export default {
     //  返回
     handleBack () {
       this.$router.push({ name: 'businessOwnerSettings' })
-    },
-    pageInit () {
-      const _this = this
-      this.$nextTick(() => { // 页面渲染完成后的回调
-        _this.setTableH()
+    },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
       })
-      this.resetSearchForm()
-    },
-    setTableH () {
-      const headHeight = this.$refs.headerBar.offsetHeight
-      this.tableHeight = window.innerHeight - headHeight - 230
-    }
-  },
-  watch: {
-    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
-      this.setTableH()
-    }
-  },
-  mounted () {
-    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
-      this.pageInit()
-    }
-  },
-  activated () {
-    // 如果是新页签打开,则重置当前页面
-    if (this.$store.state.app.isNewTab) {
-      this.pageInit()
-    }
-    // 仅刷新列表,不重置页面
-    if (this.$store.state.app.updateList) {
-      this.pageInit()
-    }
-  },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {})
-  }
-}
-</script>
-
-<style lang="less" scoped>
-  .categorySet-wrap{
-    .table-operator{
-    text-align:right;
-    }
-  }
-</style>
+      this.resetSearchForm()
+    },
+    setTableH () {
+      const headHeight = this.$refs.headerBar.offsetHeight
+      this.tableHeight = window.innerHeight - headHeight - 230
+    }
+  },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+    }
+  },
+  activated () {
+    // 如果是新页签打开,则重置当前页面
+    if (this.$store.state.app.isNewTab) {
+      this.pageInit()
+    }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {})
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .categorySet-wrap{
+    .table-operator{
+    text-align:right;
+    }
+  }
+</style>

+ 8 - 6
src/views/dealerManagement/dealerZoneSearch/list.vue

@@ -73,8 +73,10 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       tableHeight: 0,
       queryParam: {
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         dealerName: '',
         customerName: ''
       },
@@ -120,13 +122,13 @@ export default {
       })
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.dealerName = ''
       this.queryParam.customerName = ''
       this.$refs.subarea.clearData()

+ 10 - 6
src/views/dealerManagement/merchantInfoManagement/list.vue

@@ -120,8 +120,10 @@ export default {
       queryParam: { //  查询条件
         nameLike: '', //  商户名称、别名
         dealerType: undefined, //  商户类型
-        subareaSn: undefined, //  区域
-        subareaAreaSn: undefined, // 分区
+        subareaArea:{
+          subareaSn: undefined, //  区域
+          subareaAreaSn: undefined, // 分区
+        },
         auditState: undefined, // 审核状态
         cooperateFlag: undefined //  合作状态
       },
@@ -175,16 +177,18 @@ export default {
   },
   methods: {
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
       this.queryParam = {
         nameLike: '', //  商户名称、别名
         dealerType: undefined, //  商户类型
-        subareaSn: undefined, //  区域
-        subareaAreaSn: undefined, // 分区
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         auditState: undefined, // 审核状态
         cooperateFlag: undefined //  合作状态
       }

+ 10 - 6
src/views/expenseManagement/expenseReimbursementDetail/list.vue

@@ -228,8 +228,10 @@ export default {
         splitObjType: undefined, // 费用承担方类型
         splitObjSn: undefined, //  费用承担方
         childSplitObjSn: undefined, // 费用承担人
-        subareaSn: undefined, //  区域
-        subareaAreaSn: undefined, // 分区
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         provinceName: '',
         cityName: '',
         provinceSn: undefined,
@@ -348,8 +350,8 @@ export default {
       })
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -370,8 +372,10 @@ export default {
         splitObjType: undefined, // 费用承担方类型
         splitObjSn: undefined, //  费用承担方
         childSplitObjSn: undefined, // 费用承担人
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         provinceName: '',
         cityName: '',
         provinceSn: undefined,

+ 8 - 6
src/views/financialManagement/collectionDetailStatic/list.vue

@@ -238,8 +238,10 @@ export default {
         fullPaymentFlag: undefined,
         bankAccount: undefined,
         bankName: undefined,
-        subareaSn: undefined,
-        subareaAreaSn: undefined, // 分区
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         provinceSn: undefined,
         printStatus: undefined,
         invoiceStatus: undefined,
@@ -453,8 +455,8 @@ export default {
       this.$refs.table.clearSelected()
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -489,8 +491,8 @@ export default {
       this.queryParam.fullPaymentFlag = undefined
       this.queryParam.bankName = undefined
       this.queryParam.bankAccount = undefined
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.provinceSn = undefined
       this.queryParam.invoiceDateType = undefined
       this.queryParam.invoiceDate = ''

+ 10 - 6
src/views/reportData/actualSalesReport/list.vue

@@ -129,8 +129,10 @@ export default {
           provinceSn: undefined,
           citySn: undefined,
           districtSn: undefined,
-          subareaSn: undefined,
-          subareaAreaSn: undefined, // 分区
+          subareaArea:{
+            subareaSn: undefined,
+            subareaAreaSn: undefined
+          },
           dealerLevel: undefined
         }
       },
@@ -223,8 +225,8 @@ export default {
       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
+      this.queryParam.dealer.subareaArea.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.dealer.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     //  重置
     resetSearchForm () {
@@ -240,8 +242,10 @@ export default {
         provinceSn: undefined,
         citySn: undefined,
         districtSn: undefined,
-        subareaSn: undefined,
-        subareaAreaSn: undefined, // 分区
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         dealerLevel: undefined
       }
       this.totalData = null

+ 10 - 6
src/views/reportData/allCountryCostReport/list.vue

@@ -119,8 +119,10 @@ export default {
           provinceSn: undefined,
           citySn: undefined,
           districtSn: undefined,
-          subareaSn: undefined,
-          subareaAreaSn: undefined, // 分区
+          subareaArea:{
+            subareaSn: undefined,
+            subareaAreaSn: undefined
+          },
           dealerLevel: undefined
         }
       },
@@ -448,8 +450,8 @@ export default {
       })
     },
     subareaChange(val){
-      this.queryParam.dealer.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.dealer.subareaAreaSn = val[1] ? val[1] : undefined
+      this.queryParam.dealer.subareaArea.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.dealer.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     //  重置
     resetSearchForm () {
@@ -462,8 +464,10 @@ export default {
         provinceSn: undefined,
         citySn: undefined,
         districtSn: undefined,
-        subareaSn: undefined,
-        subareaAreaSn: undefined, // 分区
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         dealerLevel: undefined
       }
       this.totalData = null

+ 8 - 6
src/views/reportData/allocationDetails/list.vue

@@ -184,8 +184,10 @@ export default {
         productTypeSn3: '', //  产品三级分类
         dealerName: '',
         dealerLevel: undefined,
-        subareaSn: undefined,
-        subareaAreaSn: undefined, // 分区
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         dealerProvinceSn: undefined
       },
       productType: [],
@@ -331,8 +333,8 @@ export default {
       })
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -357,8 +359,8 @@ export default {
       this.queryParam.productTypeSn3 = ''
       this.queryParam.dealerName = ''
       this.queryParam.dealerLevel = undefined
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.dealerProvinceSn = undefined
       this.productType = []
       this.allocateTypeVal = []

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

@@ -165,8 +165,10 @@ export default {
           provinceSn: undefined,
           citySn: undefined,
           districtSn: undefined,
-          subareaSn: undefined,
-          subareaAreaSn: undefined, // 分区
+          subareaArea:{
+            subareaSn: undefined,
+            subareaAreaSn: undefined
+          },
           dealerLevel: undefined
         }
       },
@@ -307,8 +309,8 @@ export default {
       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
+      this.queryParam.dealer.subareaArea.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.dealer.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     //  重置
     resetSearchForm () {
@@ -322,8 +324,10 @@ export default {
         provinceSn: undefined,
         citySn: undefined,
         districtSn: undefined,
-        subareaSn: undefined,
-        subareaAreaSn: undefined, // 分区
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         dealerLevel: undefined
       }
       this.totalData = null

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

@@ -101,8 +101,10 @@ export default {
         time: [],
         beginDate: '',
         endDate: '',
-        subareaSn: undefined,
-        subareaAreaSn: undefined, // 分区
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         supplier: {
           supplierSn: undefined,
           supplierName: undefined,
@@ -182,8 +184,8 @@ export default {
       })
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -197,8 +199,8 @@ export default {
       this.queryParam.supplier.provinceSn = undefined
       this.queryParam.supplier.citySn = undefined
       this.queryParam.supplier.districtSn = undefined
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.$refs.subarea.clearData()
       this.$refs.areaList.clearData()
       this.$refs.table.clearTable()

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

@@ -106,8 +106,10 @@ export default {
         time: [],
         beginDate: '',
         endDate: '',
-        subareaSn: undefined,
-        subareaAreaSn: undefined, // 分区
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         sparePartsReturnNo: undefined,
         supplier: {
           supplierSn: undefined,
@@ -187,8 +189,8 @@ export default {
       })
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -200,8 +202,8 @@ export default {
       this.queryParam.supplier.provinceSn = undefined
       this.queryParam.supplier.citySn = undefined
       this.queryParam.supplier.districtSn = undefined
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.sparePartsReturnNo = undefined
       this.queryParam.supplier.supplierName = undefined
       this.queryParam.supplier.supplierSn = undefined

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

@@ -128,8 +128,10 @@ export default {
         provinceSn: undefined,
         citySn: undefined,
         districtSn: undefined,
-        subareaSn: undefined,
-        subareaAreaSn: undefined, // 分区
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         dealerLevel: undefined
       },
       rules: {
@@ -223,8 +225,8 @@ export default {
       this.queryParam.dealerSn = val.key
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -239,8 +241,8 @@ export default {
       this.queryParam.provinceSn = undefined
       this.queryParam.citySn = undefined
       this.queryParam.districtSn = undefined
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.dealerLevel = undefined
       this.totalData = null
       if (this.advanced) {

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

@@ -158,8 +158,10 @@ export default {
         dealer: {
           dealerSn: undefined,
           dealerLevel: undefined,
-          subareaSn: undefined, //  区域
-          subareaAreaSn: undefined, // 分区
+          subareaArea:{
+            subareaSn: undefined,
+            subareaAreaSn: undefined
+          },
           provinceSn: undefined
         },
         product: {
@@ -309,8 +311,8 @@ export default {
       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
+      this.queryParam.dealer.subareaArea.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.dealer.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     //  重置
     resetSearchForm () {
@@ -324,8 +326,8 @@ export default {
       this.queryParam.bizNo = ''
       this.queryParam.dealer.dealerSn = undefined
       this.queryParam.dealer.dealerLevel = undefined
-      this.queryParam.dealer.subareaSn = undefined
-      this.queryParam.dealer.subareaAreaSn = undefined
+      this.queryParam.dealer.subareaArea.subareaSn = undefined
+      this.queryParam.dealer.subareaArea.subareaAreaSn = undefined
       this.queryParam.dealer.provinceSn = undefined
       this.queryParam.product.brandType = ''
       this.queryParam.product.productBrandSn = ''

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

@@ -103,8 +103,10 @@ export default {
         beginDate: '',
         endDate: '',
         dealerProvinceSn: undefined,
-        subareaSn: undefined,
-        subareaAreaSn: undefined, // 分区
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         salesStatusType: 'REAL_SALES'
       },
       disabled: false, //  查询、重置按钮是否可操作
@@ -163,8 +165,8 @@ export default {
       })
     },
     subareaChange (val) {
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -174,8 +176,8 @@ export default {
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
       this.queryParam.dealerProvinceSn = undefined
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.salesStatusType = 'REAL_SALES'
       this.$refs.subarea.clearData()
       this.$refs.table.clearTable()

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

@@ -129,8 +129,10 @@ export default {
           'provinceSn': undefined,
           'citySn': undefined,
           'districtSn': undefined,
-          'subareaSn': undefined,
-          'subareaAreaSn': undefined, // 分区
+          'subareaArea':{
+            'subareaSn': undefined,
+            'subareaAreaSn': undefined, // 分区
+          },
           'dealerLevel': undefined
         }
       },
@@ -218,8 +220,8 @@ export default {
       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
+      this.queryParam.dealer.subareaArea.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.dealer.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     //  重置
     resetSearchForm () {
@@ -233,8 +235,10 @@ export default {
         'provinceSn': undefined,
         'citySn': undefined,
         'districtSn': undefined,
-        'subareaSn': undefined,
-        'subareaAreaSn': undefined,
+        'subareaArea':{
+          'subareaSn': undefined,
+          'subareaAreaSn': undefined,
+         },
         'dealerLevel': undefined
       }
       this.totalData = null

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

@@ -133,8 +133,10 @@ export default {
         provinceSn: undefined,
         citySn: undefined,
         districtSn: undefined,
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         dealerLevel: undefined,
         salesReturnBillNo: ''
       },
@@ -233,8 +235,8 @@ export default {
       this.queryParam.dealerSn = val.key
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -249,8 +251,8 @@ export default {
       this.queryParam.provinceSn = undefined
       this.queryParam.citySn = undefined
       this.queryParam.districtSn = undefined
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.dealerLevel = undefined
       this.queryParam.salesReturnBillNo = ''
       this.$refs.custList.resetForm()

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

@@ -129,9 +129,11 @@ export default {
         provinceSn: undefined,
         citySn: undefined,
         districtSn: undefined,
-        subareaSn: undefined,
         dealerLevel: undefined,
-        subareaAreaSn: undefined
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
       },
       columns: [],
       countLabel: [],
@@ -167,9 +169,6 @@ export default {
     }
   },
   methods: {
-    getSubareaSn (con) {
-      this.queryParam.subareaSn = con[0]
-    },
     //  导出
     handleExport () {
       const _this = this
@@ -225,8 +224,8 @@ export default {
       this.queryParam.dealerSn = val.key
     },
     subareaChange (val) {
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -241,8 +240,8 @@ export default {
       this.queryParam.provinceSn = undefined
       this.queryParam.citySn = undefined
       this.queryParam.districtSn = undefined
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.dealerLevel = undefined
       this.totalData = null
       this.$refs.subarea.clearData()

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

@@ -170,8 +170,10 @@ export default {
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         dealerProvinceSn: undefined,
         dealerCitySn: undefined,
         dealerCountySn: undefined
@@ -294,8 +296,8 @@ export default {
       this.queryParam.dealerSn = val.key
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -316,8 +318,8 @@ export default {
       this.queryParam.productTypeSn1 = ''
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined

+ 8 - 6
src/views/reportData/salesOrderTotal/list.vue

@@ -154,8 +154,10 @@ export default {
         dealerName: '',
         dealerLevel: undefined,
         operatorSn: undefined,
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         dealerProvinceSn: undefined
       },
       rules: {
@@ -284,8 +286,8 @@ export default {
       this.queryParam.dealerSn = val.key
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -300,8 +302,8 @@ export default {
       this.queryParam.dealerName = ''
       this.queryParam.dealerLevel = undefined
       this.queryParam.operatorSn = undefined
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.dealerProvinceSn = undefined
       this.totalData = null
       if(this.advanced){

+ 10 - 6
src/views/reportData/salesPresentation/list.vue

@@ -130,8 +130,10 @@ export default {
           'provinceSn': undefined,
           'citySn': undefined,
           'districtSn': undefined,
-          'subareaSn': undefined,
-          'subareaAreaSn': undefined,
+          'subareaArea':{
+            'subareaSn': undefined,
+            'subareaAreaSn': undefined,
+          },
           'dealerLevel': undefined
         }
       },
@@ -222,8 +224,8 @@ export default {
       this.queryParam.dealer.dealerSn = val.key
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -237,8 +239,10 @@ export default {
         'provinceSn': undefined,
         'citySn': undefined,
         'districtSn': undefined,
-        'subareaSn': undefined,
-        'subareaAreaSn': undefined,
+        'subareaArea':{
+          'subareaSn': undefined,
+          'subareaAreaSn': undefined,
+         },
         'dealerLevel': undefined
       }
       this.totalData = null

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

@@ -172,8 +172,10 @@ export default {
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         dealerProvinceSn: undefined,
         dealerCitySn: undefined,
         dealerCountySn: undefined
@@ -336,8 +338,8 @@ export default {
       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
+      this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     //  重置
     resetSearchForm () {
@@ -358,8 +360,8 @@ export default {
       this.queryParam.productTypeSn1 = ''
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined

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

@@ -128,8 +128,10 @@ export default {
         provinceSn: undefined,
         citySn: undefined,
         districtSn: undefined,
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         dealerLevel: undefined
       },
       rules: {
@@ -226,8 +228,8 @@ export default {
       this.queryParam.dealerSn = val.key
     },
     subareaChange (val) {
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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,8 +244,8 @@ export default {
       this.queryParam.provinceSn = undefined
       this.queryParam.citySn = undefined
       this.queryParam.districtSn = undefined
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.dealerLevel = undefined
       this.totalData = null
       this.$refs.subarea.clearData()

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

@@ -134,8 +134,10 @@ export default {
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
         salesReturnBillNo: '',
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         dealerSn: '',
         dealerLevel: undefined,
         dealerProvinceSn: undefined,
@@ -273,8 +275,8 @@ export default {
       this.queryParam.dealerSn = val.key
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -286,8 +288,8 @@ export default {
       this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.salesReturnBillNo = ''
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.dealerSn = undefined
       this.queryParam.dealerLevel = undefined
       this.queryParam.dealerProvinceSn = undefined

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

@@ -135,7 +135,10 @@ export default {
         provinceSn: undefined,
         citySn: undefined,
         districtSn: undefined,
-        subareaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         dealerLevel: undefined
       },
       columns: [],
@@ -227,8 +230,8 @@ export default {
       this.queryParam.dealerSn = val.key
     },
     subareaChange (val) {
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -244,7 +247,8 @@ export default {
       this.queryParam.provinceSn = undefined
       this.queryParam.citySn = undefined
       this.queryParam.districtSn = undefined
-      this.queryParam.subareaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.dealerLevel = undefined
       this.totalData = null
       if (this.advanced) {

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

@@ -178,8 +178,10 @@ export default {
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         provinceSn: undefined
       },
       productType: [],
@@ -306,8 +308,8 @@ export default {
       this.queryParam.dealerSn = val.key
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -332,8 +334,8 @@ export default {
       this.queryParam.productTypeSn1 = ''
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.provinceSn = undefined
       this.productType = []
       this.$refs.subarea.clearData()

+ 8 - 6
src/views/reportData/transferReturnReport/list.vue

@@ -139,8 +139,10 @@ export default {
         allocateSortSn: undefined,
         allocateReturnTypeSn: undefined,
         targetType: undefined,
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
       },
       rules: {
         'time': [{ required: true, message: '请选择退货完成日期', trigger: 'change' }]
@@ -259,8 +261,8 @@ export default {
       this.queryParam.endDate = date[1] || ''
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -277,8 +279,8 @@ export default {
       this.queryParam.allocateSortSn = undefined
       this.queryParam.allocateReturnTypeSn = undefined
       this.queryParam.targetType = undefined
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.totalData = null
       if(this.advanced){
         this.$refs.subarea.clearData()

+ 8 - 6
src/views/salesManagement/examineVerify/list.vue

@@ -189,8 +189,10 @@ export default {
         stockOutNo: '', // 出库单号
         printStatus: undefined, //  打印状态
         billStatus: undefined, //  业务状态
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         shippingAddrProvinceSn: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
@@ -263,8 +265,8 @@ export default {
       this.queryParam.endDate = date[1]
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -278,8 +280,8 @@ export default {
       this.queryParam.stockOutNo = '' // 出库单号
       this.queryParam.billStatus = undefined
       this.queryParam.printStatus = undefined
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
       if(this.advanced){
         this.$refs.subarea.clearData()

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

@@ -181,8 +181,10 @@ export default {
         salesBillNo: '', //  销售单号
         dispatchBillNo: '', //  备货单号
         billStatus: undefined, //  业务状态
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         voidFlag: undefined,
         shippingAddrProvinceSn: undefined,
         checkStatus: undefined
@@ -282,8 +284,8 @@ export default {
       })
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -303,8 +305,10 @@ export default {
         salesBillNo: '', //  销售单号
         dispatchBillNo: '', //  备货单号
         billStatus: undefined, //  业务状态
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         voidFlag: undefined,
         shippingAddrProvinceSn: undefined,
         checkStatus: undefined

+ 8 - 6
src/views/salesManagement/outboundOrder/list.vue

@@ -203,8 +203,10 @@ export default {
         stockOutNo: '',
         outBizNo: '',
         state: undefined, //  状态
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         shippingAddrProvinceSn: undefined,
         sendFlag: undefined
       },
@@ -282,8 +284,8 @@ export default {
       this.$refs.table.refresh(true)
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -295,8 +297,8 @@ export default {
       this.queryParam.state = undefined
       this.queryParam.stockOutNo = ''
       this.queryParam.outBizNo = ''
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
       this.queryParam.sendFlag = undefined
       if(this.advanced){

+ 8 - 6
src/views/salesManagement/pushOrderManagement/list.vue

@@ -222,8 +222,10 @@ export default {
         salesBillNo: '', //  销售单号
         dispatchBillNo: '', //  备货单号
         billStatus: undefined, //  业务状态
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         voidFlag: undefined,
         shippingAddrProvinceSn: undefined,
         printStatus: undefined,
@@ -342,8 +344,8 @@ export default {
       })
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -358,8 +360,8 @@ export default {
       this.queryParam.dispatchBillNo = ''
       this.queryParam.billStatus = undefined
       this.queryParam.voidFlag = undefined
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
       this.queryParam.printStatus = undefined
       this.queryParam.checkStatus = undefined

+ 8 - 6
src/views/salesManagement/salesCollection/list.vue

@@ -245,8 +245,10 @@ export default {
         dealerLevel: undefined,
         settleStyle: undefined,
         keepType: undefined,
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         billStatus: undefined,
         settleState: undefined,
         voidFlag: undefined,
@@ -350,8 +352,8 @@ export default {
       this.$refs.table.clearSelected()
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -374,8 +376,8 @@ export default {
       this.queryParam.dealerLevel = undefined
       this.queryParam.settleStyle = undefined
       this.queryParam.keepType = undefined
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.billStatus = undefined
       this.queryParam.settleState = undefined
       this.queryParam.voidFlag = undefined

+ 8 - 6
src/views/salesManagement/salesQuery/list.vue

@@ -293,8 +293,10 @@ export default {
         billStatus: undefined, //  业务状态
         financialStatus: undefined, //  财务状态
         salesBillSource: undefined,
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         shippingAddrProvinceSn: undefined
       },
       totalData: {
@@ -412,8 +414,8 @@ export default {
       this.queryParam.buyerSn = val.key
     },
     subareaChange (val) {
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+      this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     // 新增
     handleAdd () {
@@ -529,8 +531,8 @@ export default {
       this.queryParam.billStatus = undefined
       this.queryParam.financialStatus = undefined
       this.queryParam.salesBillSource = undefined
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
       if (this.advanced) {
         this.$refs.subarea.clearData()

+ 8 - 6
src/views/salesManagement/sendOutOrder/list.vue

@@ -178,8 +178,10 @@ export default {
         bizNos: '', //  业务单号
         transportState: undefined, //  物流状态
         receiveFlag: undefined, // 收货状态
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         provinceSn: undefined
       },
       totalData: {
@@ -272,8 +274,8 @@ export default {
       })
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -290,8 +292,8 @@ export default {
       this.queryParam.bizNos = ''
       this.queryParam.transportState = undefined
       this.queryParam.receiveFlag = undefined
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.provinceSn = undefined
       if(this.advanced){
         this.$refs.subarea.clearData()

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

@@ -152,8 +152,10 @@ export default {
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
         buyerSn: undefined,
-        subareaSn: undefined, //  区域
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         productName: '',
         productCode: '',
         productTypeSn1: '', //  产品一级分类
@@ -264,8 +266,8 @@ export default {
       })
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -277,8 +279,8 @@ export default {
         this.$refs.custList.resetForm()
         this.$refs.subarea.clearData()
       }
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.productName = ''
       this.queryParam.productCode = ''
       this.queryParam.productTypeSn1 = ''

+ 8 - 6
src/views/salesManagement/stockPrint/list.vue

@@ -227,8 +227,10 @@ export default {
         salesBillNo: '', //  销售单号
         dispatchBillNo: '', //  备货单号
         billStatus: undefined, //  业务状态
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         shippingAddrProvinceSn: undefined,
         voidFlag: 0,
         printStatus: 'NO_PRINT'
@@ -386,8 +388,8 @@ export default {
       this.showInfoModal = true
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
@@ -402,8 +404,8 @@ export default {
       this.queryParam.salesBillNo = ''
       this.queryParam.dispatchBillNo = ''
       this.queryParam.billStatus = undefined
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
       this.queryParam.voidFlag = this.currentTab == 1 ? '' : '0'
       this.queryParam.printStatus = this.currentTab == 1 ? '' : 'NO_PRINT'

+ 8 - 6
src/views/salesReturnManagement/salesReturn/list.vue

@@ -247,8 +247,10 @@ export default {
         purchaseReturnApplyNo: '',
         syncFlag: undefined, // 是否同步给客户
         billStatus: undefined, // 业务状态
-        subareaSn: undefined,
-        subareaAreaSn: undefined,
+        subareaArea:{
+          subareaSn: undefined,
+          subareaAreaSn: undefined
+        },
         shippingAddrProvinceSn: undefined,
         salesReturnBillSource: undefined
       },
@@ -390,8 +392,8 @@ export default {
       })
     },
     subareaChange(val){
-      this.queryParam.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.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 () {
       this.$refs.rangeCreateDate.resetDate(this.createDate)
@@ -407,8 +409,8 @@ export default {
       this.queryParam.salesReturnBillNo = ''
       this.queryParam.purchaseReturnApplyNo = ''
       this.queryParam.billStatus = undefined
-      this.queryParam.subareaSn = undefined
-      this.queryParam.subareaAreaSn = undefined
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.syncFlag = undefined
       this.queryParam.salesReturnBillSource = undefined
       this.queryParam.shippingAddrProvinceSn = undefined

+ 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.2.113:8660/ocs-admin',
+        target: 'http://192.168.2.113:8660/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: {