diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html index 29c6ad1c..b10983c7 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html @@ -188,6 +188,15 @@
+ + +
diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts index a24fddcb..e6895fac 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts @@ -459,6 +459,86 @@ export class SupplyManagementBulkPublishComponent implements OnInit { initSF6() { this.schema7 = { properties: { + stateReceipt: { + type: 'string', + title: '是否回单', + enum: [ + { label: '需要', value: true }, + { label: '不需要', value: false } + ], + ui: { + widget: 'select', + errors: { required: '请选择' }, + placeholder: '请选择' + } + }, + receiptType: { + type: 'string', + title: '回单类型', + ui: { + widget: 'dict-select', + params: { dictKey: 'receipt:type' }, + containsAllLabel: false, + placeholder: '请选择', + errors: { required: '请选择' }, + visibleIf: { + stateReceipt: value => value === true + } + } + }, + receiptAddressId: { + type: 'string', + title: '选择地址', + ui: { + widget: 'custom', + placeholder: '请点击选择收回单地址', + // validator: val => (this.sf6?.value?.receiptType === '2' ? [{ keyword: 'required', message: '请点击选择收回单地址' }] : []), + visibleIf: { + receiptType: value => value === '2' + } + }, + default: '' + }, + receiptUserName: { + type: 'string', + title: '联系人', + ui: { + visibleIf: { + receiptType: value => value === '2' + } + }, + readOnly: true + }, + phon: { + type: 'string', + title: '联系电话', + ui: { + visibleIf: { + receiptType: value => value === '2' + } + }, + readOnly: true + }, + area: { + type: 'string', + title: '所在地区', + ui: { + visibleIf: { + receiptType: value => value === '2' + } + }, + readOnly: true + }, + address: { + type: 'string', + title: '详细地址', + ui: { + visibleIf: { + receiptType: value => value === '2' + } + }, + readOnly: true + }, paymentDays: { type: 'string', title: '到货后', @@ -666,7 +746,23 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } }); } - + backBillChange() { + const modalRef = this.modalService.create({ + nzTitle: '选择收回单地址', + nzContent: PublishAddressListComponent, + nzWidth: 900, + nzComponentParams: { spuStatus: '2' }, + nzOnOk: item => { + const data = item.seleteData; + if (JSON.stringify(data) === '{}') return; + this.sf7.setValue('/receiptAddressId', data.id); + this.sf7.setValue('/receiptUserName', data.contactName); + this.sf7.setValue('/phon', data.contactTelephone); + this.sf7.setValue('/area', `${data.province}-${data.city}-${data.area}`) + this.sf7.setValue('/address', data.detailedAddress); + } + }); + } // 打开地图 openMap(type: string, index: number) { const modalRef = this.modalService.create({ @@ -850,6 +946,13 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } this.totalFees = res?.freightPrice || '0'; this.sf7data = { + stateReceipt: res?.supplementaryInformationVO?.stateReceipt, + receiptType: res?.receiptType || '', + receiptAddressId: res?.receiptAddressId || '', + receiptUserName: res?.supplementaryInformationVO?.receiptUserName || '', + area: res?.supplementaryInformationVO?.area || '', + phon: res?.supplementaryInformationVO?.phon || '', + address: res?.supplementaryInformationVO?.address || '', paymentDays: res?.paymentDays || '', remarks: res?.remarks || '' }; diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html index d8594c7f..6b7df2d5 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html @@ -154,6 +154,15 @@
+ + +
diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts index 027d230a..56a384b7 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts @@ -434,6 +434,86 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { initSF6() { this.schema6 = { properties: { + stateReceipt: { + type: 'string', + title: '是否回单', + enum: [ + { label: '需要', value: true }, + { label: '不需要', value: false } + ], + ui: { + widget: 'select', + errors: { required: '请选择' }, + placeholder: '请选择' + } + }, + receiptType: { + type: 'string', + title: '回单类型', + ui: { + widget: 'dict-select', + params: { dictKey: 'receipt:type' }, + containsAllLabel: false, + placeholder: '请选择', + errors: { required: '请选择' }, + visibleIf: { + stateReceipt: value => value === true + } + } + }, + receiptAddressId: { + type: 'string', + title: '选择地址', + ui: { + widget: 'custom', + placeholder: '请点击选择收回单地址', + // validator: val => (this.sf6?.value?.receiptType === '2' ? [{ keyword: 'required', message: '请点击选择收回单地址' }] : []), + visibleIf: { + receiptType: value => value === '2' + } + }, + default: '' + }, + receiptUserName: { + type: 'string', + title: '联系人', + ui: { + visibleIf: { + receiptType: value => value === '2' + } + }, + readOnly: true + }, + phon: { + type: 'string', + title: '联系电话', + ui: { + visibleIf: { + receiptType: value => value === '2' + } + }, + readOnly: true + }, + area: { + type: 'string', + title: '所在地区', + ui: { + visibleIf: { + receiptType: value => value === '2' + } + }, + readOnly: true + }, + address: { + type: 'string', + title: '详细地址', + ui: { + visibleIf: { + receiptType: value => value === '2' + } + }, + readOnly: true + }, paymentDays: { type: 'string', title: '到货后', @@ -463,7 +543,23 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { } }; } - + backBillChange() { + const modalRef = this.modalService.create({ + nzTitle: '选择收回单地址', + nzContent: PublishAddressListComponent, + nzWidth: 900, + nzComponentParams: { spuStatus: '2' }, + nzOnOk: item => { + const data = item.seleteData; + if (JSON.stringify(data) === '{}') return; + this.sf6.setValue('/receiptAddressId', data.id); + this.sf6.setValue('/receiptUserName', data.contactName); + this.sf6.setValue('/phon', data.contactTelephone); + this.sf6.setValue('/area', `${data.province}-${data.city}-${data.area}`) + this.sf6.setValue('/address', data.detailedAddress); + } + }); + } //指派熟车 chooseFamifiar(item: any) { const modalRef = this.modalService.create({