|
@@ -73,7 +73,7 @@
|
|
|
:rowKey="(record) => record.id"
|
|
|
:columns="columns"
|
|
|
:data="loadData"
|
|
|
- :scroll="{ x: 1310 }"
|
|
|
+ :scroll="{ x: 1590 }"
|
|
|
bordered>
|
|
|
<!-- 产品分类 -->
|
|
|
<template slot="productType" slot-scope="text, record">
|
|
@@ -122,7 +122,7 @@ export default {
|
|
|
{ title: '原厂编码', dataIndex: 'origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '品牌', dataIndex: 'productBrandName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center' },
|
|
|
- { title: '装箱数', dataIndex: 'packQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '包装数', dataIndex: 'packQtyV', width: 150, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '单位', dataIndex: 'packQtyUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '产品级别', dataIndex: 'level', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
|
|
@@ -138,6 +138,10 @@ export default {
|
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
|
data.list[i].no = no + i + 1
|
|
|
+ const packQty = (data.list[i].packQty || data.list[i].packQty == 0) ? data.list[i].packQty : '--'
|
|
|
+ const unit = data.list[i].unit || '--'
|
|
|
+ const packQtyUnit = data.list[i].packQtyUnit || '--'
|
|
|
+ data.list[i].packQtyV = packQty + unit + '/' + packQtyUnit
|
|
|
}
|
|
|
this.disabled = false
|
|
|
return data
|