Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

This commit is contained in:
Taric Xin
2022-03-07 15:35:44 +08:00
2 changed files with 7 additions and 7 deletions

View File

@ -1022,9 +1022,9 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
this.sf7data = {
stateReceipt: res?.stateReceipt,
receiptType: res?.receiptType || '',
receiptUserName: res?.receiptUserName || '',
receiptAddressArea: res?.receiptAddressArea || '',
receiptUserPhone: res?.receiptUserPhone || '',
receiptUserName: res?.supplementaryInformationVO?.receiptUserName || '',
receiptAddressArea: res?.supplementaryInformationVO?.area || '',
receiptUserPhone: res?.supplementaryInformationVO?.phon || '',
receiptAddress: res?.receiptAddress || '',
paymentDays: res?.paymentDays || '',
remarks: res?.remarks || ''

View File

@ -1262,10 +1262,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
this.sf6data = {
stateReceipt: res?.stateReceipt,
receiptType: res?.receiptType || '',
receiptUserName: res?.receiptUserName || '',
receiptAddressArea: res?.receiptAddressArea || '',
receiptUserPhone: res?.receiptUserPhone || '',
receiptAddress: res?.receiptAddress || '',
receiptUserName: res?.supplementaryInformationVO?.receiptUserName || '',
receiptAddressArea: res?.supplementaryInformationVO?.area || '',
receiptUserPhone: res?.supplementaryInformationVO?.phon || '',
receiptAddress: res?.supplementaryInformationVO.address || '',
remarks: res?.supplementaryInformationVO?.remarks || ''
};
this.sf7data = {