diff --git a/admin/src/views/consumer/prescription/order_list.vue b/admin/src/views/consumer/prescription/order_list.vue index 9bcd3c50..3dd3c77a 100644 --- a/admin/src/views/consumer/prescription/order_list.vue +++ b/admin/src/views/consumer/prescription/order_list.vue @@ -3807,9 +3807,9 @@ function canCompleteRow(row: { fulfillment_status?: number; payment_slip_audit_s } function canRefundRow(row: { fulfillment_status?: number; payment_slip_audit_status?: number }) { - // 已发货(5) / 已签收(6) / 已完成(3),且支付审核已通过(1) 可退款 + // 已发货(5) / 已签收(6) / 已完成(3) / 拒收(9),且支付审核已通过(1) 可退款 const fs = Number(row.fulfillment_status) - return (fs === 5 || fs === 6 || fs === 3) && Number(row.payment_slip_audit_status) === 1 + return (fs === 5 || fs === 6 || fs === 3 || fs === 9) && Number(row.payment_slip_audit_status) === 1 } function canQuickTrackRow(row: { fulfillment_status?: number }) { diff --git a/admin/src/views/consumer/prescription/order_list_h5.vue b/admin/src/views/consumer/prescription/order_list_h5.vue index d881395e..517a5e35 100644 --- a/admin/src/views/consumer/prescription/order_list_h5.vue +++ b/admin/src/views/consumer/prescription/order_list_h5.vue @@ -3324,7 +3324,7 @@ function canCompleteRow(row: { fulfillment_status?: number; payment_slip_audit_s function canRefundRow(row: { fulfillment_status?: number; payment_slip_audit_status?: number }) { const fs = Number(row.fulfillment_status) - return (fs === 5 || fs === 6 || fs === 3) && Number(row.payment_slip_audit_status) === 1 + return (fs === 5 || fs === 6 || fs === 3 || fs === 9) && Number(row.payment_slip_audit_status) === 1 } function canQuickTrackRow(row: { fulfillment_status?: number }) { diff --git a/server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php b/server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php index b4de2d5a..aa977417 100755 --- a/server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php +++ b/server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php @@ -2652,8 +2652,8 @@ class PrescriptionOrderLogic return false; } $curFs = (int) $order->fulfillment_status; - if (!in_array($curFs, [3, 5, 6], true)) { - self::$error = '仅「已发货」「已签收」或「已完成」状态可退款'; + if (!in_array($curFs, [3, 5, 6, 9], true)) { + self::$error = '仅「已发货」「已签收」「已完成」或「拒收」状态可退款'; return false; }