From c96d3291c1b32db2ab1a11527b29d2f9f9b3ec04 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Thu, 23 Oct 2025 17:13:26 +0800 Subject: [PATCH 1/3] 11 --- .env.development | 4 +- src/views/moneyManage/executor/executor.vue | 7 ++-- .../moneyManage/refundDetail/refundCharge.vue | 6 +-- .../moneyManage/refundDetail/refundFinance.vue | 3 +- .../moneyManage/refundDetail/refundHeader.vue | 6 +-- .../moneyManage/refundDetail/refundService.vue | 48 +++++++--------------- 6 files changed, 27 insertions(+), 47 deletions(-) diff --git a/.env.development b/.env.development index 8a24113..0f38e29 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' +VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' # 测试环境 # VITE_API_BASE='http://54.255.212.181:10704/' # 正式环境 @@ -11,7 +11,7 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload # zhangyong # VITE_API_BASE='http://192.168.3.83:8081/' # 本地 -VITE_API_BASE='http://localhost:8081/' +# VITE_API_BASE='http://localhost:8081/' # sunjiabei # VITE_API_BASE='http://192.168.1.70:8081/' diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue index 27644d0..3e19386 100644 --- a/src/views/moneyManage/executor/executor.vue +++ b/src/views/moneyManage/executor/executor.vue @@ -19,7 +19,7 @@
退款币种 - +
@@ -293,11 +293,12 @@ const getRefund = async function () { // 30：总部财务待审核；32：总部财务驳回； // 40：执行人待处理；41：执行人已处理，退款完成； paymentCurrency: searchForm.value.paymentCurrency, - payType: searchForm.value.payType, + refundCurrency: searchForm.value.refundCurrency, startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "", endtime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "", adminId: adminData.value.id, - account: adminData.value.account + account: adminData.value.account, + refundChannels:searchForm.value.refundChannels } } diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue index 3d58dba..1931824 100644 --- a/src/views/moneyManage/refundDetail/refundCharge.vue +++ b/src/views/moneyManage/refundDetail/refundCharge.vue @@ -112,8 +112,8 @@
- 退款备注 - 退款理由 +
@@ -538,7 +538,7 @@ const handleReject = async function () { } } const showStep = function (row) { - if (!hasMenuPermission(menuTree.value, permissionMapping.refundFinanceProgShow)) { + if (!hasMenuPermission(menuTree.value, permissionMapping.refundChargeProgShow)) { ElMessage.error('无此权限') return } diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue index 4d58ff3..200ba07 100644 --- a/src/views/moneyManage/refundDetail/refundFinance.vue +++ b/src/views/moneyManage/refundDetail/refundFinance.vue @@ -61,7 +61,6 @@ - @@ -112,7 +111,7 @@
- 退款备注 + 退款理由
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue index 2fb9bbf..209d85f 100644 --- a/src/views/moneyManage/refundDetail/refundHeader.vue +++ b/src/views/moneyManage/refundDetail/refundHeader.vue @@ -112,8 +112,8 @@
- 退款备注 - 退款理由 +
@@ -624,7 +624,7 @@ const reset = function () { getRefund() } const showStep = function (row) { - if (!hasMenuPermission(menuTree.value, permissionMapping.refundFinanceProgShow)) { + if (!hasMenuPermission(menuTree.value, permissionMapping.refundHeaderProgShow)) { ElMessage.error('无此权限') return } diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue index 223530d..996e295 100644 --- a/src/views/moneyManage/refundDetail/refundService.vue +++ b/src/views/moneyManage/refundDetail/refundService.vue @@ -22,7 +22,7 @@
订单状态 - +
@@ -246,28 +246,7 @@ const uploadRef = ref(null) const showBack = ref(false) const showError = ref(false) const isKF = adminData.value.adminName.includes('客服') -const statusList = ref([ - { - value:'submitted', - label:'已提交', - }, - { - value: 'back', - label: '已撤回', - }, - { - value: 'pending', - label: '审核中' - }, - { - value: 'completed', - label: '已退款' - }, - { - value:'rejected', - label:'已驳回' - } -]) +const statusList = ref(['已提交', '已撤回', '进行中','已退款','已驳回']) // 查全部 const getRefund = async function () { if (!hasMenuPermission(menuTree.value, permissionMapping.refundServiceShow)) { @@ -275,16 +254,17 @@ const getRefund = async function () { return } try { - if (searchForm.value.statuses === 'submitted') { - searchForm.value.statuses = [10] - } else if (searchForm.value.statuses === 'back') { - searchForm.value.statuses = [11] - } else if (searchForm.value.statuses === 'pending') { - searchForm.value.statuses = [20,30,40] - } else if(searchForm.value.statuses === 'completed') { - searchForm.value.statuses = [41] - } else if(searchForm.value.statuses === 'rejected') { - searchForm.value.statuses = [12,22,32] + const statusParam = ref([]) + if (searchForm.value.statuses === '已提交') { + statusParam.value = [10] + } else if (searchForm.value.statuses === '已撤回') { + statusParam.value = [11] + } else if (searchForm.value.statuses === '进行中') { + statusParam.value = [20,30,40] + } else if(searchForm.value.statuses === '已退款') { + statusParam.value = [41] + } else if(searchForm.value.statuses === '已驳回') { + statusParam.value = [12,22,32] } const params = { pageNum: pagination.value.pageNum, @@ -294,7 +274,7 @@ const getRefund = async function () { name: searchForm.value.name,//姓名 markets: searchForm.value.market,//地区 goodsNames: searchForm.value.goodsName,//商品名 - statuses: searchForm.value.statuses,//10：地区财务待审核；12：地区财务驳回； + statuses: statusParam.value,//10：地区财务待审核；12：地区财务驳回； // 20：地区负责人待审核；22：地区负责人驳回； // 30：总部财务待审核；32：总部财务驳回； // 40：执行人待处理；41：执行人已处理，退款完成； From e8d53b686afd3c0c32f1282aa945b13dd1110705 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Thu, 23 Oct 2025 17:51:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/moneyManage/executor/executor.vue | 6 ++-- .../moneyManage/refundDetail/refundHeader.vue | 41 +++++++++++----------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue index 3e19386..372cadf 100644 --- a/src/views/moneyManage/executor/executor.vue +++ b/src/views/moneyManage/executor/executor.vue @@ -294,8 +294,8 @@ const getRefund = async function () { // 40：执行人待处理；41：执行人已处理，退款完成； paymentCurrency: searchForm.value.paymentCurrency, refundCurrency: searchForm.value.refundCurrency, - startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "", - endtime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "", + sTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "", + eTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "", adminId: adminData.value.id, account: adminData.value.account, refundChannels:searchForm.value.refundChannels @@ -655,7 +655,7 @@ const disabledDate = (time) => { const reset = function () { searchForm.value = { jwcode: '', - market: [], + markets: [], statuses: [] } dateRange.value = [] diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue index 209d85f..4c868c6 100644 --- a/src/views/moneyManage/refundDetail/refundHeader.vue +++ b/src/views/moneyManage/refundDetail/refundHeader.vue @@ -247,10 +247,9 @@ @@ -261,10 +260,10 @@ @@ -275,10 +274,10 @@ @@ -289,9 +288,9 @@ @@ -344,14 +343,14 @@ const areaCharge = ref('')// 地区负责人 const headFinance = ref('')// 总部财务 const executor = ref('')// 指定执行人 const statusStepMap = { - 10: [2, false], - 12: [12, true], + 10: [1, false], + 12: [2, true], 20: [3, false], - 22: [22, true], - 30: [4, false], - 32: [32, true], - 40: [5, false], - 41: [6, false] + 22: [4, true], + 30: [5, false], + 32: [6, true], + 40: [7, false], + 41: [8, false] } const currencies = ref([ { From 528bca6a0da25504da6c112ce0bac53e03340bc9 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Thu, 23 Oct 2025 18:06:32 +0800 Subject: [PATCH 3/3] 11 --- .../moneyManage/refundDetail/refundCharge.vue | 44 +++++++++++----------- .../moneyManage/refundDetail/refundFinance.vue | 41 ++++++++++---------- 2 files changed, 41 insertions(+), 44 deletions(-) diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue index 1931824..a80f186 100644 --- a/src/views/moneyManage/refundDetail/refundCharge.vue +++ b/src/views/moneyManage/refundDetail/refundCharge.vue @@ -237,10 +237,9 @@ @@ -251,10 +250,10 @@ @@ -265,10 +264,10 @@ @@ -279,9 +278,9 @@ @@ -332,14 +331,14 @@ const headFinance = ref('')// 总部财务 const executor = ref('')// 指定执行人 const uploadRef = ref(null) const statusStepMap = { - 10: [2, false], - 12: [12, true], + 10: [1, false], + 12: [2, true], 20: [3, false], - 22: [22, true], - 30: [4, false], - 32: [32, true], - 40: [5, false], - 41: [6, false] + 22: [4, true], + 30: [5, false], + 32: [6, true], + 40: [7, false], + 41: [8, false] } const currencies = ref([ { @@ -528,10 +527,9 @@ const handleReject = async function () { }) if (result.code === 200) { ElMessage.success('审核驳回') - showAudit.value = false getRefund() addForm.value.remark = '' - showReject.value = false + showAudit2.value = false } } catch (error) { ElMessage.error(error.message || '审核失败') diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue index 200ba07..6b4807c 100644 --- a/src/views/moneyManage/refundDetail/refundFinance.vue +++ b/src/views/moneyManage/refundDetail/refundFinance.vue @@ -236,10 +236,9 @@ @@ -250,10 +249,10 @@ @@ -264,10 +263,10 @@ @@ -278,9 +277,9 @@ @@ -396,14 +395,14 @@ const payments = ref([{ } ]) const statusStepMap = { - 10: [2, false], - 12: [12, true], + 10: [1, false], + 12: [2, true], 20: [3, false], - 22: [22, true], - 30: [4, false], - 32: [32, true], - 40: [5, false], - 41: [6, false] + 22: [4, true], + 30: [5, false], + 32: [6, true], + 40: [7, false], + 41: [8, false] } const statusList = ref(['待审核','审核通过','已驳回','退款成功']) // 查全部