合并

src/views/consume/bean/addBeanConsume.vue

@@ -214,7 +214,11 @@ 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="t('common_add.jwcode')" label-position="left">
+<<<<<<< HEAD
           <el-input v-model="consumeForm.jwcode" style="width: 220px" @keyup.enter="getUser(consumeForm.jwcode)"/>
+=======
+          <el-input v-model="consumeForm.jwcode" style="width: 220px" @keyup.enter="getUser(consumeForm.jwcode)" />
+>>>>>>> lihuilin/feature-20260121173255-多语言二期2合并
           <el-button type="primary" @click="getUser(consumeForm.jwcode)" style="margin-left: 20px">{{ t('common.search') }}</el-button>
         </el-form-item>
         <el-form-item prop="permanentBean" :label="t('common_add.permanentBean')" label-position="left">

src/views/moneyManage/executor/executor.vue

@@ -7,7 +7,8 @@
       </div>
       <div class="search">
         <el-text size="large" style="width:4vw;">{{ t('common.jwcode') }}</el-text>
-        <el-input v-model="searchForm.jwcode" :placeholder="t('common.jwcodePlaceholder')" style="width:9vw;" clearable />
+        <el-input v-model="searchForm.jwcode" :placeholder="t('common.jwcodePlaceholder')" style="width:9vw;"
+          clearable />
       </div>
       <div class="search">
         <el-text size="large" style="width:4vw;">{{ t('common.productName') }}</el-text>
@@ -15,8 +16,8 @@
       </div>
       <div class="search" v-if="adminData.markets === t('common.markets.headquarter')">
         <el-text size="large" style="width:4vw;">{{ t('common.market') }}</el-text>
-        <el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" :placeholder="t('common.marketPlaceholder')"
-          clearable />
+        <el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market"
+          :placeholder="t('common.marketPlaceholder')" clearable />
       </div>
       <div class="search">
         <el-text size="large" style="width:4vw;">{{ t('common.refundCurrency') }}</el-text>
@@ -41,9 +42,8 @@
       <div class="search2" style="width: 25.5vw;">
         <el-text size="large" style="width:4vw;">{{ t('common.refundTime') }}</el-text>
         <el-date-picker v-model="dateRange" type="datetimerange" :range-separator="t('common.to')"
-        :start-placeholder="t('common.startTime')"
-        :end-placeholder="t('common.endTime')" style="width:18vw;" clearable :disabled-date="disabledDate"
-          :default-time="defaultTime" />
+          :start-placeholder="t('common.startTime')" :end-placeholder="t('common.endTime')" style="width:18vw;"
+          clearable :disabled-date="disabledDate" :default-time="defaultTime" />
       </div>
       <div>
         <el-button type="primary" size="medium" @click="getRefund">{{ t('common.search') }}</el-button>
@@ -155,6 +155,15 @@
             <el-option :label="t('common_add.refundModelPart')" :value="1"></el-option>
           </el-select>
         </div>
+        <!-- TODO多语言 -->
+        <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;">{{ t('common_add.payCurrency') }}</el-text>
           <el-input v-model="editRow.paymentCurrency" style="width:10vw;" disabled />
@@ -188,28 +197,36 @@
           <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.rejectReason" style="width:10vw;" :row="3" disabled maxlength="100" type="textarea"
+            show-word-limit clearable />
+        </div>
       </div>
       <div class="right">
         <div class="dialog-item">
           <el-text style="width:4vw;">{{ t('common_add.refundCurrency') }}</el-text>
-          <el-select v-model="editForm.refundCurrency" :placeholder="t('common_add.refundCurrencyPlaceholder')" style="width:10vw;">
+          <el-select v-model="editForm.refundCurrency" :placeholder="t('common_add.refundCurrencyPlaceholder')"
+            style="width:10vw;">
             <el-option v-for="item in currencies" :key="item" :label="item" :value="item" />
           </el-select>
         </div>
         <div class="dialog-item">
           <el-text style="width:4vw;">{{ t('common_add.refundAmount') }}</el-text>
-          <el-input v-model="editForm.refundAmount" :placeholder="t('common_add.refundAmountPlaceholder')" style="width:10vw;" clearable />
+          <el-input v-model="editForm.refundAmount" :placeholder="t('common_add.refundAmountPlaceholder')"
+            style="width:10vw;" clearable />
         </div>
         <div class="dialog-item">
           <el-text style="width:4vw;">{{ t('common_add.refundChannels') }}</el-text>
-          <el-select v-model="editForm.refundChannels" :placeholder="t('common_add.refundChannelsPlaceholder')" style="width:10vw;">
+          <el-select v-model="editForm.refundChannels" :placeholder="t('common_add.refundChannelsPlaceholder')"
+            style="width:10vw;">
             <el-option v-for="item in channelOptions" :key="item" :label="item" :value="item" />
           </el-select>
         </div>
         <div class="dialog-item">
           <el-text style="width:4vw;">{{ t('common_add.refundTime') }}</el-text>
-          <el-date-picker v-model="editForm.refundTime" type="datetime" :placeholder="t('common_add.refundTimePlaceholder')" style="width:10vw;"
-            clearable />
+          <el-date-picker v-model="editForm.refundTime" type="datetime"
+            :placeholder="t('common_add.refundTimePlaceholder')" style="width:10vw;" clearable />
         </div>
         <div class="dialog-item">
           <el-text style="width:4vw;">{{ t('common_add.refundVoucher') }}</el-text>
@@ -226,11 +243,12 @@
         </div>
         <div class="dialog-item">
           <el-text style="width:4vw;">{{ t('common_add.remark') }}</el-text>
-          <el-input v-model="editForm.refundRemark" :placeholder="t('common_add.remarkPlaceholder')" style="width:10vw;" :rows="3" maxlength="100"
-            show-word-limit type="textarea" clearable />
+          <el-input v-model="editForm.refundRemark" :placeholder="t('common_add.remarkPlaceholder')" style="width:10vw;"
+            :rows="3" maxlength="100" show-word-limit type="textarea" clearable />
         </div>
         <div style="display:flex;justify-content: center;margin-top: 5vh;">
-          <el-button type="default" @click="hideEditDialog" style="margin-right: 2vw;">{{ t('common.cancel') }}</el-button>
+          <el-button type="default" @click="hideEditDialog" style="margin-right: 2vw;">{{ t('common.cancel')
+          }}</el-button>
           <el-button type="primary" @click="submitRefund">{{ t('common.submit') }}</el-button>
         </div>
       </div>
@@ -595,7 +613,7 @@ onMounted(() => {
 .edit {
   .left {
     width: 45%;
-    height: 60vh;
+    height: auto;
     padding: 0 2vw;
 
     .dialog-item {

src/views/moneyManage/receiveDetail/receiveFinance.vue

@@ -210,7 +210,8 @@
                             </template>
                         </el-table-column>
                         <!-- 地区财务表格操作（待审核→审核，已通过→编辑） -->
-                        <el-table-column fixed="right" :label="t('common_list.operation')" width="120px" v-if="activeTab != 'reject'">
+                        <el-table-column fixed="right" :label="t('common_list.operation')" width="120px"
+                            v-if="activeTab != 'reject'">
                             <template #default=scope>
                                 <el-link v-if="activeTab == 'wait'" style="color: #2741DE;"
                                     @click="openAuditForm(scope.row)">{{ t('common.audit') }}</el-link>
@@ -517,8 +518,8 @@
         </el-dialog>
 
         <!-- 新增退款 -->
-        <el-dialog v-model="refundDialog" :title="t('common_add.refund')" class="refundDialog" overflow draggable style="width: 40vw;"
-            :before-close="closeRefundForm">
+        <el-dialog v-model="refundDialog" :title="t('common_add.refund')" class="refundDialog" overflow draggable
+            style="width: 40vw;" :before-close="closeRefundForm">
             <div style="display: flex;">
                 <div class="left">
                     <div class="add-item">
@@ -1213,6 +1214,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

@@ -5,13 +5,13 @@
                 <div class="row1">
                     <div class="rowItem">
                         <el-text style="width: 4vw;">{{ t('common.jwcode') }}</el-text>
-                        <el-input v-model="searchData.jwcode" :placeholder="t('common.jwcodePlaceholder')" style="width:10vw;"
-                            clearable></el-input>
+                        <el-input v-model="searchData.jwcode" :placeholder="t('common.jwcodePlaceholder')"
+                            style="width:10vw;" clearable></el-input>
                     </div>
                     <div class="rowItem">
                         <el-text style="width: 4vw;">{{ t('common.customerName') }}</el-text>
-                        <el-input v-model="searchData.name" :placeholder="t('common.customerNamePlaceholder')" style="width:10vw;"
-                            clearable></el-input>
+                        <el-input v-model="searchData.name" :placeholder="t('common.customerNamePlaceholder')"
+                            style="width:10vw;" clearable></el-input>
                     </div>
                     <div class="rowItem">
                         <el-text style="width: 4vw;">{{ t('common.market') }}</el-text>
@@ -24,14 +24,15 @@
                     <!-- 地区财务固定显示付款币种，删除客服的订单状态 -->
                     <div class="rowItem">
                         <el-text style="width: 4vw;">{{ t('common.payCurrency') }}</el-text>
-                        <el-select v-model="searchData.paymentCurrency" :placeholder="t('common.payCurrencyPlaceholder')" style="width: 10vw;"
-                            clearable>
+                        <el-select v-model="searchData.paymentCurrency"
+                            :placeholder="t('common.payCurrencyPlaceholder')" style="width: 10vw;" clearable>
                             <el-option v-for="item in customOptions" :key="item" :label="item" :value="item" />
                         </el-select>
                     </div>
                     <div class="rowItem">
                         <el-text style="width: 4vw;">{{ t('common.payModel') }}</el-text>
-                        <el-select v-model="searchData.payType" :placeholder="t('common.payModelPlaceholder')" style="width: 10vw;" clearable>
+                        <el-select v-model="searchData.payType" :placeholder="t('common.payModelPlaceholder')"
+                            style="width: 10vw;" clearable>
                             <el-option v-for="item in paytypeList" :key="item" :label="item" :value="item" />
                         </el-select>
                     </div>
@@ -40,8 +41,8 @@
                     <div class="left">
                         <div class="rowItem">
                             <el-text style="width: 4vw;">{{ t('common.activityName') }}</el-text>
-                            <el-select v-model="searchData.activity" :placeholder="t('common.activityNameChoose')" style="width: 10vw;"
-                                clearable>
+                            <el-select v-model="searchData.activity" :placeholder="t('common.activityNameChoose')"
+                                style="width: 10vw;" clearable>
                                 <el-option v-for="item in activityList" :key="item.id" :label="item.activityName"
                                     :value="item.id" />
                             </el-select>
@@ -54,17 +55,17 @@
                         <div class="rowItem" style="width: 25vw">
                             <el-text style="width: 4vw; margin-left: 0.5vw;">{{ t('common.payTime') }}</el-text>
                             <el-date-picker v-model="getTime" type="datetimerange" :range-separator="t('common.to')"
-                                :start-placeholder="t('common.startTime')" :end-placeholder="t('common.endTime')" style="width: 22vw; "
-                                @change="handleDatePickerChange" :default-time="defaultTime"
+                                :start-placeholder="t('common.startTime')" :end-placeholder="t('common.endTime')"
+                                style="width: 22vw; " @change="handleDatePickerChange" :default-time="defaultTime"
                                 :disabled-date="disabledDate" />
                         </div>
                     </div>
                     <el-button style="width: 3vw;" type="primary" @click="search">{{ t('common.search') }}</el-button>
                     <el-button style="width: 3vw;" type="success" @click="reset">{{ t('common.reset') }}</el-button>
-                    <el-button v-if="activeTab == 'done'" style="width: 5vw;" type="warning"
-                        @click="exportExcel()">{{ t('common.exportExcel') }}</el-button>
-                    <el-button v-if="activeTab == 'done'" style="width: 6vw;" type="primary"
-                        @click="openExportList">{{ t('common.viewExportList') }}</el-button>
+                    <el-button v-if="activeTab == 'done'" style="width: 5vw;" type="warning" @click="exportExcel()">{{
+                        t('common.exportExcel') }}</el-button>
+                    <el-button v-if="activeTab == 'done'" style="width: 6vw;" type="primary" @click="openExportList">{{
+                        t('common.viewExportList') }}</el-button>
                 </div>
             </el-card>
         </div>
@@ -89,7 +90,8 @@
                     </div>
                     <div class="info-tooltip">
                         <el-popover placement="top" :title="t('cash.receiveCashDataTitle')" :width="260" trigger="hover"
-                            :content="t('cash.receiveCashDataContent')" popper-class="custom-popover" :show-arrow="false">
+                            :content="t('cash.receiveCashDataContent')" popper-class="custom-popover"
+                            :show-arrow="false">
                             <template #reference>
                                 <el-icon class="service-icon">
                                     <Warning />
@@ -111,11 +113,13 @@
                         <el-table-column fixed="left" prop="jwcode" label="Homily ID" width="110px" />
                         <el-table-column fixed="left" prop="name" :label="t('common_list.name')" width="110px" />
                         <el-table-column prop="marketName" :label="t('common_list.market')" width="80px" />
-                        <el-table-column prop="activity" :label="t('common_list.activity')" width="120px" show-overflow-tooltip />
+                        <el-table-column prop="activity" :label="t('common_list.activity')" width="120px"
+                            show-overflow-tooltip />
                         <el-table-column prop="goodsName" :label="t('common_list.productName')" width="120px" />
                         <el-table-column prop="goodNum" :label="t('common_list.productNum')" width="130px">
                             <template #default="scope">
-                                <span v-if="scope.row.goodsName == t('cash.coinRecharge')">{{ scope.row.permanentGold }}</span>
+                                <span v-if="scope.row.goodsName == t('cash.coinRecharge')">{{ scope.row.permanentGold
+                                    }}</span>
                                 <span v-else>{{ scope.row.goodNum }}</span>
                             </template>
                         </el-table-column>
@@ -147,7 +151,8 @@
                                 <div v-if="scope.row.voucher"
                                     style="display: flex; justify-content: center; align-items: center; cursor: pointer;"
                                     @click="previewImage(scope.row.voucher)">
-                                    <img :src="scope.row.voucher" :alt="t('common_list.payVoucher')" style="width: auto; height: 40px;">
+                                    <img :src="scope.row.voucher" :alt="t('common_list.payVoucher')"
+                                        style="width: auto; height: 40px;">
                                 </div>
                                 <div v-else
                                     style="display: flex; justify-content: center; align-items: center; height: 40px;">
@@ -163,18 +168,20 @@
                             show-overflow-tooltip></el-table-column>
                         <el-table-column prop="receivedTime" :label="t('common_list.receiveTime')"
                             v-if="activeTab == 'pass' || activeTab == 'done'" width="180px" />
-                        <el-table-column prop="remark" :label="t('common_list.remark')" v-if="activeTab != 'reject'" width="150px"
-                            show-overflow-tooltip></el-table-column>
-                        <el-table-column prop="status" fixed="right" :label="t('common_list.orderStatus')" v-if="activeTab == 'done'"
-                            width="150px" show-overflow-tooltip>
+                        <el-table-column prop="remark" :label="t('common_list.remark')" v-if="activeTab != 'reject'"
+                            width="150px" show-overflow-tooltip></el-table-column>
+                        <el-table-column prop="status" fixed="right" :label="t('common_list.orderStatus')"
+                            v-if="activeTab == 'done'" width="150px" show-overflow-tooltip>
                             <template #default="scope">
-                                <span style="color: rgb(242, 84, 83);" v-if="scope.row.status == 6">{{ t('common_list.refund') }}</span>
+                                <span style="color: rgb(242, 84, 83);" v-if="scope.row.status == 6">{{
+                                    t('common_list.refund') }}</span>
                                 <span style="color: rgb(127,204,133);" v-else>{{ t('common_list.normal') }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="auditTime" :label="t('common_list.rejectTime')" v-if="activeTab == 'reject'" width="180px"
-                            show-overflow-tooltip></el-table-column>
-                        <el-table-column prop="rejectReason" :label="t('common_list.rejectReason')" v-if="activeTab == 'reject'" width="150px">
+                        <el-table-column prop="auditTime" :label="t('common_list.rejectTime')"
+                            v-if="activeTab == 'reject'" width="180px" show-overflow-tooltip></el-table-column>
+                        <el-table-column prop="rejectReason" :label="t('common_list.rejectReason')"
+                            v-if="activeTab == 'reject'" width="150px">
                             <template #default="scope">
                                 <div class="ellipsis-container"
                                     @mouseenter="handleMouseEnter($event, scope.row.rejectReason)"
@@ -193,16 +200,19 @@
                             </template>
                         </el-table-column>
                         <!-- 总部财务表格操作（待审核→审核，已通过→编辑） -->
-                        <el-table-column fixed="right" :label="t('common_list.operation')" width="120px" v-if="activeTab != 'reject'">
+                        <el-table-column fixed="right" :label="t('common_list.operation')" width="120px"
+                            v-if="activeTab != 'reject'">
                             <template #default=scope>
                                 <el-link v-if="activeTab == 'wait'" style="color: #2741DE;"
                                     @click="openAuditForm(scope.row)">{{ t('common.audit') }}</el-link>
                                 <el-link
                                     v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4)"
-                                    style="color: #2741DE;" @click="openEditForm(scope.row)">{{ t('common.edit') }}</el-link>
+                                    style="color: #2741DE;" @click="openEditForm(scope.row)">{{ t('common.edit')
+                                    }}</el-link>
                                 <el-link
                                     v-else-if="activeTab == 'done' && scope.row.status == 4 && startsWith(scope.row.orderCode, 'GOLDCOIN')"
-                                    style="color: rgb(242, 84, 83);" @click="openRefundConfirm(scope.row)">{{ t('common.refund') }}</el-link>
+                                    style="color: rgb(242, 84, 83);" @click="openRefundConfirm(scope.row)">{{
+                                    t('common.refund') }}</el-link>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -237,41 +247,46 @@
                 <div class="left">
                     <el-form class="editForm" label-width="6vw" label-position="left">
                         <el-form-item :label="t('common_add.jwcode')">
-                            <el-input disabled="true" v-model="editFormData.jwcode" :placeholder="t('common_add.jwcode')" />
+                            <el-input disabled="true" v-model="editFormData.jwcode"
+                                :placeholder="t('common_add.jwcode')" />
                         </el-form-item>
                         <el-form-item :label="t('common_add.customerName')">
-                            <el-input disabled="true" v-model="editFormData.name" :placeholder="t('common_add.customerName')" />
+                            <el-input disabled="true" v-model="editFormData.name"
+                                :placeholder="t('common_add.customerName')" />
                         </el-form-item>
                         <el-form-item :label="t('common_add.market')">
-                            <el-input disabled="true" v-model="editFormData.marketName" :placeholder="t('common_add.market')" />
+                            <el-input disabled="true" v-model="editFormData.marketName"
+                                :placeholder="t('common_add.market')" />
                         </el-form-item>
                         <el-form-item :label="t('common_add.activity')">
-                            <el-input disabled="true" v-model="editFormData.activity" :placeholder="t('common_add.activity')" />
+                            <el-input disabled="true" v-model="editFormData.activity"
+                                :placeholder="t('common_add.activity')" />
                         </el-form-item>
                         <el-form-item :label="t('common_add.productName')">
-                            <el-select disabled="true" v-model="editFormData.goodsName" :placeholder="t('common_add.productName')"
-                                clearable></el-select>
+                            <el-select disabled="true" v-model="editFormData.goodsName"
+                                :placeholder="t('common_add.productName')" clearable></el-select>
                         </el-form-item>
                         <!-- 金币产品特殊显示 -->
                         <el-form-item v-show="!isEditGold" :label="t('common_add.productNum')">
                             <div style="display: flex;">
                                 <el-input disabled="true" style="padding-right: 30px; flex: 3;"
-                                    v-model="editFormData.goodNum" :placeholder="t('common_add.productNumPlaceholder')" />
+                                    v-model="editFormData.goodNum"
+                                    :placeholder="t('common_add.productNumPlaceholder')" />
                                 <CurrencySelect disabled="true" v-model="editFormData.numUnit" :items="numUnitList"
                                     style="flex: 1.5;" :placeholder="t('common_add.numUnit')" />
                             </div>
                         </el-form-item>
                         <div v-show="isEditGold" style="margin-bottom: 15px;  display: flex;">
                             <div style=" display: flex; margin-right: 10px;">
-                                <span
-                                    style="color: #999999; display: flex; white-space: nowrap;align-items: center;">{{ t('common_add.permanentGold') }}：</span>
+                                <span style="color: #999999; display: flex; white-space: nowrap;align-items: center;">{{
+                                    t('common_add.permanentGold') }}：</span>
                                 <el-input disabled="true"
                                     style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
                                     v-model="editFormData.permanentGold" />
                             </div>
                             <div style="padding-right: 5px; display: flex;">
-                                <span
-                                    style="color: #999999; display: flex; white-space: nowrap;align-items: center;">{{ t('common_add.freeGold') }}：</span>
+                                <span style="color: #999999; display: flex; white-space: nowrap;align-items: center;">{{
+                                    t('common_add.freeGold') }}：</span>
                                 <el-input disabled="true"
                                     style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
                                     v-model="editFormData.freeGold" />
@@ -282,15 +297,16 @@
                                 :items="customOptions" :placeholder="t('common_add.payCurrencyPlaceholder')" />
                         </el-form-item>
                         <el-form-item :label="t('common_add.payAmount')">
-                            <el-input :disabled="!ifOnline" v-model="editFormData.paymentAmount" :placeholder="t('common_add.payAmountPlaceholder')" />
+                            <el-input :disabled="!ifOnline" v-model="editFormData.paymentAmount"
+                                :placeholder="t('common_add.payAmountPlaceholder')" />
                         </el-form-item>
                         <el-form-item :label="t('common_add.payMethod')">
-                            <el-select disabled="true" v-model="editFormData.payType" :placeholder="t('common_add.payMethodPlaceholder')"
-                                clearable></el-select>
+                            <el-select disabled="true" v-model="editFormData.payType"
+                                :placeholder="t('common_add.payMethodPlaceholder')" clearable></el-select>
                         </el-form-item>
                         <el-form-item :label="t('common_add.receiveArea')">
-                            <el-select disabled="true" v-model="editFormData.receivedMarket" :placeholder="t('common_add.receiveAreaPlaceholder')"
-                                clearable></el-select>
+                            <el-select disabled="true" v-model="editFormData.receivedMarket"
+                                :placeholder="t('common_add.receiveAreaPlaceholder')" clearable></el-select>
                         </el-form-item>
                         <el-form-item :label="t('common_add.payTime')">
                             <el-date-picker disabled="true" type="datetime" v-model="editFormData.payTime"
@@ -326,13 +342,16 @@
                                 :placeholder="t('common_add.receiveCurrencyPlaceholder')" />
                         </el-form-item>
                         <el-form-item :label="t('common_add.receiveAmount')" prop="receivedAmount">
-                            <el-input v-model="editFormData.receivedAmount" :placeholder="t('common_add.receiveAmountPlaceholder')" type="number" />
+                            <el-input v-model="editFormData.receivedAmount"
+                                :placeholder="t('common_add.receiveAmountPlaceholder')" type="number" />
                         </el-form-item>
                         <el-form-item :label="t('common_add.fee')" prop="handlingCharge">
-                            <el-input v-model="editFormData.handlingCharge" :placeholder="t('common_add.feePlaceholder')" type="number" />
+                            <el-input v-model="editFormData.handlingCharge"
+                                :placeholder="t('common_add.feePlaceholder')" type="number" />
                         </el-form-item>
                         <el-form-item :label="t('common_add.receiveTime')" required>
-                            <el-date-picker type="datetime" v-model="editFormData.receivedTime" :placeholder="t('common_add.receiveTimePlaceholder')" />
+                            <el-date-picker type="datetime" v-model="editFormData.receivedTime"
+                                :placeholder="t('common_add.receiveTimePlaceholder')" />
                         </el-form-item>
                     </el-form>
                     <span class="editBtns">
@@ -348,8 +367,8 @@
         </el-dialog>
 
         <!-- 新增退款 -->
-        <el-dialog v-model="refundDialog" :title="t('common_add.refund')" class="refundDialog" overflow draggable style="width: 40vw;"
-            :before-close="closeRefundForm">
+        <el-dialog v-model="refundDialog" :title="t('common_add.refund')" class="refundDialog" overflow draggable
+            style="width: 40vw;" :before-close="closeRefundForm">
             <div style="display: flex;">
                 <div class="left">
                     <div class="add-item">
@@ -381,7 +400,8 @@
                     </div>
                     <div v-show="isRefundGold" style="display: flex; margin-bottom: 10px;">
                         <div style=" display: flex; align-items: center;justify-content: center; ">
-                            <span style="color: #999999;  white-space: nowrap;">{{ t('common_add.permanentGold') }}：</span>
+                            <span style="color: #999999;  white-space: nowrap;">{{ t('common_add.permanentGold')
+                                }}：</span>
                             <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
                                 v-model="refundFormData.permanentGold" disabled />
                         </div>
@@ -409,7 +429,8 @@
                     </div>
                     <div class="add-item">
                         <el-text style="width:4vw;" size="small">{{ t('common_add.transferVoucher') }}</el-text>
-                        <el-form-item :rules="{ required: true, message: t('common_add.uploadPhoto'), trigger: 'change' }">
+                        <el-form-item
+                            :rules="{ required: true, message: t('common_add.uploadPhoto'), trigger: 'change' }">
                             <el-upload ref="uploadRef" :auto-upload="false" list-type="picture-card"
                                 :show-file-list="false">
                                 <template #default>
@@ -438,7 +459,8 @@
                     </div>
                     <div v-show="refundFormData.refundModel == '1'" style="display: flex; margin-bottom: 10px;">
                         <div style=" display: flex; align-items: center;justify-content: center; ">
-                            <span style="color: #999999;  white-space: nowrap;">{{ t('common_add.permanentGold') }}：</span>
+                            <span style="color: #999999;  white-space: nowrap;">{{ t('common_add.permanentGold')
+                                }}：</span>
                             <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
                                 v-model="refundFormData.partRefundGold" disabled />
                         </div>
@@ -1010,6 +1032,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

@@ -210,7 +210,8 @@
                             </template>
                         </el-table-column>
                         <!-- 地区财务表格操作（待审核→审核，已通过→编辑） -->
-                        <el-table-column fixed="right" :label="t('common_list.operation')" width="120px" v-if="activeTab != 'reject'">
+                        <el-table-column fixed="right" :label="t('common_list.operation')" width="120px"
+                            v-if="activeTab != 'reject'">
                             <template #default=scope>
                                 <el-link v-if="activeTab == 'wait'" style="color: #2741DE;"
                                     @click="openAuditForm(scope.row)">{{ t('common.audit') }}</el-link>
@@ -517,8 +518,8 @@
         </el-dialog>
 
         <!-- 新增退款 -->
-        <el-dialog v-model="refundDialog" :title="t('common_add.refund')" class="refundDialog" overflow draggable style="width: 40vw;"
-            :before-close="closeRefundForm">
+        <el-dialog v-model="refundDialog" :title="t('common_add.refund')" class="refundDialog" overflow draggable
+            style="width: 40vw;" :before-close="closeRefundForm">
             <div style="display: flex;">
                 <div class="left">
                     <div class="add-item">
@@ -1213,6 +1214,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/refundDetail/refundCharge.vue

@@ -4,11 +4,13 @@
         <div class="condition">
             <div class="item1">
                 <el-text size="large" style="width:4vw;">{{ t('common.jwcode') }}</el-text>
-                <el-input v-model="searchForm.jwcode" :placeholder="t('common.jwcodePlaceholder')" style="width:9vw;" clearable />
+                <el-input v-model="searchForm.jwcode" :placeholder="t('common.jwcodePlaceholder')" style="width:9vw;"
+                    clearable />
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">{{ t('common.customerName') }}</el-text>
-                <el-input v-model="searchForm.name" :placeholder="t('common.customerNamePlaceholder')" style="width:9vw;" clearable />
+                <el-input v-model="searchForm.name" :placeholder="t('common.customerNamePlaceholder')"
+                    style="width:9vw;" clearable />
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">{{ t('common.productName') }}</el-text>
@@ -17,12 +19,13 @@
             </div>
             <div class="item1" v-if="isHeadquarters">
                 <el-text size="large" style="width:4vw;">{{ t('common.market') }}</el-text>
-                <el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" :placeholder="t('common.marketPlaceholder')"
-                    clearable @change="handleMarketChange" />
+                <el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market"
+                    :placeholder="t('common.marketPlaceholder')" clearable @change="handleMarketChange" />
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">{{ t('common.orderStatus') }}</el-text>
-                <el-select v-model="searchForm.statuses" style="width:9vw;" :placeholder="t('common.orderStatusPlaceholder')" clearable>
+                <el-select v-model="searchForm.statuses" style="width:9vw;"
+                    :placeholder="t('common.orderStatusPlaceholder')" clearable>
                     <el-option v-for="item in statusList" :label="item" :value="item" :key="item" />
                 </el-select>
             </div>
@@ -30,21 +33,24 @@
         <div class="condition">
             <!-- <div class="item2">
                 <el-text size="large" style="width:4vw;">{{ t('common.payCurrency') }}</el-text>
-                <el-select v-model="searchForm.paymentCurrency" style="width:9vw;" :placeholder="t('common.payCurrencyPlaceholder')" clearable>
+                <el-select v-model="searchForm.paymentCurrency" style="width:9vw;"
+                    :placeholder="t('common.payCurrencyPlaceholder')" 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;">{{ t('common.payModel') }}</el-text>
-                <el-select v-model="searchForm.payType" style="width:9vw;" :placeholder="t('common.payModelPlaceholder')" clearable>
+                <el-select v-model="searchForm.payType" style="width:9vw;"
+                    :placeholder="t('common.payModelPlaceholder')" clearable>
                     <el-option v-for="item in channelOptions" :key="item" :label="item" :value="item" />
                 </el-select>
             </div>
             <div class="item2" style="width: 29.3vw;">
                 <el-text size="large" style="width:4vw;">{{ t('common.payTime') }}</el-text>
-                <el-date-picker v-model="dateRange" type="datetimerange" :range-separator="t('common.to')" :start-placeholder="t('common.startTime')"
-                    :end-placeholder="t('common.endTime')" style="width:22vw;" @change="handleDatePickerChange" clearable
-                    :disabled-date="disabledDate" :default-time="defaultTime" />
+                <el-date-picker v-model="dateRange" type="datetimerange" :range-separator="t('common.to')"
+                    :start-placeholder="t('common.startTime')" :end-placeholder="t('common.endTime')"
+                    style="width:22vw;" @change="handleDatePickerChange" clearable :disabled-date="disabledDate"
+                    :default-time="defaultTime" />
             </div>
             <div>
                 <el-button type="primary" @click="getRefund">{{ t('common.search') }}</el-button>
@@ -63,17 +69,20 @@
                 </template>
             </el-table-column>
             <el-table-column prop="name" label="Homily ID" width="120" fixed="left" />
-            <el-table-column prop="jwcode" :label="t('common_list.name')" width="120" fixed="left" show-overflow-tooltip />
+            <el-table-column prop="jwcode" :label="t('common_list.name')" width="120" fixed="left"
+                show-overflow-tooltip />
             <el-table-column prop="marketName" :label="t('common_list.market')" width="120" />
             <el-table-column prop="goodsName" :label="t('common_list.productName')" width="130" show-overflow-tooltip />
             <el-table-column prop="goodsNum" :label="t('common_list.productNum')" width="120" />
             <el-table-column prop="refundModel" :label="t('common_list.refundModel')" width="120">
                 <template #default="scope">
-                    {{ scope.row.refundModel === 1 ? t('common_list.refundModelPart') : t('common_list.refundModelAll') }}
+                    {{ scope.row.refundModel === 1 ? t('common_list.refundModelPart') : t('common_list.refundModelAll')
+                    }}
                 </template>
             </el-table-column>
             <el-table-column prop="submitter" :label="t('common_list.submitter')" width="120" />
-            <el-table-column prop="refundReason" :label="t('common_list.refundReason')" width="120" show-overflow-tooltip />
+            <el-table-column prop="refundReason" :label="t('common_list.refundReason')" width="120"
+                show-overflow-tooltip />
             <el-table-column prop="remark" :label="t('common_list.remark')" width="150" show-overflow-tooltip />
             <el-table-column prop="status" :label="t('common_list.orderStatus')" width="120">
                 <template #default="scope">
@@ -117,11 +126,13 @@
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">{{ t('common_add.permanentGold') }}</el-text>
-                <el-input v-model="auditRow.permanentGold" size="small" style="width:10vw;" disabled /><span>&nbsp;{{ t('common.个') }}</span>
+                <el-input v-model="auditRow.permanentGold" size="small" style="width:10vw;" disabled /><span>&nbsp;{{
+                    t('common.个') }}</span>
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">{{ t('common_add.freeGold') }}</el-text>
-                <el-input v-model="auditRow.freeGold" size="small" style="width:10vw;" disabled /><span>&nbsp;{{ t('common.个') }}</span>
+                <el-input v-model="auditRow.freeGold" size="small" style="width:10vw;" disabled /><span>&nbsp;{{
+                    t('common.个') }}</span>
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">{{ t('common_add.refundReason') }}</el-text>
@@ -209,8 +220,8 @@
             <el-button class="smallTitle" size="small" v-show="showReject">{{ t('common.rejectInfo') }}</el-button>
             <div class="bottom-item" v-show="showReject">
                 <el-text style="width:4vw;" size="small">{{ t('common_add.rejectRemark') }}</el-text>
-                <el-input v-model="addForm.remark" :placeholder="t('common_add.rejectRemarkPlaceholder')" size="small" style="width:10vw;" :row="3"
-                    maxlength="100" type="textarea" show-word-limit clearable />
+                <el-input v-model="addForm.remark" :placeholder="t('common_add.rejectRemarkPlaceholder')" size="small"
+                    style="width:10vw;" :row="3" maxlength="100" type="textarea" show-word-limit clearable />
             </div>
             <div style="text-align: center;" v-show="!showReject">
                 <el-button type="default" @click="showReject = true">{{ t('common.reject') }}</el-button>
@@ -245,13 +256,17 @@
                     <el-step>
                         <template #title>
                             <div>
-                                {{ t('cash.progress.areaFinance') }}<br>{{ areaFinance || t('common.noAuditorRecorded') }}
+                                {{ t('cash.progress.areaFinance') }}<br>{{ areaFinance || t('common.noAuditorRecorded')
+                                }}
                             </div>
                         </template>
                         <template #icon>
-                            <img v-if="currentStep === 2" src="@/assets/images/refund-rejected.png" :alt="t('common.rejected')">
-                            <img v-else-if="currentStep === 1" src="@/assets/images/refund-approving.png" :alt="t('common.pendingAudit')">
-                            <img v-else-if="currentStep > 2" src="@/assets/images/refund-approved.png" :alt="t('common.passed')">
+                            <img v-if="currentStep === 2" src="@/assets/images/refund-rejected.png"
+                                :alt="t('common.rejected')">
+                            <img v-else-if="currentStep === 1" src="@/assets/images/refund-approving.png"
+                                :alt="t('common.pendingAudit')">
+                            <img v-else-if="currentStep > 2" src="@/assets/images/refund-approved.png"
+                                :alt="t('common.passed')">
                         </template>
                     </el-step>
 
@@ -262,26 +277,33 @@
                             </div>
                         </template>
                         <template #icon>
-                            <img v-if="currentStep === 4" src="@/assets/images/refund-rejected.png" :alt="t('common.rejected')">
-                            <img v-else-if="currentStep === 3" src="@/assets/images/refund-approving.png" :alt="t('common.pendingAudit')">
+                            <img v-if="currentStep === 4" src="@/assets/images/refund-rejected.png"
+                                :alt="t('common.rejected')">
+                            <img v-else-if="currentStep === 3" src="@/assets/images/refund-approving.png"
+                                :alt="t('common.pendingAudit')">
                             <img v-else-if="currentStep > 3 && currentStep != 4"
                                 src="@/assets/images/refund-approved.png" :alt="t('common.audited')">
-                            <img v-else-if="currentStep < 3" src="@/assets/images/refund-waiting.png" :alt="t('common_list.activityStatus.notStarted')">
+                            <img v-else-if="currentStep < 3" src="@/assets/images/refund-waiting.png"
+                                :alt="t('common_list.activityStatus.notStarted')">
                         </template>
                     </el-step>
 
                     <el-step>
                         <template #title>
                             <div>
-                                {{ t('cash.progress.headFinance') }}<br>{{ headFinance || t('common.noAuditorRecorded') }}
+                                {{ t('cash.progress.headFinance') }}<br>{{ headFinance || t('common.noAuditorRecorded')
+                                }}
                             </div>
                         </template>
                         <template #icon>
-                            <img v-if="currentStep === 6" src="@/assets/images/refund-rejected.png" :alt="t('common.rejected')">
-                            <img v-else-if="currentStep === 5" src="@/assets/images/refund-approving.png" :alt="t('common.pendingAudit')">
+                            <img v-if="currentStep === 6" src="@/assets/images/refund-rejected.png"
+                                :alt="t('common.rejected')">
+                            <img v-else-if="currentStep === 5" src="@/assets/images/refund-approving.png"
+                                :alt="t('common.pendingAudit')">
                             <img v-else-if="currentStep > 5 && currentStep != 6"
                                 src="@/assets/images/refund-approved.png" :alt="t('common.audited')">
-                            <img v-else-if="currentStep < 5" src="@/assets/images/refund-waiting.png" :alt="t('common_list.activityStatus.notStarted')">
+                            <img v-else-if="currentStep < 5" src="@/assets/images/refund-waiting.png"
+                                :alt="t('common_list.activityStatus.notStarted')">
                         </template>
                     </el-step>
 
@@ -292,13 +314,17 @@
                             </div>
                         </template>
                         <template #icon>
-                            <img v-if="currentStep === 7" src="@/assets/images/refund-approving.png" :alt="t('common_list.pending')">
-                            <img v-else-if="currentStep === 8" src="@/assets/images/refund-approved.png" :alt="t('common.completed')">
-                            <img v-else-if="currentStep < 7" src="@/assets/images/refund-waiting.png" :alt="t('common_list.activityStatus.notStarted')">
+                            <img v-if="currentStep === 7" src="@/assets/images/refund-approving.png"
+                                :alt="t('common_list.pending')">
+                            <img v-else-if="currentStep === 8" src="@/assets/images/refund-approved.png"
+                                :alt="t('common.completed')">
+                            <img v-else-if="currentStep < 7" src="@/assets/images/refund-waiting.png"
+                                :alt="t('common_list.activityStatus.notStarted')">
                         </template>
                     </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">{{ t('common.confirm') }}</el-button>
             </div>
@@ -364,6 +390,7 @@ const isHeadquarters = computed(() => {
     return m === t('common.markets.headquarters') || m === '总部' || m === 'Headquarters'
 })
 const isReject = ref(false)// 进度图有没有驳回状态
+const rejectReason = ref('')// 驳回理由，进度图
 const addForm = ref({
     remark: ''
 })
@@ -567,6 +594,7 @@ const showStep = function (row) {
         return
     }
 
+    rejectReason.value = row.rejectReason || ''
     isReject.value = false
     submitter.value = row.submitter || ''
     areaFinance.value = row.areaFinance || ''
@@ -912,6 +940,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

@@ -437,7 +437,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 === t('cash.statusList.passed')) {
             statusParam.value = [20, 30, 40]
         } else if (searchForm.value.statuses === t('cash.statusList.rejected')) {
@@ -447,7 +447,7 @@ const getRefund = async function () {
         } else if (searchForm.value.statuses === t('cash.refundSuccess')) {
             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

src/views/recharge/bean/addBeanRecharge.vue

@@ -195,7 +195,11 @@ 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="t('common.jwcode')" label-position="left">
+<<<<<<< HEAD
             <el-input v-model="addForm.jwcode" style="width: 220px" @keyup.enter="getUser(addForm.jwcode)"/>
+=======
+            <el-input v-model="addForm.jwcode" style="width: 220px" @keyup.enter="getUser(addForm.jwcode)" />
+>>>>>>> lihuilin/feature-20260121173255-多语言二期2合并
             <el-button type="primary" @click="getUser(addForm.jwcode)" style="margin-left: 20px">{{ t('common.search') }}</el-button>
           </el-form-item>
           <el-form-item prop="permanentBean" :label="t('recharge.permanentBean')" label-position="left">

src/views/recharge/gold/addCoinRecharge.vue

@@ -654,7 +654,11 @@ 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')">
+<<<<<<< HEAD
             <el-input v-model="recharge.jwcode" style="width: 220px" @keyup.enter="getUser(recharge.jwcode)"/>
+=======
+            <el-input v-model="recharge.jwcode" style="width: 220px" @keyup.enter="getUser(recharge.jwcode)" />
+>>>>>>> lihuilin/feature-20260121173255-多语言二期2合并
             <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/refund/gold/addCoinRefund.vue

@@ -471,7 +471,11 @@ 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')">
+<<<<<<< HEAD
             <el-input v-model="addRefund.jwcode" style="width: 220px" @keyup.enter="getUser(addRefund.jwcode)"/>
+=======
+            <el-input v-model="addRefund.jwcode" style="width: 220px" @keyup.enter="getUser(addRefund.jwcode)" />
+>>>>>>> lihuilin/feature-20260121173255-多语言二期2合并
             <el-button type="primary" @click="getUser(addRefund.jwcode)" style="margin-left: 20px">{{ $t('common.search') }}
             </el-button>
           </el-form-item>