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

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-04-27 16:57:30 +08:00
parent 9fa1a206ef
commit eb015bf42e
4 changed files with 31 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,14 +53,14 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
if (this.resourceStatus) {
a.auditStatus = this.resourceStatus;
}
const params: any = Object.assign({}, this.sf?.value || {});
const params: any = Object.assign({}, this.sfValue || {});
delete params._$expand;
return {
...a,
...params,
createTime: {
start: this.sf?.value?.createTime?.[0] || '',
end: this.sf?.value?.createTime?.[1] || ''
start: this.sfValue?.createTime?.[0] || '',
end: this.sfValue?.createTime?.[1] || ''
}
};
}
@ -69,15 +69,15 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
if (this.resourceStatus) {
a.auditStatus = this.resourceStatus;
}
const params: any = Object.assign({}, this.sf?.value || {});
const params: any = Object.assign({}, this.sfValue || {});
delete params._$expand;
if (this.sf) {
if (this.sfValue) {
Object.assign(requestOptions.body, {
...a,
...params,
createTime: {
start: this.sf?.value?.createTime?.[0] || '',
end: this.sf?.value?.createTime?.[1] || ''
start: this.sfValue?.createTime?.[0] || '',
end: this.sfValue?.createTime?.[1] || ''
}
});
}
@ -170,9 +170,6 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value
},
onSearch: (q: any) => {
let str = q.replace(/^\s+|\s+$/g, '');
if (str) {
@ -195,54 +192,42 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
ui: {
widget: 'select',
placeholder: '请先选择货主',
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
loadingPlace: {
type: 'string',
title: '装货地',
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
},
dischargePlace: {
type: 'string',
title: '卸货地',
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
},
driverName: {
title: '承运司机',
type: 'string',
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
},
carNo: {
title: '车牌号',
type: 'string',
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
},
carCaptainName: {
title: '车队长',
type: 'string',
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
},
paymentStatus: {
@ -252,9 +237,7 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
widget: 'dict-select',
params: { dictKey: 'overall:payment:status' },
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
enterpriseInfoId: {
@ -264,9 +247,6 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
widget: 'select',
placeholder: '请选择',
allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value
},
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
}
},
@ -278,9 +258,7 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
widget: 'dict-select',
params: { dictKey: 'service:type' },
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
billStatus: {
@ -291,9 +269,7 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
widget: 'dict-select',
params: { dictKey: 'bill:status' },
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
loadingDocuments: {
@ -310,9 +286,7 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
widget: 'select',
placeholder: '请选择',
allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value
}
}
}
},