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 e6895fac..d3dfcb0b 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 @@ -100,7 +100,6 @@ export class SupplyManagementBulkPublishComponent implements OnInit { this.PageStatus = '大宗下一单'; } this.initSF1(); - // this.initSF2(); this.initSF3(); this.initSF4(); this.initSF6(); @@ -199,7 +198,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } as SFSelectWidgetSchema } }, - require: ['deadlineTime'] + required: ['shipperAppUserId', 'enterpriseProjectId','enterpriseInfoId', 'deadlineTime', 'dispatchId'] }; this.ui1 = { '*': { @@ -224,34 +223,12 @@ export class SupplyManagementBulkPublishComponent implements OnInit { .subscribe(res => { this.sf1.getProperty('/enterpriseProjectId')!.schema.enum = res; this.sf1.getProperty('/enterpriseProjectId')!.widget.reset(res); - console.log('12345645454545454=============') - console.log(this.enterpriseProjectIds) - console.log(res) if(this.enterpriseProjectIds) { this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds); } }); } - // initSF2() { - // this.schema2 = { - // properties: { - // name1: { - // type: 'string', - // title: '发货模板', - // ui: { - // widget: 'custom', - // placeholder: '请输入' - // } - // } - // } - // }; - // this.ui2 = { - // '*': { - // spanLabelFixed: 90, - // grid: { span: 12 } - // } - // }; - // } + initSF3() { this.schema3 = { properties: { @@ -559,7 +536,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } as SFTextareaWidgetSchema } }, - required: ['paymentDays'] + required: ['paymentDays','stateReceipt'] }; this.ui7 = { '*': { @@ -663,6 +640,18 @@ export class SupplyManagementBulkPublishComponent implements OnInit { }); } submit(submitType?: string): void { + Object.keys(this.validateForm1.controls).forEach(key => { + this.validateForm1.controls[key].markAsDirty(); + this.validateForm1.controls[key].updateValueAndValidity(); + }); + this.sf1.validator({ emitError: true }); + this.sf3.validator({ emitError: true }); + this.sf4.validator({ emitError: true }); + this.sf7.validator({ emitError: true }); + console.log(this.sf1.valid) + if (this.validateForm1.invalid || !this.sf3.valid || !this.sf1.valid|| !this.sf4.valid || !this.sf7.valid) { + return; + } console.log(this.startInfo) if(typeof(this.validateForm1.value.modifyTime) !== 'string' ) { var c = new Date(this.validateForm1.value.modifyTime); @@ -672,9 +661,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { var c = new Date(this.validateForm1.value.createTime); this.validateForm1.value.createTime = c.getFullYear() + '-' + (c.getMonth() + 1) + '-' + c.getDate() + ' ' + c.getHours() + ':' + c.getMinutes() + ':' + c.getSeconds() } - // if (this.validateForm1.invalid) { - // return; - // } + const params: any = { ...this.sf1.value, ...this.sf7.value, 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 56a384b7..241bfb9c 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 @@ -219,11 +219,11 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { } as SFSelectWidgetSchema } }, - required: ['deadlineTime'] + required: ['shipperAppUserId', 'enterpriseProjectId','enterpriseInfoName','enterpriseInfoId', 'deadlineTime', 'dispatchId'] }; this.ui1 = { '*': { - spanLabelFixed: 90, + spanLabelFixed: 110, grid: { span: 12 } }, $enterpriseInfoName: { @@ -534,7 +534,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { } as SFTextareaWidgetSchema } }, - required: ['paymentDays'] + required: ['paymentDays','stateReceipt'] }; this.ui6 = { '*': { diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index d7483ec6..59979b36 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -109,7 +109,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.PageStatus = '大宗下一单'; } this.initSF1(); - // this.initSF2(); this.initSF3(); this.initSF4(); this.initSF5(); @@ -204,7 +203,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { asyncData: () => this.shipperSrv.getStaffList2() } as SFSelectWidgetSchema } - } + }, + required: ['shipperAppUserId','enterpriseProjectId','dispatchId'] }; this.ui1 = { '*': { @@ -213,27 +213,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { } }; } - - // initSF2() { - // this.schema2 = { - // properties: { - // name1: { - // type: 'string', - // title: '发货模板', - // ui: { - // widget: 'custom', - // placeholder: '请输入' - // } - // } - // } - // }; - // this.ui2 = { - // '*': { - // spanLabelFixed: 90, - // grid: { span: 12 } - // } - // }; - // } initSF3() { this.schema3 = { properties: { @@ -420,7 +399,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { placeholder: '请输入' } } - } + }, + required: ['goodsValue'] }; this.ui5 = { '*': { @@ -524,7 +504,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { } as SFTextareaWidgetSchema } }, - required: ['stateReceipt', 'receiptType', 'receiptAddressId'] + required: ['stateReceipt', 'receiptType', 'receiptAddressId',] }; this.ui6 = { '*': { @@ -769,16 +749,17 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { }); } submit(submitType?: string): void { - console.log('进来了'); Object.keys(this.validateForm1.controls).forEach(key => { this.validateForm1.controls[key].markAsDirty(); this.validateForm1.controls[key].updateValueAndValidity(); }); + this.sf1.validator({ emitError: true }); this.sf3.validator({ emitError: true }); this.sf4.validator({ emitError: true }); this.sf6.validator({ emitError: true }); this.sf7.validator({ emitError: true }); - if (this.validateForm1.invalid || !this.sf3.valid || !this.sf4.valid || !this.sf6.valid || !this.sf7.valid) { + console.log(this.sf1.valid) + if (this.validateForm1.invalid || !this.sf3.valid || !this.sf1.valid|| !this.sf4.valid || !this.sf6.valid || !this.sf7.valid) { return; } if (typeof this.validateForm1.value.unloadingTime !== 'string') { diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index a2133188..9050fe04 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts @@ -218,11 +218,12 @@ export class SupplyManagementReleasePublishComponent implements OnInit { asyncData: () => this.shipperSrv.getStaffList2() } as SFSelectWidgetSchema } - } + }, + required: ['shipperAppUserId','enterpriseProjectId','enterpriseInfoName','dispatchId'] }; this.ui1 = { '*': { - spanLabelFixed: 90, + spanLabelFixed: 110, grid: { span: 12 } }, $enterpriseInfoName: { @@ -694,11 +695,12 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.validateForm1.controls[key].markAsDirty(); this.validateForm1.controls[key].updateValueAndValidity(); }); + this.sf1.validator({ emitError: true }); this.sf3.validator({ emitError: true }); this.sf4.validator({ emitError: true }); this.sf6.validator({ emitError: true }); this.sf7.validator({ emitError: true }); - if (this.validateForm1.invalid || !this.sf3.valid || !this.sf4.valid || !this.sf6.valid || !this.sf7.valid) { + if (this.validateForm1.invalid || !this.sf1.valid || !this.sf3.valid || !this.sf4.valid || !this.sf6.valid || !this.sf7.valid) { return; }