merge partner
This commit is contained in:
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user