|
|
|
@ -2427,7 +2427,6 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
watch: {
|
|
|
|
|
// "dataForm.contractType": function(val, oldVal) {
|
|
|
|
|
// console.log(val);
|
|
|
|
|
// this.dataForm.subject = undefined;
|
|
|
|
|
// this.dataForm.subject2 = undefined;
|
|
|
|
|
// this.dataForm.subject3 = undefined;
|
|
|
|
@ -2571,11 +2570,21 @@ export default {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
this.dataForm.contractLCommodityList.push(item);
|
|
|
|
|
let filterArr = [];
|
|
|
|
|
this.dataForm.contractLCommodityList = this.dataForm.contractLCommodityList.filter(
|
|
|
|
|
val => {
|
|
|
|
|
if (filterArr.includes(val.commodityCode + val.procureUnit)) {
|
|
|
|
|
return false;
|
|
|
|
|
} else {
|
|
|
|
|
filterArr.push(val.commodityCode + val.procureUnit);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
choiceRaw() {
|
|
|
|
|
this.BomgoodsBoxRawVisible = true;
|
|
|
|
|
// console.log('55555', this.dataForm.workOrderProductList)
|
|
|
|
|
let excludeIdList = [];
|
|
|
|
|
for (let i = 0; i < this.dataForm.contractLCommodityList.length; i++) {
|
|
|
|
|
excludeIdList.push(this.dataForm.contractLCommodityList[i].productId);
|
|
|
|
@ -2683,16 +2692,12 @@ export default {
|
|
|
|
|
this.dataForm.contractLCommodityList[index][
|
|
|
|
|
"contractlcommodityprocureUnitOptions"
|
|
|
|
|
] = procureUnitOptionsArr;
|
|
|
|
|
// console.log(procureUnitOptionsArr)
|
|
|
|
|
// this.contractlcommodityprocureUnitOptions = procureUnitOptionsArr
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
.catch(() => {});
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
changeData(model, index) {
|
|
|
|
|
console.log("changeData:");
|
|
|
|
|
console.log(model);
|
|
|
|
|
this.fnChgTotalRate();
|
|
|
|
|
if (model == "contractlcommodity-productId") {
|
|
|
|
|
this.getProductInfoChg(index);
|
|
|
|
@ -2703,6 +2708,19 @@ export default {
|
|
|
|
|
if (model == "businessId") {
|
|
|
|
|
this.chgBusinessId();
|
|
|
|
|
}
|
|
|
|
|
if (model == "contractlcommodity-procureUnit") {
|
|
|
|
|
let filterArr = [];
|
|
|
|
|
this.dataForm.contractLCommodityList = this.dataForm.contractLCommodityList.filter(
|
|
|
|
|
val => {
|
|
|
|
|
if (filterArr.includes(val.commodityCode + val.procureUnit)) {
|
|
|
|
|
return false;
|
|
|
|
|
} else {
|
|
|
|
|
filterArr.push(val.commodityCode + val.procureUnit);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
this.isEdit = false;
|
|
|
|
|
this.childIndex = index;
|
|
|
|
|
let modelAll = model.split("-");
|
|
|
|
@ -2838,7 +2856,6 @@ export default {
|
|
|
|
|
});
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
console.log(e);
|
|
|
|
|
}
|
|
|
|
|
return isOk;
|
|
|
|
|
},
|
|
|
|
|