This commit is contained in:
@@ -849,6 +849,18 @@
|
||||
)
|
||||
}
|
||||
},
|
||||
{
|
||||
prop: 'payment_status',
|
||||
label: '支付状态',
|
||||
width: 120,
|
||||
formatter: (row: Order) => {
|
||||
return h(
|
||||
ElTag,
|
||||
{ type: getPaymentStatusType(row.payment_status) },
|
||||
() => row.payment_status_text
|
||||
)
|
||||
}
|
||||
},
|
||||
{
|
||||
prop: 'asset_identifier',
|
||||
label: '资产标识符',
|
||||
@@ -887,18 +899,6 @@
|
||||
width: 120,
|
||||
formatter: (row: Order) => row.operator_name || '-'
|
||||
},
|
||||
{
|
||||
prop: 'payment_status',
|
||||
label: '支付状态',
|
||||
width: 120,
|
||||
formatter: (row: Order) => {
|
||||
return h(
|
||||
ElTag,
|
||||
{ type: getPaymentStatusType(row.payment_status) },
|
||||
() => row.payment_status_text
|
||||
)
|
||||
}
|
||||
},
|
||||
{
|
||||
prop: 'commission_status_name',
|
||||
label: '佣金状态',
|
||||
@@ -1199,8 +1199,8 @@
|
||||
const getActions = (row: Order) => {
|
||||
const actions: any[] = []
|
||||
|
||||
// 只有待支付和已支付的订单可以删除
|
||||
if ((row.payment_status === 1 || row.payment_status === 2) && hasAuth('orders:delete')) {
|
||||
// 只有待支付的订单可以删除
|
||||
if (row.payment_status === 1 && hasAuth('orders:delete')) {
|
||||
actions.push({
|
||||
label: '删除',
|
||||
handler: () => handleCancelOrder(row),
|
||||
|
||||
Reference in New Issue
Block a user