From 03b0bf78cb4d9a0a8a7b65403f36648630fd3916 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Wed, 22 Oct 2025 12:52:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/moneyManage/executor/executor.vue | 2 +- .../moneyManage/refundDetail/refundCharge.vue | 14 ++-- .../moneyManage/refundDetail/refundFinance.vue | 87 +++++++++++----------- .../moneyManage/refundDetail/refundHeader.vue | 12 +-- .../moneyManage/refundDetail/refundService.vue | 4 +- 5 files changed, 61 insertions(+), 58 deletions(-) diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue index ee28961..381150e 100644 --- a/src/views/moneyManage/executor/executor.vue +++ b/src/views/moneyManage/executor/executor.vue @@ -140,7 +140,7 @@
所属地区 - +
产品名称 diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue index 4007789..f5d9717 100644 --- a/src/views/moneyManage/refundDetail/refundCharge.vue +++ b/src/views/moneyManage/refundDetail/refundCharge.vue @@ -105,18 +105,20 @@ 退款申请信息
退款类型 - + + + +
退款金额 + clearable disabled>
退款备注 + :rows="3" maxlength="100" show-word-limit type="textarea" disabled />
原订单信息 @@ -128,7 +130,7 @@
所属地区 - +
产品名称 @@ -814,7 +816,7 @@ onMounted(() => { .top { width: 30vw; - height: 17vh; + height: 19vh; .top-item { display: flex; diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue index 6c17397..71d785c 100644 --- a/src/views/moneyManage/refundDetail/refundFinance.vue +++ b/src/views/moneyManage/refundDetail/refundFinance.vue @@ -12,8 +12,8 @@
所属地区 - +
产品名称 @@ -43,7 +43,7 @@
付款时间
@@ -105,11 +105,10 @@ 退款申请信息
退款类型 - - - + + + +
退款金额 @@ -130,7 +129,7 @@
所属地区 - +
产品名称 @@ -734,33 +733,33 @@ const productList = [ ] 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.name, - 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.name, + 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 showStep = function (row) { if (!hasMenuPermission(menuTree.value, permissionMapping.refundFinanceProgShow)) { @@ -771,27 +770,27 @@ const showStep = function (row) { currentStep.value = 1; if (row.status === 41) { executor.value = row.executorName - console.log('执行人',executor.value) + console.log('执行人', executor.value) currentStep.value = 6; } else { if (row.areaServise !== null && row.areaServise !== '') { submitterName.value = row.areaServise - console.log('提交人',submitterName.value) + console.log('提交人', submitterName.value) currentStep.value = 2; } if (row.areaFinance !== null && row.areaFinance !== '') { areaFinance.value = row.areaFinance - console.log('地区财务',areaFinance.value) + console.log('地区财务', areaFinance.value) currentStep.value = 3; } if (row.areaCharge !== null && row.areaCharge !== '') { areaCharge.value = row.areaCharge - console.log('地区负责人',areaCharge.value) + console.log('地区负责人', areaCharge.value) currentStep.value = 4; } if (row.headFinance !== null && row.headFinance !== '') { headFinance.value = row.headFinance - console.log('总部财务',headFinance.value) + console.log('总部财务', headFinance.value) currentStep.value = 5; } } @@ -816,12 +815,12 @@ const hideReject = function () { addForm.value.remark = '' } 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) @@ -870,7 +869,7 @@ onMounted(() => { .top { width: 30vw; - height: 17vh; + height: 19vh; .top-item { display: flex; diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue index 7269ad4..f64fc0a 100644 --- a/src/views/moneyManage/refundDetail/refundHeader.vue +++ b/src/views/moneyManage/refundDetail/refundHeader.vue @@ -104,18 +104,20 @@ 退款申请信息
退款类型 - + + + +
退款金额 + clearable disabled>
退款备注 + :rows="3" maxlength="100" show-word-limit type="textarea" disabled />
原订单信息 @@ -843,7 +845,7 @@ onMounted(() => { .top { width: 30vw; - height: 17vh; + height: 19vh; .top-item { display: flex; diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue index 556f40b..546cacc 100644 --- a/src/views/moneyManage/refundDetail/refundService.vue +++ b/src/views/moneyManage/refundDetail/refundService.vue @@ -285,12 +285,12 @@ const getRefund = async function () { 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') : "", - submitterId: isKF ? adminData.value.id : null + submitterId: adminData.value.id } } const result = await API({ - url: '/Money/select', + url: '/Money/selecta', method: 'POST', data: params })