Merge remote-tracking branch 'origin/release/test' into release/test
This commit is contained in:
@@ -806,6 +806,11 @@ async function reviewReturn(source: object) {
|
|||||||
}
|
}
|
||||||
function canConfirmRelabel(row: { relabelStatusCode?: string }) { return row.relabelStatusCode === 'CUSTOMER_CONFIRM_PENDING' }
|
function canConfirmRelabel(row: { relabelStatusCode?: string }) { return row.relabelStatusCode === 'CUSTOMER_CONFIRM_PENDING' }
|
||||||
function canReworkRelabel(row: { relabelStatusCode?: string }) { return ['CUSTOMER_CONFIRM_PENDING', 'PROCESSING'].includes(row.relabelStatusCode ?? '') }
|
function canReworkRelabel(row: { relabelStatusCode?: string }) { return ['CUSTOMER_CONFIRM_PENDING', 'PROCESSING'].includes(row.relabelStatusCode ?? '') }
|
||||||
|
function hasRelabelActions(row: LastMileOrderListItem) {
|
||||||
|
return access.can(permission.relabelOrderStatus)
|
||||||
|
&& Boolean(row.relabelOrderNo)
|
||||||
|
&& (canConfirmRelabel(row) || canReworkRelabel(row))
|
||||||
|
}
|
||||||
function lastMileRowActions(row: LastMileOrderListItem): RowActionItem[] {
|
function lastMileRowActions(row: LastMileOrderListItem): RowActionItem[] {
|
||||||
return [
|
return [
|
||||||
{ key: 'detail', label: '查看', priority: 500 },
|
{ key: 'detail', label: '查看', priority: 500 },
|
||||||
|
|||||||
Reference in New Issue
Block a user