From 3d2f14ef0b935d85a08d96ffef8921c9abc81042 Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Wed, 22 Oct 2025 15:11:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=98=A0=E5=B0=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/moneyManage/executor/executor.vue          | 11 ++++++-----
 src/views/moneyManage/refundDetail/refundCharge.vue  |  9 ++-------
 src/views/moneyManage/refundDetail/refundFinance.vue | 10 ++++------
 src/views/moneyManage/refundDetail/refundHeader.vue  |  9 ++-------
 4 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue
index 381150e..64f6355 100644
--- a/src/views/moneyManage/executor/executor.vue
+++ b/src/views/moneyManage/executor/executor.vue
@@ -148,9 +148,10 @@
                 </div>
                 <div class="dialog-item">
                     <el-text style="width:4vw;">退款类型</el-text>
-                    <el-input v-model="editRow.refundModel" style="width:10vw;" disabled>
-                        {{ scope.row.refundModel === 1 ? '部分退款' : '全部退款' }}
-                    </el-input>
+                    <el-select v-model="editRow.refundModel" style="width:10vw;" disabled>
+                    <el-option label="全部退款" :value="0"></el-option>
+                    <el-option label="部分退款" :value="1"></el-option>
+                </el-select>
                 </div>
                 <div class="dialog-item">
                     <el-text style="width:4vw;">付款币种</el-text>
@@ -182,7 +183,7 @@
                 </div>
                 <div class="dialog-item">
                     <el-text style="width:4vw;">备注</el-text>
-                    <el-input v-model="editForm.remark" style="width:10vw;" :row="3" disabled maxlength="100"
+                    <el-input v-model="editRow.remark" style="width:10vw;" :row="3" disabled maxlength="100"
                         type="textarea" show-word-limit clearable />
                 </div>
             </div>
@@ -217,7 +218,7 @@
                         :show-file-list="false">
                         <template #default>
                             <img v-if="editForm.imageUrl" :src="editForm.imageUrl"
-                                style="width: 100%; height: 100%; object-fit: cover;">
+                                style="width: 80px; height: 80px; object-fit: cover;">
                             <el-icon v-else>
                                 <Plus />
                             </el-icon>
diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue
index f5d9717..1e6225f 100644
--- a/src/views/moneyManage/refundDetail/refundCharge.vue
+++ b/src/views/moneyManage/refundDetail/refundCharge.vue
@@ -111,11 +111,6 @@
                 </el-select>
             </div>
             <div class="top-item">
-                <el-text style="width:4vw;" size="small">退款金额</el-text>
-                <el-input v-model="auditRow.paymentAmount" placeholder="请输入退款金额" size="small" style="width:10vw;"
-                    clearable disabled></el-input>
-            </div>
-            <div class="top-item">
                 <el-text style="width:4vw;" size="small">退款备注</el-text>
                 <el-input v-model="auditRow.refundReason" placeholder="请输入退款备注" size="small" style="width:10vw;"
                     :rows="3" maxlength="100" show-word-limit type="textarea" disabled />
@@ -188,7 +183,7 @@
                 </div>
                 <div class="right-item">
                     <el-text style="width:4vw;" size="small">到账时间</el-text>
-                    <el-input v-model="auditRow.receiveTime" size="small" style="width:10vw;" disabled />
+                    <el-input v-model="auditRow.receivedTime" size="small" style="width:10vw;" disabled />
                 </div>
                 <div class="right-item">
                     <el-text style="width:4vw;" size="small">备注</el-text>
@@ -816,7 +811,7 @@ onMounted(() => {
 
     .top {
         width: 30vw;
-        height: 19vh;
+        height: 17vh;
 
         .top-item {
             display: flex;
diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue
index 71d785c..a55befd 100644
--- a/src/views/moneyManage/refundDetail/refundFinance.vue
+++ b/src/views/moneyManage/refundDetail/refundFinance.vue
@@ -111,10 +111,6 @@
                 </el-select>
             </div>
             <div class="top-item">
-                <el-text style="width:4vw;" size="small">退款金额</el-text>
-                <el-input v-model="auditRow.paymentAmount" size="small" style="width:10vw;" disabled />
-            </div>
-            <div class="top-item">
                 <el-text style="width:4vw;" size="small">退款备注</el-text>
                 <el-input v-model="auditRow.refundReason" size="small" style="width:10vw;" :rows="3" maxlength="100"
                     show-word-limit type="textarea" disabled />
@@ -187,7 +183,7 @@
                 </div>
                 <div class="right-item">
                     <el-text style="width:4vw;" size="small">到账时间</el-text>
-                    <el-input v-model="auditRow.receiveTime" size="small" style="width:10vw;" disabled />
+                    <el-input v-model="auditRow.receivedTime" size="small" style="width:10vw;" disabled />
                 </div>
                 <div class="right-item">
                     <el-text style="width:4vw;" size="small">备注</el-text>
@@ -866,10 +862,11 @@ onMounted(() => {
     display: flex;
     justify-content: center;
     height: auto;
+    min-height: 40vh;
 
     .top {
         width: 30vw;
-        height: 19vh;
+        height: 17vh;
 
         .top-item {
             display: flex;
@@ -932,6 +929,7 @@ onMounted(() => {
     .bottom {
         width: 30vw;
         height: auto;
+        padding-bottom: 1vh;
 
         .bottom-item {
             display: flex;
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index f64fc0a..239b018 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -110,11 +110,6 @@
                 </el-select>
             </div>
             <div class="top-item">
-                <el-text style="width:4vw;" size="small">退款金额</el-text>
-                <el-input v-model="auditRow.paymentAmount" placeholder="请输入退款金额" size="small" style="width:10vw;"
-                    clearable disabled></el-input>
-            </div>
-            <div class="top-item">
                 <el-text style="width:4vw;" size="small">退款备注</el-text>
                 <el-input v-model="auditRow.refundReason" placeholder="请输入退款备注" size="small" style="width:10vw;"
                     :rows="3" maxlength="100" show-word-limit type="textarea" disabled />
@@ -187,7 +182,7 @@
                 </div>
                 <div class="right-item">
                     <el-text style="width:4vw;" size="small">到账时间</el-text>
-                    <el-input v-model="auditRow.receiveTime" size="small" style="width:10vw;" disabled />
+                    <el-input v-model="auditRow.receivedTime" size="small" style="width:10vw;" disabled />
                 </div>
                 <div class="right-item">
                     <el-text style="width:4vw;" size="small">备注</el-text>
@@ -845,7 +840,7 @@ onMounted(() => {
 
     .top {
         width: 30vw;
-        height: 19vh;
+        height: 17vh;
 
         .top-item {
             display: flex;

From 40e7540c6b6dee52a6795b345608a87de32cf8d8 Mon Sep 17 00:00:00 2001
From: lihuibear <lihuibear4@gmail.com>
Date: Wed, 22 Oct 2025 16:08:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:bug=20=E6=95=B0=E6=8D=AE=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/workspace/CashManagement.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/workspace/CashManagement.vue b/src/components/workspace/CashManagement.vue
index dbeace5..c54d9de 100644
--- a/src/components/workspace/CashManagement.vue
+++ b/src/components/workspace/CashManagement.vue
@@ -44,7 +44,7 @@
         <div v-else v-for="item in cashData.markets" :key="item.name" class="market-item">
           <span class="market-name">代收{{ item.name }}：</span>
           <span class="market-value">{{ item.value.toLocaleString() }} </span>
-          
+
         </div>
 
       </div>
@@ -100,6 +100,7 @@ const startDate = `${currentYear}-01-01 00:00:00`;
 const endDate = `${currentYear}-12-31 23:59:59`;
 // 获取接口数据
 const fetchCashData = async () => {
+  getAdminData()
   try {
     const res = await request({
       url: '/workbench/getTotalRevenue',
@@ -131,7 +132,7 @@ const fetchCashData = async () => {
         name: m.name,
         value: resMap.get(m.name) ?? 0
       }))
-    } else {
+    } else if (marksFlag.value=== false) {
 // 1. 定义币种中英文对照表
       const currencyMap = {
         sgd: '新币',
@@ -227,7 +228,7 @@ const renderChart = () => {
 }
 
 onMounted(() => {
-  getAdminData()
+  // getAdminData()
   fetchCashData()
 })
 </script>