一点修改

src/views/audit/gold/audit.vue

@@ -2,22 +2,14 @@
   <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"
-      >
+        <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>
@@ -43,16 +35,17 @@ const hasRecharge = ref(false);
 const hasRefund = ref(false);
 // 导航方法
 const navigateTo = (name) => {
-  if(name == 'rechargeAudit'){
-    if(!hasRecharge){
-      ElMessage.error('您暂无充值审核操作权限')
-      return;
-    }
-  }else if(name = 'refundAudit'){
+  if (name === 'refundAudit') {
     if (!hasRefund) {
       ElMessage.error('您暂无退款审核操作权限')
       return;
     }
+
+  } else if (name === 'rechargeAudit') {
+    if (!hasRecharge) {
+      ElMessage.error('您暂无充值审核操作权限')
+      return;
+    }
   }
   activeTab.value = name;
   router.push({ name });
@@ -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';
 };
 

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">

src/views/moneyManage/executor/executor.vue

@@ -154,6 +154,14 @@
             <el-option label="部分退款" :value="1"></el-option>
           </el-select>
         </div>
+        <div class="dialog-item" v-if="editRow.goodsName === '金币充值'">
+          <el-text style="width:4vw;">永久金币</el-text>
+          <el-input v-model="editRow.permanentGold" style="width:10vw;" disabled />
+        </div>
+        <div class="dialog-item" v-if="editRow.goodsName === '金币充值'">
+          <el-text style="width:4vw;">免费金币</el-text>
+          <el-input v-model="editRow.freeGold" style="width:10vw;" disabled />
+        </div>
         <div class="dialog-item">
           <el-text style="width:4vw;">付款币种</el-text>
           <el-input v-model="editRow.paymentCurrency" style="width:10vw;" disabled />
@@ -187,6 +195,11 @@
           <el-input v-model="editRow.payRemark" style="width:10vw;" :row="3" disabled maxlength="100" type="textarea"
             show-word-limit clearable />
         </div>
+        <div class="dialog-item">
+          <el-text style="width:4vw;">退款理由</el-text>
+          <el-input v-model="editRow.refundReason" style="width:10vw;" :row="3" disabled maxlength="100" type="textarea"
+            show-word-limit clearable />
+        </div>
       </div>
       <div class="right">
         <div class="dialog-item">
@@ -567,7 +580,7 @@ onMounted(() => {
 .edit {
   .left {
     width: 45%;
-    height: 60vh;
+    height: auto;
     padding: 0 2vw;
 
     .dialog-item {

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');

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');

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');

src/views/moneyManage/receiveDetail/receiveService.vue

@@ -14,11 +14,11 @@
                         <el-input v-model="searchData.name" placeholder="请输入客户姓名" style="width:10vw;"
                             clearable></el-input>
                     </div>
-                    <div class="rowItem">
+                    <!-- <div class="rowItem">
                         <el-text style="width: 4vw;">所属地区</el-text>
                         <el-cascader style="width: 9vw;" v-model="searchData.markets" :options="market"
                             placeholder="请选择所属地区" clearable @change="handleMarketChange" />
-                    </div>
+                    </div> -->
                     <div class="rowItem">
                         <el-text style="width: 4vw;">订单状态</el-text>
                         <el-select v-model="searchData.status" placeholder="请选择订单状态" style="width: 10vw;" clearable>
@@ -134,7 +134,7 @@
                             <template #default=scope>
                                 <el-link v-if="scope.row.status == 4" style="color: #FA5A1E;"
                                     @click="openConfirm('refund', scope.row)">退款</el-link>
-                                <el-link v-else-if="scope.row.status == 1" style="color: #2741DE;">待填写手续费</el-link>
+                                <el-link v-else-if="scope.row.status == 1" style="color: #2741DE;">待到账</el-link>
                                 <el-link v-else-if="scope.row.status == 5" style="color: #2741DE;"
                                     @click="openAddForm(scope.row)">编辑</el-link>
                                 <el-link v-else-if="scope.row.status == 0" style="color: #FA5A1E;"
@@ -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) => {

src/views/moneyManage/refundDetail/refundCharge.vue

@@ -15,38 +15,33 @@
                 <el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;"
                     placeholder="请选择产品名称" clearable />
             </div>
-            <div class="item1" v-if="adminData.markets === '总部'">
-                <el-text size="large" style="width:4vw;">所属地区</el-text>
-                <el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" placeholder="请选择所属地区"
-                    clearable @change="handleMarketChange" />
-            </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">订单状态</el-text>
                 <el-select v-model="searchForm.statuses" style="width:9vw;" placeholder="请选择订单状态" clearable>
                     <el-option v-for="item in statusList" :label="item" :value="item" :key="item" />
                 </el-select>
             </div>
-        </div>
-        <div class="condition">
-            <div class="item2">
+            <div class="item1">
                 <el-text size="large" style="width:4vw;">付款币种</el-text>
                 <el-select v-model="searchForm.paymentCurrency" style="width:9vw;" placeholder="请选择付款币种" clearable>
                     <el-option v-for="item in currencies" :key="item" :label="item" :value="item" />
                 </el-select>
             </div>
+        </div>
+        <div class="condition">
             <div class="item2">
                 <el-text size="large" style="width:4vw;">支付方式</el-text>
                 <el-select v-model="searchForm.payType" style="width:9vw;" placeholder="请选择支付方式" clearable>
                     <el-option v-for="item in channelOptions" :key="item" :label="item" :value="item" />
                 </el-select>
             </div>
-            <div class="item2" style="width: 28.5vw;">
+            <div class="item2" style="width: 29.2vw;">
                 <el-text size="large" style="width:4vw;">付款时间</el-text>
                 <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="起始时间"
                     end-placeholder="结束时间" style="width:22vw;" @change="handleDatePickerChange" clearable
                     :disabled-date="disabledDate" :default-time="defaultTime" />
             </div>
-            <div>
+            <div style="margin-left: 1vw;">
                 <el-button type="primary" @click="getRefund">查询</el-button>
                 <el-button type="warning" @click="exportExcel()">导出excel</el-button>
                 <el-button type="primary" @click="openExportList">查看导出列表</el-button>
@@ -85,7 +80,7 @@
                     }}
                 </template>
             </el-table-column>
-            <el-table-column prop="operation" label="操作" fixed="right" width="100px">
+            <el-table-column prop="operation" label="操作" fixed="right" width="120px">
                 <template #default="scope">
                     <div class="operation">
                         <el-button v-if="scope.row.status === 20" type="primary" text @click="showAudit(scope.row)">
@@ -223,7 +218,7 @@
         </div>
     </el-dialog>
 
-    <el-dialog v-model="showSteps" title="退款进度" overflow draggable width="1206px" height="506px" :style="{
+    <el-dialog v-model="showSteps" overflow draggable width="1206px" height="506px" :style="{
         backgroundImage: `url(${RefundChargeBackground})`,
         backgroundSize: 'cover',
         backgroundPosition: 'center'
@@ -299,6 +294,7 @@
                     </el-step>
                 </el-steps>
             </div>
+            <div class="reject-reason" v-if="isReject">驳回理由：{{ rejectReason }}</div>
             <div class="steps-btn">
                 <el-button type="primary" @click="showSteps = false">确定</el-button>
             </div>
@@ -358,6 +354,7 @@ const searchForm = ref({
     markets: []
 })
 const isReject = ref(false)// 进度图有没有驳回状态
+const rejectReason = ref('此用户非常喜欢我们的产品，并表示要充值永久会员.......')// 驳回理由，进度图
 const addForm = ref({
     remark: ''
 })
@@ -535,6 +532,7 @@ const showStep = function (row) {
         return
     }
 
+    rejectReason.value = row.rejectReason || ''
     isReject.value = false
     submitter.value = row.submitter || ''
     areaFinance.value = row.areaFinance || ''
@@ -880,6 +878,15 @@ onMounted(() => {
         justify-content: center;
     }
 
+    .reject-reason {
+        margin-top: 2vh;
+        width: 40%;
+        margin-left: 30%;
+        background-color: white;
+        padding: 1vh;
+        border-radius: 10px;
+    }
+
     .steps-btn {
         height: 15vh;
         display: flex;

src/views/moneyManage/refundDetail/refundFinance.vue

@@ -14,38 +14,33 @@
                 <el-text size="large" style="width:4vw;">产品名称</el-text>
                 <el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;" clearable />
             </div>
-            <div class="item1" v-if="adminData.markets === '总部'">
-                <el-text size="large" style="width:4vw;">所属地区</el-text>
-                <el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" placeholder="请选择所属地区"
-                    clearable @change="handleMarketChange" />
-            </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">订单状态</el-text>
                 <el-select v-model="searchForm.statuses" style="width:9vw;" clearable>
                     <el-option v-for="item in statusList" :label="item" :value="item" :key="item" />
                 </el-select>
             </div>
-        </div>
-        <div class="condition">
-            <div class="item2">
+            <div class="item1">
                 <el-text size="large" style="width:4vw;">付款币种</el-text>
                 <el-select v-model="searchForm.paymentCurrency" style="width:9vw;" clearable>
                     <el-option v-for="item in currencies" :key="item" :label="item" :value="item" />
                 </el-select>
             </div>
+        </div>
+        <div class="condition">
             <div class="item2">
                 <el-text size="large" style="width:4vw;">支付方式</el-text>
                 <el-select v-model="searchForm.payType" style="width:9vw;" clearable>
                     <el-option v-for="item in channelOptions" :key="item" :label="item" :value="item" />
                 </el-select>
             </div>
-            <div class="item2" style="width: 28.5vw;">
+            <div class="item2" style="width: 29.2vw;">
                 <el-text size="large" style="width:4vw;">付款时间</el-text>
                 <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="起始时间"
                     end-placeholder="结束时间" style="width:22vw;" @change="handleDatePickerChange" clearable
                     :disabled-date="disabledDate" :default-time="defaultTime" />
             </div>
-            <div>
+            <div style="margin-left: 1vw;">
                 <el-button type="primary" @click="getRefund">查询</el-button>
                 <el-button type="warning" @click="exportExcel()">导出excel</el-button>
                 <el-button type="primary" @click="openExportList">查看导出列表</el-button>
@@ -84,7 +79,7 @@
                     }}
                 </template>
             </el-table-column>
-            <el-table-column prop="operation" label="操作" fixed="right" width="100px">
+            <el-table-column prop="operation" label="操作" fixed="right" width="120px">
                 <template #default="scope">
                     <div class="operation">
                         <el-button v-if="scope.row.status === 10" type="primary" text @click="showAudit2(scope.row)">
@@ -222,7 +217,7 @@
         </div>
     </el-dialog>
 
-    <el-dialog v-model="showSteps" title="退款进度" overflow draggable width="1206px" height="506px" :style="{
+    <el-dialog v-model="showSteps" overflow draggable width="1206px" height="506px" :style="{
         backgroundImage: `url(${RefundFinanceBackground})`,
         backgroundSize: 'cover',
         backgroundPosition: 'center'
@@ -298,6 +293,7 @@
                     </el-step>
                 </el-steps>
             </div>
+        <div class="reject-reason" v-if="isReject">驳回理由：{{ rejectReason }}</div>
             <div class="steps-btn">
                 <el-button type="primary" @click="showSteps = false">确定</el-button>
             </div>
@@ -365,6 +361,7 @@ const auditForm = ref({
 })
 const isReject = ref(false)// 进度图有没有驳回状态
 const showReject = ref(false)
+const rejectReason = ref('此用户非常喜欢我们的产品，并表示要充值永久会员.......')// 驳回理由，进度图
 const pagination = ref({
     pageNum: 1,
     pageSize: 50,
@@ -464,7 +461,7 @@ const getRefund = async function () {
         return
     }
     try {
-        const statusParam = ref([10, 20, 22, 30, 32, 40, 41])
+        const statusParam = ref([10, 12, 20, 22, 30, 32, 40, 41])
         if (searchForm.value.statuses === '审核通过') {
             statusParam.value = [20, 30, 40]
         } else if (searchForm.value.statuses === '已驳回') {
@@ -474,7 +471,7 @@ const getRefund = async function () {
         } else if (searchForm.value.statuses === '退款成功') {
             statusParam.value = [41]
         } else {
-            statusParam.value = [10, 20, 22, 30, 32, 40, 41]
+            statusParam.value = [10, 12, 20, 22, 30, 32, 40, 41]
         }
 
         const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
@@ -621,6 +618,7 @@ const showStep = function (row) {
         return
     }
 
+    rejectReason.value = row.rejectReason || ''
     isReject.value = false
     submitter.value = row.submitter || ''
     areaFinance.value = row.areaFinance || ''
@@ -920,6 +918,15 @@ onMounted(() => {
         padding-top: 15vw;
     }
 
+    .reject-reason {
+        margin-top: 2vh;
+        width: 40%;
+        margin-left: 30%;
+        background-color: white;
+        padding: 1vh;
+        border-radius: 10px;
+    }
+
     .steps-status {
         display: flex;
         align-items: center;

src/views/moneyManage/refundDetail/refundHeader.vue

@@ -85,7 +85,7 @@
                     }}
                 </template>
             </el-table-column>
-            <el-table-column prop="operation" label="操作" fixed="right" width="100px">
+            <el-table-column prop="operation" label="操作" fixed="right" width="120px">
                 <template #default="scope">
                     <div class="operation">
                         <el-button v-if="scope.row.status === 30" type="primary" text @click="showAudit(scope.row)">
@@ -234,7 +234,7 @@
         </div>
     </el-dialog>
 
-    <el-dialog v-model="showSteps" title="退款进度" overflow draggable width="1206px" height="506px" :style="{
+    <el-dialog v-model="showSteps" overflow draggable width="1206px" height="506px" :style="{
         backgroundImage: `url(${BackgroundSvg})`,
         backgroundSize: 'cover',
         backgroundPosition: 'center'
@@ -310,6 +310,7 @@
                     </el-step>
                 </el-steps>
             </div>
+            <div class="reject-reason" v-if="isReject">驳回理由：{{ rejectReason }}</div>
             <div class="steps-btn">
                 <el-button type="primary" @click="showSteps = false">确定</el-button>
             </div>
@@ -381,6 +382,7 @@ const searchForm = ref({
     statuses: []
 })
 const isReject = ref(false)// 进度图有没有驳回状态
+const rejectReason = ref('此用户非常喜欢我们的产品，并表示要充值永久会员.......')// 驳回理由，进度图
 const addForm = ref({
     remark: ''
 })
@@ -752,6 +754,7 @@ const showStep = function (row) {
         return
     }
 
+    rejectReason.value = row.rejectReason || ''
     isReject.value = false
     submitter.value = row.submitter || ''
     areaFinance.value = row.areaFinance || ''
@@ -929,6 +932,15 @@ onMounted(() => {
         justify-content: center;
     }
 
+    .reject-reason {
+        margin-top: 2vh;
+        width: 40%;
+        margin-left: 30%;
+        background-color: white;
+        padding: 1vh;
+        border-radius: 10px;
+    }
+
     .steps-btn {
         height: 15vh;
         display: flex;

src/views/moneyManage/refundDetail/refundService.vue

@@ -14,10 +14,11 @@
                 <el-text size="large" style="width:4vw;">产品名称</el-text>
                 <el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;" clearable />
             </div>
-            <div class="item1" v-if="adminData.markets === '总部'">
-                <el-text size="large" style="width:4vw;">所属地区</el-text>
-                <el-cascader style="width: 9vw;" v-model="searchForm.market" :options="market" placeholder="请选择所属地区"
-                    clearable @change="handleMarketChange" />
+            <div class="item1">
+                <el-text size="large" style="width:4vw;">付款币种</el-text>
+                <el-select v-model="searchForm.paymentCurrency" style="width:9vw;" clearable>
+                    <el-option v-for="item in currencies" :key="item" :label="item" :value="item" />
+                </el-select>
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;" multiple>订单状态</el-text>
@@ -28,27 +29,19 @@
         </div>
         <div class="condition">
             <div class="item2">
-                <el-text size="large" style="width:4vw;">付款币种</el-text>
-                <el-select v-model="searchForm.paymentCurrency" style="width:9vw;" clearable>
-                    <el-option v-for="item in currencies" :key="item" :label="item" :value="item" />
-                </el-select>
-            </div>
-            <div class="item2">
                 <el-text size="large" style="width:4vw;">支付方式</el-text>
                 <el-select v-model="searchForm.payType" style="width:9vw;" clearable>
                     <el-option v-for="item in channelOptions" :key="item" :label="item" :value="item" />
                 </el-select>
             </div>
-            <div class="item2" style="width: 28.5vw;">
+            <div class="item2" style="width: 29.2vw;">
                 <el-text size="large" style="width:4vw;">付款时间</el-text>
                 <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="起始时间"
-                    end-placeholder="结束时间" style="width:22vw;" :disabled-date="disabledDate" :default-time="defaultTime"
+                    end-placeholder="结束时间" :disabled-date="disabledDate" :default-time="defaultTime"
                     clearable />
             </div>
-            <div>
+            <div style="margin-left: 1vw;">
                 <el-button type="primary" @click="getRefund">查询</el-button>
-                <!-- <el-button type="warning">导出excel</el-button>
-                <el-button type="primary">查看导出列表</el-button> -->
                 <el-button type="success" @click="reset">重置</el-button>
             </div>
         </div>
@@ -56,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>
@@ -105,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>
@@ -218,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'
@@ -236,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({
@@ -246,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: ''
@@ -375,7 +380,7 @@ const submitEdit = async function () {
         }else if(!editForm.value.refundReason) {
             ElMessage.error('请输入退款理由')
             return
-        }else if(editForm.value.refundModel == 1 && (!editForm.value.partRefundGold || !editForm.value.partRefundFree)) {
+        }else if(editRow.value.goodsName === '金币充值' && editForm.value.refundModel == 1 && (!editForm.value.partRefundGold || !editForm.value.partRefundFree)) {
             ElMessage.error('请输入退款金币数和免费金币数')
             return
         }else if (editForm.value.refundModel == 1 && (editForm.value.partRefundGold || editForm.value.partRefundFree)) {
@@ -515,6 +520,12 @@ const reset = function () {
     getRefund()
 }
 const showBackDialog = function (row) {
+    editForm.value = {
+        refundModel: '',
+        refundReason: '',
+        partRefundGold: '',
+        partRefundFree: ''
+    }
     backRow.value = row
     showBack.value = true
 }
@@ -522,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()

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">

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')">

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>

src/views/refund/gold/addCoinRefund.vue

@@ -279,7 +279,7 @@ const getUser = async function (jwcode) {
 // 退款类型，写死为商品退款
 const refundType = ref([
   { value: '商品退款', label: t('refund.refundTypeOptions.商品退款') },
-  { value: '金币退款', label: t('refund.refundTypeOptions.金币退款') }
+  //{ value: '金币退款', label: t('refund.refundTypeOptions.金币退款') }
 ])
 
 // 存储所有商品信息和订单号下拉数据
@@ -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>