From c9e8779418a020b7478ae8e6128e2428e5a3fe35 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 23 Mar 2022 09:40:29 +0800 Subject: [PATCH 1/3] edit --- .../invoice-requested/invoice-requested.component.ts | 4 ++-- src/app/shared/services/business/user.service.ts | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) 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 891dcef4..12465791 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 @@ -339,7 +339,7 @@ export class InvoiceRequestedComponent { }, arto: { type: 'string', - title: '购买人', + title: '货主名称', ui: { widget: 'select', placeholder: '请选择', @@ -359,7 +359,7 @@ export class InvoiceRequestedComponent { { title: '', index: 'key', type: 'checkbox' }, { title: '申请编号', render: 'vatappcode', width: 190 }, { title: '网络货运人', index: 'ltdName', width: 170 }, - { title: '购买方', index: 'artoName', width: 170 }, + { title: '货主名称', index: 'artoName', width: 170 }, { title: '订单数', index: 'ordlines', width: 90 }, { title: '申请金额', diff --git a/src/app/shared/services/business/user.service.ts b/src/app/shared/services/business/user.service.ts index caf9afe4..82f6a790 100644 --- a/src/app/shared/services/business/user.service.ts +++ b/src/app/shared/services/business/user.service.ts @@ -130,7 +130,7 @@ export class EAUserService extends BaseService { async doAfterLogin() { await this.loadUserInfo(); await this.loadUserMenus(); - await this.loadUserRoles(); + this.loadApp(); } /** @@ -165,9 +165,15 @@ export class EAUserService extends BaseService { } /** - * 加载用户角色 + * 加载系统信息 */ - loadUserRoles() {} + loadApp() { + this.http.get(`assets/mocks/app-data.json`).subscribe(res => { + if (res.app) { + this.settings.setApp(res.app); + } + }); + } /** * 登出 From cd84e321e2c2c42abefd021c4211d59c8a1f6655 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 23 Mar 2022 09:51:22 +0800 Subject: [PATCH 2/3] edit --- .../voucher-management.component.ts | 24 +++++++++++++++---- .../invoiced-list.component.html | 3 +-- .../invoiced-list/invoiced-list.component.ts | 14 +++++++++-- 3 files changed, 33 insertions(+), 8 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 c38bc2ae..c1b17c1b 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 @@ -1,5 +1,5 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-01-18 15:57:44 @@ -137,6 +137,22 @@ export class VoucherManagementComponent implements OnInit { sourceType: { type: 'string', title: '原始单类型', + enum: [ + { value: '', label: '全部' }, + { value: 1, label: '收款' }, + { value: 2, label: '收款(退款)' }, + { value: 3, label: '应收费用' }, + { value: 4, label: '应收费用(负数)' }, + { value: 5, label: '应收核销' }, + { value: 6, label: '应收核销(负数)' }, + { value: 7, label: '应付费用' }, + { value: 8, label: '应付费用(负数)' }, + { value: 9, label: '应付核销' }, + { value: 10, label: '应付核销(负数)' }, + { value: 11, label: '分票开票' }, + { value: 12, label: '删除分票' }, + { value: 13, label: '付款' } + ], ui: { widget: 'select', placeholder: '请选择', @@ -292,7 +308,7 @@ export class VoucherManagementComponent implements OnInit { return [ { title: '', index: 'key', type: 'checkbox', width: 60, className: 'text-center', fixed: 'left' }, { title: '凭证号', index: 'vccode', type: 'link', width: 200 }, - { title: '帐套', index: 'ltdId', width: 200,format:item=>`${item.vcltdcode}-${item.vcltdname}` }, + { title: '帐套', index: 'ltdId', width: 200, format: item => `${item.vcltdcode}-${item.vcltdname}` }, { title: '凭证时间', index: 'vctime', type: 'date', width: 200 }, { title: '凭证类型', index: 'vctype', width: 200 }, { title: '序号', index: 'invmoney', width: 200, format: _ => '1' }, @@ -328,8 +344,8 @@ export class VoucherManagementComponent implements OnInit { { text: '浏览', click: (item: any) => this.router.navigate(['/financial-management/voucher-management/detail/' + item.id]), - acl: { ability: ['FINANCIAL-VOUCHER-view'] }, - }, + acl: { ability: ['FINANCIAL-VOUCHER-view'] } + } // { // text: '修改' // }, 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 ae7379e0..48255eee 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 @@ -16,8 +16,7 @@ -
+
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 7c812747..ead3efb7 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 @@ -137,7 +137,7 @@ export class InvoicedListComponent implements OnInit { autocomplete: 'off' } }, - vatinvcode: { + vatappHCode: { type: 'string', title: '申请编号', ui: { @@ -177,6 +177,16 @@ export class InvoicedListComponent implements OnInit { asyncData: () => this.service.getNetworkFreightForwarder({}, true) }, default: '' + }, + vatinvcode: { + type: 'string', + title: '分票编号', + ui: { + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => value + } + } } } }; @@ -188,7 +198,7 @@ export class InvoicedListComponent implements OnInit { { title: '发票号码', index: 'invoiceno', width: 150 }, { title: '申请编号', - index: 'vatinvcode', + index: 'vatappHCode', width: 190, type: 'link', click: item => From 5d9b136898295ec39a9bbfe778ed8a4493c83f5d Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 23 Mar 2022 10:07:05 +0800 Subject: [PATCH 3/3] edit --- .../components/invoiced-list/invoiced-list.component.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 ead3efb7..0662aa43 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 @@ -253,22 +253,23 @@ export class InvoicedListComponent implements OnInit { title: '操作', fixed: 'right', className: 'text-center', - width: 180, + width: 120, buttons: [ + {type:'divider'}, { - text: '查看明细', + text: '查看明细
', click: item => this.router.navigate(['/ticket/invoice-list/detail/' + item.id], { queryParams: { expressno: item.expressno, type: 2, ltdId: item.shipperId } }) }, { - text: '发票作废', + text: '发票作废
', click: item => this.deletedInvoice(item), iif: item => item.sts === '1' }, { - text: '查看物流', + text: '查看物流
', click: item => this.showlogosticsLogs(item), iif: item => item.expresscompany }