From b96d3d5c395cfd91a502153b506d8f2a2b54bed3 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 20 Jan 2022 14:53:30 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.conf.js | 4 ++-- .../cost-management-detail.component.html | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 60203285..26076c67 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 11:12:31 + * @LastEditTime : 2022-01-20 14:20:33 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -20,7 +20,7 @@ module.exports = { // } '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html index 76564935..d1bcfeea 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html +++ b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html @@ -84,7 +84,8 @@ {{ costInfo?.artocode}}/{{ costInfo?.artonames}} - {{ item.hrvatmoney | currency}} + {{ item.armoney | currency}} + {{ item.hrmoney | currency}} {{ item.armoney | currency}} From b6f2c2c4493c160c68cc595db4f2b7b52d02700b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 20 Jan 2022 15:06:27 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.conf.js | 4 ++-- .../components/bulk-publish/bulk-publish.component.ts | 10 +++++----- .../onecar-publish/onecar-publish.component.ts | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 26076c67..e4a7db22 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 14:20:33 + * @LastEditTime : 2022-01-20 14:53:51 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -20,7 +20,7 @@ module.exports = { // } '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, 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 04425c4a..2d78ebd2 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 @@ -919,12 +919,12 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } this.totalFees = res?.freightPrice || '0'; this.sf7data = { - stateReceipt: res?.supplementaryInformationVO?.stateReceipt, + stateReceipt: res?.stateReceipt, receiptType: res?.receiptType || '', - receiptUserName: res?.supplementaryInformationVO?.receiptUserName || '', - receiptAddressArea: res?.supplementaryInformationVO?.receiptAddressArea || '', - receiptUserPhone: res?.supplementaryInformationVO?.receiptUserPhone || '', - receiptAddress: res?.supplementaryInformationVO?.receiptAddress || '', + receiptUserName: res?.receiptUserName || '', + receiptAddressArea: res?.receiptAddressArea || '', + receiptUserPhone: res?.receiptUserPhone || '', + receiptAddress: res?.receiptAddress || '', paymentDays: res?.paymentDays || '', remarks: res?.remarks || '' }; 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 c067ec5d..f4072d90 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 @@ -1048,12 +1048,12 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { // remarks: res?.remarks // }; this.sf6data = { - stateReceipt: res?.supplementaryInformationVO?.stateReceipt, + stateReceipt: res?.stateReceipt, receiptType: res?.receiptType || '', - receiptUserName: res?.supplementaryInformationVO?.receiptUserName || '', - receiptAddressArea: res?.supplementaryInformationVO?.receiptAddressArea || '', - receiptUserPhone: res?.supplementaryInformationVO?.receiptUserPhone || '', - receiptAddress: res?.supplementaryInformationVO?.receiptAddress || '', + receiptUserName: res?.receiptUserName || '', + receiptAddressArea: res?.receiptAddressArea || '', + receiptUserPhone: res?.receiptUserPhone || '', + receiptAddress: res?.receiptAddress || '', remarks: res?.supplementaryInformationVO?.remarks || '' }; // if (this.PageStatus === '整车修改') { From a68612626b83c5e0bbaa72b13bf97d2224f999d1 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 20 Jan 2022 15:12:09 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../etc-invoiced-logs.component.ts | 8 +- .../invoiced-list.component.html | 106 ++++++++++-------- .../invoiced-list/invoiced-list.component.ts | 6 +- 3 files changed, 65 insertions(+), 55 deletions(-) diff --git a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts index 0bb7ef77..37d0090e 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts @@ -29,12 +29,12 @@ export class ETCInvoicedLogsComponent implements OnInit { Object.assign(requestOptions.body, { ...this.sf.value, exTime: { - start: this.sf.value.exTime?.[0] || null, - end: this.sf.value.exTime?.[1] || null + start: this.sf.value.exTime?.[0] || '', + end: this.sf.value.exTime?.[1] || '' }, invoiceMakeTime: { - start: this.sf.value.invoiceMakeTime?.[0] || null, - end: this.sf.value.invoiceMakeTime?.[1] || null + start: this.sf.value.invoiceMakeTime?.[0] || '', + end: this.sf.value.invoiceMakeTime?.[1] || '' } }); } diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html index 1a0169ca..616f487a 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html @@ -1,59 +1,69 @@ - - - + -
-
- -
-
- - - - -
+
+
+
+
+ + + + +
+
-
- - -
- 已选择 - {{ selectedRows.length }} 条数据   开票金额总计 {{ - totalCallNo }} - 清空 -
+
+ + +
+ 已选择 + {{ selectedRows.length }} 条数据   开票金额总计 + {{ totalCallNo }} + 清空
+
- - - {{item.no}} - 预览发票 - - - {{ item.expresscompany }}
{{ item.expressno }} - - + + + {{ item.no }} + 预览发票 + + + 0.09 + + + {{ item.expresscompany }}
+ {{ item.expressno }} + + -

- 顺丰快递: {{routesInfo?.mailNo}} - 已签收 -

- - \ No newline at end of file +

+ 顺丰快递: {{ routesInfo?.mailNo }} + 已签收 +

+ + diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts index 8d9a21ac..d01da241 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts @@ -210,14 +210,14 @@ export class InvoicedListComponent implements OnInit { className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) } }, - { title: '税率', index: 'vatrate', className: 'text-right', width: 90 }, + { title: '税率', render: 'vatrate', className: 'text-right', width: 90 }, { title: '税额', - index: 'disvattax', + index: 'vattax', width: 90, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.disvattax }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) } }, { title: '开票日期', index: 'invoicedate', type: 'date', width: 150 }, { From 61dccdd3d32700e65dfcf08728f72fc3558b7fbe Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 20 Jan 2022 15:24:19 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cost-management.component.html | 6 ++-- .../voucher-management.component.html | 8 ++--- .../voucher-management.component.ts | 28 ++++++++++----- .../voucher-summary.component.html | 14 ++++++-- .../cancellation-invoice.component.ts | 34 +++++++++---------- .../invoice-detail.component.html | 4 +-- .../invoice-requested.component.html | 4 +-- .../invoice-requested.component.ts | 18 +++++----- .../invoiced-list.component.html | 10 +++--- 9 files changed, 73 insertions(+), 53 deletions(-) diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.html b/src/app/routes/financial-management/components/cost-management/cost-management.component.html index 76114f5f..d6ea4f3b 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.html +++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-30 19:36:30 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 10:20:32 + * @LastEditTime : 2022-01-20 15:22:19 * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\cost-management\\cost-management.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -19,8 +19,8 @@
- - + - - + +
this.router.navigate(['/financial-management/voucher-management/detail/' + item.id]) }, - { - text: '修改' - }, - { - text: '删除' - }, - { - text: '提交' - } + // { + // text: '修改' + // }, + // { + // text: '删除' + // }, + // { + // text: '提交' + // } ] } ]; diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html index 5adf4f91..b18c9463 100644 --- a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html @@ -1,3 +1,13 @@ + @@ -11,9 +21,9 @@
- + - +
@@ -83,7 +83,7 @@ - +
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html index e4e8d229..1f7bb47e 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html @@ -46,9 +46,9 @@ 清空 - + diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index 13ccf85c..5a962ed6 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -415,13 +415,13 @@ export class InvoiceRequestedComponent implements OnInit { buttons: [ { type: 'divider' }, { - text: '开票', + text: '开票
', click: item => this.requestedInvoiceAction(item) }, - { - text: '驳回
', - click: item => this.rejectAction([item]) - }, + // { + // text: '驳回
', + // click: item => this.rejectAction([item]) + // }, { text: '订单明细
', click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item?.id]) @@ -430,10 +430,10 @@ export class InvoiceRequestedComponent implements OnInit { text: '查看原因
', click: item => this.showReason(item) }, - { - text: '下载对账单' - // click: item => this.rejectAction(item) - } + // { + // text: '下载对账单' + // // click: item => this.rejectAction(item) + // } ] } ]; diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html index 616f487a..55886cf5 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html @@ -14,7 +14,7 @@
- + - -
+ +
Date: Thu, 20 Jan 2022 15:28:57 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment-order-detail.component.ts | 4 ++-- .../components/payment-order/payment-order.component.html | 8 ++++---- .../components/payment-order/payment-order.component.ts | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.ts index a21c7eb8..d52a949a 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.ts +++ b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.ts @@ -144,8 +144,8 @@ export class PaymentOrderDetailComponent implements OnInit { private initST(): STColumn[] { return [ { title: '序号', render: 'billHCode', width: 80 }, - { title: '费用号', index: 'feeHCode', width: 100 }, - { title: '费用日期', index: 'feedate', type: 'date', width: 150 }, + // { title: '费用号', index: 'feeHCode', width: 100 }, + // { title: '费用日期', index: 'feedate', type: 'date', width: 150 }, { title: '订单号', index: 'billHCode', width: 100 }, { title: '订单日期', index: 'billTime', width: 150 }, { title: '结算客户', index: 'cnoName', width: 90 }, diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.html b/src/app/routes/financial-management/components/payment-order/payment-order.component.html index 264f0092..82b4c11b 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order.component.html +++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.html @@ -12,8 +12,8 @@ [class.expend-options]="_$expand"> - - + - +
已选择 {{ selectedRows.length }} 张单 diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts index 32b03295..10ca6f4b 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts +++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts @@ -256,9 +256,9 @@ export class PaymentOrderComponent implements OnInit { text: '浏览', click: item => this.router.navigate(['/financial-management/payment-order/detail/' + item.id]) }, - { - text: '修改', - } + // { + // text: '修改', + // } ] } ]; From 9232c4cc0ecb217e32eaa3827eebf499ebadd88f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 20 Jan 2022 16:08:16 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment-order-detail.component.ts | 39 ++- .../announcement-message.component.html | 80 +++++++ .../announcement-message.component.less | 13 + .../announcement-message.component.ts | 226 ++++++++++++++++++ .../sys-setting/services/system.service.ts | 16 +- .../sys-setting/sys-setting-routing.module.ts | 2 + .../routes/sys-setting/sys-setting.module.ts | 6 +- src/assets/mocks/menu-data.json | 4 + 8 files changed, 362 insertions(+), 24 deletions(-) create mode 100644 src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html create mode 100644 src/app/routes/sys-setting/components/announcement-message/announcement-message.component.less create mode 100644 src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts diff --git a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.ts index d52a949a..a01261aa 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.ts +++ b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.ts @@ -81,13 +81,13 @@ export class PaymentOrderDetailComponent implements OnInit { hidden: true } }, - feeHCode: { - type: 'string', - title: '费用单号', - ui: { - placeholder: '请输入' - } - }, + // feeHCode: { + // type: 'string', + // title: '费用单号', + // ui: { + // placeholder: '请输入' + // } + // }, billHCode: { type: 'string', title: '订单号', @@ -102,26 +102,23 @@ export class PaymentOrderDetailComponent implements OnInit { placeholder: '请输入' } }, - feedate: { - title: '费用日期', - type: 'string', - ui: { - widget: 'sl-from-to-search', - format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } - } as SFDateWidgetSchema - }, + // feedate: { + // title: '费用日期', + // type: 'string', + // ui: { + // widget: 'sl-from-to-search', + // format: 'yyyy-MM-dd', + // visibleIf: { + // expand: (value: boolean) => value + // } + // } as SFDateWidgetSchema + // }, billTime: { title: '订单日期', type: 'string', ui: { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } } as SFDateWidgetSchema }, cno: { diff --git a/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html new file mode 100644 index 00000000..ccce1dc8 --- /dev/null +++ b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html @@ -0,0 +1,80 @@ + + + + + +
+ +
+ +
+ + + +
+ +
+
+ + + + +
+ +
+ + + +
+
+ +
+
+ + +
+ 客户 + 供应商 +
+ + + + + + + + + + + + + diff --git a/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.less b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.less new file mode 100644 index 00000000..04fd4ba3 --- /dev/null +++ b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.less @@ -0,0 +1,13 @@ +:host::ng-deep{ + .search-box{ + .ant-card-body{ + padding-bottom: 18px; + } + } + + .content-box{ + .ant-card-body{ + padding-top: 14px; + } + } +} \ No newline at end of file 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 new file mode 100644 index 00000000..042dd488 --- /dev/null +++ b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts @@ -0,0 +1,226 @@ +import { Component, OnInit, ViewChild, Type } from '@angular/core'; +import { STComponent, STColumn, STChange } from '@delon/abc/st'; +import { SFComponent, SFDateWidgetSchema, SFRadioWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; +import { ShipperBaseService } from '@shared'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { of } from 'rxjs'; +import { map } from 'rxjs/operators'; +import { SystemService } from '../../services/system.service'; + +@Component({ + selector: 'app-sys-setting-components-announcement-message', + templateUrl: './announcement-message.component.html', + styleUrls: ['./announcement-message.component.less'] +}) +export class AnnouncementMessageComponent implements OnInit { + @ViewChild('st', { static: true }) + st!: STComponent; + @ViewChild('sf', { static: false }) sf!: SFComponent; + @ViewChild('sfFre', { static: false }) sfFre!: SFComponent; + ui: SFUISchema = {}; + ui2: SFUISchema = {}; + schema: SFSchema = {}; + addSchema: SFSchema = {}; + _$expand = false; + editText = ''; + formData :any; + isVisible = false; + edit = false; + editId = false; + + columns: STColumn[] = [ + { title: '公告标题', index: 'announcementTitle' }, + { title: '创建时间', index: 'createTime' }, + { title: '发送时间', index: 'sendTime' }, + { title: '公告内容', index: 'announcementContent' }, + { + title: '操作', + buttons: [ + { + text: '编辑', + click: item => this.roleAction(item, 2) + }, + { + text: '删除', + click: item => this.deleteAction(item) + }, + ] + } + ]; + + selectedRows: any[] = []; + + get reqParams (){ + return { + ...this.sf?.value, + createTime: { + start: this.sf?.value?.createTime?.[0] || '', + end: this.sf?.value?.createTime?.[1] || '' + } + }}; + + constructor( + public service: SystemService, + private nzModalService: NzModalService, + public shipperservice: ShipperBaseService, + ) {} + + ngOnInit(): void { + this.initSF() + this.initSFFre() + } + + stChange(e: STChange): void { + switch (e.type) { + case 'checkbox': + this.selectedRows = e.checkbox!; + break; + case 'filter': + this.st.load(); + break; + } + } + /** + * 伸缩查询条件 + */ + expandToggle(): void { + this._$expand = !this._$expand; + this.sf?.setValue('/_$expand', this._$expand); + } + /** + * 查询字段个数 + */ + get queryFieldCount(): number { + return Object.keys(this.schema?.properties || {}).length; + } + initSF(){ + this.schema = { + properties: { + _$expand: { type: 'boolean', ui: { hidden: true } }, + announcementTitle: { + type: 'string', + title: '按钮名称', + ui: { placeholder: '请输入' } + }, + createTime: { + title: '创建时间', + type: 'string', + ui: { + widget: 'date', + mode: 'range', + format: 'yyyy-MM-dd', + allowClear: true, + } as SFDateWidgetSchema + }, + } + + }; + this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; + } + initSFFre() { + this.addSchema = { + properties: { + appIdList: { + type: 'string', + title: '发布平台', + enum: [ + { label: '运营后台', value: 1 }, + { label: '货主后台', value: 2 }, + { label: '司机端', value: 3 } + ], + ui: { + widget: 'select', + mode: 'multiple', + errors: { required: '请选择' }, + placeholder: '请选择' + } + }, + announcementTitle: { + type: 'string', + title: '公告标题', + ui: { placeholder: '请输入' } + }, + announcementContent: { + type: 'string', + title: '公告内容', + ui: { placeholder: '请输入' } + }, + sendTime: { + title: '发送时间', + type: 'string', + format: 'date-time', + ui: { + allowClear: true, + } + }, + }, + required: ['name', 'i18n', 'text'] + }; +this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; +} + roleAction(value: any,item?: any) { + if(item === 1) { + this.edit = false; + this.editText = '新增'; + this.formData = {}; + } else { + this.service.request(this.service.$api_getButtonInfo_one, {id: value.id}).subscribe((res: any) => { + console.log(res) + if(res) { + this.formData = res; + } + }) + this.edit = true; + this.editId = value.id; + this.editText = '编辑'; + } + this.isVisible = true; + } + + deleteAction(item?: any) { + this.nzModalService.error({ + nzTitle: '确认删除？', + nzClosable: false, + nzCancelText: '取消', + nzOnOk: () => { + this.service.request(this.service.$api_settlementCustomer_deletebatch, [item.id]).subscribe(res => { + if (res) { + this.service.msgSrv.success('删除成功！'); + this.st.reload(1) + } + }) + } + }); + } + + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + } + handleCancel() { + this.isVisible = false + } + + handleOK() { + console.log(this.sfFre.value) + if(!this.sfFre.valid) { + this.service.msgSrv.warning('请正确填写完整！') + return + } + const params ={ + ...this.sfFre.value + } + if(this.editId) { + params.id = this.editId + } + this.service.request(this.service.$api_saveButtonInfo, params).subscribe((res:any) => { + if(res) { + this.service.msgSrv.success('保存成功！') + this.isVisible = false + this.st.reload(); + } + }) + } +} diff --git a/src/app/routes/sys-setting/services/system.service.ts b/src/app/routes/sys-setting/services/system.service.ts index e9755da6..c0fe2088 100644 --- a/src/app/routes/sys-setting/services/system.service.ts +++ b/src/app/routes/sys-setting/services/system.service.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-20 17:18:43 - * @LastEditTime : 2022-01-19 11:09:26 + * @LastEditTime : 2022-01-20 15:46:46 * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\services\\system.service.ts @@ -143,7 +143,21 @@ export class SystemService extends BaseService { $api_getButtonInfo_one = '/api/mdc/cuc/buttonInfo/getButtonInfo'; // 删除按钮信息(id) $api_deletebatchButton = '/api/mdc/cuc/buttonInfo/deletebatchButton'; + + + // 根据条件获取公告列表 + $api_getAnnouncementInfoList_page = '/api/mdc/pbc/announcementInfo/getAnnouncementInfoList'; + // 获取公告信息详情 + $api_getAnnouncementInfoById_detail = '/api/mdc/pbc/announcementInfo/getAnnouncementInfoById'; + // 删除公告信息 + $api_delete_deleteAnnouncementInfoById = '/api/mdc/pbc/announcementInfo/deleteAnnouncementInfoById'; + // 编辑公告信息 + $api_modifyAnnouncementInfo = '/api/mdc/pbc/announcementInfo/modifyAnnouncementInfo'; + // 新增公告信息 + $api_addAnnouncementInfo = '/api/mdc/pbc/announcementInfo/addAnnouncementInfo'; + + $api_getRoleTemplateInfo: string = ''; $api_getFunctionButtonInfo: string = ''; $api_getFunctionDataInfo: string = ''; diff --git a/src/app/routes/sys-setting/sys-setting-routing.module.ts b/src/app/routes/sys-setting/sys-setting-routing.module.ts index add28e17..d229c8a6 100644 --- a/src/app/routes/sys-setting/sys-setting-routing.module.ts +++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts @@ -26,6 +26,7 @@ import { SystemSupplyLogsComponent } from './components/system-supply-logs/syste import { SystemWaybillLogsComponent } from './components/system-waybill-logs/system-waybill-logs.component'; import { UserLogsComponent } from './components/user-logs/user-logs.component'; import { VersionLogsComponent } from './components/version-logs/version-logs.component'; +import { AnnouncementMessageComponent } from './components/announcement-message/announcement-message.component'; const routes: Routes = [ { path: 'staff-management', component: StaffManagementComponent }, @@ -46,6 +47,7 @@ const routes: Routes = [ { path: 'system-supply-logs', component: SystemSupplyLogsComponent }, { path: 'system-waybill-logs', component: SystemWaybillLogsComponent }, { path: 'btn-management', component: BtnManagementComponent }, + { path: 'announcement-message', component: AnnouncementMessageComponent }, ]; @NgModule({ diff --git a/src/app/routes/sys-setting/sys-setting.module.ts b/src/app/routes/sys-setting/sys-setting.module.ts index 38f68fa0..ad4f4e37 100644 --- a/src/app/routes/sys-setting/sys-setting.module.ts +++ b/src/app/routes/sys-setting/sys-setting.module.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 15:23:05 - * @LastEditTime : 2022-01-19 10:53:26 + * @LastEditTime : 2022-01-20 15:35:53 * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\sys-setting.module.ts @@ -35,6 +35,7 @@ import { CloseAccountComponent } from './components/close-account/close-account. import { SystemSupplyLogsComponent } from './components/system-supply-logs/system-supply-logs.component'; import { SystemWaybillLogsComponent } from './components/system-waybill-logs/system-waybill-logs.component'; import { BtnManagementComponent } from './components/btn-management/btn-management.component'; +import { AnnouncementMessageComponent } from './components/announcement-message/announcement-message.component'; const COMPONENTS = [ StaffManagementComponent, @@ -54,7 +55,8 @@ const COMPONENTS = [ CloseAccountComponent, SystemSupplyLogsComponent, SystemWaybillLogsComponent, - BtnManagementComponent + BtnManagementComponent, + AnnouncementMessageComponent ]; const NOTROUTECOMPONENTS = [ BuyerTranspowerComponent, diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index e8c10f01..868ade81 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -484,6 +484,10 @@ "text": "按钮管理设置", "link": "/system/btn-management" }, + { + "text": "公告信息管理", + "link": "/system/announcement-message" + }, { "text": "车型车长配置", "link": "/system/cart-config" From 60544b8896b3f888a0eff1aeac10e112813d2bc6 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 20 Jan 2022 16:26:08 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=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(); - } - }) } } From 440c8d38dc5dd15ee31ef9830842c29da5099c1c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 20 Jan 2022 16:34:32 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/payment-order/payment-order.component.ts | 2 +- .../announcement-message/announcement-message.component.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts index 10ca6f4b..fad3ee8b 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts +++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts @@ -235,7 +235,7 @@ export class PaymentOrderComponent implements OnInit { width: 120, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.paymoney }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.payMoney }) } }, { title: '付款类型', index: 'payTypeLabel', width: 130 }, { title: '付款方式', index: 'payModeLabel', width: 130 }, 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 b583cf97..cc74c101 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 @@ -6,6 +6,7 @@ import { NzModalService } from 'ng-zorro-antd/modal'; import { of } from 'rxjs'; import { map } from 'rxjs/operators'; import { SystemService } from '../../services/system.service'; +import { environment } from '@env/environment'; @Component({ selector: 'app-sys-setting-components-announcement-message', @@ -125,7 +126,7 @@ export class AnnouncementMessageComponent implements OnInit { type: 'string', title: '发布平台', enum: [ - { label: '运营后台', value: 1 }, + { label: '运营后台', value: environment.appId }, { label: '货主后台', value: 2 }, { label: '司机端', value: 3 } ], From d9a3bb581c5df61b6b46ce83bc224753f7ff12f4 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 20 Jan 2022 16:36:06 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.conf.js | 4 ++-- .../components/payment-order/payment-order.component.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index e4a7db22..3f46d181 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 14:53:51 + * @LastEditTime : 2022-01-20 16:35:47 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -20,7 +20,7 @@ module.exports = { // } '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts index fad3ee8b..f937ddb9 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts +++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts @@ -243,7 +243,7 @@ export class PaymentOrderComponent implements OnInit { { title: '收款人', index: 'hrToName', width: 150 }, { title: '应付已核销', index: 'callNo', width: 150 }, { title: '确认日期', index: 'payDate2', type: 'date', className: 'text-center', width: 150 }, - { title: '创建时间', index: 'createTime', type: 'date', className: 'text-center', width: 150 }, + { title: '创建时间', index: 'payDate', type: 'date', className: 'text-center', width: 150 }, { title: '创建人', index: 'createUserId', width: 160 }, { title: '付款备注', index: 'payRemarks', width: 200 }, { From 267bf8a69346c353a576c364dbefdd4f40d30f9e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 20 Jan 2022 16:40:29 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment-order-detail.component.html | 6 +++--- .../components/payment-order/payment-order.component.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html index d90549fd..06cd3368 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html +++ b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-19 16:54:07 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 16:22:55 + * @LastEditTime : 2022-01-20 16:40:08 * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\payment-order\\payment-order-detail\\payment-order-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -40,7 +40,7 @@ {{headerInfo?.payBankTypeLabel}} - {{headerInfo?.payDate2}} + {{headerInfo?.payDate}} {{headerInfo?.payRemarks}} @@ -51,7 +51,7 @@ {{headerInfo?.payModeLabel}} - {{headerInfo?.payTypeLabel}} + {{headerInfo?.payType}} {{headerInfo?.payMoney |currency}} diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts index f937ddb9..2fc3b452 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts +++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts @@ -237,12 +237,12 @@ export class PaymentOrderComponent implements OnInit { className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.payMoney }) } }, - { title: '付款类型', index: 'payTypeLabel', width: 130 }, + { title: '付款类型', index: 'payType', width: 130 }, { title: '付款方式', index: 'payModeLabel', width: 130 }, { title: '结算客户', index: 'shipperId', width: 160 }, { title: '收款人', index: 'hrToName', width: 150 }, { title: '应付已核销', index: 'callNo', width: 150 }, - { title: '确认日期', index: 'payDate2', type: 'date', className: 'text-center', width: 150 }, + { title: '确认日期', index: 'payDate', type: 'date', className: 'text-center', width: 150 }, { title: '创建时间', index: 'payDate', type: 'date', className: 'text-center', width: 150 }, { title: '创建人', index: 'createUserId', width: 160 }, { title: '付款备注', index: 'payRemarks', width: 200 }, From 96bdd7f60224bdf51fa909388668afc03ffc1fa4 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 20 Jan 2022 16:59:58 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.conf.js | 2 +- .../payment-order-detail.component.html | 6 +++--- .../voucher-detail/voucher-detail.component.html | 2 +- .../voucher-management/voucher-management.component.ts | 4 ++-- .../voucher-list/voucher-list.component.ts | 2 +- .../announcement-message.component.ts | 10 +++++----- src/environments/environment.service.ts | 10 +++++++--- 7 files changed, 20 insertions(+), 16 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 3f46d181..0c568287 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 16:35:47 + * @LastEditTime : 2022-01-20 16:57:38 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ diff --git a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html index 06cd3368..726d7da1 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html +++ b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-19 16:54:07 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 16:40:08 + * @LastEditTime : 2022-01-20 16:57:24 * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\payment-order\\payment-order-detail\\payment-order-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -23,13 +23,13 @@ {{headerInfo?.ltdName}} - {{headerInfo?.hrToName}} + {{headerInfo?.payBankTypeLabel}} {{headerInfo?.ltdAccountId}} - {{headerInfo?.invdate}} + {{headerInfo?.payMoney}}
diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html b/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html index 8d8fe5dc..552fa829 100644 --- a/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html +++ b/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html @@ -12,7 +12,7 @@ - {{info?.vcltdcode}} + {{info?.ltdId}} {{info?.vctype}} diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts index 393c4f87..a6871f49 100644 --- a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts +++ b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 15:57:44 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 15:23:12 + * @LastEditTime : 2022-01-20 16:58:27 * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\voucher-management\\voucher-management.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -296,7 +296,7 @@ export class VoucherManagementComponent implements OnInit { { title: '凭证号', index: 'id', type: 'link', width: 150 }, { title: '帐套', index: 'vcltdid', width: 150 }, { title: '凭证时间', index: 'vctime', type: 'date', width: 150 }, - { title: '凭证类型', index: 'vctypeLabel', width: 150 }, + { title: '凭证类型', index: 'vctype', width: 150 }, { title: '序号', index: 'invmoney', width: 150, format: _ => '1' }, { title: '摘要', index: 'remarks', width: 300 }, { title: '币种', index: 'currency', width: 100 }, diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts b/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts index fc9137f1..eff9fc1d 100644 --- a/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts @@ -186,7 +186,7 @@ export class VoucherListComponent implements OnInit { { title: '凭证号', index: 'id', type: 'link', width: 150 }, { title: '帐套', index: 'vcltdid', width: 150 }, { title: '凭证时间', index: 'vctime', type: 'date', width: 150 }, - { title: '凭证类型', index: 'vctypeLabel', width: 150 }, + { title: '凭证类型', index: 'vctype', width: 150 }, { title: '序号', index: 'invmoney', width: 150, format: _ => '1' }, { title: '摘要', index: 'remarks', width: 300 }, { title: '币种', index: 'currency', width: 100 }, 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 cc74c101..720d11d1 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 @@ -1,12 +1,11 @@ import { Component, OnInit, ViewChild, Type } from '@angular/core'; import { STComponent, STColumn, STChange } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFRadioWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; -import { ShipperBaseService } from '@shared'; +import { EAEnvironmentService, ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { of } from 'rxjs'; import { map } from 'rxjs/operators'; import { SystemService } from '../../services/system.service'; -import { environment } from '@env/environment'; @Component({ selector: 'app-sys-setting-components-announcement-message', @@ -65,6 +64,7 @@ export class AnnouncementMessageComponent implements OnInit { public service: SystemService, private nzModalService: NzModalService, public shipperservice: ShipperBaseService, + private envSrv: EAEnvironmentService, ) {} ngOnInit(): void { @@ -126,9 +126,9 @@ export class AnnouncementMessageComponent implements OnInit { type: 'string', title: '发布平台', enum: [ - { label: '运营后台', value: environment.appId }, - { label: '货主后台', value: 2 }, - { label: '司机端', value: 3 } + { label: '运营后台', value: this.envSrv.env.appId }, + // { label: '货主后台', value: this.envSrv.env.HzappId }, + // { label: '司机端', value: this.envSrv.env.sjappId } ], ui: { widget: 'select', diff --git a/src/environments/environment.service.ts b/src/environments/environment.service.ts index a0cafad7..49800234 100644 --- a/src/environments/environment.service.ts +++ b/src/environments/environment.service.ts @@ -1,8 +1,8 @@ /* * @Author: Maple * @Date: 2021-03-22 09:50:07 - * @LastEditors: Do not edit - * @LastEditTime: 2021-05-27 11:37:17 + * @LastEditors : Shiming + * @LastEditTime : 2022-01-20 16:54:57 * @Description:全局环境服务 */ import { Injectable } from '@angular/core'; @@ -11,8 +11,12 @@ import { Injectable } from '@angular/core'; providedIn: 'root', }) export class EnvironmentService { - // 应用ID + // 运多星运营管理后台应用ID private appId = `5800BF51DC9A494489700F09E3B81520`; + // 运多星货主后台应用ID + private HzappId = `A48F72F0A304427F921794BAD86B3522`; + // 运多星司机应用ID + private sjappId = `AB5EDFE8A46D46EBA69F2CBB6C94D226`; // 租户ID private tenantId = `1352892699355607041`; private env: { appId: string; tenantId: string } = { appId: this.appId, tenantId: this.tenantId }; From 7e0259a0ccbe2f7e04dcfcf0e826dc28be9e060f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 20 Jan 2022 17:04:06 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.conf.js | 2 +- .../voucher-detail/voucher-detail.component.html | 14 ++++++++++++-- .../voucher-detail/voucher-detail.component.ts | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 0c568287..e6c40845 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 16:57:38 + * @LastEditTime : 2022-01-20 17:01:32 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html b/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html index 552fa829..bc8e7369 100644 --- a/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html +++ b/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html @@ -1,3 +1,13 @@ + + {{info?.ltdId}} @@ -46,7 +56,7 @@ {{info?.remarks}} - {{info?.createUserId}} + {{info?.id}} {{info?.createUserId}} diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.ts b/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.ts index 1c4f072c..ebf64601 100644 --- a/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.ts +++ b/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.ts @@ -11,7 +11,7 @@ import { FreightAccountService } from '../../../services/freight-account.service export class VoucherDetailComponent implements OnInit { columns: STColumn[] = [ { title: '摘要', index: 'remarks' }, - { title: '会计科目', index: 'subname' }, + { title: '会计科目', index: 'subcode' }, { title: '辅助核算', render: 'auxVOList' }, { title: '币种', index: 'currency', className: 'text-center' }, { From 12c8510a5e54835ba719b704f605e8fc8d7c2364 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 20 Jan 2022 17:15:24 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cost-management/cost-management.component.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.html b/src/app/routes/financial-management/components/cost-management/cost-management.component.html index d6ea4f3b..2846666e 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.html +++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-30 19:36:30 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 15:22:19 + * @LastEditTime : 2022-01-20 17:14:57 * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\cost-management\\cost-management.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -51,7 +51,8 @@ {{ item.hrmoney | currency}} - {{ item.artocode}}/{{ item.artonames}} + {{ item.artocode}}/{{ item.artonames}} + {{ item.hrtocode}}/{{ item.hrtonames}} {{ item.hrpaymoney | currency}} From 5818711df5a01e3116e1c8a8339508548e6feaa6 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 20 Jan 2022 17:18:25 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voucher-management/voucher-management.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts index a6871f49..172b56b6 100644 --- a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts +++ b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 15:57:44 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 16:58:27 + * @LastEditTime : 2022-01-20 17:18:16 * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\voucher-management\\voucher-management.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -294,7 +294,7 @@ export class VoucherManagementComponent implements OnInit { return [ { title: '', index: 'key', type: 'checkbox', width: 60, className: 'text-center', fixed: 'left' }, { title: '凭证号', index: 'id', type: 'link', width: 150 }, - { title: '帐套', index: 'vcltdid', width: 150 }, + { title: '帐套', index: 'ltdId', width: 150 }, { title: '凭证时间', index: 'vctime', type: 'date', width: 150 }, { title: '凭证类型', index: 'vctype', width: 150 }, { title: '序号', index: 'invmoney', width: 150, format: _ => '1' }, From 7e498fe364eb1e932918040b4810bf7c07b11c6a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 20 Jan 2022 17:18:45 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voucher-management/voucher-management.component.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts index 172b56b6..cbe3fb72 100644 --- a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts +++ b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts @@ -293,11 +293,11 @@ export class VoucherManagementComponent implements OnInit { private initST(): STColumn[] { return [ { title: '', index: 'key', type: 'checkbox', width: 60, className: 'text-center', fixed: 'left' }, - { title: '凭证号', index: 'id', type: 'link', width: 150 }, - { title: '帐套', index: 'ltdId', width: 150 }, - { title: '凭证时间', index: 'vctime', type: 'date', width: 150 }, - { title: '凭证类型', index: 'vctype', width: 150 }, - { title: '序号', index: 'invmoney', width: 150, format: _ => '1' }, + { title: '凭证号', index: 'id', type: 'link', width: 200 }, + { title: '帐套', index: 'ltdId', width: 200 }, + { title: '凭证时间', index: 'vctime', type: 'date', width: 200 }, + { title: '凭证类型', index: 'vctype', width: 200 }, + { title: '序号', index: 'invmoney', width: 200, format: _ => '1' }, { title: '摘要', index: 'remarks', width: 300 }, { title: '币种', index: 'currency', width: 100 }, {