lilei 3 달 전
부모
커밋
d13d3df761

+ 8 - 15
src/views/reportData/tireSubsidyReport/incrementalSubsidyList.vue

@@ -83,13 +83,6 @@
           :pagination="{pageSizeOptions: ['20','50','100','200','500']}"
           :defaultLoadData="false"
           bordered>
-          <!-- 地区 -->
-          <template slot="addressInfo" slot-scope="text, record">
-            <span v-if="record.dealerEntity&&record.dealerEntity.provinceName">
-              {{ record.dealerEntity.provinceName }}
-            </span>
-            <span v-else>--</span>
-          </template>
           <template slot="footer">
             <a-row :gutter="15">
               <a-col :md="4" :sm="24">订货数量合计:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty: '--' }}</a-col>
@@ -135,7 +128,7 @@ export default {
           subareaAreaSn: '' // 分区
         },
         dealerSn: undefined, // 客户sn
-        dealerEntity: {
+        dealer: {
           provinceSn: undefined, // 省
           citySn: undefined, // 市
           districtSn: undefined // 区
@@ -194,7 +187,7 @@ export default {
         { title: '季度', dataIndex: 'quarter', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '省份', scopedSlots: { customRender: 'addressInfo' }, width: '10%', align: 'center' },
+        { title: '省份', dataIndex: 'provinceName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'dealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '订货数量(总部)', dataIndex: 'salesQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '订货数量(转单)', dataIndex: 'transferQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -246,9 +239,9 @@ export default {
     },
     // 地区
     areaChange (val) {
-      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
+      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, valStr) {
@@ -268,9 +261,9 @@ export default {
     resetSearchForm () {
       this.queryParam.subsidyType = 'QUARTER'
       this.queryParam.queryDate = undefined
-      this.queryParam.dealerEntity.provinceSn = undefined
-      this.queryParam.dealerEntity.citySn = undefined
-      this.queryParam.dealerEntity.districtSn = undefined
+      this.queryParam.dealer.provinceSn = undefined
+      this.queryParam.dealer.citySn = undefined
+      this.queryParam.dealer.districtSn = undefined
       this.queryParam.subareaArea.subareaSn = ''
       this.queryParam.subareaArea.subareaAreaSn = ''
       this.queryParam.dealerName = undefined

+ 8 - 15
src/views/reportData/tireSubsidyReport/incrementalSubsidyYearList.vue

@@ -93,13 +93,6 @@
           :pagination="{pageSizeOptions: ['20','50','100','200','500']}"
           :defaultLoadData="false"
           bordered>
-          <!-- 地区 -->
-          <template slot="addressInfo" slot-scope="text, record">
-            <span v-if="record.dealerEntity&&record.dealerEntity.provinceName">
-              {{ record.dealerEntity.provinceName }}
-            </span>
-            <span v-else>--</span>
-          </template>
           <template slot="footer">
             <a-row :gutter="15">
               <a-col :md="4" :sm="24">订货数量合计:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty: '--' }}</a-col>
@@ -144,7 +137,7 @@ export default {
           subareaAreaSn: '' // 分区
         },
         customSn: undefined, // 客户sn
-        dealerEntity: {
+        dealer: {
           dealerName: undefined, // 客户名称
           provinceSn: undefined, // 省
           citySn: undefined, // 市
@@ -207,7 +200,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '省份', scopedSlots: { customRender: 'addressInfo' }, width: '10%', align: 'center' },
+        { title: '省份', dataIndex: 'provinceName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'dealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '订货数量(总部)', dataIndex: 'salesQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '订货数量(转单)', dataIndex: 'transferQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -260,9 +253,9 @@ export default {
     },
     // 地区
     areaChange (val) {
-      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
+      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
     subareaChange (val) {
@@ -273,9 +266,9 @@ export default {
     resetSearchForm () {
       this.queryParam.subsidyType = 'YEAR'
       this.queryParam.bizYear = moment().year()
-      this.queryParam.dealerEntity.provinceSn = undefined
-      this.queryParam.dealerEntity.citySn = undefined
-      this.queryParam.dealerEntity.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 = ''

+ 8 - 15
src/views/reportData/tireSubsidyReport/serviceFreightDetailList.vue

@@ -127,13 +127,6 @@
           :scroll="{ y: tableHeight-120}"
           :defaultLoadData="false"
           bordered>
-          <!-- 地区 -->
-          <template slot="addressInfo" slot-scope="text, record">
-            <span v-if="record.dealerEntity&&record.dealerEntity.provinceName">
-              {{ record.dealerEntity.provinceName }}
-            </span>
-            <span v-else>--</span>
-          </template>
           <template slot="footer">
             <a-row :gutter="15">
               <a-col :md="6" :sm="24">服务费金额:{{ (totalData && (totalData.subsidyServiceAmount || totalData.subsidyServiceAmount==0)) ? toThousands(totalData.subsidyServiceAmount): '--' }}</a-col>
@@ -185,7 +178,7 @@ export default {
           subareaSn: undefined, // 区域
           subareaAreaSn: undefined // 分区
         },
-        dealerEntity: {
+        dealer: {
           provinceSn: undefined,
           citySn: undefined,
           districtSn: undefined
@@ -245,7 +238,7 @@ export default {
         { title: '业务单号', dataIndex: 'bizNo', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { 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: '省份', scopedSlots: { customRender: 'addressInfo' }, width: '80px', align: 'center' },
+        { title: '省份', dataIndex: 'provinceName', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '记账主体', dataIndex: 'belongDealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '轮胎省仓', dataIndex: 'belongProvinceFlagDictValue', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售数量', dataIndex: 'bizQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -309,9 +302,9 @@ export default {
     },
     // 地区省份
     areaChange (val) {
-      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
+      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
     subareaChange (val) {
@@ -333,9 +326,9 @@ export default {
       this.queryParam.transferDealerSn = undefined
       this.queryParam.dealerSn = undefined
       this.queryParam.belongProvinceFlag = undefined
-      this.queryParam.dealerEntity.provinceSn = undefined
-      this.queryParam.dealerEntity.citySn = undefined
-      this.queryParam.dealerEntity.districtSn = undefined
+      this.queryParam.dealer.provinceSn = undefined
+      this.queryParam.dealer.citySn = undefined
+      this.queryParam.dealer.districtSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
       if (this.advanced) {

+ 9 - 16
src/views/reportData/tireSubsidyReport/serviceFreightList.vue

@@ -89,13 +89,6 @@
           :pagination="{pageSizeOptions: ['20','50','100','200','500']}"
           :defaultLoadData="false"
           bordered>
-          <!-- 地区 -->
-          <template slot="addressInfo" slot-scope="text, record">
-            <span v-if="record.dealerEntity&&record.dealerEntity.provinceName">
-              {{ record.dealerEntity.provinceName }}
-            </span>
-            <span v-else>--</span>
-          </template>
           <template slot="footer">
             <a-row :gutter="15">
               <a-col :md="6" :sm="24">服务费金额合计:{{ (totalData && (totalData.subsidyServiceTotal || totalData.subsidyServiceTotal==0)) ? toThousands(totalData.subsidyServiceTotal): '--' }}</a-col>
@@ -134,7 +127,7 @@ export default {
       //  查询条件
       queryParam: {
         queryDate: moment().format('YYYY-MM'), // 选择月份
-        dealerEntity: {
+        dealer: {
           provinceSn: undefined, // 省
           citySn: undefined, // 市
           districtSn: undefined // 区
@@ -195,7 +188,7 @@ export default {
         { title: '月份', dataIndex: 'mothDay', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '省份', scopedSlots: { customRender: 'addressInfo' }, width: '6%', align: 'center' },
+        { title: '省份', dataIndex: 'provinceName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '记账主体', dataIndex: 'belongDealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '服务费(记)', dataIndex: 'subsidyServiceSales', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '服务费(扣)', dataIndex: 'subsidyServiceReturn', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
@@ -252,9 +245,9 @@ export default {
     },
     // 地区
     areaChange (val) {
-      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
+      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
     subareaChange (val) {
@@ -265,10 +258,10 @@ export default {
     resetSearchForm () {
       this.monthVal = moment().format('YYYY-MM')
       this.queryParam.queryDate = moment().format('YYYY-MM')
-      this.queryParam.dealerEntity.provinceSn = undefined
-      this.queryParam.dealerEntity.citySn = undefined
-      this.queryParam.dealerEntity.districtSn = undefined
-      this.queryParam.dealerEntity.dealerName = undefined
+      this.queryParam.dealer.provinceSn = undefined
+      this.queryParam.dealer.citySn = undefined
+      this.queryParam.dealer.districtSn = undefined
+      this.queryParam.dealer.dealerName = undefined
       this.queryParam.subareaArea.subareaSn = ''
       this.queryParam.subareaArea.subareaAreaSn = ''
       this.queryParam.dealerLevel = undefined