返佣
This commit is contained in:
@ -284,7 +284,7 @@
|
||||
<sv label="协议附件">
|
||||
<!-- {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} -->
|
||||
<a href="javascript:;" (click)="agreement('1')">查看附件</a>
|
||||
<a href="javascript:;" (click)="agreement('2')">补充协议</a>
|
||||
<a target="_blank" [routerLink]="['/agreement']" [queryParams]="{ type: 8 }">补充协议</a>
|
||||
</sv>
|
||||
</sv-container>
|
||||
<sv-container col="2" class="mt-md">
|
||||
@ -344,7 +344,7 @@
|
||||
<nz-card nzTitle="轨迹信息" style="width: 100%" [nzExtra]="extraTemplate" #distannce5>
|
||||
<div nz-row>
|
||||
<div nz-col [nzSpan]="12">
|
||||
<st [scroll]="{y: '500px'}" #st [data]="addressItems" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
<st [scroll]="{y: '500px'}" style="min-height: 600px;" #st [data]="addressItems" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
</st>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="12">
|
||||
@ -363,6 +363,7 @@
|
||||
|
||||
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
|
||||
<ng-container *nzModalContent>
|
||||
<div *ngIf="!imges">暂无附件信息</div>
|
||||
<app-imagelist [imgList]="imges"></app-imagelist>
|
||||
</ng-container>
|
||||
<ng-template #nzModalFooter>
|
||||
|
||||
@ -908,11 +908,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
|
||||
});
|
||||
};
|
||||
agreement(value: any) {
|
||||
if (value === '1') {
|
||||
this.imges = this.i?.supplementAgreement;
|
||||
} else if (value === '2') {
|
||||
this.imges = this.i?.supplementAgreement;
|
||||
}
|
||||
this.imges = this.i?.agreementFilePath;
|
||||
this.isVisible = true;
|
||||
}
|
||||
handleCancel() {
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
<button
|
||||
(click)="cancellation()"
|
||||
nz-button
|
||||
*ngIf="i?.billStatus == '4' || i?.billStatus == '5' || i?.billStatus == '2' || i?.billStatus == '3' || i?.billStatus == '1'"
|
||||
*ngIf="i?.billStatus !== '1' && i?.billStatus !== '5' && i?.billStatus !== '6' && i?.overallPaymentStatus != '2'"
|
||||
acl [acl-ability]="['ORDER-BULK-DETAIL-cancelAnOrder']"
|
||||
>取消订单</button
|
||||
>
|
||||
@ -47,7 +47,7 @@
|
||||
<sv label="调度员">{{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} </sv>
|
||||
<sv label="外部订单号">{{ i?.externalBillCode }}</sv>
|
||||
<sv label="货源编号">{{ i?.goodsResource?.resourceCode }} </sv>
|
||||
<sv label="运单号">{{ i?.wayBillCode }}</sv>
|
||||
<sv label="运单号">{{ i?.wayBill?.wayBillCode }}</sv>
|
||||
<sv label="承诺付款天数">{{ i?.goodsResource?.paymentDays }}</sv>
|
||||
</div>
|
||||
<nz-tabset style="margin-top: 15px">
|
||||
@ -94,8 +94,8 @@
|
||||
{{ i?.unloadPlanTime }}
|
||||
</sv> -->
|
||||
<sv label="接单数量"> {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方 </sv>
|
||||
<sv *ngIf="i?.billStatus =='3' || i?.billStatus =='4' || i?.billStatus =='5'" label="装货数量"> {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件 </sv>
|
||||
<sv *ngIf="i?.billStatus =='4' || i?.billStatus =='5'" label="卸货数量"> {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方,{{ i?.acceptNumber }}件 </sv>
|
||||
<sv *ngIf="i?.billStatus =='3' || i?.billStatus =='4' || i?.billStatus =='5'" label="装货数量"> {{ i?.loadWeight }}吨,{{ i?.loadVolume }}方</sv>
|
||||
<sv *ngIf="i?.billStatus =='4' || i?.billStatus =='5'" label="卸货数量"> {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方</sv>
|
||||
</sv-container>
|
||||
<div class="mt-md">
|
||||
<h4 class="text-md"
|
||||
@ -165,7 +165,7 @@
|
||||
<sv label="协议附件">
|
||||
<!-- {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} -->
|
||||
<a href="javascript:;" (click)="agreement('1')">查看附件</a>
|
||||
<a href="javascript:;" (click)="agreement('2')">补充协议</a>
|
||||
<a target="_blank" [routerLink]="['/agreement']" [queryParams]="{ type: 8 }">补充协议</a>
|
||||
</sv>
|
||||
</sv-container>
|
||||
<sv-container col="2" class="mt-md">
|
||||
@ -208,11 +208,11 @@
|
||||
<nz-card nzTitle="轨迹信息" style="width: 100%" [nzExtra]="extraTemplate" #distannce5>
|
||||
<div nz-row>
|
||||
<div nz-col [nzSpan]="12">
|
||||
<st [scroll]="{y: '500px'}" #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
<st [scroll]="{y: '500px'}" style="min-height: 600px;" #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
</st>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="12">
|
||||
<amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [MapList]="mapList"></amap-path-simplifier>
|
||||
<amap-path-simplifier [mapWidth]="'100%'" [pois]="pois" [mapHeight]="'600px'" [MapList]="mapList"></amap-path-simplifier>
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
@ -251,6 +251,7 @@
|
||||
|
||||
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
|
||||
<ng-container *nzModalContent>
|
||||
<div *ngIf="!imges">暂无附件信息</div>
|
||||
<app-imagelist [imgList]="imges"></app-imagelist>
|
||||
</ng-container>
|
||||
<ng-template #nzModalFooter>
|
||||
|
||||
@ -28,6 +28,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
|
||||
MapList: any[]=[];
|
||||
id = this.route.snapshot.params.id;
|
||||
billExpenses: any[] = []; //运费信息表格信息
|
||||
pois: any[] = [];
|
||||
i: any;
|
||||
imges: any;
|
||||
totalObj: any;
|
||||
@ -79,6 +80,20 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
|
||||
this.i = res;
|
||||
this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TRA');
|
||||
this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data:any)=>data.displayStatus !=="HIDE");
|
||||
this.pois = [
|
||||
{
|
||||
markerLabel: '起',
|
||||
color: 'blue',
|
||||
position: [res.startingPoint.longitude, res.startingPoint.latitude],
|
||||
title: res.startingPoint.detailedAddress
|
||||
},
|
||||
{
|
||||
markerLabel: '卸',
|
||||
color: 'red',
|
||||
position: [res.endPoint.longitude, res.endPoint.latitude],
|
||||
title: res.endPoint.detailedAddress
|
||||
}
|
||||
];
|
||||
}
|
||||
});
|
||||
this.service.request(this.service.$api_get_getRiskDetail, { id: this.id }).subscribe(res => {
|
||||
@ -97,11 +112,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
|
||||
this.router.navigate(['order-management/bulk-detailChange', this.id]);
|
||||
}
|
||||
agreement(value: any) {
|
||||
if (value === '1') {
|
||||
this.imges = this.i?.supplementAgreement;
|
||||
} else if (value === '2') {
|
||||
this.imges = this.i?.supplementAgreement;
|
||||
}
|
||||
this.imges = this.i?.agreementFilePath;
|
||||
this.isVisible = true;
|
||||
}
|
||||
handleCancel() {
|
||||
|
||||
@ -242,7 +242,7 @@
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template #extraTemplate>
|
||||
<div>
|
||||
<div *ngIf="resourceStatus == 4">
|
||||
<button
|
||||
nz-button
|
||||
nzType="primary"
|
||||
|
||||
@ -118,7 +118,7 @@ export class OrderManagementBulkComponent implements OnInit {
|
||||
};
|
||||
}
|
||||
search() {
|
||||
this.st?.load(1);
|
||||
this.st?.load();
|
||||
this.getGoodsSourceStatistical();
|
||||
}
|
||||
getGoodsSourceStatistical() {
|
||||
@ -181,7 +181,10 @@ export class OrderManagementBulkComponent implements OnInit {
|
||||
_$expand: { type: 'boolean', ui: { hidden: true } },
|
||||
billCode: {
|
||||
type: 'string',
|
||||
title: '订单号'
|
||||
title: '订单号',
|
||||
ui: {
|
||||
placeholder: '最多100个单号,空号隔开',
|
||||
}
|
||||
},
|
||||
resourceCode: {
|
||||
type: 'string',
|
||||
@ -513,7 +516,7 @@ export class OrderManagementBulkComponent implements OnInit {
|
||||
title: '操作',
|
||||
fixed: 'right',
|
||||
width: '130px',
|
||||
className: 'text-center',
|
||||
className: 'text-left block-td',
|
||||
buttons: [
|
||||
{
|
||||
text: '运费变更记录',
|
||||
@ -523,44 +526,44 @@ export class OrderManagementBulkComponent implements OnInit {
|
||||
acl: { ability: ['ORDER-BULK-listChangeApply'] },
|
||||
},
|
||||
{
|
||||
text: '查看评价 ',
|
||||
text: '查看评价',
|
||||
click: _record => this.viewEvaluate(_record),
|
||||
iif: item => item.billStatus == '5',
|
||||
acl: { ability: ['ORDER-BULK-evaluation'] },
|
||||
},
|
||||
{
|
||||
text: '查看详情 ',
|
||||
text: '查看详情',
|
||||
click: (item: any) => {
|
||||
this.router.navigate(['./bulk-detail', item.id], { relativeTo: this.ar });
|
||||
},
|
||||
acl: { ability: ['USERCENTER-FREIGHT-USER-view'] },
|
||||
},
|
||||
{
|
||||
text: '变更运费 ',
|
||||
text: '变更运费',
|
||||
click: _record => this.updateFreight(_record),
|
||||
iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2',
|
||||
acl: { ability: ['ORDER-BULK-FreightChangeBulkDetail'] },
|
||||
},
|
||||
{
|
||||
text: '确认签收 ',
|
||||
text: '确认签收',
|
||||
click: _record => this.confirmReceipt(_record),
|
||||
iif: item => item.billStatus == '4',
|
||||
acl: { ability: ['VEHICLE-LIST-view'] },
|
||||
},
|
||||
{
|
||||
text: '取消订单 ',
|
||||
text: '取消订单',
|
||||
click: _record => this.cancellation(_record),
|
||||
iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2',
|
||||
acl: { ability: ['ORDER-BULK-signBulkOrder'] },
|
||||
},
|
||||
{
|
||||
text: '申请退款 ',
|
||||
text: '申请退款',
|
||||
click: (_record) => this.applyRefund(_record),
|
||||
iif: item => item.isApplyForRefund,
|
||||
acl: { ability: ['ORDER-VEHICLE-modificationOrder'] },
|
||||
},
|
||||
{
|
||||
text: '修改订单 ',
|
||||
text: '修改订单',
|
||||
click: _record => this.changeOrder(_record),
|
||||
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
|
||||
acl: { ability: ['ORDER-BULK-BulkBillDetail'] },
|
||||
|
||||
@ -389,7 +389,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
title: '操作',
|
||||
fixed: 'right',
|
||||
width: '140px',
|
||||
className: 'text-center',
|
||||
className: 'text-center block-td',
|
||||
buttons: [
|
||||
{
|
||||
text: '查看申诉记录',
|
||||
@ -403,7 +403,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
|
||||
acl: { ability: ['ORDER-COMPLIANCE-AUDIT-listChangeApply'] },
|
||||
},
|
||||
{
|
||||
text: '合规抽查 ',
|
||||
text: '合规抽查',
|
||||
click: _record => this.audit(_record),
|
||||
iif: item => item.complianceStatus == '0',
|
||||
acl: { ability: ['ORDER-COMPLIANCE-AUDIT-updateBillByCompliance'] },
|
||||
|
||||
@ -331,7 +331,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
|
||||
title: '操作',
|
||||
fixed: 'right',
|
||||
width: '136px',
|
||||
className: 'text-center',
|
||||
className: 'text-center block-td',
|
||||
buttons: [
|
||||
{
|
||||
text: '生成电子单据',
|
||||
@ -340,19 +340,19 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
|
||||
acl: { ability: ['ORDER-RECEIPTS-electronicBillingOne'] },
|
||||
},
|
||||
{
|
||||
text: '通过 ',
|
||||
text: '通过',
|
||||
click: _record => this.sign(_record),
|
||||
iif: item => item.auditStatus == '1',
|
||||
acl: { ability: ['ORDER-RECEIPTS-billAuditPassBatch'] },
|
||||
},
|
||||
{
|
||||
text: '修改 ',
|
||||
text: '修改',
|
||||
click: _record => this.modification(_record),
|
||||
iif: item => item.auditStatus == '1' ,
|
||||
acl: { ability: ['ORDER-RECEIPTS-updateBillExamine'] },
|
||||
},
|
||||
{
|
||||
text: '查看凭证 ',
|
||||
text: '查看凭证',
|
||||
click: _record => this.generate(_record, 3),
|
||||
iif: item => item.auditStatus == '2',
|
||||
acl: { ability: ['ORDER-RECEIPTS-view'] },
|
||||
|
||||
@ -302,7 +302,7 @@ export class OrderManagementRiskComponent implements OnInit {
|
||||
title: '操作',
|
||||
fixed: 'right',
|
||||
width: '90px',
|
||||
className: 'text-center',
|
||||
className: 'text-center block-td',
|
||||
buttons: [
|
||||
{
|
||||
text: '审核',
|
||||
@ -311,7 +311,7 @@ export class OrderManagementRiskComponent implements OnInit {
|
||||
acl: { ability: ['ORDER-RISK-audit'] },
|
||||
},
|
||||
{
|
||||
text: '详情 ',
|
||||
text: '详情',
|
||||
click: _record => this.viewEvaluate(_record),
|
||||
acl: { ability: ['ORDER-RISK-riskDetail'] },
|
||||
}
|
||||
|
||||
@ -35,9 +35,9 @@
|
||||
<sv label="录单员">{{ i?.createUserName || i?.goodsResource?.createUserName }} /{{ i?.createUserPhone || i?.goodsResource?.createUserPhone }} </sv>
|
||||
<sv label="调度员">{{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} </sv>
|
||||
<sv label="外部订单号">{{ i?.externalBillCode }}</sv>
|
||||
<sv label="货源编号">{{ i?.resourceCode }} </sv>
|
||||
<sv label="货源编号">{{ i?.goodsResource?.resourceCode }} </sv>
|
||||
<sv label="运单号">{{ i?.wayBillId }}</sv>
|
||||
<sv label="承诺付款天数">{{ i?.goodsResource?.dispatchName }}</sv>
|
||||
<sv label="承诺付款天数">{{ i?.goodsResource?.paymentDays }}</sv>
|
||||
</div>
|
||||
|
||||
<nz-tabset style="margin-top: 15px">
|
||||
@ -259,7 +259,7 @@
|
||||
<sv label="协议附件">
|
||||
<!-- {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} -->
|
||||
<a href="javascript:;" (click)="agreement('1')">查看附件</a>
|
||||
<a href="javascript:;" (click)="agreement('2')">补充协议</a>
|
||||
<a target="_blank" [routerLink]="['/agreement']" [queryParams]="{ type: 8 }">补充协议</a>
|
||||
</sv>
|
||||
</sv-container>
|
||||
<sv-container col="2" class="mt-md">
|
||||
@ -318,7 +318,7 @@
|
||||
<nz-card nzTitle="轨迹信息" style="width: 100%" [nzExtra]="extraTemplate" #distannce5>
|
||||
<div nz-row>
|
||||
<div nz-col [nzSpan]="12">
|
||||
<st [scroll]="{y: '500px'}" #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
<st [scroll]="{y: '500px'}" style="min-height: 600px;" #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
</st>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="12">
|
||||
@ -336,6 +336,7 @@
|
||||
</nz-card>
|
||||
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
|
||||
<ng-container *nzModalContent>
|
||||
<div *ngIf="!imges">暂无附件信息</div>
|
||||
<app-imagelist [imgList]="imges"></app-imagelist>
|
||||
</ng-container>
|
||||
<ng-template #nzModalFooter>
|
||||
|
||||
@ -855,11 +855,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
|
||||
});
|
||||
};
|
||||
agreement(value: any) {
|
||||
if (value === '1') {
|
||||
this.imges = this.i?.supplementAgreement;
|
||||
} else if (value === '2') {
|
||||
this.imges = this.i?.supplementAgreement;
|
||||
}
|
||||
this.imges = this.i?.agreementFilePath;
|
||||
this.isVisible = true;
|
||||
}
|
||||
handleCancel() {
|
||||
|
||||
@ -46,9 +46,9 @@
|
||||
<sv label="录单员">{{ i?.createUserName || i?.goodsResource?.createUserName }} /{{ i?.createUserPhone || i?.goodsResource?.createUserPhone }} </sv>
|
||||
<sv label="调度员">{{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} </sv>
|
||||
<sv label="外部订单号">{{ i?.externalBillCode }}</sv>
|
||||
<sv label="货源编号">{{ i?.resourceCode }} </sv>
|
||||
<sv label="货源编号">{{ i?.goodsResource?.resourceCode }} </sv>
|
||||
<sv label="运单号">{{ i?.wayBillId }}</sv>
|
||||
<sv label="承诺付款天数">{{ i?.goodsResource?.dispatchName }}</sv>
|
||||
<sv label="承诺付款天数">{{ i?.goodsResource?.paymentDays }}</sv>
|
||||
</div>
|
||||
|
||||
<nz-tabset style="margin-top: 15px">
|
||||
@ -140,7 +140,7 @@
|
||||
<sv label="货物价值">
|
||||
{{i?.goodsResource?.goodsValue !==null?(i?.goodsResource?.goodsValue|currency)+'元':'-'}}
|
||||
</sv>
|
||||
<sv label="保价费金额">
|
||||
<sv label="服务包费用">
|
||||
{{i?.goodsResource?.insurancePremium!==null?(i?.goodsResource?.insurancePremium |currency)+'元':'-'}}
|
||||
</sv>
|
||||
</sv-container>
|
||||
@ -171,7 +171,7 @@
|
||||
<sv label="协议附件">
|
||||
<!-- {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} -->
|
||||
<a href="javascript:;" (click)="agreement('1')">查看附件</a>
|
||||
<a href="javascript:;" (click)="agreement('2')">补充协议</a>
|
||||
<a target="_blank" [routerLink]="['/agreement']" [queryParams]="{ type: 8 }">补充协议</a>
|
||||
</sv>
|
||||
</sv-container>
|
||||
<sv-container col="2" class="mt-md">
|
||||
@ -214,12 +214,12 @@
|
||||
<nz-card nzTitle="轨迹信息" style="width: 100%" [nzExtra]="extraTemplate" #distannce5>
|
||||
<div nz-row>
|
||||
<div nz-col [nzSpan]="12">
|
||||
<st [scroll]="{y: '500px'}" #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
<st [scroll]="{y: '500px'}" style="min-height: 600px;" #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
</st>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="12">
|
||||
<amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [MapList]="mapList"></amap-path-simplifier>
|
||||
</div>
|
||||
<amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [MapList]="mapList" [pois]="pois"></amap-path-simplifier>
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
<ng-template #extraTemplate>
|
||||
@ -233,6 +233,7 @@
|
||||
|
||||
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
|
||||
<ng-container *nzModalContent>
|
||||
<div *ngIf="!imges">暂无附件信息</div>
|
||||
<app-imagelist [imgList]="imges"></app-imagelist>
|
||||
</ng-container>
|
||||
<ng-template #nzModalFooter>
|
||||
|
||||
@ -124,11 +124,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
|
||||
this.router.navigate(['order-management/vehicle-detailChange', this.id]);
|
||||
}
|
||||
agreement(value: any) {
|
||||
if (value === '1') {
|
||||
this.imges = this.i?.agreementFilePath;
|
||||
} else if (value === '2') {
|
||||
this.imges = this.i?.agreementFilePath;
|
||||
}
|
||||
this.imges = this.i?.agreementFilePath;
|
||||
this.isVisible = true;
|
||||
}
|
||||
handleCancel() {
|
||||
|
||||
@ -86,13 +86,26 @@
|
||||
<ng-template st-row="createUserName" let-item let-index="index">
|
||||
<div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
|
||||
</ng-template>
|
||||
<ng-template st-row="mybidDetailInfo" let-item let-index="index">
|
||||
<!-- <ng-template st-row="mybidDetailInfo" let-item let-index="index">
|
||||
<div *ngIf="item.mybidDetailInfo.length > 0">
|
||||
<p *ngFor="let data of item.mybidDetailInfo">
|
||||
{{ data.expenseName }}:¥{{ data.price | number: '0.2-2' }}
|
||||
<span *ngIf="data.paymentStatusLabel" style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
|
||||
</p>
|
||||
</div>
|
||||
</ng-template> -->
|
||||
<ng-template st-row="mybidDetailInfo" let-item let-index="index">
|
||||
<div *ngIf="item.mybidDetailInfo.length > 0">
|
||||
<div *ngFor="let data of item.mybidDetailInfo">
|
||||
{{ data.expenseName }}:{{ data.price | currency }}
|
||||
<span *ngIf="data.paymentStatus && data.paymentStatus === '1' && data.price>0" style="color: #f59a63">待申请</span>
|
||||
<span *ngIf="data.paymentStatus && data.paymentStatus === '2'" style="color: #f59a63">已支付</span>
|
||||
<span *ngIf="data.paymentStatus && data.paymentStatus === '3'" style="color: #f59a63">已拒绝</span>
|
||||
<span *ngIf="data.paymentStatus && data.paymentStatus === '4'" style="color: #f59a63">申请中</span>
|
||||
<span *ngIf="data.paymentStatus && data.paymentStatus === '5'" style="color: #f59a63">退款中</span>
|
||||
<span *ngIf="data.paymentStatus && data.paymentStatus === '6'" style="color: #f59a63">退款成功</span>
|
||||
</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
|
||||
<div *ngFor="let i of item?.billExpenseDetailVOList; let ii = index">
|
||||
@ -201,6 +214,7 @@
|
||||
<button nz-button nzType="primary" (click)="modifyFreightPeople()" acl [acl-ability]="['ORDER-VEHICLE-modificationNetworkFreight']"> 修改网络货运人 </button>
|
||||
<button nz-button nzType="primary" (click)="modifycaptain()" acl [acl-ability]="['ORDER-VEHICLE-modificationCarCaptain']"> 修改车队长 </button>
|
||||
<button
|
||||
*ngIf="resourceStatus == 4"
|
||||
nz-button
|
||||
nzType="primary"
|
||||
nzGhost
|
||||
|
||||
@ -191,8 +191,10 @@ resourceStatus: any;
|
||||
_$expand: { type: 'boolean', ui: { hidden: true } },
|
||||
billCode: {
|
||||
type: 'string',
|
||||
title: '订单号'
|
||||
|
||||
title: '订单号',
|
||||
ui: {
|
||||
placeholder: '最多100个单号,空号隔开',
|
||||
}
|
||||
},
|
||||
resourceCode: {
|
||||
type: 'string',
|
||||
@ -436,7 +438,7 @@ resourceStatus: any;
|
||||
title: '操作',
|
||||
fixed: 'right',
|
||||
width: '130px',
|
||||
className: 'text-center',
|
||||
className: 'text-center block-td',
|
||||
buttons: [
|
||||
|
||||
{
|
||||
@ -446,50 +448,50 @@ resourceStatus: any;
|
||||
acl: { ability: ['ORDER-VEHICLE-ChangeApplyList'] },
|
||||
},
|
||||
{
|
||||
text: '查看详情 ',
|
||||
text: '查看详情',
|
||||
click: (item: any) => {
|
||||
this.router.navigate(['./vehicle-detail', item.id], { relativeTo: this.ar });
|
||||
},
|
||||
acl: { ability: ['USERCENTER-FREIGHT-USER-view'] },
|
||||
},
|
||||
{
|
||||
text: '查看评价 ',
|
||||
text: '查看评价',
|
||||
click: (_record) => this.viewEvaluate(_record),
|
||||
iif: item => item.billStatus == '5',
|
||||
acl: { ability: ['ORDER-VEHICLE-evaluation'] },
|
||||
},
|
||||
{
|
||||
text: '变更运费 ',
|
||||
text: '变更运费',
|
||||
click: (_record) => this.updateFreight(_record),
|
||||
iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2',
|
||||
acl: { ability: ['ORDER-VEHICLE-FreightChangeWholeDetail'] },
|
||||
},
|
||||
{
|
||||
text: '确认签收 ',
|
||||
text: '确认签收',
|
||||
click: (_record) => this.confirmReceipt(_record),
|
||||
iif: item => item.billStatus == '4',
|
||||
acl: { ability: ['ORDER-VEHICLE-signWholeOrder'] },
|
||||
},
|
||||
{
|
||||
text: '取消订单 ',
|
||||
text: '取消订单',
|
||||
click: (_record) => this.cancellation(_record),
|
||||
iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus !== '2',
|
||||
acl: { ability: ['ORDER-VEHICLE-cancelAnOrder'] },
|
||||
},
|
||||
{
|
||||
text: '修改订单 ',
|
||||
text: '修改订单',
|
||||
click: (_record) => this.changeOrder(_record),
|
||||
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
|
||||
acl: { ability: ['ORDER-VEHICLE-modificationOrder'] },
|
||||
},
|
||||
{
|
||||
text: '申请退款 ',
|
||||
text: '申请退款',
|
||||
click: (_record) => this.applyRefund(_record),
|
||||
iif: item => item.isApplyForRefund,
|
||||
acl: { ability: ['ORDER-VEHICLE-modificationOrder'] },
|
||||
},
|
||||
{
|
||||
text: '查看轨迹 ',
|
||||
text: '查看轨迹',
|
||||
click: (_record) => this.viewTrack(_record),
|
||||
iif: item => item.billStatus !== '1' && item.billStatus !== '6',
|
||||
// acl: { ability: ['VEHICLE-LIST-view'] },
|
||||
@ -748,16 +750,6 @@ resourceStatus: any;
|
||||
nzContent: VehicleFreightPeopleComponent,
|
||||
nzComponentParams: { data: { ids: params, enterpriseInfoIds: params2, } },
|
||||
nzFooter: null,
|
||||
// nzOnOk: sin => {
|
||||
// this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
|
||||
// if (res) {
|
||||
// this.service.msgSrv.success('变更运费成功');
|
||||
// modal.destroy();
|
||||
// this.st.reload();
|
||||
// }
|
||||
// });
|
||||
// return false;
|
||||
// }
|
||||
});
|
||||
modal.afterClose.subscribe((result) => {
|
||||
if (result) {
|
||||
|
||||
Reference in New Issue
Block a user