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:
潘晓云
2022-04-21 20:37:05 +08:00
parent ee4f07ee8d 09de79ab55
commit acc78ad635
62 changed files with 624 additions and 764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html
View File

@ -1,4 +1,4 @@
<page-header-wrapper [title]="'开票订单明细'" [logo]="logo">
<page-header-wrapper [title]="'司机账户明细'" [logo]="logo">
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
<i nz-icon nzType="left" nzTheme="outline"></i>

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

@ -133,7 +133,7 @@ export class DriverAccountDetailComponent implements OnInit {
nzShowTime: true
} as SFDateWidgetSchema
},
transactionNumber: {
channelPaySn: {
type: 'string',
title: '流水号',
ui: {
@ -142,7 +142,7 @@ export class DriverAccountDetailComponent implements OnInit {
},
businessNumber: {
type: 'string',
title: '关联单号',
title: '交易单号',
ui: {
placeholder: '请输入'
}

14
src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html
View File

@ -1,4 +1,14 @@
<page-header-wrapper [title]="'开票订单明细'" [logo]="logo">
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-04-06 10:57:56
* @LastEditors : Shiming
* @LastEditTime : 2022-04-21 16:41:13
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\freight-account\\freight-account-detail\\freight-account-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="'货主账号明细'" [logo]="logo">
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
<i nz-icon nzType="left" nzTheme="outline"></i>
@ -40,7 +50,7 @@
</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);loadInfo();">查询</button>
(click)="st?.load(1);">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button (click)="exportList()"> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()">

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

@ -46,7 +46,7 @@ export class FreightAccountDetailComponent implements OnInit {
}
});
}
this.loadStatistics(requestOptions.body);
// this.loadStatistics(requestOptions.body);
return requestOptions;
};
@ -153,34 +153,45 @@ export class FreightAccountDetailComponent implements OnInit {
placeholder: '请输入'
}
},
// tradeType: {
// type: 'string',
// title: '交易类型',
// enum: [
// { label: '全部', value: '' },
// { label: '整车订单退款', value: '1' },
// { label: '整车订单支付', value: '2' },
// { label: '提现失败退回', value: '3' },
// { label: '提现', value: '4' },
// { label: '充值', value: '5' },
// { label: '运货订单结算F', value: '5' }
// ],
// ui: {
// widget: 'select',
// placeholder: '请选择',
// visibleIf: {
// expand: (value: boolean) => value
// }
// },
// default: ''
// },
tradeType: {
type: 'string',
title: '交易类型',
enum: [
{ label: '全部', value: '' },
{ label: '整车订单退款', value: '1' },
{ label: '整车订单支付', value: '2' },
{ label: '提现失败退回', value: '3' },
{ label: '提现', value: '4' },
{ label: '充值', value: '5' },
{ label: '运货订单结算F', value: '5' }
],
ui: {
widget: 'select',
placeholder: '请选择',
widget: 'dict-select',
params: { dictKey: 'trade:type' },
visibleIf: {
expand: (value: boolean) => value
}
},
default: ''
},
} as SFSelectWidgetSchema
},
incomeType: {
type: 'string',
title: '收支类型',
enum: [
{ label: '全部', value: '' },
{ label: '收入', value: '1' },
{ label: '支出', value: '2' }
{ label: '收入', value: '2' },
{ label: '支出', value: '1' }
],
ui: {
widget: 'select',
@ -191,18 +202,28 @@ export class FreightAccountDetailComponent implements OnInit {
},
default: ''
},
projectId: {
title: '所属项目',
projectName: {
type: 'string',
default: '',
title: '所属项目',
ui: {
widget: 'select',
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
},
asyncData: () => this.service.getEnterpriseProject()
} as SFSelectWidgetSchema
}
}
}
// projectId: {
// title: '所属项目',
// type: 'string',
// default: '',
// ui: {
// widget: 'select',
// visibleIf: {
// expand: (value: boolean) => value
// },
// asyncData: () => this.service.getEnterpriseProject()
// } as SFSelectWidgetSchema
// }
}
};
}
@ -212,6 +233,7 @@ export class FreightAccountDetailComponent implements OnInit {
{ title: '交易时间', index: 'createTime', type: 'date', width: 170 },
{ title: '流水号', index: 'transactionNumber', width: 170 },
{ title: '交易类型', index: 'tradeTypeLabel', className: 'text-center', width: 140 },
{ title: '收支类型', index: 'tradeTypeLabel', className: 'text-center', width: 140 },
{ title: '交易单号', index: 'businessNumber', width: 170 },
{ title: '订单号', index: 'orderSn', width: 170 },
{ title: '运单号', index: 'transportSn', width: 170 },

6
src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts
View File

@ -83,6 +83,7 @@ export class PayableOrderDetailComponent implements OnInit {
*/
resetSF() {
this.sf.reset();
this._$expand = false;
}
/**
@ -123,10 +124,7 @@ export class PayableOrderDetailComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
asyncData: () => this.service.getCloseAccount(),
visibleIf: {
expand: (value: boolean) => value
}
asyncData: () => this.service.getCloseAccount()
},
default: ''
},

3
src/app/routes/financial-management/components/payable-order/payable-order.component.html
View File

@ -38,8 +38,7 @@
[ui]="{ '*': { spanLabelFixed: 110,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="text-right"
[class.expend-options]="_$expand">
<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 [disabled]="false" (click)="resetSF()">重置</button>
<!-- <button nz-button [disabled]="false"> 导出</button>

6
src/app/routes/financial-management/components/payment-record/payment-record.component.ts
View File

@ -150,9 +150,9 @@ export class PaymentRecordComponent implements OnInit {
type: 'string',
title: '车队长收款',
enum: [
{ label: '全部', value: '' },
{ label: '否', value: '0' },
{ label: '是', value: '1' }
{label: '全部', value: ''},
{label: '是', value: '1'},
{label: '否', value: '2'}
],
ui: {
widget: 'select',

1
src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts
View File

@ -68,6 +68,7 @@ export class ReceivableOrderDetailComponent implements OnInit {
*/
resetSF() {
this.sf.reset();
this._$expand = false;
}
/**

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-05 20:15:41
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:17:19
* @LastEditTime : 2022-04-21 10:15:49
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\withdrawals-record\\withdrawals-detail\\withdrawals-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -16,7 +16,7 @@
</ng-template>
</page-header-wrapper>
<nz-card [nzLoading]="service.http.loading">
<nz-card >
<nz-alert nzType="info" nzMessage="提现信息" class="mb-md"></nz-alert>
<div se-container [labelWidth]="130">
<se label="网络货运人">

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

@ -140,39 +140,41 @@ export class WithdrawalsDetailComponent implements OnInit {
hidden: true
}
},
billHCode: {
orderPaymentCode: {
type: 'string',
title: '支付编号',
ui: {
placeholder: '请输入'
}
},
billHCod1e: {
billCode: {
type: 'string',
title: '订单号',
ui: {
placeholder: '请输入'
}
},
billHCo1de: {
resourceCode: {
type: 'string',
title: '货源编号',
ui: {
placeholder: '请输入'
}
},
billHC1ode: {
serviceType: {
type: 'string',
title: '服务类型',
ui: {
widget: 'select',
widget: 'dict-select',
params: { dictKey: 'service:type' },
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
default: ''
},
billHCo11de: {
driverName: {
type: 'string',
title: '承运司机',
ui: {
@ -182,7 +184,7 @@ export class WithdrawalsDetailComponent implements OnInit {
}
}
},
billHCo111de: {
driverLicensePlate: {
type: 'string',
title: '车牌号',
ui: {
@ -192,7 +194,7 @@ export class WithdrawalsDetailComponent implements OnInit {
}
}
},
billHC1o11de: {
captain: {
type: 'string',
title: '收款人',
ui: {
@ -202,9 +204,14 @@ export class WithdrawalsDetailComponent implements OnInit {
}
}
},
billHC1o111de: {
isCaptain: {
type: 'string',
title: '车队长收款',
enum: [
{label: '全部', value: ''},
{label: '是', value: '1'},
{label: '否', value: '2'}
],
ui: {
widget: 'select',
placeholder: '请选择',