diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue index 27644d0..372cadf 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, - 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') : "", + refundCurrency: searchForm.value.refundCurrency, + 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 + account: adminData.value.account, + refundChannels:searchForm.value.refundChannels } } @@ -654,7 +655,7 @@ const disabledDate = (time) => { const reset = function () { searchForm.value = { jwcode: '', - market: [], + markets: [], statuses: [] } dateRange.value = [] diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue index 3d58dba..a80f186 100644 --- a/src/views/moneyManage/refundDetail/refundCharge.vue +++ b/src/views/moneyManage/refundDetail/refundCharge.vue @@ -112,8 +112,8 @@
- 退款备注 - 退款理由 +
@@ -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,17 +527,16 @@ 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 || '审核失败') } } 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..6b4807c 100644 --- a/src/views/moneyManage/refundDetail/refundFinance.vue +++ b/src/views/moneyManage/refundDetail/refundFinance.vue @@ -61,7 +61,6 @@ - @@ -112,7 +111,7 @@
- 退款备注 + 退款理由
@@ -237,10 +236,9 @@ @@ -251,10 +249,10 @@ @@ -265,10 +263,10 @@ @@ -279,9 +277,9 @@ @@ -397,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(['待审核','审核通过','已驳回','退款成功']) // 查全部 diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue index 2fb9bbf..4c868c6 100644 --- a/src/views/moneyManage/refundDetail/refundHeader.vue +++ b/src/views/moneyManage/refundDetail/refundHeader.vue @@ -112,8 +112,8 @@
- 退款备注 - 退款理由 +
@@ -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([ { @@ -624,7 +623,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：执行人已处理，退款完成；