|
@@ -2538,7 +2538,8 @@ export default {
|
|
i < this.basicForm.puDemandItemList.length;
|
|
i < this.basicForm.puDemandItemList.length;
|
|
i++, j++
|
|
i++, j++
|
|
) {
|
|
) {
|
|
- this.basicForm.puDemandItemList[i].qty = rows[j];
|
|
|
|
|
|
+ this.basicForm.puDemandItemList[i].qty =
|
|
|
|
+ rows[j] || this.basicForm.puDemandItemList[i].qty;
|
|
}
|
|
}
|
|
this.$refs.table.doLayout();
|
|
this.$refs.table.doLayout();
|
|
this.$modal.closeLoading();
|
|
this.$modal.closeLoading();
|
|
@@ -2581,10 +2582,14 @@ export default {
|
|
i < this.basicForm.puDemandItemList.length;
|
|
i < this.basicForm.puDemandItemList.length;
|
|
i++, j++
|
|
i++, j++
|
|
) {
|
|
) {
|
|
- this.basicForm.puDemandItemList[i].additionalSupplier =
|
|
|
|
- newLine[j].additionalSupplier;
|
|
|
|
- this.basicForm.puDemandItemList[i].additionalSupplierName =
|
|
|
|
- newLine[j].additionalSupplierName;
|
|
|
|
|
|
+ if (newLine[j].additionalSupplier) {
|
|
|
|
+ this.basicForm.puDemandItemList[i].additionalSupplier =
|
|
|
|
+ newLine[j].additionalSupplier;
|
|
|
|
+ this.basicForm.puDemandItemList[
|
|
|
|
+ i
|
|
|
|
+ ].additionalSupplierName =
|
|
|
|
+ newLine[j].additionalSupplierName;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
this.$refs.table.doLayout();
|
|
this.$refs.table.doLayout();
|
|
this.$modal.closeLoading();
|
|
this.$modal.closeLoading();
|
|
@@ -2637,16 +2642,18 @@ export default {
|
|
i < this.basicForm.puDemandItemList.length;
|
|
i < this.basicForm.puDemandItemList.length;
|
|
i++, j++
|
|
i++, j++
|
|
) {
|
|
) {
|
|
- this.basicForm.puDemandItemList[i].deliveryAddressName =
|
|
|
|
- newLine[j].deliveryAddressName;
|
|
|
|
- this.basicForm.puDemandItemList[i].deliveryAddress =
|
|
|
|
- newLine[j].deliveryAddress;
|
|
|
|
- this.basicForm.puDemandItemList[i].contacts =
|
|
|
|
- newLine[j].contacts;
|
|
|
|
- this.basicForm.puDemandItemList[i].contactsPhone =
|
|
|
|
- newLine[j].contactsPhone;
|
|
|
|
- this.basicForm.puDemandItemList[i].address =
|
|
|
|
- newLine[j].address;
|
|
|
|
|
|
+ if (newLine[j].deliveryAddress) {
|
|
|
|
+ this.basicForm.puDemandItemList[i].deliveryAddressName =
|
|
|
|
+ newLine[j].deliveryAddressName;
|
|
|
|
+ this.basicForm.puDemandItemList[i].deliveryAddress =
|
|
|
|
+ newLine[j].deliveryAddress;
|
|
|
|
+ this.basicForm.puDemandItemList[i].contacts =
|
|
|
|
+ newLine[j].contacts;
|
|
|
|
+ this.basicForm.puDemandItemList[i].contactsPhone =
|
|
|
|
+ newLine[j].contactsPhone;
|
|
|
|
+ this.basicForm.puDemandItemList[i].address =
|
|
|
|
+ newLine[j].address;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
this.$refs.table.doLayout();
|
|
this.$refs.table.doLayout();
|
|
this.$modal.closeLoading();
|
|
this.$modal.closeLoading();
|