diff --git a/admin/src/views/consumer/prescription/index.vue b/admin/src/views/consumer/prescription/index.vue index 78bb048b..c456fb54 100644 --- a/admin/src/views/consumer/prescription/index.vue +++ b/admin/src/views/consumer/prescription/index.vue @@ -1656,6 +1656,7 @@ async function submitCreateOrderFromPrescription() { const orderNo = row?.order_no feedback.msgSuccess(orderNo ? `业务订单已创建,单号:${orderNo}` : '业务订单已创建') createOrderVisible.value = false + getLists() } catch (e) { console.error(e) } finally { diff --git a/admin/src/views/consumer/prescription/order_list.vue b/admin/src/views/consumer/prescription/order_list.vue index c648987d..34da8af8 100644 --- a/admin/src/views/consumer/prescription/order_list.vue +++ b/admin/src/views/consumer/prescription/order_list.vue @@ -8,6 +8,43 @@ + +
+
+ 处方审核 +
+ {{ tab.label }} +
+
+
+ 支付单审核 +
+ {{ tab.label }} +
+
+
+
+ @@ -1587,9 +1624,33 @@ const loadServicePackageOptions = async () => { const queryParams = reactive({ order_no: '', prescription_id: '' as string | number, - fulfillment_status: '' as number | '' + fulfillment_status: '' as number | '', + prescription_audit_status: '' as number | '', + payment_slip_audit_status: '' as number | '' }) +const rxAuditTabs = [ + { label: '全部', value: '' as number | '' }, + { label: '待审核', value: 0 }, + { label: '已通过', value: 1 }, + { label: '已驳回', value: 2 } +] +const payAuditTabs = [ + { label: '全部', value: '' as number | '' }, + { label: '待审核', value: 0 }, + { label: '已通过', value: 1 }, + { label: '已驳回', value: 2 } +] + +function handleRxAuditTabClick(val: number | '') { + queryParams.prescription_audit_status = val + resetPage() +} +function handlePayAuditTabClick(val: number | '') { + queryParams.payment_slip_audit_status = val + resetPage() +} + async function fetchLists(params: Record) { const p: Record = { ...params } if (p.prescription_id === '' || p.prescription_id === undefined) { @@ -1600,6 +1661,12 @@ async function fetchLists(params: Record) { if (p.fulfillment_status === '' || p.fulfillment_status === undefined) { delete p.fulfillment_status } + if (p.prescription_audit_status === '' || p.prescription_audit_status === undefined) { + delete p.prescription_audit_status + } + if (p.payment_slip_audit_status === '' || p.payment_slip_audit_status === undefined) { + delete p.payment_slip_audit_status + } if (!p.order_no) delete p.order_no return prescriptionOrderLists(p) } @@ -1613,6 +1680,8 @@ function handleReset() { queryParams.order_no = '' queryParams.prescription_id = '' queryParams.fulfillment_status = '' + queryParams.prescription_audit_status = '' + queryParams.payment_slip_audit_status = '' resetParams() } diff --git a/server/app/adminapi/lists/tcm/PrescriptionOrderLists.php b/server/app/adminapi/lists/tcm/PrescriptionOrderLists.php index f2851018..f639a530 100644 --- a/server/app/adminapi/lists/tcm/PrescriptionOrderLists.php +++ b/server/app/adminapi/lists/tcm/PrescriptionOrderLists.php @@ -19,7 +19,7 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn public function setSearch(): array { return [ - '=' => ['prescription_id', 'fulfillment_status'], + '=' => ['prescription_id', 'fulfillment_status', 'prescription_audit_status', 'payment_slip_audit_status'], '%like%' => ['order_no'], ]; }