|
|
@@ -168,7 +168,7 @@
|
|
|
<el-table-column
|
|
|
label="型号"
|
|
|
align="center"
|
|
|
- prop="categoryModel"
|
|
|
+ prop="modelType"
|
|
|
:show-overflow-tooltip="true"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -180,7 +180,7 @@
|
|
|
<el-table-column
|
|
|
label="牌号"
|
|
|
align="center"
|
|
|
- prop="brandNum"
|
|
|
+ prop="productBrand"
|
|
|
:show-overflow-tooltip="true"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -312,6 +312,24 @@
|
|
|
prop="categoryName"
|
|
|
:show-overflow-tooltip="true"
|
|
|
></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ label="型号"
|
|
|
+ align="center"
|
|
|
+ prop="modelType"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ label="规格"
|
|
|
+ align="center"
|
|
|
+ prop="specification"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ label="牌号"
|
|
|
+ align="center"
|
|
|
+ prop="productBrand"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ ></el-table-column>
|
|
|
<el-table-column
|
|
|
label="批次号"
|
|
|
prop="batchNo"
|
|
|
@@ -644,6 +662,8 @@
|
|
|
// productItem['bizNo'] = res.bizNo[productIndex]||res.bizNo[0];
|
|
|
return {
|
|
|
...productItem,
|
|
|
+ productBrand: productItem.brandNum,
|
|
|
+ modelType: productItem.categoryModel,
|
|
|
outInDetailRecordRequestList:
|
|
|
productItem.outInDetailRecordRequestList.map((packingItem) => {
|
|
|
return {
|
|
|
@@ -670,7 +690,10 @@
|
|
|
for (const key in this.productList) {
|
|
|
for (const k in this.productList[key].outInDetailRecordRequestList) {
|
|
|
arr.push({
|
|
|
- ...this.productList[key].outInDetailRecordRequestList[k]
|
|
|
+ ...this.productList[key].outInDetailRecordRequestList[k],
|
|
|
+ modelType: this.productList[key].categoryModel,
|
|
|
+ specification: this.productList[key].specification,
|
|
|
+ productBrand: this.productList[key].brandNum,
|
|
|
});
|
|
|
}
|
|
|
}
|