Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
wangshiming
2022-01-13 15:57:40 +08:00
parent ec9123c805 6fc033cc95
commit dc7d0d5e1d
12 changed files with 348 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/app/routes/financial-management/components/driver-account/driver-account.component.ts
View File

@ -1,14 +1,18 @@
import { CurrencyPipe } from '@angular/common';
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
import { ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component';
import { FreightAccountService } from '../../services/freight-account.service';
@Component({
selector: 'app-driver-account',
templateUrl: './driver-account.component.html',
styleUrls: ['./driver-account.component.less']
styleUrls: ['./driver-account.component.less'],
providers: [CurrencyPipe]
})
export class DriverAccountComponent implements OnInit {
@ViewChild('st', { static: true })
@ -20,7 +24,12 @@ export class DriverAccountComponent implements OnInit {
columns: STColumn[] = this.initST();
_$expand = false;
constructor(public service: FreightAccountService, private router: Router) {}
constructor(
public service: FreightAccountService,
private router: Router,
private modal: NzModalService,
private currencyPipe: CurrencyPipe
) {}
ngOnInit(): void {}
@ -32,6 +41,16 @@ export class DriverAccountComponent implements OnInit {
return requestOptions;
};
showAccountDetail(item: any) {
this.modal.create({
nzTitle: '账户明细',
nzContent: AccountDetailComponent,
nzWidth: 600,
nzComponentParams: {},
nzFooter: null
});
}
/**
* 重置表单
*/
@ -146,10 +165,33 @@ export class DriverAccountComponent implements OnInit {
{ title: '网络货运人', index: 'ltdName' },
{ title: '银行类型', index: 'bankTypeLabel' },
{ title: '虚拟账户', index: 'virtualAccount' },
{ title: '可用余额', index: 'availableBalance' },
{ title: '冻结余额', index: 'freezeBalance' },
{ title: '本月累计提现金额', index: 'withdrawBalance', width: 150 },
{ title: '账户总余额', index: 'availableBalance' },
{
title: '可用余额',
index: 'availableBalance',
type: 'currency',
format: item => `${this.currencyPipe.transform(item.availableBalance)}`
},
{
title: '冻结余额',
index: 'freezeBalance',
type: 'currency',
format: item => `${this.currencyPipe.transform(item.availableBalance)}`
},
{
title: '本月累计提现金额',
index: 'withdrawBalance',
width: 150,
type: 'currency',
format: item => `${this.currencyPipe.transform(item.availableBalance)}`
},
{
title: '账户总余额',
index: 'availableBalance',
className: 'text-right',
type: 'link',
format: item => `${this.currencyPipe.transform(item.availableBalance)}`,
click: item => this.showAccountDetail(item)
},
{ title: '创建时间', index: 'createTime', type: 'date', width: 150 },
{
title: '操作',

1
src/app/routes/financial-management/components/freight-account/freight-account.component.ts
View File

@ -50,6 +50,7 @@ export class FreightAccountComponent implements OnInit {
this.modal.create({
nzTitle: '账户明细',
nzContent: AccountDetailComponent,
nzWidth: 600,
nzComponentParams: {},
nzFooter: null
});

9
src/app/routes/financial-management/components/voucher-management/voucher-management.component.html
View File

@ -10,9 +10,9 @@
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button> 导出</button>
<button nz-button> 导出明细</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button [disabled]="service.http.loading"> 导出</button>
<button nz-button [disabled]="service.http.loading"> 导出明细</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -24,7 +24,8 @@
<nz-card class="content-box" nzBordered>
<div class="d-flex align-items-center mb-md mt-md">
<button nz-button (click)="this.addInvoice()" nzType="primary">添加发票</button>
<button nz-button nzType="primary">新建凭证</button>
<button nz-button nzType="primary">凭证导入</button>
<div class="ml-md">
已选择
<strong class="text-primary">{{ selectedRows.length }}</strong> 张发票

167
src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts
View File

@ -102,7 +102,7 @@ export class VoucherManagementComponent implements OnInit {
},
ltdid: {
type: 'string',
title: '网络货运人',
title: '客户',
ui: {
widget: 'select',
placeholder: '请选择',
@ -111,37 +111,37 @@ export class VoucherManagementComponent implements OnInit {
},
default: ''
},
invoiceno: {
createtime: {
title: '凭证时间',
type: 'string',
title: '发票号码',
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
},
inpinvc2ode: {
type: 'string',
title: '原始单号',
ui: {
autocomplete: 'off',
placeholder: '请输入'
}
},
invtype: {
type: 'string',
title: '发票类型',
ui: {
widget: 'dict-select',
params: { dictKey: 'refund:apply:status' },
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
hrto: {
type: 'string',
title: '销售方',
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
createtime: {
invtype: {
type: 'string',
title: '原始单类型',
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
createtim2e: {
title: '创建时间',
type: 'string',
ui: {
@ -152,9 +152,19 @@ export class VoucherManagementComponent implements OnInit {
}
} as SFDateWidgetSchema
},
inpinvcosde: {
type: 'string',
title: '凭证摘要',
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
sts: {
type: 'string',
title: '收票状态',
title: '凭证类型',
ui: {
widget: 'dict-select',
params: { dictKey: 'refund:apply:status' },
@ -164,12 +174,13 @@ export class VoucherManagementComponent implements OnInit {
}
}
},
invdate: {
s2ts: {
type: 'string',
title: '发票日期',
title: '科目',
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
widget: 'dict-select',
params: { dictKey: 'refund:apply:status' },
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
@ -177,7 +188,7 @@ export class VoucherManagementComponent implements OnInit {
},
remarks: {
type: 'string',
title: '收票备注',
title: '借方金额',
ui: {
placeholder: '请输入',
visibleIf: {
@ -187,7 +198,7 @@ export class VoucherManagementComponent implements OnInit {
},
billCode: {
type: 'string',
title: '订单号',
title: '贷方金额',
ui: {
placeholder: '请输入',
visibleIf: {
@ -195,15 +206,72 @@ export class VoucherManagementComponent implements OnInit {
}
}
},
s2t2s: {
type: 'string',
title: '帐套',
ui: {
widget: 'dict-select',
params: { dictKey: 'refund:apply:status' },
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
s22t2s: {
type: 'string',
title: '凭证状态',
ui: {
widget: 'dict-select',
params: { dictKey: 'refund:apply:status' },
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
feecode: {
type: 'string',
title: '费用号',
title: 'NC凭证',
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
feecsode: {
type: 'string',
title: '汇总凭证号',
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
s22t2ss: {
type: 'string',
title: '导入NC',
ui: {
widget: 'dict-select',
params: { dictKey: 'refund:apply:status' },
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
s22t2s1s: {
type: 'string',
title: '是否汇总',
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
}
}
};
@ -212,27 +280,34 @@ export class VoucherManagementComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '', index: 'key', type: 'checkbox' },
{ title: '收票单号', index: 'inpinvcode', type: 'link' },
{ title: '网络货运人', index: 'ltdid' },
{ title: '发票日期', index: 'invdate', type: 'date' },
{ title: '发票号', index: 'invoiceno' },
{ title: '发票金额', index: 'invmoney' },
{ title: '税额', index: 'invtax' },
{ title: '发票类型', index: 'invtype' },
{ title: '销售方', index: 'hrto' },
{ title: '创建时间', index: 'createtime', type: 'date' },
{ title: '创建人', index: 'createbyname' },
{ title: '收票状态', index: 'sts' },
{ title: '凭证号', index: 'inpinvcode', type: 'link' },
{ title: '帐套', index: 'ltdid' },
{ title: '凭证时间', index: 'invdate', type: 'date' },
{ title: '凭证类型', index: 'invoiceno' },
{ title: '序号', index: 'invmoney' },
{ title: '摘要', index: 'invtax' },
{ title: '币种', index: 'invtype' },
{ title: '借方金额', index: 'hrto' },
{ title: '贷方金额', index: 'createtime', type: 'date' },
{ title: 'NC凭证', index: 'createbyname' },
{ title: '汇总凭证号', index: 'sts' },
{ title: '凭证状态', index: 'sts' },
{ title: '创建时间', index: 'sts' },
{ title: '创建人', index: 'sts' },
{
title: '操作',
buttons: [
{
text: '浏览',
click: item => this.router.navigate(['/ticket/input-invoice/detail/' + item.id])
text: '浏览'
},
{
text: '修改',
click: item => this.router.navigate(['/ticket/input-invoice/edit/1'])
text: '修改'
},
{
text: '删除 '
},
{
text: '提交'
}
]
}

29
src/app/routes/ticket-management/components/express-info/express-info.component.html Normal file
View File

@ -0,0 +1,29 @@
<page-header-wrapper title="基础配置">
</page-header-wrapper>
<nz-card class="search-box">
<div nz-row nzGutter="8">
<div nz-col [nzSpan]="6">
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 90,grid: { span: 24 } }}" [compact]="true"
[button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="8" nzOffset="1">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
</div>
</div>
</nz-card>
<nz-card class="content-box">
<div class="d-flex justify-content-end mb-sm">
<div>
<button nz-button nzType="primary" (click)="printOrder()" >打印面单</button>
</div>
</div>
<st #st [data]="url" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading" [scroll]="{ y: '370px' }" (change)="stChange($event)"></st>
</nz-card>

0
src/app/routes/ticket-management/components/express-info/express-info.component.less Normal file
View File

102
src/app/routes/ticket-management/components/express-info/express-info.component.ts Normal file
View File

@ -0,0 +1,102 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { STComponent, STColumn, STChange } from '@delon/abc/st';
import { SFComponent, SFSchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal';
import { TicketService } from '../../services/ticket.service';
@Component({
selector: 'app-express-info',
templateUrl: './express-info.component.html',
styleUrls: ['./express-info.component.less']
})
export class ExpressInfoComponent implements OnInit {
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
url = `/rule?_allow_anonymous=true`;
searchSchema: SFSchema = {
properties: {
receiveName: {
title: '配置类型',
type: 'string',
ui: {
widget: 'select',
placeholder: '请选择',
// asyncData: () => {
// return this.service.request(this.service.$api_getAppRoleList).pipe(
// map((res: any) => {
// this.roleList = res;
// return res.map((item: any) => {
// return { label: item.roleName, value: item.id };
// });
// }),
// );
// },
change: (i: any) => {
this.sf.value.receiveName = i;
this.sf?.setValue('/receiveName', i);
}
}
}
}
};
columns: STColumn[] = [
{ title: '配置类型', index: 'no' },
{ title: '配置项', index: 'description' },
{
title: '启用状态',
className: 'text-center',
index: 'status',
type: 'badge',
badge: {
0: { text: '启用', color: 'success' },
2: { text: '停用', color: 'error' },
3: { text: '停用', color: 'error' },
1: { text: '停用', color: 'error' }
}
},
{
title: '创建时间',
index: 'updatedAt',
type: 'date'
}
];
selectedRows: any[] = [];
reqParams = { pageIndex: 1, pageSize: 10 };
constructor(public service: TicketService, private nzModalService: NzModalService) {}
ngOnInit(): void {}
stChange(e: STChange): void {
switch (e.type) {
case 'checkbox':
this.selectedRows = e.checkbox!;
break;
case 'filter':
this.st.load();
break;
}
}
printOrder() {
this.nzModalService.warning({
nzTitle: '确认打印面单所选快递单？',
nzClosable: false,
nzCancelText: '取消',
nzOnOk: () => {}
});
}
/**
* 重置表单
*/
resetSF() {
this.sf.reset();
}
}

4
src/app/routes/ticket-management/ticket-management-routing.module.ts
View File

@ -5,6 +5,7 @@ import { ETCBlacklistComponent } from './components/etc-blacklist/etc-blacklist.
import { ETCInvoicedListComponent } from './components/etc-invoiced-list/etc-invoiced-list.component';
import { ETCInvoicedLogsComponent } from './components/etc-invoiced-logs/etc-invoiced-logs.component';
import { ETCInvoicedRequestedComponent } from './components/etc-invoiced-requested/etc-invoiced-requested.component';
import { ExpressInfoComponent } from './components/express-info/express-info.component';
import { EditCollectionInvoiceComponent } from './components/input-invoice/edit-collection-invoice/edit-collection-invoice.component';
import { InputInvoiceDetailComponent } from './components/input-invoice/input-invoice-detail/input-invoice-detail.component';
import { InputInvoiceComponent } from './components/input-invoice/input-invoice.component';
@ -26,7 +27,8 @@ const routes: Routes = [
{ path: 'etc-blacklist', component: ETCBlacklistComponent },
{ path: 'input-invoice', component: InputInvoiceComponent },
{ path: 'input-invoice/detail/:id', component: InputInvoiceDetailComponent },
{ path: 'input-invoice/edit/:id', component: EditCollectionInvoiceComponent }
{ path: 'input-invoice/edit/:id', component: EditCollectionInvoiceComponent },
{ path: 'express-info', component: ExpressInfoComponent },
];
@NgModule({

9
src/app/routes/ticket-management/ticket-management.module.ts
View File

@ -23,6 +23,7 @@ import { AddCollectionInvoiceModalComponent } from './components/input-invoice/a
import { EditCollectionInvoiceComponent } from './components/input-invoice/edit-collection-invoice/edit-collection-invoice.component';
import { AddCostDetailComponent } from './components/input-invoice/add-cost-detail/add-cost-detail.component';
import { PrintOrderModalComponent } from './components/invoice-requested/print-order-modal/print-order-modal.component';
import { ExpressInfoComponent } from './components/express-info/express-info.component';
const COMPONENTS: any = [
ETCInvoicedListComponent,
@ -37,7 +38,8 @@ const COMPONENTS: any = [
PushInvoiceComponent,
InputInvoiceComponent,
InputInvoiceDetailComponent,
EditCollectionInvoiceComponent
EditCollectionInvoiceComponent,
ExpressInfoComponent
];
const NOTROUTECOMPONENTS: any = [
TransactionDetailsComponent,
@ -46,10 +48,11 @@ const NOTROUTECOMPONENTS: any = [
AddOwnerComponent,
AddCartComponent,
AddCollectionInvoiceModalComponent,
AddCostDetailComponent
AddCostDetailComponent,
PrintOrderModalComponent
];
@NgModule({
declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS, PrintOrderModalComponent],
declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS],
imports: [CommonModule, TicketManagementRoutingModule, SharedModule]
})
export class TicketManagementModule {}

2
src/app/shared/components/account-detail/account-detail.component.html
View File

@ -1,4 +1,4 @@
<st #st [data]="url" [columns]="columns"
<st #st [data]="url" [columns]="columns" bordered size="small"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"

36
src/app/shared/components/account-detail/account-detail.component.ts
View File

@ -1,28 +1,48 @@
import { CurrencyPipe } from '@angular/common';
import { Component, OnInit, ViewChild } from '@angular/core';
import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st';
import { BaseService } from '../../services';
@Component({
selector: 'app-account-detail',
templateUrl: './account-detail.component.html'
templateUrl: './account-detail.component.html',
providers:[CurrencyPipe]
})
export class AccountDetailComponent implements OnInit {
@ViewChild('st', { static: true })
st!: STComponent;
columns: STColumn[] = [
{ title: '网络货运人', index: 'phone' },
{ title: '平安账户余额', index: 'ltdName' },
{ title: '浦发账户余额', index: 'bankTypeLabel' }
];
columns: STColumn[] = [];
url = '';
isCanCreate = false;
constructor(public service: BaseService) {}
constructor(public service: BaseService, private currencyPipe: CurrencyPipe) {}
ngOnInit(): void {}
ngOnInit(): void {
setTimeout(() => {
this.initST();
}, 200);
}
beforeReq = (requestOptions: STRequestOptions) => {
return requestOptions;
};
initST() {
this.columns = [
{ title: '网络货运人', index: 'phone', className: 'text-center' },
{
title: '平安账户余额',
index: 'ltdName',
type: 'currency',
format: item => `${this.currencyPipe.transform(item.availableBalance)}`
},
{
title: '浦发账户余额',
index: 'bankTypeLabel',
type: 'currency',
format: item => `${this.currencyPipe.transform(item.availableBalance)}`
}
];
}
}

4
src/assets/mocks/menu-data.json
View File

@ -338,6 +338,10 @@
"text": "已开订单明细",
"link": "/ticket/invoice-list/detail/:id",
"hide": true
},
{
"text": "快递信息",
"link": "/ticket/express-info"
}
]
},