From f181229238ed490590640839fbbc4fa733ac0b87 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 28 Feb 2022 19:43:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/bulk-publish/bulk-publish.component.ts | 3 ++- .../bulk-release-publish/bulk-release-publish.component.ts | 3 ++- .../components/release-publish/release-publish.component.ts | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) 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 a2222101..a614b852 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 @@ -523,7 +523,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } as SFTextareaWidgetSchema } }, - required: ['stateReceipt', 'receiptType', 'receiptUserName','receiptUserPhone','receiptAddressArea','receiptAddress'] + required: ['stateReceipt', 'receiptType', 'receiptUserName','receiptUserPhone','receiptAddressArea','receiptAddress','paymentDays'] }; this.ui7 = { '*': { @@ -655,6 +655,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { this.sf4.validator({ emitError: true }); this.sf7.validator({ emitError: true }); if (this.validateForm1.invalid || !this.sf3.valid || !this.sf1.valid || !this.sf4.valid || !this.sf7.valid) { + this.service.msgSrv.warning('请完善必填项！'); return; } 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 35f68fc2..d870e3df 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 @@ -533,7 +533,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { } as SFTextareaWidgetSchema } }, - required: ['stateReceipt', 'paymentDays', 'receiptType', 'receiptUserName','receiptUserPhone','receiptAddressArea','receiptAddress'] + required: ['stateReceipt', 'paymentDays', 'receiptType', 'receiptUserName','receiptUserPhone','receiptAddressArea','receiptAddress','paymentDays'] }; this.ui6 = { '*': { @@ -581,6 +581,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { this.sf4.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) { + this.service.msgSrv.warning('请完善必填项！'); return; } 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 8eeedaa6..2a419693 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 @@ -813,6 +813,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.sf6.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) { + this.service.msgSrv.warning('请完善必填项！'); return; } From 7a6a2454a08d83dfa3be94afd1c9c19b38ddbb6e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 28 Feb 2022 19:48:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/bulk-detail/bulk-detail.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index 01e93833..b6d7fd88 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @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 * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -36,7 +36,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { { title: '款项', index: 'expenseName' }, { title: '运输费（元）', render: 'price' }, { title: '附加费（元）', render: 'surcharge' }, - { title: '支付时间', index: ' paymentTime' }, + { title: '支付时间', index: 'paymentTime' }, { title: '支付状态', className: 'text-center',