Bladeren bron

Merge branch 'develop_yh53_1' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh53_1

chenrui 3 maanden geleden
bovenliggende
commit
be378af4f5

+ 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
       })

+ 7 - 10
src/views/reportData/tireSubsidyReport/serviceFreightDetailList.vue

@@ -185,7 +185,7 @@ export default {
         },
         belongDealerSn: undefined,
         transferDealerSn: undefined,
-        dealerSn: undefined
+        bizDealerSn: undefined
       },
       totalData: null, // 合计
       showOutDetail: false, // 出库明细弹窗
@@ -235,7 +235,7 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '40px', align: 'center' },
-        { title: '业务单号', dataIndex: 'bizNo', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务单号', dataIndex: 'bizNo', width: '120px', 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: '省份', dataIndex: 'provinceName', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
@@ -245,9 +245,9 @@ export default {
         { title: '销售金额', dataIndex: 'bizAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '服务费比例', dataIndex: 'subsidyServiceDiff', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text * 100) + '%' : '--') } },
         { title: '服务费金额', dataIndex: 'subsidyServiceAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '运费补贴', dataIndex: 'subsidyShippingDiff', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '运费补贴', dataIndex: 'subsidyShippingDiff', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '运费补贴金额', dataIndex: 'subsidyShippingAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '客户名称', dataIndex: 'dealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'bizDealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '发货经销商', dataIndex: 'transferDealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '业务类型', dataIndex: 'bizTypeDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
@@ -279,18 +279,15 @@ export default {
     },
     // 选择发货经销商
     custTireChange (val) {
-      this.queryParam.transferDealerName = val.name
       this.queryParam.transferDealerSn = val.key
     },
     // 记账主体
     belongDealerChange (val) {
-      this.queryParam.belongDealerName = val.name
       this.queryParam.belongDealerSn = val.key
     },
     // 客户名称 change
     custChange (val) {
-      this.queryParam.dealerName = val.name
-      this.queryParam.dealerSn = val.key
+      this.queryParam.bizDealerSn = val.key
     },
     // 统计
     getCount (params) {
@@ -326,16 +323,16 @@ export default {
       this.queryParam.bizType = undefined
       this.queryParam.belongDealerSn = undefined
       this.queryParam.transferDealerSn = undefined
-      this.queryParam.dealerSn = undefined
+      this.queryParam.bizDealerSn = undefined
       this.queryParam.belongProvinceFlag = 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
+      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()

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

@@ -159,6 +159,7 @@ export default {
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
+              data.list[i].mothDay = data.list[i].bizMonth + '月'
             }
             this.disabled = false
             this.getCount(params)
@@ -189,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) : '--') } },
@@ -230,7 +231,6 @@ export default {
     },
     // 记账主体
     belongDealerChange (val) {
-      this.queryParam.belongDealerName = val.name
       this.queryParam.belongDealerSn = val.key
     },
     // 统计
@@ -289,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 () {