diff --git a/admin/src/views/consumer/prescription/order_list.vue b/admin/src/views/consumer/prescription/order_list.vue index 2c0c625c..5fcd9112 100644 --- a/admin/src/views/consumer/prescription/order_list.vue +++ b/admin/src/views/consumer/prescription/order_list.vue @@ -704,7 +704,7 @@ { const num = Number(value) - if (!Number.isFinite(num) || num <= 0) { - callback(new Error('订单金额必须大于0')) + if (!Number.isFinite(num) || num < 0) { + callback(new Error('订单金额不能为负数')) return } callback() @@ -3164,7 +3164,8 @@ function openUpdateAmount() { return } updateAmountForm.id = Number(row?.id) || 0 - updateAmountForm.amount = Number(row?.amount) || undefined + const amt = Number(row?.amount) + updateAmountForm.amount = Number.isFinite(amt) ? amt : undefined updateAmountVisible.value = true nextTick(() => updateAmountFormRef.value?.clearValidate()) } diff --git a/admin/src/views/consumer/prescription/order_list_h5.vue b/admin/src/views/consumer/prescription/order_list_h5.vue index c7a4afc6..61ac921a 100644 --- a/admin/src/views/consumer/prescription/order_list_h5.vue +++ b/admin/src/views/consumer/prescription/order_list_h5.vue @@ -1298,7 +1298,7 @@ { const num = Number(value) - if (!Number.isFinite(num) || num <= 0) { - callback(new Error('订单金额必须大于0')) + if (!Number.isFinite(num) || num < 0) { + callback(new Error('订单金额不能为负数')) return } callback() @@ -3886,7 +3886,8 @@ function openUpdateAmount() { return } updateAmountForm.id = Number(row?.id) || 0 - updateAmountForm.amount = Number(row?.amount) || undefined + const amt = Number(row?.amount) + updateAmountForm.amount = Number.isFinite(amt) ? amt : undefined updateAmountVisible.value = true nextTick(() => updateAmountFormRef.value?.clearValidate()) } diff --git a/admin/src/views/doctor/roster.vue b/admin/src/views/doctor/roster.vue index bc251156..46c95504 100644 --- a/admin/src/views/doctor/roster.vue +++ b/admin/src/views/doctor/roster.vue @@ -231,8 +231,7 @@ import { ref, computed, onMounted } from 'vue' import dayjs from 'dayjs' import isoWeek from 'dayjs/plugin/isoWeek' import feedback from '@/utils/feedback' -import { adminLists } from '@/api/perms/admin' -import { rosterLists, rosterSave, rosterDelete, rosterBatchSave } from '@/api/doctor' +import { doctorLists, rosterLists, rosterSave, rosterDelete, rosterBatchSave } from '@/api/doctor' import { ElMessageBox } from 'element-plus' dayjs.extend(isoWeek) @@ -491,10 +490,9 @@ async function removeSegment(row: RosterSegment) { const loadDoctors = async () => { try { - const res = await adminLists({ + const res = await doctorLists({ page_no: 1, - page_size: 1000, - role_id: 1 + page_size: 1000 }) tableData.value = (res?.lists || []).map((doctor: any) => ({ doctorId: doctor.id, diff --git a/server/app/adminapi/validate/tcm/PrescriptionOrderValidate.php b/server/app/adminapi/validate/tcm/PrescriptionOrderValidate.php index 76500f39..435451fe 100755 --- a/server/app/adminapi/validate/tcm/PrescriptionOrderValidate.php +++ b/server/app/adminapi/validate/tcm/PrescriptionOrderValidate.php @@ -91,6 +91,6 @@ class PrescriptionOrderValidate extends BaseValidate { return $this->only(['id', 'amount']) ->append('id', 'require|integer|gt:0') - ->append('amount', 'require|float|gt:0'); + ->append('amount', 'require|float|egt:0'); } }