ZYT/zyt
2
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
Your Name
2026-06-03 14:48:57 +08:00
parent 37df208706
commit 2138626519
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/src/views/consumer/prescription/order_list.vue
+2 -2
View File
@@ -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 }) { 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) 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 }) { function canQuickTrackRow(row: { fulfillment_status?: number }) {
admin/src/views/consumer/prescription/order_list_h5.vue
+1 -1
View File
@@ -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 }) { function canRefundRow(row: { fulfillment_status?: number; payment_slip_audit_status?: number }) {
const fs = Number(row.fulfillment_status) 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 }) { function canQuickTrackRow(row: { fulfillment_status?: number }) {
server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php
+2 -2
View File
@@ -2652,8 +2652,8 @@ class PrescriptionOrderLogic
return false; return false;
} }
$curFs = (int) $order->fulfillment_status; $curFs = (int) $order->fulfillment_status;
if (!in_array($curFs, [3, 5, 6], true)) { if (!in_array($curFs, [3, 5, 6, 9], true)) {
self::$error = '仅「已发货」「已签收」或「已完成」状态可退款'; self::$error = '仅「已发货」「已签收」「已完成」或「拒收」状态可退款';
return false; return false;
} }