chenrui преди 1 година
родител
ревизия
2b9fa32df4

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

@@ -174,8 +174,8 @@ export default {
       },
       totalData: null, // 统计数据
       columns: [], // 列表表头
-      countLabel: [], // 统计数据表头
-      countBrandLabel: [], // 统计数据品牌表头
+      countLabel: [], // 统计分类数据
+      countBrandLabel: [], // 统计品牌数据
       rules: {
         'time': [{ required: true, message: '请选择下推时间', trigger: 'change' }]
       },

+ 34 - 26
src/views/reportData/promotionSalesOrderReport/list.vue

@@ -56,7 +56,7 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="客户级别">
+                <a-form-model-item label="客户级别">
                   <v-select
                     v-model="queryParam.dealerLevel"
                     ref="dealerLevel"
@@ -64,15 +64,15 @@
                     code="DEALER_LEVEL"
                     placeholder="请选择客户级别"
                     allowClear></v-select>
-                </a-form-item>
+                </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="产品品牌">
+                <a-form-model-item label="产品品牌">
                   <ProductBrand id="productInfoList-productBrand" v-model="queryParam.productBrand"></ProductBrand>
-                </a-form-item>
+                </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="产品分类">
+                <a-form-model-item label="产品分类">
                   <productTypeAll
                     expandType="click"
                     :changeOnSelect="false"
@@ -81,7 +81,7 @@
                     @change="changeProductType"
                     v-model="productType"
                     id="productInfoList-productType"></productTypeAll>
-                </a-form-item>
+                </a-form-model-item>
               </a-col>
             </template>
             <a-col :md="24" :sm="24" style="text-align:center;margin-bottom: 10px;">
@@ -194,15 +194,17 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import moment from 'moment'
+import { hdExportExcel } from '@/libs/exportExcel'
+// 组件
 import { STable, VSelect } from '@/components'
 import ProductBrand from '@/views/common/productBrand.js'
 import productTypeAll from '@/views/common/productType.js'
-import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import subarea from '@/views/common/subarea.js'
 import reportModal from '@/views/common/reportModal.vue'
 import Area from '@/views/common/area.js'
 import BizUser from '@/views/common/bizUser.js'
-import { hdExportExcel } from '@/libs/exportExcel'
+import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
+// 接口
 import { brandTypeReportList, brandTypeReportCount, brandTypeReportExport } from '@/api/reportData'
 export default {
   name: 'PromotionSalesOrderReport',
@@ -212,35 +214,36 @@ export default {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
-      tableHeight: 0,
-      showExport: false,
-      queryParam: { //  查询条件
-        brandTypeBeginDate: moment().format('YYYYMM'),
-        brandTypeEndDate: moment().format('YYYYMM'),
-        dealerSn: undefined,
-        provinceSn: undefined,
+      tableHeight: 0, // 表格高度
+      disabled: false, //  查询、重置按钮是否可操作
+      exportLoading: false, // 导出按钮加载状态
+      showExport: false, // 导出弹窗
+      //  查询条件
+      queryParam: {
+        brandTypeBeginDate: moment().format('YYYYMM'), // 开始月份
+        brandTypeEndDate: moment().format('YYYYMM'), // 结束月份
+        dealerSn: undefined, // 客户 sn
+        provinceSn: undefined, // 省份
         subareaArea: {
-          subareaSn: undefined,
-          subareaAreaSn: undefined,
-          bizUserSn: undefined
+          subareaSn: undefined, // 区域
+          subareaAreaSn: undefined, // 分区
+          bizUserSn: undefined// 区域负责人
         },
-        productBrand: undefined,
+        productBrand: undefined, // 产品品牌
         productTypeSn1: '', //  产品一级分类
         productType: '', //  产品二级分类
-        dealerLevel: undefined
+        dealerLevel: undefined// 客户等级
       },
-      productType: [],
+      productType: [], // 产品分类
       form: {
         monthInfo: [moment().format('YYYY-MM'), moment().format('YYYY-MM')]
       },
       rules: {
         monthInfo: [{ required: true, message: '请选择统计月份', trigger: 'change' }]
       },
-      disabled: false, //  查询、重置按钮是否可操作
-      exportLoading: false,
-      startValue: moment().format('YYYY-MM'), // 统计月份
-      endValue: moment().format('YYYY-MM'),
-      endOpen: false,
+      startValue: moment().format('YYYY-MM'), // 统计月份 开始
+      endValue: moment().format('YYYY-MM'), // 统计月份 结束
+      endOpen: false, // 打开结束月份弹窗
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
@@ -251,11 +254,13 @@ export default {
         if (!paramsPage.subareaArea.subareaSn && !paramsPage.subareaArea.subareaAreaSn && !paramsPage.subareaArea.bizUserSn) {
           delete paramsPage.subareaArea
         }
+        // 获取列表数据  有分页
         return brandTypeReportList(paramsPage).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
             this.getCount(paramsPage)
+            // 计算列表序号
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
@@ -304,6 +309,7 @@ export default {
     }
   },
   watch: {
+    // 展开关闭
     advanced (newValue, oldValue) {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
@@ -384,6 +390,7 @@ export default {
         }
       })
     },
+    // 查询
     handleSearch () {
       const _this = this
       if (!_this.form.monthInfo[0] || !_this.form.monthInfo[1]) {
@@ -439,6 +446,7 @@ export default {
       this.$refs.ruleForm.resetFields()
       this.$refs.table.refresh()
     },
+    // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 215

+ 31 - 24
src/views/reportData/promotionSalesRealTimeReport/index.vue

@@ -5,6 +5,7 @@
         <a-tab-pane key="1" tab="促销销售单报表">
           <a-card size="small" :bordered="false" class="promotionSalesRealTimeReport-wrap searchBoxNormal">
             <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
+              <!-- 查询条件 -->
               <a-form-model
                 layout="inline"
                 ref="ruleForm"
@@ -17,7 +18,6 @@
                     </a-form-model-item>
                   </a-col>
                   <a-col :md="6" :sm="24">
-                    <!-- :disabledDate="disabledDate" -->
                     <a-form-model-item label="促销开始时间">
                       <a-range-picker
                         style="width:100%"
@@ -103,9 +103,9 @@
                       </a-form-model-item>
                     </a-col>
                     <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
-                      <a-form-item label="客服">
+                      <a-form-model-item label="客服">
                         <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
-                      </a-form-item>
+                      </a-form-model-item>
                     </a-col>
                   </template>
                   <a-col :md="isShowCustomerSearch?24:6" :sm="24" :style="{textAlign: isShowCustomerSearch?'center':''}">
@@ -195,17 +195,18 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
+import getDate from '@/libs/getDate.js'
+import { hdExportExcel } from '@/libs/exportExcel'
+// 组件
 import { STable, VSelect } from '@/components'
 import reportModal from '@/views/common/reportModal.vue'
-import { salesPromoReportList, salesPromoReportQueryCount, exportSalesPromoReport } from '@/api/reportData'
-import { hdExportExcel } from '@/libs/exportExcel'
 import gatherList from './list'
 import rangeDate from '@/views/common/rangeDate.vue'
-import getDate from '@/libs/getDate.js'
 import subarea from '@/views/common/subarea.js'
 import AreaList from '@/views/common/areaList.js'
 import customerService from '@/views/common/customerService'
-// import moment from 'moment'
+// 接口
+import { salesPromoReportList, salesPromoReportQueryCount, exportSalesPromoReport } from '@/api/reportData'
 export default {
   name: 'PriceDifferenceDetailReportList',
   mixins: [commonMixin],
@@ -213,10 +214,11 @@ export default {
   data () {
     const _this = this
     return {
-      advanced: true, // 高级搜索 展开/关闭
-      time: undefined,
       spinning: false,
+      advanced: true, // 高级搜索 展开/关闭
+      time: undefined, // 促销开始时间
       queryParam: {
+        // 促销审核时间默认值
         salesDate: [
           getDate.getCurrMonthDays().starttime,
           getDate.getCurrMonthDays().endtime
@@ -234,25 +236,25 @@ export default {
         buyerLevel: undefined, // 客户级别
         buyerName: '', // 客户名称
         subareaArea: {
-          subareaSn: '',
-          subareaAreaSn: ''
+          subareaSn: '', // 区域
+          subareaAreaSn: ''// 分区
         },
         dealerProvinceSn: undefined, // 省份编码
         dealerCitySn: undefined, // 城市编码
         dealerDistrictSn: undefined, // 区域编码
-        giveMoney: undefined,
+        giveMoney: undefined, // 采购额
         bizUserSn: undefined// 客服
       },
       rules: {
         salesDate: [{ required: true, message: '请选择销售审核时间', trigger: 'change' }]
       },
-      dateFormat: 'YYYY-MM-DD',
-      tabVal: 1,
-      disabled: false,
-      tableHeight: 0,
+      dateFormat: 'YYYY-MM-DD', // 时间格式
+      tabVal: 1, // tab值  1促销销售单报表 2促销销售单实时报表
+      disabled: false, //  查询、重置按钮是否可操作
+      tableHeight: 0, // 表格高度
       totalData: null, //  合计
-      exportLoading: false,
-      showExport: false,
+      exportLoading: false, // 导出按钮加载状态
+      showExport: false, // 导出弹窗
       columns: [
         { title: '促销名称', dataIndex: 'promotion.title', width: '160px', align: 'left', customRender: function (text) { return text || '--' }, fixed: 'left', ellipsis: true },
         { title: '促销时间', scopedSlots: { customRender: 'promotionTime' }, width: '130px', align: 'center', fixed: 'left' },
@@ -287,10 +289,12 @@ export default {
         const newParams = JSON.parse(JSON.stringify(params))
         delete newParams.salesDate
         this.spinning = true
+        // 促销销售单报表  列表  有分页
         return salesPromoReportList(newParams).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
+            // 序号计算
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
@@ -304,6 +308,7 @@ export default {
     }
   },
   methods: {
+    // 销售审核时间  change
     salesDateChange (date) {
       if (date[0] && date[1]) {
         this.queryParam.salesDate = date
@@ -313,6 +318,7 @@ export default {
       this.queryParam.beginAuditDate = date[0] || ''
       this.queryParam.endAuditDate = date[1] || ''
     },
+    // 促销开始时间  change
     dateChange (date, dateString) {
       this.time = date
       if (dateString[0] != '' && dateString[1] != '') {
@@ -323,10 +329,6 @@ export default {
         this.$set(this.queryParam.promoRuleReport, 'promotionDateEnd', undefined)
       }
     },
-    // // 不可选日期
-    // disabledDate (date, dateStrings) {
-    //   return date && date.valueOf('day') < moment().subtract(1, 'day') // 今天以后,包含今天
-    // },
     // 统计
     getCount (params) {
       salesPromoReportQueryCount(params).then(res => {
@@ -337,11 +339,12 @@ export default {
         }
       })
     },
+    // 区域分区
     subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
-    // tab
+    // tab 切换 change
     handleChange (val) {
       this.tabVal = val
     },
@@ -379,6 +382,7 @@ export default {
         }
       })
     },
+    // 地区
     areaChange (val) {
       this.queryParam.dealerProvinceSn = val[0] ? val[0] : ''
       this.queryParam.dealerCitySn = val[1] ? val[1] : ''
@@ -387,9 +391,9 @@ export default {
     // 查询
     handleSearch () {
       const _this = this
-      // 总计
       const paramData = JSON.parse(JSON.stringify(this.queryParam))
       delete paramData.salesDate
+      // 获取统计数据
       _this.getCount(paramData)
       _this.$refs.table.refresh(true)
     },
@@ -430,18 +434,21 @@ export default {
       this.$refs.table.clearTable()
       this.totalData = null
     },
+    // 初始化
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
     },
+    // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 260
     }
   },
   watch: {
+    // 展开关闭
     advanced (newValue, oldValue) {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调

+ 40 - 48
src/views/reportData/promotionSalesRealTimeReport/list.vue

@@ -2,6 +2,7 @@
   <a-spin :spinning="spinning" tip="Loading...">
     <div class="productInfoList-wrap">
       <a-card size="small" :bordered="false" class="searchBoxNormal">
+        <!-- 查询 -->
         <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
           <a-form-model layout="inline" ref="ruleForm" :rules="rules" :model="newQueryParam">
             <a-row :gutter="15">
@@ -11,7 +12,6 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <!-- :disabledDate="disabledDate" -->
                 <a-form-model-item label="促销开始时间">
                   <a-range-picker
                     style="width:100%"
@@ -91,9 +91,9 @@
                   </a-form-model-item>
                 </a-col>
                 <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
-                  <a-form-item label="客服">
+                  <a-form-model-item label="客服">
                     <customerService ref="customerName" v-model="newQueryParam.bizUserSn"></customerService>
-                  </a-form-item>
+                  </a-form-model-item>
                 </a-col>
               </template>
               <a-col :md="6" :sm="24">
@@ -179,51 +179,38 @@
 </template>
 
 <script>
-import {
-  commonMixin
-} from '@/utils/mixin'
-import {
-  salesPromoRealReportList,
-  salesPromoRealReportCount,
-  exportSalesPromoRealReport
-} from '@/api/reportData'
-import {
-  hdExportExcel
-} from '@/libs/exportExcel'
-import {
-  STable,
-  VSelect
-} from '@/components'
+import { commonMixin } from '@/utils/mixin'
+import { hdExportExcel } from '@/libs/exportExcel'
+import getDate from '@/libs/getDate.js'
+// 组件
+import { STable, VSelect } from '@/components'
 import reportModal from '@/views/common/reportModal.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import customerService from '@/views/common/customerService.vue'
 import subarea from '@/views/common/subarea.js'
 import AreaList from '@/views/common/areaList.js'
-import getDate from '@/libs/getDate.js'
+// 接口
+import { salesPromoRealReportList, salesPromoRealReportCount, exportSalesPromoRealReport } from '@/api/reportData'
 export default {
-  name: 'QueryPart',
+  name: 'GatherList',
   mixins: [commonMixin],
-  components: {
-    STable,
-    VSelect,
-    reportModal,
-    AreaList,
-    rangeDate,
-    subarea,
-    customerService
-  },
+  components: { STable, VSelect, reportModal, AreaList, rangeDate, subarea, customerService },
   data () {
     const _this = this
     return {
-      advanced: true, // 高级搜索 展开/关闭
-      time: undefined,
       spinning: false,
-      disabled: false,
-      tableHeight: 0,
-      newQueryParam: { // 查询条件
+      advanced: true, // 高级搜索 展开/关闭
+      disabled: false, //  查询、重置按钮是否可操作
+      tableHeight: 0, // 表格高度
+      exportLoading: false, // 导出按钮加载状态
+      showExport: false, // 导出弹窗
+      time: undefined, // 促销开始时间
+      // 查询条件
+      newQueryParam: {
+        // 下推时间 默认值
         salesDate: [
-          getDate.getCurrMonthDays().starttime,
-          getDate.getCurrMonthDays().endtime
+          getDate.getCurrMonthDays().starttime, // 下推开始时间
+          getDate.getCurrMonthDays().endtime// 下推结束时间
         ],
         beginAuditDate: getDate.getCurrMonthDays().starttime, // 审核开始时间
         endAuditDate: getDate.getCurrMonthDays().endtime, // 审核结束时间
@@ -238,25 +225,20 @@ export default {
         buyerLevel: undefined, // 客户级别
         buyerName: '', // 客户名称
         subareaArea: {
-          subareaSn: '',
-          subareaAreaSn: ''
+          subareaSn: '', // 区域
+          subareaAreaSn: ''// 分区
         },
         dealerProvinceSn: undefined, // 省份编码
         dealerCitySn: undefined, // 城市编码
         dealerDistrictSn: undefined, // 区域编码
-        bizUserSn: undefined
+        bizUserSn: undefined// 客服
       },
       rules: {
-        salesDate: [{
-          required: true,
-          message: '请选择下推时间',
-          trigger: 'change'
-        }]
+        salesDate: [{ required: true, message: '请选择下推时间', trigger: 'change' }]
       },
-      dateFormat: 'YYYY-MM-DD',
-      totalData: null, //  合计
-      exportLoading: false,
-      showExport: false,
+      dateFormat: 'YYYY-MM-DD', // 时间格式
+      totalData: null, //  统计合计
+      // 表格列
       columns: [{
         title: '促销名称',
         dataIndex: 'promotion.title',
@@ -430,10 +412,12 @@ export default {
         this.spinning = true
         this.disabled = true
         const params = Object.assign(parameter, this.newQueryParam)
+        // 促销销售单实时报表 列表  有分页
         return salesPromoRealReportList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
+            // 计算列表序号
             for (var i = 0; i < data.length; i++) {
               data[i].no = i + 1
             }
@@ -446,6 +430,7 @@ export default {
     }
   },
   watch: {
+    // 展开关闭
     advanced (newValue, oldValue) {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
@@ -457,6 +442,7 @@ export default {
     }
   },
   methods: {
+    // 下推时间 change
     salesDateChange (date) {
       if (date[0] && date[1]) {
         this.newQueryParam.salesDate = date
@@ -466,11 +452,13 @@ export default {
       this.newQueryParam.beginAuditDate = date[0] || ''
       this.newQueryParam.endAuditDate = date[1] || ''
     },
+    // 地区
     areaChange (val) {
       this.newQueryParam.dealerProvinceSn = val[0] ? val[0] : ''
       this.newQueryParam.dealerCitySn = val[1] ? val[1] : ''
       this.newQueryParam.dealerDistrictSn = val[2] ? val[2] : ''
     },
+    // 促销开始时间
     dateChange (date, dateString) {
       this.time = date
       if (dateString[0] != '' && dateString[1] != '') {
@@ -481,6 +469,7 @@ export default {
         this.$set(this.newQueryParam.promoRuleReport, 'promotionDateEnd', undefined)
       }
     },
+    // 区域分区
     subareaChange (val) {
       this.newQueryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.newQueryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
@@ -536,6 +525,7 @@ export default {
         _this.showExport = true
       })
     },
+    // 重置
     resetSearchForm () {
       this.$refs.ruleForm.resetFields()
       this.newQueryParam = {
@@ -571,12 +561,14 @@ export default {
       this.$refs.table.clearTable()
       this.totalData = null
     },
+    // 初始化
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
     },
+    // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 260

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

@@ -171,8 +171,8 @@ export default {
       },
       totalData: null, // 统计数据
       columns: [], // 列表表头
-      countLabel: [], // 统计数据表头
-      countBrandLabel: [], // 统计数据品牌表头
+      countLabel: [], // 统计分类数据
+      countBrandLabel: [], // 统计品牌数据
       rules: {
         'time': [{ required: true, message: '请选择下推时间', trigger: 'change' }]
       },

+ 40 - 27
src/views/reportData/salesSlipReport/list.vue

@@ -60,9 +60,9 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
-                <a-form-item label="客服">
+                <a-form-model-item label="客服">
                   <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
-                </a-form-item>
+                </a-form-model-item>
               </a-col>
             </template>
             <a-col :md="isShowCustomerSearch?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: isShowCustomerSearch?'center':''}">
@@ -133,17 +133,19 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import getDate from '@/libs/getDate.js'
+import { hdExportExcel } from '@/libs/exportExcel'
+// 组件
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
-import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import subarea from '@/views/common/subarea.js'
 import reportModal from '@/views/common/reportModal.vue'
 import AreaList from '@/views/common/areaList.js'
 import BizUser from '@/views/common/bizUser.js'
 import customerService from '@/views/common/customerService'
-import { hdExportExcel } from '@/libs/exportExcel'
-import { salesKdxxdReportTitle, salesBillReportList, salesBillReportCount } from '@/api/salesBillReport'
+import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
+// 接口
 import { salesSlipExport } from '@/api/reportData'
+import { salesKdxxdReportTitle, salesBillReportList, salesBillReportCount } from '@/api/salesBillReport'
 export default {
   name: 'SalesSlipReportList',
   mixins: [commonMixin],
@@ -152,46 +154,52 @@ export default {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
-      tableHeight: 0,
-      showExport: false,
-      queryParam: { //  查询条件
+      disabled: false, //  查询、重置按钮是否可操作
+      tableHeight: 0, // 表格高度
+      showExport: false, // 导出弹窗
+      exportLoading: false, // 导出按钮加载状态
+      //  查询条件
+      queryParam: {
+        // 默认下推时间
         time: [
           getDate.getCurrMonthDays().starttime,
           getDate.getCurrMonthDays().endtime
         ],
-        beginDate: getDate.getCurrMonthDays().starttime,
-        endDate: getDate.getCurrMonthDays().endtime,
+        beginDate: getDate.getCurrMonthDays().starttime, // 开始时间
+        endDate: getDate.getCurrMonthDays().endtime, // 结束时间
         salesBillNo: '', //  销售单号
-        dealerSn: undefined,
-        provinceSn: undefined,
-        citySn: undefined,
-        districtSn: undefined,
+        dealerSn: undefined, // 客户sn
+        dealerLevel: undefined, // 客户等级
+        provinceSn: undefined, // 省
+        citySn: undefined, // 市
+        districtSn: undefined, // 区
         subareaArea: {
-          subareaSn: undefined,
-          subareaAreaSn: undefined,
-          bizUserSn: undefined
+          subareaSn: undefined, // 区域
+          subareaAreaSn: undefined, // 分区
+          bizUserSn: undefined// 区域负责人
         },
-        dealerLevel: undefined,
         bizUserSn: undefined// 客服
       },
-      columns: [],
-      countLabel: [],
-      countBrandLabel: [],
+      columns: [], // 表格列
+      countLabel: [], // 统计品牌数据
+      countBrandLabel: [], // 统计分类数据
+      totalData: null, // 统计
       rules: {
         'time': [{ required: true, message: '请选择下推时间', trigger: 'change' }]
       },
-      disabled: false, //  查询、重置按钮是否可操作
-      exportLoading: false,
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        const paramsPage = Object.assign(this.queryParam, { pageNo: parameter.pageNo, pageSize: parameter.pageSize }) //  有分页
+        const paramsPage = Object.assign(this.queryParam, { pageNo: parameter.pageNo, pageSize: parameter.pageSize })
+        // 获取列表数据  有分页
         return salesBillReportList(paramsPage).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
+            // 获取统计数据
             this.getCount(paramsPage)
+            // 计算列表序号
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
@@ -201,11 +209,11 @@ export default {
           this.spinning = false
           return data
         })
-      },
-      totalData: null
+      }
     }
   },
   watch: {
+    // 展开关闭
     advanced (newValue, oldValue) {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
@@ -247,6 +255,7 @@ export default {
         }
       })
     },
+    // 查询
     handleSearch () {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
@@ -258,7 +267,7 @@ export default {
         }
       })
     },
-    //  创建时间  change
+    //  下推时间  change
     dateChange (date) {
       if (date[0] && date[1]) {
         this.queryParam.time = date
@@ -268,9 +277,11 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
+    // 客户名称  change
     custChange (val) {
       this.queryParam.dealerSn = val.key
     },
+    // 区域分区  change
     subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
@@ -303,6 +314,7 @@ export default {
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()
     },
+    // 地区
     areaChange (val) {
       this.queryParam.provinceSn = val[0] ? val[0] : ''
       this.queryParam.citySn = val[1] ? val[1] : ''
@@ -330,6 +342,7 @@ export default {
       })
       this.resetSearchForm()
     },
+    // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 215