|
|
@@ -523,7 +523,7 @@
|
|
|
v-for="item in scope.row.specificationsList"
|
|
|
:key="item.productSpecifications"
|
|
|
:label="item.productSpecifications"
|
|
|
- :value="item.productSpecifications"
|
|
|
+ :value="{value:item.productSpecifications,label:item.productType}"
|
|
|
>
|
|
|
<span class="discribe" style="float: left">{{
|
|
|
item.productSpecifications
|
|
|
@@ -1208,7 +1208,7 @@ export default {
|
|
|
let productId = "";
|
|
|
if (specificationsList && specificationsList.length > 0) {
|
|
|
let targetItem = specificationsList.find(
|
|
|
- (item) => item.productSpecifications == productSpecifications
|
|
|
+ (item) => item.productSpecifications == productSpecifications.value && item.productType == productSpecifications.label
|
|
|
);
|
|
|
productId = targetItem.id;
|
|
|
}
|
|
|
@@ -1248,9 +1248,8 @@ export default {
|
|
|
let { productSpecifications, specificationsList } = row;
|
|
|
if (productSpecifications) {
|
|
|
let targetItem = specificationsList.find(
|
|
|
- (item) => item.productSpecifications == productSpecifications
|
|
|
+ (item) => item.productSpecifications == productSpecifications.value && item.productType == productSpecifications.label
|
|
|
);
|
|
|
- console.log(targetItem);
|
|
|
row.productNo = targetItem?.productNo;
|
|
|
row.productType = targetItem?.productType;
|
|
|
} else {
|
