Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop
This commit is contained in:
wangshiming
@ -552,6 +552,11 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements
|
||||
click: _record => this.changeOrder(_record),
|
||||
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
|
||||
acl: { ability: ['ORDER-BULK-BulkBillDetail'] }
|
||||
},{
|
||||
text: '订单上报推送',
|
||||
click: _record => this.orderReportPush(_record),
|
||||
iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5')
|
||||
// acl: { ability: ['VEHICLE-LIST-view'] },
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -659,6 +664,15 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements
|
||||
this.changeId = item.id;
|
||||
this.isVisible = true;
|
||||
}
|
||||
|
||||
orderReportPush(item: any) {
|
||||
this.service.request(this.service.$api_manualOrderSubmission,{id: item.id}).subscribe( res=> {
|
||||
if(res) {
|
||||
this.st.reload(this.st.pi)
|
||||
this.service.msgSrv.success('推送成功');
|
||||
}
|
||||
})
|
||||
}
|
||||
/**
|
||||
* 浮动费用查看
|
||||
*/
|
||||
|
||||
@ -50,7 +50,7 @@
|
||||
<st #st [bordered]="true" multiSort [scroll]="{ x:'1200px',y:scrollY }" [data]="service.$api_get_listWholePage"
|
||||
[columns]="columns" [req]="{ process: beforeReq }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}"
|
||||
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }">
|
||||
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="service.http.loading">
|
||||
<ng-template st-row="billCode" let-item let-index="index">
|
||||
<a [routerLink]="'vehicle-detail/' + item.id">{{ item.billCode }}</a>
|
||||
<div>
|
||||
|
||||
@ -469,6 +469,12 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
|
||||
click: _record => this.viewTrack(_record),
|
||||
iif: item => item.billStatus !== '1' && item.billStatus !== '6'
|
||||
// acl: { ability: ['VEHICLE-LIST-view'] },
|
||||
},
|
||||
{
|
||||
text: '订单上报推送',
|
||||
click: _record => this.orderReportPush(_record),
|
||||
iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5')
|
||||
// acl: { ability: ['VEHICLE-LIST-view'] },
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -738,6 +744,16 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
|
||||
});
|
||||
}
|
||||
|
||||
// 订单上报推送
|
||||
orderReportPush(item: any) {
|
||||
this.service.request(this.service.$api_manualOrderSubmission,{id: item.id}).subscribe( res=> {
|
||||
if(res) {
|
||||
this.st.reload(this.st.pi)
|
||||
this.service.msgSrv.success('推送成功');
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// *确认签收
|
||||
|
||||
confirmReceipt(item: any) {
|
||||
|
||||
@ -219,6 +219,8 @@ export class OrderManagementService extends ShipperBaseService {
|
||||
public $api_getBillTakeGoods = `/api/sdc/billOperate/getBillTakeGoods`;
|
||||
// 生成提/卸货单
|
||||
public $api_createBillEsignGoods = `/api/sdc/billOperate/createBillEsignGoods`;
|
||||
// 订单上报推送
|
||||
$api_manualOrderSubmission = '/api/sdc/billOperate/manualOrderSubmission';
|
||||
|
||||
// // 生成卸货单
|
||||
// public $api_createBillDischargeGoods = `/api/sdc/billOperate/createBillDischargeGoods`;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<div *ngIf="i">
|
||||
<page-header-wrapper [title]="'大宗货源详情'" [logo]="logo" [content]="headerContent">
|
||||
<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>
|
||||
@ -13,12 +13,12 @@
|
||||
<div nz-row>
|
||||
<div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.shipperAppUserName }}</div>
|
||||
<div nz-col nzSpan="10">
|
||||
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
|
||||
[acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
|
||||
<button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl
|
||||
[acl-ability]="['SUPPLY-BULK-DETAIL-updatePrice']">修改单价</button>
|
||||
<button nz-button nzType="primary" nzGhost (click)="placeOrder(i)" acl
|
||||
[acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
|
||||
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
|
||||
[acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
|
||||
<button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl
|
||||
[acl-ability]="['SUPPLY-BULK-DETAIL-updatePrice']">修改单价</button>
|
||||
<button nz-button nzType="primary" nzGhost (click)="placeOrder(i)" acl
|
||||
[acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mt-sm mb-sm" nz-row>
|
||||
@ -27,7 +27,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<nz-divider></nz-divider>
|
||||
<div sv-container *ngIf="i">
|
||||
<div sv-container>
|
||||
<sv label="项目">{{ i?.enterpriseProjectName }}</sv>
|
||||
<sv label="截止时间">{{ i?.deadlineTime }}</sv>
|
||||
<sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>
|
||||
@ -36,7 +36,35 @@
|
||||
</div>
|
||||
</ng-template>
|
||||
</page-header-wrapper>
|
||||
<nz-card nzTitle="货源进度">
|
||||
<nz-card [nzBorderless]="true" class="mb0">
|
||||
<div class="mb-xs" nz-row>
|
||||
<button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button>
|
||||
<h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4>
|
||||
</div>
|
||||
<div nz-row>
|
||||
<div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.shipperAppUserName }}</div>
|
||||
<div nz-col nzSpan="10">
|
||||
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
|
||||
[acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
|
||||
<button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl
|
||||
[acl-ability]="['SUPPLY-BULK-DETAIL-updatePrice']">修改单价</button>
|
||||
<button nz-button nzType="primary" nzGhost (click)="placeOrder(i)" acl
|
||||
[acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mt-sm mb-sm" nz-row>
|
||||
<div>
|
||||
<b>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '¥' }}</span></b>
|
||||
</div>
|
||||
</div>
|
||||
<nz-divider></nz-divider>
|
||||
<div sv-container>
|
||||
<sv label="项目">{{ i?.enterpriseProjectName }}</sv>
|
||||
<sv label="截止时间">{{ i?.deadlineTime }}</sv>
|
||||
<sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>
|
||||
<sv label="调度员">{{ i?.dispatchName }}/{{ i?.dispatchPhone }} </sv>
|
||||
<sv label="服务类型">{{ i?.serviceTypeLabel }} </sv>
|
||||
</div>
|
||||
<div class="approval-status">
|
||||
<div style="width: 60%; margin: 0 auto">
|
||||
<nz-steps style="width: 70%; margin: 0 auto" [nzLabelPlacement]="'vertical'">
|
||||
@ -51,33 +79,6 @@
|
||||
</nz-steps>
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
<nz-card nzTitle="基本信息">
|
||||
<sv-container col="3">
|
||||
<sv-title>货物信息</sv-title>
|
||||
<ng-container *ngFor="let item of i?.goodsInfoVOList">
|
||||
<sv label="货物名称">
|
||||
{{item.goodsTypeName}} > {{item.goodsName}}
|
||||
</sv>
|
||||
<sv label="货物数量">
|
||||
{{item.weight}}吨 / {{item.volume>=0?item.volume:'-'}}方
|
||||
</sv>
|
||||
<sv label="剩余">
|
||||
{{i?.surplusWeight!==null?i?.surplusWeight:'--'}}吨 / {{i?.surplusVolume!==null?i?.surplusVolume:'-'}}方
|
||||
</sv>
|
||||
<sv label="用车需求">
|
||||
{{item.carModelLabel || '--'}} / {{item.carLengthLabel || '--'}}<span *ngIf="item.carLength !=='999'">米</span>
|
||||
</sv>
|
||||
<!-- <sv label="承运信息">
|
||||
{{i?.carrierInformationVO?.driverName}} / {{i?.carrierInformationVO?.driverTelephone}} /
|
||||
{{i?.carrierInformationVO?.driverLicensePlate}}
|
||||
</sv> -->
|
||||
<!-- <sv label="当前指派">
|
||||
<a (click)="viewCurrentAssign(i)">查看</a>
|
||||
</sv> -->
|
||||
</ng-container>
|
||||
</sv-container>
|
||||
<div class="mt-md">
|
||||
<h4 class="text-md">装货卸货信息
|
||||
<span class="ml-sm text-sm">(
|
||||
@ -119,7 +120,39 @@
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
<nz-card nzTitle="运费信息">
|
||||
<nz-card [nzBorderless]="true" class="mb0">
|
||||
<div class="font-weight-blod text-md detail-title">
|
||||
<a class="sign mr-xs"></a>
|
||||
<span>基本信息</span>
|
||||
</div>
|
||||
<sv-container col="3">
|
||||
<!-- <sv-title>货物信息</sv-title> -->
|
||||
<ng-container *ngFor="let item of i?.goodsInfoVOList">
|
||||
<sv label="货物名称">
|
||||
{{item.goodsTypeName}} > {{item.goodsName}}
|
||||
</sv>
|
||||
<sv label="货物数量">
|
||||
{{item.weight}}吨 / {{item.volume>=0?item.volume:'-'}}方
|
||||
</sv>
|
||||
<sv label="剩余">
|
||||
{{i?.surplusWeight!==null?i?.surplusWeight:'--'}}吨 / {{i?.surplusVolume!==null?i?.surplusVolume:'-'}}方
|
||||
</sv>
|
||||
<sv label="用车需求">
|
||||
{{item.carModelLabel || '--'}} / {{item.carLengthLabel || '--'}}<span *ngIf="item.carLength !=='999'">米</span>
|
||||
</sv>
|
||||
<!-- <sv label="承运信息">
|
||||
{{i?.carrierInformationVO?.driverName}} / {{i?.carrierInformationVO?.driverTelephone}} /
|
||||
{{i?.carrierInformationVO?.driverLicensePlate}}
|
||||
</sv> -->
|
||||
<!-- <sv label="当前指派">
|
||||
<a (click)="viewCurrentAssign(i)">查看</a>
|
||||
</sv> -->
|
||||
</ng-container>
|
||||
</sv-container>
|
||||
|
||||
</nz-card>
|
||||
|
||||
<nz-card [nzBorderless]="true" class="mb0" nzTitle="运费信息">
|
||||
<div>
|
||||
<div nz-row>
|
||||
<div *ngFor="let item of i?.goodsInfoVOList" nz-col nzSpan="24">
|
||||
@ -132,13 +165,13 @@
|
||||
<label>运费单价：</label>
|
||||
<span class="text-error-dark text-xxl">{{ item?.freightPrice | currency: '￥' }} {{
|
||||
freightType[item?.freightType] }}</span>
|
||||
<span>（附加费率{{i?.rate * 100 | number: '0.2-2'}}%）</span>
|
||||
<span>（附加费率{{i?.rate * 100 | number: '0.2-2'}}%）</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
<nz-card nzTitle="关联订单">
|
||||
<nz-card [nzBorderless]="true" class="mb0" nzTitle="关联订单">
|
||||
<sv-container col="5">
|
||||
<sv [label]="item?.wayBillStatusLabel" *ngFor="let item of i?.wayBillClassifiedStatisticsVOList">
|
||||
(<span [ngClass]="{ 'text-primary': item?.count > 0 }">{{ item?.count }}</span>)
|
||||
@ -157,7 +190,7 @@
|
||||
</sv> -->
|
||||
</sv-container>
|
||||
</nz-card>
|
||||
<nz-card nzTitle="补充信息">
|
||||
<nz-card [nzBorderless]="true" class="mb0" nzTitle="补充信息">
|
||||
<sv-container>
|
||||
<sv label="是否回单">
|
||||
{{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
|
||||
@ -166,7 +199,8 @@
|
||||
{{ i?.supplementaryInformationVO?.receiptTypeLabel }}
|
||||
</sv>
|
||||
<sv label="联系人" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
|
||||
{{ i?.supplementaryInformationVO?.receiptUserName ? i?.supplementaryInformationVO?.receiptUserName + '/' : '' }} {{ i?.supplementaryInformationVO?.phon }}
|
||||
{{ i?.supplementaryInformationVO?.receiptUserName ? i?.supplementaryInformationVO?.receiptUserName + '/' : '' }}
|
||||
{{ i?.supplementaryInformationVO?.phon }}
|
||||
</sv>
|
||||
<sv label="所在地区" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
|
||||
{{ i?.supplementaryInformationVO?.area }}
|
||||
@ -174,14 +208,13 @@
|
||||
<sv label="详细地址" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
|
||||
{{ i?.supplementaryInformationVO?.address }}
|
||||
</sv>
|
||||
<sv label="备注" >
|
||||
<sv label="备注">
|
||||
{{ i?.supplementaryInformationVO?.remarks }}
|
||||
</sv>
|
||||
</sv-container>
|
||||
</nz-card>
|
||||
<nz-card nzTitle="操作日志">
|
||||
<st #st [data]="service.$api_getOperationLogRecordsList" [columns]="logColumns"
|
||||
[page]="{}"
|
||||
<nz-card [nzBorderless]="true" class="mb0" nzTitle="操作日志">
|
||||
<st #st [data]="service.$api_getOperationLogRecordsList" [columns]="logColumns" [page]="{}"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }">
|
||||
</st>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
min-height: 210px;
|
||||
|
||||
p {
|
||||
margin-bottom: .5em;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,11 +1,46 @@
|
||||
<div *ngIf="i">
|
||||
<page-header-wrapper [title]="'整车货源详情'" [logo]="logo" [content]="headerContent">
|
||||
<ng-template #logo>
|
||||
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
|
||||
<i nz-icon nzType="left" nzTheme="outline"></i>
|
||||
</button>
|
||||
</ng-template>
|
||||
<ng-template #headerContent>
|
||||
<nz-spin [nzSpinning]="service.http.loading">
|
||||
<div *ngIf="i">
|
||||
<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>
|
||||
</button>
|
||||
</ng-template>
|
||||
<ng-template #headerContent>
|
||||
<div class="mb-xs" nz-row>
|
||||
<button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button>
|
||||
<h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4>
|
||||
</div>
|
||||
<div nz-row>
|
||||
<div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.enterpriseInfoName }}</div>
|
||||
<div nz-col nzSpan="10">
|
||||
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
|
||||
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-cancelSupply']">取消货源</button>
|
||||
<button nz-button (click)="assignedCar(i)" *ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'" acl
|
||||
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehicleAnew']">重新指派</button>
|
||||
<button nz-button (click)="updateGoodsSource(i)"
|
||||
*ngIf="i?.resourceStatus === '1' && i.insurancePayment !== 'Y'" acl
|
||||
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']">修改货源</button>
|
||||
<button nz-button nzType="primary" nzGhost (click)="nextOrder(i)" acl
|
||||
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder']">再下一单</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mt-sm mb-sm" nz-row>
|
||||
<div>
|
||||
<b>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency }}</span></b>
|
||||
</div>
|
||||
</div>
|
||||
<nz-divider></nz-divider>
|
||||
<div sv-container *ngIf="i">
|
||||
<sv label="外部货源号">{{ i?.externalResourceCode }} </sv>
|
||||
<sv label="项目">{{ i?.enterpriseProjectName }}</sv>
|
||||
<sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>
|
||||
<sv label="调度员">{{ i?.dispatchName }}/{{ i?.dispatchPhone }} </sv>
|
||||
<sv label="服务类型">{{ i?.serviceTypeLabel }} </sv>
|
||||
</div>
|
||||
</ng-template>
|
||||
</page-header-wrapper>
|
||||
<nz-card [nzBorderless]="true" class="mb0">
|
||||
<div class="mb-xs" nz-row>
|
||||
<button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button>
|
||||
<h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4>
|
||||
@ -13,218 +48,214 @@
|
||||
<div nz-row>
|
||||
<div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.enterpriseInfoName }}</div>
|
||||
<div nz-col nzSpan="10">
|
||||
<button
|
||||
nz-button
|
||||
(click)="cancleGoodsSource()"
|
||||
*ngIf="i?.resourceStatus === '1'"
|
||||
acl
|
||||
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-cancelSupply']"
|
||||
>取消货源</button
|
||||
>
|
||||
<button
|
||||
nz-button
|
||||
(click)="assignedCar(i)"
|
||||
*ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'"
|
||||
acl
|
||||
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehicleAnew']"
|
||||
>重新指派</button
|
||||
>
|
||||
<button
|
||||
nz-button
|
||||
(click)="updateGoodsSource(i)"
|
||||
*ngIf="i?.resourceStatus === '1' && i.insurancePayment !== 'Y'"
|
||||
acl
|
||||
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']"
|
||||
>修改货源</button
|
||||
>
|
||||
<button nz-button nzType="primary" nzGhost (click)="nextOrder(i)" acl [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder']"
|
||||
>再下一单</button
|
||||
>
|
||||
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
|
||||
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-cancelSupply']">取消货源</button>
|
||||
<button nz-button (click)="assignedCar(i)" *ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'" acl
|
||||
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehicleAnew']">重新指派</button>
|
||||
<button nz-button (click)="updateGoodsSource(i)"
|
||||
*ngIf="i?.resourceStatus === '1' && i.insurancePayment !== 'Y'" acl
|
||||
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']">修改货源</button>
|
||||
<button nz-button nzType="primary" nzGhost (click)="nextOrder(i)" acl
|
||||
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder']">再下一单</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mt-sm mb-sm" nz-row>
|
||||
<!-- <div class="mt0 mb0" nz-row>
|
||||
<div>
|
||||
<b
|
||||
>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '￥' }}</span></b
|
||||
>
|
||||
<b>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency }}</span></b>
|
||||
</div>
|
||||
</div>
|
||||
<nz-divider></nz-divider>
|
||||
<div sv-container *ngIf="i">
|
||||
</div> -->
|
||||
<nz-divider class="divider-margin"></nz-divider>
|
||||
<div class="mb-lg" sv-container *ngIf="i">
|
||||
<sv label="外部货源号">{{ i?.externalResourceCode }} </sv>
|
||||
<sv label="项目">{{ i?.enterpriseProjectName }}</sv>
|
||||
<sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>
|
||||
<sv label="调度员">{{ i?.dispatchName }}/{{ i?.dispatchPhone }} </sv>
|
||||
<sv label="服务类型">{{ i?.serviceTypeLabel }} </sv>
|
||||
</div>
|
||||
</ng-template>
|
||||
</page-header-wrapper>
|
||||
<nz-card title="货源进度">
|
||||
<div class="approval-status">
|
||||
<div style="width: 60%; margin: 0 auto">
|
||||
<nz-steps [nzLabelPlacement]="'vertical'">
|
||||
<nz-step
|
||||
[nzStatus]="i?.resourceStatus !== '1' ? 'finish' : 'process'"
|
||||
nzIcon="solution"
|
||||
[nzDescription]="i?.createAt"
|
||||
nzTitle="下单"
|
||||
[nzSubtitle]="i?.createTime"
|
||||
></nz-step>
|
||||
<nz-step
|
||||
*ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2'"
|
||||
[nzStatus]="i?.resourceStatus === '1' ? 'wait' : 'finish'"
|
||||
nzIcon="file-done"
|
||||
[nzTitle]="'接单'"
|
||||
[nzSubtitle]="i?.orderReceivingTime"
|
||||
></nz-step>
|
||||
<nz-step
|
||||
nzStatus="finish"
|
||||
nzIcon="close-circle"
|
||||
nzTitle="取消货源"
|
||||
*ngIf="i?.resourceStatus === '3'"
|
||||
[nzSubtitle]="i?.endTime"
|
||||
></nz-step>
|
||||
</nz-steps>
|
||||
<div class="approval-status">
|
||||
<div lass="step-row">
|
||||
<nz-steps [nzLabelPlacement]="'vertical'">
|
||||
<nz-step [nzStatus]="i?.resourceStatus !== '1' ? 'finish' : 'process'" nzIcon="solution"
|
||||
[nzDescription]="i?.createAt" nzTitle="下单" [nzSubtitle]="i?.createTime"></nz-step>
|
||||
<nz-step *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2'"
|
||||
[nzStatus]="i?.resourceStatus === '1' ? 'wait' : 'finish'" nzIcon="file-done" [nzTitle]="'接单'"
|
||||
[nzSubtitle]="i?.orderReceivingTime"></nz-step>
|
||||
<nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"
|
||||
[nzSubtitle]="i?.endTime"></nz-step>
|
||||
</nz-steps>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
</nz-card>
|
||||
|
||||
<nz-card nzTitle="基本信息">
|
||||
<sv-container col="2">
|
||||
<sv-title>货物信息</sv-title>
|
||||
<ng-container *ngFor="let item of i?.goodsInfoVOList">
|
||||
<sv label="货物名称">
|
||||
{{ item.goodsTypeName }} - {{ item.goodsName }}
|
||||
<nz-card [nzBorderless]="true" class="mb0">
|
||||
<div class="font-weight-blod text-md detail-title">
|
||||
<a class="sign mr-xs"></a>
|
||||
<span>基本信息</span>
|
||||
</div>
|
||||
<sv-container col="2">
|
||||
<!-- <sv-title>货物信息</sv-title> -->
|
||||
<ng-container *ngFor="let item of i?.goodsInfoVOList">
|
||||
<sv label="货物名称">
|
||||
{{ item.goodsTypeName }} - {{ item.goodsName }}
|
||||
</sv>
|
||||
<sv label="货物数量"> {{ item.weight }}吨,{{ item.volume }}方,{{ item.number }}件 </sv>
|
||||
</ng-container>
|
||||
</sv-container>
|
||||
<sv-container class="mt-md">
|
||||
<!-- <sv-title>承运信息</sv-title> -->
|
||||
<sv label="司机姓名">
|
||||
{{ i?.carrierInformationVO?.driverName }}
|
||||
</sv>
|
||||
<sv label="货物数量"> {{ item.weight }}吨,{{ item.volume }}方,{{ item.number }}件 </sv>
|
||||
</ng-container>
|
||||
</sv-container>
|
||||
<sv-container class="mt-md">
|
||||
<sv-title>承运信息</sv-title>
|
||||
<sv label="司机姓名">
|
||||
{{ i?.carrierInformationVO?.driverName }}
|
||||
<sv label="手机号">
|
||||
{{ i?.carrierInformationVO?.driverTelephone }}
|
||||
</sv>
|
||||
<sv label="车牌号">
|
||||
{{ i?.carrierInformationVO?.driverLicensePlate }}
|
||||
</sv>
|
||||
</sv-container>
|
||||
<sv label="承运司机" *ngIf="i?.carrierInformationVO.driverTelephone !== i?.payeePhone">
|
||||
{{i?.carrierInformationVO.driverName || '--'}} / {{i?.carrierInformationVO.driverTelephone || '--'}} /
|
||||
{{i?.carrierInformationVO.driverLicensePlate || '--'}}
|
||||
</sv>
|
||||
<sv label="手机号">
|
||||
{{ i?.carrierInformationVO?.driverTelephone }}
|
||||
<sv label="车型车长载重">
|
||||
{{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight ||
|
||||
'--')+'吨'}}
|
||||
</sv>
|
||||
<sv label="车牌号">
|
||||
{{ i?.carrierInformationVO?.driverLicensePlate }}
|
||||
</sv>
|
||||
</sv-container>
|
||||
<div class="mt-md">
|
||||
<h4 class="text-md"
|
||||
>装货卸货信息
|
||||
<span class="ml-sm text-sm"
|
||||
>(
|
||||
<label>{{ i?.loadingCount }}装</label>
|
||||
<label>{{ i?.unloadingCount }}卸</label>
|
||||
)
|
||||
</span>
|
||||
</h4>
|
||||
<div nz-row [nzGutter]="24">
|
||||
<div nz-col [nzSpan]="12">
|
||||
<div class="handling-info p-md">
|
||||
<div class="flex" *ngFor="let item of i?.unLoadingPlaceVOList">
|
||||
<div *ngIf="item?.type === '1'" class="loading-row">
|
||||
<div class="handling-info-icon loading-bg">装</div>
|
||||
<div class="info">
|
||||
<h4>装货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}</h4>
|
||||
<p>联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<p class="time-info">装货时间：{{ i?.loadingTime }}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="12">
|
||||
<div class="handling-info p-md">
|
||||
<div class="flex" *ngFor="let item of i?.unLoadingPlaceVOList">
|
||||
<div *ngIf="item?.type === '2'" class="loading-row">
|
||||
<div class="handling-info-icon unloaing-bg">卸</div>
|
||||
<div class="info">
|
||||
<h4>卸货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}</h4>
|
||||
<p>联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<p class="time-info">卸货时间：{{ i?.unloadingTime }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
<nz-card nzTitle="服务信息">
|
||||
<sv-container>
|
||||
<sv label="服务包">
|
||||
{{ i?.insuranceTypeLabel}}
|
||||
</sv>
|
||||
<sv label="货物价值" *ngIf="i?.insuranceType !== '3'">
|
||||
{{i?.goodsValue !==null?(i?.goodsValue|currency)+'元':'-'}}
|
||||
</sv>
|
||||
<sv label="服务包费用" *ngIf="i?.insuranceType !== '3'">
|
||||
{{i?.insurancePremium!==null?(i?.insurancePremium |currency)+'元':'-'}}
|
||||
</sv>
|
||||
</sv-container>
|
||||
</nz-card>
|
||||
<nz-card [nzTitle]="'运费信息（到货后' + i?.paymentDays + '天内支付运费）'">
|
||||
<st [data]="i?.expenseVOList" [columns]="expenseColumns" [page]="{ show: false }">
|
||||
<ng-template st-row="total" let-item>
|
||||
<div>
|
||||
{{ item?.totalAmount | currency }}
|
||||
<span>(含附加费）</span>
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template st-row="price" let-item>
|
||||
<div>
|
||||
{{ item?.price | currency }}
|
||||
</div>
|
||||
</ng-template>
|
||||
</st>
|
||||
<div class="freight-info-box mt-md" nz-row>
|
||||
<div nz-col nzSpan="24">
|
||||
<h3>
|
||||
<label>总计 :</label>
|
||||
<span class="text-error-dark text-xl">
|
||||
{{ i?.totalAmount | currency }}
|
||||
<div class="mt-md">
|
||||
<h4 class="text-md">装货卸货信息
|
||||
<span class="ml-sm text-sm">(
|
||||
<label>{{ i?.loadingCount }}装</label>
|
||||
<label>{{ i?.unloadingCount }}卸</label>
|
||||
)
|
||||
</span>
|
||||
<span>（运费{{ i?.totalFreight | currency }}含附加运费 {{ i?.totalSurcharge | currency }}）</span>
|
||||
</h3>
|
||||
<div *ngIf='i?.resourceStatus !== "1" && i?.carrierInformationVO?.driverName !== i?.payeeName' >车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}</div>
|
||||
</h4>
|
||||
<div nz-row [nzGutter]="24">
|
||||
<div nz-col [nzSpan]="12">
|
||||
<div class="handling-info p-md">
|
||||
<ng-container *ngFor="let item of i?.unLoadingPlaceVOList">
|
||||
<div class="flex" *ngIf="item?.type === '1'">
|
||||
<div class="loading-row">
|
||||
<div class="handling-info-icon loading-bg">装</div>
|
||||
<div class="info">
|
||||
<h4>装货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}</h4>
|
||||
<p>联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ng-container>
|
||||
<p class="time-info">装货时间：{{ i?.loadingTime }}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="12">
|
||||
<div class="handling-info p-md">
|
||||
<ng-container *ngFor="let item of i?.unLoadingPlaceVOList">
|
||||
<div class="flex" *ngIf="item?.type === '2'">
|
||||
<div class="loading-row">
|
||||
<div class="handling-info-icon unloaing-bg">卸</div>
|
||||
<div class="info">
|
||||
<h4>卸货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}</h4>
|
||||
<p>联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ng-container>
|
||||
<p class="time-info">卸货时间：{{ i?.unloadingTime }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
<nz-card nzTitle="补充信息">
|
||||
<sv-container>
|
||||
<sv label="是否回单">
|
||||
{{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
|
||||
</sv>
|
||||
<sv label="回单类型" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
|
||||
{{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
|
||||
</sv>
|
||||
<sv label="联系人" *ngIf="i?.supplementaryInformationVO?.stateReceipt"> {{ i?.supplementaryInformationVO?.receiptUserName || '-' }} / {{ i?.supplementaryInformationVO?.phon || '-' }}
|
||||
</sv>
|
||||
<sv label="所在地区" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
|
||||
{{ i?.supplementaryInformationVO?.area }}
|
||||
</sv>
|
||||
<sv label="详细地址" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
|
||||
{{ i?.supplementaryInformationVO?.address }}
|
||||
</sv>
|
||||
<sv label="备注">
|
||||
{{ i?.supplementaryInformationVO?.remarks }}
|
||||
</sv>
|
||||
</sv-container>
|
||||
</nz-card>
|
||||
<nz-card nzTitle="操作日志">
|
||||
<st #st [data]="service.$api_getOperationLogRecordsList" [columns]="logColumns"
|
||||
[page]="{}"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }">
|
||||
<ng-template st-row="operator" let-item>
|
||||
<div>
|
||||
{{ item?.operator }} {{ item?.telephone ? '/' + item?.telephone : '' }}
|
||||
</nz-card>
|
||||
|
||||
<nz-card [nzBorderless]="true" class="mb0">
|
||||
<div class="font-weight-blod text-md detail-title">
|
||||
<a class="sign"></a>
|
||||
<span>服务信息</span>
|
||||
</div>
|
||||
</ng-template>
|
||||
</st>
|
||||
</nz-card>
|
||||
</div>
|
||||
<sv-container>
|
||||
<sv label="服务包">
|
||||
{{ i?.insuranceTypeLabel}}
|
||||
</sv>
|
||||
<sv label="货物价值" *ngIf="i?.insuranceType !== '3'">
|
||||
{{i?.goodsValue !==null?(i?.goodsValue|currency)+'元':'-'}}
|
||||
</sv>
|
||||
<sv label="服务包费用" *ngIf="i?.insuranceType !== '3'">
|
||||
{{i?.insurancePremium!==null?(i?.insurancePremium |currency)+'元':'-'}}
|
||||
</sv>
|
||||
</sv-container>
|
||||
</nz-card>
|
||||
<nz-card [nzBorderless]="true" class="mb0">
|
||||
<div class="font-weight-blod text-md detail-title">
|
||||
<a class="sign"></a>
|
||||
<span>运费信息</span>
|
||||
<span class="pl-sm text-warning">(到货后{{i?.paymentDays}}天内支付运费)</span>
|
||||
</div>
|
||||
<st [data]="i?.expenseVOList" [columns]="expenseColumns" [page]="{ show: false }">
|
||||
<ng-template st-row="total" let-item>
|
||||
<div>
|
||||
{{ item?.totalAmount | currency }}
|
||||
<span>(含附加费）</span>
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template st-row="price" let-item>
|
||||
<div>
|
||||
{{ item?.price | currency }}
|
||||
</div>
|
||||
</ng-template>
|
||||
</st>
|
||||
<div class="freight-info-box mt-md" nz-row>
|
||||
<div nz-col nzSpan="24">
|
||||
<h3>
|
||||
<label>总计 :</label>
|
||||
<span class="text-error-dark text-xl">
|
||||
{{ i?.totalAmount | currency }}
|
||||
</span>
|
||||
<span>（运费{{ i?.totalFreight | currency }}含附加运费 {{ i?.totalSurcharge | currency }}）</span>
|
||||
</h3>
|
||||
<div *ngIf='i?.resourceStatus !== "1" && i?.carrierInformationVO?.driverName !== i?.payeeName'>车队长：{{
|
||||
i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
<nz-card [nzBorderless]="true" class="mb0">
|
||||
<div class="font-weight-blod text-md detail-title">
|
||||
<a class="sign"></a>
|
||||
<span>补充信息</span>
|
||||
</div>
|
||||
<sv-container>
|
||||
<sv label="是否回单">
|
||||
{{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
|
||||
</sv>
|
||||
<sv label="回单类型" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
|
||||
{{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
|
||||
</sv>
|
||||
<sv label="联系人" *ngIf="i?.supplementaryInformationVO?.stateReceipt"> {{
|
||||
i?.supplementaryInformationVO?.receiptUserName || '-' }} / {{ i?.supplementaryInformationVO?.phon || '-' }}
|
||||
</sv>
|
||||
<sv label="所在地区" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
|
||||
{{ i?.supplementaryInformationVO?.area }}
|
||||
</sv>
|
||||
<sv label="详细地址" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
|
||||
{{ i?.supplementaryInformationVO?.address }}
|
||||
</sv>
|
||||
<sv label="备注">
|
||||
{{ i?.supplementaryInformationVO?.remarks }}
|
||||
</sv>
|
||||
</sv-container>
|
||||
</nz-card>
|
||||
<nz-card [nzBorderless]="true" class="mb0">
|
||||
<div class="font-weight-blod text-md detail-title">
|
||||
<a class="sign"></a>
|
||||
<span>操作日志</span>
|
||||
</div>
|
||||
<st #st [data]="service.$api_getOperationLogRecordsList" [columns]="logColumns" [page]="{}"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }">
|
||||
<ng-template st-row="operator" let-item>
|
||||
<div>
|
||||
{{ item?.operator }} {{ item?.telephone ? '/' + item?.telephone : '' }}
|
||||
</div>
|
||||
</ng-template>
|
||||
</st>
|
||||
</nz-card>
|
||||
</div>
|
||||
</nz-spin>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
min-height: 210px;
|
||||
|
||||
p {
|
||||
margin-bottom: .5em;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -440,12 +440,15 @@ export class TaxManagementOrderReportingComponent implements OnInit {
|
||||
if (item?.putStatus != '0') {
|
||||
status = true
|
||||
}
|
||||
|
||||
});
|
||||
if(status) {
|
||||
this.service.msgSrv.warning('选择了已上传，请重新勾选！');
|
||||
return;
|
||||
}
|
||||
if(this.selectedRows.find(item => item.checkStatus !== '1')) {
|
||||
this.service.msgSrv.warning('选择了未通过校验的订单，请重新勾选！');
|
||||
return;
|
||||
}
|
||||
let params: any[] = [];
|
||||
this.selectedRows.forEach(item => {
|
||||
params.push(item.id);
|
||||
|
||||
Reference in New Issue
Block a user