merge partner

This commit is contained in:
Taric Xin
2022-03-23 14:24:21 +08:00
226 changed files with 15751 additions and 993 deletions

View File

@ -277,7 +277,7 @@ export class OrderManagementBulkComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'overall:payment:status' },
containsAllLable: true,
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
@ -332,7 +332,7 @@ export class OrderManagementBulkComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'service:type' },
containsAllLable: true,
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
@ -343,7 +343,7 @@ export class OrderManagementBulkComponent implements OnInit {
type: 'string',
ui: {
widget: 'dict-select',
containsAllLable: true,
containsAllLabel: true,
params: { dictKey: 'goodresource:settlement:type' },
containAllLable: true,
visibleIf: {
@ -392,27 +392,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);
// }
});
}
/**
* 初始化数据列表
*/
@ -553,8 +553,9 @@ export class OrderManagementBulkComponent implements OnInit {
{
text: '取消订单',
click: _record => this.cancellation(_record),
iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2',
acl: { ability: ['ORDER-BULK-signBulkOrder'] },
iif: item =>
item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1',
acl: { ability: ['ORDER-BULK-signBulkOrder'] },
},
{
text: '申请退款',
@ -649,7 +650,7 @@ export class OrderManagementBulkComponent implements OnInit {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
tabChange(item: any) {}
tabChange(item: any) { }
/**
* 重置表单
*/
@ -661,8 +662,8 @@ export class OrderManagementBulkComponent implements OnInit {
/**
* 导入货源
*/
importGoodsSource() {}
audit(item: any) {}
importGoodsSource() { }
audit(item: any) { }
/*
* 审核关闭弹窗
@ -683,7 +684,7 @@ export class OrderManagementBulkComponent implements OnInit {
/**
* 审核通过按钮
*/
handleOK() {}
handleOK() { }
OpenPrice(item: any) {
this.changeId = item.id;
this.isVisible = true;
@ -736,10 +737,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();
}
});
}
});
@ -816,10 +817,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,
@ -830,7 +831,7 @@ export class OrderManagementBulkComponent implements OnInit {
nzFooter: null
});
modalRef.afterClose.subscribe((res: boolean) => {
if(res) {
if (res) {
this.resetSF;
this.st.load();
}

View File

@ -51,7 +51,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
private modal: NzModalService,
public shipperservice: ShipperBaseService,
private router: Router
) {}
) { }
/**
* 查询参数
@ -236,7 +236,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'overall:payment:status' },
containsAllLable: true,
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
@ -262,7 +262,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'service:type' },
containsAllLable: true,
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
@ -286,27 +286,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);
// }
});
}
/**
* 初始化数据列表
*/
@ -432,7 +432,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',
@ -445,7 +445,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,
},
],
},
@ -466,16 +466,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'
}
];
}
/**
@ -484,30 +488,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()
}
})
});
}
});
}
/**
* 伸缩查询条件
*/
@ -515,7 +519,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
tabChange(item: any) {}
tabChange(item: any) { }
/**
* 重置表单
*/
@ -527,7 +531,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
/**
* 导入货源
*/
importGoodsSource() {}
importGoodsSource() { }
OpenPrice(item: any) {
this.changeId = item.id;
this.isVisible = true;
@ -584,24 +588,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);
});
@ -618,55 +622,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);
}
}
}

View File

@ -41,7 +41,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
private modal: NzModalService,
public shipperservice: ShipperBaseService,
private router: Router
) {}
) { }
/**
* 查询参数
@ -211,7 +211,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'overall:payment:status' },
containsAllLable: true,
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
@ -237,7 +237,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'service:type' },
containsAllLable: true,
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
@ -248,7 +248,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
type: 'string',
ui: {
widget: 'dict-select',
containsAllLable: true,
containsAllLabel: true,
params: { dictKey: 'goodresource:settlement:type' },
containAllLable: true,
visibleIf: {
@ -351,7 +351,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'] },
},
{
@ -377,7 +377,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
tabChange(item: any) {}
tabChange(item: any) { }
/**
* 重置表单
*/
@ -389,13 +389,13 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
/**
* 导入货源
*/
importGoodsSource() {}
audit(item: any) {}
importGoodsSource() { }
audit(item: any) { }
/**
* 审核通过按钮
*/
handleOK() {}
handleOK() { }
OpenPrice(item: any) {
this.isVisible = true;
}
@ -414,12 +414,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({
@ -435,23 +435,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)
@ -474,7 +474,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
}
// 批量生成电子单据
sign1(item?: any) {
if(this.selectedRows.length <= 0) {
if (this.selectedRows.length <= 0) {
this.service.msgSrv.error('请选择订单!')
return
}

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);
@ -173,7 +173,7 @@ export class OrderManagementRiskComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'freight:type' },
containsAllLable: true,
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
@ -185,7 +185,7 @@ export class OrderManagementRiskComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'BulkFreightUnitPriceType' },
containsAllLable: true,
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
@ -312,7 +312,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'] },
},
{
@ -410,7 +410,7 @@ export class OrderManagementRiskComponent implements OnInit {
/**
* 导入货源
*/
importGoodsSource() {}
importGoodsSource() { }
/*
* 审核关闭弹窗
@ -423,7 +423,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);
});
@ -440,7 +440,7 @@ export class OrderManagementRiskComponent implements OnInit {
this.service.msgSrv.success('审核通过成功!');
this.isVisibleRE = false;
this.st?.load(1);
this.getGoodsSourceStatistical()
this.getGoodsSourceStatistical()
}
});
}
@ -449,14 +449,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;
}
@ -481,14 +481,14 @@ export class OrderManagementRiskComponent implements OnInit {
if (item) {
this.auditId = item.billCode;
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;
}
}
}

View File

@ -55,7 +55,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
two: '2',
three: '2',
id: 2
}
},
];
tabs = {
cancelQuantity: 0,
@ -732,10 +732,6 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
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();
// }
// });

View File

@ -211,7 +211,7 @@ export class OrderManagementService extends ShipperBaseService {
})
);
}
constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
super(injector, eaCacheSrv);
constructor(public injector: Injector) {
super(injector);
}
}