Bladeren bron

修改bug

chenrui 2 jaren geleden
bovenliggende
commit
4b906a7dfe

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

@@ -54,7 +54,7 @@
         size="small"
         :defaultLoadData="false"
         :rowKey="(record,index) => record.no"
-        :rowKeyName="no"
+        rowKeyName="no"
         :columns="columns"
         :data="loadData"
         :showPagination="false"

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

@@ -59,7 +59,7 @@
         size="small"
         :defaultLoadData="false"
         :rowKey="(record) => record.no"
-        :rowKeyName="no"
+        rowKeyName="no"
         :columns="columns"
         :data="loadData"
         :showPagination="false"

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

@@ -71,7 +71,7 @@
         ref="table"
         size="small"
         :rowKey="(record) => record.no"
-        :rowKeyName="no"
+        rowKeyName="no"
         :columns="columns"
         :data="loadData"
         :scroll="{ x: 2250, y: tableHeight }"

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

@@ -77,7 +77,7 @@
         size="small"
         :defaultLoadData="false"
         :rowKey="(record) => record.no"
-        :rowKeyName="no"
+        rowKeyName="no"
         :columns="columns"
         :data="loadData"
         :scroll="{ x: 2370 }"

+ 23 - 23
src/views/reportData/salesAmountReport/list.vue

@@ -25,7 +25,7 @@
             <a-col :md="6" :sm="24">
               <a-form-model-item label="客户级别">
                 <v-select
-                  v-model="queryParam.dealer.dealerLevel"
+                  v-model="queryParam.dealerLevel"
                   ref="dealerLevel"
                   id="salesAmountReportList-allocateTypeSn"
                   code="DEALER_LEVEL"
@@ -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" v-model="subareaSn" @change="getSubareaSn"></subarea>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
@@ -72,7 +72,7 @@
         size="small"
         :defaultLoadData="false"
         :rowKey="(record) => record.no"
-        :rowKeyName="no"
+        rowKeyName="no"
         :columns="columns"
         :data="loadData"
         :scroll="{ x: 2250 }"
@@ -125,15 +125,14 @@ 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,
+        dealerLevel: undefined
       },
+      subareaSn: undefined,
       columns: [],
       countLabel: [],
       rules: {
@@ -168,6 +167,9 @@ export default {
     }
   },
   methods: {
+    getSubareaSn (con) {
+      this.queryParam.subareaSn = con[0]
+    },
     //  导出
     handleExport () {
       const _this = this
@@ -220,7 +222,7 @@ export default {
       this.queryParam.endDate = date[1] || ''
     },
     custChange (val) {
-      this.queryParam.dealer.dealerSn = val.key
+      this.queryParam.dealerSn = val.key
     },
     //  重置
     resetSearchForm () {
@@ -231,14 +233,12 @@ export default {
       this.$refs.rangeDate.resetDate(this.queryParam.time)
       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
-      }
+      this.queryParam.dealerSn = undefined
+      this.queryParam.provinceSn = undefined
+      this.queryParam.citySn = undefined
+      this.queryParam.districtSn = undefined
+      this.queryParam.subareaSn = undefined
+      this.queryParam.dealerLevel = undefined
       this.totalData = null
       if (this.advanced) {
         this.$refs.areaList.clearData()
@@ -248,9 +248,9 @@ export default {
       this.$refs.table.clearTable()
     },
     areaChange (val) {
-      this.queryParam.dealer.provinceSn = val[0] ? val[0] : ''
-      this.queryParam.dealer.citySn = val[1] ? val[1] : ''
-      this.queryParam.dealer.districtSn = val[2] ? val[2] : ''
+      this.queryParam.provinceSn = val[0] ? val[0] : ''
+      this.queryParam.citySn = val[1] ? val[1] : ''
+      this.queryParam.districtSn = val[2] ? val[2] : ''
     },
     // 获取表头
     async getTableTitle () {

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

@@ -77,7 +77,7 @@
         size="small"
         :defaultLoadData="false"
         :rowKey="(record) => record.no"
-        :rowKeyName="no"
+        rowKeyName="no"
         :columns="columns"
         :data="loadData"
         :scroll="{ x: 2370 }"

+ 23 - 23
src/views/reportData/salesSlipReport/list.vue

@@ -25,7 +25,7 @@
             <a-col :md="6" :sm="24">
               <a-form-model-item label="客户级别">
                 <v-select
-                  v-model="queryParam.dealer.dealerLevel"
+                  v-model="queryParam.dealerLevel"
                   ref="dealerLevel"
                   id="salesSlipReportList-allocateTypeSn"
                   code="DEALER_LEVEL"
@@ -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" v-model="subareaSn" @change="getSubareaSn"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -77,7 +77,7 @@
         size="small"
         :defaultLoadData="false"
         :rowKey="(record) => record.no"
-        :rowKeyName="no"
+        rowKeyName="no"
         :columns="columns"
         :data="loadData"
         :scroll="{ x: 2410 }"
@@ -131,15 +131,14 @@ export default {
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
         salesBillNo: '', //  销售单号
-        dealer: {
-          'dealerSn': undefined,
-          'provinceSn': undefined,
-          'citySn': undefined,
-          'districtSn': undefined,
-          'subareaSn': undefined,
-          'dealerLevel': undefined
-        }
+        dealerSn: undefined,
+        provinceSn: undefined,
+        citySn: undefined,
+        districtSn: undefined,
+        subareaSn: undefined,
+        dealerLevel: undefined
       },
+      subareaSn: undefined,
       columns: [],
       countLabel: [],
       rules: {
@@ -174,6 +173,9 @@ export default {
     }
   },
   methods: {
+    getSubareaSn (con) {
+      this.queryParam.subareaSn = con[0]
+    },
     //  导出
     handleExport () {
       const _this = this
@@ -226,7 +228,7 @@ export default {
       this.queryParam.endDate = date[1] || ''
     },
     custChange (val) {
-      this.queryParam.dealer.dealerSn = val.key
+      this.queryParam.dealerSn = val.key
     },
     //  重置
     resetSearchForm () {
@@ -238,14 +240,12 @@ export default {
       this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.salesBillNo = ''
-      this.queryParam.dealer = {
-        'dealerSn': undefined,
-        'provinceSn': undefined,
-        'citySn': undefined,
-        'districtSn': undefined,
-        'subareaSn': undefined,
-        'dealerLevel': undefined
-      }
+      this.queryParam.dealerSn = undefined
+      this.queryParam.provinceSn = undefined
+      this.queryParam.citySn = undefined
+      this.queryParam.districtSn = undefined
+      this.queryParam.subareaSn = undefined
+      this.queryParam.dealerLevel = undefined
       this.totalData = null
       if (this.advanced) {
         this.$refs.areaList.clearData()
@@ -255,9 +255,9 @@ export default {
       this.$refs.table.clearTable()
     },
     areaChange (val) {
-      this.queryParam.dealer.provinceSn = val[0] ? val[0] : ''
-      this.queryParam.dealer.citySn = val[1] ? val[1] : ''
-      this.queryParam.dealer.districtSn = val[2] ? val[2] : ''
+      this.queryParam.provinceSn = val[0] ? val[0] : ''
+      this.queryParam.citySn = val[1] ? val[1] : ''
+      this.queryParam.districtSn = val[2] ? val[2] : ''
     },
     // 获取表头
     async getTableTitle () {