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 lxx

Browse Source
This commit is contained in:
xiaoxing.liu
2022-04-08 17:46:35 +08:00
parent 15e200c787 54ef73b6db
commit 466d6b4b5e
40 changed files with 256 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
View File

@ -248,7 +248,7 @@ export class DatatableFundReportingComponent implements OnInit {
{ title: '实际承运人名称', index: 'carrier', className: 'text-center', width: '150px' },
{ title: '实际承运人证件号码', index: 'cardId', className: 'text-center', width: '200px' },
{ title: '车牌号', index: 'carNumber', className: 'text-center', width: '180px' },
{ title: '车牌颜色', index: 'carColor', className: 'text-center', width: '180px' },
{ title: '车牌颜色', index: 'carColorLabel', className: 'text-center', width: '180px' },
{ title: '总金额', render: 'tolalAmount', className: 'text-center', width: '120px' },
{ title: '付款方式', index: 'payType', className: 'text-center', width: '150px' },

2
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
View File

@ -46,7 +46,7 @@
</ng-template>
<ng-template st-row="checkStatus" let-item let-index="index">
<a (click)="viewResult(item)">{{filterCheckStatus(item?.checkStatus)}}</a>
<a *ngIf="item?.checkStatus === 2" (click)="viewResult(item)">{{filterCheckStatus(item?.checkStatus)}}</a>
<span *ngIf="item?.checkStatus !== 2">{{filterCheckStatus(item?.checkStatus)}}</span>
</ng-template>

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

@ -76,7 +76,7 @@ export class DriverAccountDetailComponent implements OnInit {
stChange(e: STChange): void {}
exportList() {
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
this.service.downloadFile(this.service.$api_get_exportAccountBalanceDriverByOperatorPage, { ...this.sf.value, pageSize: -1 });
}
goBack() {

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

@ -1,32 +1,43 @@
<page-header-wrapper title="司机账户">
</page-header-wrapper>
<page-header-wrapper title="司机账户"> </page-header-wrapper>
<nz-card class="search-box">
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="searchSchema"
[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"
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 (click)="exportList()"> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf
#sf
[schema]="searchSchema"
[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" class="text-right">
<button nz-button nzType="primary" [nzLoading]="loading" (click)="st?.load(1)">查询</button>
<button nz-button [disabled]="loading" (click)="resetSF()">重置</button>
<button nz-button [disabled]="loading" (click)="exportList()"> 导出</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">
<st #st [data]="service.$api_get_driver_account_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="false" [scroll]="{ x: '1200px' }">
<ng-template st-row="availableBalance" let-item let-index="index">
<a (click)="showAccountDetail(item)">{{ (parseFloat(item.availableBalance) +
parseFloat(item.freezeBalance)).toFixed(2) | currency}}</a>
</ng-template>
</st>
</nz-card>
<st
#st
[data]="service.$api_get_driver_account_page"
[columns]="columns"
[req]="{ process: beforeReq }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}"
[page]="{}"
[loading]="false"
[scroll]="{ x: '1200px' }"
>
<ng-template st-row="availableBalance" let-item let-index="index">
<a (click)="showAccountDetail(item)">{{
(parseFloat(item.availableBalance) + parseFloat(item.freezeBalance)).toFixed(2) | currency
}}</a>
</ng-template>
</st>
</nz-card>

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

@ -18,7 +18,7 @@ export class DriverAccountComponent implements OnInit {
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
loading: boolean = true;
searchSchema: SFSchema = this.initSF();
columns: STColumn[] = this.initST();
_$expand = false;
@ -40,9 +40,16 @@ export class DriverAccountComponent implements OnInit {
});
}
}
this.loading = true;
return requestOptions;
};
afterRes = (data: any[], rawData?: any) => {
console.log(data)
this.loading = false
return data.map(item => ({
...item,
}));
};
showAccountDetail(item: any) {
this.modal.create({
nzTitle: '账户明细',
@ -74,7 +81,7 @@ export class DriverAccountComponent implements OnInit {
}
exportList() {
this.service.asyncExport({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_driver_account_page);
this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_driver_account_page);
}
private initSF(): SFSchema {

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

@ -83,7 +83,7 @@ export class FreightAccountDetailComponent implements OnInit {
stChange(e: STChange): void {}
exportList() {
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
this.service.downloadFile(this.service.$api_get_exportAccountBalanceShipperByOperatorPage, { ...this.sf.value, pageSize: -1 });
}
goBack() {

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

@ -80,7 +80,7 @@ export class FreightAccountComponent implements OnInit {
}
exportList() {
this.service.asyncExport({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_shipper);
this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportShipperAccountBalanceByOperator);
}
private initSF(): SFSchema {

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

@ -66,7 +66,7 @@ export class PlatformAccountDetailComponent implements OnInit {
stChange(e: STChange): void {}
exportList() {
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
this.service.downloadFile(this.service.$api_get_exportAccountBalanceByPage, { ...this.sf.value, pageSize: -1 });
}
goBack() {

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

@ -46,7 +46,7 @@
<div nz-col [nzXl]="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 (click)="exportList()"> 导出</button>
</div>
</div>
</nz-card>

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

@ -194,4 +194,7 @@ export class PlatformAccountComponent implements OnInit {
}
];
}
exportList() {
this.service.downloadFile(this.service.$api_get_exportPlatformAccountBalanceByOperator, { ...this.sf.value, pageSize: -1 });
}
}

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

@ -79,7 +79,7 @@ export class RechargeRecordComponent implements OnInit {
}
exportList() {
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
this.service.downloadFile(this.service.$api_get_exportPageByOperator, { ...this.sf.value, pageSize: -1 });
}
private initSF(): SFSchema {

2
src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html
View File

@ -11,7 +11,7 @@
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 (click)='exportList()'> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

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

@ -261,4 +261,7 @@ export class TransactionFlowComponent {
}
];
}
exportList() {
this.service.downloadFile(this.service.$api_get_exportAccountBalanceDetailPage, { ...this.sf.value, pageSize: -1 });
}
}

19
src/app/routes/financial-management/services/freight-account.service.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-18 15:57:44
* @LastEditors : Shiming
* @LastEditTime : 2022-01-26 16:53:11
* @LastEditTime : 2022-04-08 17:30:12
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\services\\freight-account.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -137,6 +137,23 @@ export class FreightAccountService extends ShipperBaseService {
// 根据预收款ID获取核销信息明细
$api_get_advance_collection_hrxiao = '/api/fcc/ficoAhxH/getAhxHByYskblaId';
// 运营导出充值信息 充值记录导出
$api_get_exportPageByOperator = '/api/fcc/rechargeInfo/exportPageByOperator';
// 运营端导出交易流水明细
$api_get_exportAccountBalanceDetailPage = '/api/fcc/accountBalanceDetail/exportAccountBalanceDetailPage';
// 运营端导出平台账户余额交易明细
$api_get_exportAccountBalanceByPage = '/api/fcc/accountBalanceDetail/exportAccountBalanceByPage';
// 运营端导出司机账户余额交易明细
$api_get_exportAccountBalanceDriverByOperatorPage = '/api/fcc/accountBalanceDetail/exportAccountBalanceDriverByOperatorPage';
// 运营端导出货主账户余额交易明细
$api_get_exportAccountBalanceShipperByOperatorPage = '/api/fcc/accountBalanceDetail/exportAccountBalanceShipperByOperatorPage';
// 运营端导出导出货主账户
$api_get_exportShipperAccountBalanceByOperator = '/api/fcc/accountBalance/exportShipperAccountBalanceByOperator';
// 运营端导出导出平台账户信息
$api_get_exportPlatformAccountBalanceByOperator = '/api/fcc/accountBalance/exportPlatformAccountBalanceByOperator';
constructor(public injector: Injector) {
super(injector);
}

4
src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-04-07 10:11:15
* @LastEditTime : 2022-04-08 16:34:26
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\abnormal-warning\\abnormal-warning.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -70,7 +70,7 @@
<ng-template st-row="driverName" let-item let-index="index">
<div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" + item?.carNo : '' }} </div>
<div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }} </div>
</ng-template>
<ng-template st-row="longitude" let-item let-index="index">
<div> {{ item?.longitude }}

6
src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts
View File

@ -227,7 +227,9 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
className: 'text-left',
index: 'billCode'
},
{ title: '服务类型', index: 'serviceTypeLabel', width: '220px', className: 'text-left' },
{ title: '服务类型', index: 'serviceTypeLabel', width: '220px', className: 'text-left',format: (item) => {
return item?.resourceTypeLabel + item?.serviceTypeLabel
} },
{ title: '货主', index: 'shipperName', width: '220px', className: 'text-left' },
{ title: '装货地', index: 'loadingAddressArr', width: '220px', className: 'text-left' },
{ title: '卸货地', index: 'unloadingAddressArr', width: '220px', className: 'text-left' },
@ -283,6 +285,6 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
// 导出
exprot() {
this.service.asyncExport(this.reqParams, this.service.$api_get_asyncExportSpotCheckList);
this.service.exportStart(this.reqParams, this.service.$api_get_asyncExportSpotCheckList);
}
}

2
src/app/routes/order-management/components/bulk/bulk.component.ts
View File

@ -851,6 +851,6 @@ export class OrderManagementBulkComponent implements OnInit {
}
// 导出
exprot() {
this.service.asyncExport(this.reqParams,this.service.$api_get_asyncExportBulkList);
this.service.exportStart(this.reqParams,this.service.$api_get_asyncExportBulkList);
}
}

2
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
View File

@ -696,6 +696,6 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
}
// 导出
exprot() {
this.service.asyncExport(this.reqParams, this.service.$api_get_asyncExportSpotCheckList);
this.service.exportStart(this.reqParams, this.service.$api_get_asyncExportSpotCheckList);
}
}

2
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
View File

@ -578,6 +578,6 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
}
// 导出
exprot() {
this.service.asyncExport(this.reqParams, this.service.$api_get_asyncExportExamineBillList);
this.service.exportStart(this.reqParams, this.service.$api_get_asyncExportExamineBillList);
}
}

2
src/app/routes/order-management/components/risk/risk.component.ts
View File

@ -534,6 +534,6 @@ export class OrderManagementRiskComponent implements OnInit {
}
// 导出
exprot() {
this.service.asyncExport(this.reqParams, this.service.$api_get_asyncExportRiskBillList);
this.service.exportStart(this.reqParams, this.service.$api_get_asyncExportRiskBillList);
}
}

2
src/app/routes/order-management/components/vehicle/vehicle.component.ts
View File

@ -866,6 +866,6 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
}
// 导出
exprot() {
this.service.asyncExport(this.reqParams, this.service.$api_get_asyncExportWholeList);
this.service.exportStart(this.reqParams, this.service.$api_get_asyncExportWholeList);
}
}

2
src/app/routes/supply-management/components/bulk/bulk.component.ts
View File

@ -568,6 +568,6 @@ export class SupplyManagementBulkComponent implements OnInit {
userAction() {}
// 导出
exportFire() {
this.service.asyncExport(this.reqParams, this.service.$api_asyncExportBulkList);
this.service.exportStart(this.reqParams, this.service.$api_asyncExportBulkList);
}
}

2
src/app/routes/supply-management/components/vehicle/vehicle.component.ts
View File

@ -685,6 +685,6 @@ export class SupplyManagementVehicleComponent implements OnInit {
}
// 导出
exportFire() {
this.service.asyncExport(this.reqParams, this.service.$api_asyncExportWholeList);
this.service.exportStart(this.reqParams, this.service.$api_asyncExportWholeList);
}
}

4
src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
View File

@ -177,7 +177,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
}
},
checkStatus: {
title: '精准',
title: '本地校验',
type: 'string',
ui: {
placeholder: '请选择',
@ -241,7 +241,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
this.columns = [
{ title: '', type: 'checkbox', className: 'text-center', width: '60px', },
{ title: '上传状态', render: 'putStatus', className: 'text-center', width: '120px', },
{ title: '精准', render: 'checkStatus', className: 'text-center', width: '120px', },
{ title: '本地校验', render: 'checkStatus', className: 'text-center', width: '120px', },
{
title: '订单号',
index: 'billCode',

30
src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-03-30 14:26:01
* @LastEditors : Shiming
* @LastEditTime : 2022-04-08 15:36:04
* @LastEditTime : 2022-04-08 15:48:58
* @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\verify-result\\verify-result.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -63,11 +63,29 @@ export class TaxManagementOrderVerifyResultComponent implements OnInit {
initST() {
this.columns = [
{ title: '序号', type: 'no', className: 'text-center', width: '60px', },
{ title: '校验字段', index: 'orderStatus', className: 'text-center', width: '120px', },
{ title: '是否必填', index: 'orderStatus', className: 'text-center', width: '100px', },
{ title: '上传值', index: 'orderStatus', className: 'text-center', width: '120px', },
{ title: '本地校验', index: 'orderStatus', className: 'text-center', width: '100px', },
{ title: '错误内容', index: 'orderStatus', className: 'text-center', width: '150px', },
{ title: '校验字段', index: 'checkFieldName', className: 'text-center', width: '120px', },
{
title: '是否必填',
index: 'requiredStatus',
className: 'text-center',
width: '100px',
type: 'enum',
enum: {
0: '否',
1: '是'
}
},
{ title: '上传值', index: 'fieldValue', className: 'text-center', width: '150px', },
{
title: '本地校验', index: 'checkStatus', className: 'text-center', width: '100px',
type: 'enum',
enum: {
0: '校验中',
1: '通过',
2: '不通过'
}
},
{ title: '错误内容', index: 'remark', className: 'text-center', width: '150px', },
]
}

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

@ -1,8 +1,8 @@
<div nz-row nzGutter="8">
<div nz-col nzSpan="19">
<div nz-col nzSpan="18">
<sf #sf [schema]="searchSchema" [ui]="{ '*': {grid: { span: 12 } }}" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="5" class="text-right mb-md">
<div nz-col [nzSpan]="6" 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>

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

@ -246,16 +246,16 @@ export class ETCBlacklistComponent implements OnInit {
}
}
},
params6: {
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
// }
// }
// }
}
};
}

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

@ -95,7 +95,7 @@ export class ETCInvoicedListComponent implements OnInit {
title: '订单类型',
ui: {
widget: 'dict-select',
params: { dictKey: 'refund:apply:status' },
params: { dictKey: 'bill:type' },
placeholder: '请选择'
}
},

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

@ -12,7 +12,7 @@
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 (click)="exprot()"> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

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

@ -211,20 +211,24 @@ export class ETCInvoicedRequestedComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '', index: 'key', type: 'checkbox' },
{ title: '运单号', index: 'wayBillCode' },
{ title: '订单号', index: 'billCode' },
{ title: '订单类型', index: 'billType' },
{ title: '装货地', index: 'loadingPlace' },
{ title: '卸货地', index: 'dischargePlace' },
{ title: '司机信息', render: 'call1No' },
{ title: '车辆信息', render: 'call1N2o' },
{ title: '托运人', index: 'shipperAppUserName' },
{ title: '网络货运人', index: 'enterpriseInfoName' },
{ title: '接单时间', index: 'orderReceivingTime', type: 'date' },
{ title: '装货时间', index: 'shipperAppUserName', type: 'date' },
{ title: '卸货时间', index: 'unloadingTime', type: 'date' },
{ title: '签收时间', index: 'submissionTime', type: 'date' }
{ title: '', index: 'key', type: 'checkbox', width: '60px' },
{ title: '运单号', index: 'wayBillCode', width: '170px' },
{ title: '订单号', index: 'billCode' , width: '170px' },
{ title: '订单类型', index: 'billTypeLabel' , width: '140px' },
{ title: '装货地', index: 'loadingPlace' , width: '220px' },
{ title: '卸货地', index: 'dischargePlace', width: '220px' },
{ title: '司机信息', render: 'call1No', width: '140px' },
{ title: '车辆信息', render: 'call1N2o' , width: '200px' },
{ title: '托运人', index: 'shipperAppUserName' , width: '140px' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '220px' },
{ title: '接单时间', index: 'orderReceivingTime', type: 'date', width: '150px' },
{ title: '装货时间', index: 'shipperAppUserName', type: 'date', width: '150px' },
{ title: '卸货时间', index: 'unloadingTime', type: 'date', width: '150px' },
{ title: '签收时间', index: 'submissionTime', type: 'date', width: '150px' }
];
}
// 导出
exprot() {
this.service.exportStart(this.sf?.value, this.service.$api_get_asyncExportEtcApplyList);
}
}

6
src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts
View File

@ -30,15 +30,15 @@ export class ExpressDetailModalComponent implements OnInit {
width: 120,
type: 'widget',
className: 'text-right font-weight-bold',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) }
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatmoney }) }
},
{
title: '金额',
index: 'vatmoney',
index: 'vatnotax',
width: 90,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatmoney }) }
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) }
},
{
title: '税率',

5
src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
View File

@ -81,7 +81,7 @@
<div nz-col [nzXl]="6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="orderST?.load(1)">查询</button>
<button nz-button (click)="resetSF(1)">重置</button>
<!-- <button nz-button> 导出</button> -->
<button nz-button (click)="exportList()"> 导出</button>
</div>
</div>
@ -114,8 +114,9 @@
<st #invoiceST [data]="service.$api_get_invoice_details" [columns]="invoiceColumns" size="small" bordered="true"
[page]="{}" [req]="{ process: beforeReq }" [loading]="false" [scroll]="{ x: '1200px', y: '250px' }">
<ng-template st-row="vatname" let-item let-index="index">
<nz-select *ngIf="isEdit" [ngModel]="item.owner"
<nz-select *ngIf="isEdit" [ngModel]="item.vatname"
(ngModelChange)="invoiceST.setRow(index, { vatname: $event })" style="width: 100%">
<nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of services"></nz-option>
</nz-select>
<ng-container *ngIf="!isEdit">{{ item.vatname }}</ng-container>
</ng-template>

40
src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts
View File

@ -42,6 +42,8 @@ export class InvoiceDetailComponent implements OnInit {
type: any = 1;
selectedIndex = 0;
services: any[] = [];
constructor(public service: TicketService, private route: ActivatedRoute) {
this.isCanEdit = route.snapshot.queryParams.type === '1';
const expressno = route.snapshot.queryParams.expressno;
@ -54,7 +56,9 @@ export class InvoiceDetailComponent implements OnInit {
}
}
ngOnInit(): void {}
ngOnInit(): void {
this.getDictByKey();
}
beforeReq = (requestOptions: STRequestOptions) => {
Object.assign(requestOptions.body, { vatinvHId: this.id });
@ -67,6 +71,12 @@ export class InvoiceDetailComponent implements OnInit {
return requestOptions;
};
getDictByKey() {
this.service.request('/api/mdc/pbc/dictItems/getDictValue', { dictKey: 'invoice:service:type' }).subscribe(res => {
this.services = res;
});
}
loadInvoiceHeader(id: string) {
this.service.request(this.service.$api_get_invoice_header_detail, { id }).subscribe(res => {
if (res) {
@ -87,7 +97,23 @@ export class InvoiceDetailComponent implements OnInit {
}
saveInvoices() {
this.isEdit = false;
const list = this.invoiceST._data.map(item => {
const rs = { ...item };
delete rs._values;
return rs;
});
this.service
.request(this.service.$api_update_evatinh, {
id: this.id,
updatEvatinvDetailDTO: list
})
.subscribe(res => {
if (res) {
this.service.msgSrv.success('修改成功');
this.invoiceST.load(1);
this.isEdit = false;
}
});
}
/**
@ -107,6 +133,16 @@ export class InvoiceDetailComponent implements OnInit {
}
}
exportList() {
const params = { listSource: 1, pageSize: -1, vatinvHId: this.id };
if (this.orderSf) {
Object.assign(params, {
...this.orderSf.value
});
}
this.service.exportStart(params, this.service.$api_export_invoice_order_detail);
}
private initOrderSF(): SFSchema {
return {
properties: {

3
src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
View File

@ -189,6 +189,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
*/
resetSF() {
this.sf.reset();
this._$expand = false;
}
/**
@ -267,7 +268,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
}
}
},
orderS22n2: {
drivercarinfo: {
type: 'string',
title: '车牌号',
ui: {

4
src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
View File

@ -420,7 +420,7 @@ export class InvoiceRequestedComponent {
return [
{ title: '', index: 'key', type: 'checkbox' },
{ title: '申请编号', render: 'vatappcode', width: 190 },
{ title: '发票类型', index: 'vatapptypeLable', width: 140 },
{ title: '发票类型', index: 'vatapptypeLabel', width: 140 },
{ title: '网络货运人', index: 'ltdName', width: 170 },
{ title: '货主名称', index: 'artoName', width: 170 },
{ title: '订单数', index: 'ordlines', width: 90 },
@ -459,7 +459,7 @@ export class InvoiceRequestedComponent {
params: ({ record }) => ({ value: record.invoicedMoney })
}
},
{ title: '已开票张数', index: 'invoicedNum', width: 160 },
{ title: '已开票张数', className: 'text-right', index: 'invoicedNum', width: 160 },
{ title: '开户行', index: 'bankName', width: 160 },
{ title: '银行账户', index: 'bankAccount', width: 140 },
{ title: '注册地址', index: 'registerAddr', width: 140 },

12
src/app/routes/ticket-management/services/ticket.service.ts
View File

@ -1,10 +1,10 @@
/*
* @Author: your name
* @Date: 2021-12-29 13:12:35
* @LastEditTime: 2022-01-04 10:36:02
* @LastEditors: Please set LastEditors
* @LastEditTime : 2022-04-08 16:37:58
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\ticket-management\services\ticket.service.ts
* @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\services\\ticket.service.ts
*/
import { Injectable, Injector } from '@angular/core';
import { EACacheService, ShipperBaseService } from '@shared';
@ -73,6 +73,8 @@ export class TicketService extends ShipperBaseService {
$api_get_invoice_header_detail = '/api/fcc/ficoVatinvH/get';
// 获取分票发票抬头开票申请订单明细
$api_get_invoice_order_detail = '/api/fcc/ficoVatappBill/getDetailByVatinvHId';
// 货主/运营端获取开票申请订单明细导出
$api_export_invoice_order_detail = '/api/fcc/ficoVatappBill/reportDetailByVatapp';
// 获取分票发票抬头开票申请费用明细
$api_get_invoice_cost_detail = '/api/fcc/ficoVatappFee/getDetailByVatinvHId';
// 获取分票发票明细
@ -85,6 +87,8 @@ export class TicketService extends ShipperBaseService {
$api_delete_deletebatch = '/api/fcc/ficoVatinvH/deletebatch';
// 保存开票申请费用明细
$api_ficoVatappFee_save = '/api/fcc/ficoVatappFee/save';
// 更新销项发票信息
$api_update_evatinh = '/api/fcc/ficoVatinvH/updatEvatinvH';
// 查询ETC白名单（货主）
$api_get_etc_shipper_list = '/api/fcc/ficoShipperWhiteList/list/page';
@ -128,6 +132,8 @@ export class TicketService extends ShipperBaseService {
// 根据地区code查询列表
$api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode';
// ETC申请开票导出
$api_get_asyncExportEtcApplyList = '/api/sdc/invoiceEtcOperate/asyncExportEtcApplyList';
constructor(public injector: Injector) {
super(injector);

77
src/app/routes/vehicle/components/audit/audit.component.ts
View File

@ -10,7 +10,7 @@ import { VehicleService } from '../../../vehicle/services/vehicle.service';
import { CarSettleCarauthComponent } from '../list/carauth/carauth.component';
@Component({
selector: 'app-Vehicle-components-audit',
templateUrl: './audit.component.html',
templateUrl: './audit.component.html'
})
export class VehicleComponentsAuditComponent implements OnInit {
_$expand = false;
@ -22,7 +22,13 @@ export class VehicleComponentsAuditComponent implements OnInit {
@ViewChild('st', { static: false }) st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute, private modalHelper: ModalHelper) { }
constructor(
public service: VehicleService,
private modal: NzModalService,
private router: Router,
private ar: ActivatedRoute,
private modalHelper: ModalHelper
) {}
/**
* 查询字段个数navigate
*/
@ -36,26 +42,26 @@ export class VehicleComponentsAuditComponent implements OnInit {
get reqParams() {
const a: any = {};
if (this.resourceStatus === 1) {
a.approvalStatus = 10
a.approvalStatus = 10;
} else if (this.resourceStatus === 2) {
a.approvalStatus = 20
a.approvalStatus = 20;
} else if (this.resourceStatus === 3) {
a.approvalStatus = 30
a.approvalStatus = 30;
}
return {
...a,
...this.sf?.value,
...this.sf?.value
};
}
get selectedRows() {
return this.st?.list.filter((item) => item.checked) || [];
return this.st?.list.filter(item => item.checked) || [];
}
ngOnInit() {
this.initSF();
this.initST();
this.ar.url.subscribe((params) => {
this.ar.url.subscribe(params => {
this.st?.load(1);
});
}
@ -71,8 +77,8 @@ export class VehicleComponentsAuditComponent implements OnInit {
expand: {
type: 'boolean',
ui: {
hidden: true,
},
hidden: true
}
},
carNo: {
title: '车牌号',
@ -106,7 +112,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'car:color' },
containsAllLabel: true,
containsAllLabel: true
}
},
isSelf: {
@ -114,11 +120,11 @@ export class VehicleComponentsAuditComponent implements OnInit {
title: '是否挂靠',
enum: [
{ label: '是', value: 1 },
{ label: '否', value: 0 },
{ label: '否', value: 0 }
],
ui: {
widget: 'select',
allowClear: true,
allowClear: true
}
},
saveUser: {
@ -126,10 +132,10 @@ export class VehicleComponentsAuditComponent implements OnInit {
title: '录入人员',
ui: {
visibleIf: {
expand: (value: boolean) => value,
},
},
},
expand: (value: boolean) => value
}
}
}
// approvalStatus: {
// type: 'string',
// title: '审核状态',
@ -149,7 +155,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
// },
// },
// },
},
}
};
this.ui = { '*': { spanLabelFixed: 90, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
}
@ -162,7 +168,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
{ title: '车型-车长-载重', width: '180px', className: 'text-center', render: 'carLength' },
{ title: '是否挂靠', width: '180px', className: 'text-center', render: 'isSelf' },
{ title: '所有人', width: '180px', className: 'text-center', index: 'carOwner' },
{ title: '录入人员', width: '180px', className: 'text-center', index: 'saveUser', },
{ title: '录入人员', width: '180px', className: 'text-center', index: 'saveUser' },
{
title: '审核状态',
className: 'text-center',
@ -176,8 +182,8 @@ export class VehicleComponentsAuditComponent implements OnInit {
10: { text: '待审核', color: 'warning' },
20: { text: '已审核', color: 'success' },
30: { text: '已驳回', color: 'error' },
40: { text: '证件过期', color: 'error' },
},
40: { text: '证件过期', color: 'error' }
}
},
{ title: '申请时间', width: '180px', className: 'text-center', index: 'createTime' },
{
@ -189,13 +195,13 @@ export class VehicleComponentsAuditComponent implements OnInit {
{
text: '查看',
acl: { ability: ['VEHICLE-AUDIT-view'] },
click: (item) => {
click: item => {
this.router.navigate(['./detail', item.id], { relativeTo: this.ar, queryParams: { carId: item.carId } });
// this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
},
},
],
},
}
}
]
}
];
}
selectChange(e: number) {
@ -213,7 +219,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
this.sf?.setValue('/expand', this._$expand);
}
creat() {
this.router.navigate(['./new',], { relativeTo: this.ar });
this.router.navigate(['./new'], { relativeTo: this.ar });
}
/**
* 重置表单
@ -224,19 +230,16 @@ export class VehicleComponentsAuditComponent implements OnInit {
}
// 导出
exportFire() {
this.service.request(this.service.$api_carLicenseAudit_export, this.reqParams).subscribe((res: any) => {
if(res) {
this.service.msgSrv.success('导出成功,请去右上角下载中心下载')
return
}
});
let params = Object.assign({}, this.reqParams || {});
params.pageSize = -1;
this.service.exportStart(params, this.service.$api_carLicenseAudit_export);
}
addModal() {
const i = {
appUserId: '',
}
this.modalHelper.create(CarSettleCarauthComponent, { i }, { size: 900 }).subscribe((res) => {
this.st.load()
appUserId: ''
};
this.modalHelper.create(CarSettleCarauthComponent, { i }, { size: 900 }).subscribe(res => {
this.st.load();
});
}
}

15
src/app/routes/vehicle/components/list/list.component.ts
View File

@ -19,7 +19,7 @@ export class VehicleComponentsListComponent implements OnInit {
@ViewChild('st', { static: false }) st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) { }
constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}
/**
* 查询参数
@ -199,7 +199,7 @@ export class VehicleComponentsListComponent implements OnInit {
expand: (value: boolean) => value
}
}
},
}
// putOnRecord: {
// type: 'string',
// title: '是否已备案',
@ -278,7 +278,7 @@ export class VehicleComponentsListComponent implements OnInit {
text: '查看',
acl: { ability: ['VEHICLE-LIST-view'] },
click: item => {
this.router.navigate(['/vehicle/list/detail/' + item.id] );
this.router.navigate(['/vehicle/list/detail/' + item.id]);
// this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
}
}
@ -308,11 +308,8 @@ export class VehicleComponentsListComponent implements OnInit {
}
// 导出
exportFire() {
this.service.request(this.service.$api_carLicense_export, this.reqParams).subscribe((res: any) => {
if(res) {
this.service.msgSrv.success('导出成功,请去右上角下载中心下载')
return
}
});
let params = Object.assign({}, this.reqParams || {});
params.pageSize = -1;
this.service.exportStart(params, this.service.$api_carLicense_export);
}
}

2
src/app/routes/waybill-management/components/bulk/bulk.component.ts
View File

@ -480,6 +480,6 @@ export class WaybillManagementBulkComponent implements OnInit {
}
// 导出
exprot() {
this.service.asyncExport(this.reqParams,this.service.$api_asyncExportBulkList)
this.service.exportStart(this.reqParams,this.service.$api_asyncExportBulkList)
}
}

2
src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
View File

@ -489,6 +489,6 @@ export class WaybillManagementVehicleComponent implements OnInit {
}
// 导出
exprot() {
this.service.asyncExport(this.reqParams, this.service.$api_asyncExportWholeList);
this.service.exportStart(this.reqParams, this.service.$api_asyncExportWholeList);
}
}