Forráskód Böngészése

Merge branch 'develop_yh45' of jianguan-web/jg-ocs-html into develop_yh47

李磊 9 hónapja
szülő
commit
428dc28c44

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.466",
+    "version": "2.2.45",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 2 - 0
src/views/common/quarterDate.vue

@@ -115,9 +115,11 @@ export default {
   width:100%;
   .quarter-date-year{
     flex:1;
+    width:49%;
   }
   .quarter-date-jd{
     flex:1;
+    width:50%;
   }
 }
 </style>

+ 1 - 1
src/views/dealerManagement/marketingDivisionSetNew/addZoneModal.vue

@@ -141,7 +141,7 @@ export default {
 </script>
 
 <style lang="less">
-  .marketingDivisionSetEdit-modal{
+  .addZone-modal{
     .ant-modal-body {
       padding: 40px 40px 24px;
     }

+ 2 - 2
src/views/reportData/tireFeeReport/index.vue

@@ -6,10 +6,10 @@
           <monthQueryList ref="tireMonthQueryList"></monthQueryList>
         </a-tab-pane>
         <a-tab-pane key="2" tab="轮胎季度费用报表" force-render>
-          <quarterQueryList></quarterQueryList>
+          <quarterQueryList ref="tireQuarterQueryList"></quarterQueryList>
         </a-tab-pane>
         <a-tab-pane key="3" tab="轮胎年度费用报表" force-render>
-          <yearQueryList></yearQueryList>
+          <yearQueryList ref="tireYearQueryList"></yearQueryList>
         </a-tab-pane>
       </a-tabs>
     </a-card>

+ 17 - 16
src/views/reportData/tireFeeReport/monthQueryList.vue

@@ -112,7 +112,10 @@
           bordered>
           <!-- 地区 -->
           <template slot="addressInfo" slot-scope="text, record">
-            {{ record.dealerEntity.provinceName }}{{ '/'+record.dealerEntity.cityName }}{{ '/'+record.dealerEntity.districtName }}
+            <span v-if="record.dealerEntity&&record.dealerEntity.provinceName">
+              {{ record.dealerEntity.provinceName }}{{ '/'+record.dealerEntity.cityName }}{{ '/'+record.dealerEntity.districtName }}
+            </span>
+            <span v-else>--</span>
           </template>
           <!-- 是否是省仓客户 -->
           <template slot="provinceFlag" slot-scope="text, record">
@@ -232,22 +235,22 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '地区', scopedSlots: { customRender: 'addressInfo' }, width: '15%', align: 'center' },
+        { title: '地区', scopedSlots: { customRender: 'addressInfo' }, width: '12%', align: 'center' },
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: '13%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealerEntity.dealerLevelDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '轮胎省仓', dataIndex: 'provinceFlag', scopedSlots: { customRender: 'provinceFlag' }, width: '10%', align: 'center' },
-        { title: '轮胎省仓名称', dataIndex: 'parentDealerEntity.dealerName', width: '13%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '总量提升奖励', dataIndex: 'increaseRewardAmount', width: '12%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: <div>总量工厂<div>承担60%</div></div>, dataIndex: 'increaseRewardShareFactory', width: '12%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: <div>总量供应链管理部<div>承担40%</div></div>, dataIndex: 'increaseRewardShareSys', width: '15%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: <a-tooltip placement='top' title='轮胎轮胎省仓出库加盟商数量*5'>运费补贴&nbsp;<a-icon type="question-circle" /></a-tooltip>, dataIndex: 'transSubsidy', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '轮胎省仓', dataIndex: 'provinceFlag', scopedSlots: { customRender: 'provinceFlag' }, width: '8%', align: 'center' },
+        { title: '轮胎省仓名称', dataIndex: 'parentDealerEntity.dealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '总量提升奖励', dataIndex: 'increaseRewardAmount', width: '11%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: <div>总量工厂<div>承担60%</div></div>, dataIndex: 'increaseRewardShareFactory', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: <div>总量供应链管理部<div>承担40%</div></div>, dataIndex: 'increaseRewardShareSys', width: '13%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: <a-tooltip placement='top' title='轮胎省仓出库加盟商数量*5'>运费补贴&nbsp;<a-icon type="question-circle" /></a-tooltip>, dataIndex: 'transSubsidy', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: <a-tooltip placement='top' title='截止当前时间的往期累计积分'>累计积分&nbsp;<a-icon type="question-circle" /></a-tooltip>, dataIndex: 'totalPoint', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: <div>当期积分<div>返利券</div></div>, dataIndex: 'currentPoint', width: '12%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: <div>积分工厂<div>承担60%</div></div>, dataIndex: 'currentPointShareFactory', width: '12%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: <div>当期积分<div>返利券</div></div>, dataIndex: 'currentPoint', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: <div>积分工厂<div>承担60%</div></div>, dataIndex: 'currentPointShareFactory', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: <div>积分供应链管理部<div>承担40%</div></div>, dataIndex: 'currentPointShareSys', width: '15%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '平台服务费', dataIndex: 'serviceAmountSys', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '省仓服务费', dataIndex: 'serviceAmountProvince', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '轮胎省仓服务费', dataIndex: 'serviceAmountProvince', width: '11%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       return arr
     }
@@ -261,7 +264,7 @@ export default {
     //   } else {
     //     nowDate = dateInfo
     //   }
-    //   // 月份的第一天
+    //   月份的第一天
     //   const firstDayOfMonth = moment(nowDate).format('YYYY-MM-DD') + ' 00:00:00'
     //   // 月份的最后一天
     //   const lastDayOfMonth = moment(nowDate).endOf('month').format('YYYY-MM-DD') + ' 23:59:59'
@@ -378,6 +381,7 @@ export default {
       this.$nextTick(() => { // 页面渲染完成后的回调
         this.setTableH()
       })
+      this.resetSearchForm()
     },
     // 计算表格高度
     setTableH () {
@@ -395,9 +399,6 @@ export default {
     if (this.$store.state.app.isNewTab) {
       this.pageInit()
     }
-  },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {})
   }
 }
 </script>

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

@@ -88,17 +88,21 @@
           :scroll="{ y: tableHeight-120}"
           :defaultLoadData="false"
           bordered>
+          <!-- 地区 -->
           <template slot="addressInfo" slot-scope="text, record">
-            {{ record.dealerEntity.provinceName }}{{ '/'+record.dealerEntity.cityName }}{{ '/'+record.dealerEntity.districtName }}
+            <span v-if="record.dealerEntity&&record.dealerEntity.provinceName">
+              {{ record.dealerEntity.provinceName }}{{ '/'+record.dealerEntity.cityName }}{{ '/'+record.dealerEntity.districtName }}
+            </span>
+            <span v-else>--</span>
           </template>
           <template slot="footer">
             <a-row :gutter="15">
-              <a-col :md="4" :sm="24">轮胎省仓返利金额:{{ (totalData && (totalData.rebateAmountProvince || totalData.rebateAmountProvince==0)) ? toThousands(totalData.rebateAmountProvince): '--' }}</a-col>
               <a-col :md="4" :sm="24">平台出库数量:{{ (totalData && (totalData.outQty || totalData.outQty==0)) ? totalData.outQty: '--' }}</a-col>
               <a-col :md="4" :sm="24">平台返利点数:{{ (totalData && (totalData.rebatePointsSys || totalData.rebatePointsSys==0)) ? (totalData.rebatePointsSys*100).toFixed(2)+'%': '--' }}</a-col>
               <a-col :md="4" :sm="24">开单金额:{{ (totalData && (totalData.outAmount || totalData.outAmount==0)) ? toThousands(totalData.outAmount): '--' }}</a-col>
               <a-col :md="4" :sm="24">平台返利金额:{{ (totalData && (totalData.rebateAmountSys || totalData.rebateAmountSys==0)) ? toThousands(totalData.rebateAmountSys): '--' }}</a-col>
               <a-col :md="4" :sm="24"><a-tooltip placement="top" title="开单金额合计*1.5%">广宣品费用&nbsp;<a-icon type="question-circle" /></a-tooltip>:{{ (totalData && (totalData.posterAmount || totalData.posterAmount==0)) ? toThousands(totalData.posterAmount): '--' }}</a-col>
+              <a-col :md="4" :sm="24">轮胎省仓返利金额:{{ (totalData && (totalData.rebateAmountProvince || totalData.rebateAmountProvince==0)) ? toThousands(totalData.rebateAmountProvince): '--' }}</a-col>
             </a-row>
           </template>
         </s-table>
@@ -200,11 +204,11 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '地区', scopedSlots: { customRender: 'addressInfo' }, width: '15%', align: 'center' },
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: '14%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealerEntity.dealerLevelDictValue', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: <a-tooltip placement='top' title='平台销售给该轮胎省仓及轮胎省仓差价绑定的加盟商的数量合计'>平台出库数量&nbsp;<a-icon type="question-circle" /></a-tooltip>, dataIndex: 'outQty', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '开单金额', dataIndex: 'outAmount', width: '14%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '轮胎省仓返利点数', dataIndex: 'rebatePointProvince', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '轮胎省仓返利点数', dataIndex: 'rebatePointProvince', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? (text * 100).toFixed(2) + '%' : '--') } },
         { title: '轮胎省仓返利金额', dataIndex: 'rebateAmountProvince', width: '14%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       return arr
@@ -213,8 +217,8 @@ export default {
   methods: {
     // 获取季度默认值
     getQuarterVal () {
-      // 获取上个月是今年的第几季度
-      const lastQuarter = moment().subtract(1, 'month').quarter()
+      // 获取月是今年的第几季度
+      const lastQuarter = moment().quarter()
       // 获取今年年份
       const thisYear = moment().year()
       this.timeInfo = [thisYear, lastQuarter]
@@ -318,7 +322,7 @@ export default {
       this.$nextTick(() => { // 页面渲染完成后的回调
         this.setTableH()
       })
-      this.getQuarterVal()
+      this.resetSearchForm()
     },
     // 计算表格高度
     setTableH () {
@@ -336,9 +340,6 @@ export default {
     if (this.$store.state.app.isNewTab) {
       this.pageInit()
     }
-  },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {})
   }
 }
 </script>

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

@@ -100,15 +100,18 @@
           bordered>
           <!-- 地区 -->
           <template slot="addressInfo" slot-scope="text, record">
-            {{ record.dealerEntity.provinceName }}{{ '/'+record.dealerEntity.cityName }}{{ '/'+record.dealerEntity.districtName }}
+            <span v-if="record.dealerEntity&&record.dealerEntity.provinceName">
+              {{ record.dealerEntity.provinceName }}{{ '/'+record.dealerEntity.cityName }}{{ '/'+record.dealerEntity.districtName }}
+            </span>
+            <span v-else>--</span>
           </template>
           <template slot="footer">
             <a-row :gutter="15">
-              <a-col :md="4" :sm="24">轮胎省仓返利金额:{{ (totalData && (totalData.rebateAmountProvince || totalData.rebateAmountProvince==0)) ? toThousands(totalData.rebateAmountProvince): '--' }}</a-col>
               <a-col :md="4" :sm="24">平台出库数量:{{ (totalData && (totalData.outQty || totalData.outQty==0)) ? totalData.outQty: '--' }}</a-col>
               <a-col :md="4" :sm="24">平台返利点数:{{ (totalData && (totalData.rebatePointsSys || totalData.rebatePointsSys==0)) ? (totalData.rebatePointsSys*100).toFixed(2)+'%': '--' }}</a-col>
               <a-col :md="4" :sm="24">开单金额:{{ (totalData && (totalData.outAmount || totalData.outAmount==0)) ? toThousands(totalData.outAmount): '--' }}</a-col>
               <a-col :md="4" :sm="24">平台返利金额:{{ (totalData && (totalData.rebateAmountSys || totalData.rebateAmountSys==0)) ? toThousands(totalData.rebateAmountSys): '--' }}</a-col>
+              <a-col :md="4" :sm="24">轮胎省仓返利金额:{{ (totalData && (totalData.rebateAmountProvince || totalData.rebateAmountProvince==0)) ? toThousands(totalData.rebateAmountProvince): '--' }}</a-col>
             </a-row>
           </template>
         </s-table>
@@ -147,7 +150,7 @@ export default {
       //  查询条件
       queryParam: {
         queryType: 'year', // 轮胎年度费用报表
-        queryDate: moment().subtract(1, 'years').format('YYYY'), // 选择年份
+        queryDate: moment().year(), // 选择年份
         dealerLevel: undefined, // 客户等级
         customSn: undefined, // 客户sn
         subareaArea: {
@@ -221,11 +224,11 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '地区', scopedSlots: { customRender: 'addressInfo' }, width: '15%', align: 'center' },
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: '18%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: '18%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealerEntity.dealerLevelDictValue', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: <a-tooltip placement='top' title='平台销售给该轮胎省仓及轮胎省仓差价绑定的加盟商的数量合计'>平台出库数量&nbsp;<a-icon type="question-circle" /></a-tooltip>, dataIndex: 'outQty', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '开单金额', dataIndex: 'outAmount', width: '13%', align: 'right', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '轮胎省仓返利点数', dataIndex: 'rebatePointProvince', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '轮胎省仓返利点数', dataIndex: 'rebatePointProvince', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? (text * 100).toFixed(2) + '%' : '--') } },
         { title: '轮胎省仓返利金额', dataIndex: 'rebateAmountProvince', width: '15%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       return arr
@@ -281,8 +284,8 @@ export default {
     //  重置
     resetSearchForm () {
       this.queryParam.queryType = 'year'
-      const lastYear = moment().subtract(1, 'years').format('YYYY')
-      this.queryParam.queryDate = lastYear
+      const nowYear = moment().year()
+      this.queryParam.queryDate = nowYear
       this.queryParam.dealerEntity.provinceSn = undefined
       this.queryParam.dealerEntity.citySn = undefined
       this.queryParam.dealerEntity.districtSn = undefined
@@ -329,6 +332,7 @@ export default {
       this.$nextTick(() => { // 页面渲染完成后的回调
         this.setTableH()
       })
+      this.resetSearchForm()
     },
     // 计算表格高度
     setTableH () {
@@ -346,9 +350,6 @@ export default {
     if (this.$store.state.app.isNewTab) {
       this.pageInit()
     }
-  },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {})
   }
 }
 </script>

+ 26 - 24
src/views/reportData/tireSalesReport/detailList.vue

@@ -41,7 +41,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户级别">
                   <v-select
-                    v-model="queryParam.dealerLevel"
+                    v-model="queryParam.dealer.dealerLevel"
                     ref="dealerLevel"
                     id="tireSalesReportList-dealerLevel"
                     code="DEALER_LEVEL"
@@ -61,7 +61,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="轮胎省仓名称">
-                  <dealerSubareaScopeList ref="provinceDealerList" placeholder="请输入轮胎省仓名称" id="tireSalesDealerList-custProvinceName" @change="custProvinceChange" />
+                  <dealerSubareaScopeList ref="provinceDealerList" placeholder="请输入轮胎省仓名称" id="tireSalesDealerList-parentDealerName" @change="custProvinceChange" />
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -168,8 +168,8 @@
               <a-col :md="4" :sm="24" v-if="$hasPermissions('M_tireSalesReportList_salesPrice')">客户现有库存金额:{{ (totalData&&totalData.rptDealerStockVO && (totalData.rptDealerStockVO.totalStockAmount || totalData.rptDealerStockVO.totalStockAmount==0)) ? toThousands(totalData.rptDealerStockVO.totalStockAmount): '--' }}</a-col>
               <a-col :md="4" :sm="24">出库加盟商数量:{{ (totalData && (totalData.outQtyDealer || totalData.outQtyDealer==0)) ?totalData.outQtyDealer: '--' }}</a-col>
               <a-col :md="4" :sm="24" v-if="$hasPermissions('M_tireSalesReportList_salesPrice')">出库加盟商金额:{{ (totalData && (totalData.outAmountDealer || totalData.outAmountDealer==0)) ? toThousands(totalData.outAmountDealer): '--' }}</a-col>
-              <a-col :md="4" :sm="24">出库跨区域数量:{{ (totalData && (totalData.outQtyDealer || totalData.outQtyDealer==0)) ?totalData.outQtyDealer: '--' }}</a-col>
-              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_tireSalesReportList_salesPrice')">出库跨区域金额:{{ (totalData && (totalData.outAmountDealer || totalData.outAmountDealer==0)) ? toThousands(totalData.outAmountDealer): '--' }}</a-col>
+              <a-col :md="4" :sm="24">出库跨区域数量:{{ (totalData && (totalData.crossRegionOutQty || totalData.crossRegionOutQty==0)) ?totalData.crossRegionOutQty: '--' }}</a-col>
+              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_tireSalesReportList_salesPrice')">出库跨区域金额:{{ (totalData && (totalData.crossRegionOutAmount || totalData.crossRegionOutAmount==0)) ? toThousands(totalData.crossRegionOutAmount): '--' }}</a-col>
               <a-col :md="4" :sm="24">出库终端数量:{{ (totalData && (totalData.outQtyTerminal || totalData.outQtyTerminal==0)) ?totalData.outQtyTerminal: '--' }}</a-col>
               <a-col :md="4" :sm="24" v-if="$hasPermissions('M_tireSalesReportList_salesPrice')">出库终端金额:{{ (totalData && (totalData.outAmountTerminal || totalData.outAmountTerminal==0)) ? toThousands(totalData.outAmountTerminal): '--' }}</a-col>
               <a-col :md="4" :sm="24">累计出库数量:{{ (totalData && (totalData.outQty || totalData.outQty==0)) ?totalData.outQty: '--' }}</a-col>
@@ -219,10 +219,12 @@ export default {
         time: [], // 日期
         bizBeginDate: '', // 开始时间
         bizEndDate: '', // 结束时间
-        provinceSn: undefined, // 省
-        citySn: undefined, // 市
-        districtSn: undefined, // 区
-        dealerLevel: undefined, // 客户等级
+        dealer: {
+          provinceSn: undefined, // 省
+          citySn: undefined, // 市
+          districtSn: undefined, // 区
+          dealerLevel: undefined // 客户等级
+        },
         dealerName: undefined, // 客户名称
         dealerSn: undefined, // 客户sn
         subareaArea: {
@@ -233,10 +235,9 @@ export default {
         productWord: '', // 产品编码/原厂编码
         productName: '', // 产品名称
         parentDealerSn: undefined, // 轮胎省仓sn
-        parentDealerEntity: {
-          dealerName: undefined // 轮胎省仓名称
-        },
-        provinceFlag: undefined// 是否是轮胎省仓 1是 0否
+        parentDealerName: undefined, // 轮胎省仓名称
+        provinceFlag: undefined, // 是否是轮胎省仓 1是 0否
+        bizUserSn: undefined// 客服
       },
       totalData: null, // 合计
       showOutDetail: false, // 出库明细弹窗
@@ -293,7 +294,7 @@ export default {
         { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户级别', dataIndex: 'dealerEntity.dealerLevelDictValue', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '轮胎省仓', dataIndex: 'provinceFlag', width: '80px', align: 'center', customRender: function (text) { return text == '1' ? '是' : '否' } },
-        { title: '轮胎省仓名称', dataIndex: 'parentDealerEntity.dealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '轮胎省仓名称', dataIndex: 'parentDealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'productEntity.origCode', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品尺寸', dataIndex: 'productEntity.size', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
@@ -305,7 +306,7 @@ export default {
         { title: '退货数量', dataIndex: 'returnQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: <div>客户现有<div>库存数量</div></div>, dataIndex: 'rptDealerStockVO.totalStockQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: <div>出库加盟商<div>数量</div></div>, dataIndex: 'outQtyDealer', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: <div>出库跨区域<div>数量</div></div>, dataIndex: 'outQtyTerminal', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: <div>出库跨区域<div>数量</div></div>, dataIndex: 'crossRegionOutQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: <div>出库终端<div>数量</div></div>, dataIndex: 'outQtyTerminal', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: <div>累计出库<div>数量</div></div>, dataIndex: 'outQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: <div>已绑质保单<div>数量</div></div>, dataIndex: 'rptDealerStockVO.totalWarrantyQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -319,7 +320,7 @@ export default {
         arr.splice(22, 0, { title: '退货金额', dataIndex: 'returnAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(24, 0, { title: '客户现有库存金额', dataIndex: 'rptDealerStockVO.totalStockAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(26, 0, { title: '出库加盟商金额', dataIndex: 'outAmountDealer', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(28, 0, { title: '出库跨区域金额', dataIndex: 'outAmountTerminal', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(28, 0, { title: '出库跨区域金额', dataIndex: 'crossRegionOutAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(30, 0, { title: '出库终端金额', dataIndex: 'outAmountTerminal', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(32, 0, { title: '累计出库金额', dataIndex: 'outAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
@@ -346,7 +347,7 @@ export default {
     },
     // 轮胎省仓客户名称 change
     custProvinceChange (val) {
-      this.queryParam.parentDealerEntity.dealerName = val.name
+      this.queryParam.parentDealerName = val.name
       this.queryParam.parentDealerSn = val.key
     },
     // 统计
@@ -380,9 +381,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.dealer.provinceSn = val[0] ? val[0] : undefined
+      this.queryParam.dealer.citySn = val[1] ? val[1] : undefined
+      this.queryParam.dealer.districtSn = val[2] ? val[2] : undefined
     },
     //  日期选择  change
     dateChange (date) {
@@ -405,20 +406,21 @@ export default {
       this.$refs.rangeDate.resetDate()
       this.queryParam.bizBeginDate = ''
       this.queryParam.bizEndDate = ''
-      this.queryParam.provinceSn = undefined
-      this.queryParam.citySn = undefined
-      this.queryParam.districtSn = undefined
+      this.queryParam.dealer.provinceSn = undefined
+      this.queryParam.dealer.citySn = undefined
+      this.queryParam.dealer.districtSn = undefined
       this.queryParam.dealerName = undefined
       this.queryParam.dealerSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
-      this.queryParam.dealerLevel = undefined
+      this.queryParam.dealer.dealerLevel = undefined
       this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.productWord = undefined
       this.queryParam.productName = undefined
       this.queryParam.parentDealerSn = undefined
-      this.queryParam.parentDealerEntity.dealerName = undefined
+      this.queryParam.parentDealerName = undefined
       this.queryParam.provinceFlag = undefined
+      this.queryParam.bizUserSn = undefined
       this.$refs.subarea.clearData()
       if (this.advanced) {
         this.$refs.dealerSubareaScopeList.resetForm()

+ 50 - 48
src/views/reportData/tireSalesReport/list.vue

@@ -41,7 +41,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户级别">
                   <v-select
-                    v-model="queryParam.dealerLevel"
+                    v-model="queryParam.dealer.dealerLevel"
                     ref="dealerLevel"
                     id="tireSalesDealerList-dealerLevel"
                     code="DEALER_LEVEL"
@@ -61,7 +61,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="轮胎省仓名称">
-                  <dealerSubareaScopeList ref="provinceDealerList" placeholder="请输入轮胎省仓名称" id="tireSalesDealerList-custProvinceName" @change="custProvinceChange" />
+                  <dealerSubareaScopeList ref="provinceDealerList" placeholder="请输入轮胎省仓名称" id="tireSalesDealerList-parentDealerName" @change="custProvinceChange" />
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -139,8 +139,8 @@
               <a-col :md="4" :sm="24" v-if="$hasPermissions('M_tireSalesReportList_salesPrice')">客户现有库存金额:{{ (totalData&&totalData.rptDealerStockVO && (totalData.rptDealerStockVO.totalStockAmount || totalData.rptDealerStockVO.totalStockAmount==0)) ? toThousands(totalData.rptDealerStockVO.totalStockAmount): '--' }}</a-col>
               <a-col :md="4" :sm="24">出库加盟商数量:{{ (totalData && (totalData.outQtyDealer || totalData.outQtyDealer==0)) ?totalData.outQtyDealer: '--' }}</a-col>
               <a-col :md="4" :sm="24" v-if="$hasPermissions('M_tireSalesReportList_salesPrice')">出库加盟商金额:{{ (totalData && (totalData.outAmountDealer || totalData.outAmountDealer==0)) ? toThousands(totalData.outAmountDealer): '--' }}</a-col>
-              <a-col :md="4" :sm="24">出库跨区域数量:{{ (totalData && (totalData.outQtyTerminal || totalData.outQtyTerminal==0)) ?totalData.outQtyTerminal: '--' }}</a-col>
-              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_tireSalesReportList_salesPrice')">出库跨区域金额:{{ (totalData && (totalData.outAmountTerminal || totalData.outAmountTerminal==0)) ? toThousands(totalData.outAmountTerminal): '--' }}</a-col>
+              <a-col :md="4" :sm="24">出库跨区域数量:{{ (totalData && (totalData.crossRegionOutQty || totalData.crossRegionOutQty==0)) ?totalData.crossRegionOutQty: '--' }}</a-col>
+              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_tireSalesReportList_salesPrice')">出库跨区域金额:{{ (totalData && (totalData.crossRegionOutAmount || totalData.crossRegionOutAmount==0)) ? toThousands(totalData.crossRegionOutAmount): '--' }}</a-col>
               <a-col :md="4" :sm="24">出库终端数量:{{ (totalData && (totalData.outQtyTerminal || totalData.outQtyTerminal==0)) ?totalData.outQtyTerminal: '--' }}</a-col>
               <a-col :md="4" :sm="24" v-if="$hasPermissions('M_tireSalesReportList_salesPrice')">出库终端金额:{{ (totalData && (totalData.outAmountTerminal || totalData.outAmountTerminal==0)) ? toThousands(totalData.outAmountTerminal): '--' }}</a-col>
               <a-col :md="4" :sm="24">累计出库数量:{{ (totalData && (totalData.outQty || totalData.outQty==0)) ?totalData.outQty: '--' }}</a-col>
@@ -187,10 +187,12 @@ export default {
         time: [], // 日期
         bizBeginDate: '', // 开始时间
         bizEndDate: '', // 结束时间
-        provinceSn: undefined, // 省份编码
-        citySn: undefined, // 市编码
-        districtSn: undefined, // 区编码
-        dealerLevel: undefined, // 客户等级
+        dealer: {
+          provinceSn: undefined, // 省份编码
+          citySn: undefined, // 市编码
+          districtSn: undefined, // 区编码
+          dealerLevel: undefined // 客户等级
+        },
         dealerName: undefined, // 客户名称
         dealerSn: undefined, // 客户sn
         subareaArea: {
@@ -199,10 +201,9 @@ export default {
           bizUserSn: undefined // 区域负责人
         },
         parentDealerSn: undefined, // 轮胎省仓sn
-        parentDealerEntity: {
-          dealerName: undefined // 轮胎省仓名称
-        },
-        provinceFlag: undefined// 是否是轮胎省仓 1是 0否
+        parentDealerName: undefined, // 轮胎省仓名称
+        provinceFlag: undefined, // 是否是轮胎省仓 1是 0否
+        bizUserSn: undefined// 客服
       },
       rules: {
         'time': [{ required: true, message: '请选择日期', trigger: 'change' }]
@@ -251,40 +252,40 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '地区', scopedSlots: { customRender: 'addressInfo' }, width: '12%', align: 'center' },
-        { title: '区域', dataIndex: 'subareaArea.subareaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '区域负责人', dataIndex: 'bizUserName', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '客户级别', dataIndex: 'dealerEntity.dealerLevelDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '轮胎省仓', dataIndex: 'provinceFlag', width: '8%', align: 'center', customRender: function (text) { return text == '1' ? '是' : '否' } },
-        { title: '轮胎省仓名称', dataIndex: 'parentDealerEntity.dealerName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '任务数量', dataIndex: 'dealerEntity.taskNum', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总部订货数量', dataIndex: 'sysOrderQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '上级订货数量', dataIndex: 'upOrderQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '序号', dataIndex: 'no', width: '40px', align: 'center' },
+        { title: '地区', scopedSlots: { customRender: 'addressInfo' }, width: '100px', align: 'center' },
+        { title: '区域', dataIndex: 'subareaArea.subareaName', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '区域负责人', dataIndex: 'bizUserName', width: '90px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户级别', dataIndex: 'dealerEntity.dealerLevelDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '轮胎省仓', dataIndex: 'provinceFlag', width: '80px', align: 'center', customRender: function (text) { return text == '1' ? '是' : '否' } },
+        { title: '轮胎省仓名称', dataIndex: 'parentDealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '任务数量', dataIndex: 'dealerEntity.taskNum', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总部订货数量', dataIndex: 'sysOrderQty', width: '90px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '上级订货数量', dataIndex: 'upOrderQty', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '跨地区订货数量', dataIndex: 'crossRegionQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '累计入库数量', dataIndex: 'putQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '累计入库数量', dataIndex: 'putQty', width: '90px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '退货数量', dataIndex: 'returnQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '客户现有库存数量', dataIndex: 'rptDealerStockVO.totalStockQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '出库加盟商数量', dataIndex: 'outQtyDealer', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '出库跨区域数量', dataIndex: 'outQtyTerminal', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '出库终端数量', dataIndex: 'outQtyTerminal', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '累计出库数量', dataIndex: 'outQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '出库跨区域数量', dataIndex: 'crossRegionOutQty', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '出库终端数量', dataIndex: 'outQtyTerminal', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '累计出库数量', dataIndex: 'outQty', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: <div>已绑质保单<div>数量</div></div>, dataIndex: 'rptDealerStockVO.totalWarrantyQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       if (this.$hasPermissions('M_tireSalesReportList_salesPrice')) {
-        arr.splice(10, 0, { title: '授信金额', dataIndex: 'dealerEntity.taskAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(12, 0, { title: '总部订货金额', dataIndex: 'sysOrderAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(14, 0, { title: '上级订货金额', dataIndex: 'upOrderAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(16, 0, { title: '跨地区订货金额', dataIndex: 'crossRegionAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(18, 0, { title: '累计入库金额', dataIndex: 'putAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(20, 0, { title: '退货金额', dataIndex: 'returnAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(22, 0, { title: '客户现有库存金额', dataIndex: 'rptDealerStockVO.totalStockAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(24, 0, { title: '出库加盟商金额', dataIndex: 'outAmountDealer', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(26, 0, { title: '出库跨区域金额', dataIndex: 'outAmountTerminal', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(28, 0, { title: '出库终端金额', dataIndex: 'outAmountTerminal', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(30, 0, { title: '累计出库金额', dataIndex: 'outAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(10, 0, { title: '授信金额', dataIndex: 'dealerEntity.taskAmount', width: '90px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(12, 0, { title: '总部订货金额', dataIndex: 'sysOrderAmount', width: '90px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(14, 0, { title: '上级订货金额', dataIndex: 'upOrderAmount', width: '90px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(16, 0, { title: '跨地区订货金额', dataIndex: 'crossRegionAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(18, 0, { title: '累计入库金额', dataIndex: 'putAmount', width: '90px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(20, 0, { title: '退货金额', dataIndex: 'returnAmount', width: '90px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(22, 0, { title: '客户现有库存金额', dataIndex: 'rptDealerStockVO.totalStockAmount', width: '90px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(24, 0, { title: '出库加盟商金额', dataIndex: 'outAmountDealer', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(26, 0, { title: '出库跨区域金额', dataIndex: 'crossRegionOutAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(28, 0, { title: '出库终端金额', dataIndex: 'outAmountTerminal', width: '90px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(30, 0, { title: '累计出库金额', dataIndex: 'outAmount', width: '90px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }
@@ -309,7 +310,7 @@ export default {
     },
     // 轮胎省仓客户名称 change
     custProvinceChange (val) {
-      this.queryParam.parentDealerEntity.dealerName = val.name
+      this.queryParam.parentDealerName = val.name
       this.queryParam.parentDealerSn = val.key
     },
     // 统计
@@ -324,9 +325,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.dealer.provinceSn = val[0] ? val[0] : undefined
+      this.queryParam.dealer.citySn = val[1] ? val[1] : undefined
+      this.queryParam.dealer.districtSn = val[2] ? val[2] : undefined
     },
     //  日期选择  change
     dateChange (date) {
@@ -349,18 +350,19 @@ export default {
       this.$refs.rangeDate.resetDate()
       this.queryParam.bizBeginDate = ''
       this.queryParam.bizEndDate = ''
-      this.queryParam.provinceSn = undefined
-      this.queryParam.citySn = undefined
-      this.queryParam.districtSn = undefined
+      this.queryParam.dealer.provinceSn = undefined
+      this.queryParam.dealer.citySn = undefined
+      this.queryParam.dealer.districtSn = undefined
       this.queryParam.dealerName = undefined
       this.queryParam.dealerSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.subareaArea.bizUserSn = undefined
-      this.queryParam.dealerLevel = undefined
+      this.queryParam.dealer.dealerLevel = undefined
       this.queryParam.parentDealerSn = undefined
-      this.queryParam.parentDealerEntity.dealerName = undefined
+      this.queryParam.parentDealerName = undefined
       this.queryParam.provinceFlag = undefined
+      this.queryParam.bizUserSn = undefined
       this.totalData = null
       this.$refs.areaList.clearData()
       if (this.advanced) {