Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Taric Xin
2022-02-28 20:02:09 +08:00
parent 389c5cd7cf 7a6a2454a0
commit 438484699d
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-06 20:20:26 * @Date : 2021-12-06 20:20:26
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-02-22 10:16:11 * @LastEditTime : 2022-02-28 19:47:14
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -36,7 +36,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
{ title: '款项', index: 'expenseName' }, { title: '款项', index: 'expenseName' },
{ title: '运输费（元）', render: 'price' }, { title: '运输费（元）', render: 'price' },
{ title: '附加费（元）', render: 'surcharge' }, { title: '附加费（元）', render: 'surcharge' },
{ title: '支付时间', index: ' paymentTime' }, { title: '支付时间', index: 'paymentTime' },
{ {
title: '支付状态', title: '支付状态',
className: 'text-center', className: 'text-center',

3
src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
View File

@ -523,7 +523,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
} as SFTextareaWidgetSchema } as SFTextareaWidgetSchema
} }
}, },
required: ['stateReceipt', 'receiptType', 'receiptUserName','receiptUserPhone','receiptAddressArea','receiptAddress'] required: ['stateReceipt', 'receiptType', 'receiptUserName','receiptUserPhone','receiptAddressArea','receiptAddress','paymentDays']
}; };
this.ui7 = { this.ui7 = {
'*': { '*': {
@ -655,6 +655,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
this.sf4.validator({ emitError: true }); this.sf4.validator({ emitError: true });
this.sf7.validator({ emitError: true }); this.sf7.validator({ emitError: true });
if (this.validateForm1.invalid || !this.sf3.valid || !this.sf1.valid || !this.sf4.valid || !this.sf7.valid) { if (this.validateForm1.invalid || !this.sf3.valid || !this.sf1.valid || !this.sf4.valid || !this.sf7.valid) {
this.service.msgSrv.warning('请完善必填项！');
return; return;
} }

3
src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
View File

@ -533,7 +533,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
} as SFTextareaWidgetSchema } as SFTextareaWidgetSchema
} }
}, },
required: ['stateReceipt', 'paymentDays', 'receiptType', 'receiptUserName','receiptUserPhone','receiptAddressArea','receiptAddress'] required: ['stateReceipt', 'paymentDays', 'receiptType', 'receiptUserName','receiptUserPhone','receiptAddressArea','receiptAddress','paymentDays']
}; };
this.ui6 = { this.ui6 = {
'*': { '*': {
@ -581,6 +581,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
this.sf4.validator({ emitError: true }); this.sf4.validator({ emitError: true });
this.sf6.validator({ emitError: true }); this.sf6.validator({ emitError: true });
if (this.ngForm.form.invalid || !this.sf1.valid || !this.sf3.valid || !this.sf4.valid || !this.sf6.valid) { if (this.ngForm.form.invalid || !this.sf1.valid || !this.sf3.valid || !this.sf4.valid || !this.sf6.valid) {
this.service.msgSrv.warning('请完善必填项！');
return; return;
} }

1
src/app/routes/supply-management/components/release-publish/release-publish.component.ts
View File

@ -813,6 +813,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
this.sf6.validator({ emitError: true }); this.sf6.validator({ emitError: true });
this.sf7.validator({ emitError: true }); this.sf7.validator({ emitError: true });
if (this.validateForm1.invalid || !this.sf1.valid || !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) {
this.service.msgSrv.warning('请完善必填项！');
return; return;
} }