|
|
@@ -52,10 +52,14 @@
|
|
|
<el-table-column prop="colorKey" label="颜色" width="80" align="center" show-overflow-tooltip />
|
|
|
<el-table-column prop="categoryModel" label="型号" width="100" align="center" show-overflow-tooltip />
|
|
|
<el-table-column prop="specification" label="规格" width="100" align="center" show-overflow-tooltip />
|
|
|
- <el-table-column prop="gradeName" label="牌号" width="80" align="center" show-overflow-tooltip />
|
|
|
- <el-table-column prop="voltage" label="电压" width="80" align="center" />
|
|
|
- <el-table-column prop="approvalNumber" label="批准文号" width="120" align="center" show-overflow-tooltip />
|
|
|
- <el-table-column prop="packingSpec" label="包装规格" width="100" align="center" show-overflow-tooltip />
|
|
|
+ <el-table-column prop="brandNum" label="牌号" width="80" align="center" show-overflow-tooltip />
|
|
|
+ <el-table-column
|
|
|
+ v-for="(item, index) in newColumns"
|
|
|
+ :label="item.label"
|
|
|
+ :align="item.align"
|
|
|
+ :prop="item.prop"
|
|
|
+ :show-overflow-tooltip="item.showOverflowTooltip"
|
|
|
+ ></el-table-column>
|
|
|
<el-table-column prop="allowUnpack" label="允许拆包" width="90" align="center" />
|
|
|
<el-table-column prop="supplierName" label="供应商" min-width="120" align="center" show-overflow-tooltip />
|
|
|
<el-table-column prop="warehouseName" label="仓库" min-width="100" align="center" show-overflow-tooltip />
|
|
|
@@ -238,6 +242,7 @@
|
|
|
name: 'ItemListed',
|
|
|
data() {
|
|
|
return {
|
|
|
+ newColumns: [],
|
|
|
locationStatusList,
|
|
|
visible: false,
|
|
|
rowData: null,
|
|
|
@@ -328,6 +333,20 @@
|
|
|
},
|
|
|
|
|
|
methods: {
|
|
|
+ // 获取动态表头
|
|
|
+ getFieldModel() {
|
|
|
+ storageApi.fieldModel({ fieldModel: 't_main_category' }).then((res) => {
|
|
|
+ let newRes = res.map((m) => {
|
|
|
+ return {
|
|
|
+ prop: 'extField.' + m.prop,
|
|
|
+ label: m.label,
|
|
|
+ align: 'center',
|
|
|
+ showOverflowTooltip: true
|
|
|
+ };
|
|
|
+ });
|
|
|
+ this.newColumns = [...newRes];
|
|
|
+ });
|
|
|
+ },
|
|
|
// ==================== 打开/关闭 ====================
|
|
|
async open(row, type, mode, initDimension) {
|
|
|
console.log('open', row, type, mode);
|
|
|
@@ -353,6 +372,7 @@
|
|
|
this.storageRecords = [];
|
|
|
this.packingPages = { pageNum: 1, size: 20 };
|
|
|
this.packingTotal = 0;
|
|
|
+ this.getFieldModel();
|
|
|
// 先请求库存记录（可能已上架过），再打开弹窗
|
|
|
await this.getDetail();
|
|
|
this.visible = true;
|
