|
@@ -481,17 +481,17 @@ export default {
|
|
|
{ title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '7%', align: 'center' },
|
|
|
{ title: <a-tooltip placement='top' title='第一次提交时间'>提交时间 <a-icon type="question-circle" /></a-tooltip>, dataIndex: 'firstSubmitDate', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') }, sorter: true },
|
|
|
{ title: '客户名称', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '出库仓库', scopedSlots: { customRender: 'warehouseBox' }, width: '8%', align: 'left', ellipsis: true },
|
|
|
+ { title: '出库仓库', scopedSlots: { customRender: 'warehouseBox' }, width: '8%', align: 'center', ellipsis: true },
|
|
|
{ title: '总数量', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: '4%', align: 'center' },
|
|
|
- { title: '总售价', dataIndex: 'totalAmount', width: '4%', align: 'right',isShow:false,customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
+ { title: '总售价', dataIndex: 'totalAmount', width: '4%', align: 'right', isShow: false, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
{ title: '已下推数量', dataIndex: 'totalPushedQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '下推总金额', dataIndex: 'totalPushedAmount', width: '4%', align: 'right', isShow:false, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
- { title: '待下推数量', dataIndex: 'totalUnpushedQty', width: '4%', align: 'center', isShow:false, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '待下推金额', dataIndex: 'totalUnpushedAmount', width: '4%', align: 'right',isShow:false, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
+ { title: '下推总金额', dataIndex: 'totalPushedAmount', width: '4%', align: 'right', isShow: false, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
+ { title: '待下推数量', dataIndex: 'totalUnpushedQty', width: '4%', align: 'center', isShow: false, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '待下推金额', dataIndex: 'totalUnpushedAmount', width: '4%', align: 'right', isShow: false, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
{ title: '已发货数量', dataIndex: 'totalDispatchQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '已取消数量', dataIndex: 'totalCancelQty', width: '4%', align: 'center',isShow:false, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '转采购额数量', dataIndex: 'totalConvertPromoGiftsQty', width: '4%', align: 'center',isShow:false, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '转采购额金额', dataIndex: 'totalConvertPromoGiftsAmount', width: '4%', align: 'right',isShow:false, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
+ { title: '已取消数量', dataIndex: 'totalCancelQty', width: '4%', align: 'center', isShow: false, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '转采购额数量', dataIndex: 'totalConvertPromoGiftsQty', width: '4%', align: 'center', isShow: false, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '转采购额金额', dataIndex: 'totalConvertPromoGiftsAmount', width: '4%', align: 'right', isShow: false, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
{ title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '审核时间', dataIndex: 'auditDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
|
|
|
{ title: '最近备货时间', dataIndex: 'lastStockUpDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
|
|
@@ -500,17 +500,17 @@ export default {
|
|
|
{ title: '备货打印状态', dataIndex: 'printStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
|
|
|
]
|
|
|
-
|
|
|
+
|
|
|
arr.map(item => {
|
|
|
- if(this.$hasPermissions('M_salesQueryList_salesPrice')){
|
|
|
- item.isShow = ['totalAmount','totalPushedAmount','totalUnpushedAmount','totalConvertPromoGiftsAmount'].includes(item.dataIndex)
|
|
|
+ if (this.$hasPermissions('M_salesQueryList_salesPrice')) {
|
|
|
+ item.isShow = ['totalAmount', 'totalPushedAmount', 'totalUnpushedAmount', 'totalConvertPromoGiftsAmount'].includes(item.dataIndex)
|
|
|
}
|
|
|
- if(this.colsArr.find(k=>k.value==item.dataIndex)){
|
|
|
+ if (this.colsArr.find(k => k.value == item.dataIndex)) {
|
|
|
item.isShow = this.showCols.includes(item.dataIndex)
|
|
|
}
|
|
|
})
|
|
|
console.log(arr)
|
|
|
- return arr.filter(item => !this.colsArr.find(k=>k.value==item.dataIndex) || item.isShow)
|
|
|
+ return arr.filter(item => !this.colsArr.find(k => k.value == item.dataIndex) || item.isShow)
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
@@ -539,7 +539,7 @@ export default {
|
|
|
this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
|
|
|
this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
|
|
|
},
|
|
|
- toWaitCostOrder(){
|
|
|
+ toWaitCostOrder () {
|
|
|
this.$router.push({ name: 'waitCostOrder' })
|
|
|
},
|
|
|
// 新增
|