fix(ui): 调整表格列宽和翻译，优化活动管理界面布局

- 将订单状态列宽从120px统一调整为130px，避免文本截断
- 修改英文翻译"Pending"为"Incomplete"，更准确描述状态
- 将市场列宽从80px调整为110px，显示完整内容
- 重构活动管理界面布局，使用弹性布局适应不同语言文本
- 修复package-lock.json中peer依赖标记问题

package-lock.json

@@ -116,6 +116,7 @@
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz",
       "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.26.2",
@@ -2019,6 +2020,7 @@
       "version": "6.7.2",
       "resolved": "https://registry.npmmirror.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.7.2.tgz",
       "integrity": "sha512-yxtOBWDrdi5DD5o1pmVdq3WMCvnobT0LU6R8RyyVXPvFRd2o79/0NCuQoCjNTeZz9EzA9xS3JxNWfv54RIHFEA==",
+      "peer": true,
       "dependencies": {
         "@fortawesome/fontawesome-common-types": "6.7.2"
       },
@@ -2791,6 +2793,7 @@
       "resolved": "https://mirrors.huaweicloud.com/repository/npm/@types/lodash-es/-/lodash-es-4.17.12.tgz",
       "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/lodash": "*"
       }
@@ -2801,6 +2804,7 @@
       "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "undici-types": "~6.20.0"
       }
@@ -3337,6 +3341,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001688",
         "electron-to-chromium": "^1.5.73",
@@ -4241,13 +4246,15 @@
       "version": "4.17.21",
       "resolved": "https://mirrors.huaweicloud.com/repository/npm/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/lodash-es": {
       "version": "4.17.21",
       "resolved": "https://mirrors.huaweicloud.com/repository/npm/lodash-es/-/lodash-es-4.17.21.tgz",
       "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/lodash-unified": {
       "version": "1.0.3",
@@ -4717,6 +4724,7 @@
       "integrity": "sha512-wc2cBWqJgkU3Iz5oztRkQbfVkbxoz5EhnCGOrnJvnLnQ7O0WhQUYyv18qQI79O8L7DdHrrlJNeCHd4VGpnaXKQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.6"
       },
@@ -4794,6 +4802,7 @@
       "resolved": "https://registry.npmmirror.com/sass/-/sass-1.86.3.tgz",
       "integrity": "sha512-iGtg8kus4GrsGLRDLRBRHY9dNVA78ZaS7xr01cWnS7PEMQyFtTqBiyCrfpTYTZXRWM94akzckYjh8oADfFNTzw==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "chokidar": "^4.0.0",
         "immutable": "^5.0.2",
@@ -4940,6 +4949,7 @@
       "integrity": "sha512-GWANVlPM/ZfYzuPHjq0nxT+EbOEDDN3Jwhwdg1D8TU8oSkktp8w64Uq4auuGLxFSoNTRDncTq2hQHX1Ld9KHkA==",
       "dev": true,
       "license": "BSD-2-Clause",
+      "peer": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -4993,6 +5003,7 @@
       "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
       "devOptional": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -5085,6 +5096,7 @@
       "integrity": "sha512-RjjMipCKVoR4hVfPY6GQTgveinjNuyLw+qruksLDvA5ktI1150VmcMBKmQaEWJhg/j6Uaf6dNCNA0AfdzUb/hQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.24.2",
         "postcss": "^8.5.1",
@@ -5176,6 +5188,7 @@
       "resolved": "https://mirrors.huaweicloud.com/repository/npm/vue/-/vue-3.5.13.tgz",
       "integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.13",
         "@vue/compiler-sfc": "3.5.13",

src/components/locales/lang/en.js

@@ -518,7 +518,7 @@ export default {
     payAmount: "Pay Amount",
     receiveCurrency: "Rcv Currency",
     receiveAmount: "Rcv Amount",
-    toSupply: "Pending",
+    toSupply: "Incomplete",
     pending: "Pending",
     fee: "Fee",
     transferVoucher: "Transfer IMG",

src/views/activityManage/activity.vue

@@ -1,31 +1,33 @@
 <template>
     <el-card class="card1" style="margin-bottom: 1vh;">
         <div class="condition">
-            <div class="condition-item1">
-                <el-text size="large">{{ t('common.activityName') }}：</el-text>
-                <el-input v-model="searchForm.activityName" style="width: 10vw" :placeholder="t('common.activityNamePlaceholder')" clearable />
+            <div class="condition-item">
+                <el-text size="large" class="label-text">{{ t('common.activityName') }}：</el-text>
+                <el-input v-model="searchForm.activityName" class="input-width" :placeholder="t('common.activityNamePlaceholder')" clearable />
             </div>
-            <div class="condition-item1">
-                <el-text size="large">{{ t('common.type') }}：</el-text>
+            <div class="condition-item">
+                <el-text size="large" class="label-text">{{ t('common.type') }}：</el-text>
                 <!-- <el-cascader v-model="searchForm.businessBelong" :options="marketOptions" placeholder="请选择所属地区" clearable
                 style="width: 10vw" /> -->
-                <el-select v-model="searchForm.businessBelong" :placeholder="t('common.typePlaceholder')" style="width: 10vw" clearable>
+                <el-select v-model="searchForm.businessBelong" :placeholder="t('common.typePlaceholder')" class="input-width" clearable>
                     <el-option :label="t('common.customerBelong')" value="客户归属地" />
                     <el-option :label="t('common.activityBelong')" value="活动归属地" />
                 </el-select>
             </div>
-            <div class="condition-item2">
-                <el-text size="large">{{ t('common.startTime') }}：</el-text>
+            <div class="condition-item">
+                <el-text size="large" class="label-text">{{ t('common.startTime') }}：</el-text>
                 <el-date-picker v-model="searchForm.startTime" type="datetime" :placeholder="t('common.startTime')"
-                    format="YYYY-MM-DD HH:mm:ss" :default-time="defaultStartTime" clearable />
+                    format="YYYY-MM-DD HH:mm:ss" :default-time="defaultStartTime" class="input-width" clearable />
             </div>
-            <div class="condition-item2">
-                <el-text size="large">{{ t('common.endTime') }}：</el-text>
+            <div class="condition-item">
+                <el-text size="large" class="label-text">{{ t('common.endTime') }}：</el-text>
                 <el-date-picker v-model="searchForm.endTime" type="datetime" :placeholder="t('common.endTime')"
-                    format="YYYY-MM-DD HH:mm:ss" :default-time="defaultEndTime" clearable />
+                    format="YYYY-MM-DD HH:mm:ss" :default-time="defaultEndTime" class="input-width" clearable />
+            </div>
+            <div class="condition-buttons">
+                <el-button type="primary" @click="getActivity">{{ t('common.search') }}</el-button>
+                <el-button type="success" @click="reset">{{ t('common.reset') }}</el-button>
             </div>
-            <el-button type="primary" @click="getActivity">{{ t('common.search') }}</el-button>
-            <el-button type="success" @click="reset">{{ t('common.reset') }}</el-button>
         </div>
     </el-card>
 
@@ -514,31 +516,42 @@ onMounted(() => {
 .condition {
     display: flex;
     align-items: center;
+    flex-wrap: wrap;
+    gap: 10px;
 }
 
-.condition-item1 {
+.condition-item {
     display: flex;
     align-items: center;
-    width: 15vw;
+    margin-right: 10px;
+}
+
+.label-text {
+    white-space: nowrap;
+}
+
+.input-width {
+    width: 160px;
 }
 
-.condition-item2 {
+.condition-buttons {
     display: flex;
     align-items: center;
-    width: 17vw;
+    gap: 10px;
+    margin-left: 10px;
 }
 
 .add-item {
     display: flex;
     align-items: center;
-    width: 17vw;
     margin-bottom: 1vh;
+    /* 去掉固定宽度以适应英文文本 */
 }
 
 .edit-item {
     display: flex;
     align-items: center;
-    width: 17vw;
     margin-bottom: 1vh;
+    /* 去掉固定宽度以适应英文文本 */
 }
 </style>

src/views/moneyManage/executor/executor.vue

@@ -111,7 +111,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="status" :label="t('common_list.orderStatus')" width="120">
+      <el-table-column prop="status" :label="t('common_list.orderStatus')" width="130">
         <template #default="scope">
           {{ scope.row.status === 41 ? t('common_list.refundSuccess') : t('common_list.pending') }}
         </template>

src/views/moneyManage/receiveDetail/receiveFinance.vue

@@ -122,7 +122,7 @@
                         </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="110px" />
                         <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" />

src/views/moneyManage/receiveDetail/receiveManage.vue

@@ -122,7 +122,7 @@
                         </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="110px" />
                         <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" />

src/views/moneyManage/refundDetail/refundCharge.vue

@@ -72,7 +72,7 @@
             <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">
+            <el-table-column prop="status" :label="t('common_list.orderStatus')" width="130">
                 <template #default="scope">
                     {{
                         [20].includes(scope.row.status) ? t('cash.statusList.pending') :

src/views/moneyManage/refundDetail/refundFinance.vue

@@ -66,7 +66,7 @@
             <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="remark" :label="t('common_list.remark')" width="150" show-overflow-tooltip />
-            <el-table-column prop="status" :label="t('common_list.orderStatus')" width="120">
+            <el-table-column prop="status" :label="t('common_list.orderStatus')" width="130">
                 <template #default="scope">
                     {{
                         [10].includes(scope.row.status) ? t('cash.statusList.pending') :

src/views/moneyManage/refundDetail/refundHeader.vue

@@ -66,7 +66,7 @@
             <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="remark" :label="t('common_list.remark')" width="150" show-overflow-tooltip />
-            <el-table-column prop="status" :label="t('common_list.orderStatus')" width="120">
+            <el-table-column prop="status" :label="t('common_list.orderStatus')" width="130">
                 <template #default="scope">
                     {{
                         [30].includes(scope.row.status) ? t('cash.statusList.pending') :