Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

车辆接口更新

Browse Source
This commit is contained in:
wangshiming
2022-01-19 13:47:07 +08:00
parent a212b6200f
commit fce0c56506
3 changed files with 394 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

270
src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html
View File

@ -1,119 +1,167 @@
<page-header-wrapper title="费用单" [logo]="logo"> <page-header-wrapper title="费用单" [logo]="logo">
<ng-template #logo> <ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()"> <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
<i nz-icon nzType="left" nzTheme="outline"></i> <i nz-icon nzType="left" nzTheme="outline"></i>
</button> </button>
</ng-template> </ng-template>
</page-header-wrapper> </page-header-wrapper>
<nz-card class="search-box"> <nz-card class="search-box">
<div nz-row> <div nz-row>
<div nz-col nzSpan="24"> <div nz-col nzSpan="24">
<se-container col="3" labelWidth=100 *ngIf="!textStatus"> <se-container col="3" labelWidth="100" *ngIf="!textStatus">
<se-title class="mb-md" style="font-size:18px">基本信息（应收费用）</se-title> <se-title class="mb-md" style="font-size: 18px">基本信息（应收费用）</se-title>
<se label="网络货运人" required> <se label="网络货运人" required>
{{costInfo?.ltdid}} {{ costInfo?.ltdid }}
</se> </se>
<se label="费用类型" required col="2"> <se label="费用类型" required col="2">
{{costInfo?.feetype}} {{ costInfo?.feetype }}
</se> </se>
<se label="费用备注"> <se label="费用备注">
{{costInfo?.arremarks}} {{ costInfo?.arremarks }}
</se> </se>
<se label="应收对象" required> <se label="应收对象" required>
{{costInfo?.artoname}} {{ costInfo?.artoname }}
</se> </se>
<se label="开票类型" required> <se label="开票类型" required>
{{costInfo?.arvattype}} {{ costInfo?.arvattype }}
</se> </se>
<se label="应收金额" required> <se label="应收金额" required>
{{costInfo?.armoeny}} {{ costInfo?.armoeny }}
</se> </se>
<se label="开票金额" required> <se label="开票金额" required>
{{costInfo?.arkpmoney}} {{ costInfo?.arkpmoney }}
</se> </se>
<se label="收款金额" required> <se label="收款金额" required>
{{costInfo?.arbrmmoney}} {{ costInfo?.arbrmmoney }}
</se> </se>
</se-container> </se-container>
<se-container col="3" labelWidth=100 *ngIf="textStatus" class="mt-md"> <se-container col="3" labelWidth="100" *ngIf="textStatus" class="mt-md">
<se-title class="mb-md" style="font-size:18px">基本信息（应付费用）</se-title> <se-title class="mb-md" style="font-size: 18px">基本信息（应付费用）</se-title>
<se label="网络货运人" required> <se label="网络货运人" required>
{{costInfo?.ltdid}} {{ costInfo?.ltdid }}
</se> </se>
<se label="费用类型" required> <se label="费用类型" required>
{{costInfo?.feetype}} {{ costInfo?.feetype }}
</se> </se>
<se label="应付核销" required> <se label="应付核销" required> </se>
</se> <se label="费用备注">
<se label="费用备注"> {{ costInfo?.hrremarks }}
{{costInfo?.hrremarks}} </se>
</se> <se label="应收对象" required>
<se label="应收对象" required> {{ costInfo?.hrtoname }}
{{costInfo?.hrtoname}} </se>
</se> <se label="收票类型" required>
<se label="收票类型" required> {{ costInfo?.hrvattype }}
{{costInfo?.hrvattype}} </se>
</se> <se label="应付金额" required>
<se label="应付金额" required> {{ costInfo?.hrmoney }}
{{costInfo?.hrmoney}} </se>
</se> <se label="收票金额" required>
<se label="收票金额" required> {{ costInfo?.hrvatmoney }}
{{costInfo?.hrvatmoney}} </se>
</se> <se label="付款金额" required>
<se label="付款金额" required> {{ costInfo?.hrpaymoney }}
{{costInfo?.hrpaymoney}} </se>
</se> </se-container>
</se-container>
</div>
</div> </div>
</div>
</nz-card> </nz-card>
<nz-card class="content-box" nzBordered> <nz-card class="content-box" nzBordered>
<nz-tabset> <nz-tabset>
<nz-tab nzTitle="费用明细"> <nz-tab nzTitle="费用明细">
<st #st [data]="costInfo?.ficoFeeLList" [columns]="columns.cost" [page]="{ show: false}" <st
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }"> #st
<ng-template st-row="no" let-item let-index="index" let-column="column"> [scroll]="{ x: '2000px' }"
{{ textStatus ? item.hrmoney : item.hrvatmoney }} [data]="costInfo?.ficoFeeLList"
</ng-template> [columns]="columns.cost"
<ng-template st-row="hrvatmoney" let-item let-index="index" let-column="column"> [page]="{ show: false }"
{{ index+1 }} [loading]="service.http.loading"
</ng-template> [scroll]="{ x: '1200px', y: '370px' }"
</st> >
</nz-tab> <ng-template st-row="hrvatmoney" let-item let-index="index">
<nz-tab nzTitle="开票信息"> {{ item.hrvatmoney | currency}}
<st #st [data]="costInfo?.ficoVatappDatailList" [columns]="columns.requested" [page]="{ show: false}" </ng-template>
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }"> <ng-template st-row="armoney" let-item let-index="index">
<ng-template st-row="no" let-item let-index="index" let-column="column"> {{ item.armoney | currency}}
{{ index+1 }} </ng-template>
</ng-template> <ng-template st-row="arkpmoney" let-item let-index="index">
</st> {{ item.arkpmoney | currency}}
</nz-tab> </ng-template>
<nz-tab nzTitle="收款信息"> <ng-template st-row="no" let-item let-index="index" let-column="column">
<st #st [data]="costInfo?.ficoAhxLList" [columns]="columns.collection" [page]="{ show: false}" {{ textStatus ? item.hrmoney : item.hrvatmoney }}
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }"> </ng-template>
<ng-template st-row="no" let-item let-index="index" let-column="column"> </st>
{{ index+1 }} </nz-tab>
</ng-template> <nz-tab nzTitle="开票信息">
<ng-template st-row="status" let-item let-index="index" let-column="column"> <st
已核销 #st
</ng-template> [scroll]="{ x: '2000px' }"
</st> [data]="costInfo?.ficoVatappDatailList"
</nz-tab> [columns]="columns.requested"
<nz-tab nzTitle="收票信息"> [page]="{ show: false }"
<st #st [data]="data" [columns]="columns.ticket" [page]="{ show: false}" [loading]="service.http.loading" [loading]="service.http.loading"
[scroll]="{ x:'1200px',y: '370px' }"></st> [scroll]="{ x: '1200px', y: '370px' }"
</nz-tab> >
<nz-tab nzTitle="付款信息"> <ng-template st-row="vatnotax" let-item let-index="index">
<st #st [data]="costInfo?.ficoPhxLList" [columns]="columns.payment" [page]="{ show: false}" [loading]="service.http.loading" {{ item.vatnotax | currency}}
[scroll]="{ x:'1200px',y: '370px' }"> </ng-template>
<ng-template st-row="no" let-item let-index="index" let-column="column"> <ng-template st-row="vatmoney" let-item let-index="index">
{{ index+1 }} {{ item.vatmoney | currency}}
</ng-template> </ng-template>
</st> <ng-template st-row="no" let-item let-index="index" let-column="column">
</nz-tab> {{ index + 1 }}
</nz-tabset> </ng-template>
</st>
</nz-tab>
</nz-card> <nz-tab nzTitle="收款信息">
<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"> 已核销 </ng-template>
</st>
</nz-tab>
<nz-tab nzTitle="收票信息">
<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
[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 }}
</ng-template>
</st>
</nz-tab>
</nz-tabset>
</nz-card>

58
src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts
View File

@ -43,39 +43,39 @@ export class CostManagementDetailComponent implements OnInit {
private initST(): { [key: string]: STColumn[] } { private initST(): { [key: string]: STColumn[] } {
return { return {
cost: [ cost: [
{ title: '序号', render: 'no', width: 70 }, { title: '序号', render: 'no', width: 70,className: 'text-left', },
{ title: '费用明细号', index: 'feeHId' }, { title: '费用明细号', index: 'feeHId',className: 'text-left', width: 200,},
{ title: '订单号', index: 'billHId' }, { title: '订单号', index: 'billHId' ,className: 'text-left', width: 200,},
{ title: '订单日期', index: 'callNo' }, { title: '订单日期', index: 'callNo' ,className: 'text-left',width: 200,},
{ title: '运单号', index: 'waybillHId' }, { title: '运单号', index: 'waybillHId',className: 'text-left', width: 200,},
{ title: '运单日期', index: 'waybillDate' }, { title: '运单日期', index: 'waybillDate' ,className: 'text-left',width: 200,},
{ title: '结算客户', index: 'callNo' }, { title: '结算客户', index: 'callNo' ,className: 'text-left',width: 200,},
{ title: '订单费用类型', index: 'billLType' }, { title: '订单费用类型', index: 'billLType' ,className: 'text-left',width: 200,},
{ title: '费用科目', index: 'feeSubId' }, { title: '费用科目', index: 'feeSubId' ,className: 'text-left',width: 200,},
{ title: '税率', index: 'hrvatrate' }, { title: '税率', index: 'hrvatrate',className: 'text-right', width: 200,},
{ title: '费用金额', render: 'hrvatmoney' }, { title: '费用金额', render: 'hrvatmoney',className: 'text-right', width: 200,},
{ title: '收/付款金额', index: 'armoney' }, { title: '收/付款金额', render: 'armoney',className: 'text-right', width: 200,},
{ title: '开/收票金额', index: 'arkpmoney' } { title: '开/收票金额', render: 'arkpmoney' ,className: 'text-right',width: 200,}
], ],
requested: [ requested: [
{ title: '序号', render: 'no', width: 70 }, { title: '序号', render: 'no', width: 70 ,className: 'text-left',},
{ title: '费用明细号', index: 'feeHId' }, { title: '费用明细号', index: 'feeHId',className: 'text-left',width: 200, },
{ title: '发票申请', index: 'vatappcode' }, { title: '发票申请', index: 'vatappcode',className: 'text-left', width: 200,},
{ title: '发票类型', index: 'vatapptype' }, { title: '发票类型', index: 'vatapptype',className: 'text-left',width: 200, },
{ title: '发票号', index: 'vatappcode' }, { title: '发票号', index: 'vatappcode',className: 'text-left',width: 200, },
{ title: '发票日期', index: 'vatappdate' }, { title: '发票日期', index: 'vatappdate',className: 'text-left', width: 200,},
{ title: '发票状态', index: 'sts' }, { title: '发票状态', index: 'sts' ,className: 'text-left',width: 200,},
{ title: '应收金额', index: 'vatnotax' }, { title: '应收金额', render: 'vatnotax',className: 'text-left',width: 200, },
{ title: '开票金额', index: 'vatmoney' } { title: '开票金额', render: 'vatmoney' ,className: 'text-left',width: 200,}
], ],
collection: [ collection: [
{ title: '序号', render: 'no', width: 70 }, { title: '序号', render: 'no', width: 70, },
{ title: '费用明细号', index: 'feeLId' }, { title: '费用明细号', index: 'feeLId' ,className: 'text-left', width: 200,},
{ title: '收款单号', index: 'id' }, { title: '收款单号', index: 'ahxHId' ,className: 'text-left', width: 200,},
{ title: '收款日期', index: 'feedate' }, { title: '收款日期', index: 'feedate' ,className: 'text-left', width: 200,},
{ title: '收款状态', render: 'status' }, { title: '收款状态', render: 'status' ,className: 'text-left', width: 150,},
{ title: '应收金额', index: 'ahxmoney' }, { title: '应收金额', render: 'ahxmoney' ,className: 'text-left', width: 120,},
{ title: '收款金额', index: 'ahxmoney' } { title: '收款金额', render: 'ahxmoney',className: 'text-left', width: 120, }
], ],
ticket: [ ticket: [
{ title: '序号', render: 'no', width: 70 }, { title: '序号', render: 'no', width: 70 },

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

@ -11,7 +11,6 @@ import { of } from 'rxjs';
import { ShipperBaseService } from '@shared'; import { ShipperBaseService } from '@shared';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
@Component({ @Component({
selector: 'app-supply-management-bulk', selector: 'app-supply-management-bulk',
templateUrl: './bulk.component.html', templateUrl: './bulk.component.html',
@ -27,10 +26,10 @@ export class OrderManagementBulkComponent implements OnInit {
isVisibleEvaluate = false; isVisibleEvaluate = false;
isVisible = false; isVisible = false;
_$expand = false; _$expand = false;
changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录 changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录
changeViewId: any; // 查看运费变更记录id - 用于查看 changeViewId: any; // 查看运费变更记录id - 用于查看
ViewCause: any; // 变更运费查看数据 ViewCause: any; // 变更运费查看数据
sfViewFormData: any; // 变更运费查看的sf 数据 sfViewFormData: any; // 变更运费查看的sf 数据
@ViewChild('st') private readonly st!: STComponent; @ViewChild('st') private readonly st!: STComponent;
@ViewChild('stFloat') private readonly stFloat!: STComponent; @ViewChild('stFloat') private readonly stFloat!: STComponent;
@ViewChild('stFloatView') private readonly stFloatView!: STComponent; @ViewChild('stFloatView') private readonly stFloatView!: STComponent;
@ -44,56 +43,55 @@ export class OrderManagementBulkComponent implements OnInit {
resourceStatus: any; resourceStatus: any;
datass: any = [ datass: any = [
{ {
one: '1', one: '1',
two: '1', two: '1',
three: '1', three: '1',
id: 1 id: 1
}, },
{ {
one: '2', one: '2',
two: '2', two: '2',
three: '2', three: '2',
id: 2 id: 2
}, }
]; ];
tabs = { tabs = {
cancelQuantity: 0, cancelQuantity: 0,
receivedQuantity: 0, receivedQuantity: 0,
stayQuantity: 0, stayQuantity: 0,
signQuantity: 0, signQuantity: 0,
compolatelQuantity: 0, compolatelQuantity: 0,
GoingQuantity: 0, GoingQuantity: 0,
totalCount: 0 totalCount: 0
}; };
constructor( constructor(
public service: OrderManagementService, public service: OrderManagementService,
private modal: NzModalService, private modal: NzModalService,
public shipperservice: ShipperBaseService, public shipperservice: ShipperBaseService,
private router: Router, private router: Router
) {}
) { }
/** /**
* 查询参数 * 查询参数
*/ */
get reqParams() { get reqParams() {
const a:any = {}; const a: any = {};
if(this.resourceStatus) { if (this.resourceStatus) {
a.billStatus = this.resourceStatus; a.billStatus = this.resourceStatus;
} }
const params: any = Object.assign({}, this.sf?.value || {}); const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand; delete params._$expand;
return { return {
...a, ...a,
...params, ...params,
createTime: { createTime: {
start: this.sf?.value?.createTime?.[0] || '', start: this.sf?.value?.createTime?.[0] || '',
end: this.sf?.value?.createTime?.[1] || '', end: this.sf?.value?.createTime?.[1] || ''
}, }
}; };
} }
get selectedRows() { get selectedRows() {
return this.st?.list.filter((item) => item.checked) || []; return this.st?.list.filter(item => item.checked) || [];
} }
get changeParams() { get changeParams() {
return { return {
@ -102,7 +100,7 @@ tabs = {
} }
search() { search() {
this.st?.load(1); this.st?.load(1);
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
} }
getGoodsSourceStatistical() { getGoodsSourceStatistical() {
this.tabs = { this.tabs = {
@ -114,39 +112,39 @@ tabs = {
GoingQuantity: 0, GoingQuantity: 0,
totalCount: 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) { if (res) {
let totalCount = 0; let totalCount = 0;
res.forEach((element: any) => { res.forEach((element: any) => {
if(element.billStatusLabel === '待发车') { if (element.billStatusLabel === '待发车') {
this.tabs.stayQuantity = element.quantity this.tabs.stayQuantity = element.quantity;
} else if (element.billStatusLabel === '待接单') { } else if (element.billStatusLabel === '待接单') {
this.tabs.receivedQuantity = element.quantity this.tabs.receivedQuantity = element.quantity;
} else if (element.billStatusLabel === '待签收') { } else if (element.billStatusLabel === '待签收') {
this.tabs.signQuantity = element.quantity this.tabs.signQuantity = element.quantity;
} else if (element.billStatusLabel === '已完成') { } else if (element.billStatusLabel === '已完成') {
this.tabs.compolatelQuantity = element.quantity this.tabs.compolatelQuantity = element.quantity;
} else if (element.billStatusLabel === '已取消') { } else if (element.billStatusLabel === '已取消') {
this.tabs.cancelQuantity = element.quantity this.tabs.cancelQuantity = element.quantity;
} else if (element.billStatusLabel === '运输中') { } 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) { selectChange(e: number) {
this.resourceStatus = e; this.resourceStatus = e;
this.initST(); this.initST();
setTimeout(() => { setTimeout(() => {
this.st.load(); this.st.load();
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
}, 500); }, 500);
} }
ngOnInit(): void { ngOnInit(): void {
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
this.initSF(); this.initSF();
this.initST(); this.initST();
this.initSTFloat(); this.initSTFloat();
@ -154,11 +152,9 @@ tabs = {
this.initSFView(); this.initSFView();
} }
/** /**
* 初始化查询表单 * 初始化查询表单
*/ */
initSF() { initSF() {
this.schema = { this.schema = {
properties: { properties: {
@ -183,14 +179,14 @@ tabs = {
onSearch: (q: any) => { onSearch: (q: any) => {
if (!!q) { if (!!q) {
return this.service return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: q}) .request(this.service.$api_enterpriceList, { enterpriseName: q })
.pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) .pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.toPromise(); .toPromise();
} else { } else {
return of([]); return of([]);
} }
}, }
} as SFSelectWidgetSchema, } as SFSelectWidgetSchema
}, },
enterpriseProjectId: { enterpriseProjectId: {
type: 'string', type: 'string',
@ -247,10 +243,10 @@ tabs = {
type: 'string', type: 'string',
ui: { ui: {
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value, _$expand: (value: boolean) => value
}, }
} }
}, },
paymentstatus: { paymentstatus: {
title: '支付状态', title: '支付状态',
type: 'string', type: 'string',
@ -259,9 +255,9 @@ tabs = {
params: { dictKey: 'overall:payment:status' }, params: { dictKey: 'overall:payment:status' },
containsAllLable: true, containsAllLable: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value, _$expand: (value: boolean) => value
}, }
} as SFSelectWidgetSchema, } as SFSelectWidgetSchema
}, },
createTime: { createTime: {
title: '创建时间', title: '创建时间',
@ -288,9 +284,9 @@ tabs = {
widget: 'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择',
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value, _$expand: (value: boolean) => value
}, }
}, }
}, },
enterpriseInfoId: { enterpriseInfoId: {
type: 'string', type: 'string',
@ -300,10 +296,10 @@ tabs = {
placeholder: '请选择', placeholder: '请选择',
allowClear: true, allowClear: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value, _$expand: (value: boolean) => value
}, },
asyncData: () => this.shipperservice.getNetworkFreightForwarder(), asyncData: () => this.shipperservice.getNetworkFreightForwarder()
}, }
}, },
serviceType: { serviceType: {
title: '服务类型', title: '服务类型',
@ -314,9 +310,9 @@ tabs = {
params: { dictKey: 'service:type' }, params: { dictKey: 'service:type' },
containsAllLable: true, containsAllLable: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value, _$expand: (value: boolean) => value
}, }
} as SFSelectWidgetSchema, } as SFSelectWidgetSchema
}, },
settlementBasis: { settlementBasis: {
title: '结算依据', title: '结算依据',
@ -325,26 +321,26 @@ tabs = {
widget: 'dict-select', widget: 'dict-select',
containsAllLable: true, containsAllLable: true,
params: { dictKey: 'goodresource:settlement:type' }, params: { dictKey: 'goodresource:settlement:type' },
containAllLable:true, containAllLable: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value, _$expand: (value: boolean) => value
}, }
} as SFSelectWidgetSchema, } as SFSelectWidgetSchema
}, }
}, },
type: 'object' type: 'object'
}; };
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
} }
/** /**
* 初始化查询表单 * 初始化查询表单
*/ */
initSFView() { initSFView() {
this.schemaView = { this.schemaView = {
properties: { properties: {
freightPrice: { freightPrice: {
type: 'string', type: 'string',
title: '运费单价', title: '运费单价'
}, },
rule: { rule: {
title: '', title: '',
@ -353,9 +349,9 @@ tabs = {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'goodresource:rounding:rules' }, params: { dictKey: 'goodresource:rounding:rules' },
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value, _$expand: (value: boolean) => value
}, }
} as SFSelectWidgetSchema, } as SFSelectWidgetSchema
}, },
settlementBasis: { settlementBasis: {
type: 'string', type: 'string',
@ -364,11 +360,11 @@ tabs = {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'goodresource:settlement:type' }, params: { dictKey: 'goodresource:settlement:type' },
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value, _$expand: (value: boolean) => value
}, }
} as SFSelectWidgetSchema, } as SFSelectWidgetSchema
}, }
}, }
}; };
this.uiView = { '*': { spanLabelFixed: 80, grid: { span: 12, gutter: 4 } } }; this.uiView = { '*': { spanLabelFixed: 80, grid: { span: 12, gutter: 4 } } };
} }
@ -378,7 +374,7 @@ tabs = {
*/ */
initST() { initST() {
this.columns = [ this.columns = [
{ title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' }, { title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' },
{ {
title: '订单号', title: '订单号',
width: '180px', width: '180px',
@ -390,7 +386,7 @@ tabs = {
title: '运费明细', title: '运费明细',
width: '250px', width: '250px',
className: 'text-right', className: 'text-right',
render: 'mybidDetailInfo', render: 'mybidDetailInfo'
}, },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' }, { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left' }, { title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left' },
@ -409,7 +405,8 @@ tabs = {
className: 'text-left', className: 'text-left',
width: '250px', width: '250px',
render: 'goodsName' render: 'goodsName'
}, { },
{
title: '运费单价', title: '运费单价',
className: 'text-right', className: 'text-right',
width: '180px', width: '180px',
@ -419,13 +416,13 @@ tabs = {
title: '接单数量', title: '接单数量',
className: 'text-right', className: 'text-right',
index: 'goodsNumber', index: 'goodsNumber',
width: '180px', width: '180px'
}, },
{ {
title: '结算重量', title: '结算重量',
className: 'text-right', className: 'text-right',
index: 'settlementWeight', index: 'settlementWeight',
width: '150px', width: '150px'
}, },
{ {
title: '承运司机', title: '承运司机',
@ -439,7 +436,7 @@ tabs = {
className: 'text-left', className: 'text-left',
width: '180px', width: '180px',
index: 'payeeName', index: 'payeeName',
render: 'payeeName', render: 'payeeName'
}, },
{ {
title: '装卸货时间', title: '装卸货时间',
@ -451,7 +448,7 @@ tabs = {
title: '创建时间', title: '创建时间',
width: '180px', width: '180px',
className: 'text-left', className: 'text-left',
index: 'createTime', index: 'createTime'
}, },
{ {
title: '操作', title: '操作',
@ -461,36 +458,38 @@ tabs = {
buttons: [ buttons: [
{ {
text: '查看评价　', text: '查看评价　',
click: (_record) => this.viewEvaluate(_record), click: _record => this.viewEvaluate(_record),
iif: item => item.billStatus == '5', iif: item => item.billStatus == '5'
}, },
{ {
text: '运费变更记录', text: '运费变更记录',
click: (_record) => this.OpenPrice(_record), click: _record => this.OpenPrice(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6', iif: item =>
item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6'
}, },
{ {
text: '变更运费　', text: '变更运费　',
click: (_record) => this.updateFreight(_record), click: _record => this.updateFreight(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3', iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3'
}, },
{ {
text: '确认签收　', text: '确认签收　',
click: (_record) => this.confirmReceipt(_record), click: _record => this.confirmReceipt(_record),
iif: item => item.billStatus == '4', iif: item => item.billStatus == '4'
}, },
{ {
text: '取消订单　', text: '取消订单　',
click: (_record) => this.cancellation(_record), click: _record => this.cancellation(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1', iif: item =>
item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1'
}, },
{ {
text: '修改订单　', text: '修改订单　',
click: (_record) => this.changeOrder(_record), click: _record => this.changeOrder(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3', iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3'
}, }
], ]
}, }
]; ];
} }
initSTFloat() { initSTFloat() {
@ -510,7 +509,7 @@ tabs = {
className: 'text-center', className: 'text-center',
index: 'applyUserName' index: 'applyUserName'
}, },
{ title: '状态', index: 'handleStatusLabel', className: 'text-center' }, { title: '状态', index: 'handleStatusLabel', className: 'text-center' },
{ {
title: '操作', title: '操作',
fixed: 'right', fixed: 'right',
@ -518,7 +517,7 @@ tabs = {
buttons: [ buttons: [
{ {
text: '查看', text: '查看',
click: (_record) => this.FloatView(_record), click: _record => this.FloatView(_record)
}, },
// { // {
// text: '查看协议', // text: '查看协议',
@ -526,11 +525,11 @@ tabs = {
// }, // },
{ {
text: '撤销', text: '撤销',
click: (_record) => this.revoke(_record), click: _record => this.revoke(_record),
iif: item => item.handleStatus === '1' || item.handleStatus === 1, iif: item => item.handleStatus === '1' || item.handleStatus === 1
}, }
], ]
}, }
]; ];
} }
initSTFloatView() { initSTFloatView() {
@ -548,17 +547,8 @@ tabs = {
index: 'amountAfterChange', index: 'amountAfterChange',
render: 'amountAfterChange' render: 'amountAfterChange'
}, },
{ title: '变更值', { title: '变更值', index: 'amountchangeValue', width: '120px', className: 'text-center', render: 'amountchangeValue' },
index: 'amountchangeValue', { title: '变更后', index: 'amountBeforeChange', render: 'amountBeforeChange', width: '120px', className: 'text-center' }
width: '120px',
className: 'text-center',
render: 'amountchangeValue'
},
{ title: '变更后',
index: 'amountBeforeChange',
render: 'amountBeforeChange',
width: '120px',
className: 'text-center' }
]; ];
} }
/** /**
@ -573,14 +563,13 @@ tabs = {
}; };
} }
/** /**
* 伸缩查询条件 * 伸缩查询条件
*/ */
expandToggle(): void { expandToggle(): void {
this._$expand = !this._$expand; this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand); this.sf?.setValue('/_$expand', this._$expand);
} }
tabChange(item: any) { tabChange(item: any) {}
}
/** /**
* 重置表单 * 重置表单
*/ */
@ -592,58 +581,53 @@ tabs = {
/** /**
* 导入货源 * 导入货源
*/ */
importGoodsSource() { importGoodsSource() {}
audit(item: any) {}
} /*
audit(item: any) {
}
/*
* 审核关闭弹窗 * 审核关闭弹窗
view: 1 view: 1
浮动费用： 0 浮动费用： 0
查看评价： 3 查看评价： 3
*/ */
handleCancel(type: string) { handleCancel(type: string) {
if(type === '0') { if (type === '0') {
this.isVisible = false this.isVisible = false;
} else if(type === '1') { } else if (type === '1') {
console.log(type) console.log(type);
this.isVisibleView = false this.isVisibleView = false;
} else if(type === '2') { } else if (type === '2') {
this.isVisibleEvaluate = false this.isVisibleEvaluate = false;
} }
} }
/** /**
* 审核通过按钮 * 审核通过按钮
*/ */
handleOK() { handleOK() {}
}
OpenPrice(item: any) { OpenPrice(item: any) {
this.changeId = item.id; this.changeId = item.id;
this.isVisible = true this.isVisible = true;
} }
/** /**
* 浮动费用查看 * 浮动费用查看
*/ */
FloatView(item: any) { FloatView(item: any) {
this.changeViewId = item.id; 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.ViewCause = res;
}) });
this.isVisibleView = true this.isVisibleView = true;
} }
/** /**
*查看评价 *查看评价
*/ */
viewEvaluate(item: any) { viewEvaluate(item: any) {
this.isVisibleEvaluate = true this.isVisibleEvaluate = true;
} }
/** /**
*变更运费 *变更运费
*/ */
updateFreight(item: any) { updateFreight(item: any) {
this.service.request(this.service.$api_getFreightChangeBulkDetail, { id: item.id }).subscribe(data => { this.service.request(this.service.$api_getFreightChangeBulkDetail, { id: item.id }).subscribe(data => {
if (data) { if (data) {
const modal = this.modal.create({ const modal = this.modal.create({
@ -651,22 +635,19 @@ tabs = {
nzWidth: 580, nzWidth: 580,
nzContent: UpdateFreightComponent, nzContent: UpdateFreightComponent,
nzComponentParams: { data: { ...data, billId: item.id } }, nzComponentParams: { data: { ...data, billId: item.id } },
nzFooter: null nzFooter: null
});
modal.afterClose.subscribe(_ => {
this.st.reload(1);
this.getGoodsSourceStatistical();
}); });
modal.afterClose.subscribe(_ =>
{
this.st.reload(1);
this.getGoodsSourceStatistical();
}
);
} }
}); });
} }
// *确认签收 // *确认签收
confirmReceipt(item: any) { confirmReceipt(item: any) {
const modalRef = this.modal.create({ const modalRef = this.modal.create({
nzTitle: '确认签收', nzTitle: '确认签收',
nzWidth: '50%', nzWidth: '50%',
@ -678,8 +659,8 @@ tabs = {
nzFooter: null nzFooter: null
}); });
modalRef.afterClose.subscribe((result: any) => { modalRef.afterClose.subscribe((result: any) => {
this.st.load(1); this.st.load(1);
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
}); });
} }
userAction() { userAction() {
@ -690,45 +671,45 @@ tabs = {
this.service.request(this.service.$api_get_batchSignBulkOrder, params).subscribe(res => { this.service.request(this.service.$api_get_batchSignBulkOrder, params).subscribe(res => {
if (res) { if (res) {
this.st.load(1); this.st.load(1);
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
} }
}); });
} }
// 取消订单 // 取消订单
cancellation(item: any) { cancellation(item: any) {
// api_get_cancelAnOrder // api_get_cancelAnOrder
this.modal.confirm({ this.modal.confirm({
nzTitle: '<b>确定取消该订单吗?</b>', nzTitle: '<b>确定取消该订单吗?</b>',
nzContent: `<b>取消后无法恢复，请确认</b>`, nzContent: `<b>取消后无法恢复，请确认</b>`,
nzOnOk: () => 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) { if (res === true) {
this.service.msgSrv.success('操作成功！'); this.service.msgSrv.success('操作成功！');
this.st?.reload(1); this.st?.reload(1);
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
this.initST(); this.initST();
} }
this.st?.reload(1); this.st?.reload(1);
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
}),
}) })
} });
revoke(item: any) { }
this.modal.confirm({ revoke(item: any) {
nzTitle: '是否确定立即撤销费用变更！</i>', this.modal.confirm({
nzOnOk: () => nzTitle: '是否确定立即撤销费用变更！</i>',
this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id}).subscribe((res) => { nzOnOk: () =>
if(res) { this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id }).subscribe(res => {
this.service.msgSrv.success('撤销成功！') if (res) {
this.stFloat.reload() this.service.msgSrv.success('撤销成功！');
this.st?.reload(1); this.stFloat.reload();
this.getGoodsSourceStatistical() this.st?.reload(1);
} this.getGoodsSourceStatistical();
}) }
}); })
} });
// 修改订单 }
changeOrder(value: any) { // 修改订单
this.router.navigate(['order-management/bulk-detailChange', value.id]) changeOrder(value: any) {
} this.router.navigate(['order-management/bulk-detailChange', value.id]);
}
} }