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-04-08 16:34:43 +08:00
parent a92677a5b9 1a397b28f3
commit 29da0409e9
25 changed files with 105 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,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.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_export_shipper);
}
private initSF(): SFSchema {

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

@ -285,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/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-logs/etc-invoiced-logs.component.html
View File

@ -13,7 +13,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>

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

@ -62,6 +62,16 @@ export class ETCInvoicedLogsComponent implements OnInit {
this.sf?.setValue('/expand', this._$expand);
}
exportList() {
const params = { listSource: 1, pageSize: -1 };
if (this.sf) {
Object.assign(params, {
...this.sf.value
});
}
this.service.downloadFile(this.service.$api_export_invoice_logs_page, params);
}
private initSF(): SFSchema {
return {
properties: {

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

@ -113,7 +113,7 @@ export class ETCInvoicedRequestedComponent implements OnInit {
title: '订单类型',
ui: {
widget: 'dict-select',
params: { dictKey: 'refund:apply:status' },
params: { dictKey: 'bill:type' },
placeholder: '请选择'
}
},
@ -211,20 +211,20 @@ 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' }
];
}
}

2
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>

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

@ -107,6 +107,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: {

2
src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html
View File

@ -30,7 +30,7 @@
</ng-template>
</st>
<div class="modal-footer text-center">
<button nz-button type="button">移除</button>
<button nz-button type="button"(click)="removeOrder(selectedRows)">移除</button>
<button nz-button type="button" (click)="saveManage()">手工处理</button>
<!-- <button nz-button type="submit" nzType="primary" [nzLoading]="service.http.loading" (click)="saveManage()">自动开票</button> -->
</div>

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

@ -39,11 +39,11 @@ export class RequestedInvoiceModalComponent {
removeOrder(item: any[]) {
console.log(item);
this.nzModalService.warning({
nzTitle: '确定从当前批次中移除所有订单？',
nzTitle: '确定从当前批次中移除所选订单？',
nzContent: '移除后相关订单可以重新提交开票申请',
nzOnOk: () => {
const ids = this.selectedRows.map(order => order.billHId);
this.service.request(this.service.$api_remove_bill, ids).subscribe(res => {
const ids = item.map(order => order.billHId);
this.service.request(this.service.$api_remove_bill, { billHIds: ids }).subscribe(res => {
if (res) {
this.service.msgSrv.success('移除成功');
this.modal.destroy(true);

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

@ -69,7 +69,7 @@ export class InvoicedListComponent implements OnInit {
nzTitle: '确定将所选发票作废？',
nzCancelText: '取消',
nzOnOk: () => {
this.service.request(this.service.$api_cancel_invoice, { id: item.id }).subscribe(res => {
this.service.request(this.service.$api_delete_invoice, { id: item.id }).subscribe(res => {
if (res) {
this.service.msgSrv.success('发票作废成功');
}
@ -81,6 +81,27 @@ export class InvoicedListComponent implements OnInit {
});
}
canceInvoice(item: any) {
// if (this.selectedRows?.length <= 0) {
// this.service.msgSrv.warning('请选择发票');
// return;
// }
const modal = this.nzModalService.warning({
nzTitle: '确定取消所选发票？',
nzCancelText: '取消',
nzOnOk: () => {
this.service.request(this.service.$api_cancel_invoice, { id: item.id }).subscribe(res => {
if (res) {
this.service.msgSrv.success('取消发票成功');
}
modal.destroy();
this.st.load(1);
});
return false;
}
});
}
/**
* 填写物流/修改物流
* @param item
@ -314,10 +335,15 @@ export class InvoicedListComponent implements OnInit {
queryParams: { expressno: item.expressno, type: 2, ltdId: item.shipperId }
})
},
{
text: '取消开票<br>',
click: item => this.canceInvoice(item),
iif: item => item.sts === '1'
},
{
text: '发票作废<br>',
click: item => this.deletedInvoice(item),
iif: item => item.sts === '1'
iif: item => item.sts === '3'
},
{
text: '查看物流<br>',

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

@ -22,7 +22,8 @@ export class TicketService extends ShipperBaseService {
// 货主/运营端获取开票申请订单明细
$api_get_invoice_requested_order_detail = '/api/fcc/ficoVatappBill/getDetailByVatapp';
// 删除开票申请订单明细
$api_remove_bill = '/api/fcc/ficoVatappBill/deletebatch';
// $api_remove_bill = '/api/fcc/ficoVatappBill/deletebatch';
$api_remove_bill = '/api/fcc/ficoVatappH/remove';
// 运营端单个/批量驳回
$api_reject_invoice = '/api/fcc/ficoVatappH/rejectInvoiceApple';
// 运营端修改开票地址
@ -65,11 +66,15 @@ export class TicketService extends ShipperBaseService {
$api_update_Express = '/api/fcc/ficoVatinvH/updateExpress';
// 发票作废
$api_cancel_invoice = '/api/fcc/ficoVatinvH/inpinvHCancel';
$api_delete_invoice = '/api/fcc/ficoVatinvH/inpinvHCancel';
// 发票取消
$api_cancel_invoice = '/api/fcc/ficoVatinvH/cancel';
// 获取销项发票抬头
$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';
// 获取分票发票明细
@ -108,6 +113,8 @@ export class TicketService extends ShipperBaseService {
$api_get_invoice_record_page = '/api/sdc/invoiceEtcOperate/list/listEtcRecordPageList';
// 查询ETC发票明细表
$api_get_invoice_logs_page = '/api/fcc/ficoEtcInvoiceL/list/page';
// 导出ETC发票明细表
$api_export_invoice_logs_page = '/api/fcc/ficoEtcInvoiceL/asyncExport';
// 进项发票查询
$api_get_input_invoice_page = '/api/fcc/ficoInpinvH/getListPage';

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);
}
}