合并

src/views/consume/bean/addBeanConsume.vue

@@ -214,11 +214,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="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/refundDetail/refundService.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>
@@ -16,8 +18,8 @@
             </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.market" :options="market" :placeholder="t('common.marketPlaceholder')"
-                    clearable @change="handleMarketChange" />
+                <el-cascader style="width: 9vw;" v-model="searchForm.market" :options="market"
+                    :placeholder="t('common.marketPlaceholder')" clearable @change="handleMarketChange" />
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;" multiple>{{ t('common.orderStatus') }}</el-text>
@@ -41,9 +43,9 @@
             </div>
             <div class="item2" style="width: 28.5vw;">
                 <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;" :disabled-date="disabledDate" :default-time="defaultTime"
-                    clearable />
+                <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;" :disabled-date="disabledDate" :default-time="defaultTime" clearable />
             </div>
             <div>
                 <el-button type="primary" @click="getRefund">{{ t('common.search') }}</el-button>
@@ -62,7 +64,8 @@
                 </template>
             </el-table-column>
             <el-table-column prop="jwcode" label="Homily ID" width="120" fixed="left" />
-            <el-table-column prop="name" :label="t('common_list.name')" width="120" fixed="left" show-overflow-tooltip />
+            <el-table-column prop="name" :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="activity" :label="t('common_list.activity')" width="120px" show-overflow-tooltip />
             <el-table-column prop="goodsName" :label="t('common_list.productName')" width="130" show-overflow-tooltip />
@@ -78,7 +81,8 @@
                         @click="previewImage(scope.row.voucher)">
                         <img :src="scope.row.voucher" alt="转账凭证" style="width: auto; height: 40px;">
                     </div>
-                    <div v-else style="display: flex; justify-content: center; align-items: center; height: 40px;">{{ t('common_add.noTransferVoucher') }}
+                    <div v-else style="display: flex; justify-content: center; align-items: center; height: 40px;">{{
+                        t('common_add.noTransferVoucher') }}
                     </div>
                 </template>
             </el-table-column>
@@ -105,6 +109,10 @@
                             @click="showEditDialog(scope.row)">
                             {{ t('common.edit') }}
                         </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>
@@ -214,8 +222,8 @@
         </div>
     </el-dialog>
 
-    <ConfirmDialog v-model="showBack" :message="t('common.willRecallOrder')" @confirm="recall" @cancel="showBack = false"
-        @close="showBack = false" />
+    <ConfirmDialog v-model="showBack" :message="t('common.willRecallOrder')" @confirm="recall"
+        @cancel="showBack = false" @close="showBack = false" />
 
     <el-dialog v-model="showError" overflow draggable class="back-dialog" :style="{
         backgroundImage: `url(${RefundRecallBackground})`,
@@ -228,6 +236,10 @@
             <el-button type="primary" @click="" style="margin-left: 2vw;">{{ t('common.confirm') }}</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, computed } from 'vue'
@@ -263,6 +275,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: ''
@@ -392,10 +406,10 @@ const submitEdit = async function () {
     }
     try {
         console.log(editRow.value)
-        if(!editForm.value.refundModel) {
+        if (!editForm.value.refundModel) {
             ElMessage.error(t('elmessage.selectRefundModel'))
             return
-        }else if(!editForm.value.refundReason) {
+        } else if (!editForm.value.refundReason) {
             ElMessage.error(t('elmessage.refundReasonPlaceholder'))
             return
         } else if (editRow.value.goodsName === '金币充值' && editForm.value.refundModel == 1) {
@@ -587,6 +601,10 @@ const defaultTime = [
     new Date(2000, 1, 1, 0, 0, 0),
     new Date(2000, 2, 1, 23, 59, 59),
 ]
+	const showRejectReasonDialog = function (row) {
+    rejectReason.value = row.rejectReason
+    showRejectReason.value = true
+}
 onMounted(() => {
     getRefund()
     getMarket()

src/views/recharge/bean/addBeanRecharge.vue

@@ -195,11 +195,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="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,11 +654,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')">
-<<<<<<< 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,11 +471,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')">
-<<<<<<< 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>