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-05 20:15:41 +08:00
parent cd0035940a e4c007f0d5
commit 961c21f6df
31 changed files with 998 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/routes/account/account-routing.module.ts
View File

@ -16,14 +16,13 @@ const routes: Routes = [
path: 'center',
component: AccountComponentsCenterComponent,
data: {
title: '账户中心',
titleI18n: 'app.my.center',
},
},
title: '账户中心'
}
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
exports: [RouterModule]
})
export class AccountRoutingModule {}

15
src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.less → src/app/routes/commom/less/box.less
View File

@ -19,19 +19,8 @@
padding-left : 16px;
padding-right: 16px;
}
}
.expend-options {
margin-top: 0px;
}
@media (min-width: 1200px) {
.expend-options {
margin-top: -40px;
max-width : 400px;
position : absolute;
right : 0;
bottom : 30px;
.text-truncate {
white-space: normal;
}
}

13
src/app/routes/commom/less/expend-but.less Normal file
View File

@ -0,0 +1,13 @@
.expend-options {
margin-top: 0px;
}
@media (min-width: 1200px) {
.expend-options {
max-width: 400px;
position : absolute;
right : 0;
bottom : 25px;
}
}

4
src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
View File

@ -10,7 +10,7 @@
<nz-alert nzType="info" nzMessage="提现信息" class="mb-md"></nz-alert>
<div se-container [labelWidth]="100">
<se label="网络货运人">
{{formData?.ltdname}}
{{formData?.ltdName}}
</se>
<se label="银行类型">
{{formData?.bankType==='1'?'平安银行':'浦发银行'}}
@ -28,7 +28,7 @@
{{formData?.virtualAccount}}
</se>
<se label="提现状态">
{{refundStatus[formData?.virtualAccount]}}
{{formData?.refundStatusLabel}}
</se>
<se label="提现金额">
{{formData?.amount}}

8
src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
View File

@ -12,14 +12,6 @@ export class WithdrawalsDetailComponent implements OnInit {
timeLineData: any = [];
refundStatus: any = {
'1': '待审核',
'2': '提现中',
'3': '提现成功',
'4': '拒绝提现',
'5': '提现失败'
};
constructor(public service: FreightAccountService, private route: ActivatedRoute) {
const id = route.snapshot.params.id;
this.loadRefundDetail(id);

2
src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts
View File

@ -242,7 +242,7 @@ export class WithdrawalsRecordComponent implements OnInit {
{ title: '', index: 'key', type: 'checkbox' },
{ title: '提现时间', index: 'createTime', width: 180 },
{ title: '提现单号', index: 'refundApplyCode', width: 120 },
{ title: '网络货运人', index: 'ltdname', width: 120 },
{ title: '网络货运人', index: 'ltdName', width: 120 },
{ title: '银行类型', index: 'bankTypeLabel', width: 100 },
{ title: '账户类型', index: 'accountType', width: 100 },
{ title: '账户名称', index: 'bankAccountName', width: 100 },

16
src/app/routes/passport/components/login/login.component.ts
View File

@ -164,15 +164,19 @@ export class UserLoginComponent implements OnInit, OnDestroy {
// this.captchaSrv.sendSMSCaptchaByMobile();
if (result) {
this.captchaSrv.sendSMSCaptchaByMobile(this.captchaSF.value.phone).subscribe(res => {
console.log(res);
if (res.success && res.data.code === '1') {
this.captchaSrv.msgSrv.success('发送验证码成功');
this.createInterval();
} else if (res.data.code === '503046') {
this.dunHelper.popUp(this.captchaSF.value.phone).subscribe(_ => {
this.createInterval();
this.dunHelper.destory();
});
} else {
}
// else if (res.status === 503609) {
// this.dunHelper.popUp(this.captchaSF.value.phone).subscribe(_ => {
// this.createInterval();
// this.dunHelper.destory();
// });
// }
else {
this.captchaSrv.msgSrv.warning(res.msg);
}
});

144
src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html
View File

@ -2,7 +2,7 @@
<div nz-row [nzGutter]="8">
<div nz-col nzSpan="4">
<ul nz-menu nzMode="inline" class="card-height">
<li nz-menu-item [nzSelected]="idx === 0" (click)="changeType(idx)"
<li nz-menu-item [nzSelected]="idx === 0" (click)="changeType(item)"
*ngFor="let item of tabs; let idx = index">
{{ item.name }}
</li>
@ -10,107 +10,71 @@
</div>
<div nz-col nzSpan="20" style="overflow: scroll">
<nz-card class="card-height" [nzBordered]="null" nzSize="small" *ngIf="selectedTab===0 || selectedTab===1">
<h2 style="font-weight: 800;">货主提现设置</h2>
<nz-card class="card-height" [nzBordered]="null" nzSize="small">
<h2 style="font-weight: 800;">{{selectedTab?.name}}</h2>
<div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="250">
<se [label]="item.name" *ngFor="let item of configList">
<ng-container [ngSwitch]="item.itemValue?.type">
<ng-container *ngSwitchCase="'radio'">
<nz-radio-group [(ngModel)]="item.itemValue.data">
<label nz-radio [nzValue]="false"
class="ml-xl">{{item.itemValue.falseLable}}</label>
<label nz-radio [nzValue]="true"
class="ml-xl">{{item.itemValue.trueLable}}</label>
</nz-radio-group>
</ng-container>
<ng-container *ngSwitchCase="'input'">
<nz-input-group [nzAddOnAfter]="item.itemValue.afterLable" style="width: 150px;" class="ml-md">
<input type="number" nz-input [(ngModel)]="item.itemValue.data"
placeholder="请输入" />
<se [label]="item.name" *ngFor="let item of configList" col="1">
<ng-container [ngSwitch]="item.itemType">
<ng-container *ngSwitchCase="1">
<nz-input-group [nzAddOnAfter]="item.remark?.afterLable" style="width: 155px;"
class="ml-md mr-xl">
<input type="number" nz-input [(ngModel)]="item.itemValue" placeholder="请输入" />
</nz-input-group>
</ng-container>
<ng-container *ngSwitchCase="2">
<nz-radio-group [(ngModel)]="item.itemValue" class="mr-xl">
<label nz-radio nzValue="0" class="ml-xl">{{item.remark?.[0] || '否'}}</label>
<label nz-radio nzValue="1" class="ml-xl">{{item.remark?.[1] || '是'}}</label>
</nz-radio-group>
</ng-container>
<ng-container *ngSwitchCase="3">
<nz-time-picker nzFormat="HH:mm" nzPlaceHolder="请选择时间" [(ngModel)]="item.itemValue"
class="ml-md mr-xl">
</nz-time-picker>
</ng-container>
<ng-container *ngSwitchCase="5">
<div class="d-flex" style="align-items: center;justify-content: space-between;">
<input type="time" [(ngModel)]="item.itemValue.startTime" placeHolder="开始时间"
style="margin-left: 23px;">
<!-- <nz-time-picker nzFormat="HH:mm" nzPlaceHolder="开始时间"
[(ngModel)]="item.itemValue.startTime" style="margin-left: 23px;">
</nz-time-picker> -->
<label class="ml-sm mr-sm"> --</label>
<input type="time" [(ngModel)]="item.itemValue.endTime" placeHolder="结束时间"
style="margin-left: 0;" class=" mr-xl">
<!-- <nz-time-picker nzFormat="HH:mm" nzPlaceHolder="结束时间"
[(ngModel)]="item.itemValue.endTime">
</nz-time-picker> -->
</div>
</ng-container>
</ng-container>
<!-- <ng-container *ngFor="let item of item.extend">
<ng-container [ngSwitch]="item">
<ng-container *ngSwitchCase="1">
<button nz-button nzType="default">配置网络货运</button>
</ng-container>
<ng-container *ngSwitchCase="2">
<button nz-button nzType="default">配置货主</button>
</ng-container>
<ng-container *ngSwitchCase="3">
<button nz-button nzType="default">配置司机</button>
</ng-container>
<ng-container *ngSwitchCase="4">
<button nz-button nzType="default">配置车队长</button>
</ng-container>
<ng-container *ngSwitchDefault></ng-container>
</ng-container>
</ng-container> -->
</se>
</div>
</div>
</nz-card>
<nz-card class="card-height" [nzBordered]="null" nzSize="small" *ngIf="selectedTab===2">
<h2 style="font-weight: 800;">路桥发票设置</h2>
<div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="100">
<se label="发票申请" style="margin-bottom: 0;">
<nz-radio-group [(ngModel)]="formDate.isAudit">
<label nz-radio [nzValue]="false" class="ml-xl">手动申请</label>
<label nz-radio [nzValue]="true" class="ml-xl">自动申请</label>
</nz-radio-group>
</se>
<se>
<p class="ml-xl" style="color: #7e7c7c;">开启自动申请后，运单完成卸货后会自动根据运单信息申请ETC发票。</p>
</se>
</div>
</div>
</nz-card>
<nz-card class="card-height" [nzBordered]="null" nzSize="small" *ngIf="selectedTab===3">
<h2 style="font-weight: 800;">风险单监控</h2>
<div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="180">
<se [col]="1" label="早/晚于计划出发时间" style="margin-bottom: 8px;">
<nz-radio-group [(ngModel)]="formDate.isAudit">
<label nz-radio [nzValue]="false" class="ml-xl mt-sm">不限定</label>
<label nz-radio [nzValue]="true" class="ml-xl mt-sm">范围外报异常</label>
</nz-radio-group>
<nz-input-group nzAddOnAfter="小时" style="width: 200px;">
<input type="number" nz-input placeholder="请输入允许时间差" />
</nz-input-group>
</se>
<se [col]="1">
<p class="ml-xl" style="color: #7e7c7c;">当前时间与计划时间对比，允许如上合理范围内执行不报异常，差异在范围外则报异常</p>
</se>
<se [col]="1" label="早/晚于计划到达时间" style="margin-bottom: 8px;">
<nz-radio-group [(ngModel)]="formDate.isAudit">
<label nz-radio [nzValue]="false" class="ml-xl mt-sm">不限定</label>
<label nz-radio [nzValue]="true" class="ml-xl mt-sm">范围外报异常</label>
</nz-radio-group>
<nz-input-group nzAddOnAfter="小时" style="width: 200px;">
<input type="number" nz-input placeholder="请输入允许时间差" />
</nz-input-group>
</se>
<se [col]="1">
<p class="ml-xl" style="color: #7e7c7c;">当前时间与计划时间对比，允许如上合理范围内执行不报异常，差异在范围外则报异常</p>
</se>
<se [col]="1" label="损耗量" style="margin-bottom: 8px;">
<nz-radio-group [(ngModel)]="formDate.isAudit">
<label nz-radio [nzValue]="false" class="ml-xl mt-sm">不限定</label>
<label nz-radio [nzValue]="true" class="ml-xl mt-sm">范围外报异常</label>
</nz-radio-group>
<nz-input-group nzAddOnAfter="%" style="width: 200px;">
<input type="number" nz-input placeholder="请输入允许时间差" />
</nz-input-group>
</se>
<se [col]="1">
<p class="ml-xl" style="color: #7e7c7c;">签收量与装运量对比，允许如上合理范围内损耗不报异常，差异在范围外则报异常</p>
</se>
<se [col]="1" label="装货/卸货地距离范围" style="margin-bottom: 8px;">
<nz-radio-group [(ngModel)]="formDate.isAudit">
<label nz-radio [nzValue]="false" class="ml-xl mt-sm">不限定</label>
<label nz-radio [nzValue]="true" class="ml-xl mt-sm">范围外报异常</label>
</nz-radio-group>
<nz-input-group nzAddOnAfter="KM" style="width: 200px;">
<input type="number" nz-input placeholder="请输入允许时间差" />
</nz-input-group>
</se>
<se [col]="1">
<p class="ml-xl" style="color: #7e7c7c;">装货地和发货地、签收地和收货地距离对比，允许如上合理范围内执行不报异常，差异在范围外则报异常</p>
</se>
</div>
</div>
</nz-card>
<div class="mb-md save-btn">
<button class="ml-lg" nz-button nzSize="large" nzType="primary">保存</button>
<button class="ml-lg" nz-button nzSize="large" nzType="primary" (click)="saveAction()">保存</button>
</div>
</div>
</div>

9
src/app/routes/sys-setting/components/basic-setting/basic-setting.component.less
View File

@ -10,13 +10,18 @@
}
.block-radio {
display : flex;
min-height : 32px;
display : flex;
min-height: 32px;
}
input {
width : 100px;
margin-left: 10px;
}
.ant-form-item-control-input-content {
display: flex;
}
}
}

143
src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts
View File

@ -1,5 +1,6 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
import { dateTimePickerUtil } from '@delon/util';
import { SystemService } from '../../services/system.service';
@Component({
@ -8,102 +9,66 @@ import { SystemService } from '../../services/system.service';
styleUrls: ['./basic-setting.component.less']
})
export class BasicSettingComponent implements OnInit {
formDate: any = {
isAudit: false,
isEveryDay: false,
isEveryWeek: false
};
tabs = [
{
name: '货主提现设置'
},
{
name: '司机提现设置'
},
{
name: '路桥发票设置'
},
{
name: '风险单监控'
}
];
selectedTab = 0;
tabs: any[] = [];
selectedTab: any = null;
checkOptionsOne = [
{ label: '周一', value: '周一', checked: true },
{ label: '周二', value: '周二' },
{ label: '周三', value: '周三' },
{ label: '周四', value: '周四' },
{ label: '周五', value: '周五' },
{ label: '周六', value: '周六' },
{ label: '周日', value: '周日' }
];
configList: any = [
{
configId: '1475393700370898945',
itemKey: 'goods.name.config.type.3.3',
itemType: 1,
itemValue: '{"data":false,"type":"radio","trueLable":"开启","falseLable":"关闭"}',
name: '货主是否可以设置车队长',
parentId: '0',
remark: ''
},
{
configId: '1475393700370898945',
itemKey: 'goods.name.config.type.3.4',
itemType: 1,
itemValue: '{"data":false,"type":"radio","trueLable":"开启","falseLable":"关闭"}',
name: '货主企业四要素校验开关',
parentId: '0',
remark: ''
},
{
configId: '1475393700370898945',
itemKey: 'goods.name.config.type.3.5',
itemType: 1,
itemValue: '{"data":false,"type":"radio","trueLable":"开启","falseLable":"关闭"}',
name: '货主提现功能开关',
parentId: '0',
remark: ''
},
{
configId: '1475393700370898945',
itemKey: 'goods.name.config.type.3.5',
itemType: 1,
itemValue: '{"data":"","type":"input","afterLable":"%"}',
name: '货主费率配置',
parentId: '0',
remark: ''
},
{
configId: '1475393700370898945',
itemKey: 'goods.name.config.type.3.5',
itemType: 1,
itemValue: '{"data":"5","type":"input","afterLable":"次"}',
name: '单个用户每天最大发送短信次数',
parentId: '0',
remark: ''
},
{
configId: '1475393700370898945',
itemKey: 'goods.name.config.type.3.5',
itemType: 1,
itemValue: '{"data":true,"type":"radio","trueLable":"开启","falseLable":"关闭","isCustom":true}',
name: '合同单权限',
parentId: '0',
remark: ''
}
];
configList: any = [];
constructor(private service: SystemService) {}
ngOnInit() {
this.configList = this.configList.map((item: any) => ({ ...item, itemValue: JSON.parse(item.itemValue) }));
this.getTypeList();
}
changeType(type: number): void {
getTypeList() {
this.service.request(this.service.$api_get_config_tree, { configFullKey: 'sys.config' }).subscribe((res: Array<any>) => {
if (res?.length > 0) {
const typeData = res.find(config => config.configFullKey === 'sys.config');
if (typeData) {
this.tabs = typeData.children;
this.selectedTab = typeData.children[0];
this.getConfigList(this.selectedTab.id);
}
}
});
}
getConfigList(id: string) {
this.service.request(this.service.$api_get_config_by_parent_id, { id }).subscribe((res: Array<any>) => {
if (res?.length > 0) {
res = res.map(item => ({
...item,
remark: item.remark ? JSON.parse(item.remark) : null,
extend: item.extend ? JSON.parse(item.extend) : [],
itemValue: item.itemValue ? JSON.parse(item.itemValue) : item.itemValue
}));
this.configList = res;
console.log(res);
} else {
this.configList = [];
}
});
}
changeType(type: any): void {
this.selectedTab = type;
console.log(type);
this.getConfigList(this.selectedTab.id);
}
saveAction() {
if (this.configList?.length < 0) {
return;
}
const params = this.configList.map((item: any) => ({
...item,
remark: item.remark ? JSON.stringify(item.remark) : null,
itemValue: item.itemValue ? JSON.stringify(item.itemValue) : null
}));
this.service.request(this.service.$api_update_config_batch, params).subscribe(res => {
if (res) {
this.service.msgSrv.success('修改配置成功');
this.getConfigList(this.selectedTab.id);
}
});
}
}

3
src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts
View File

@ -79,8 +79,7 @@ export class SystemStaffStaffModalComponent implements OnInit {
}
if (this.i.userId === 0) {
const params: any = {
...this.sf.value,
enterpriseId: 0
...this.sf.value
};
this.service.request(this.service.$api_add_staff, params).subscribe(res => {
if (res) {

4
src/app/routes/sys-setting/services/system.service.ts
View File

@ -101,6 +101,8 @@ export class SystemService extends BaseService {
// 根据FullKey获取系统子配置(树)
public $api_get_config_tree = '/api/mdc/pbc/sysConfig/getSysConfigTreeByParentFullKey';
// 查找系统配置项列表
public $api_get_config_by_parent_id = '/api/mdc/pbc/sysConfigItem/findSysConfigItemBySysConfigId';
// 新增系统配置
public $api_add_config = '/api/mdc/pbc/sysConfig/save';
// 更新系统配置
@ -115,6 +117,8 @@ export class SystemService extends BaseService {
public $api_add_config_item = '/api/mdc/pbc/sysConfigItem/save';
// 更新系统配置项
public $api_update_config_item = '/api/mdc/pbc/sysConfigItem/update';
// 批量更新系统配置项
public $api_update_config_batch = '/api/mdc/pbc/sysConfigItem/updateBatch';
// 更新系统配置项排序
public $api_update_config_item_sort = '/api/mdc/pbc/sysConfigItem/updateSort';
// 删除系统配置项

2
src/app/routes/sys-setting/sys-setting.module.ts
View File

@ -61,7 +61,7 @@ const NOTROUTECOMPONENTS = [
AuditResonConfigActionModalComponent,
CartConfigActionModalComponent,
SettingRoleEditComponent,
SettingMenuComponent
SettingMenuComponent,
];
@NgModule({
declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS],

15
src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.html Normal file
View File

@ -0,0 +1,15 @@
<div nz-row nzGutter="8">
<div nz-col nzSpan="19">
<sf #sf [schema]="searchSchema" [ui]="{ '*': {grid: { span: 12 } }}" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="5" class="text-right mb-md">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
</div>
<st #st [data]="service.$mock_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] }" [loading]="service.http.loading"
[scroll]="{ x:'650px',y: '400px' }" (change)="stChange($event)"></st>
</div>

70
src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.ts Normal file
View File

@ -0,0 +1,70 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal';
import { TicketService } from '../../../services/ticket.service';
@Component({
selector: 'app-add-cart',
templateUrl: './add-cart.component.html',
})
export class AddCartComponent implements OnInit {
data = [];
selectedData: any[] = [];
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
columns: STColumn[] = [
{ title: '', index: 'key', type: 'checkbox' },
{ title: '车牌号', index: 'no' },
{ title: '车辆所有人', index: 'callNo' }
];
searchSchema: SFSchema = {
properties: {
params1: {
title: '',
type: 'string',
ui: {
placeholder: '请输入车牌号'
}
},
params2: {
title: '',
type: 'string',
ui: {
placeholder: '请输入车辆所有人'
}
},
}
};
constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
ngOnInit(): void {}
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
});
}
return requestOptions;
};
stChange(e: STChange): void {
switch (e.type) {
case 'checkbox':
this.selectedData = e.checkbox!;
break;
}
}
/**
* 重置表单
*/
resetSF() {
this.sf.reset();
}
}

16
src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.html Normal file
View File

@ -0,0 +1,16 @@
<div nz-row nzGutter="8">
<div nz-col nzSpan="19">
<sf #sf [schema]="searchSchema" [ui]="{ '*': {grid: { span: 8 } }}" [compact]="true"
[button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="5" class="text-right mb-md">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
</div>
<st #st [data]="service.$mock_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] }"
[loading]="service.http.loading" [scroll]="{ x:'810px',y: '400px' }" (change)="stChange($event)"></st>
</div>

79
src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.ts Normal file
View File

@ -0,0 +1,79 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal';
import { TicketService } from '../../../services/ticket.service';
@Component({
selector: 'app-add-owner',
templateUrl: './add-owner.component.html'
})
export class AddOwnerComponent implements OnInit {
data = [];
selectedData: any[] = [];
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
columns: STColumn[] = [
{ title: '', index: 'key', type: 'checkbox' },
{ title: '企业名称', index: 'no' },
{ title: '联系人姓名', index: 'callNo' },
{ title: '联系人手机号', index: 'callNo' },
{ title: '认证状态', index: 'callNo' }
];
searchSchema: SFSchema = {
properties: {
params1: {
title: '',
type: 'string',
ui: {
placeholder: '请输入企业名称'
}
},
params2: {
title: '',
type: 'string',
ui: {
placeholder: '请输入姓名'
}
},
params3: {
title: '',
type: 'string',
ui: {
placeholder: '请输入手机号'
}
}
}
};
constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
ngOnInit(): void {}
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
});
}
return requestOptions;
};
stChange(e: STChange): void {
switch (e.type) {
case 'checkbox':
this.selectedData = e.checkbox!;
break;
}
}
/**
* 重置表单
*/
resetSF() {
this.sf.reset();
}
}

14
src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html
View File

@ -1,4 +1,4 @@
<page-header-wrapper [title]="'黑名单'" [content]="content">
<page-header-wrapper [title]="'ETC白名单'" [content]="content">
<ng-template #content>
<nz-tabset class="tabs-wrap">
<nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="changeTab(tab)"> </nz-tab>
@ -10,7 +10,7 @@
<div nz-row nzGutter="8">
<div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="searchSchema"
[ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
[ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
[button]="'none'"></sf>
</div>
<div nz-col [nzXl]="6" [nzLg]="24" [nzMd]="24" [nzSm]="24" [nzXs]="24" class="text-right">
@ -23,16 +23,16 @@
<nz-card>
<div class="d-flex align-items-center mb-md">
<button nz-button>添加</button>
<button nz-button>删除</button>
<button nz-button (click)="configAction()">添加</button>
<button nz-button (click)="deleteAction()">删除</button>
<div class="ml-md">
已选择
<strong class="text-primary">{{ selectedRows.length }}</strong> 条删除
<strong class="text-primary">{{ selectedRows.length }}</strong> 条数据
<a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
</div>
</div>
<st #st [data]="url" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
<st #st [data]="service.$mock_url" [columns]="columns"
[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] }"
[loading]="service.http.loading" [scroll]="{ y: '370px' }" (change)="stChange($event)"></st>

11
src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.less
View File

@ -1,15 +1,4 @@
:host::ng-deep {
.search-box {
.ant-card-body {
padding-bottom: 18px;
}
}
.content-box {
.ant-card-body {
padding-top: 14px;
}
}
.tabs-wrap>.ant-tabs-nav {
margin-bottom: 0;

293
src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts
View File

@ -1,13 +1,16 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { STComponent, STColumn, STChange } from '@delon/abc/st';
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal';
import { SystemService } from 'src/app/routes/sys-setting/services/system.service';
import { TicketService } from '../../services/ticket.service';
import { AddCartComponent } from './add-cart/add-cart.component';
import { AddOwnerComponent } from './add-owner/add-owner.component';
@Component({
selector: 'app-etc-blacklist',
templateUrl: './etc-blacklist.component.html',
styleUrls: ['./etc-blacklist.component.less']
styleUrls: ['../../../commom/less/box.less', './etc-blacklist.component.less']
})
export class ETCBlacklistComponent implements OnInit {
@ViewChild('st', { static: true })
@ -27,128 +30,32 @@ export class ETCBlacklistComponent implements OnInit {
}
];
tabType = 1;
url = `/rule?_allow_anonymous=true`;
searchSchema: SFSchema = {
properties: {
tabType: {
type: 'number',
ui: {
hidden: true
}
},
params1: {
title: '企业名称',
type: 'string',
ui: {
placeholder: '请输入',
visibleIf: {
tabType: (value: number) => this.tabType === 1
}
}
},
params2: {
title: '联系人姓名',
type: 'string',
ui: {
placeholder: '姓名/手机/车牌号',
visibleIf: {
tabType: (value: number) => this.tabType === 1
}
}
},
params3: {
title: '手机号',
type: 'string',
ui: {
placeholder: '请输入',
visibleIf: {
tabType: (value: number) => this.tabType === 1
}
}
},
params4: {
title: '车牌号',
type: 'string',
ui: {
placeholder: '请输入',
visibleIf: {
tabType: (value: number) => this.tabType === 2
}
}
},
params5: {
title: '司机姓名',
type: 'string',
ui: {
placeholder: '请输入',
visibleIf: {
tabType: (value: number) => this.tabType === 2
}
}
},
params6: {
title: '手机号',
type: 'string',
ui: {
placeholder: '请输入',
visibleIf: {
tabType: (value: number) => this.tabType === 2
}
}
}
}
};
searchSchema: SFSchema = this.initSF();
columns: STColumn[] = [
{ title: '', index: 'key', type: 'checkbox' },
{ title: '企业名称', index: 'no', iif: () => this.tabType === 1 },
{ title: '联系人姓名', index: 'no', iif: () => this.tabType === 1 },
{ title: '车牌号', index: 'no', iif: () => this.tabType === 2 },
{ title: '司机姓名', index: 'no', iif: () => this.tabType === 2 },
{ title: '手机号', index: 'no' },
{
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: 'no' },
{
title: '创建时间',
index: 'updatedAt',
type: 'date'
},
{
title: '操作',
buttons: [
{
text: '删除',
click: item => this.deleteAction(item)
}
]
}
];
columns: STColumn[] = this.initST();
selectedRows: any[] = [];
reqParams = { pageIndex: 1, pageSize: 10 };
constructor(public service: SystemService, private nzModalService: NzModalService) {}
constructor(public service: TicketService, private nzModalService: NzModalService) {}
ngOnInit(): void {}
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
});
}
return requestOptions;
};
// 切换Tab
changeTab(item: any) {
this.tabType = item.type;
this.sf?.setValue('/tabType', item.type);
this.sf?.reset();
this.selectedRows = [];
setTimeout(() => {
this.tabs.forEach(i => (i.isActived = false));
item.isActived = !item.isActived;
@ -162,20 +69,58 @@ export class ETCBlacklistComponent implements OnInit {
case 'checkbox':
this.selectedRows = e.checkbox!;
break;
case 'filter':
this.st.load();
break;
}
}
configAction(item?: any) {}
configAction(item?: any) {
if (this.tabType === 1) {
this.addOwnerAction(item);
} else {
this.addCartAction(item);
}
}
addOwnerAction(item: any) {
const modal = this.nzModalService.create({
nzTitle: '选择货主',
nzContent: AddOwnerComponent,
nzWidth: 850,
nzComponentParams: { data: [] },
nzOnOk: com => {
console.log(com.selectedData);
}
});
modal.afterClose.subscribe(res => {
if (res) {
this.st.load();
}
});
}
addCartAction(item: any) {
const modal = this.nzModalService.create({
nzTitle: '选择车辆',
nzContent: AddCartComponent,
nzWidth: 700,
nzComponentParams: { data: [] },
nzOnOk: com => {
console.log(com.selectedData);
}
});
modal.afterClose.subscribe(res => {
if (res) {
this.st.load();
}
});
}
deleteAction(item?: any) {
this.nzModalService.error({
nzTitle: '确认删除？',
this.nzModalService.warning({
nzTitle: this.tabType === 1 ? '确定将所选货主从ETC白名单中剔除？' : '确定将所选车辆从ETC白名单中剔除？',
nzClosable: false,
nzCancelText: '取消',
nzOnOk: () => {}
nzOnOk: () => {},
nzOkText: '确定'
});
}
/**
@ -184,4 +129,116 @@ export class ETCBlacklistComponent implements OnInit {
resetSF() {
this.sf.reset();
}
private initSF(): SFSchema {
return {
properties: {
tabType: {
type: 'number',
ui: {
hidden: true
}
},
params1: {
title: '企业名称',
type: 'string',
ui: {
placeholder: '请输入',
visibleIf: {
tabType: (value: number) => this.tabType === 1
}
}
},
params2: {
title: '联系人姓名',
type: 'string',
ui: {
placeholder: '姓名/手机/车牌号',
visibleIf: {
tabType: (value: number) => this.tabType === 1
}
}
},
params3: {
title: '联系人手机号',
type: 'string',
ui: {
placeholder: '请输入',
visibleIf: {
tabType: (value: number) => this.tabType === 1
}
}
},
params4: {
title: '车牌号',
type: 'string',
ui: {
placeholder: '请输入',
visibleIf: {
tabType: (value: number) => this.tabType === 2
}
}
},
params5: {
title: '司机姓名',
type: 'string',
ui: {
placeholder: '请输入',
visibleIf: {
tabType: (value: number) => this.tabType === 2
}
}
},
params6: {
title: '手机号',
type: 'string',
ui: {
placeholder: '请输入',
visibleIf: {
tabType: (value: number) => this.tabType === 2
}
}
}
}
};
}
private initST(): STColumn[] {
return [
{ title: '', index: 'key', type: 'checkbox' },
{ title: '企业名称', index: 'no', iif: () => this.tabType === 1 },
{ title: '联系人姓名', index: 'no', iif: () => this.tabType === 1 },
{ title: '联系人手机号', index: 'no' },
{
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' }
},
iif: () => this.tabType === 1
},
{ title: '车牌号', index: 'no', iif: () => this.tabType === 2 },
{ title: '车辆所有人', index: 'no', iif: () => this.tabType === 2 },
{ title: '创建者', index: 'no' },
{
title: '创建时间',
index: 'updatedAt',
type: 'date'
},
{
title: '操作',
buttons: [
{
text: '删除',
click: item => this.deleteAction(item)
}
]
}
];
}
}

21
src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html
View File

@ -3,24 +3,35 @@
<nz-card class="search-box" nzBordered>
<div nz-row nzGutter="8">
<div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="searchSchema"
[ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
[button]="'none'"></sf>
</div>
<div nz-col [nzXl]="6" [nzLg]="24" [nzMd]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<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 nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</div>
</nz-card>
<nz-card class="content-box" nzBordered>
<st #st [data]="url" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
<st #st [data]="service.$mock_url" [columns]="columns"
[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] }"
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '400px' }" (change)="stChange($event)"></st>
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '400px' }">
<ng-template st-row="call1No" let-item let-index="index" let-column="column">
张三<br>13812345678
</ng-template>
<ng-template st-row="call12No" let-item let-index="index" let-column="column">
粤B88888<br>张三
</ng-template>
</st>
</nz-card>

13
src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.less
View File

@ -1,13 +0,0 @@
:host::ng-deep {
.search-box {
.ant-card-body {
padding-bottom: 18px;
}
}
.content-box {
.ant-card-body {
padding-top: 16px;
}
}
}

210
src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts
View File

@ -1,6 +1,6 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STComponent, STColumn, STChange } from '@delon/abc/st';
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal';
import { TicketService } from '../../services/ticket.service';
@ -9,107 +9,35 @@ import { TransactionDetailsComponent } from './transaction-details/transaction-d
@Component({
selector: 'app-etc-invoiced-list',
templateUrl: './etc-invoiced-list.component.html',
styleUrls: ['./etc-invoiced-list.component.less']
styleUrls: ['../../../commom/less/box.less']
})
export class ETCInvoicedListComponent implements OnInit {
url = `/rule?_allow_anonymous=true`;
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
columns: STColumn[] = [
{ title: '运单号', index: 'no' },
{ title: '开票状态', index: 'callNo' },
{ title: '业务方', index: 'callNo' },
{ title: '业务方税号', index: 'callNo' },
{ title: '开票金额', index: 'callNo' },
{ title: '发票张数', index: 'callNo' },
{ title: '申请时间', index: 'updatedAt', type: 'date' },
{
title: '操作',
buttons: [
{
text: '交易明细',
click: item => this.showDetail(item)
}
]
}
];
searchSchema: SFSchema = {
properties: {
orderSn: {
type: 'string',
title: '运单号',
ui: {
autocomplete: 'off'
}
},
receiveName: {
type: 'string',
title: '开票状态',
enum: [
{ label: '全部', value: '' },
{ label: '待受理', value: '待受理' },
{ label: '待开票', value: '待开票' },
{ label: '开票中', value: '开票中' },
{ label: '已开票', value: '已开票' },
{ label: '已撤销', value: '已撤销' },
{ label: '已拒绝', value: '已拒绝' }
],
ui: {
widget: 'select',
placeholder: '请选择',
change: (i: any) => {
this.sf.value.receiveName = i;
this.sf?.setValue('/receiveName', i);
}
},
default: ''
},
receiveName2: {
type: 'string',
title: '业务方',
enum: [
{ label: '全部', value: '' },
{ label: '待受理', value: '待受理' },
{ label: '待开票', value: '待开票' },
{ label: '开票中', value: '开票中' },
{ label: '已开票', value: '已开票' },
{ label: '已撤销', value: '已撤销' },
{ label: '已拒绝', value: '已拒绝' }
],
ui: {
widget: 'select',
placeholder: '请选择',
change: (i: any) => {
this.sf.value.receiveName = i;
this.sf?.setValue('/receiveName', i);
}
},
default: ''
}
}
};
reqParams = {};
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
_$expand = false;
constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
ngOnInit(): void {}
stChange(e: STChange): void {
switch (e.type) {
case 'filter':
this.st.load();
break;
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
});
}
}
return requestOptions;
};
showDetail(item: any) {
const modal = this.nzModalService.create({
nzTitle: '运单交易明细',
nzContent: TransactionDetailsComponent,
nzWidth: 800,
nzWidth: 900,
nzComponentParams: { data: [] },
nzOnOk: com => {
console.log(com.selectedData);
@ -126,5 +54,117 @@ export class ETCInvoicedListComponent implements OnInit {
*/
resetSF() {
this.sf.reset();
this._$expand = false;
}
/**
* 伸缩查询条件
*/
expandToggle() {
this._$expand = !this._$expand;
this.sf?.setValue('/expand', this._$expand);
}
private initSF(): SFSchema {
return {
properties: {
expand: {
type: 'boolean',
ui: {
hidden: true
}
},
orderSn: {
type: 'string',
title: '运单号',
ui: {
autocomplete: 'off'
}
},
order2Sn: {
type: 'string',
title: '订单号',
ui: {
autocomplete: 'off'
}
},
order2S2n: {
type: 'string',
title: '订单类型',
ui: {
widget: 'dict-select',
params: { dictKey: 'refund:apply:status' },
placeholder: '请选择'
}
},
receiveName: {
type: 'string',
title: '开票状态',
ui: {
widget: 'dict-select',
params: { dictKey: 'refund:apply:status' },
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
},
default: ''
},
receiveName2: {
type: 'string',
title: '托运人',
enum: [{ label: '全部', value: '' }],
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
},
default: ''
},
ltdId: {
type: 'string',
title: '网络货运人',
ui: {
widget: 'select',
placeholder: '请选择',
allowClear: true,
visibleIf: {
expand: (value: boolean) => value
},
asyncData: () => this.service.getNetworkFreightForwarder()
},
default: ''
}
}
};
}
private initST(): STColumn[] {
return [
{ title: '运单号', index: 'no' },
{ title: '订单号', index: 'no' },
{ title: '开票状态', index: 'callNo' },
{ title: '订单类型', index: 'callNo' },
{ title: '装货地', index: 'callNo' },
{ title: '卸货地', index: 'callNo' },
{ title: '司机信息', render: 'call1No' },
{ title: '车辆信息', render: 'call12No' },
{ title: '托运人', index: 'callNo' },
{ title: '网络货运人', index: 'callNo' },
{ title: '开票金额', index: 'callNo' },
{ title: '开票张数', index: 'callNo' },
{ title: '申请时间', index: 'updatedAt', type: 'date' },
{
title: '操作',
buttons: [
{
text: '交易明细',
click: item => this.showDetail(item)
}
]
}
];
}
}

4
src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.html
View File

@ -9,8 +9,8 @@
</div>
<st #st [data]="url" [columns]="columns" bordered size="small"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[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] }"
[loading]="service.http.loading" [scroll]="{ x:'756px',y: '400px' }" (change)="stChange($event)"></st>
[loading]="service.http.loading" [scroll]="{ x:'860px',y: '400px' }"></st>
</div>

27
src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.ts
View File

@ -1,14 +1,13 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STComponent, STColumn, STChange } from '@delon/abc/st';
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal';
import { TicketService } from '../../../services/ticket.service';
@Component({
selector: 'app-transaction-details',
templateUrl: './transaction-details.component.html',
styleUrls: ['./transaction-details.component.less']
templateUrl: './transaction-details.component.html'
})
export class TransactionDetailsComponent implements OnInit {
data = [];
@ -41,11 +40,7 @@ export class TransactionDetailsComponent implements OnInit {
],
ui: {
widget: 'select',
placeholder: '请选择',
change: (i: any) => {
this.sf.value.receiveName = i;
this.sf?.setValue('/receiveName', i);
}
placeholder: '请选择'
},
default: ''
},
@ -53,8 +48,7 @@ export class TransactionDetailsComponent implements OnInit {
title: '交易时间',
type: 'string',
ui: {
widget: 'date',
mode: 'range',
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
}
@ -67,13 +61,14 @@ export class TransactionDetailsComponent implements OnInit {
ngOnInit(): void {}
stChange(e: STChange): void {
switch (e.type) {
case 'filter':
this.st.load();
break;
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
});
}
}
return requestOptions;
};
/**
* 重置表单

12
src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.html
View File

@ -6,7 +6,7 @@
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="searchSchema"
[ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
[ui]="{ '*': { spanLabelFixed: 100,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
[button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
@ -23,9 +23,13 @@
</nz-card>
<nz-card class="content-box" nzBordered>
<st #st [data]="url" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
<st #st [data]="service.$mock_url" [columns]="columns"
[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] }"
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)"></st>
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }">
<ng-template st-row="call3No" let-item let-index="index" let-column="column">
特朗普<br>13789040523
</ng-template>
</st>
</nz-card>

263
src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts
View File

@ -1,6 +1,6 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STComponent, STColumn, STChange } from '@delon/abc/st';
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal';
import { TicketService } from '../../services/ticket.service';
@ -8,135 +8,15 @@ import { TicketService } from '../../services/ticket.service';
@Component({
selector: 'app-etc-invoiced-logs',
templateUrl: './etc-invoiced-logs.component.html',
styleUrls: ['./etc-invoiced-logs.component.less']
styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
})
export class ETCInvoicedLogsComponent implements OnInit {
url = `/rule?_allow_anonymous=true`;
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
columns: STColumn[] = [
{ title: '发票号码', index: 'no' },
{ title: '发票代码', index: 'callNo' },
{ title: '运单号', index: 'callNo' },
{ title: '车牌号', index: 'callNo' },
{ title: '入站口', index: 'callNo' },
{ title: '出站口', index: 'callNo' },
{ title: '里程（km）', index: 'callNo' },
{ title: '交易id', index: 'callNo' },
{ title: '交易金额（元）', index: 'callNo' },
{ title: '发票金额（元）', index: 'callNo' },
{ title: '税率', index: 'callNo' },
{ title: '税额（元）', index: 'callNo' },
{ title: '价税合计（元）', index: 'callNo' },
{ title: '交易时间', index: 'updatedAt', type: 'date' },
{ title: '开票日期', index: 'updatedAt', type: 'date' },
{ title: '购买方', index: 'callNo' },
{ title: '购方税号', index: 'callNo' },
{ title: '销售方', index: 'callNo' },
{ title: '销方税号', index: 'callNo' }
];
searchSchema: SFSchema = {
properties: {
expand: {
type: 'boolean',
ui: {
hidden: true
}
},
orderSn: {
type: 'string',
title: '发票号码',
ui: {
placeholder: '请输入',
autocomplete: 'off'
}
},
orderSn1: {
type: 'string',
title: '运单号',
ui: {
placeholder: '请输入',
autocomplete: 'off'
}
},
orderSn2: {
type: 'string',
title: '车牌号',
ui: {
placeholder: '请输入',
autocomplete: 'off'
}
},
createTime: {
title: '交易时间',
type: 'string',
ui: {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
createTime2: {
title: '开票日期',
type: 'string',
ui: {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
receiveName: {
type: 'string',
title: '购买方',
enum: [
{ label: '全部', value: '全部' },
{ label: '企业认证审核', value: '企业认证审核' },
{ label: '企业管理员审核', value: '企业管理员审核' }
],
ui: {
widget: 'select',
placeholder: '请选择',
change: (i: any) => {
this.sf.value.receiveName = i;
this.sf?.setValue('/receiveName', i);
},
visibleIf: {
expand: (value: boolean) => value
}
}
},
receiveName2: {
type: 'string',
title: '销售方',
enum: [
{ label: '全部', value: '全部' },
{ label: '企业认证审核', value: '企业认证审核' },
{ label: '企业管理员审核', value: '企业管理员审核' }
],
ui: {
widget: 'select',
placeholder: '请选择',
change: (i: any) => {
this.sf.value.receiveName2 = i;
this.sf?.setValue('/receiveName2', i);
},
visibleIf: {
expand: (value: boolean) => value
}
}
}
}
};
reqParams = {};
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
_$expand = false;
@ -144,19 +24,17 @@ export class ETCInvoicedLogsComponent implements OnInit {
ngOnInit(): void {}
stChange(e: STChange): void {
switch (e.type) {
case 'filter':
this.st.load();
break;
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
});
}
}
approval(): void {}
add(): void {}
return requestOptions;
};
routeTo(item: any) {
return;
this.router.navigate(['/ticket/invoice-requested-detail/1']);
}
@ -175,4 +53,121 @@ export class ETCInvoicedLogsComponent implements OnInit {
this._$expand = !this._$expand;
this.sf?.setValue('/expand', this._$expand);
}
private initSF(): SFSchema {
return {
properties: {
expand: {
type: 'boolean',
ui: {
hidden: true
}
},
orderSn: {
type: 'string',
title: '发票号码',
ui: {
placeholder: '请输入',
autocomplete: 'off'
}
},
orderS2n1: {
type: 'string',
title: '订单号',
ui: {
placeholder: '请输入'
}
},
orderSn1: {
type: 'string',
title: '运单号',
ui: {
placeholder: '请输入'
}
},
orderSn2: {
type: 'string',
title: '车牌号',
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
createTime: {
title: '交易时间',
type: 'string',
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
createTime2: {
title: '开票日期',
type: 'string',
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
receiveName2: {
type: 'string',
title: '销售方',
enum: [{ label: '全部', value: '全部' }],
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
ltdId: {
type: 'string',
title: '网络货运人',
ui: {
widget: 'select',
placeholder: '请选择',
allowClear: true,
visibleIf: {
expand: (value: boolean) => value
},
asyncData: () => this.service.getNetworkFreightForwarder()
},
default: ''
}
}
};
}
private initST(): STColumn[] {
return [
{ title: '发票号码', index: 'no', width: 100, type: 'link', click: item => this.routeTo(item) },
{ title: '发票代码', index: 'callNo', width: 100 },
{ title: '订单号', index: 'callNo', width: 100 },
{ title: '运单号', index: 'callNo', width: 100 },
{ title: '入站口', index: 'callNo', width: 100 },
{ title: '出站口', index: 'callNo', width: 100 },
{ title: '司机', render: 'call3No', width: 140 },
{ title: '车牌号', index: 'callNo', width: 100 },
{ title: '里程（km）', index: 'callNo', width: 120 },
{ title: '交易id', index: 'callNo', width: 100 },
{ title: '交易金额（元）', index: 'callNo', width: 130 },
{ title: '税率', index: 'callNo', width: 90 },
{ title: '金额（元）', index: 'callNo', width: 120 },
{ title: '税额（元）', index: 'callNo', width: 120 },
{ title: '价税合计（元）', index: 'callNo', width: 130 },
{ title: '交易时间', index: 'updatedAt', type: 'date', width: 150 },
{ title: '开票日期', index: 'updatedAt', type: 'date', width: 150 },
{ title: '销售方', index: 'callNo', width: 90 },
{ title: '网络货运人', index: 'callNo', width: 120 }
];
}
}

29
src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html
View File

@ -1,7 +1,6 @@
<page-header-wrapper [title]="'申请记录'">
</page-header-wrapper>
<nz-card class="search-box" nzBordered>
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
@ -25,7 +24,7 @@
<nz-card class="content-box" nzBordered>
<div class="d-flex align-items-center mb-md mt-md">
<button nz-button (click)="this.auditAction(null)">申请开票</button>
<button nz-button (click)="this.auditAction()">申请开票</button>
<div class="ml-md">
已选择
<strong class="text-primary">{{ selectedRows.length }}</strong> 条运单
@ -33,20 +32,16 @@
</div>
</div>
<st #st [data]="url" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
<st #st [data]="service.$mock_url" [columns]="columns"
[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] }"
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)"></st>
</nz-card>
<ng-template #auditModal>
<div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="80">
<se [col]="1" label="备注">
<textarea nz-input rows="3" placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
style="width: 325px;margin-left: 14px;"></textarea>
</se>
</div>
</div>
</ng-template>
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)">
<ng-template st-row="call1No" let-item let-index="index" let-column="column">
张三<br>13812345678
</ng-template>
<ng-template st-row="call1N2o" let-item let-index="index" let-column="column">
粤B88888<br>张三
</ng-template>
</st>
</nz-card>

330
src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts
View File

@ -1,6 +1,6 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STComponent, STColumn, STChange } from '@delon/abc/st';
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal';
import { TicketService } from '../../services/ticket.service';
@ -8,127 +8,17 @@ import { TicketService } from '../../services/ticket.service';
@Component({
selector: 'app-etc-invoiced-requested',
templateUrl: './etc-invoiced-requested.component.html',
styleUrls: ['./etc-invoiced-requested.component.less']
styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
})
export class ETCInvoicedRequestedComponent implements OnInit {
url = `/rule?_allow_anonymous=true`;
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
@ViewChild('auditModal', { static: false })
auditModal!: any;
columns: STColumn[] = [
{ title: '', index: 'key', type: 'checkbox' },
{ title: '运单号', index: 'no' },
{ title: '司机', index: 'callNo' },
{ title: '装货地', index: 'callNo' },
{ title: '卸货地', index: 'callNo' },
{ title: '托运人', index: 'callNo' },
{ title: '无车承运人', index: 'callNo' },
{ title: '派车时间', index: 'updatedAt', type: 'date' },
{ title: '提货时间', index: 'updatedAt', type: 'date' },
{ title: '卸货时间', index: 'updatedAt', type: 'date' },
{ title: '签收时间', index: 'updatedAt', type: 'date' },
];
searchSchema: SFSchema = {
properties: {
expand: {
type: 'boolean',
ui: {
hidden: true
}
},
orderSn: {
type: 'string',
title: '运单号',
ui: {
autocomplete: 'off',
placeholder: '请输入'
}
},
orderSn1: {
type: 'string',
title: '司机',
ui: {
autocomplete: 'off',
placeholder: '姓名/手机'
}
},
orderSn2: {
type: 'string',
title: '车牌号',
ui: {
autocomplete: 'off',
placeholder: '请输入'
}
},
orderS3: {
type: 'string',
title: '卸货地',
ui: {
autocomplete: 'off',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
orderSn4: {
type: 'string',
title: '装货地',
ui: {
autocomplete: 'off',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
orderSn5: {
type: 'string',
title: '托运人',
enum: [
{ label: '全部', value: '全部' },
{ label: '企业认证审核', value: '企业认证审核' },
{ label: '企业管理员审核', value: '企业管理员审核' }
],
ui: {
widget: 'select',
placeholder: '请选择',
change: (i: any) => {
this.sf.value.receiveName = i;
this.sf?.setValue('/receiveName', i);
},
visibleIf: {
expand: (value: boolean) => value
}
}
},
receiveName: {
type: 'string',
title: '无车承运人',
enum: [
{ label: '全部', value: '全部' },
{ label: '企业认证审核', value: '企业认证审核' },
{ label: '企业管理员审核', value: '企业管理员审核' }
],
ui: {
widget: 'select',
placeholder: '请选择',
change: (i: any) => {
this.sf.value.receiveName = i;
this.sf?.setValue('/receiveName', i);
},
visibleIf: {
expand: (value: boolean) => value
}
}
}
}
};
reqParams = {};
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
_$expand = false;
@ -137,64 +27,31 @@ export class ETCInvoicedRequestedComponent implements OnInit {
ngOnInit(): void {}
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
});
}
return requestOptions;
};
stChange(e: STChange): void {
switch (e.type) {
case 'checkbox':
this.selectedRows = e.checkbox!;
break;
case 'filter':
this.st.load();
break;
}
}
approval(): void {}
add(): void {}
routeTo(item: any) {
this.router.navigate(['/ticket/invoice-requested-detail/1']);
}
auditAction(item: any) {
const modal = this.nzModalService.create({
nzTitle: '审核',
nzContent: this.auditModal,
nzFooter: [
{
label: '拒绝',
type: 'default',
onClick: () => {
modal.destroy();
}
},
{
label: '通过',
type: 'primary',
onClick: () => {
modal.destroy();
}
}
]
});
modal.afterClose.subscribe(res => {
this.st.load();
});
}
showReason(item: any) {
const modal = this.nzModalService.create({
nzTitle: '查看原因',
nzContent: '运单数据异常，暂时无法开票，请联系客服400-xxxx-xxxx',
nzFooter: [
{
label: '关闭',
type: 'primary',
onClick: () => {
modal.destroy();
}
}
]
auditAction() {
if (this.selectedRows?.length <= 0) {
this.service.msgSrv.warning('请选择申请记录');
return;
}
const modal = this.nzModalService.warning({
nzTitle: '确定对已选运单批量申请开票？',
nzOnOk: () => {}
});
}
@ -213,4 +70,149 @@ export class ETCInvoicedRequestedComponent implements OnInit {
this._$expand = !this._$expand;
this.sf?.setValue('/expand', this._$expand);
}
private initSF(): SFSchema {
return {
properties: {
expand: {
type: 'boolean',
ui: {
hidden: true
}
},
orderSn: {
type: 'string',
title: '运单号',
ui: {
autocomplete: 'off',
placeholder: '请输入'
}
},
orderS2n: {
type: 'string',
title: '订单号',
ui: {
autocomplete: 'off',
placeholder: '请输入'
}
},
order2S2n: {
type: 'string',
title: '订单类型',
ui: {
widget: 'dict-select',
params: { dictKey: 'refund:apply:status' },
placeholder: '请选择'
}
},
orderSn1: {
type: 'string',
title: '司机姓名',
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
ord0erSn1: {
type: 'string',
title: '司机手机',
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
orderSn2: {
type: 'string',
title: '车牌号',
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
orderS1n2: {
type: 'string',
title: '车辆所有人',
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
orderS3: {
type: 'string',
title: '卸货地',
ui: {
autocomplete: 'off',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
orderSn4: {
type: 'string',
title: '装货地',
ui: {
autocomplete: 'off',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
orderSn5: {
type: 'string',
title: '托运人',
enum: [{ label: '全部', value: '全部' }],
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
ltdId: {
type: 'string',
title: '网络货运人',
ui: {
widget: 'select',
placeholder: '请选择',
allowClear: true,
visibleIf: {
expand: (value: boolean) => value
},
asyncData: () => this.service.getNetworkFreightForwarder()
},
default: ''
}
}
};
}
private initST(): STColumn[] {
return [
{ title: '', index: 'key', type: 'checkbox' },
{ title: '运单号', index: 'no' },
{ title: '订单号', index: 'no' },
{ title: '订单类型', index: 'no' },
{ title: '装货地', index: 'callNo' },
{ title: '卸货地', index: 'callNo' },
{ title: '司机信息', render: 'call1No' },
{ title: '车辆信息', render: 'call1N2o' },
{ title: '托运人', index: 'callNo' },
{ title: '网络货运人', index: 'callNo' },
{ title: '接单时间', index: 'updatedAt', type: 'date' },
{ title: '装货时间', index: 'updatedAt', type: 'date' },
{ title: '卸货时间', index: 'updatedAt', type: 'date' },
{ title: '签收时间', index: 'updatedAt', type: 'date' }
];
}
}

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

@ -15,6 +15,8 @@ import { RequestedDetailComponent } from './components/invoice-requested/request
import { InvoiceDetailComponent } from './components/invoice-detail/invoice-detail.component';
import { CancellationInvoiceComponent } from './components/cancellation-invoice/cancellation-invoice.component';
import { PushInvoiceComponent } from './components/cancellation-invoice/push-invoice/push-invoice.component';
import { AddOwnerComponent } from './components/etc-blacklist/add-owner/add-owner.component';
import { AddCartComponent } from './components/etc-blacklist/add-cart/add-cart.component';
const COMPONENTS: any = [
ETCInvoicedListComponent,
@ -25,11 +27,18 @@ const COMPONENTS: any = [
InvoicedListComponent,
InvoiceRequestedDetailComponent,
InvoiceDetailComponent,
CancellationInvoiceComponent
CancellationInvoiceComponent,
PushInvoiceComponent
];
const NOTROUTECOMPONENTS: any = [
TransactionDetailsComponent,
RequestedInvoiceModalComponent,
RequestedDetailComponent,
AddOwnerComponent,
AddCartComponent
];
const NOTROUTECOMPONENTS: any = [TransactionDetailsComponent, RequestedInvoiceModalComponent, RequestedDetailComponent];
@NgModule({
declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS, PushInvoiceComponent],
declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS],
imports: [CommonModule, TicketManagementRoutingModule, SharedModule]
})
export class TicketManagementModule {}

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

@ -360,7 +360,7 @@
"link": "/ticket/etc-invoice-requested"
},
{
"text": "运单开票记录",
"text": "开票记录",
"link": "/ticket/etc-invoice-list"
},
{
@ -368,7 +368,7 @@
"link": "/ticket/etc-invoiced-logs"
},
{
"text": "黑名单",
"text": "ETC白名单",
"link": "/ticket/etc-blacklist"
}
]