diff --git a/proxy.conf.js b/proxy.conf.js index 60203285..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 11:12:31 + * @LastEditTime : 2022-01-20 17:01:32 * @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}} 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..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 10:20:32 + * @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. --> @@ -19,8 +19,8 @@
- - + - - +
@@ -27,10 +37,10 @@ {{headerInfo?.payDate}} - {{headerInfo?.hrBankNo}} + {{headerInfo?.payBankTypeLabel}} - {{headerInfo?.payDate2}} + {{headerInfo?.payDate}} {{headerInfo?.payRemarks}} @@ -41,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-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..c664c849 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 @@ -40,6 +40,7 @@ export class PaymentOrderDetailComponent implements OnInit { if (this.sf) { Object.assign(requestOptions.body, { ...this.sf.value, + payHId: this.id, billTime: { start: this.sf.value.billTime?.[0] || null, end: this.sf.value.billTime?.[1] || null @@ -49,6 +50,10 @@ export class PaymentOrderDetailComponent implements OnInit { end: this.sf.value.feedate?.[1] || null } }); + } else { + Object.assign(requestOptions.body, { + payHId: this.id, + }); } return requestOptions; }; @@ -81,13 +86,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 +107,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: { @@ -144,8 +146,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..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 @@ -235,15 +235,15 @@ 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: '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: 'createTime', 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 }, { @@ -256,9 +256,9 @@ export class PaymentOrderComponent implements OnInit { text: '浏览', click: item => this.router.navigate(['/financial-management/payment-order/detail/' + item.id]) }, - { - text: '修改', - } + // { + // text: '修改', + // } ] } ]; diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html b/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html index 923e7ea7..c0b073c7 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html @@ -59,7 +59,7 @@ - + - - + - +
已选择 {{ 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/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..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?.vcltdcode}} + {{info?.ltdId}} {{info?.vctype}} @@ -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' }, { diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.html b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.html index 484ee40a..36096a94 100644 --- a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.html +++ b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.html @@ -11,8 +11,8 @@
- - + +
'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 }, { @@ -320,15 +330,15 @@ export class VoucherManagementComponent implements OnInit { text: '浏览', click: (item: any) => 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-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/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 @@
- + + + + +
+ +
+ + + +
+
+ +
+
+ + +
+ 客户 + 供应商 +
+ + + + + + + + + + + + + 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..720d11d1 --- /dev/null +++ b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts @@ -0,0 +1,257 @@ +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 { 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'; + +@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: 'appName' }, + { 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, + private envSrv: EAEnvironmentService, + ) {} + + 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: this.envSrv.env.appId }, + // { label: '货主后台', value: this.envSrv.env.HzappId }, + // { label: '司机端', value: this.envSrv.env.sjappId } + ], + 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 + } + 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; + } + } +} 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/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts index 9ce228f2..688ef255 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts @@ -327,23 +327,23 @@ export class CancellationInvoiceComponent implements OnInit { iif: item => item.sts != '3', click: item => this.requestedAction(item) }, - { - text: '推送开票', - iif: item => item.sts != '3', - click: item => this.pushInvoiceAction(item) - }, - { - text: '移除', - click: item => this.batchRemove(item) - }, - { - text: '确认' - // click: item => this.rejectAction(item) - }, - { - text: '撤回', - click: item => this.batchWithdraw(item) - } + // { + // text: '推送开票', + // iif: item => item.sts != '3', + // click: item => this.pushInvoiceAction(item) + // }, + // { + // text: '移除', + // click: item => this.batchRemove(item) + // }, + // { + // text: '确认' + // // click: item => this.rejectAction(item) + // }, + // { + // text: '撤回', + // click: item => this.batchWithdraw(item) + // } ] } ]; 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/invoice-detail/invoice-detail.component.html b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html index 81e14e51..40ff6972 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html @@ -63,7 +63,7 @@ - +
@@ -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 1a0169ca..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 @@ -1,59 +1,69 @@ - - - + -
-
- -
-
- - - - -
+
+
+
+
+ + + + +
+
-
- - -
- 已选择 - {{ 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 }, { diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index fdd060d5..d0337e30 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" 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 };