|
@@ -2000,8 +2000,22 @@
|
|
|
categoryModel: item.modelType, // 物品型号
|
|
categoryModel: item.modelType, // 物品型号
|
|
|
specification: item.specification, // 规格
|
|
specification: item.specification, // 规格
|
|
|
brandNum: item.brandNum, // 牌号
|
|
brandNum: item.brandNum, // 牌号
|
|
|
- colorKey: this.bizType == 1 ? (this.form.colorKey ? this.form.colorKey.split(',') : '') : item.colorKey ? item.colorKey.split(',') : '', // 颜色
|
|
|
|
|
- modelKey: this.bizType == 1 ? (this.form.modelKey ? this.form.modelKey.split(',') : '') : item.modelKey ? item.modelKey.split(',') : '', // 机型
|
|
|
|
|
|
|
+ colorKey:
|
|
|
|
|
+ this.bizType == 1
|
|
|
|
|
+ ? this.form.colorKey
|
|
|
|
|
+ ? this.form.colorKey.split(',')
|
|
|
|
|
+ : ''
|
|
|
|
|
+ : item.colorKey
|
|
|
|
|
+ ? item.colorKey.split(',')
|
|
|
|
|
+ : '', // 颜色
|
|
|
|
|
+ modelKey:
|
|
|
|
|
+ this.bizType == 1
|
|
|
|
|
+ ? this.form.modelKey
|
|
|
|
|
+ ? this.form.modelKey.split(',')
|
|
|
|
|
+ : ''
|
|
|
|
|
+ : item.modelKey
|
|
|
|
|
+ ? item.modelKey.split(',')
|
|
|
|
|
+ : '', // 机型
|
|
|
batchNo: [1, 3, 6].includes(this.bizType)
|
|
batchNo: [1, 3, 6].includes(this.bizType)
|
|
|
? this.detailList[0]?.batchNo || batchNo
|
|
? this.detailList[0]?.batchNo || batchNo
|
|
|
: batchNo, // 批次号
|
|
: batchNo, // 批次号
|
|
@@ -2080,6 +2094,8 @@
|
|
|
];
|
|
];
|
|
|
console.log(this.productList, 'this.productList');
|
|
console.log(this.productList, 'this.productList');
|
|
|
console.log(this.detailList, 'this.detailList');
|
|
console.log(this.detailList, 'this.detailList');
|
|
|
|
|
+ console.log(this.detailList.length, 'this.detailList');
|
|
|
|
|
+ console.log(getAssetNumPr, 'getAssetNumPr');
|
|
|
|
|
|
|
|
// 生成包装编码
|
|
// 生成包装编码
|
|
|
const { data } = await storageApi.getAssetNum(getAssetNumPr);
|
|
const { data } = await storageApi.getAssetNum(getAssetNumPr);
|
|
@@ -2165,7 +2181,7 @@
|
|
|
} else if (this.bizType != 2) {
|
|
} else if (this.bizType != 2) {
|
|
|
clientCode = item.clientCode || item.extInfo?.clientCode;
|
|
clientCode = item.clientCode || item.extInfo?.clientCode;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
return {
|
|
return {
|
|
|
index: this.isMoreProduct
|
|
index: this.isMoreProduct
|
|
|
? this.productList.find(
|
|
? this.productList.find(
|
|
@@ -2188,8 +2204,12 @@
|
|
|
specification:
|
|
specification:
|
|
|
item.specification || this.productList[0].specification, // 规格
|
|
item.specification || this.productList[0].specification, // 规格
|
|
|
brandNum: item.productBrand || this.productList[0].brandNum, // 牌号
|
|
brandNum: item.productBrand || this.productList[0].brandNum, // 牌号
|
|
|
- colorKey: (item.colorKey ? item.colorKey.split(',') : '') || this.productList[0].colorKey, // 颜色
|
|
|
|
|
- modelKey: (item.modelKey ? item.modelKey.split(',') : '') || this.productList[0].modelKey, // 机型
|
|
|
|
|
|
|
+ colorKey:
|
|
|
|
|
+ (item.colorKey ? item.colorKey.split(',') : '') ||
|
|
|
|
|
+ this.productList[0].colorKey, // 颜色
|
|
|
|
|
+ modelKey:
|
|
|
|
|
+ (item.modelKey ? item.modelKey.split(',') : '') ||
|
|
|
|
|
+ this.productList[0].modelKey, // 机型
|
|
|
parentIndex: this.isMoreProduct
|
|
parentIndex: this.isMoreProduct
|
|
|
? this.productList.find(
|
|
? this.productList.find(
|
|
|
(val) => val.categoryCode == item.productCode
|
|
(val) => val.categoryCode == item.productCode
|