From 7f69882b9f7fc468c262862d7c142da419079b3d Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Mon, 15 Dec 2025 11:00:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E7=82=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/audit/gold/audit.vue                     | 43 +++++++++-------------
 src/views/consume/bean/addBeanConsume.vue          |  2 +-
 src/views/moneyManage/executor/executor.vue        |  2 +-
 .../moneyManage/receiveDetail/receiveFinance.vue   |  5 +++
 .../moneyManage/receiveDetail/receiveHead.vue      |  5 +++
 .../moneyManage/receiveDetail/receiveManage.vue    |  5 +++
 .../moneyManage/receiveDetail/receiveService.vue   |  2 +-
 .../moneyManage/refundDetail/refundService.vue     | 18 ++++++++-
 src/views/recharge/bean/addBeanRecharge.vue        |  2 +-
 src/views/recharge/gold/addCoinRecharge.vue        |  2 +-
 src/views/recharge/gold/coinRecharge.vue           |  3 +-
 src/views/refund/gold/addCoinRefund.vue            |  2 +-
 12 files changed, 58 insertions(+), 33 deletions(-)

diff --git a/src/views/audit/gold/audit.vue b/src/views/audit/gold/audit.vue
index ff7b891..341366e 100644
--- a/src/views/audit/gold/audit.vue
+++ b/src/views/audit/gold/audit.vue
@@ -1,24 +1,16 @@
 <template>
   <div>
     <div style="height:4vh;width:82vw;">
-    <el-button-group>
-      <el-button
-          class="no-active-btn"
-          :class="{ 'active-btn': activeTab === 'rechargeAudit' }"
-          @click="navigateTo('rechargeAudit')"
-          v-if="hasRecharge"
-      >
-        {{ $t('audit.rechargeAudit') }}
-      </el-button>
-      <el-button
-          class="no-active-btn"
-          :class="{ 'active-btn': activeTab === 'refundAudit' }"
-          @click="navigateTo('refundAudit')"
-          v-if="hasRefund"
-      >
-        {{ $t('audit.refundAudit') }}
-      </el-button>
-    </el-button-group>
+      <el-button-group>
+        <el-button class="no-active-btn" :class="{ 'active-btn': activeTab === 'refundAudit' }"
+          @click="navigateTo('refundAudit')" v-if="hasRefund">
+          {{ $t('audit.refundAudit') }}
+        </el-button>
+        <el-button class="no-active-btn" :class="{ 'active-btn': activeTab === 'rechargeAudit' }"
+          @click="navigateTo('rechargeAudit')" v-if="hasRecharge" disabled>
+          {{ $t('audit.rechargeAudit') }}
+        </el-button>
+      </el-button-group>
     </div>
     <router-view></router-view>
   </div>
@@ -43,14 +35,15 @@ const hasRecharge = ref(false);
 const hasRefund = ref(false);
 // 导航方法
 const navigateTo = (name) => {
-  if(name == 'rechargeAudit'){
-    if(!hasRecharge){
-      ElMessage.error('您暂无充值审核操作权限')
+  if (name === 'refundAudit') {
+    if (!hasRefund) {
+      ElMessage.error('您暂无退款审核操作权限')
       return;
     }
-  }else if(name = 'refundAudit'){
-   if(!hasRefund){
-      ElMessage.error('您暂无退款审核操作权限')
+
+  } else if (name === 'rechargeAudit') {
+    if (!hasRecharge) {
+      ElMessage.error('您暂无充值审核操作权限')
       return;
     }
   }
@@ -70,8 +63,8 @@ const initPermissions = () => {
 // 默认跳转逻辑
 const getDefaultAuditRoute = () => {
   initPermissions();
-  if (hasRecharge.value) return 'rechargeAudit';
   if (hasRefund.value) return 'refundAudit';
+  if (hasRecharge.value) return 'rechargeAudit';
   return 'rechargeAudit';
 };
 
diff --git a/src/views/consume/bean/addBeanConsume.vue b/src/views/consume/bean/addBeanConsume.vue
index 1eaaebf..449fb6c 100644
--- a/src/views/consume/bean/addBeanConsume.vue
+++ b/src/views/consume/bean/addBeanConsume.vue
@@ -210,7 +210,7 @@ const throttledHandleConsumeFormt = _.throttle(handleConsumeForm, 5000, {
       <el-form :model="consumeForm" :rules="rules" ref="formRef" label-width="auto" style="max-width: 600px"
         class="add-form">
         <el-form-item prop="jwcode" label="精网号" label-position="left">
-          <el-input v-model="consumeForm.jwcode" style="width: 220px" />
+          <el-input v-model="consumeForm.jwcode" style="width: 220px" @keyup.enter="getUser(consumeForm.jwcode)" />
           <el-button type="primary" @click="getUser(consumeForm.jwcode)" style="margin-left: 20px">查询</el-button>
         </el-form-item>
         <el-form-item prop="permanentBean" label="付费金豆" label-position="left">
diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue
index 6cebcc9..422fdae 100644
--- a/src/views/moneyManage/executor/executor.vue
+++ b/src/views/moneyManage/executor/executor.vue
@@ -197,7 +197,7 @@
         </div>
         <div class="dialog-item">
           <el-text style="width:4vw;">退款理由</el-text>
-          <el-input v-model="editRow.rejectReason" style="width:10vw;" :row="3" disabled maxlength="100" type="textarea"
+          <el-input v-model="editRow.refundReason" style="width:10vw;" :row="3" disabled maxlength="100" type="textarea"
             show-word-limit clearable />
         </div>
       </div>
diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue
index d69eb51..b48c209 100644
--- a/src/views/moneyManage/receiveDetail/receiveFinance.vue
+++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue
@@ -1160,6 +1160,11 @@ const submitEditForm = async () => {
     try {
         await editFormRef.value.validate();
 
+        if(editFormData.value.paymentCurrency != editFormData.value.receivedCurrency){
+            ElMessage.error('付款币种与到账币种不一致')
+            return
+        }
+
         // 处理时间格式
         if (editFormData.value.receivedTime) {
             editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss');
diff --git a/src/views/moneyManage/receiveDetail/receiveHead.vue b/src/views/moneyManage/receiveDetail/receiveHead.vue
index eee4d63..592188c 100644
--- a/src/views/moneyManage/receiveDetail/receiveHead.vue
+++ b/src/views/moneyManage/receiveDetail/receiveHead.vue
@@ -986,6 +986,11 @@ const submitEditForm = async () => {
     try {
         await editFormRef.value.validate();
 
+        if(editFormData.value.paymentCurrency != editFormData.value.receivedCurrency){
+            ElMessage.error('付款币种与到账币种不一致')
+            return
+        }
+
         // 处理时间格式
         if (editFormData.value.receivedTime) {
             editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss');
diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue
index 159d089..5c627b0 100644
--- a/src/views/moneyManage/receiveDetail/receiveManage.vue
+++ b/src/views/moneyManage/receiveDetail/receiveManage.vue
@@ -1150,6 +1150,11 @@ const submitEditForm = async () => {
     try {
         await editFormRef.value.validate();
 
+        if(editFormData.value.paymentCurrency != editFormData.value.receivedCurrency){
+            ElMessage.error('付款币种与到账币种不一致')
+            return
+        }
+
         // 处理时间格式
         if (editFormData.value.receivedTime) {
             editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss');
diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue
index 17d7e8a..1f9a171 100644
--- a/src/views/moneyManage/receiveDetail/receiveService.vue
+++ b/src/views/moneyManage/receiveDetail/receiveService.vue
@@ -818,7 +818,7 @@ const handleEditForm = async () => {
 }
 
 // 付款币种和支付方式选项（客服专用）
-const customOptions = ref(['美元(USD)', '港币(HKD)', '新币(SGD)', '马币(MYR)', '泰铢(THB)', '加币(CAD)', '越南盾(VDN)', '韩元(KRW)'])
+const customOptions = ref(['人民币(RMB)','美元(USD)', '港币(HKD)', '新币(SGD)', '马币(MYR)', '泰铢(THB)', '加币(CAD)', '越南盾(VDN)', '韩元(KRW)'])
 const paytypeOptions = ref(["Stripe-链接收款", "PaymentAsia-链接收款", "Ipay88-链接收款", "Grabpay", "Nets", "E-Transfer", "Paypal", "银行转账", "刷卡", "现金", "支票"])
 const MoneyAddressOptions = ref(['马来西亚', '香港', '新加坡', '泰国', '越南HCM', '加拿大'])
 const handleCurrencyChange = (option) => {
diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue
index 90a17b0..d6a171d 100644
--- a/src/views/moneyManage/refundDetail/refundService.vue
+++ b/src/views/moneyManage/refundDetail/refundService.vue
@@ -49,7 +49,7 @@
 
     <el-card style="margin-top: 0.5vh;background-color: rgb(231,244,253);">
         <el-table :data="tableData" style="height:73vh;width:82vw;background-color: rgb(243,250,254);">
-            <el-table-column type="index" label="序号" width="60" fixed="left">
+            <el-table-column type="index" :label="t('common.id')" width="60" fixed="left">
                 <template #default="scope">
                     {{ scope.$index + 1 + (pagination.pageNum - 1) * pagination.pageSize }}
                 </template>
@@ -98,6 +98,10 @@
                             @click="showEditDialog(scope.row)">
                             编辑
                         </el-button>
+                        <el-button v-if="[12, 22, 32].includes(scope.row.status)" type="primary" text
+                            @click="showRejectReasonDialog(scope.row)">
+                            查看驳回理由
+                        </el-button>
                     </div>
                 </template>
             </el-table-column>
@@ -211,6 +215,10 @@
             <el-button type="primary" @click="" style="margin-left: 2vw;">确定</el-button>
         </div>
     </el-dialog>
+
+    <el-dialog v-model="showRejectReason" title="驳回理由" width="40%" style="background-color: rgb(243,250,254);">
+        <div>{{ rejectReason }}</div>
+    </el-dialog>
 </template>
 <script setup>
 import { ref, onMounted } from 'vue'
@@ -229,6 +237,8 @@ import { productList, CurrencyForId } from '@/views/moneyManage/receiveDetail/ut
 import RefundRecallBackground from '@/assets/images/refund-recall.png'
 import { isNumber } from 'lodash'
 import { re } from 'mathjs'
+import { useI18n } from 'vue-i18n'
+const { t } = useI18n()
 
 const dateRange = ref([])
 const searchForm = ref({
@@ -239,6 +249,8 @@ const searchForm = ref({
 const market = ref([])
 const backRow = ref({})// 撤回存数据
 const editRow = ref({})// 编辑存数据
+const rejectReason = ref('小钱鸭小钱鸭小钱鸭小钱鸭小钱鸭小钱鸭小钱鸭小钱鸭小钱鸭小钱鸭小钱鸭小钱鸭小钱鸭小钱鸭小钱鸭小钱鸭小钱鸭小钱鸭小钱鸭小钱鸭小钱鸭')// 驳回理由
+const showRejectReason = ref(false)// 驳回理由弹窗
 const editForm = ref({
     refundModel: '',
     refundReason: ''
@@ -521,6 +533,10 @@ const showEditDialog = function (row) {
     editRow.value = row
     showEdit.value = true
 }
+const showRejectReasonDialog = function (row) {
+    rejectReason.value = row.rejectReason
+    showRejectReason.value = true
+}
 const handlePageSizeChange = function (val) {
     pagination.value.pageSize = val
     getRefund()
diff --git a/src/views/recharge/bean/addBeanRecharge.vue b/src/views/recharge/bean/addBeanRecharge.vue
index 5ae5387..9307ba0 100644
--- a/src/views/recharge/bean/addBeanRecharge.vue
+++ b/src/views/recharge/bean/addBeanRecharge.vue
@@ -192,7 +192,7 @@ const handleAddForm = async () => {
         <el-form :model="addForm" :rules="rules" ref="formRef" label-width="auto" style="max-width: 600px"
           class="add-form">
           <el-form-item prop="jwcode" label="精网号" label-position="left">
-            <el-input v-model="addForm.jwcode" style="width: 220px" />
+            <el-input v-model="addForm.jwcode" style="width: 220px" @keyup.enter="getUser(addForm.jwcode)" />
             <el-button type="primary" @click="getUser(addForm.jwcode)" style="margin-left: 20px">查询</el-button>
           </el-form-item>
           <el-form-item prop="permanentBean" label="付费金豆" label-position="left">
diff --git a/src/views/recharge/gold/addCoinRecharge.vue b/src/views/recharge/gold/addCoinRecharge.vue
index 5d78f43..282f5bb 100644
--- a/src/views/recharge/gold/addCoinRecharge.vue
+++ b/src/views/recharge/gold/addCoinRecharge.vue
@@ -644,7 +644,7 @@ onMounted(() => {
         <el-form :model="recharge" ref="Ref" :rules="rules" label-width="auto" label-position="right"
                  style="min-width: 500px" class="add-form">
           <el-form-item prop="jwcode" :label="$t('common_add.jwcode')">
-            <el-input v-model="recharge.jwcode" style="width: 220px"/>
+            <el-input v-model="recharge.jwcode" style="width: 220px" @keyup.enter="getUser(recharge.jwcode)"/>
             <el-button type="primary" @click="getUser(recharge.jwcode)" style="margin-left: 20px">{{ $t('common.search') }}</el-button>
           </el-form-item>
           <el-form-item prop="activity" :label="$t('common_add.activity')">
diff --git a/src/views/recharge/gold/coinRecharge.vue b/src/views/recharge/gold/coinRecharge.vue
index ccaca69..2c6aadb 100644
--- a/src/views/recharge/gold/coinRecharge.vue
+++ b/src/views/recharge/gold/coinRecharge.vue
@@ -11,7 +11,8 @@
       <el-button class="no-active-btn"
                  :class="{ 'active-btn': activeTab === 'addCoinRecharge' }"
                  @click="navigateTo('addCoinRecharge')"
-                 v-if="hasAdd">
+                 v-if="hasAdd"
+                 disabled>
         {{ $t('recharge.addCoinRecharge') }}
       </el-button>
     </el-button-group>
diff --git a/src/views/refund/gold/addCoinRefund.vue b/src/views/refund/gold/addCoinRefund.vue
index e44a11b..e59fea7 100644
--- a/src/views/refund/gold/addCoinRefund.vue
+++ b/src/views/refund/gold/addCoinRefund.vue
@@ -441,7 +441,7 @@ onMounted(() =>{
         <el-form :model="addRefund" ref="Ref" :rules="rules" label-width="auto" label-position="right"
           style="min-width: 500px" class="add-form">
           <el-form-item prop="jwcode" :label="$t('common_add.jwcode')">
-            <el-input v-model="addRefund.jwcode" style="width: 220px" />
+            <el-input v-model="addRefund.jwcode" style="width: 220px" @keyup.enter="getUser(addRefund.jwcode)" />
             <el-button type="primary" @click="getUser(addRefund.jwcode)" style="margin-left: 20px">{{ $t('common.search') }}
             </el-button>
           </el-form-item>