Merge branch 'milestone-20251215-多语言二期2'

src/components/locales/lang/en.js

@@ -39,7 +39,7 @@ export default {
     productNamePlaceholder: "Enter product",
     type: "Type",
     typePlaceholder: "Select type",
-    customerBelong: "Cust. Region",
+    customerBelong: "Customer Region",
     activityBelong: "Activity Region",
     articleVideoID: "Post/Video ID",
     articleVideoIDPlaceholder: "Enter ID",
@@ -1126,6 +1126,7 @@ export default {
       recalled: "Recalled",
       refunded: "Refunded",
       rejected: "Rejected",
+      inProgress: "In Progress",
     },
     pending: "Pending",
     refundSuccess: "Refund Success",

src/components/locales/lang/zh-CN.js

@@ -951,7 +951,7 @@ export default {
     // 筛选统计表
     gold: "金币",
     recharge: "充值",
-    consume: "消费",
+    consumes: "消费",
     rank: "排名",
     allTypes: "全部类型",
     region: "地区",

src/components/workspace/CashManagement.vue

@@ -42,8 +42,8 @@
           <span class="market-value">{{ market.value.toLocaleString() }} {{ t('workbench.SGD') }}</span>
         </div>
         <div v-else v-for="item in cashData.markets" :key="item.name" class="market-item">
-          <span class="market-name">{{ t('workbench.collect')}}{{ item.name }}：</span>
-          <span class="market-value">{{ item.value.toLocaleString() }}</span>
+          <span class="market-name">{{ item.name }}{{ t('workbench.collect') }}：</span>
+          <span class="market-value">{{ item.value.toLocaleString() }} {{ item.currencyLabel }}</span>
 
         </div>
 
@@ -135,7 +135,15 @@ const fetchCashData = async () => {
         value: resMap.get(m.name) ?? 0
       }))
     } else if (marksFlag.value=== false) {
-// 1. 定义币种中英文对照表 代收地区的币种
+      const currencyCollectMarketMap = {
+        sgd: t('workbench.Singapore'),
+        myr: t('workbench.Malaysia'),
+        hkd: t('workbench.HongKong'),
+        cad: t('workbench.Canada'),
+        thb: t('workbench.Thailand'),
+        vdn: t('workbench.VietnamHCM'),
+      };
+
       const currencyMap = {
         sgd: t('workbench.SGD'),
         myr: t('workbench.MYR'),
@@ -165,8 +173,9 @@ const fetchCashData = async () => {
                 : 0;
 
         return {
-          name: currencyMap[lowerCurrency],
+          name: currencyCollectMarketMap[lowerCurrency],
           value: total,
+          currencyLabel: currencyMap[lowerCurrency],
         };
       });
 
@@ -280,7 +289,7 @@ onMounted( async() => {
 .text2 {
   margin: 13px;
   width: 95%;
-  height: 48px;
+  height: 10vh;
   border-radius: 8px;
   background: linear-gradient(90deg, #E4F0FC 0%, #C1DCF8 50%, #E4F0FC 100%);
   box-shadow: 0 2px 2px 0 #00152940;
@@ -291,7 +300,7 @@ onMounted( async() => {
 
 .text2-income {
   color: #040a2d;
-  font-size: 20px;
+  font-size: 40px;
   font-weight: 900;
 }
 
@@ -305,12 +314,12 @@ onMounted( async() => {
 
 .market-data {
   display: flex;
-  width: 245px;
+  width: 265px;
   flex-direction: column;
   align-items: flex-start;
   gap: 20px;
   padding: 10px;
-  margin-left: 40px;
+  margin-left: 20px;
 }
 
 .market-item {

src/components/workspace/GoldGraph.vue

@@ -54,7 +54,7 @@
         </div>
         <div class="right">
           <el-card class="graph-card-list">
-            <div class="card-large">{{ t('workbench.gold') }}{{ activeTab === 'recharge' ? t('workbench.recharge') : t('workbench.consume') }}{{ t('workbench.rank') }}</div>
+            <div class="card-large">{{ t('workbench.gold') }}{{ activeTab === 'recharge' ? t('workbench.recharge') : t('workbench.consumes') }}{{ t('workbench.rank') }}</div>
             <el-select popper-class="mySelectStyle" class="card-select" v-model="selectedType"
                        style="width: 100%; margin-bottom: 15px">
               <el-option :label="t('workbench.allTypes')" value="all"></el-option>
@@ -595,7 +595,7 @@ const updateChart = (chartData) => {
             result += `${param.seriesName}: ${param.value.toLocaleString()}<br/>`;
             total += param.value;
           })
-          result += `${t('workbench.all')}${activeTab.value === 'recharge' ? t('workbench.recharge') : t('workbench.consume')}: ${total.toLocaleString()}`;
+          result += `${t('workbench.all')}${activeTab.value === 'recharge' ? t('workbench.recharge') : t('workbench.consumes')}: ${total.toLocaleString()}`;
           return result
         }
       },

src/components/workspace/GoldGraphMarkets.vue

@@ -493,7 +493,7 @@ const updateChart = (chartData) => {
             result += `${param.seriesName}: ${param.value.toLocaleString()}<br/>`
             total += param.value
           })
-          result += `${t('workbench.all')}${activeTab.value === 'recharge' ? t('workbench.recharge') : t('workbench.consume')}: ${total.toLocaleString()}`
+          result += `${t('workbench.all')}${activeTab.value === 'recharge' ? t('workbench.recharge') : t('workbench.consumes')}: ${total.toLocaleString()}`
           return result
         }
       },

src/views/activityManage/activity.vue

@@ -92,7 +92,7 @@
             </el-radio-group>
         </div>
         <div class="add-item" v-show="addForm.businessBelong === '活动归属地'">
-            <el-text size="large">{{ t('common_add.market') }}</el-text>
+            <el-text size="large">{{ t('common_add.market') }}：</el-text>
             <el-cascader v-model="addForm.area" :options="marketOptions" :placeholder="t('common_add.marketPlaceholder')" clearable
                 style="width: 12vw" />
         </div>
@@ -114,7 +114,7 @@
 
     <el-dialog v-model="showEdit" width="20vw" draggable align-center style="background-color: rgb(243,250,254);">
         <div class="edit-item">
-            <el-text size="large">{{ t('common_add.activity') }}</el-text>
+            <el-text size="large">{{ t('common_add.activity') }}：</el-text>
             <el-input v-model="editForm.activityName" style="width: 12vw" :placeholder="t('common_add.activityPlaceholder')" maxlength="200" clearable />
         </div>
 

src/views/audit/gold/rechargeAudit.vue

@@ -103,7 +103,7 @@
       <el-table-column prop="permanentGold" :label="$t('audit.permanentGold')" width="130px" sortable="custom">
         <template #default="scope">{{ scope.row.permanentGold / 100 }}</template>
       </el-table-column>
-      <el-table-column prop="freeGold" :label="$t('audit.freeGold')" sortable="custom" width="110px">
+      <el-table-column prop="freeGold" :label="$t('audit.freeGold')" sortable="custom" width="130px">
         <template #default="scope">{{ (scope.row.freeGold) / 100 }}</template>
       </el-table-column>
       <el-table-column prop="remark" :label="$t('audit.note')" width="180px" show-overflow-tooltip />

src/views/audit/gold/refundAudit.vue

@@ -95,7 +95,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="goodsName" :label="$t('audit.refundGoods')" width="120" show-overflow-tooltip />
-      <el-table-column prop="sumGold" :label="$t('audit.refundTotalGold')" width="160" sortable="custom">
+      <el-table-column prop="sumGold" :label="$t('audit.refundTotalGold')" width="190" sortable="custom">
         <template #default="{ row }">
           {{ row.sumGold / 100 }}
         </template>
@@ -105,12 +105,12 @@
           {{ row.permanentGold / 100 }}
         </template>
       </el-table-column>
-      <el-table-column prop="freeGold" :label="$t('audit.freeGold')" width="120" sortable="custom">
+      <el-table-column prop="freeGold" :label="$t('audit.freeGold')" width="130" sortable="custom">
         <template #default="{ row }">
           {{ (row.freeJune + row.freeDecember) / 100 }}
         </template>
       </el-table-column>
-      <el-table-column prop="taskGold" :label="$t('audit.taskGold')" width="120" sortable="custom">
+      <el-table-column prop="taskGold" :label="$t('audit.taskGold')" width="130" sortable="custom">
         <template #default="{ row }">
           {{ row.taskGold / 100 }}
         </template>

src/views/channelManage/fans/fans.vue

@@ -559,12 +559,12 @@ const getTagText = (state) => {
         <el-table-column prop="name" :label="t('common_list.name')" width="150px" fixed="left" show-overflow-tooltip />
         <!-- 固定精网号列 -->
         <el-table-column prop="jwcode" :label="t('common_list.jwcode')" width="110px" fixed="left" />
-        <el-table-column prop="dept" :label="t('common_list.market')" width="110px" />
+        <el-table-column prop="dept" :label="t('common_list.market')" width="130px" />
         <el-table-column prop="beanNum" :label="t('common_list.beanNum')" sortable="custom" width="120px" />
-        <el-table-column prop="buyBean" :label="t('common_list.permanentBean')" sortable="custom" width="120px" />
-        <el-table-column prop="freeBean" :label="t('common_list.freeBean')" sortable="custom" width="120px" />
+        <el-table-column prop="buyBean" :label="t('common_list.permanentBean')" sortable="custom" width="170px" />
+        <el-table-column prop="freeBean" :label="t('common_list.freeBean')" sortable="custom" width="130px" />
         <el-table-column prop="channel" :label="t('common_list.channel')" width="190px" show-overflow-tooltip />
-        <el-table-column prop="type" :label="t('common_list.memberType')" width="120px">
+        <el-table-column prop="type" :label="t('common_list.memberType')" width="130px">
           <template #default="scope">
             {{consumeTypes.find(item => item.value === Number(scope.row.type))?.label || t('common_list.unknownType')}}
           </template>

src/views/channelManage/reward/reward.vue

@@ -600,7 +600,7 @@ const getTagText = (state) => {
         <el-table-column prop="name" :label="t('common_list.name')" width="150px" fixed="left" show-overflow-tooltip/>
         <!-- 固定精网号列 -->
         <el-table-column prop="jwcode" :label="t('common_list.jwcode')" width="110px" fixed="left"/>
-        <el-table-column prop="dept" :label="t('common_list.market')" width="110px"/>
+        <el-table-column prop="dept" :label="t('common_list.market')" width="130px"/>
         <el-table-column prop="gift" :label="t('common_list.gift')" width="150px">
         </el-table-column>
         <el-table-column prop="beanNum" :label="t('common_list.beanNum')" sortable="custom" width="120px"/>
@@ -609,8 +609,8 @@ const getTagText = (state) => {
             {{ scope.row.isBackpack == 1 ? t('common_list.yes') : t('common_list.no') }}
           </template>
         </el-table-column>
-        <el-table-column prop="buyBean" :label="t('common_list.permanentBean')" sortable="custom" width="120px"/>
-        <el-table-column prop="freeBean" :label="t('common_list.freeBean')" sortable="custom" width="120px"/>
+        <el-table-column prop="buyBean" :label="t('common_list.permanentBean')" sortable="custom" width="170px"/>
+        <el-table-column prop="freeBean" :label="t('common_list.freeBean')" sortable="custom" width="130px"/>
         <el-table-column prop="liveChannel" :label="t('common_list.channel')" width="120px" show-overflow-tooltip/>
         <el-table-column prop="liveName" :label="t('common_list.liveRoomName')" width="160px" show-overflow-tooltip/>
         <el-table-column prop="consumeTime" :label="t('common_list.consumetime')" sortable="custom" width="190px"/>

src/views/consume/bean/articleVideo.vue

@@ -576,7 +576,7 @@ const getTagText = (state) => {
         <el-table-column prop="name" :label="t('common_list.name')" width="150px" fixed="left" show-overflow-tooltip />
         <!-- 固定精网号列 -->
         <el-table-column prop="jwcode" :label="t('common_list.jwcode')" width="110px" fixed="left" />
-        <el-table-column prop="dept" :label="t('common_list.market')" width="110px" />
+        <el-table-column prop="dept" :label="t('common_list.market')" width="120px" />
         <el-table-column prop="type" :label="t('consume.type')" width="120px">
           <template #default="scope">
             {{

src/views/consume/bean/dieHardFan.vue

@@ -559,7 +559,7 @@ const getTagText = (state) => {
         <el-table-column prop="name" :label="t('common_list.name')" width="150px" fixed="left" show-overflow-tooltip />
         <!-- 固定精网号列 -->
         <el-table-column prop="jwcode" :label="t('common_list.jwcode')" width="110px" fixed="left" />
-        <el-table-column prop="dept" :label="t('common_list.market')" width="110px" />
+        <el-table-column prop="dept" :label="t('common_list.market')" width="120px" />
         <el-table-column prop="beanNum" :label="t('common_list.beanNum')" sortable="custom" width="120px" />
         <el-table-column prop="buyBean" :label="t('common_list.permanentBean')" sortable="custom" width="170px" />
         <el-table-column prop="freeBean" :label="t('common_list.freeBean')" sortable="custom" width="130px" />

src/views/consume/bean/liveStream.vue

@@ -600,7 +600,7 @@ const getTagText = (state) => {
         <el-table-column prop="name" :label="t('common_list.name')" width="150px" fixed="left" show-overflow-tooltip/>
         <!-- 固定精网号列 -->
         <el-table-column prop="jwcode" :label="t('common_list.jwcode')" width="110px" fixed="left"/>
-        <el-table-column prop="dept" :label="t('common_list.market')" width="110px"/>
+        <el-table-column prop="dept" :label="t('common_list.market')" width="120px"/>
         <el-table-column prop="gift" :label="t('common_list.gift')" width="150px">
         </el-table-column>
         <el-table-column prop="beanNum" :label="t('common_list.beanNum')" sortable="custom" width="120px"/>

src/views/consume/gold/coinConsumeDetail.vue

@@ -601,7 +601,7 @@ const getMarket = async function () {
           <el-cascader class="selectContent" style="width: 8vw;" v-model="selectedMarketPath" :options="market" :placeholder="$t('common.marketPlaceholder')"
             clearable @change="handleMarketChange" />
         </div> 
-        <div class="selectRow" style="width: 15vw;">
+        <div class="selectRow" style="min-width: 15vw;">
           <el-text size="large">{{ $t('common.consumePlatform') }}：</el-text>
           <el-select class="selectContent" v-model="consumeUser.payPlatform" :placeholder="$t('common.consumePlatformPlaceholder')" clearable>
             <el-option v-for="item in consumePlatform" :key="item.id" :label="item.label" :value="item.value" />
@@ -687,12 +687,12 @@ _list
             {{ scope.row.permanentGold }}
           </template>
         </el-table-column>
-        <el-table-column prop="freeGold" :label="$t('common_list.freeGold')" sortable="“custom”" width="110px">
+        <el-table-column prop="freeGold" :label="$t('common_list.freeGold')" sortable="“custom”" width="130px">
           <template #default="scope">
             {{ scope.row.freeGold }}
           </template>
         </el-table-column>
-        <el-table-column prop="taskGold" :label="$t('common_list.taskGold')" sortable="“custom”" width="110px">
+        <el-table-column prop="taskGold" :label="$t('common_list.taskGold')" sortable="“custom”" width="130px">
           <template #default="scope">
             {{ scope.row.taskGold }}
           </template>

src/views/moneyManage/executor/executor.vue

@@ -64,7 +64,7 @@
       <el-table-column prop="marketName" :label="t('common_list.market')" width="120" />
       <el-table-column prop="goodsName" :label="t('common_list.productName')" width="120" />
       <el-table-column prop="goodsNum" :label="t('common_list.productNum')" width="120" />
-      <el-table-column prop="refundModel" :label="t('common_list.refundModel')" width="120">
+      <el-table-column prop="refundModel" :label="t('common_list.refundModel')" width="140">
         <template #default="scope">
           {{ scope.row.refundModel === 1 ? t('common_list.refundModelPart') : t('common_list.refundModelAll') }}
         </template>

src/views/moneyManage/receiveDetail/receiveFinance.vue

@@ -133,7 +133,7 @@
                                 <span v-else>{{ scope.row.goodNum }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="paymentCurrency" :label="t('common_list.payCurrency')" width="100px" />
+                        <el-table-column prop="paymentCurrency" :label="t('common_list.payCurrency')" width="120px" />
                         <el-table-column prop="paymentAmount" :label="t('common_list.payAmount')" width="120px" />
                         <!-- 地区财务显示到账币种/金额/手续费（已通过/已完成标签页） -->
                         <el-table-column prop="receivedCurrency" :label="t('common_list.receiveCurrency')"
@@ -283,7 +283,7 @@
         </el-dialog>
 
         <!-- 审核弹窗 -->
-        <el-dialog class="adddialog" v-model="auditFormisible" width="20vw" :before-close="closeAuditForm">
+        <el-dialog class="adddialog" v-model="auditFormisible" width="28vw" :before-close="closeAuditForm">
             <el-form class="addForm" label-width="4vw" label-position="left">
                 <el-form-item :label="t('common_add.jwcode')">
                     <el-input disabled="true" v-model="auditFormData.jwcode"
@@ -392,10 +392,10 @@
         </el-dialog>
 
         <!-- 编辑填手续费弹窗 -->
-        <el-dialog class="editdialog" v-model="editFormisible" width="20vw" :before-close="closeEditForm">
+        <el-dialog class="editdialog" v-model="editFormisible" width="28vw" :before-close="closeEditForm">
             <div class="content">
                 <div class="left">
-                    <el-form class="editForm" label-width="4.5vw" label-position="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')" />
@@ -486,7 +486,7 @@
                 </div>
                 <div class="right">
                     <el-form ref="editFormRef" :rules="editFormRule" :model="editFormData" class="editFormRighrt"
-                        label-width="4.5vw" label-position="left">
+                        label-width="6vw" label-position="left">
                         <el-form-item :label="t('common_add.receiveCurrency')">
                             <CurrencySelect v-model="editFormData.receivedCurrency" :items="customOptions"
                                 :placeholder="t('common_add.receiveCurrencyPlaceholder')" />
@@ -1698,7 +1698,7 @@ const handlePagination = (type, val) => {
     }
 
     :deep(.adddialog .el-form-item__label) {
-        min-width: 80px;
+        min-width: 100px;
         width: auto;
         font-weight: 800;
         padding-bottom: 15px;

src/views/moneyManage/receiveDetail/receiveHead.vue

@@ -232,10 +232,10 @@
         </div>
 
         <!-- 编辑填手续费弹窗（总部财务核心编辑功能） -->
-        <el-dialog class="editdialog" v-model="editFormisible" width="20vw" :before-close="closeEditForm">
+        <el-dialog class="editdialog" v-model="editFormisible" width="28vw" :before-close="closeEditForm">
             <div class="content">
                 <div class="left">
-                    <el-form class="editForm" label-width="4.5vw" label-position="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-form-item>
@@ -320,7 +320,7 @@
                 <div class="right">
                     <!-- 总部财务可编辑项：仅到账相关信息 -->
                     <el-form ref="editFormRef" :rules="editFormRule" :model="editFormData" class="editFormRighrt"
-                        label-width="4.5vw" label-position="left">
+                        label-width="6vw" label-position="left">
                         <el-form-item :label="t('common_add.receiveCurrency')" required>
                             <CurrencySelect v-model="editFormData.receivedCurrency" :items="customOptions"
                                 :placeholder="t('common_add.receiveCurrencyPlaceholder')" />
@@ -1467,7 +1467,7 @@ const handlePagination = (type, val) => {
     }
 
     :deep(.adddialog .el-form-item__label) {
-        min-width: 80px;
+        min-width: 100px;
         width: auto;
         font-weight: 800;
         padding-bottom: 15px;

src/views/moneyManage/receiveDetail/receiveManage.vue

@@ -133,7 +133,7 @@
                                 <span v-else>{{ scope.row.goodNum }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="paymentCurrency" :label="t('common_list.payCurrency')" width="100px" />
+                        <el-table-column prop="paymentCurrency" :label="t('common_list.payCurrency')" width="120px" />
                         <el-table-column prop="paymentAmount" :label="t('common_list.payAmount')" width="120px" />
                         <!-- 地区财务显示到账币种/金额/手续费（已通过/已完成标签页） -->
                         <el-table-column prop="receivedCurrency" :label="t('common_list.receiveCurrency')"
@@ -283,7 +283,7 @@
         </el-dialog>
 
         <!-- 审核弹窗 -->
-        <el-dialog class="adddialog" v-model="auditFormisible" width="20vw" :before-close="closeAuditForm">
+        <el-dialog class="adddialog" v-model="auditFormisible" width="28vw" :before-close="closeAuditForm">
             <el-form class="addForm" label-width="4vw" label-position="left">
                 <el-form-item :label="t('common_add.jwcode')">
                     <el-input disabled="true" v-model="auditFormData.jwcode"
@@ -392,10 +392,10 @@
         </el-dialog>
 
         <!-- 编辑填手续费弹窗 -->
-        <el-dialog class="editdialog" v-model="editFormisible" width="20vw" :before-close="closeEditForm">
+        <el-dialog class="editdialog" v-model="editFormisible" width="28vw" :before-close="closeEditForm">
             <div class="content">
                 <div class="left">
-                    <el-form class="editForm" label-width="4.5vw" label-position="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')" />
@@ -486,7 +486,7 @@
                 </div>
                 <div class="right">
                     <el-form ref="editFormRef" :rules="editFormRule" :model="editFormData" class="editFormRighrt"
-                        label-width="4.5vw" label-position="left">
+                        label-width="6vw" label-position="left">
                         <el-form-item :label="t('common_add.receiveCurrency')">
                             <CurrencySelect v-model="editFormData.receivedCurrency" :items="customOptions"
                                 :placeholder="t('common_add.receiveCurrencyPlaceholder')" />

src/views/moneyManage/receiveDetail/receiveService.vue

@@ -95,10 +95,10 @@
                         </el-table-column>
                         <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="marketName" :label="t('common_list.market')" width="120px" />
                         <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="goodsName" :label="t('common_list.productName')" width="150px" />
                         <el-table-column prop="goodNum" :label="t('common_list.productNum')" width="130px">
                             <template #default="scope">
                                 <span v-if="scope.row.goodsName == t('common_list.goldRecharge')">{{
@@ -106,7 +106,7 @@
                                 <span v-else>{{ scope.row.goodNum }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="paymentCurrency" :label="t('common_list.payCurrency')" width="100px" />
+                        <el-table-column prop="paymentCurrency" :label="t('common_list.payCurrency')" width="120px" />
                         <el-table-column prop="paymentAmount" :label="t('common_list.payAmount')" width="120px" />
                         <el-table-column prop="payType" :label="t('common_list.payModel')" width="130px" />
                         <el-table-column prop="payTime" :label="t('common_list.payTime')" width="180px" />
@@ -201,8 +201,8 @@
         </div>
 
         <!-- 客服新增/编辑收款弹窗 -->
-        <el-dialog class="adddialog" v-model="addFormisible" width="20vw" :before-close="closeAddForm">
-            <el-form class="addForm" ref="addFormRef" :rules="addFormRule" :model="addFormData" label-width="4vw"
+        <el-dialog class="adddialog" v-model="addFormisible" width="28vw" :before-close="closeAddForm">
+            <el-form class="addForm" ref="addFormRef" :rules="addFormRule" :model="addFormData" label-width="6vw"
                 label-position="left">
                 <el-form-item :label="t('common_add.jwcode')" required prop="jwcode">
                     <el-input v-model="addFormData.jwcode" :placeholder="t('common_add.jwcodePlaceholder')"
@@ -1438,7 +1438,7 @@ onMounted(async () => {
     }
 
     :deep(.adddialog .el-form-item__label) {
-        min-width: 80px;
+        min-width: 120px;
         width: auto;
         font-weight: 800;
         padding-bottom: 15px;

src/views/moneyManage/receiveDetail/utils/staticData.js

@@ -213,7 +213,7 @@ export const MarketNameForId = (name) => {
     return 24018
   } else if (name == t('cash.markets.VietnamHCM') || name == '越南HCM' || name == 'Vietnam HCM') {
     return 24022
-  } else if (name == t('common.markets.headquarters') || name == '总部' || name == 'Headquarters' || name == 'HQ') {
+  } else if (name == t('common.markets.headquarters') || name == '总部' || name == 'Headquarters') {
     return '总部'
   } else {
     return name
@@ -221,7 +221,7 @@ export const MarketNameForId = (name) => {
 }
 
 export const normalizeSubmitterMarket = (name) => {
-  if (name == t('common.markets.headquarters') || name == '总部' || name == 'Headquarters' || name == 'HQ') {
+  if (name == t('common.markets.headquarters') || name == '总部' || name == 'Headquarters') {
     return '总部'
   } else {
     return name

src/views/recharge/gold/coinRechargeDetail.vue

@@ -687,9 +687,9 @@ const getTagText = (state) => {
         <el-table-column prop="rateName" :label="$t('common_list.rateName')" width="110px" />
         <el-table-column prop="money" sortable="custom" :label="$t('common_list.rechargeAmount')" width="110px" />
         <el-table-column prop="permanentGold" :label="$t('common_list.permanentGold')" sortable="custom" width="130px" />
-        <el-table-column prop="freeGold" :label="$t('common_list.freeGold')" sortable="custom" width="110px" />
-        <el-table-column prop="payPlatform" :label="$t('common_list.rechargePlatform')" width="110px" />
-        <el-table-column prop="payModel" :label="$t('common_list.payModel')" width="100px" />
+        <el-table-column prop="freeGold" :label="$t('common_list.freeGold')" sortable="custom" width="130px" />
+        <el-table-column prop="payPlatform" :label="$t('common_list.rechargePlatform')" width="130px" />
+        <el-table-column prop="payModel" :label="$t('common_list.payModel')" width="120px" />
         <el-table-column prop="remark" :label="$t('common_list.remark')" width="150px" show-overflow-tooltip />
         <el-table-column prop="isRefund" :label="$t('common_list.orderStatus')" width="200px" show-overflow-tooltip>
           <template #default="scope">

src/views/refund/gold/coinRefundDetail.vue

@@ -598,7 +598,7 @@ const getMarket = async function () {
         <el-table-column prop="market" :label="$t('common_list.market')" width="110px" />
         <el-table-column prop="orderCode" :label="$t('common_list.orderNo')" width="260px" show-overflow-tooltip />
         <el-table-column prop="goodsName" :label="$t('common_list.goodsName')" width="110px" show-overflow-tooltip />
-        <el-table-column prop="refundType" :label="$t('common_list.refundType')" width="100px" />
+        <el-table-column prop="refundType" :label="$t('common_list.refundType')" width="130px" />
         <el-table-column prop="refundModel" :label="$t('common_list.refundModel')" width="110px">
           <template #default="scope">
             {{ scope.row.refundModel === 0 ? $t('common_list.refundModelAll') : scope.row.refundModel === 1 ? $t('common_list.refundModelPart') : '' }}