From 60544b8896b3f888a0eff1aeac10e112813d2bc6 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 20 Jan 2022 16:26:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payable-order.component.html | 14 +++- .../payment-order-detail.component.html | 12 +++- .../payment-order-detail.component.ts | 5 ++ .../receipt-order-detail.component.html | 4 +- .../receipt-order.component.html | 8 +-- .../receipt-order/receipt-order.component.ts | 6 +- .../receivable-order.component.html | 70 ++++++++++++------- .../receivable-order.component.ts | 6 +- .../announcement-message.component.ts | 44 ++++++++++-- 9 files changed, 121 insertions(+), 48 deletions(-) diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.html b/src/app/routes/financial-management/components/payable-order/payable-order.component.html index 79e83713..00a3240b 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order.component.html +++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.html @@ -1,3 +1,13 @@ + @@ -12,8 +22,8 @@ [class.expend-options]="_$expand"> - - + - - + - +
已选择 {{ selectedRows.length }} 张单 diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts index e0eac603..7a226bdc 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts @@ -269,9 +269,9 @@ export class ReceiptOrderComponent implements OnInit { text: '浏览', click: item => this.router.navigate(['/financial-management/receipt-order/detail/' + item.id]) }, - { - text: '核销' - } + // { + // text: '核销' + // } ] } ]; diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html index 04160a51..b91cbc5d 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html @@ -1,32 +1,50 @@ - - + + -
-
- -
-
- - - - - -
+
+
+
+
+ + + + +
+
- - - \ No newline at end of file + + + diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts index ba1a3e26..876fcce9 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts @@ -276,9 +276,9 @@ export class ReceivableOrderComponent implements OnInit { click: item => this.router.navigate(['/financial-management/receivable-order/detail/' + item.id], { queryParams: { billHId: item.billHId } }) }, - { - text: '核销' - } + // { + // text: '核销' + // } ] } ]; diff --git a/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts index 042dd488..b583cf97 100644 --- a/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts +++ b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts @@ -30,6 +30,7 @@ export class AnnouncementMessageComponent implements OnInit { columns: STColumn[] = [ { title: '公告标题', index: 'announcementTitle' }, + { title: '发布平台', index: 'appName' }, { title: '创建时间', index: 'createTime' }, { title: '发送时间', index: 'sendTime' }, { title: '公告内容', index: 'announcementContent' }, @@ -209,18 +210,47 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; this.service.msgSrv.warning('请正确填写完整！') return } + var c = new Date(this.sfFre.value.sendTime); + this.sfFre.value.sendTime = + c.getFullYear() + + '-' + + this.addPreZero(c.getMonth() + 1) + + '-' + + this.addPreZero(c.getDate()) + + ' ' + + this.addPreZero(c.getHours()) + + ':' + + this.addPreZero(c.getMinutes()) + + ':' + + this.addPreZero(c.getSeconds()); const params ={ ...this.sfFre.value } if(this.editId) { params.id = this.editId + console.log(params) + this.service.request(this.service.$api_addAnnouncementInfo, params).subscribe((res:any) => { + if(res) { + this.service.msgSrv.success('保存成功！') + this.isVisible = false + this.st.reload(); + } + }) + } else { + this.service.request(this.service.$api_modifyAnnouncementInfo, params).subscribe((res:any) => { + if(res) { + this.service.msgSrv.success('保存成功！') + this.isVisible = false + this.st.reload(); + } + } + )} +} + addPreZero(num: any) { + if (num < 10) { + return '0' + num; + } else { + return num; } - this.service.request(this.service.$api_saveButtonInfo, params).subscribe((res:any) => { - if(res) { - this.service.msgSrv.success('保存成功！') - this.isVisible = false - this.st.reload(); - } - }) } }