lilei 3 ヶ月 前
コミット
d200620069

+ 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 || '--' } },
@@ -243,11 +243,11 @@ export default {
         { 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 : '--') } },
         { title: '销售金额', dataIndex: 'bizAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '服务费比例', dataIndex: 'subsidyServiceDiff', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '服务费比例', dataIndex: 'subsidyServiceDiff', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? Number(text * 100).toFixed(2) + '%' : '--') } },
         { 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,7 +323,7 @@ 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