|
@@ -176,7 +176,7 @@
|
|
|
let arr= [
|
|
|
{ title: "", field: "", key: "acheck", type: "checkbox", align: "center" },
|
|
|
{ title: '序号', field: 'no',key: "a", width: 50, align: 'center', operationColumn: false },
|
|
|
- { title: '活动规则', field: 'productCode',key: "m", width: 100, align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return codeFormat(row,row[column.field],h)} },
|
|
|
+ { title: '活动规则', field: 'prompName',key: "m", width: 100, align: 'center',operationColumn: false },
|
|
|
{ title: '产品编码', field: 'productCode',key: "b", width: 100, align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return codeFormat(row,row[column.field],h)} },
|
|
|
{ title: '产品名称', field: 'productName',key: "c", width: 200, align: 'center',operationColumn: false , ellipsis: { showTitle: true },renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},
|
|
|
{ title: '出库仓库', field: 'warehouseName',key: "e", width: 100, align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},
|
|
@@ -238,12 +238,14 @@
|
|
|
const productOrigCode = (item.productEntity && item.productEntity.origCode) || (item.dealerProductEntity && item.dealerProductEntity.origCode)
|
|
|
const productOrigUnit = (item.productEntity && item.productEntity.unit) || (item.dealerProductEntity && item.dealerProductEntity.unit)
|
|
|
const warehouseName = item.dispatchBill && item.dispatchBill.warehouseName || ''
|
|
|
+ const prompName = item.promotionRule ? (item.promotionRule.promotion && item.promotionRule.promotion.description) + '('+item.promotionRule.description+')' : '--'
|
|
|
item.productCode = productCode || '--'
|
|
|
item.productName = productName || '--'
|
|
|
item.productOrigCode = productOrigCode == ' ' ? '--' : productOrigCode
|
|
|
item.productOrigUnit = productOrigUnit || '--'
|
|
|
item.warehouseName = warehouseName || '--'
|
|
|
item.qtyBackups = item.qty
|
|
|
+ item.prompName = prompName || '--'
|
|
|
})
|
|
|
this.showEmpty = this.dataSource.length <= 0
|
|
|
this.tableHeight = (this.showEmpty ? 300 : this.maxHeight) + 'px'
|