车辆接口更新
This commit is contained in:
wangshiming
@ -9,60 +9,59 @@
|
||||
<nz-card class="search-box">
|
||||
<div nz-row>
|
||||
<div nz-col nzSpan="24">
|
||||
<se-container col="3" labelWidth=100 *ngIf="!textStatus">
|
||||
<se-title class="mb-md" style="font-size:18px">基本信息（应收费用）</se-title>
|
||||
<se-container col="3" labelWidth="100" *ngIf="!textStatus">
|
||||
<se-title class="mb-md" style="font-size: 18px">基本信息（应收费用）</se-title>
|
||||
<se label="网络货运人" required>
|
||||
{{costInfo?.ltdid}}
|
||||
{{ costInfo?.ltdid }}
|
||||
</se>
|
||||
<se label="费用类型" required col="2">
|
||||
{{costInfo?.feetype}}
|
||||
{{ costInfo?.feetype }}
|
||||
</se>
|
||||
<se label="费用备注">
|
||||
{{costInfo?.arremarks}}
|
||||
{{ costInfo?.arremarks }}
|
||||
</se>
|
||||
<se label="应收对象" required>
|
||||
{{costInfo?.artoname}}
|
||||
{{ costInfo?.artoname }}
|
||||
</se>
|
||||
<se label="开票类型" required>
|
||||
{{costInfo?.arvattype}}
|
||||
{{ costInfo?.arvattype }}
|
||||
</se>
|
||||
<se label="应收金额" required>
|
||||
{{costInfo?.armoeny}}
|
||||
{{ costInfo?.armoeny }}
|
||||
</se>
|
||||
<se label="开票金额" required>
|
||||
{{costInfo?.arkpmoney}}
|
||||
{{ costInfo?.arkpmoney }}
|
||||
</se>
|
||||
<se label="收款金额" required>
|
||||
{{costInfo?.arbrmmoney}}
|
||||
{{ costInfo?.arbrmmoney }}
|
||||
</se>
|
||||
</se-container>
|
||||
<se-container col="3" labelWidth=100 *ngIf="textStatus" class="mt-md">
|
||||
<se-title class="mb-md" style="font-size:18px">基本信息（应付费用）</se-title>
|
||||
<se-container col="3" labelWidth="100" *ngIf="textStatus" class="mt-md">
|
||||
<se-title class="mb-md" style="font-size: 18px">基本信息（应付费用）</se-title>
|
||||
<se label="网络货运人" required>
|
||||
{{costInfo?.ltdid}}
|
||||
{{ costInfo?.ltdid }}
|
||||
</se>
|
||||
<se label="费用类型" required>
|
||||
{{costInfo?.feetype}}
|
||||
</se>
|
||||
<se label="应付核销" required>
|
||||
{{ costInfo?.feetype }}
|
||||
</se>
|
||||
<se label="应付核销" required> </se>
|
||||
<se label="费用备注">
|
||||
{{costInfo?.hrremarks}}
|
||||
{{ costInfo?.hrremarks }}
|
||||
</se>
|
||||
<se label="应收对象" required>
|
||||
{{costInfo?.hrtoname}}
|
||||
{{ costInfo?.hrtoname }}
|
||||
</se>
|
||||
<se label="收票类型" required>
|
||||
{{costInfo?.hrvattype}}
|
||||
{{ costInfo?.hrvattype }}
|
||||
</se>
|
||||
<se label="应付金额" required>
|
||||
{{costInfo?.hrmoney}}
|
||||
{{ costInfo?.hrmoney }}
|
||||
</se>
|
||||
<se label="收票金额" required>
|
||||
{{costInfo?.hrvatmoney}}
|
||||
{{ costInfo?.hrvatmoney }}
|
||||
</se>
|
||||
<se label="付款金额" required>
|
||||
{{costInfo?.hrpaymoney}}
|
||||
{{ costInfo?.hrpaymoney }}
|
||||
</se>
|
||||
</se-container>
|
||||
</div>
|
||||
@ -72,48 +71,97 @@
|
||||
<nz-card class="content-box" nzBordered>
|
||||
<nz-tabset>
|
||||
<nz-tab nzTitle="费用明细">
|
||||
<st #st [data]="costInfo?.ficoFeeLList" [columns]="columns.cost" [page]="{ show: false}"
|
||||
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }">
|
||||
<st
|
||||
#st
|
||||
[scroll]="{ x: '2000px' }"
|
||||
[data]="costInfo?.ficoFeeLList"
|
||||
[columns]="columns.cost"
|
||||
[page]="{ show: false }"
|
||||
[loading]="service.http.loading"
|
||||
[scroll]="{ x: '1200px', y: '370px' }"
|
||||
>
|
||||
<ng-template st-row="hrvatmoney" let-item let-index="index">
|
||||
{{ item.hrvatmoney | currency}}
|
||||
</ng-template>
|
||||
<ng-template st-row="armoney" let-item let-index="index">
|
||||
{{ item.armoney | currency}}
|
||||
</ng-template>
|
||||
<ng-template st-row="arkpmoney" let-item let-index="index">
|
||||
{{ item.arkpmoney | currency}}
|
||||
</ng-template>
|
||||
<ng-template st-row="no" let-item let-index="index" let-column="column">
|
||||
{{ textStatus ? item.hrmoney : item.hrvatmoney }}
|
||||
</ng-template>
|
||||
<ng-template st-row="hrvatmoney" let-item let-index="index" let-column="column">
|
||||
{{ index+1 }}
|
||||
</ng-template>
|
||||
</st>
|
||||
</nz-tab>
|
||||
<nz-tab nzTitle="开票信息">
|
||||
<st #st [data]="costInfo?.ficoVatappDatailList" [columns]="columns.requested" [page]="{ show: false}"
|
||||
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }">
|
||||
<st
|
||||
#st
|
||||
[scroll]="{ x: '2000px' }"
|
||||
[data]="costInfo?.ficoVatappDatailList"
|
||||
[columns]="columns.requested"
|
||||
[page]="{ show: false }"
|
||||
[loading]="service.http.loading"
|
||||
[scroll]="{ x: '1200px', y: '370px' }"
|
||||
>
|
||||
<ng-template st-row="vatnotax" let-item let-index="index">
|
||||
{{ item.vatnotax | currency}}
|
||||
</ng-template>
|
||||
<ng-template st-row="vatmoney" let-item let-index="index">
|
||||
{{ item.vatmoney | currency}}
|
||||
</ng-template>
|
||||
<ng-template st-row="no" let-item let-index="index" let-column="column">
|
||||
{{ index+1 }}
|
||||
{{ index + 1 }}
|
||||
</ng-template>
|
||||
</st>
|
||||
</nz-tab>
|
||||
<nz-tab nzTitle="收款信息">
|
||||
<st #st [data]="costInfo?.ficoAhxLList" [columns]="columns.collection" [page]="{ show: false}"
|
||||
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }">
|
||||
<st
|
||||
#st
|
||||
[scroll]="{ x: '2000px' }"
|
||||
[data]="costInfo?.ficoAhxLList"
|
||||
[columns]="columns.collection"
|
||||
[page]="{ show: false }"
|
||||
[loading]="service.http.loading"
|
||||
[scroll]="{ x: '1200px', y: '370px' }"
|
||||
>
|
||||
<ng-template st-row="ahxmoney" let-item let-index="index">
|
||||
{{ item.ahxmoney | currency}}
|
||||
</ng-template>
|
||||
<ng-template st-row="ahxmoney" let-item let-index="index">
|
||||
{{ item.ahxmoney | currency}}
|
||||
</ng-template>
|
||||
<ng-template st-row="no" let-item let-index="index" let-column="column">
|
||||
{{ index+1 }}
|
||||
</ng-template>
|
||||
<ng-template st-row="status" let-item let-index="index" let-column="column">
|
||||
已核销
|
||||
{{ index + 1 }}
|
||||
</ng-template>
|
||||
<ng-template st-row="status" let-item let-index="index" let-column="column"> 已核销 </ng-template>
|
||||
</st>
|
||||
</nz-tab>
|
||||
<nz-tab nzTitle="收票信息">
|
||||
<st #st [data]="data" [columns]="columns.ticket" [page]="{ show: false}" [loading]="service.http.loading"
|
||||
[scroll]="{ x:'1200px',y: '370px' }"></st>
|
||||
<st
|
||||
#st
|
||||
[data]="data"
|
||||
[scroll]="{ x: '2000px' }"
|
||||
[columns]="columns.ticket"
|
||||
[page]="{ show: false }"
|
||||
[loading]="service.http.loading"
|
||||
[scroll]="{ x: '1200px', y: '370px' }"
|
||||
></st>
|
||||
</nz-tab>
|
||||
<nz-tab nzTitle="付款信息">
|
||||
<st #st [data]="costInfo?.ficoPhxLList" [columns]="columns.payment" [page]="{ show: false}" [loading]="service.http.loading"
|
||||
[scroll]="{ x:'1200px',y: '370px' }">
|
||||
<st
|
||||
#st
|
||||
[scroll]="{ x: '2000px' }"
|
||||
[data]="costInfo?.ficoPhxLList"
|
||||
[columns]="columns.payment"
|
||||
[page]="{ show: false }"
|
||||
[loading]="service.http.loading"
|
||||
[scroll]="{ x: '1200px', y: '370px' }"
|
||||
>
|
||||
<ng-template st-row="no" let-item let-index="index" let-column="column">
|
||||
{{ index+1 }}
|
||||
{{ index + 1 }}
|
||||
</ng-template>
|
||||
</st>
|
||||
</nz-tab>
|
||||
</nz-tabset>
|
||||
|
||||
|
||||
</nz-card>
|
||||
@ -43,39 +43,39 @@ export class CostManagementDetailComponent implements OnInit {
|
||||
private initST(): { [key: string]: STColumn[] } {
|
||||
return {
|
||||
cost: [
|
||||
{ title: '序号', render: 'no', width: 70 },
|
||||
{ title: '费用明细号', index: 'feeHId' },
|
||||
{ title: '订单号', index: 'billHId' },
|
||||
{ title: '订单日期', index: 'callNo' },
|
||||
{ title: '运单号', index: 'waybillHId' },
|
||||
{ title: '运单日期', index: 'waybillDate' },
|
||||
{ title: '结算客户', index: 'callNo' },
|
||||
{ title: '订单费用类型', index: 'billLType' },
|
||||
{ title: '费用科目', index: 'feeSubId' },
|
||||
{ title: '税率', index: 'hrvatrate' },
|
||||
{ title: '费用金额', render: 'hrvatmoney' },
|
||||
{ title: '收/付款金额', index: 'armoney' },
|
||||
{ title: '开/收票金额', index: 'arkpmoney' }
|
||||
{ title: '序号', render: 'no', width: 70,className: 'text-left', },
|
||||
{ title: '费用明细号', index: 'feeHId',className: 'text-left', width: 200,},
|
||||
{ title: '订单号', index: 'billHId' ,className: 'text-left', width: 200,},
|
||||
{ title: '订单日期', index: 'callNo' ,className: 'text-left',width: 200,},
|
||||
{ title: '运单号', index: 'waybillHId',className: 'text-left', width: 200,},
|
||||
{ title: '运单日期', index: 'waybillDate' ,className: 'text-left',width: 200,},
|
||||
{ title: '结算客户', index: 'callNo' ,className: 'text-left',width: 200,},
|
||||
{ title: '订单费用类型', index: 'billLType' ,className: 'text-left',width: 200,},
|
||||
{ title: '费用科目', index: 'feeSubId' ,className: 'text-left',width: 200,},
|
||||
{ title: '税率', index: 'hrvatrate',className: 'text-right', width: 200,},
|
||||
{ title: '费用金额', render: 'hrvatmoney',className: 'text-right', width: 200,},
|
||||
{ title: '收/付款金额', render: 'armoney',className: 'text-right', width: 200,},
|
||||
{ title: '开/收票金额', render: 'arkpmoney' ,className: 'text-right',width: 200,}
|
||||
],
|
||||
requested: [
|
||||
{ title: '序号', render: 'no', width: 70 },
|
||||
{ title: '费用明细号', index: 'feeHId' },
|
||||
{ title: '发票申请', index: 'vatappcode' },
|
||||
{ title: '发票类型', index: 'vatapptype' },
|
||||
{ title: '发票号', index: 'vatappcode' },
|
||||
{ title: '发票日期', index: 'vatappdate' },
|
||||
{ title: '发票状态', index: 'sts' },
|
||||
{ title: '应收金额', index: 'vatnotax' },
|
||||
{ title: '开票金额', index: 'vatmoney' }
|
||||
{ title: '序号', render: 'no', width: 70 ,className: 'text-left',},
|
||||
{ title: '费用明细号', index: 'feeHId',className: 'text-left',width: 200, },
|
||||
{ title: '发票申请', index: 'vatappcode',className: 'text-left', width: 200,},
|
||||
{ title: '发票类型', index: 'vatapptype',className: 'text-left',width: 200, },
|
||||
{ title: '发票号', index: 'vatappcode',className: 'text-left',width: 200, },
|
||||
{ title: '发票日期', index: 'vatappdate',className: 'text-left', width: 200,},
|
||||
{ title: '发票状态', index: 'sts' ,className: 'text-left',width: 200,},
|
||||
{ title: '应收金额', render: 'vatnotax',className: 'text-left',width: 200, },
|
||||
{ title: '开票金额', render: 'vatmoney' ,className: 'text-left',width: 200,}
|
||||
],
|
||||
collection: [
|
||||
{ title: '序号', render: 'no', width: 70 },
|
||||
{ title: '费用明细号', index: 'feeLId' },
|
||||
{ title: '收款单号', index: 'id' },
|
||||
{ title: '收款日期', index: 'feedate' },
|
||||
{ title: '收款状态', render: 'status' },
|
||||
{ title: '应收金额', index: 'ahxmoney' },
|
||||
{ title: '收款金额', index: 'ahxmoney' }
|
||||
{ title: '序号', render: 'no', width: 70, },
|
||||
{ title: '费用明细号', index: 'feeLId' ,className: 'text-left', width: 200,},
|
||||
{ title: '收款单号', index: 'ahxHId' ,className: 'text-left', width: 200,},
|
||||
{ title: '收款日期', index: 'feedate' ,className: 'text-left', width: 200,},
|
||||
{ title: '收款状态', render: 'status' ,className: 'text-left', width: 150,},
|
||||
{ title: '应收金额', render: 'ahxmoney' ,className: 'text-left', width: 120,},
|
||||
{ title: '收款金额', render: 'ahxmoney',className: 'text-left', width: 120, }
|
||||
],
|
||||
ticket: [
|
||||
{ title: '序号', render: 'no', width: 70 },
|
||||
|
||||
@ -11,7 +11,6 @@ import { of } from 'rxjs';
|
||||
import { ShipperBaseService } from '@shared';
|
||||
import { Router } from '@angular/router';
|
||||
|
||||
|
||||
@Component({
|
||||
selector: 'app-supply-management-bulk',
|
||||
templateUrl: './bulk.component.html',
|
||||
@ -54,9 +53,9 @@ export class OrderManagementBulkComponent implements OnInit {
|
||||
two: '2',
|
||||
three: '2',
|
||||
id: 2
|
||||
},
|
||||
];
|
||||
tabs = {
|
||||
}
|
||||
];
|
||||
tabs = {
|
||||
cancelQuantity: 0,
|
||||
receivedQuantity: 0,
|
||||
stayQuantity: 0,
|
||||
@ -64,21 +63,20 @@ tabs = {
|
||||
compolatelQuantity: 0,
|
||||
GoingQuantity: 0,
|
||||
totalCount: 0
|
||||
};
|
||||
};
|
||||
constructor(
|
||||
public service: OrderManagementService,
|
||||
private modal: NzModalService,
|
||||
public shipperservice: ShipperBaseService,
|
||||
private router: Router,
|
||||
|
||||
) { }
|
||||
private router: Router
|
||||
) {}
|
||||
|
||||
/**
|
||||
* 查询参数
|
||||
*/
|
||||
get reqParams() {
|
||||
const a:any = {};
|
||||
if(this.resourceStatus) {
|
||||
const a: any = {};
|
||||
if (this.resourceStatus) {
|
||||
a.billStatus = this.resourceStatus;
|
||||
}
|
||||
const params: any = Object.assign({}, this.sf?.value || {});
|
||||
@ -88,12 +86,12 @@ tabs = {
|
||||
...params,
|
||||
createTime: {
|
||||
start: this.sf?.value?.createTime?.[0] || '',
|
||||
end: this.sf?.value?.createTime?.[1] || '',
|
||||
},
|
||||
end: this.sf?.value?.createTime?.[1] || ''
|
||||
}
|
||||
};
|
||||
}
|
||||
get selectedRows() {
|
||||
return this.st?.list.filter((item) => item.checked) || [];
|
||||
return this.st?.list.filter(item => item.checked) || [];
|
||||
}
|
||||
get changeParams() {
|
||||
return {
|
||||
@ -102,7 +100,7 @@ tabs = {
|
||||
}
|
||||
search() {
|
||||
this.st?.load(1);
|
||||
this.getGoodsSourceStatistical()
|
||||
this.getGoodsSourceStatistical();
|
||||
}
|
||||
getGoodsSourceStatistical() {
|
||||
this.tabs = {
|
||||
@ -114,39 +112,39 @@ tabs = {
|
||||
GoingQuantity: 0,
|
||||
totalCount: 0
|
||||
};
|
||||
this.service.request(this.service.$api_getBulkStatistical, {...this.reqParams}).subscribe(res => {
|
||||
this.service.request(this.service.$api_getBulkStatistical, { ...this.reqParams }).subscribe(res => {
|
||||
if (res) {
|
||||
let totalCount = 0;
|
||||
res.forEach((element: any) => {
|
||||
if(element.billStatusLabel === '待发车') {
|
||||
this.tabs.stayQuantity = element.quantity
|
||||
if (element.billStatusLabel === '待发车') {
|
||||
this.tabs.stayQuantity = element.quantity;
|
||||
} else if (element.billStatusLabel === '待接单') {
|
||||
this.tabs.receivedQuantity = element.quantity
|
||||
this.tabs.receivedQuantity = element.quantity;
|
||||
} else if (element.billStatusLabel === '待签收') {
|
||||
this.tabs.signQuantity = element.quantity
|
||||
this.tabs.signQuantity = element.quantity;
|
||||
} else if (element.billStatusLabel === '已完成') {
|
||||
this.tabs.compolatelQuantity = element.quantity
|
||||
this.tabs.compolatelQuantity = element.quantity;
|
||||
} else if (element.billStatusLabel === '已取消') {
|
||||
this.tabs.cancelQuantity = element.quantity
|
||||
this.tabs.cancelQuantity = element.quantity;
|
||||
} else if (element.billStatusLabel === '运输中') {
|
||||
this.tabs.GoingQuantity = element.quantity
|
||||
this.tabs.GoingQuantity = element.quantity;
|
||||
}
|
||||
totalCount += element.quantity
|
||||
totalCount += element.quantity;
|
||||
});
|
||||
this.tabs.totalCount = totalCount
|
||||
this.tabs.totalCount = totalCount;
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
selectChange(e: number) {
|
||||
this.resourceStatus = e;
|
||||
this.initST();
|
||||
setTimeout(() => {
|
||||
this.st.load();
|
||||
this.getGoodsSourceStatistical()
|
||||
this.getGoodsSourceStatistical();
|
||||
}, 500);
|
||||
}
|
||||
ngOnInit(): void {
|
||||
this.getGoodsSourceStatistical()
|
||||
this.getGoodsSourceStatistical();
|
||||
this.initSF();
|
||||
this.initST();
|
||||
this.initSTFloat();
|
||||
@ -154,8 +152,6 @@ tabs = {
|
||||
this.initSFView();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 初始化查询表单
|
||||
*/
|
||||
@ -183,14 +179,14 @@ tabs = {
|
||||
onSearch: (q: any) => {
|
||||
if (!!q) {
|
||||
return this.service
|
||||
.request(this.service.$api_enterpriceList, { enterpriseName: q})
|
||||
.pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
|
||||
.request(this.service.$api_enterpriceList, { enterpriseName: q })
|
||||
.pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
|
||||
.toPromise();
|
||||
} else {
|
||||
return of([]);
|
||||
}
|
||||
},
|
||||
} as SFSelectWidgetSchema,
|
||||
}
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
enterpriseProjectId: {
|
||||
type: 'string',
|
||||
@ -247,8 +243,8 @@ tabs = {
|
||||
type: 'string',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
},
|
||||
paymentstatus: {
|
||||
@ -259,9 +255,9 @@ tabs = {
|
||||
params: { dictKey: 'overall:payment:status' },
|
||||
containsAllLable: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
} as SFSelectWidgetSchema,
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
createTime: {
|
||||
title: '创建时间',
|
||||
@ -288,9 +284,9 @@ tabs = {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
},
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
},
|
||||
enterpriseInfoId: {
|
||||
type: 'string',
|
||||
@ -300,10 +296,10 @@ tabs = {
|
||||
placeholder: '请选择',
|
||||
allowClear: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
|
||||
_$expand: (value: boolean) => value
|
||||
},
|
||||
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
|
||||
}
|
||||
},
|
||||
serviceType: {
|
||||
title: '服务类型',
|
||||
@ -314,9 +310,9 @@ tabs = {
|
||||
params: { dictKey: 'service:type' },
|
||||
containsAllLable: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
} as SFSelectWidgetSchema,
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
settlementBasis: {
|
||||
title: '结算依据',
|
||||
@ -325,12 +321,12 @@ tabs = {
|
||||
widget: 'dict-select',
|
||||
containsAllLable: true,
|
||||
params: { dictKey: 'goodresource:settlement:type' },
|
||||
containAllLable:true,
|
||||
containAllLable: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
} as SFSelectWidgetSchema,
|
||||
},
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
} as SFSelectWidgetSchema
|
||||
}
|
||||
},
|
||||
type: 'object'
|
||||
};
|
||||
@ -344,7 +340,7 @@ tabs = {
|
||||
properties: {
|
||||
freightPrice: {
|
||||
type: 'string',
|
||||
title: '运费单价',
|
||||
title: '运费单价'
|
||||
},
|
||||
rule: {
|
||||
title: '',
|
||||
@ -353,9 +349,9 @@ tabs = {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'goodresource:rounding:rules' },
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
} as SFSelectWidgetSchema,
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
settlementBasis: {
|
||||
type: 'string',
|
||||
@ -364,11 +360,11 @@ tabs = {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'goodresource:settlement:type' },
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
} as SFSelectWidgetSchema,
|
||||
},
|
||||
},
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
} as SFSelectWidgetSchema
|
||||
}
|
||||
}
|
||||
};
|
||||
this.uiView = { '*': { spanLabelFixed: 80, grid: { span: 12, gutter: 4 } } };
|
||||
}
|
||||
@ -390,7 +386,7 @@ tabs = {
|
||||
title: '运费明细',
|
||||
width: '250px',
|
||||
className: 'text-right',
|
||||
render: 'mybidDetailInfo',
|
||||
render: 'mybidDetailInfo'
|
||||
},
|
||||
{ title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
|
||||
{ title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left' },
|
||||
@ -409,7 +405,8 @@ tabs = {
|
||||
className: 'text-left',
|
||||
width: '250px',
|
||||
render: 'goodsName'
|
||||
}, {
|
||||
},
|
||||
{
|
||||
title: '运费单价',
|
||||
className: 'text-right',
|
||||
width: '180px',
|
||||
@ -419,13 +416,13 @@ tabs = {
|
||||
title: '接单数量',
|
||||
className: 'text-right',
|
||||
index: 'goodsNumber',
|
||||
width: '180px',
|
||||
width: '180px'
|
||||
},
|
||||
{
|
||||
title: '结算重量',
|
||||
className: 'text-right',
|
||||
index: 'settlementWeight',
|
||||
width: '150px',
|
||||
width: '150px'
|
||||
},
|
||||
{
|
||||
title: '承运司机',
|
||||
@ -439,7 +436,7 @@ tabs = {
|
||||
className: 'text-left',
|
||||
width: '180px',
|
||||
index: 'payeeName',
|
||||
render: 'payeeName',
|
||||
render: 'payeeName'
|
||||
},
|
||||
{
|
||||
title: '装卸货时间',
|
||||
@ -451,7 +448,7 @@ tabs = {
|
||||
title: '创建时间',
|
||||
width: '180px',
|
||||
className: 'text-left',
|
||||
index: 'createTime',
|
||||
index: 'createTime'
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
@ -461,36 +458,38 @@ tabs = {
|
||||
buttons: [
|
||||
{
|
||||
text: '查看评价 ',
|
||||
click: (_record) => this.viewEvaluate(_record),
|
||||
iif: item => item.billStatus == '5',
|
||||
click: _record => this.viewEvaluate(_record),
|
||||
iif: item => item.billStatus == '5'
|
||||
},
|
||||
{
|
||||
text: '运费变更记录',
|
||||
click: (_record) => this.OpenPrice(_record),
|
||||
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6',
|
||||
click: _record => this.OpenPrice(_record),
|
||||
iif: item =>
|
||||
item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6'
|
||||
},
|
||||
{
|
||||
text: '变更运费 ',
|
||||
click: (_record) => this.updateFreight(_record),
|
||||
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
|
||||
click: _record => this.updateFreight(_record),
|
||||
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3'
|
||||
},
|
||||
{
|
||||
text: '确认签收 ',
|
||||
click: (_record) => this.confirmReceipt(_record),
|
||||
iif: item => item.billStatus == '4',
|
||||
click: _record => this.confirmReceipt(_record),
|
||||
iif: item => item.billStatus == '4'
|
||||
},
|
||||
{
|
||||
text: '取消订单 ',
|
||||
click: (_record) => this.cancellation(_record),
|
||||
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1',
|
||||
click: _record => this.cancellation(_record),
|
||||
iif: item =>
|
||||
item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1'
|
||||
},
|
||||
{
|
||||
text: '修改订单 ',
|
||||
click: (_record) => this.changeOrder(_record),
|
||||
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
|
||||
},
|
||||
],
|
||||
},
|
||||
click: _record => this.changeOrder(_record),
|
||||
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3'
|
||||
}
|
||||
]
|
||||
}
|
||||
];
|
||||
}
|
||||
initSTFloat() {
|
||||
@ -518,7 +517,7 @@ tabs = {
|
||||
buttons: [
|
||||
{
|
||||
text: '查看',
|
||||
click: (_record) => this.FloatView(_record),
|
||||
click: _record => this.FloatView(_record)
|
||||
},
|
||||
// {
|
||||
// text: '查看协议',
|
||||
@ -526,11 +525,11 @@ tabs = {
|
||||
// },
|
||||
{
|
||||
text: '撤销',
|
||||
click: (_record) => this.revoke(_record),
|
||||
iif: item => item.handleStatus === '1' || item.handleStatus === 1,
|
||||
},
|
||||
],
|
||||
},
|
||||
click: _record => this.revoke(_record),
|
||||
iif: item => item.handleStatus === '1' || item.handleStatus === 1
|
||||
}
|
||||
]
|
||||
}
|
||||
];
|
||||
}
|
||||
initSTFloatView() {
|
||||
@ -548,17 +547,8 @@ tabs = {
|
||||
index: 'amountAfterChange',
|
||||
render: 'amountAfterChange'
|
||||
},
|
||||
{ title: '变更值',
|
||||
index: 'amountchangeValue',
|
||||
width: '120px',
|
||||
className: 'text-center',
|
||||
render: 'amountchangeValue'
|
||||
},
|
||||
{ title: '变更后',
|
||||
index: 'amountBeforeChange',
|
||||
render: 'amountBeforeChange',
|
||||
width: '120px',
|
||||
className: 'text-center' }
|
||||
{ title: '变更值', index: 'amountchangeValue', width: '120px', className: 'text-center', render: 'amountchangeValue' },
|
||||
{ title: '变更后', index: 'amountBeforeChange', render: 'amountBeforeChange', width: '120px', className: 'text-center' }
|
||||
];
|
||||
}
|
||||
/**
|
||||
@ -579,8 +569,7 @@ tabs = {
|
||||
this._$expand = !this._$expand;
|
||||
this.sf?.setValue('/_$expand', this._$expand);
|
||||
}
|
||||
tabChange(item: any) {
|
||||
}
|
||||
tabChange(item: any) {}
|
||||
/**
|
||||
* 重置表单
|
||||
*/
|
||||
@ -592,11 +581,8 @@ tabs = {
|
||||
/**
|
||||
* 导入货源
|
||||
*/
|
||||
importGoodsSource() {
|
||||
|
||||
}
|
||||
audit(item: any) {
|
||||
}
|
||||
importGoodsSource() {}
|
||||
audit(item: any) {}
|
||||
|
||||
/*
|
||||
* 审核关闭弹窗
|
||||
@ -605,40 +591,38 @@ tabs = {
|
||||
查看评价： 3
|
||||
*/
|
||||
handleCancel(type: string) {
|
||||
if(type === '0') {
|
||||
this.isVisible = false
|
||||
} else if(type === '1') {
|
||||
console.log(type)
|
||||
this.isVisibleView = false
|
||||
} else if(type === '2') {
|
||||
this.isVisibleEvaluate = false
|
||||
if (type === '0') {
|
||||
this.isVisible = false;
|
||||
} else if (type === '1') {
|
||||
console.log(type);
|
||||
this.isVisibleView = false;
|
||||
} else if (type === '2') {
|
||||
this.isVisibleEvaluate = false;
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 审核通过按钮
|
||||
*/
|
||||
handleOK() {
|
||||
|
||||
}
|
||||
handleOK() {}
|
||||
OpenPrice(item: any) {
|
||||
this.changeId = item.id;
|
||||
this.isVisible = true
|
||||
this.isVisible = true;
|
||||
}
|
||||
/**
|
||||
* 浮动费用查看
|
||||
*/
|
||||
FloatView(item: any) {
|
||||
this.changeViewId = item.id;
|
||||
this.service.request(this.service.$api_getChangeRecordBulkDetail, {id: this.changeViewId}).subscribe((res) => {
|
||||
this.service.request(this.service.$api_getChangeRecordBulkDetail, { id: this.changeViewId }).subscribe(res => {
|
||||
this.ViewCause = res;
|
||||
})
|
||||
this.isVisibleView = true
|
||||
});
|
||||
this.isVisibleView = true;
|
||||
}
|
||||
/**
|
||||
*查看评价
|
||||
*/
|
||||
viewEvaluate(item: any) {
|
||||
this.isVisibleEvaluate = true
|
||||
this.isVisibleEvaluate = true;
|
||||
}
|
||||
/**
|
||||
*变更运费
|
||||
@ -652,14 +636,11 @@ tabs = {
|
||||
nzContent: UpdateFreightComponent,
|
||||
nzComponentParams: { data: { ...data, billId: item.id } },
|
||||
nzFooter: null
|
||||
|
||||
});
|
||||
modal.afterClose.subscribe(_ =>
|
||||
{
|
||||
modal.afterClose.subscribe(_ => {
|
||||
this.st.reload(1);
|
||||
this.getGoodsSourceStatistical();
|
||||
}
|
||||
);
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -679,7 +660,7 @@ tabs = {
|
||||
});
|
||||
modalRef.afterClose.subscribe((result: any) => {
|
||||
this.st.load(1);
|
||||
this.getGoodsSourceStatistical()
|
||||
this.getGoodsSourceStatistical();
|
||||
});
|
||||
}
|
||||
userAction() {
|
||||
@ -690,7 +671,7 @@ tabs = {
|
||||
this.service.request(this.service.$api_get_batchSignBulkOrder, params).subscribe(res => {
|
||||
if (res) {
|
||||
this.st.load(1);
|
||||
this.getGoodsSourceStatistical()
|
||||
this.getGoodsSourceStatistical();
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -701,34 +682,34 @@ tabs = {
|
||||
nzTitle: '<b>确定取消该订单吗?</b>',
|
||||
nzContent: `<b>取消后无法恢复，请确认</b>`,
|
||||
nzOnOk: () =>
|
||||
this.service.request(this.service.$api_get_cancelAnOrder, {id: item.id}).subscribe((res) => {
|
||||
this.service.request(this.service.$api_get_cancelAnOrder, { id: item.id }).subscribe(res => {
|
||||
if (res === true) {
|
||||
this.service.msgSrv.success('操作成功！');
|
||||
this.st?.reload(1);
|
||||
this.getGoodsSourceStatistical()
|
||||
this.getGoodsSourceStatistical();
|
||||
this.initST();
|
||||
}
|
||||
this.st?.reload(1);
|
||||
this.getGoodsSourceStatistical()
|
||||
}),
|
||||
this.getGoodsSourceStatistical();
|
||||
})
|
||||
});
|
||||
}
|
||||
revoke(item: any) {
|
||||
this.modal.confirm({
|
||||
nzTitle: '是否确定立即撤销费用变更！</i>',
|
||||
nzOnOk: () =>
|
||||
this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id}).subscribe((res) => {
|
||||
if(res) {
|
||||
this.service.msgSrv.success('撤销成功！')
|
||||
this.stFloat.reload()
|
||||
this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id }).subscribe(res => {
|
||||
if (res) {
|
||||
this.service.msgSrv.success('撤销成功！');
|
||||
this.stFloat.reload();
|
||||
this.st?.reload(1);
|
||||
this.getGoodsSourceStatistical()
|
||||
this.getGoodsSourceStatistical();
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
// 修改订单
|
||||
changeOrder(value: any) {
|
||||
this.router.navigate(['order-management/bulk-detailChange', value.id])
|
||||
this.router.navigate(['order-management/bulk-detailChange', value.id]);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user