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

fix bug

Browse Source
This commit is contained in:
Lingzi
2022-04-02 15:50:03 +08:00
parent 422fe61a53 407a7b624b
commit 6007b0b727
77 changed files with 1162 additions and 486 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

@ -9,7 +9,7 @@
<nz-card>
<nz-row [nzGutter]="16">
<nz-col [nzXl]="9" [nzLg]="8" [nzSm]="12">
<nz-statistic [nzValue]="params?.ltdName+'('+(params?.bankType===1?'平安':'浦发')+')'"
<nz-statistic [nzValue]="params?.ltdName+'('+(params?.bankType==='1'?'平安':'浦发')+')'"
[nzTitle]="params.name+'('+params.phone+')'" [nzValueStyle]="{'font-size':'16px','font-weight':'bold'}"
class="bold">
</nz-statistic>

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

@ -35,7 +35,8 @@ export class DriverAccountDetailComponent implements OnInit {
ltdId: this.params.ltdId,
projectId: this.params.projectId,
enterpriseId: this.params.enterpriseId,
roleId: this.params.roleId
roleId: this.params.roleId,
bankType: this.params.bankType,
});
if (this.sf) {
Object.assign(requestOptions.body, {
@ -59,6 +60,7 @@ export class DriverAccountDetailComponent implements OnInit {
roleId: this.params.roleId,
pageIndex: this.st.pi,
pageSize: this.st.ps,
bankType: this.params.bankType,
createTime: {
start: this.sf?.value?.createTime?.[0] || '',
end: this.sf?.value?.createTime?.[1] || ''
@ -162,13 +164,13 @@ export class DriverAccountDetailComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '交易时间', index: 'createTime', type: 'date' },
{ title: '流水号', index: 'channelPaySn' },
{ title: '交易类型', index: 'tradeTypeLabel', className: 'text-center' },
{ title: '交易单号', index: 'businessNumber' },
{ title: '订单号', index: 'orderSn' },
{ title: '运单号', index: 'transportSn' },
{ title: '收支类型', index: 'incomeTypeLabel', className: 'text-center' },
{ title: '交易时间', index: 'createTime', type: 'date', width: 150 },
{ title: '流水号', index: 'channelPaySn', width: 170 },
{ title: '交易类型', index: 'tradeTypeLabel', className: 'text-center', width: 150 },
{ title: '交易单号', index: 'businessNumber' , width: 190},
{ title: '订单号', index: 'orderSn' , width: 190},
{ title: '运单号', index: 'transportSn', width: 190 },
{ title: '收支类型', index: 'incomeTypeLabel', className: 'text-center', width: 150 },
{
title: '交易金额',
index: 'amount',
@ -185,9 +187,9 @@ export class DriverAccountDetailComponent implements OnInit {
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) }
},
{ title: '付款方', index: 'payName'},
{ title: '收款方', index: 'payeeName' },
{ title: '备注', index: 'tradeContent' },
{ title: '付款方', index: 'payName', width: 150},
{ title: '收款方', index: 'incomeName', width: 150 },
{ title: '备注', index: 'tradeContent' , width: 150},
];
}
}

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

@ -9,7 +9,7 @@
<nz-card>
<nz-row [nzGutter]="16">
<nz-col [nzXl]="9" [nzLg]="8" [nzSm]="12">
<nz-statistic [nzValue]="params.ltdName+'('+(params.bankType===1?'平安':'浦发')+')'"
<nz-statistic [nzValue]="params.ltdName+'('+(params.bankType==='1'?'平安':'浦发')+')'"
[nzTitle]="params.tenantName" [nzValueStyle]="{'font-size':'16px','font-weight':'bold'}" class="bold">
</nz-statistic>
</nz-col>

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

@ -134,7 +134,7 @@ export class FreightAccountDetailComponent implements OnInit {
},
businessNumber: {
type: 'string',
title: '关联单号',
title: '交易单号',
ui: {
placeholder: '请输入'
}
@ -178,7 +178,7 @@ export class FreightAccountDetailComponent implements OnInit {
default: ''
},
projectId: {
title: '项目',
title: '所属项目',
type: 'string',
default: '',
ui: {
@ -221,7 +221,7 @@ export class FreightAccountDetailComponent implements OnInit {
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) }
},
{ title: '付款方', index: 'payName' , width: 170},
{ title: '收款方', index: 'payeeName', width: 170 },
{ title: '收款方', index: 'incomeName', width: 170 },
{ title: '备注', index: 'tradeContent', width: 170 }
];
}

4
src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-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>
@ -7,7 +7,7 @@
</page-header-wrapper>
<nz-card>
<h3 class="font-weight-bold">天津怡亚通物流科技有限公司（浦发银行）</h3>
<h3 class="font-weight-bold">{{params?.ltdName}}</h3>
<nz-row [nzGutter]="16">
<nz-col [nzXl]="4" [nzLg]="8" [nzSm]="12">
<nz-statistic [nzValue]="((info.availableBalance |currency:' ') || 0)+'元'" nzTitle="平台账户余额"

2
src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts
View File

@ -221,7 +221,7 @@ export class PlatformAccountDetailComponent implements OnInit {
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) }
},
{ title: '付款方', index: 'payName', className: 'text-center', width: 150 },
{ title: '收款方', index: 'payeeName', className: 'text-center', width: 150 },
{ title: '收款方', index: 'incomeName', className: 'text-center', width: 150 },
{ title: '备注', index: 'tradeContent', className: 'text-center', width: 150 }
];
}

2
src/app/routes/financial-management/components/platform-account/platform-account.component.ts
View File

@ -187,7 +187,7 @@ export class PlatformAccountComponent implements OnInit {
text: '查看明细',
click: item =>
this.router.navigate(['/financial-management/platform-account/detail/' + item.id], {
queryParams: { ltdId: item.ltdId, bankType: item.bankType }
queryParams: { ltdId: item.ltdId, bankType: item.bankType, ltdName: `${item.ltdName}(${item.bankTypeLabel})` }
})
}
]

252
src/app/routes/financial-management/components/recharge-record/dist/recharge-record.component.js vendored Normal file
View File

@ -0,0 +1,252 @@
"use strict";
var __assign = (this && this.__assign) || function () {
__assign = Object.assign || function(t) {
for (var s, i = 1, n = arguments.length; i < n; i++) {
s = arguments[i];
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
t[p] = s[p];
}
return t;
};
return __assign.apply(this, arguments);
};
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
exports.__esModule = true;
exports.RechargeRecordComponent = void 0;
var core_1 = require("@angular/core");
var RechargeRecordComponent = /** @class */ (function () {
function RechargeRecordComponent(service, modal) {
var _this = this;
this.service = service;
this.modal = modal;
this.columns = this.initST();
this.searchSchema = this.initSF();
this.rechargeRemark = '';
this._$expand = false;
this.beforeReq = function (requestOptions) {
if (_this.sf) {
Object.assign(requestOptions.body, __assign({}, _this.sf.value));
}
return requestOptions;
};
}
RechargeRecordComponent.prototype.ngOnInit = function () { };
RechargeRecordComponent.prototype.addRemark = function (item) {
var _this = this;
this.rechargeRemark = item.rechargeRemark;
var modal = this.modal.create({
nzTitle: this.rechargeRemark ? '修改备注' : '添加备注',
nzContent: this.remarkodal,
nzFooter: [
{
type: 'primary',
label: '确认',
loading: function () { return _this.service.http.loading; },
onClick: function () {
modal.destroy();
}
}
]
});
};
RechargeRecordComponent.prototype.goBack = function () {
history.go(-1);
};
/**
* 重置表单
*/
RechargeRecordComponent.prototype.resetSF = function () {
this.sf.reset();
this._$expand = false;
};
/**
* 伸缩查询条件
*/
RechargeRecordComponent.prototype.expandToggle = function () {
var _a;
this._$expand = !this._$expand;
(_a = this.sf) === null || _a === void 0 ? void 0 : _a.setValue('/expand', this._$expand);
};
RechargeRecordComponent.prototype.exportList = function () {
this.service.downloadFile(this.service.$mock_url, __assign(__assign({}, this.sf.value), { pageSize: -1 }));
};
RechargeRecordComponent.prototype.initSF = function () {
var _this = this;
return {
properties: {
expand: {
type: 'boolean',
ui: {
hidden: true
}
},
rechargeNo: {
type: 'string',
title: '充值单号',
ui: {
placeholder: '请输入'
}
},
rechargeStatus: {
type: 'string',
title: '充值状态',
"enum": [
{ label: '全部', value: '' },
{ label: '充值中', value: '1' },
{ label: '充值失败', value: '2' },
{ label: '充值成功', value: '3' }
],
ui: {
widget: 'select',
placeholder: '请选择'
},
"default": ''
},
createTime: {
title: '充值时间',
type: 'string',
ui: {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd'
}
},
roleName: {
type: 'string',
title: '账户名称',
ui: {
placeholder: '请输入',
autocomplete: 'off',
visibleIf: {
expand: function (value) { return value; }
}
}
},
accountType: {
type: 'string',
title: '账户类型',
"enum": [
{ label: '全部', value: '' },
{ label: '货主账户', value: '1' },
{ label: '司机账户', value: '2' },
{ label: '营商商账户', value: '3' }
],
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: function (value) { return value; }
}
},
"default": ''
},
ltdId: {
type: 'string',
title: '网络货运人',
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: function (value) { return value; }
},
allowClear: true,
asyncData: function () { return _this.service.getNetworkFreightForwarder(); }
}
},
bankType: {
type: 'string',
title: '银行类型',
"enum": [
{ label: '全部', value: '' },
{ label: '平安银行', value: '1' },
{ label: '浦发银行', value: '2' }
],
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: function (value) { return value; }
}
},
"default": ''
}
}
};
};
RechargeRecordComponent.prototype.initST = function () {
var _this = this;
return [
{ title: '充值时间', index: 'createTime', type: 'date', width: 180 },
{ title: '充值单号', index: 'rechargeNo', width: 140 },
{ title: '网络货运人', index: 'ltdName', width: 160 },
{ title: '银行类型', index: 'bankTypeLabel', width: 100 },
{ title: '账户类型', index: 'accountTypeLabel', width: 100 },
{ title: '账户名称', index: 'roleName', width: 160 },
{ title: '虚拟账户', index: 'virtualAccount', width: 100 },
{
title: '充值金额',
index: 'rechargeAmount',
width: 160,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: function (_a) {
var record = _a.record;
return ({ value: record.rechargeAmount });
} }
},
{ title: '充值银行账户', render: 'transferBankAccount', width: 200 },
{ title: '充值方式', index: 'payChannelLabel', width: 100 },
{ title: '充值状态', index: 'rechargeStatusLabel', width: 100 },
{ title: '银行流水号', index: 'paySerialNumber', width: 120 },
{
title: '操作',
width: 120,
fixed: 'right',
className: 'text-center',
buttons: [
{ type: 'divider' },
{
text: '查看回单<br>',
click: function (item) {
return _this.service.getReceiptUrl(item.receiptUrl, {
bankType: item.bankType,
rmYll: item.roleId,
snglFlgCd: item.paySerialNumber2,
bussType: '06',
ltdId: item.ltdId,
accountType: item.accountType
});
}
},
{
text: '添加备注',
click: function (item) { return _this.addRemark(item); }
}
]
}
];
};
__decorate([
core_1.ViewChild('st', { static: true })
], RechargeRecordComponent.prototype, "st");
__decorate([
core_1.ViewChild('sf', { static: false })
], RechargeRecordComponent.prototype, "sf");
__decorate([
core_1.ViewChild('remarkodal', { static: true })
], RechargeRecordComponent.prototype, "remarkodal");
RechargeRecordComponent = __decorate([
core_1.Component({
selector: 'app-recharge-record',
templateUrl: './recharge-record.component.html',
styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
})
], RechargeRecordComponent);
return RechargeRecordComponent;
}());
exports.RechargeRecordComponent = RechargeRecordComponent;

15
src/app/routes/financial-management/components/recharge-record/recharge-record.component.html
View File

@ -19,7 +19,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: 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.expend-options]="_$expand"
@ -42,4 +42,15 @@
{{ item.transferBankOpenName }} <br> {{ item.transferBankCardNumber }}
</ng-template>
</st>
</nz-card>
</nz-card>
<ng-template #remarkodal>
<div nz-row>
<div nz-col nzSpan="24" se-container [labelWidth]="80">
<se [col]="1" label="备注">
<textarea nz-input rows="3" [(ngModel)]="rechargeRemark" placeholder="最多不能超过100字"
maxlength="100"></textarea>
</se>
</div>
</div>
</ng-template>

36
src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts
View File

@ -1,6 +1,7 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal';
import { FreightAccountService } from '../../services/freight-account.service';
@Component({
@ -16,8 +17,12 @@ export class RechargeRecordComponent implements OnInit {
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
@ViewChild('remarkodal', { static: true })
remarkodal!: any;
rechargeRemark = '';
_$expand = false;
constructor(public service: FreightAccountService) {}
constructor(public service: FreightAccountService, private modal: NzModalService) {}
ngOnInit(): void {}
@ -28,6 +33,24 @@ export class RechargeRecordComponent implements OnInit {
return requestOptions;
};
addRemark(item: any) {
this.rechargeRemark = item.rechargeRemark;
const modal = this.modal.create({
nzTitle: this.rechargeRemark ? '修改备注' : '添加备注',
nzContent: this.remarkodal,
nzFooter: [
{
type: 'primary',
label: '确认',
loading: () => this.service.http.loading,
onClick: () => {
modal.destroy();
}
}
]
});
}
goBack() {
history.go(-1);
}
@ -110,7 +133,7 @@ export class RechargeRecordComponent implements OnInit {
{ label: '全部', value: '' },
{ label: '货主账户', value: '1' },
{ label: '司机账户', value: '2' },
{ label: '营商账户', value: '3' }
{ label: '营商商账户', value: '3' }
],
ui: {
widget: 'select',
@ -178,12 +201,13 @@ export class RechargeRecordComponent implements OnInit {
{ title: '银行流水号', index: 'paySerialNumber', width: 120 },
{
title: '操作',
width: 100,
width: 120,
fixed: 'right',
className: 'text-center',
buttons: [
{ type: 'divider' },
{
text: '查看回单',
text: '查看回单<br>',
click: item =>
this.service.getReceiptUrl(item.receiptUrl, {
bankType: item.bankType,
@ -193,6 +217,10 @@ export class RechargeRecordComponent implements OnInit {
ltdId: item.ltdId,
accountType: item.accountType
})
},
{
text: '添加备注',
click: item => this.addRemark(item)
}
]
}

6
src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts
View File

@ -138,9 +138,9 @@ export class TransactionFlowComponent {
title: '账户类型',
enum: [
{ label: '全部', value: '' },
{ label: '货主端', value: '1' },
{ label: '司机端', value: '2' },
{ label: '司机端', value: '3' }
{ label: '货主账户', value: '1' },
{ label: '司机账户', value: '2' },
{ label: '运营商账户', value: '3' }
],
ui: {
widget: 'select',

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

@ -59,7 +59,7 @@
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据&nbsp;&nbsp; 累计提现 <strong
class="text-red">{{
totalCallNo }}</strong>
<a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
<a *ngIf="totalCallNo > 0" (click)="st.clearCheck();totalCallNo=0" class="ml-lg">清空</a>
</div>
<button nz-button (click)="this.auditAction(null)">审核</button>
</div>