From 9aba2935e2ece9ba229868277da49eacb916e167 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Fri, 24 Oct 2025 15:15:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=80=BB=E5=AE=A1=E6=89=B9=E5=8A=A0goodsNa?= =?UTF-8?q?me?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/moneyManage/refundDetail/refundHeader.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue index fe3235e..2c6fd66 100644 --- a/src/views/moneyManage/refundDetail/refundHeader.vue +++ b/src/views/moneyManage/refundDetail/refundHeader.vue @@ -519,7 +519,8 @@ const handlePass = async function () { executor: addForm.value.executor, status: 40, headFinance: adminData.value.adminName, - auditId: auditRow.value.auditId + auditId: auditRow.value.auditId, + goodsName: auditRow.value.goodsName } const result = await API({ url: '/Money/finalReview', From d429f367550c6952526a5714f36f8e9554662b42 Mon Sep 17 00:00:00 2001 From: zhangrenyuan <18990852002@163.com> Date: Fri, 24 Oct 2025 15:30:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=AE=A1=E6=A0=B8=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=88=E9=87=91=E5=B8=81=E5=85=85=E5=80=BC=E3=80=81=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E5=92=8C=E9=87=91=E8=B1=86=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/audit/bean/beanAudit.vue | 18 ++++++++----- src/views/audit/gold/rechargeAudit.vue | 17 +++++++----- src/views/audit/gold/refundAudit.vue | 18 ++++++++----- .../moneyManage/receiveDetail/receiveDetail.vue | 30 +++++++++++----------- 4 files changed, 50 insertions(+), 33 deletions(-) diff --git a/src/views/audit/bean/beanAudit.vue b/src/views/audit/bean/beanAudit.vue index b2f62c4..3fd6aa8 100644 --- a/src/views/audit/bean/beanAudit.vue +++ b/src/views/audit/bean/beanAudit.vue @@ -108,8 +108,8 @@ - - + @@ -117,16 +117,16 @@ - --> + @@ -168,6 +168,7 @@ const sortField = ref('') const sortOrder = ref('') const checkTab = ref('pending') const rejectDialogVisible = ref(false) +const rejectReasonDialogVisible = ref(false) // 驳回理由输入框显示状态 const reason = ref('') const rejectRow = ref({ id: null @@ -391,7 +392,7 @@ const handleReject = async () => { } await API({ url: '/beanAudit/status2', data: params }) ElMessage.success('驳回成功') - rejectDialogVisible.value = false + rejectReasonDialogVisible.value = false await get() cancelClicked.value = false await getStats() @@ -400,6 +401,11 @@ const handleReject = async () => { ElMessage.error('操作失败') } } +// 确认驳回后显示理由输入框 +const showRejectReasonInput = () => { + rejectDialogVisible.value = false // 关闭确认对话框 + rejectReasonDialogVisible.value = true // 打开驳回理由输入框 +} // 处理驳回取消操作 const handleRejectCancel = () => { rejectDialogVisible.value = false diff --git a/src/views/audit/gold/rechargeAudit.vue b/src/views/audit/gold/rechargeAudit.vue index 4d50cfc..083990c 100644 --- a/src/views/audit/gold/rechargeAudit.vue +++ b/src/views/audit/gold/rechargeAudit.vue @@ -166,8 +166,7 @@ - - + @@ -257,6 +256,7 @@ const getTime = ref([]) const activity = ref([]) const market = ref("") const rejectDialogVisible = ref(false) +const rejectReasonDialogVisible = ref(false) // 驳回理由输入框显示状态 const rejectReason = ref('') const approveDialogVisible = ref(false) @@ -690,7 +690,7 @@ const handleReject = async () => { await request({ url: '/audit/audit', data: params }) ElMessage.success('驳回操作成功') - rejectDialogVisible.value = false + rejectReasonDialogVisible.value = false await getRecharge() cancelClicked.value = false await getStats() @@ -699,6 +699,11 @@ const handleReject = async () => { ElMessage.error('操作失败') } } +// 确认驳回后显示理由输入框 +const showRejectReasonInput = () => { + rejectDialogVisible.value = false // 关闭确认对话框 + rejectReasonDialogVisible.value = true // 打开驳回理由输入框 +} // 处理驳回取消操作 const handleRejectCancel = () => { rejectDialogVisible.value = false diff --git a/src/views/audit/gold/refundAudit.vue b/src/views/audit/gold/refundAudit.vue index 497b0a3..ebcc6b2 100644 --- a/src/views/audit/gold/refundAudit.vue +++ b/src/views/audit/gold/refundAudit.vue @@ -153,8 +153,8 @@ @current-change="handleCurrentChange"> - - + - --> + @@ -209,6 +209,7 @@ const defaultTime = [ const activeTimeRange = ref('') const currentRecord = ref(null) // 当前行信息 const rejectDialogVisible = ref(false) +const rejectReasonDialogVisible = ref(false) const rejectReason = ref('') const approveDialogVisible = ref(false) @@ -438,7 +439,7 @@ const handleReject = async () => { } await API({ url: '/audit/audit', data: params }) ElMessage.success('驳回成功') - rejectDialogVisible.value = false + rejectReasonDialogVisible.value = false await get() cancelClicked.value = false await getStats() @@ -448,6 +449,11 @@ const handleReject = async () => { ElMessage.error('操作失败') } } +// 确认驳回后显示理由输入框 +const showRejectReasonInput = () => { + rejectDialogVisible.value = false // 关闭确认对话框 + rejectReasonDialogVisible.value = true // 打开驳回理由输入框 +} // 处理驳回取消操作 const handleRejectCancel = () => { rejectDialogVisible.value = false diff --git a/src/views/moneyManage/receiveDetail/receiveDetail.vue b/src/views/moneyManage/receiveDetail/receiveDetail.vue index 33e2d1d..155e035 100644 --- a/src/views/moneyManage/receiveDetail/receiveDetail.vue +++ b/src/views/moneyManage/receiveDetail/receiveDetail.vue @@ -149,7 +149,7 @@ @@ -224,20 +224,20 @@ @@ -407,7 +407,7 @@
- Date: Fri, 24 Oct 2025 15:59:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9confirmDialog?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/dialogs/ConfirmDialog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/dialogs/ConfirmDialog.vue b/src/components/dialogs/ConfirmDialog.vue index 4cc4f97..396a955 100644 --- a/src/components/dialogs/ConfirmDialog.vue +++ b/src/components/dialogs/ConfirmDialog.vue @@ -6,7 +6,7 @@ :width="width" :close-on-click-modal="false" :style="{ - backgroundImage: 'url(/src/assets/SvgIcons/背景.svg)', + backgroundImage: 'url(@/assets/SvgIcons/背景.svg)', backgroundSize: 'cover', backgroundPosition: 'center', height: '400px'