chenrui 10 ヶ月 前
コミット
e1c6607e04

+ 11 - 10
src/views/reportData/tireFeeReport/monthQueryList.vue

@@ -171,14 +171,15 @@ export default {
         queryType: 'month', // 轮胎月度费用报表
         beginDate: this.getMonthDetailDay().firstDay, // 开始时间
         endDate: this.getMonthDetailDay().lastDay, // 结束时间
-        provinceSn: undefined, // 省
-        citySn: undefined, // 市
-        districtSn: undefined, // 区
+       
         dealerLevel: undefined, // 客户等级
         customSn: undefined, // 客户sn
         parentDealerSn: undefined, // 轮胎省仓sn
         dealerEntity: {
-          dealerName: undefined // 客户名称
+          dealerName: undefined,// 客户名称
+          provinceSn: undefined, // 省
+          citySn: undefined, // 市
+          districtSn: undefined // 区
         },
         parentDealerEntity: {
           dealerName: undefined // 轮胎省仓名称
@@ -319,9 +320,9 @@ export default {
     },
     // 地区
     areaChange (val) {
-      this.queryParam.provinceSn = val[0] ? val[0] : undefined
-      this.queryParam.citySn = val[1] ? val[1] : undefined
-      this.queryParam.districtSn = val[2] ? val[2] : undefined
+      this.queryParam.dealerEntity.provinceSn = val[0] ? val[0] : undefined
+      this.queryParam.dealerEntity.citySn = val[1] ? val[1] : undefined
+      this.queryParam.dealerEntity.districtSn = val[2] ? val[2] : undefined
     },
     // 区域分区  change
     subareaChange (val) {
@@ -335,9 +336,9 @@ export default {
       this.monthVal = moment().format('YYYY-MM')
       this.queryParam.beginDate = timeObj.firstDay // 开始时间
       this.queryParam.endDate = timeObj.lastDay// 结束时间
-      this.queryParam.provinceSn = undefined
-      this.queryParam.citySn = undefined
-      this.queryParam.districtSn = undefined
+      this.queryParam.dealerEntity.provinceSn = undefined
+      this.queryParam.dealerEntity.citySn = undefined
+      this.queryParam.dealerEntity.districtSn = undefined
       this.queryParam.dealerEntity.dealerName = undefined
       this.queryParam.parentDealerEntity.dealerName = undefined
       this.queryParam.customSn = undefined

+ 10 - 10
src/views/reportData/tireFeeReport/quarterQueryList.vue

@@ -141,9 +141,6 @@ export default {
         queryType: 'quarter', // 轮胎季度费用报表
         beginDate: undefined, // 开始时间
         endDate: undefined, // 结束时间
-        provinceSn: undefined, // 省
-        citySn: undefined, // 市
-        districtSn: undefined, // 区
         dealerLevel: undefined, // 客户级别
         subareaArea: {
           subareaSn: '', // 区域
@@ -151,7 +148,10 @@ export default {
         },
         customSn: undefined, // 客户sn
         dealerEntity: {
-          dealerName: undefined// 客户名称
+          dealerName: undefined,// 客户名称
+          provinceSn: undefined, // 省
+          citySn: undefined, // 市
+          districtSn: undefined // 区
         },
         provinceFlag: '1'// 是轮胎省仓
       },
@@ -257,9 +257,9 @@ export default {
     },
     // 地区
     areaChange (val) {
-      this.queryParam.provinceSn = val[0] ? val[0] : undefined
-      this.queryParam.citySn = val[1] ? val[1] : undefined
-      this.queryParam.districtSn = val[2] ? val[2] : undefined
+      this.queryParam.dealerEntity.provinceSn = val[0] ? val[0] : undefined
+      this.queryParam.dealerEntity.citySn = val[1] ? val[1] : undefined
+      this.queryParam.dealerEntity.districtSn = val[2] ? val[2] : undefined
     },
     //  日期选择  change
     dateChange (date, valStr) {
@@ -283,9 +283,9 @@ export default {
       this.queryParam.time = []
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
-      this.queryParam.provinceSn = undefined
-      this.queryParam.citySn = undefined
-      this.queryParam.districtSn = undefined
+      this.queryParam.dealerEntity.provinceSn = undefined
+      this.queryParam.dealerEntity.citySn = undefined
+      this.queryParam.dealerEntity.districtSn = undefined
       this.queryParam.dealerEntity.dealerName = undefined
       this.queryParam.customSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined

+ 10 - 10
src/views/reportData/tireFeeReport/yearQueryList.vue

@@ -149,9 +149,6 @@ export default {
         queryType: 'year', // 轮胎年度费用报表
         beginDate: '2023-01-31 00:00:00', // 开始时间
         endDate: '2023-12-31 23:59:59', // 结束时间
-        provinceSn: undefined, // 省
-        citySn: undefined, // 市
-        districtSn: undefined, // 区
         dealerLevel: undefined, // 客户等级
         customSn: undefined, // 客户sn
         subareaArea: {
@@ -159,7 +156,10 @@ export default {
           subareaAreaSn: '' // 分区
         },
         dealerEntity: {
-          dealerName: undefined // 客户名称
+          dealerName: undefined ,// 客户名称
+          provinceSn: undefined, // 省
+          citySn: undefined, // 市
+          districtSn: undefined // 区
         },
         provinceFlag: '1'// 是轮胎省仓
       },
@@ -273,9 +273,9 @@ export default {
     },
     // 地区
     areaChange (val) {
-      this.queryParam.provinceSn = val[0] ? val[0] : undefined
-      this.queryParam.citySn = val[1] ? val[1] : undefined
-      this.queryParam.districtSn = val[2] ? val[2] : undefined
+      this.queryParam.dealerEntity.provinceSn = val[0] ? val[0] : undefined
+      this.queryParam.dealerEntity.citySn = val[1] ? val[1] : undefined
+      this.queryParam.dealerEntity.districtSn = val[2] ? val[2] : undefined
     },
     // 区域分区  change
     subareaChange (val) {
@@ -288,9 +288,9 @@ export default {
       this.currYear = '2023'
       this.queryParam.beginDate = '2023-01-31 00:00:00'
       this.queryParam.endDate = '2023-12-31 23:59:59'
-      this.queryParam.provinceSn = undefined
-      this.queryParam.citySn = undefined
-      this.queryParam.districtSn = undefined
+      this.queryParam.dealerEntity.provinceSn = undefined
+      this.queryParam.dealerEntity.citySn = undefined
+      this.queryParam.dealerEntity.districtSn = undefined
       this.queryParam.dealerEntity.dealerName = undefined
       this.queryParam.customSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined