|
@@ -400,7 +400,14 @@ export default {
|
|
{ title: '序号', field: 'no', key: 'a', width: 50, align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return noFormat(row, row[column.field], h) } },
|
|
{ title: '序号', field: 'no', key: 'a', width: 50, align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return noFormat(row, row[column.field], h) } },
|
|
{ title: '产品编码', field: 'productCode', key: 'b', width: 150, align: 'left', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return codeFormat(row, row[column.field], h) } },
|
|
{ title: '产品编码', field: 'productCode', key: 'b', width: 150, align: 'left', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return codeFormat(row, row[column.field], h) } },
|
|
{ title: '产品名称', field: 'productName', key: 'c', width: 220, align: 'left', operationColumn: false, ellipsis: { showTitle: true }, renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--' } },
|
|
{ title: '产品名称', field: 'productName', key: 'c', width: 220, align: 'left', operationColumn: false, ellipsis: { showTitle: true }, renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--' } },
|
|
- {
|
|
|
|
|
|
+ { title: '原厂编码', field: 'productOrigCode', key: 'd', width: 150, align: 'left', 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] || '--' } }
|
|
|
|
+ ]
|
|
|
|
+ // 单元格合并数量
|
|
|
|
+ this.colspanNums = this.showConvertPromoGifts ? 7 : 6
|
|
|
|
+ if (this.hasPrompActive) {
|
|
|
|
+ this.colspanNums = this.colspanNums + 1
|
|
|
|
+ arr.splice(4, 0, {
|
|
title: '规则数量',
|
|
title: '规则数量',
|
|
field: 'rulesNums',
|
|
field: 'rulesNums',
|
|
key: '4',
|
|
key: '4',
|
|
@@ -427,12 +434,8 @@ export default {
|
|
</a-popover> : '--'
|
|
</a-popover> : '--'
|
|
)
|
|
)
|
|
}
|
|
}
|
|
- },
|
|
|
|
- { title: '原厂编码', field: 'productOrigCode', key: 'd', width: 150, align: 'left', 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] || '--' } }
|
|
|
|
- ]
|
|
|
|
- // 单元格合并数量
|
|
|
|
- this.colspanNums = this.showConvertPromoGifts ? 8 : 7
|
|
|
|
|
|
+ })
|
|
|
|
+ }
|
|
if (this.$hasPermissions('B_salesDispatch_salesPrice')) { // 售价权限
|
|
if (this.$hasPermissions('B_salesDispatch_salesPrice')) { // 售价权限
|
|
this.colspanNums = this.colspanNums + 1
|
|
this.colspanNums = this.colspanNums + 1
|
|
arr.push({ title: '销售价', field: 'price', width: 80, key: 'f', align: 'right', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return priceFormat(row, row[column.field], h) } })
|
|
arr.push({ title: '销售价', field: 'price', width: 80, key: 'f', align: 'right', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return priceFormat(row, row[column.field], h) } })
|