| 
					
				 | 
			
			
				@@ -21,11 +21,6 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 <supplier id="billingBackReport-supplierName" v-model="queryParam.supplier.supplierSn" @change="getSupplierName" placeholder="请输入供应商名称"></supplier> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               </a-form-model-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </a-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              <a-form-model-item label="所在区域/分区"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                <subarea id="billingBackReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              </a-form-model-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            </a-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               <a-form-model-item label="地区"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 <AreaList id="billingBackReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -90,9 +85,9 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <script> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { commonMixin } from '@/utils/mixin' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { STable, VSelect } from '@/components' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import getDate from '@/libs/getDate.js' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import rangeDate from '@/views/common/rangeDate.vue' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import AreaList from '@/views/common/areaList.js' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import subarea from '@/views/common/subarea.js' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { hdExportExcel } from '@/libs/exportExcel' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import reportModal from '@/views/common/reportModal.vue' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import supplier from '@/views/common/supplier.js' 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -100,19 +95,18 @@ import { querySupplierPage, querySupplierCount, querySupplierTitle, supplierExpo 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   name: 'RegionTypeSalesReportList', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   mixins: [commonMixin], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  components: { STable, VSelect, rangeDate, subarea, reportModal, AreaList, supplier }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  components: { STable, VSelect, rangeDate, reportModal, AreaList, supplier }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   data () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     return { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       spinning: false, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       showExport: false, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       queryParam: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        time: [], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        beginDate: '', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        endDate: '', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        subareaArea:{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          subareaSn: undefined, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          subareaAreaSn: undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        time: [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          getDate.getCurrMonthDays().starttime, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          getDate.getCurrMonthDays().endtime 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        beginDate: getDate.getCurrMonthDays().starttime, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        endDate: getDate.getCurrMonthDays().endtime, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         supplier: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           supplierSn: undefined, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           supplierName: undefined, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -122,7 +116,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       countLabel: [], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      countBrandLabel:[], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      countBrandLabel: [], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       columns: [], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       disabled: false, //  查询、重置按钮是否可操作 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       exportLoading: false, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -167,7 +161,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 选择供应商 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     getSupplierName (val, item) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.supplier.supplierName = item.supplierName 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.queryParam.supplier.supplierName = item ? item.supplierName : undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.queryParam.supplier.supplierSn = val 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     //  创建时间  change 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -192,32 +186,28 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    subareaChange(val){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     //  重置 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     resetSearchForm () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.$refs.ruleForm.resetFields() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.time = [] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.queryParam.time = [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        getDate.getCurrMonthDays().starttime, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        getDate.getCurrMonthDays().endtime 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      ] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.$refs.rangeDate.resetDate(this.queryParam.time) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.beginDate = '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.endDate = '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.queryParam.beginDate = getDate.getCurrMonthDays().starttime 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.queryParam.endDate = getDate.getCurrMonthDays().endtime 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.queryParam.supplier.supplierName = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.queryParam.supplier.supplierSn = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.queryParam.supplier.provinceSn = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.queryParam.supplier.citySn = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.queryParam.supplier.districtSn = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.subareaArea.subareaSn = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.subareaArea.subareaAreaSn = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.$refs.subarea.clearData() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.$refs.areaList.clearData() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.$refs.table.clearTable() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     areaChange (val) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.provinceSn = val[0] ? val[0] : '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.citySn = val[1] ? val[1] : '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.districtSn = val[2] ? val[2] : '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.queryParam.supplier.provinceSn = val[0] ? val[0] : '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.queryParam.supplier.citySn = val[1] ? val[1] : '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.queryParam.supplier.districtSn = val[2] ? val[2] : '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     //  导出 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     handleExport () { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -245,8 +235,8 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       const _this = this 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       const tableTitle = await querySupplierTitle().then(res => res.data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.columns = tableTitle.list 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌') < 0) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌') >= 0) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.columns.map(item => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         let mw = 40 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (item.customRender == 'amount') { 
			 |