|
|
@@ -369,7 +369,6 @@
|
|
|
clearable
|
|
|
v-model="row.modelKey"
|
|
|
:isOne="$index === 0"
|
|
|
- multiple
|
|
|
filterable
|
|
|
allow-create
|
|
|
default-first-option
|
|
|
@@ -384,7 +383,6 @@
|
|
|
clearable
|
|
|
v-model="row.colorKey"
|
|
|
:isOne="$index === 0"
|
|
|
- multiple
|
|
|
filterable
|
|
|
allow-create
|
|
|
default-first-option
|
|
|
@@ -645,7 +643,6 @@
|
|
|
clearable
|
|
|
v-model="row.modelKey"
|
|
|
:isOne="false"
|
|
|
- multiple
|
|
|
filterable
|
|
|
allow-create
|
|
|
default-first-option
|
|
|
@@ -660,7 +657,6 @@
|
|
|
clearable
|
|
|
v-model="row.colorKey"
|
|
|
:isOne="false"
|
|
|
- multiple
|
|
|
filterable
|
|
|
allow-create
|
|
|
default-first-option
|
|
|
@@ -2293,10 +2289,10 @@
|
|
|
// 处理包装数据
|
|
|
this.packingList = this.packingList.map((packingItem) => {
|
|
|
if (packingItem.modelKey) {
|
|
|
- packingItem.modelKey = packingItem.modelKey.toString();
|
|
|
+ packingItem.modelKey = packingItem.modelKey;
|
|
|
}
|
|
|
if (packingItem.colorKey) {
|
|
|
- packingItem.colorKey = packingItem.colorKey.toString();
|
|
|
+ packingItem.colorKey = packingItem.colorKey;
|
|
|
}
|
|
|
return {
|
|
|
...packingItem,
|
|
|
@@ -2310,10 +2306,10 @@
|
|
|
// 处理产品数据
|
|
|
this.productList = this.productList.map((productItem) => {
|
|
|
if (productItem.modelKey) {
|
|
|
- productItem.modelKey = productItem.modelKey.toString();
|
|
|
+ productItem.modelKey = productItem.modelKey;
|
|
|
}
|
|
|
if (productItem.colorKey) {
|
|
|
- productItem.colorKey = productItem.colorKey.toString();
|
|
|
+ productItem.colorKey = productItem.colorKey;
|
|
|
}
|
|
|
return {
|
|
|
...productItem,
|
|
|
@@ -2770,8 +2766,8 @@
|
|
|
categoryCode: item.code, // 物品编码
|
|
|
categoryModel: item.modelType, // 物品型号
|
|
|
specification: item.specification, // 规格
|
|
|
- modelKey: item.modelKey ? item.modelKey.split(',') : '', // 机型
|
|
|
- colorKey: item.colorKey ? item.colorKey.split(',') : '', // 颜色
|
|
|
+ modelKey: item.modelKey ? item.modelKey : '', // 机型
|
|
|
+ colorKey: item.colorKey ? item.colorKey : '', // 颜色
|
|
|
color: item.color,
|
|
|
brandNum: item.brandNum, // 牌号
|
|
|
batchNo: item.batchNo || batchNo, // 批次号
|
