lilei 3 months ago
parent
commit
590c8b8f25

+ 4 - 1
src/views/reportData/tireSubsidyReport/incrementalSubsidyList.vue

@@ -293,7 +293,10 @@ export default {
       const _this = this
       _this.exportLoading = true
       _this.spinning = true
-      hdExportExcel(subsidyStepExport, _this.queryParam, '增量补贴报表(' + this.queryParam.queryDate + '季度)-', function () {
+      const year = this.queryParam.queryDate.substr(0, 4)
+      const quarter = this.queryParam.queryDate.substr(5, 1)
+      const params = Object.assign(_this.queryParam, { bizYear: year, bizQuarter: quarter })
+      hdExportExcel(subsidyStepExport, params, '增量补贴报表(' + this.queryParam.queryDate + '季度)-', function () {
         _this.exportLoading = false
         _this.spinning = false
       })

+ 1 - 1
src/views/reportData/tireSubsidyReport/serviceFreightDetailList.vue

@@ -330,9 +330,9 @@ export default {
       this.queryParam.dealer.districtSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
+      this.$refs.belongDealer.resetForm()
       if (this.advanced) {
         this.$refs.dealerTireScopeList.resetForm()
-        this.$refs.belongDealer.resetForm()
         this.$refs.custList.resetForm()
         this.$refs.subarea.clearData()
         this.$refs.areaList.clearData()

+ 4 - 2
src/views/reportData/tireSubsidyReport/serviceFreightList.vue

@@ -190,7 +190,7 @@ export default {
         { 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: '省份', 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: 'dealerName', 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) : '--') } },
         { title: '服务费金额合计', dataIndex: 'subsidyServiceTotal', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
@@ -231,7 +231,6 @@ export default {
     },
     // 记账主体
     belongDealerChange (val) {
-      this.queryParam.belongDealerName = val.name
       this.queryParam.belongDealerSn = val.key
     },
     // 统计
@@ -290,6 +289,9 @@ export default {
     exportList () {
       const _this = this
       const params = JSON.parse(JSON.stringify(_this.queryParam))
+      params.bizYear = params.queryDate.split('-')[0]
+      params.bizMonth = params.queryDate.split('-')[1]
+      delete params.queryDate
       _this.exportLoading = true
       _this.spinning = true
       hdExportExcel(subsidyMonthExport, params, '轮胎服务费运费报表(' + this.queryParam.queryDate + '月份)-', function () {