diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue index fc9d2a3..27644d0 100644 --- a/src/views/moneyManage/executor/executor.vue +++ b/src/views/moneyManage/executor/executor.vue @@ -35,7 +35,7 @@
订单状态 - +
@@ -104,7 +104,7 @@ @@ -252,6 +252,7 @@ const uploadUrl = 'https://api.homilychart.com/hljw/api/aws/upload' const dateRange = ref([]) const tableData = ref([]) const editRow = ref({})// 编辑回显 +const statusList = ref(['待处理', '退款成功']) const pagination = ref({ pageNum: 1, pageSize: 50, @@ -270,7 +271,14 @@ const editForm = ref({ // 查全部 const getRefund = async function () { try { - searchForm.value.statuses = [40, 41] // 默认:看不到进度没到这里的 + const statusesParam = [40, 41] // 默认:看不到进度没到这里的 + if(searchForm.value.statuses === '待处理'){ + statusesParam.value = [40] + } else if (searchForm.value.statuses === '退款成功'){ + statusesParam.value = [41] + } else { + statusesParam.value = [40, 41] + } const params = { pageNum: pagination.value.pageNum, @@ -280,7 +288,7 @@ const getRefund = async function () { name: searchForm.value.name, markets: searchForm.value.markets, goodsNames: searchForm.value.goodsName, - statuses: searchForm.value.statuses,//10:地区财务待审核;12:地区财务驳回; + statuses: statusesParam.value,//10:地区财务待审核;12:地区财务驳回; // 20:地区负责人待审核;22:地区负责人驳回; // 30:总部财务待审核;32:总部财务驳回; // 40:执行人待处理;41:执行人已处理,退款完成; @@ -378,17 +386,6 @@ const hideEditDialog = () => { jwcode: '' } } - -const statusList = ref([ - { - value: 40, - label: '待处理', - }, - { - value: 41, - label: '退款完成' - } -]) const channelOptions = ref([{ value: '银行转账', label: '银行转账' diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue index 4160944..3d58dba 100644 --- a/src/views/moneyManage/refundDetail/refundCharge.vue +++ b/src/views/moneyManage/refundDetail/refundCharge.vue @@ -23,7 +23,7 @@
订单状态 - +
@@ -75,9 +75,10 @@ @@ -104,7 +105,7 @@
退款申请信息
- 退款类型 + 退款方式 @@ -427,24 +428,7 @@ const channelOptions = ref([{ label: 'Ipay88-Link平台' } ]) -const statusList = ref([ - { - value: 20, - label: '待审核', - }, - { - value: '审核通过', - label: '审核通过' - }, - { - value: '审核驳回', - label: '审核驳回' - }, - { - value: 41, - label: '退款完成' - } -]) +const statusList = ref(['待审核','审核通过','已驳回','退款成功']) // 查全部 const getRefund = async function () { if (!hasMenuPermission(menuTree.value, permissionMapping.refundChargeShow)) { @@ -452,11 +436,17 @@ const getRefund = async function () { return } try { - searchForm.value.statuses = [20, 22, 30, 32, 40, 41] // 看不到进度没到这里的 + const statuses = ref([20, 22, 30, 32, 40, 41]) // 看不到进度没到这里的 if (searchForm.value.statuses === '审核通过') { - statuses = [30, 40] - } else if (searchForm.value.statuses === '审核驳回') { - statuses = [22, 32] + statuses.value = [30, 40] + } else if (searchForm.value.statuses === '已驳回') { + statuses.value = [22, 32] + } else if (searchForm.value.statuses === '待审核') { + statuses.value = [20] + } else if (searchForm.value.statuses === '退款成功') { + statuses.value = [41] + } else { + statuses.value = [20, 22, 30, 32, 40, 41] } const params = { pageNum: pagination.value.pageNum, @@ -466,7 +456,7 @@ const getRefund = async function () { name: searchForm.value.name,//姓名 markets: searchForm.value.markets,//地区 goodsNames: searchForm.value.goodsName,//商品名 - statuses: searchForm.value.statuses,//10:地区财务待审核;12:地区财务驳回; + statuses: statuses.value,//10:地区财务待审核;12:地区财务驳回; // 20:地区负责人待审核;22:地区负责人驳回; // 30:总部财务待审核;32:总部财务驳回; // 40:执行人待处理;41:执行人已处理,退款完成; @@ -736,7 +726,7 @@ const hideReject = function () { const reset = function () { searchForm.value = { jwcode: '', - market: [], + markets: [], statuses: [] } dateRange.value = [] diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue index 598ee37..4d58ff3 100644 --- a/src/views/moneyManage/refundDetail/refundFinance.vue +++ b/src/views/moneyManage/refundDetail/refundFinance.vue @@ -22,7 +22,7 @@
订单状态 - +
@@ -75,9 +75,10 @@ @@ -104,7 +105,7 @@
退款申请信息
- 退款类型 + 退款方式 @@ -405,24 +406,7 @@ const statusStepMap = { 40: [5, false], 41: [6, false] } -const statusList = ref([ - { - value: 20, - label: '待审核', - }, - { - value: '审核通过', - label: '审核通过' - }, - { - value: '审核驳回', - label: '审核驳回' - }, - { - value: 41, - label: '退款完成' - } -]) +const statusList = ref(['待审核','审核通过','已驳回','退款成功']) // 查全部 const getRefund = async function () { if (!hasMenuPermission(menuTree.value, permissionMapping.refundFinanceShow)) { @@ -430,10 +414,17 @@ const getRefund = async function () { return } try { + const statusParam = ref([]) if (searchForm.value.statuses === '审核通过') { - searchForm.value.statuses = [20, 30, 40] - } else if (searchForm.value.statuses === '审核驳回') { - searchForm.value.statuses = [12, 22, 32] + statusParam.value = [20, 30, 40] + } else if (searchForm.value.statuses === '已驳回') { + statusParam.value = [12, 22, 32] + } else if (searchForm.value.statuses === '待审核') { + statusParam.value = [10] + } else if (searchForm.value.statuses === '退款成功') { + statusParam.value = [41] + } else { + statusParam.value = [] } const params = { pageNum: pagination.value.pageNum, @@ -443,7 +434,7 @@ const getRefund = async function () { name: searchForm.value.name,//姓名 markets: searchForm.value.markets,//地区 goodsNames: searchForm.value.goodsName,//商品名 - statuses: searchForm.value.statuses,//10:地区财务待审核;12:地区财务驳回; + statuses: statusParam.value,//10:地区财务待审核;12:地区财务驳回; // 20:地区负责人待审核;22:地区负责人驳回; // 30:总部财务待审核;32:总部财务驳回; // 40:执行人待处理;41:执行人已处理,退款完成; @@ -789,7 +780,7 @@ const showStep = function (row) { isReject.value = reject } - console.log('步骤条状态',currentStep.value) + console.log('步骤条状态', currentStep.value) showSteps.value = true } const showAudit2 = function (row) { @@ -799,7 +790,7 @@ const showAudit2 = function (row) { 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 7ec89a8..2fb9bbf 100644 --- a/src/views/moneyManage/refundDetail/refundHeader.vue +++ b/src/views/moneyManage/refundDetail/refundHeader.vue @@ -12,17 +12,18 @@
所属地区 - +
产品名称 - +
订单状态 - +
@@ -74,9 +75,10 @@ @@ -103,7 +105,7 @@
退款申请信息
- 退款类型 + 退款方式 @@ -438,12 +440,7 @@ const channelOptions = ref([{ label: 'Ipay88-Link平台' } ]) -const statusList = ref([ - { value: 30, label: '待审核' }, - { value: 40, label: '审核通过' }, - { value: 32, label: '审核驳回' }, - { value: 41, label: '退款完成' } -]) +const statusList = ref(['待审核', '审核通过', '已驳回', '退款成功']) const executorList = ref([ { value: '305485', @@ -485,7 +482,18 @@ const getRefund = async function () { return } try { - searchForm.value.statuses = [30, 32, 40, 41] // 默认:看不到进度没到这里的 + const statusParam = ref([30, 32, 40, 41])// 默认:看不到进度没到这里的 + if (searchForm.value.statuses === '待审核') { + statusParam.value = [30] + } else if (searchForm.value.statuses === '审核通过') { + statusParam.value = [40] + } else if (searchForm.value.statuses === '已驳回') { + statusParam.value = [32] + } else if (searchForm.value.statuses === '退款成功') { + statusParam.value = [41] + } else { + statusParam.value = [30, 32, 40, 41] + } const params = { pageNum: pagination.value.pageNum, @@ -495,10 +503,7 @@ const getRefund = async function () { name: searchForm.value.name, markets: searchForm.value.markets, goodsNames: searchForm.value.goodsName, - statuses: searchForm.value.statuses,//10:地区财务待审核;12:地区财务驳回; - // 20:地区负责人待审核;22:地区负责人驳回; - // 30:总部财务待审核;32:总部财务驳回; - // 40:执行人待处理;41:执行人已处理,退款完成; + statuses: statusParam.value, 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') : "", @@ -559,7 +564,7 @@ const handleReject = async function () { rejectReason: addForm.value.remark, headFinance: adminData.value.adminName, auditId: auditRow.value.auditId, - orderCode:auditRow.value.orderCode + orderCode: auditRow.value.orderCode } const result = await API({ url: '/Money/finalReview', @@ -577,33 +582,33 @@ const handleReject = async function () { } } const getMarket = async function () { - try { - const result = await API({ - - url: '/market/selectMarket', - }) - console.log('看看地区树', result) - - const transformTree = (nodes) => { - const allChildren = nodes.flatMap(node => node.children || []); - - return allChildren.map(child => { - const grandchildren = child.children && child.children.length - ? transformTree([child]) - : null; + try { + const result = await API({ - return { - value: child.id, - label: child.name, - children: grandchildren + url: '/market/selectMarket', + }) + console.log('看看地区树', result) + + const transformTree = (nodes) => { + const allChildren = nodes.flatMap(node => node.children || []); + + return allChildren.map(child => { + const grandchildren = child.children && child.children.length + ? transformTree([child]) + : null; + + return { + value: child.id, + label: child.name, + children: grandchildren + }; + }); }; - }); - }; - market.value = transformTree(result.data) - console.log('转换后的地区树==============', market.value) - } catch (error) { - console.log('请求失败', error) - } + market.value = transformTree(result.data) + console.log('转换后的地区树==============', market.value) + } catch (error) { + console.log('请求失败', error) + } } const hideReject = function () { showReject.value = false @@ -612,7 +617,7 @@ const hideReject = function () { const reset = function () { searchForm.value = { jwcode: '', - market: [], + markets: [], statuses: [] } dateRange.value = [] @@ -639,7 +644,7 @@ const showStep = function (row) { isReject.value = reject } - console.log('步骤条状态',currentStep.value) + console.log('步骤条状态', currentStep.value) showSteps.value = true } const productList = [ @@ -776,12 +781,12 @@ const showAudit = function (row) { showAudit2.value = true } const defaultTime = [ - new Date(2000, 1, 1, 0, 0, 0), - new Date(2000, 2, 1, 23, 59, 59), + new Date(2000, 1, 1, 0, 0, 0), + new Date(2000, 2, 1, 23, 59, 59), ] const disabledDate = (time) => { - const limitDate = new Date(2025, 0, 1); - return time.getTime() < limitDate.getTime(); + const limitDate = new Date(2025, 0, 1); + return time.getTime() < limitDate.getTime(); } onMounted(() => { console.log('???????????????????', adminData.value)