|
@@ -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' }]
|
|
@@ -259,7 +260,7 @@ export default {
|
|
|
{ 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: 'parentDealerName', 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 : '--') } },
|
|
@@ -268,7 +269,7 @@ export default {
|
|
|
{ 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: 'crossRegionOutQty', 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: <div>已绑质保单<div>数量</div></div>, dataIndex: 'rptDealerStockVO.totalWarrantyQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
|
|
@@ -282,7 +283,7 @@ export default {
|
|
|
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(26, 0, { title: '出库跨区域金额', dataIndex: 'crossRegionOutAmount', 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) : '--') } })
|
|
|
}
|
|
@@ -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
|
|
|
},
|
|
|
// 统计
|
|
@@ -349,17 +350,17 @@ 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.totalData = null
|
|
|
this.$refs.areaList.clearData()
|