Merge branch 'lihuilin/feature-20250923114949-现金' into milestone-20250913-现金管理

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>

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;

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;

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;