update
This commit is contained in:
@@ -481,7 +481,7 @@ export function prescriptionOrderLogs(params: { id: number }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** 修改订单金额 */
|
/** 修改订单金额 */
|
||||||
export function prescriptionOrderUpdateAmount(params: { id: number; amount_update: number }) {
|
export function prescriptionOrderUpdateAmount(params: { id: number; amount: number }) {
|
||||||
return request.post({ url: '/tcm.prescriptionOrder/updateAmount', params })
|
return request.post({ url: '/tcm.prescriptionOrder/updateAmount', params })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1216,9 +1216,9 @@
|
|||||||
<el-form-item label="当前金额">
|
<el-form-item label="当前金额">
|
||||||
<div class="text-sm text-gray-700 font-medium">¥{{ formatMoney(detailData?.amount) }}</div>
|
<div class="text-sm text-gray-700 font-medium">¥{{ formatMoney(detailData?.amount) }}</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="新金额" prop="amount_update">
|
<el-form-item label="新金额" prop="amount">
|
||||||
<el-input-number
|
<el-input-number
|
||||||
v-model="updateAmountForm.amount_update"
|
v-model="updateAmountForm.amount"
|
||||||
:min="0.01"
|
:min="0.01"
|
||||||
:step="0.01"
|
:step="0.01"
|
||||||
:precision="2"
|
:precision="2"
|
||||||
@@ -3356,10 +3356,10 @@ const updateAmountSaving = ref(false)
|
|||||||
const updateAmountFormRef = ref<FormInstance>()
|
const updateAmountFormRef = ref<FormInstance>()
|
||||||
const updateAmountForm = reactive({
|
const updateAmountForm = reactive({
|
||||||
id: 0,
|
id: 0,
|
||||||
amount_update: undefined as number | undefined
|
amount: undefined as number | undefined
|
||||||
})
|
})
|
||||||
const updateAmountRules: FormRules = {
|
const updateAmountRules: FormRules = {
|
||||||
amount_update: [
|
amount: [
|
||||||
{ required: true, message: '请输入订单金额', trigger: 'blur' },
|
{ required: true, message: '请输入订单金额', trigger: 'blur' },
|
||||||
{
|
{
|
||||||
validator: (_rule, value, callback) => {
|
validator: (_rule, value, callback) => {
|
||||||
@@ -3496,7 +3496,7 @@ function resetPatchRxPatientForm() {
|
|||||||
|
|
||||||
function resetUpdateAmountDialog() {
|
function resetUpdateAmountDialog() {
|
||||||
updateAmountForm.id = 0
|
updateAmountForm.id = 0
|
||||||
updateAmountForm.amount_update = undefined
|
updateAmountForm.amount = undefined
|
||||||
updateAmountFormRef.value?.clearValidate()
|
updateAmountFormRef.value?.clearValidate()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3507,7 +3507,7 @@ function openUpdateAmount() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
updateAmountForm.id = Number(row?.id) || 0
|
updateAmountForm.id = Number(row?.id) || 0
|
||||||
updateAmountForm.amount_update = Number(row?.amount) || undefined
|
updateAmountForm.amount = Number(row?.amount) || undefined
|
||||||
updateAmountVisible.value = true
|
updateAmountVisible.value = true
|
||||||
nextTick(() => updateAmountFormRef.value?.clearValidate())
|
nextTick(() => updateAmountFormRef.value?.clearValidate())
|
||||||
}
|
}
|
||||||
@@ -3568,7 +3568,7 @@ async function submitUpdateAmount() {
|
|||||||
try {
|
try {
|
||||||
await prescriptionOrderUpdateAmount({
|
await prescriptionOrderUpdateAmount({
|
||||||
id: orderId,
|
id: orderId,
|
||||||
amount_update: Number(updateAmountForm.amount_update)
|
amount: Number(updateAmountForm.amount)
|
||||||
})
|
})
|
||||||
feedback.msgSuccess('修改成功')
|
feedback.msgSuccess('修改成功')
|
||||||
updateAmountVisible.value = false
|
updateAmountVisible.value = false
|
||||||
|
|||||||
@@ -677,7 +677,19 @@
|
|||||||
<el-row :gutter="16" class="mb-5">
|
<el-row :gutter="16" class="mb-5">
|
||||||
<el-col :xs="12" :sm="6">
|
<el-col :xs="12" :sm="6">
|
||||||
<el-card shadow="never" class="stat-card border border-gray-100 bg-gray-50/50">
|
<el-card shadow="never" class="stat-card border border-gray-100 bg-gray-50/50">
|
||||||
<div class="stat-title text-gray-500 text-xs mb-1">总金额</div>
|
<div class="flex items-center justify-between mb-1">
|
||||||
|
<div class="stat-title text-gray-500 text-xs">总金额</div>
|
||||||
|
<el-button
|
||||||
|
v-if="canUpdateAmount(detailData)"
|
||||||
|
v-perms="['tcm.prescriptionOrder/updateAmount']"
|
||||||
|
type="primary"
|
||||||
|
size="small"
|
||||||
|
link
|
||||||
|
@click="openUpdateAmount"
|
||||||
|
>
|
||||||
|
修改
|
||||||
|
</el-button>
|
||||||
|
</div>
|
||||||
<div class="stat-value text-red-500 font-bold text-xl">¥{{ detailData.amount }}</div>
|
<div class="stat-value text-red-500 font-bold text-xl">¥{{ detailData.amount }}</div>
|
||||||
</el-card>
|
</el-card>
|
||||||
</el-col>
|
</el-col>
|
||||||
@@ -1221,6 +1233,47 @@
|
|||||||
</div>
|
</div>
|
||||||
</el-drawer>
|
</el-drawer>
|
||||||
|
|
||||||
|
<el-dialog
|
||||||
|
v-model="updateAmountVisible"
|
||||||
|
title="修改订单金额"
|
||||||
|
width="92%"
|
||||||
|
destroy-on-close
|
||||||
|
:close-on-click-modal="false"
|
||||||
|
@closed="resetUpdateAmountDialog"
|
||||||
|
>
|
||||||
|
<el-form
|
||||||
|
ref="updateAmountFormRef"
|
||||||
|
:model="updateAmountForm"
|
||||||
|
:rules="updateAmountRules"
|
||||||
|
label-width="84px"
|
||||||
|
@submit.prevent="submitUpdateAmount"
|
||||||
|
>
|
||||||
|
<el-form-item label="当前金额">
|
||||||
|
<div class="text-sm text-gray-700 font-medium">¥{{ formatMoney(detailData?.amount) }}</div>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="新金额" prop="amount">
|
||||||
|
<el-input-number
|
||||||
|
v-model="updateAmountForm.amount"
|
||||||
|
:min="0.01"
|
||||||
|
:step="0.01"
|
||||||
|
:precision="2"
|
||||||
|
controls-position="right"
|
||||||
|
class="w-full"
|
||||||
|
placeholder="请输入新金额"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<div class="text-xs text-gray-400 pl-[84px] -mt-1 leading-relaxed">
|
||||||
|
已完成或已取消订单不可修改。提交成功后会刷新详情与操作日志。
|
||||||
|
</div>
|
||||||
|
</el-form>
|
||||||
|
<template #footer>
|
||||||
|
<el-button @click="updateAmountVisible = false">取消</el-button>
|
||||||
|
<el-button type="primary" :loading="updateAmountSaving" @click="submitUpdateAmount">
|
||||||
|
确认修改
|
||||||
|
</el-button>
|
||||||
|
</template>
|
||||||
|
</el-dialog>
|
||||||
|
|
||||||
<!-- 编辑(分步向导与「创建业务订单」弹窗统一) -->
|
<!-- 编辑(分步向导与「创建业务订单」弹窗统一) -->
|
||||||
<el-dialog
|
<el-dialog
|
||||||
v-model="editVisible"
|
v-model="editVisible"
|
||||||
@@ -2342,6 +2395,7 @@ import {
|
|||||||
prescriptionOrderLogisticsTrace,
|
prescriptionOrderLogisticsTrace,
|
||||||
prescriptionOrderShip,
|
prescriptionOrderShip,
|
||||||
prescriptionOrderLogs,
|
prescriptionOrderLogs,
|
||||||
|
prescriptionOrderUpdateAmount,
|
||||||
prescriptionOrderAddPayOrder,
|
prescriptionOrderAddPayOrder,
|
||||||
prescriptionOrderComplete,
|
prescriptionOrderComplete,
|
||||||
prescriptionOrderRevokeRxAudit,
|
prescriptionOrderRevokeRxAudit,
|
||||||
@@ -3133,6 +3187,12 @@ function handleCardMoreCommand(cmd: string, row: Record<string, any>) {
|
|||||||
else if (cmd === 'withdraw') confirmWithdraw(row as any)
|
else if (cmd === 'withdraw') confirmWithdraw(row as any)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function canUpdateAmount(row: { id?: number; fulfillment_status?: number } | null | undefined) {
|
||||||
|
if (!row?.id) return false
|
||||||
|
const fs = Number(row.fulfillment_status)
|
||||||
|
return fs !== 3 && fs !== 4
|
||||||
|
}
|
||||||
|
|
||||||
const detailVisible = ref(false)
|
const detailVisible = ref(false)
|
||||||
const detailLoading = ref(false)
|
const detailLoading = ref(false)
|
||||||
const detailData = ref<Record<string, any> | null>(null)
|
const detailData = ref<Record<string, any> | null>(null)
|
||||||
@@ -3344,6 +3404,29 @@ const logisticsTracePayload = ref<Record<string, any> | null>(null)
|
|||||||
const logisticsTracePhoneTail = ref('')
|
const logisticsTracePhoneTail = ref('')
|
||||||
|
|
||||||
const detailLogs = ref<any[]>([])
|
const detailLogs = ref<any[]>([])
|
||||||
|
const updateAmountVisible = ref(false)
|
||||||
|
const updateAmountSaving = ref(false)
|
||||||
|
const updateAmountFormRef = ref<FormInstance>()
|
||||||
|
const updateAmountForm = reactive({
|
||||||
|
id: 0,
|
||||||
|
amount: undefined as number | undefined
|
||||||
|
})
|
||||||
|
const updateAmountRules: FormRules = {
|
||||||
|
amount: [
|
||||||
|
{ required: true, message: '请输入订单金额', trigger: 'blur' },
|
||||||
|
{
|
||||||
|
validator: (_rule, value, callback) => {
|
||||||
|
const num = Number(value)
|
||||||
|
if (!Number.isFinite(num) || num <= 0) {
|
||||||
|
callback(new Error('订单金额必须大于0'))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
callback()
|
||||||
|
},
|
||||||
|
trigger: 'blur'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
function canViewPrescriptionOrderLogs() {
|
function canViewPrescriptionOrderLogs() {
|
||||||
const p = userStore.perms || []
|
const p = userStore.perms || []
|
||||||
@@ -3379,6 +3462,7 @@ function logActionText(act: string) {
|
|||||||
revoke_pay_audit: '撤回支付审核',
|
revoke_pay_audit: '撤回支付审核',
|
||||||
gancao_submit: '甘草下单',
|
gancao_submit: '甘草下单',
|
||||||
patch_rx_patient: '处方患者信息',
|
patch_rx_patient: '处方患者信息',
|
||||||
|
update_amount: '修改订单金额',
|
||||||
complete: '完成订单'
|
complete: '完成订单'
|
||||||
}
|
}
|
||||||
return m[act] || act
|
return m[act] || act
|
||||||
@@ -3463,6 +3547,24 @@ function resetPatchRxPatientForm() {
|
|||||||
patchRxPatientForm.phone = ''
|
patchRxPatientForm.phone = ''
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function resetUpdateAmountDialog() {
|
||||||
|
updateAmountForm.id = 0
|
||||||
|
updateAmountForm.amount = undefined
|
||||||
|
updateAmountFormRef.value?.clearValidate()
|
||||||
|
}
|
||||||
|
|
||||||
|
function openUpdateAmount() {
|
||||||
|
const row = detailData.value
|
||||||
|
if (!canUpdateAmount(row)) {
|
||||||
|
feedback.msgWarning('当前订单状态不允许修改金额')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
updateAmountForm.id = Number(row?.id) || 0
|
||||||
|
updateAmountForm.amount = Number(row?.amount) || undefined
|
||||||
|
updateAmountVisible.value = true
|
||||||
|
nextTick(() => updateAmountFormRef.value?.clearValidate())
|
||||||
|
}
|
||||||
|
|
||||||
async function refreshCurrentPrescriptionOrderDetail() {
|
async function refreshCurrentPrescriptionOrderDetail() {
|
||||||
const id = detailData.value?.id
|
const id = detailData.value?.id
|
||||||
if (!id) return
|
if (!id) return
|
||||||
@@ -3502,6 +3604,37 @@ async function submitPatchRxPatient() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function submitUpdateAmount() {
|
||||||
|
const form = updateAmountFormRef.value
|
||||||
|
if (!form) return
|
||||||
|
try {
|
||||||
|
await form.validate()
|
||||||
|
} catch {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (!canUpdateAmount(detailData.value)) {
|
||||||
|
feedback.msgWarning('当前订单状态不允许修改金额')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const orderId = updateAmountForm.id
|
||||||
|
updateAmountSaving.value = true
|
||||||
|
try {
|
||||||
|
await prescriptionOrderUpdateAmount({
|
||||||
|
id: orderId,
|
||||||
|
amount: Number(updateAmountForm.amount)
|
||||||
|
})
|
||||||
|
feedback.msgSuccess('修改成功')
|
||||||
|
updateAmountVisible.value = false
|
||||||
|
await refreshCurrentPrescriptionOrderDetail()
|
||||||
|
await fetchLogs(orderId)
|
||||||
|
getLists()
|
||||||
|
} catch {
|
||||||
|
/* 拦截器已提示 */
|
||||||
|
} finally {
|
||||||
|
updateAmountSaving.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function openDetail(id: number) {
|
async function openDetail(id: number) {
|
||||||
// 修复 Bug:显式彻底清空缓存,防止前一次弹窗的数据残留
|
// 修复 Bug:显式彻底清空缓存,防止前一次弹窗的数据残留
|
||||||
detailData.value = null
|
detailData.value = null
|
||||||
|
|||||||
@@ -105,6 +105,17 @@ class PrescriptionOrderController extends BaseAdminController
|
|||||||
return $this->success('保存成功', $result);
|
return $this->success('保存成功', $result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function updateAmount()
|
||||||
|
{
|
||||||
|
$params = (new PrescriptionOrderValidate())->post()->goCheck('updateAmount');
|
||||||
|
$result = PrescriptionOrderLogic::updateAmount($params, $this->adminId, $this->adminInfo);
|
||||||
|
if ($result === false) {
|
||||||
|
return $this->fail(PrescriptionOrderLogic::getError());
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->success('修改成功');
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改关联处方的患者姓名与手机号(订单详情场景)
|
* 修改关联处方的患者姓名与手机号(订单详情场景)
|
||||||
*/
|
*/
|
||||||
@@ -246,21 +257,6 @@ class PrescriptionOrderController extends BaseAdminController
|
|||||||
return $this->success('', $result);
|
return $this->success('', $result);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改订单金额
|
|
||||||
*/
|
|
||||||
public function updateAmount()
|
|
||||||
{
|
|
||||||
$params = (new PrescriptionOrderValidate())->post()->goCheck('updateAmount');
|
|
||||||
$result = PrescriptionOrderLogic::updateAmount($params, $this->adminId, $this->adminInfo);
|
|
||||||
|
|
||||||
if ($result === false) {
|
|
||||||
return $this->fail(PrescriptionOrderLogic::getError());
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this->success('修改成功');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 为「已发货」订单新增一条关联支付单,并重置支付单审核状态为待审核
|
* 为「已发货」订单新增一条关联支付单,并重置支付单审核状态为待审核
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -2437,18 +2437,19 @@ class PrescriptionOrderLogic
|
|||||||
*/
|
*/
|
||||||
public static function updateAmount(array $params, int $adminId, array $adminInfo): bool
|
public static function updateAmount(array $params, int $adminId, array $adminInfo): bool
|
||||||
{
|
{
|
||||||
|
self::$error = '';
|
||||||
$id = (int) $params['id'];
|
$id = (int) $params['id'];
|
||||||
$newAmount = round((float) $params['amount_update'], 2);
|
$newAmount = round((float) $params['amount'], 2);
|
||||||
|
|
||||||
// 查询订单
|
// 查询订单
|
||||||
$order = PrescriptionOrder::find($id);
|
$order = PrescriptionOrder::where('id', $id)->whereNull('delete_time')->find();
|
||||||
if (!$order) {
|
if (!$order) {
|
||||||
self::setError('订单不存在');
|
self::setError('订单不存在');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 数据权限检查
|
// 数据权限检查
|
||||||
if (!self::checkDataScope($order->toArray(), $adminId, $adminInfo)) {
|
if (!self::canAccessOrder($order, $adminId, $adminInfo)) {
|
||||||
self::setError('无权限操作此订单');
|
self::setError('无权限操作此订单');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -2460,16 +2461,23 @@ class PrescriptionOrderLogic
|
|||||||
}
|
}
|
||||||
|
|
||||||
$oldAmount = round((float) $order->amount, 2);
|
$oldAmount = round((float) $order->amount, 2);
|
||||||
|
$oldAmountCents = (int) round($oldAmount * 100);
|
||||||
|
$newAmountCents = (int) round($newAmount * 100);
|
||||||
|
|
||||||
// 金额未变化
|
// 金额未变化
|
||||||
if (abs($newAmount - $oldAmount) < 0.01) {
|
if ($newAmountCents === $oldAmountCents) {
|
||||||
self::setError('金额未发生变化');
|
self::setError('金额未发生变化');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 更新金额
|
// 更新金额
|
||||||
$order->amount = $newAmount;
|
$order->amount = $newAmount;
|
||||||
$order->save();
|
try {
|
||||||
|
$order->save();
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
self::setError($e->getMessage());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// 记录日志
|
// 记录日志
|
||||||
$summary = sprintf('将订单金额从 ¥%.2f 修改为 ¥%.2f', $oldAmount, $newAmount);
|
$summary = sprintf('将订单金额从 ¥%.2f 修改为 ¥%.2f', $oldAmount, $newAmount);
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ class PrescriptionOrderValidate extends BaseValidate
|
|||||||
'patient_name' => 'require|max:50',
|
'patient_name' => 'require|max:50',
|
||||||
'phone' => 'require|max:20',
|
'phone' => 'require|max:20',
|
||||||
'phone_tail' => 'max:20|regex:/^\\d*$/',
|
'phone_tail' => 'max:20|regex:/^\\d*$/',
|
||||||
'amount_update' => 'require|float|gt:0',
|
|
||||||
];
|
];
|
||||||
|
|
||||||
protected $message = [
|
protected $message = [
|
||||||
@@ -51,8 +50,6 @@ class PrescriptionOrderValidate extends BaseValidate
|
|||||||
'patient_name.require' => '请输入患者姓名',
|
'patient_name.require' => '请输入患者姓名',
|
||||||
'phone.require' => '请输入手机号',
|
'phone.require' => '请输入手机号',
|
||||||
'phone_tail.regex' => '手机后四位仅支持数字',
|
'phone_tail.regex' => '手机后四位仅支持数字',
|
||||||
'amount_update.require' => '请输入订单金额',
|
|
||||||
'amount_update.gt' => '订单金额必须大于0',
|
|
||||||
];
|
];
|
||||||
|
|
||||||
protected $scene = [
|
protected $scene = [
|
||||||
@@ -80,6 +77,13 @@ class PrescriptionOrderValidate extends BaseValidate
|
|||||||
'submitGancaoRecipel' => ['id'],
|
'submitGancaoRecipel' => ['id'],
|
||||||
'previewGancaoRecipel' => ['id'],
|
'previewGancaoRecipel' => ['id'],
|
||||||
'patchPrescriptionPatient' => ['id', 'patient_name', 'phone'],
|
'patchPrescriptionPatient' => ['id', 'patient_name', 'phone'],
|
||||||
'updateAmount' => ['id', 'amount_update'],
|
'updateAmount' => ['id', 'amount'],
|
||||||
];
|
];
|
||||||
|
|
||||||
|
public function updateAmount(): PrescriptionOrderValidate
|
||||||
|
{
|
||||||
|
return $this->only(['id', 'amount'])
|
||||||
|
->append('id', 'require|integer|gt:0')
|
||||||
|
->append('amount', 'require|float|gt:0');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user