Merge branch 'zhangyong/milestone-20250913-现金管理二期' into milestone-20251104-现金二期

src/router/index.js

@@ -319,7 +319,7 @@ const routes = [
                             {
                                 path: 'receiveManager',
                                 name: "receiveManager",
-                                component: () => import("../views/moneyManage/receiveDetail/receiveFinance.vue"),
+                                component: () => import("../views/moneyManage/receiveDetail/receiveManage.vue"),
                                 meta: { permissionId: [67, 79] }
                             },
                             {//地区财务

src/views/moneyManage/receiveDetail/receiveFinance.vue

@@ -162,11 +162,11 @@
                             v-if="activeTab == 'pass' || activeTab == 'done'" width="180px" />
                         <el-table-column prop="remark" label="备注" v-if="activeTab != 'reject'" width="150px"
                             show-overflow-tooltip></el-table-column>
-                        <el-table-column prop="status" label="订单状态" v-if="activeTab == 'done'" width="150px"
+                        <el-table-column prop="status" fixed="right" label="订单状态" v-if="activeTab == 'done'" width="150px"
                             show-overflow-tooltip>
                             <template #default="scope">
-                                <span v-if="scope.row.status == 6">退款</span>
-                                <span v-else>正常</span>
+                                <span style="color: rgb(242, 84, 83);" v-if="scope.row.status == 6">退款</span>
+                                <span style="color: rgb(127,204,133);" v-else>正常</span>
                             </template>
                         </el-table-column>
                         <el-table-column prop="auditTime" label="驳回时间" v-if="activeTab == 'reject'" width="180px"
@@ -201,7 +201,7 @@
                                 </el-link>
                                 <el-link
                                     v-else-if="activeTab == 'done' && scope.row.status == 4 && startsWith(scope.row.orderCode, 'GOLDCOIN')"
-                                    style="color: #2741DE;" @click="openRefundConfirm(scope.row)">退款
+                                    style="color: rgb(242, 84, 83);" @click="openRefundConfirm(scope.row)">退款
                                 </el-link>
                             </template>
                         </el-table-column>
@@ -781,28 +781,17 @@ const submitRefund = async () => {
         if (!refundFormData.value.refundReason) {
             return ElMessage.error('请输入退款原因');
         }
+        if(refundFormData.value.refundReason){
+            
+        }
         const result = await request({
             url: '/Money/addOnline',
             data: {
                 jwcode: refundFormData.value.jwcode, // 精网号（必填）
                 name: refundFormData.value.name,  // 姓名（必填）
                 market: refundFormData.value.marketName,  // 所属地区（必填）
-                activity: refundFormData.value.activity, // 活动名称（可选）
-                bankCode: refundFormData.value.bankCode,  // 银行流水订单号（必填）
-                goodsName: refundFormData.value.goodsName, // 商品名称（必填）
-                goodNum: refundFormData.value.goodNum,  // 商品数量（必填，默认0）
-                paymentCurrency: refundFormData.value.paymentCurrency,  // 付款币种（必填）
-                paymentAmount: (refundFormData.value.paymentAmount) * 100,  // 付款金额（必填）
-                receivedCurrency: refundFormData.value.receivedCurrency,  // 到账币种（必填）
-                receivedAmount: (refundFormData.value.receivedAmount) * 100,  // 到账金额（必填）
-                handlingCharge: (refundFormData.value.handlingCharge) * 100,  // 手续费（可选）
-                receivedMarket: refundFormData.value.receivedMarket, // 到账地区（可选）
-                payType: refundFormData.value.payType,  // 支付方式（必填）
-                payTime: refundFormData.value.payTime,  // 付款时间，格式：yyyy-MM-dd HH:mm:ss（可选）
-                receivedTime: refundFormData.value.receivedTime,  // 到账时间，格式：yyyy-MM-dd HH:mm:ss（可选）
-                areaServise: adminData.value.adminName,  // 提交人（可选）
+                submitterMarket:adminData.value.markets,
                 submitterId: adminData.value.id,
-                voucher: refundFormData.value.voucher,  // 转账凭证URL（可选）
                 remark: refundFormData.value.remark,  // 备注信息（可选）
                 refundReason: refundFormData.value.refundReason,  // 退款备注-客服填写（可选）
                 refundModel: refundFormData.value.refundModel,  // 退款方式：0-全额，1-部分（可选）

src/views/moneyManage/receiveDetail/receiveService.vue

@@ -825,22 +825,8 @@ const submitRefund = async () => {
                 jwcode: refundFormData.value.jwcode,
                 name: refundFormData.value.name,
                 market: refundFormData.value.marketName,
-                activity: refundFormData.value.activity,
-                bankCode: refundFormData.value.bankCode,
-                goodsName: refundFormData.value.goodsName,
-                goodNum: refundFormData.value.goodNum,
-                paymentCurrency: refundFormData.value.paymentCurrency,
-                paymentAmount: (refundFormData.value.paymentAmount) * 100,
-                receivedCurrency: refundFormData.value.receivedCurrency,
-                receivedAmount: (refundFormData.value.receivedAmount) * 100,
-                handlingCharge: (refundFormData.value.handlingCharge) * 100,
-                receivedMarket: refundFormData.value.receivedMarket,
-                payType: refundFormData.value.payType,
-                payTime: refundFormData.value.payTime,
-                receivedTime: refundFormData.value.receivedTime,
-                areaServise: adminData.value.adminName,
                 submitterId: adminData.value.id,
-                voucher: refundFormData.value.voucher,
+                submitterMarket:adminData.value.markets,
                 remark: refundFormData.value.remark,
                 refundReason: refundFormData.value.refundReason,
                 refundModel: refundFormData.value.refundModel,