diff --git a/src/views/asset-management/task-management/iot-card-task/index.vue b/src/views/asset-management/task-management/iot-card-task/index.vue index e7f90a9..db17ba6 100644 --- a/src/views/asset-management/task-management/iot-card-task/index.vue +++ b/src/views/asset-management/task-management/iot-card-task/index.vue @@ -5,7 +5,7 @@ diff --git a/src/views/finance/agent-recharge/index.vue b/src/views/finance/agent-recharge/index.vue index d33c94c..dbb3442 100644 --- a/src/views/finance/agent-recharge/index.vue +++ b/src/views/finance/agent-recharge/index.vue @@ -512,12 +512,6 @@ // 加载店铺列表 - 改用级联查询 const loadShops = async () => { try { - // 加载平铺列表用于搜索(保留原有逻辑) - const res1 = await ShopService.getShops({ page: 1, page_size: 9999 }) - if (res1.code === 0) { - shopOptions.value = res1.data.items || [] - } - // 加载顶级店铺用于级联选择 const res2 = await ShopService.getShopsCascade({ parent_id: undefined }) if (res2.code === 0) { diff --git a/src/views/finance/refund/index.vue b/src/views/finance/refund/index.vue index 30e80c7..24827f4 100644 --- a/src/views/finance/refund/index.vue +++ b/src/views/finance/refund/index.vue @@ -740,9 +740,10 @@ refundList.value = res.data.items || [] pagination.total = res.data.total || 0 } - } catch (error) { - console.error(error) - } finally { + } catch (error: any) { + console.error(error) + ElMessage.error(error?.message || '重新提交失败') + } finally { loading.value = false } } @@ -999,17 +1000,9 @@ const getActions = (row: Refund) => { const actions: any[] = [] - // 待审批状态可以审批通过、拒绝或退回 + // 待审批状态可以打回重填、审批通过或审批拒绝 if (row.status === 1) { - // 退回按钮直接显示 - if (hasAuth('refund:return')) { - actions.push({ - label: '退回', - handler: () => handleShowReturn(row), - type: 'primary' - }) - } - // 审批通过和审批拒绝放到更多里 + // 审批通过 if (hasAuth('refund:approve')) { actions.push({ label: '审批通过', @@ -1017,6 +1010,7 @@ type: 'primary' }) } + // 审批拒绝 if (hasAuth('refund:reject')) { actions.push({ label: '审批拒绝', @@ -1024,10 +1018,18 @@ type: 'danger' }) } + // 打回重填 + if (hasAuth('refund:return')) { + actions.push({ + label: '打回重填', + handler: () => handleShowReturn(row), + type: 'primary' + }) + } } - // 已拒绝或已退回状态可以重新提交 - if (row.status === 3 || row.status === 4) { + // 只有已退回状态可以重新提交 + if (row.status === 4 && hasAuth('refund:resubmit')) { actions.push({ label: '重新提交', handler: () => handleShowResubmit(row), diff --git a/src/views/order-management/order-list/index.vue b/src/views/order-management/order-list/index.vue index 11a28b6..290b2f5 100644 --- a/src/views/order-management/order-list/index.vue +++ b/src/views/order-management/order-list/index.vue @@ -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),