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

edit

Browse Source
This commit is contained in:
Taric Xin
2022-01-12 10:47:36 +08:00
parent 9d8da4f37e
commit 75808bbaf5
27 changed files with 330 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

341
src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
View File

@ -11,11 +11,10 @@ import { VehicleSureArriveComponent } from 'src/app/routes/order-management/moda
import { VehicleSureDepartComponent } from 'src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component';
import { WaybillManagementServe } from '../../services/waybill-management.service';
@Component({
selector: 'app-supply-management-vehicle',
templateUrl: './vehicle.component.html',
styleUrls: ['./vehicle.component.less']
styleUrls: ['./vehicle.component.less', '../../../commom/less/expend-but.less', '../../../commom/less/box.less']
})
export class WaybillManagementVehicleComponent implements OnInit {
ui: SFUISchema = {};
@ -36,62 +35,60 @@ export class WaybillManagementVehicleComponent implements OnInit {
columnsFloatView: STColumn[] = [];
datass: any = [
{
one: '1',
two: '1',
three: '1',
id: 1
},
one: '1',
two: '1',
three: '1',
id: 1
},
{
one: '2',
two: '2',
three: '2',
id: 2
},
];
tabs = {
signQuantity: 0,
cancelQuantity: 0,
receivedQuantity: 0,
stayQuantity: 0
};
constructor(public service: WaybillManagementServe, private modal: NzModalService, public service2: ShipperBaseService) { }
one: '2',
two: '2',
three: '2',
id: 2
}
];
tabs = {
signQuantity: 0,
cancelQuantity: 0,
receivedQuantity: 0,
stayQuantity: 0
};
constructor(public service: WaybillManagementServe, private modal: NzModalService, public service2: ShipperBaseService) {}
/**
* 查询参数
*/
get reqParams() {
const a:any = {};
if(this.resourceStatus) {
a.wayBillStatus = this.resourceStatus
* 查询参数
*/
get reqParams() {
const a: any = {};
if (this.resourceStatus) {
a.wayBillStatus = this.resourceStatus;
}
return {
...a,
...this.sf?.value,
...this.sf?.value
};
}
get selectedRows() {
return this.st?.list.filter((item) => item.checked) || [];
return this.st?.list.filter(item => item.checked) || [];
}
ngOnInit(): void {
this.initSF();
this.initST();
this.getGoodsSourceStatistical()
this.getGoodsSourceStatistical();
this.initSTFloat();
this.initSTFloatView();
}
/**
* 初始化查询表单
*/
initSF() {
* 初始化查询表单
*/
initSF() {
this.schema = {
properties: {
_$expand: { type: 'boolean', ui: { hidden: true } },
wayBillCodeno: {
type: 'string',
title: '运单号',
title: '运单号'
},
resourceCode: {
type: 'string',
@ -106,8 +103,8 @@ tabs = {
title: '装货地',
ui: {
visibleIf: {
_$expand: (value: boolean) => value,
},
_$expand: (value: boolean) => value
}
}
},
dischargePlace: {
@ -115,8 +112,8 @@ tabs = {
title: '卸货地',
ui: {
visibleIf: {
_$expand: (value: boolean) => value,
},
_$expand: (value: boolean) => value
}
}
},
driverId: {
@ -130,20 +127,19 @@ tabs = {
onSearch: (q: any) => {
if (!!q) {
return this.service
.request(this.service.$api_get_getDriverInfo, { keyword: q,
model: 1, type: 1 })
.pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.id } as SFSchemaEnum))))
.request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 1 })
.pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.id } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
carNo: {
carNo: {
title: '车牌号',
type: 'string',
ui: {
@ -157,18 +153,18 @@ tabs = {
.request(this.service.$api_get_getCarLicenseListByCarNo, {
carNo: q
})
.pipe(map((res: any[]) => (res as any[]).map((i) => ({ label: i.carNo, value: i.carNo } as SFSchemaEnum))))
.pipe(map((res: any[]) => (res as any[]).map(i => ({ label: i.carNo, value: i.carNo } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
},
payeeId: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
payeeId: {
title: '车队长',
type: 'string',
ui: {
@ -179,30 +175,29 @@ tabs = {
onSearch: (q: any) => {
if (!!q) {
return this.service
.request(this.service.$api_get_getDriverInfo, { keyword: q,
model: 1, type: 2 })
.pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.id } as SFSchemaEnum))))
.request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 2 })
.pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.id } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
},
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
paymentstatus: {
title: '支付状态',
type: 'string',
ui: {
widget: 'dict-select',
params: { dictKey: 'payment:status' },
containAllLable:true,
containAllLable: true,
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
createTime: {
title: '创建时间',
@ -212,9 +207,9 @@ tabs = {
mode: 'range',
format: 'yyyy-MM-dd',
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFDateWidgetSchema,
_$expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
isRiskSheet: {
type: 'string',
@ -229,9 +224,9 @@ tabs = {
widget: 'select',
placeholder: '请选择',
visibleIf: {
_$expand: (value: boolean) => value,
},
},
_$expand: (value: boolean) => value
}
}
},
enterpriseInfoName: {
type: 'string',
@ -240,11 +235,11 @@ tabs = {
widget: 'select',
placeholder: '请选择',
visibleIf: {
_$expand: (value: boolean) => value,
_$expand: (value: boolean) => value
},
allowClear: true,
asyncData: () => this.service2.getNetworkFreightForwarder(),
},
asyncData: () => this.service2.getNetworkFreightForwarder()
}
},
goodsName: {
type: 'string',
@ -253,14 +248,14 @@ tabs = {
widget: 'select',
placeholder: '请选择',
visibleIf: {
_$expand: (value: boolean) => value,
_$expand: (value: boolean) => value
},
allowClear: true,
asyncData: () => this.getCatalogueMember(),
},
},
asyncData: () => this.getCatalogueMember()
}
}
},
type: 'object',
type: 'object'
};
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
}
@ -305,26 +300,23 @@ tabs = {
width: '120px',
index: 'unloadingAddressArr'
},
{
{
title: '货物信息',
className: 'text-center',
width: '180px',
render: 'goodsInfos'
},
{
title: '承运司机',
className: 'text-center',
width: '120px',
index: 'driverName'
},
{
title: '收款人',
className: 'text-center',
width: '120px',
index: 'payeeName'
},
{
title: '装卸货时间',
@ -336,7 +328,7 @@ tabs = {
title: '创建时间',
width: '130px',
className: 'text-center',
index: 'createTime',
index: 'createTime'
},
{
title: '操作',
@ -346,20 +338,20 @@ tabs = {
buttons: [
{
text: '查看评价',
click: (_record) => this.viewEvaluate(_record),
click: _record => this.viewEvaluate(_record)
},
{
text: '确认发车',
click: (_record) => this.sureDepart(_record),
iif: item => item.wayBillStatus == '2' ,
click: _record => this.sureDepart(_record),
iif: item => item.wayBillStatus == '2'
},
{
text: '确认到车',
click: (_record) => this.sureArrive(_record),
iif: item => item.wayBillStatus == '3' ,
},
],
},
click: _record => this.sureArrive(_record),
iif: item => item.wayBillStatus == '3'
}
]
}
];
}
initSTFloat() {
@ -367,19 +359,19 @@ tabs = {
{
title: '序号',
className: 'text-center',
index: 'one',
index: 'one'
},
{
title: '操作时间',
className: 'text-center',
index: 'two',
index: 'two'
},
{
title: '操作人',
className: 'text-center',
index: 'three',
index: 'three'
},
{ title: '状态', index: 'externalSn', className: 'text-center' },
{ title: '状态', index: 'externalSn', className: 'text-center' },
{
title: '操作',
fixed: 'right',
@ -387,14 +379,14 @@ tabs = {
buttons: [
{
text: '查看',
click: (_record) => this.FloatView(_record),
click: _record => this.FloatView(_record)
},
{
text: '撤销',
click: (_record) => this.audit(_record),
},
],
},
click: _record => this.audit(_record)
}
]
}
];
}
initSTFloatView() {
@ -408,7 +400,7 @@ tabs = {
{
title: '变更前',
width: '100px',
className: 'text-center',
className: 'text-center'
},
{ title: '变更值', index: 'externalSn', width: '120px', className: 'text-center' },
{ title: '变更后', index: 'externalSn', width: '120px', className: 'text-center' }
@ -421,14 +413,14 @@ tabs = {
return Object.keys(this.schema?.properties || {}).length;
}
/**
* 伸缩查询条件
*/
* 伸缩查询条件
*/
expandToggle(): void {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
tabChange(item: any) {
console.log(item)
console.log(item);
}
/**
* 重置表单
@ -438,18 +430,15 @@ tabs = {
this._$expand = false;
}
// 获取录单员
// 获取录单员
getCatalogueMember() {
const params = {
};
const params = {};
return this.service.request(this.service.$api_get_catalogue_member, params, 'GET').pipe(
map((res) => {
map(res => {
if (res) {
console.log(res)
console.log(res);
}
}),
})
);
}
@ -464,105 +453,97 @@ tabs = {
/**
* 导入货源
*/
importGoodsSource() {
}
importGoodsSource() {}
audit(item: any) {
console.log(item)
console.log(item);
}
/*
/*
* 审核关闭弹窗
view: 1
浮动费用： 0
查看评价： 3
*/
handleCancel(type: string) {
console.log(type)
if(type === '0') {
this.isVisible = false
} else if(type === '1') {
console.log(type)
this.isVisibleView = false
} else if(type === '2') {
console.log(type)
this.isVisibleEvaluate = false
console.log(type);
if (type === '0') {
this.isVisible = false;
} else if (type === '1') {
console.log(type);
this.isVisibleView = false;
} else if (type === '2') {
console.log(type);
this.isVisibleEvaluate = false;
}
}
/**
* 审核通过按钮
*/
handleOK() {
}
/**
* 审核通过按钮
*/
handleOK() {}
OpenPrice() {
this.isVisible = true
this.isVisible = true;
}
/**
* 浮动费用查看
*/
/**
* 浮动费用查看
*/
FloatView(item: any) {
console.log(item)
this.isVisibleView = true
console.log(item);
this.isVisibleView = true;
}
/**
*查看评价
*/
/**
*查看评价
*/
viewEvaluate(item: any) {
console.log(item)
this.isVisibleEvaluate = true
console.log(item);
this.isVisibleEvaluate = true;
}
getGoodsSourceStatistical() {
this.service.request(this.service.$api_get_getWholeStatistics).subscribe(res => {
if (res) {
res.forEach((ele: any) => {
switch(ele.wayBillStatus) {
res.forEach((ele: any) => {
switch (ele.wayBillStatus) {
case '1':
this.tabs.stayQuantity = ele?.count;
break;
this.tabs.stayQuantity = ele?.count;
break;
case '2':
this.tabs.receivedQuantity = ele?.count;
break;
case '3':
this.tabs.cancelQuantity = ele?.count;
break;
break;
case '4':
this.tabs.signQuantity = ele?.count;
break;
break;
}
});
});
}
})
});
}
// *确认发车
sureDepart(item: any) {
const modalRef = this.modal.create({
nzTitle: '确认发车',
nzWidth: '50%',
nzContent: VehicleSureDepartComponent,
nzComponentParams: {
i: item,
Status: 1
},
nzFooter: null
});
}
// 确认到车
sureArrive(item: any) {
const modalRef = this.modal.create({
nzTitle: '确认到车',
nzWidth: '50%',
nzContent: VehicleSureArriveComponent,
nzComponentParams: {
i: item,
Status: 1
},
nzFooter: null
});
}
// *确认发车
sureDepart(item: any) {
const modalRef = this.modal.create({
nzTitle: '确认发车',
nzWidth: '50%',
nzContent: VehicleSureDepartComponent,
nzComponentParams: {
i: item,
Status: 1
},
nzFooter: null
});
}
// 确认到车
sureArrive(item: any) {
const modalRef = this.modal.create({
nzTitle: '确认到车',
nzWidth: '50%',
nzContent: VehicleSureArriveComponent,
nzComponentParams: {
i: item,
Status: 1
},
nzFooter: null
});
}
}