Merge remote-tracking branch 'origin/milestone-20250913-现金管理' into milestone-20250913-现金管理

.env.development

@@ -1,4 +1,4 @@
-VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
+# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
 # 测试环境
 #  VITE_API_BASE='http://54.255.212.181:10704/'
 # 正式环境
@@ -17,4 +17,4 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
 
 # lijianlin
 # VITE_API_BASE='http://192.168.9.41:8081/'
-# VITE_API_BASE='http://localhost:8081/'
+VITE_API_BASE='http://localhost:8081/'

src/views/audit/bean/beanAudit.vue

@@ -85,7 +85,7 @@
         </template>
       </el-table-column>
       <el-table-column v-if="checkTab === 'pending' && (hasbeanWaitThough || hasbeanWaitReject)" fixed="right"
-        prop="operation" label="操作" width="400px">
+        prop="operation" label="操作" width="200px">
         <template #default="scope">
           <div class="operation">
 

src/views/home.vue

@@ -412,7 +412,7 @@ function logout() {
 /* 主内容区域样式 */
 .el-main {
   height: 100%;
-  padding: 20px;
+  padding: 1px 8px 10px 8px;
   background: transparent;
   overflow-y: auto;
   /* 应用自定义滚动条 */

src/views/moneyManage/refundDetail/refundCharge.vue

@@ -212,7 +212,7 @@
     </el-dialog>
 
     <el-dialog v-model="showSteps" title="退款进度" overflow draggable width="1206px" height="506px" :style="{
-        backgroundImage: 'url(/src/assets/images/背景图.png)',
+        backgroundImage: `url(${RefundChargeBackground})`,
         backgroundSize: 'cover',
         backgroundPosition: 'center'
     }">
@@ -303,6 +303,8 @@ const adminStore = useAdminStore()
 const { adminData, menuTree } = storeToRefs(adminStore)
 import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js"
 
+import RefundChargeBackground from '@/assets/images/背景图.png'
+
 const currentStep = ref(0)// 进度图
 const searchForm = ref({
     jwcode: '',

src/views/moneyManage/refundDetail/refundFinance.vue

@@ -211,7 +211,7 @@
     </el-dialog>
 
     <el-dialog v-model="showSteps" title="退款进度" overflow draggable width="1206px" height="506px" :style="{
-        backgroundImage: 'url(/src/assets/images/背景图.png)',
+        backgroundImage: `url(${RefundFinanceBackground})`,
         backgroundSize: 'cover',
         backgroundPosition: 'center'
     }">
@@ -303,6 +303,8 @@ const { adminData, menuTree } = storeToRefs(adminStore)
 import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js"
 import { get } from 'lodash'
 
+import RefundFinanceBackground from '@/assets/images/背景图.png'
+
 const currentStep = ref(0)// 进度图
 const searchForm = ref({
     jwcode: '',

src/views/moneyManage/refundDetail/refundHeader.vue

@@ -222,7 +222,7 @@
     </el-dialog>
 
     <el-dialog v-model="showSteps" title="退款进度" overflow draggable width="1206px" height="506px" :style="{
-        backgroundImage: 'url(/src/assets/images/背景图.png)',
+        backgroundImage: `url(${BackgroundSvg})`,
         backgroundSize: 'cover',
         backgroundPosition: 'center'
     }">
@@ -302,6 +302,7 @@
     </el-dialog>
 </template>
 <script setup>
+import BackgroundSvg from '@/assets/images/背景图.png'
 import { ref, onMounted } from 'vue'
 import { ElMessage } from 'element-plus'
 import API from '@/util/http.js'
@@ -520,7 +521,11 @@ const handlePass = async function () {
             status: 40,
             headFinance: adminData.value.adminName,
             auditId: auditRow.value.auditId,
-            goodsName: auditRow.value.goodsName
+            goodsName: auditRow.value.goodsName,
+            permanentGold: auditRow.value.permanentGold,
+            freeGold: auditRow.value.freeGold,
+            orderCode: auditRow.value.orderCode,
+            jwcode: auditRow.value.jwcode
         }
         const result = await API({
             url: '/Money/finalReview',

src/views/moneyManage/refundDetail/refundService.vue

@@ -194,7 +194,7 @@
         @close="showBack = false" />
 
     <el-dialog v-model="showError" overflow draggable class="back-dialog" :style="{
-        backgroundImage: 'url(/src/assets/images/撤回.png)',
+        backgroundImage: `url(${RefundRecallBackground})`,
         backgroundSize: 'cover',
         backgroundPosition: 'center'
     }">
@@ -219,6 +219,8 @@ import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menu
 import ConfirmDialog from '@/components/dialogs/ConfirmDialog.vue'
 import { pa } from 'element-plus/es/locales.mjs'
 
+import RefundRecallBackground from '@/assets/images/撤回.png'
+
 const dateRange = ref([])
 const searchForm = ref({
     jwcode: '',

src/views/permissions/userPermission.vue

@@ -9,6 +9,9 @@ import { useAdminStore } from "@/store/index.js"
 import { storeToRefs } from "pinia"
 import { findMenuById, permissionMapping } from "@/utils/menuTreePermission.js"
 
+import BackGroundSvg from '@/assets/SvgIcons/背景.svg'
+
+
 const adminStore = useAdminStore()
 const { adminData, menuTree } = storeToRefs(adminStore)
 
@@ -1148,7 +1151,7 @@ onMounted(async function () {
   </el-dialog>
 
   <el-dialog v-model="ackVisible" width="700px" :close-on-click-modal="false" :style="{
-    backgroundImage: 'url(/src/assets/SvgIcons/背景.svg',
+    backgroundImage: `url(${BackGroundSvg})`,
     backgroundSize: 'cover',
     backgroundPosition: 'center',
     height: '400px'