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

替换containsAllLable

Browse Source
This commit is contained in:
潘晓云
2022-03-09 16:33:45 +08:00
parent 957a66254f
commit b0a7611ae4
28 changed files with 1365 additions and 1105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,7 @@ export class OrderManagementBulkComponent implements OnInit {
private modal: NzModalService,
public shipperservice: ShipperBaseService,
private router: Router
) {}
) { }
/**
* 查询参数
@ -257,7 +257,7 @@ export class OrderManagementBulkComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'overall:payment:status' },
containsAllLable: true,
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
@ -312,7 +312,7 @@ export class OrderManagementBulkComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'service:type' },
containsAllLable: true,
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
@ -323,7 +323,7 @@ export class OrderManagementBulkComponent implements OnInit {
type: 'string',
ui: {
widget: 'dict-select',
containsAllLable: true,
containsAllLabel: true,
params: { dictKey: 'goodresource:settlement:type' },
containAllLable: true,
visibleIf: {
@ -372,27 +372,27 @@ export class OrderManagementBulkComponent implements OnInit {
};
this.uiView = { '*': { spanLabelFixed: 80, grid: { span: 12, gutter: 4 } } };
}
// 获取城市列表
getRegionCode(regionCode: any) {
console.log(regionCode);
return this.service
.request(this.service.$api_get_enterprise_project, { id: regionCode })
.pipe(
map(res =>
res.map((item: any) => ({
label: item.projectName,
value: item.id
}))
)
// 获取城市列表
getRegionCode(regionCode: any) {
console.log(regionCode);
return this.service
.request(this.service.$api_get_enterprise_project, { id: regionCode })
.pipe(
map(res =>
res.map((item: any) => ({
label: item.projectName,
value: item.id
}))
)
.subscribe(res => {
this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
// if (this.enterpriseProjectIds) {
// this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
// }
});
}
)
.subscribe(res => {
this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
// if (this.enterpriseProjectIds) {
// this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
// }
});
}
/**
* 初始化数据列表
*/
@ -510,7 +510,7 @@ export class OrderManagementBulkComponent implements OnInit {
click: _record => this.cancellation(_record),
iif: item =>
item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1',
acl: { ability: ['ORDER-BULK-signBulkOrder'] },
acl: { ability: ['ORDER-BULK-signBulkOrder'] },
},
{
text: '申请退款　',
@ -605,7 +605,7 @@ export class OrderManagementBulkComponent implements OnInit {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
tabChange(item: any) {}
tabChange(item: any) { }
/**
* 重置表单
*/
@ -617,8 +617,8 @@ export class OrderManagementBulkComponent implements OnInit {
/**
* 导入货源
*/
importGoodsSource() {}
audit(item: any) {}
importGoodsSource() { }
audit(item: any) { }
/*
* 审核关闭弹窗
@ -639,7 +639,7 @@ export class OrderManagementBulkComponent implements OnInit {
/**
* 审核通过按钮
*/
handleOK() {}
handleOK() { }
OpenPrice(item: any) {
this.changeId = item.id;
this.isVisible = true;
@ -692,10 +692,10 @@ export class OrderManagementBulkComponent implements OnInit {
nzFooter: null
});
modal.afterClose.subscribe((res: any) => {
if(res) {
this.st.reload(1);
this.getGoodsSourceStatistical();
}
if (res) {
this.st.reload(1);
this.getGoodsSourceStatistical();
}
});
}
});
@ -772,10 +772,10 @@ export class OrderManagementBulkComponent implements OnInit {
changeOrder(value: any) {
this.router.navigate(['order-management/bulk-detailChange', value.id]);
}
/**
*申请退款
*/
applyRefund(item: any) {
/**
*申请退款
*/
applyRefund(item: any) {
const modalRef = this.modal.create({
nzTitle: '申请退款',
nzContent: OneCarOrderCancelConfirmComponent,
@ -786,7 +786,7 @@ export class OrderManagementBulkComponent implements OnInit {
nzFooter: null
});
modalRef.afterClose.subscribe((res: boolean) => {
if(res) {
if (res) {
this.resetSF;
this.st.load();
}

214
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
View File

@ -51,7 +51,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
private modal: NzModalService,
public shipperservice: ShipperBaseService,
private router: Router
) {}
) { }
/**
* 查询参数
@ -232,7 +232,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'overall:payment:status' },
containsAllLable: true,
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
@ -258,7 +258,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'service:type' },
containsAllLable: true,
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
@ -282,27 +282,27 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
};
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
}
// 获取城市列表
getRegionCode(regionCode: any) {
console.log(regionCode);
return this.service
.request(this.service.$api_get_enterprise_project, { id: regionCode })
.pipe(
map(res =>
res.map((item: any) => ({
label: item.projectName,
value: item.id
}))
)
// 获取城市列表
getRegionCode(regionCode: any) {
console.log(regionCode);
return this.service
.request(this.service.$api_get_enterprise_project, { id: regionCode })
.pipe(
map(res =>
res.map((item: any) => ({
label: item.projectName,
value: item.id
}))
)
.subscribe(res => {
this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
// if (this.enterpriseProjectIds) {
// this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
// }
});
}
)
.subscribe(res => {
this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
// if (this.enterpriseProjectIds) {
// this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
// }
});
}
/**
* 初始化数据列表
*/
@ -428,7 +428,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
className: 'text-center',
index: 'applyUserName'
},
{ title: '状态', index: 'handleStatusLabel', className: 'text-center' },
{ title: '状态', index: 'handleStatusLabel', className: 'text-center' },
{
title: '操作',
fixed: 'right',
@ -441,7 +441,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
{
text: '撤销',
click: (_record) => this.revoke(_record),
iif: item => item.handleStatus === '1' || item.handleStatus === 1,
iif: item => item.handleStatus === '1' || item.handleStatus === 1,
},
],
},
@ -462,16 +462,20 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
index: 'amountAfterChange',
render: 'amountAfterChange'
},
{ title: '变更值',
{
title: '变更值',
index: 'amountchangeValue',
render: 'amountchangeValue',
width: '120px',
className: 'text-center' },
{ title: '变更后',
className: 'text-center'
},
{
title: '变更后',
index: 'amountBeforeChange',
render: 'amountBeforeChange',
width: '120px',
className: 'text-center' }
className: 'text-center'
}
];
}
/**
@ -480,30 +484,30 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
get queryFieldCount(): number {
return Object.keys(this.schema?.properties || {}).length;
}
/**
* 浮动费用查看
*/
FloatView(item: any) {
console.log(item)
this.changeViewId = item.id;
this.service.request(this.service.$api_getChangeRecordWholeDetail, {id: this.changeViewId}).subscribe((res) => {
this.ViewCause = res;
/**
* 浮动费用查看
*/
FloatView(item: any) {
console.log(item)
this.changeViewId = item.id;
this.service.request(this.service.$api_getChangeRecordWholeDetail, { id: this.changeViewId }).subscribe((res) => {
this.ViewCause = res;
})
this.isVisibleView = true
}
revoke(item: any) {
this.modal.confirm({
nzTitle: '是否确定立即撤销费用变更！</i>',
nzOnOk: () =>
this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id }).subscribe((res) => {
console.log(res)
if (res) {
this.service.msgSrv.success('撤销成功！')
this.stFloat.reload()
}
})
this.isVisibleView = true
}
revoke(item: any) {
this.modal.confirm({
nzTitle: '是否确定立即撤销费用变更！</i>',
nzOnOk: () =>
this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id}).subscribe((res) => {
console.log(res)
if(res) {
this.service.msgSrv.success('撤销成功！')
this.stFloat.reload()
}
})
});
}
});
}
/**
* 伸缩查询条件
*/
@ -511,7 +515,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
tabChange(item: any) {}
tabChange(item: any) { }
/**
* 重置表单
*/
@ -523,7 +527,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
/**
* 导入货源
*/
importGoodsSource() {}
importGoodsSource() { }
OpenPrice(item: any) {
this.changeId = item.id;
this.isVisible = true;
@ -580,24 +584,24 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 24 } } };
}
/*
* 审核关闭弹窗
*/
handleCancel(value?: string) {
if(value === '0') {
this.isVisible = false;
} else if(value === '1') {
this.isVisibleRE = false;
} else if(value === '2') {
this.isVisibleView = false;
}
/*
* 审核关闭弹窗
*/
handleCancel(value?: string) {
if (value === '0') {
this.isVisible = false;
} else if (value === '1') {
this.isVisibleRE = false;
} else if (value === '2') {
this.isVisibleView = false;
}
/**
* 审核通过按钮
*/
}
/**
* 审核通过按钮
*/
handleOK() {
let idList: any[] = [];
if(this.selectedRows.length > 0) {
if (this.selectedRows.length > 0) {
this.selectedRows.forEach(item => {
idList.push(item.id);
});
@ -614,55 +618,55 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
this.service.msgSrv.success('提交成功！');
this.isVisibleRE = false;
this.st?.load(1);
this.getGoodsSourceStatistical()
this.getGoodsSourceStatistical()
}
});
}
/**
* 审核拒绝按钮
*/
reject() {
if(!this.sfView.value.complianceRemark) {
this.service.msgSrv.error('备注不能为空！');
return;
}
let idList: any[] = [];
if(this.selectedRows.length > 0) {
this.selectedRows.forEach(item => {
idList.push(item.id);
});
} else {
idList.push(this.sfView.value.billCode)
}
const parms = {
ids: idList,
complianceRemark: this.sfView.value.complianceRemark,
complianceStatus: 2,
};
this.service.request(this.service.$api_get_updateBillByCompliance, parms).subscribe(res => {
if (res) {
this.service.msgSrv.success('提交成功！');
this.isVisibleRE = false;
this.st?.load(1);
this.getGoodsSourceStatistical()
}
});
/**
* 审核拒绝按钮
*/
reject() {
if (!this.sfView.value.complianceRemark) {
this.service.msgSrv.error('备注不能为空！');
return;
}
/**
*合规抽查
*/
let idList: any[] = [];
if (this.selectedRows.length > 0) {
this.selectedRows.forEach(item => {
idList.push(item.id);
});
} else {
idList.push(this.sfView.value.billCode)
}
const parms = {
ids: idList,
complianceRemark: this.sfView.value.complianceRemark,
complianceStatus: 2,
};
this.service.request(this.service.$api_get_updateBillByCompliance, parms).subscribe(res => {
if (res) {
this.service.msgSrv.success('提交成功！');
this.isVisibleRE = false;
this.st?.load(1);
this.getGoodsSourceStatistical()
}
});
}
/**
*合规抽查
*/
audit(item?: any) {
if (item) {
this.isVisibleRE = true;
this.auditId = item.id;
this.initSTAudit(1);
} else {
if(this.selectedRows.length <= 0) {
if (this.selectedRows.length <= 0) {
this.service.msgSrv.error('请选择订单！')
return;
} else {
this.isVisibleRE = true;
this.initSTAudit(2);
this.isVisibleRE = true;
this.initSTAudit(2);
}
}
}

34
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
View File

@ -41,7 +41,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
private modal: NzModalService,
public shipperservice: ShipperBaseService,
private router: Router
) {}
) { }
/**
* 查询参数
@ -207,7 +207,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'overall:payment:status' },
containsAllLable: true,
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
@ -233,7 +233,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'service:type' },
containsAllLable: true,
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
@ -244,7 +244,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
type: 'string',
ui: {
widget: 'dict-select',
containsAllLable: true,
containsAllLabel: true,
params: { dictKey: 'goodresource:settlement:type' },
containAllLable: true,
visibleIf: {
@ -347,7 +347,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
{
text: '修改　　　　',
click: _record => this.modification(_record),
iif: item => item.auditStatus == '1' ,
iif: item => item.auditStatus == '1',
acl: { ability: ['ORDER-RECEIPTS-updateBillExamine'] },
},
{
@ -373,7 +373,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
tabChange(item: any) {}
tabChange(item: any) { }
/**
* 重置表单
*/
@ -385,13 +385,13 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
/**
* 导入货源
*/
importGoodsSource() {}
audit(item: any) {}
importGoodsSource() { }
audit(item: any) { }
/**
* 审核通过按钮
*/
handleOK() {}
handleOK() { }
OpenPrice(item: any) {
this.isVisible = true;
}
@ -410,12 +410,12 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
modalRef.afterClose.subscribe((result: any) => {
this.st.load(1);
this.getGoodsSourceStatistical()
});
});
}
// 生成电子单据
generate(item: any, sts?: number) {
let text = '查看凭证';
if(sts == 2) {
if (sts == 2) {
text = '生成电子单据';
}
const modalRef = this.modal.create({
@ -431,23 +431,23 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
modalRef.afterClose.subscribe((result: any) => {
this.st.load(1);
this.getGoodsSourceStatistical()
});
});
}
// 通过
sign(item?: any) {
let params: any = []
let text = '';
if(item === '1') {
if(this.selectedRows.length <= 0) {
if (item === '1') {
if (this.selectedRows.length <= 0) {
this.service.msgSrv.error('请选择订单！')
return
}
this.selectedRows.forEach(ite => {
params.push(ite.id);
});
text = `<b>已选择${this.selectedRows.length}条订单，确认批量通过审核吗？</b>`
text = `<b>已选择${this.selectedRows.length}条订单，确认批量通过审核吗？</b>`
} else {
text = `<b>确认通过审核吗？</b>`
text = `<b>确认通过审核吗？</b>`
params.push(item.id);
}
console.log(this.selectedRows)
@ -470,7 +470,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
}
// 批量生成电子单据
sign1(item?: any) {
if(this.selectedRows.length <= 0) {
if (this.selectedRows.length <= 0) {
this.service.msgSrv.error('请选择订单！')
return
}

62
src/app/routes/order-management/components/risk/risk.component.ts
View File

@ -40,34 +40,34 @@ export class OrderManagementRiskComponent implements OnInit {
public shipperservice: ShipperBaseService,
private modal: NzModalService,
public router: Router
) {}
) { }
/**
* 查询参数
*/
get reqParams() {
get reqParams() {
// const a:any = {};
// if(this.resourceStatus) {
// a.representationsStatus = this.resourceStatus
// a.representationsStatus = this.resourceStatus
// }
// return {
// ...a,
// ...this.sf?.value,
// };
const a:any = {};
if(this.resourceStatus) {
a.representationsStatus = this.resourceStatus
const a: any = {};
if (this.resourceStatus) {
a.representationsStatus = this.resourceStatus
}
const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand;
return {
return {
...a,
...params,
createTime: {
start: this.sf?.value?.createTime?.[0] || '',
end: this.sf?.value?.createTime?.[1] || '',
},
};
};
}
search() {
this.st?.load(1);
@ -84,17 +84,17 @@ export class OrderManagementRiskComponent implements OnInit {
getGoodsSourceStatistical() {
this.service.request(this.service.$api_get_listStatisticalStatus, this.reqParams).subscribe(res => {
if (res) {
res.forEach((element: any) => {
if(element.representationsStatusLabel === '待申述') {
this.tabs.stayQuantity = element.quantity
} else if (element.representationsStatusLabel === '申诉失败') {
this.tabs.receivedQuantity = element.quantity
} else if (element.representationsStatusLabel === '申述成功') {
this.tabs.cancelQuantity = element.quantity
} else if (element.representationsStatusLabel === '申诉中') {
this.tabs.underwayQuantity = element.quantity
}
});
res.forEach((element: any) => {
if (element.representationsStatusLabel === '待申述') {
this.tabs.stayQuantity = element.quantity
} else if (element.representationsStatusLabel === '申诉失败') {
this.tabs.receivedQuantity = element.quantity
} else if (element.representationsStatusLabel === '申述成功') {
this.tabs.cancelQuantity = element.quantity
} else if (element.representationsStatusLabel === '申诉中') {
this.tabs.underwayQuantity = element.quantity
}
});
}
})
}
@ -168,7 +168,7 @@ export class OrderManagementRiskComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'freight:type' },
containsAllLable: true,
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
@ -180,7 +180,7 @@ export class OrderManagementRiskComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'BulkFreightUnitPriceType' },
containsAllLable: true,
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
@ -307,7 +307,7 @@ export class OrderManagementRiskComponent implements OnInit {
{
text: '审核',
click: _record => this.audit(_record),
iif: item => item.representationsStatus == '1' || item.representationsStatus == '2' ,
iif: item => item.representationsStatus == '1' || item.representationsStatus == '2',
acl: { ability: ['ORDER-RISK-audit'] },
},
{
@ -405,7 +405,7 @@ export class OrderManagementRiskComponent implements OnInit {
/**
* 导入货源
*/
importGoodsSource() {}
importGoodsSource() { }
/*
* 审核关闭弹窗
@ -418,7 +418,7 @@ export class OrderManagementRiskComponent implements OnInit {
*/
handleOK() {
let idList: any[] = [];
if(this.selectedRows.length > 0) {
if (this.selectedRows.length > 0) {
this.selectedRows.forEach(item => {
idList.push(item.id);
});
@ -435,7 +435,7 @@ export class OrderManagementRiskComponent implements OnInit {
this.service.msgSrv.success('审核通过成功！');
this.isVisibleRE = false;
this.st?.load(1);
this.getGoodsSourceStatistical()
this.getGoodsSourceStatistical()
}
});
}
@ -444,14 +444,14 @@ export class OrderManagementRiskComponent implements OnInit {
*/
reject() {
let idList: any[] = [];
if(this.selectedRows.length > 0) {
if (this.selectedRows.length > 0) {
this.selectedRows.forEach(item => {
idList.push(item.id);
});
} else {
idList.push(this.sfView.value.billCode)
}
if(!this.sfView.value.representationsCause) {
if (!this.sfView.value.representationsCause) {
this.service.msgSrv.error('拒绝原因为空！');
return;
}
@ -476,14 +476,14 @@ export class OrderManagementRiskComponent implements OnInit {
if (item) {
this.auditId = item.id;
this.initSTAudit(1);
this.isVisibleRE = true;
this.isVisibleRE = true;
} else {
if(this.selectedRows.length <= 0) {
if (this.selectedRows.length <= 0) {
this.service.msgSrv.error('请选择订单！')
return;
} else {
this.initSTAudit(2);
this.isVisibleRE = true;
this.initSTAudit(2);
this.isVisibleRE = true;
}
}
}

456
src/app/routes/order-management/components/vehicle/vehicle.component.ts
View File

@ -43,34 +43,34 @@ export class OrderManagementVehicleComponent 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 = {
cancelQuantity: 0,
receivedQuantity: 0,
stayQuantity: 0,
signQuantity: 0,
compolatelQuantity: 0,
GoingQuantity: 0,
totalCount: 0
};
resourceStatus: any;
one: '2',
two: '2',
three: '2',
id: 2
},
];
tabs = {
cancelQuantity: 0,
receivedQuantity: 0,
stayQuantity: 0,
signQuantity: 0,
compolatelQuantity: 0,
GoingQuantity: 0,
totalCount: 0
};
resourceStatus: any;
constructor(
public service: OrderManagementService,
private modal: NzModalService,
public shipperservice: ShipperBaseService,
public router: Router,
) { }
) { }
/**
* 查询参数
@ -86,20 +86,20 @@ resourceStatus: any;
};
}
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 || {});
delete params._$expand;
return {
return {
...a,
...params,
createTime: {
start: this.sf?.value?.createTime?.[0] || '',
end: this.sf?.value?.createTime?.[1] || '',
},
};
};
}
get selectedRows() {
return this.st?.list.filter((item) => item.checked) || [];
@ -112,8 +112,8 @@ resourceStatus: any;
this.initSTFloatView();
}
search() {
this.st?.load(1);
this.getGoodsSourceStatistical()
this.st?.load(1);
this.getGoodsSourceStatistical()
}
getGoodsSourceStatistical() {
this.tabs = {
@ -127,26 +127,26 @@ resourceStatus: any;
};
const params: any = Object.assign({}, this.reqParams || {});
delete params.billStatus
this.service.request(this.service.$api_statisticalStatus,params).subscribe(res => {
this.service.request(this.service.$api_statisticalStatus, params).subscribe(res => {
if (res) {
let totalCount = 0;
res.forEach((element: any) => {
if(element.billStatusLabel === '待发车') {
this.tabs.stayQuantity = element.quantity
} else if (element.billStatusLabel === '待接单') {
this.tabs.receivedQuantity = element.quantity
} else if (element.billStatusLabel === '运输中') {
this.tabs.GoingQuantity = element.quantity
} else if (element.billStatusLabel === '待签收') {
this.tabs.signQuantity = element.quantity
} else if (element.billStatusLabel === '已完成') {
this.tabs.compolatelQuantity = element.quantity
} else if (element.billStatusLabel === '已取消') {
this.tabs.cancelQuantity = element.quantity
}
totalCount += element.quantity
});
this.tabs.totalCount = totalCount
res.forEach((element: any) => {
if (element.billStatusLabel === '待发车') {
this.tabs.stayQuantity = element.quantity
} else if (element.billStatusLabel === '待接单') {
this.tabs.receivedQuantity = element.quantity
} else if (element.billStatusLabel === '运输中') {
this.tabs.GoingQuantity = element.quantity
} else if (element.billStatusLabel === '待签收') {
this.tabs.signQuantity = element.quantity
} else if (element.billStatusLabel === '已完成') {
this.tabs.compolatelQuantity = element.quantity
} else if (element.billStatusLabel === '已取消') {
this.tabs.cancelQuantity = element.quantity
}
totalCount += element.quantity
});
this.tabs.totalCount = totalCount
}
})
}
@ -154,14 +154,14 @@ resourceStatus: any;
/**
* 初始化查询表单
*/
initSF() {
initSF() {
this.schema = {
properties: {
_$expand: { type: 'boolean', ui: { hidden: true } },
billCode: {
type: 'string',
title: '订单号'
},
resourceCode: {
type: 'string',
@ -179,7 +179,7 @@ resourceStatus: any;
onSearch: (q: any) => {
if (!!q) {
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))))
.toPromise();
} else {
@ -247,14 +247,14 @@ resourceStatus: any;
_$expand: (value: boolean) => value,
},
}
},
},
paymentStatus: {
title: '支付状态',
type: 'string',
ui: {
widget: 'dict-select',
params: { dictKey: 'overall:payment:status' },
containsAllLable: true,
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value,
},
@ -328,7 +328,7 @@ resourceStatus: any;
ui: {
widget: 'dict-select',
params: { dictKey: 'service:type' },
containsAllLable: true,
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value,
},
@ -345,7 +345,7 @@ resourceStatus: any;
*/
initST() {
this.columns = [
{ title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' },
{ title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' },
{
title: '订单号',
width: '200px',
@ -411,11 +411,11 @@ resourceStatus: any;
width: '120px',
className: 'text-left',
buttons: [
{
text: '运费变更记录',
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',
acl: { ability: ['ORDER-VEHICLE-ChangeApplyList'] },
},
{
@ -460,7 +460,7 @@ resourceStatus: any;
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
// acl: { ability: ['VEHICLE-LIST-view'] },
},
],
},
];
@ -482,7 +482,7 @@ resourceStatus: any;
className: 'text-center',
index: 'applyUserName'
},
{ title: '状态', index: 'handleStatusLabel', className: 'text-center' },
{ title: '状态', index: 'handleStatusLabel', className: 'text-center' },
{
title: '操作',
fixed: 'right',
@ -495,7 +495,7 @@ resourceStatus: any;
{
text: '撤销',
click: (_record) => this.revoke(_record),
iif: item => item.handleStatus === '1' || item.handleStatus === 1,
iif: item => item.handleStatus === '1' || item.handleStatus === 1,
},
],
},
@ -516,39 +516,43 @@ resourceStatus: any;
index: 'amountAfterChange',
render: 'amountAfterChange'
},
{ title: '变更值',
{
title: '变更值',
index: 'amountchangeValue',
render: 'amountchangeValue',
width: '120px',
className: 'text-center' },
{ title: '变更后',
className: 'text-center'
},
{
title: '变更后',
index: 'amountBeforeChange',
render: 'amountBeforeChange',
width: '120px',
className: 'text-center' }
className: 'text-center'
}
];
}
// 获取城市列表
getRegionCode(regionCode: any) {
console.log(regionCode);
return this.service
.request(this.service.$api_get_enterprise_project, { id: regionCode })
.pipe(
map(res =>
res.map((item: any) => ({
label: item.projectName,
value: item.id
}))
// 获取城市列表
getRegionCode(regionCode: any) {
console.log(regionCode);
return this.service
.request(this.service.$api_get_enterprise_project, { id: regionCode })
.pipe(
map(res =>
res.map((item: any) => ({
label: item.projectName,
value: item.id
}))
)
)
)
.subscribe(res => {
this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
// if (this.enterpriseProjectIds) {
// this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
// }
});
}
.subscribe(res => {
this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
// if (this.enterpriseProjectIds) {
// this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
// }
});
}
/**
* 查询字段个数
*/
@ -588,19 +592,19 @@ resourceStatus: any;
audit(item: any) {
}
/*
* 审核关闭弹窗
view: 1
浮动费用： 0
查看评价： 3
*/
/*
* 审核关闭弹窗
view: 1
浮动费用： 0
查看评价： 3
*/
handleCancel(type: string) {
console.log(type)
if(type === '0') {
if (type === '0') {
this.isVisible = false
} else if(type === '1') {
} else if (type === '1') {
this.isVisibleView = false
} else if(type === '2') {
} else if (type === '2') {
this.isVisibleEvaluate = false
}
}
@ -608,20 +612,20 @@ resourceStatus: any;
this.changeId = value.id;
this.isVisible = true
}
/**
* 浮动费用查看
*/
/**
* 浮动费用查看
*/
FloatView(item: any) {
console.log(item)
this.changeViewId = item.id;
this.service.request(this.service.$api_getChangeRecordWholeDetail, {id: this.changeViewId}).subscribe((res) => {
this.service.request(this.service.$api_getChangeRecordWholeDetail, { id: this.changeViewId }).subscribe((res) => {
this.ViewCause = res;
})
this.isVisibleView = true
}
/**
*查看评价
*/
/**
*查看评价
*/
viewEvaluate(item: any) {
console.log(item)
this.isVisibleEvaluate = true
@ -643,22 +647,22 @@ resourceStatus: any;
this.diverList = res.evaluateInfos
});
}
/**
*变更运费
*/
updateFreight(item: any) {
console.log(item?.isFreightChangeApplication)
/**
*变更运费
*/
updateFreight(item: any) {
console.log(item?.isFreightChangeApplication)
this.service.request(this.service.$api_get_getFreightChangeWholeDetail, { id: item.id }).subscribe(data => {
if (data) {
const modal = this.modal.create({
nzTitle: '变更运费',
nzWidth: 580,
nzContent: VehicleUpdateFreightComponent,
nzComponentParams: { data: { ...data, id: item.id,isFreightChangeApplication: item?.isFreightChangeApplication } },
nzComponentParams: { data: { ...data, id: item.id, isFreightChangeApplication: item?.isFreightChangeApplication } },
nzFooter: null,
});
modal.afterClose.subscribe((res: Boolean) => {
if(res) {
modal.afterClose.subscribe((res: Boolean) => {
if (res) {
this.st.load();
this.getGoodsSourceStatistical()
}
@ -669,33 +673,33 @@ resourceStatus: any;
/**
*修改附加费率
*/
modifyRate() {
modifyRate() {
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.id);
});
if(params.length === 0) {
if (params.length === 0) {
this.service.msgSrv.error('请先选择订单！')
return
}
const modal = this.modal.create({
nzTitle: '修改附加费率',
nzWidth: 600,
nzContent: VehicleModifyRateComponent,
nzComponentParams: { data: { ids: params } },
nzFooter: null,
});
modal.afterClose.subscribe((result) => {
if (result) {
this.st.load(1);
this.getGoodsSourceStatistical()
}
});
const modal = this.modal.create({
nzTitle: '修改附加费率',
nzWidth: 600,
nzContent: VehicleModifyRateComponent,
nzComponentParams: { data: { ids: params } },
nzFooter: null,
});
modal.afterClose.subscribe((result) => {
if (result) {
this.st.load(1);
this.getGoodsSourceStatistical()
}
});
}
/**
*修改网络货运人
*/
modifyFreightPeople() {
/**
*修改网络货运人
*/
modifyFreightPeople() {
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.id);
@ -704,73 +708,73 @@ resourceStatus: any;
this.selectedRows.forEach(item => {
params2.push(item.enterpriseInfoId);
});
if(params.length === 0) {
if (params.length === 0) {
this.service.msgSrv.error('请先选择订单！')
return
}
const modal = this.modal.create({
nzTitle: '修改网络货运人',
nzWidth: 600,
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) {
this.st.load(1);
this.getGoodsSourceStatistical()
}
});
const modal = this.modal.create({
nzTitle: '修改网络货运人',
nzWidth: 600,
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) {
this.st.load(1);
this.getGoodsSourceStatistical()
}
});
}
/**
*修改网络货运人
*/
modifycaptain() {
/**
*修改网络货运人
*/
modifycaptain() {
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.id);
});
if(params.length === 0) {
if (params.length === 0) {
this.service.msgSrv.error('请先选择订单！')
return
}
const modal = this.modal.create({
nzTitle: '修改车队长',
nzWidth: 900,
nzContent: VehicleModifyCaptainComponent,
nzComponentParams: { data: { ids: params, } },
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) {
this.st.load(1);
this.getGoodsSourceStatistical()
}
});
const modal = this.modal.create({
nzTitle: '修改车队长',
nzWidth: 900,
nzContent: VehicleModifyCaptainComponent,
nzComponentParams: { data: { ids: params, } },
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) {
this.st.load(1);
this.getGoodsSourceStatistical()
}
});
}
// *确认签收
confirmReceipt(item: any) {
const modalRef = this.modal.create({
nzTitle: '确认签收',
@ -783,61 +787,61 @@ resourceStatus: any;
nzFooter: null
});
}
revoke(item: any) {
this.modal.confirm({
nzTitle: '是否确定立即撤销费用变更！</i>',
nzOnOk: () =>
this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id}).subscribe((res) => {
revoke(item: any) {
this.modal.confirm({
nzTitle: '是否确定立即撤销费用变更！</i>',
nzOnOk: () =>
this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id }).subscribe((res) => {
console.log(res)
if(res) {
if (res) {
this.service.msgSrv.success('撤销成功！')
this.stFloat.reload()
}
})
});
});
}
// 取消订单
cancellation(item: any) {
// api_get_cancelAnOrder
this.modal.confirm({
nzTitle: '<b>确定取消该订单吗?</b>',
nzContent: `<b>取消后无法恢复，请确认</b>`,
nzOnOk: () =>
this.service.request(this.service.$api_get_cancelAnOrder, { id: item.id }).subscribe((res) => {
if (res === true) {
this.service.msgSrv.success('操作成功！');
this.st.load(1);
this.getGoodsSourceStatistical()
this.initST();
}
}),
})
}
userAction() {
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.id);
});
if (params.length === 0) {
this.service.msgSrv.error('请先选择订单！')
return
}
// 取消订单
cancellation(item: any) {
// api_get_cancelAnOrder
this.modal.confirm({
nzTitle: '<b>确定取消该订单吗?</b>',
nzContent: `<b>取消后无法恢复，请确认</b>`,
nzOnOk: () =>
this.service.request(this.service.$api_get_cancelAnOrder, {id: item.id}).subscribe((res) => {
if (res === true) {
this.service.msgSrv.success('操作成功！');
this.st.load(1);
this.getGoodsSourceStatistical()
this.initST();
}
}),
})
}
userAction() {
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.id);
});
if(params.length === 0) {
this.service.msgSrv.error('请先选择订单！')
return
this.service.request(this.service.$api_get_batchSignWholeOrder, params).subscribe(res => {
if (res) {
console.log(res);
this.st.load(1);
this.getGoodsSourceStatistical()
}
this.service.request(this.service.$api_get_batchSignWholeOrder, params).subscribe(res => {
if (res) {
console.log(res);
this.st.load(1);
this.getGoodsSourceStatistical()
}
});
}
// 修改订单
});
}
// 修改订单
changeOrder(value: any) {
this.router.navigate(['order-management/vehicle-detailChange', value.id]);
}
/**
*申请退款
*/
applyRefund(item: any) {
/**
*申请退款
*/
applyRefund(item: any) {
const modalRef = this.modal.create({
nzTitle: '申请退款',
nzContent: OneCarOrderCancelConfirmComponent,
@ -848,7 +852,7 @@ resourceStatus: any;
nzFooter: null
});
modalRef.afterClose.subscribe((res: boolean) => {
if(res) {
if (res) {
this.resetSF;
this.st.load();
}