加筛选字段

package-lock.json

@@ -116,7 +116,6 @@
       "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",
@@ -2020,7 +2019,6 @@
       "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"
       },
@@ -2793,7 +2791,6 @@
       "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": "*"
       }
@@ -2804,7 +2801,6 @@
       "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~6.20.0"
       }
@@ -3341,7 +3337,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001688",
         "electron-to-chromium": "^1.5.73",
@@ -4246,15 +4241,13 @@
       "version": "4.17.21",
       "resolved": "https://mirrors.huaweicloud.com/repository/npm/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "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",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/lodash-unified": {
       "version": "1.0.3",
@@ -4724,7 +4717,6 @@
       "integrity": "sha512-wc2cBWqJgkU3Iz5oztRkQbfVkbxoz5EhnCGOrnJvnLnQ7O0WhQUYyv18qQI79O8L7DdHrrlJNeCHd4VGpnaXKQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.6"
       },
@@ -4802,7 +4794,6 @@
       "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",
@@ -4949,7 +4940,6 @@
       "integrity": "sha512-GWANVlPM/ZfYzuPHjq0nxT+EbOEDDN3Jwhwdg1D8TU8oSkktp8w64Uq4auuGLxFSoNTRDncTq2hQHX1Ld9KHkA==",
       "dev": true,
       "license": "BSD-2-Clause",
-      "peer": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -5003,7 +4993,6 @@
       "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
       "devOptional": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -5096,7 +5085,6 @@
       "integrity": "sha512-RjjMipCKVoR4hVfPY6GQTgveinjNuyLw+qruksLDvA5ktI1150VmcMBKmQaEWJhg/j6Uaf6dNCNA0AfdzUb/hQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.24.2",
         "postcss": "^8.5.1",
@@ -5188,7 +5176,6 @@
       "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

@@ -363,6 +363,7 @@ export default {
     getChartDataFailed: "Get chart data failed",
     renderChartFailed: "Chart render failed",
     // Rate
+    confirmModify: "Confirm modify?",
     pleaseInputRate: "Enter rate",
     pleaseInputCorrectRateFormat: "Check rate format",
     pleaseInputCorrectSymbol: "Check symbol",
@@ -692,7 +693,7 @@ export default {
     activityName: "Activity",
     currencyName: "Currency",
     rechargeAmount: "Amount",
-    note: "Note",
+    note: "Remark",
     payModel: "Payment",
     paymentVoucher: "Voucher",
     submitter: "Submitter",
@@ -771,7 +772,7 @@ export default {
     addBeanRecharge: "New Recharge",
     systemRecharge: "System",
     onlineRecharge: "Online",
-    mobile: "Mobile",
+    mobile: "Phone",
   },
 
   // Consume Group

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

@@ -362,6 +362,7 @@ export default {
     getChartDataFailed: "获取图表数据失败，请稍后重试",
     renderChartFailed: "图表渲染失败，请稍后重试",
     // 汇率相关
+    confirmModify: "确认修改？",
     pleaseInputRate: "请输入汇率比例",
     pleaseInputCorrectRateFormat: "请输入正确的汇率比例格式",
     pleaseInputCorrectSymbol: "请输入正确的符号",
@@ -667,7 +668,7 @@ export default {
     consumptionTimes: "消费次数",
     onlyStatisticsDataAfter20250101: "仅统计2025-01-01后的数据",
     store: "所属门店",
-    maxReductionAmount: "红包最大抵扣金额",
+    // maxReductionAmount: "红包最大抵扣金额",
     //金豆
     currentPayableBean: "当前付费金豆",
     currentFreeBean: "当前免费金豆",
@@ -1040,7 +1041,7 @@ export default {
       myr: "马币(MYR)",
       thb: "泰铢(THB)",
       cad: "加币(CAD)",
-      vnd: "越南盾(VDN)",
+      vnd: "越南盾(VND)",
       krw: "韩元(KRW)",
     },
     // 收款方式

src/components/workspace/CashManagement.vue

@@ -204,7 +204,7 @@ const getAdminData = async function () {
     loading.value = true; // 开始加载
     const result = await API({url: '/admin/userinfo', data: {}});
     marksFlag.value = result.markets === '总部' || result.markets === '研发部' 
-    || result.markets === 'Headquarters' || result.markets === 'R&D Department';
+    || result.markets === 'Headquarters' || result.markets === 'R&D Dept';
     console.log("marksFlag", marksFlag.value);
     // alert(marksFlag.value)
   } catch (error) {

src/views/channelManage/fans/fans.vue

@@ -219,6 +219,7 @@ const ConsumeSelectBy = async function (val) {
       payType: 7, // 固定传入 payType 值 7
       beanConsumeFan: {
         ...beanConsumeFan.value,
+        roleId: adminData.value.roleId,
         flag: flag.value 
       }
     };

src/views/channelManage/reward/reward.vue

@@ -258,6 +258,7 @@ const selectLiveBy = async function (val) {
       payType: 1, // 固定传入 payType 值 1 是直播
       beanConsumeLive: {
         ...beanConsumeLive.value,
+        roleId: adminData.value.roleId,
         flag: flag.value
       }
     };

src/views/consume/bean/articleVideo.vue

@@ -581,8 +581,8 @@ const getTagText = (state) => {
           <template #default="scope">
             {{
               Array.isArray(consumeTypes)
-                ? consumeTypes.find(item => item.value === Number(scope.row.type))?.label || t('common_list.unknownType')
-                : t('common_list.unknownType')
+                ? consumeTypes.find(item => item.value === Number(scope.row.type))?.label || t('common_list.other')
+                : t('common_list.other')
             }}
           </template>
         </el-table-column>

src/views/consume/bean/dieHardFan.vue

@@ -219,6 +219,7 @@ const ConsumeSelectBy = async function (val) {
       payType: 7, // 固定传入 payType 值 7
       beanConsumeFan: {
         ...beanConsumeFan.value,
+        roleId: adminData.value.roleId,
         flag: flag.value 
       }
     };

src/views/consume/bean/liveStream.vue

@@ -258,6 +258,7 @@ const selectLiveBy = async function (val) {
       payType: 1, // 固定传入 payType 值 1 是直播
       beanConsumeLive: {
         ...beanConsumeLive.value,
+        roleId: adminData.value.roleId,
         flag: flag.value
       }
     };

src/views/consume/gold/addCoinConsume.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, reactive, ref, watch } from "vue";
+import { onMounted, reactive, ref, watch, computed } from "vue";
 import { ElIcon, ElMessage } from "element-plus";
 import moment from "moment";
 import request from "@/util/http.js"
@@ -64,8 +64,7 @@ const addConsume = ref({
   taskGold: null, // 任务金币
   remark: "",//备注
   adminId: null,// 当前管理员id
-  adminName: adminData.value.adminName,
-  redMoney: 1 // 是否使用红包：1-使用，0-不使用
+  adminName: adminData.value.adminName
 })
 const Ref = ref(null)
 const rules = reactive({
@@ -162,40 +161,23 @@ function validateInput() {
   }
 
 
-  // 验证金币总和
-  const totalAvailableGold = (user.value.nowSumGold)
-  // 如果未勾选使用红包，则只校验消耗金币数是否超过可用金币数
+  // 验证金币总和（不考虑红包）
+  const totalAvailableGold = user.value.nowSumGold;
   if (user.value.jwcode && sumGold > totalAvailableGold) {
-    // 如果未勾选使用红包，直接提示金币不足
-    if (addConsume.value.redMoney == 0) {
-      ElMessage.error(t('elmessage.limitExceeded'));
-      // 将sumGold设置为null
-      addConsume.value.sumGold = null;
-      return false;
-    }
-    // 如果勾选使用红包，且不满足原价条件，则会在validateRedLimit中提示
+    ElMessage.error(t('elmessage.limitExceeded'));
+    addConsume.value.sumGold = null;
+    return false;
   }
 
   return true;
 }
 
-// 仅在鼠标离开（blur）时校验：消耗金币数 + 红包抵扣金额 ≥ 原价
+// 仅在鼠标离开（blur）时校验：sumGold 是否为有效值（无红包逻辑）
 function validateRedLimit() {
   const sumGold = parseFloat(addConsume.value.sumGold);
-  const price = Number(addConsume.value.price || 0);
-  const redMax = Number(user.value.red || 0);
-  if (!isNaN(price) && price > 0) {
-    if (isNaN(sumGold) || sumGold <= 0) {
-      ElMessage.error(t('elmessage.noEmptySumGold'));
-      return false;
-    }
-    // 如果勾选使用红包，才需要校验消耗金币数 + 红包抵扣金额 ≥ 原价
-    if (addConsume.value.redMoney == 1) {
-      if (sumGold + redMax < price) {
-        ElMessage.error(t('elmessage.limitRedAmount'));
-        return false;
-      }
-    }
+  if (isNaN(sumGold) || sumGold <= 0) {
+    ElMessage.error(t('elmessage.noEmptySumGold'));
+    return false;
   }
   return true;
 }
@@ -212,21 +194,22 @@ function calculateCoins(sumGold) {
   let remaining = parsedSumGold;
   let freeUsed = 0, permanentUsed = 0, taskUsed = 0;
 
-  // 优先消耗免费金币
-  if (nowFreeGold > 0) {
+  // 1. 优先消耗免费金币
+  if (remaining > 0 && nowFreeGold > 0) {
     freeUsed = Math.min(parseFloat(nowFreeGold.toFixed(4)), remaining);
     remaining = parseFloat((remaining - freeUsed).toFixed(4));
   }
 
-  // 其次消耗永久金币
+  // 2. 其次消耗永久金币
   if (remaining > 0 && nowPermanentGold > 0) {
     permanentUsed = Math.min(parseFloat(nowPermanentGold.toFixed(4)), remaining);
     remaining = parseFloat((remaining - permanentUsed).toFixed(4));
   }
 
-  // 最后消耗任务金币
+  // 3. 最后消耗任务金币
   if (remaining > 0 && nowTaskGold > 0) {
-    taskUsed = parseFloat(remaining.toFixed(4));
+    taskUsed = Math.min(parseFloat(nowTaskGold.toFixed(4)), remaining);
+    remaining = parseFloat((remaining - taskUsed).toFixed(4));
   }
 
   // 更新金币值
@@ -276,8 +259,7 @@ const add = async function () {
         permanentGold: addConsume.value.permanentGold * 100,
         goodsName: addConsume.value.goodsName.value,
         remark: addConsume.value.remark,
-        adminName: adminData.value.adminName,
-        redMoney: Number(addConsume.value.redMoney) // 1-使用红包，0-不使用红包
+        adminName: adminData.value.adminName
       }
     })
     addDisabled.value = false
@@ -328,8 +310,7 @@ function resetForm() {
     taskGold: null,
     remark: "",
     adminId: adminData.value.id,
-    adminName: adminData.value.adminName,
-    redMoney: 1 // 默认使用红包
+    adminName: adminData.value.adminName
   }
 
   console.log("重置表单")
@@ -352,6 +333,9 @@ function resetForm() {
     nowFreeGold: null,
     nowSumGold: null
   }
+
+  // 重置后不再触发校验提示
+  Ref.value.clearValidate()
 }
 
 // 充值对话框显示状态
@@ -424,7 +408,7 @@ const addBefore = () => {
       });
       return;
     }
-    if (!validateInput() || !validateRedLimit()) {
+    if (!validateInput()) {
       return;
     }
     ReadCookies.value = `coinConsume:${addConsume.value.jwcode}:${addConsume.value.goodsName.value}`
@@ -494,8 +478,6 @@ const getUser = async function (jwcode) {
           addConsume.value.taskGold = task;
         }
       }
-      // 验证输入
-      validateInput()
 
 
     } else if (!result.data) {
@@ -544,7 +526,7 @@ watch(
   () => addConsume.value.sumGold,
   (newValue) => {
     const parsedNewValue = parseFloat(newValue);
-    if (!isNaN(parsedNewValue) && parsedNewValue > 0) {
+    if (!isNaN(parsedNewValue) && parsedNewValue > 0 && user.value.jwcode) {
       const { free, permanent, task } = calculateCoins(parsedNewValue);
       addConsume.value.freeGold = free;
       addConsume.value.permanentGold = permanent;
@@ -569,6 +551,8 @@ watch(
   }
 );
 
+/* 红包逻辑已在当前分支移除 */
+
 /*
 ====================挂载=================================
 */
@@ -603,14 +587,8 @@ onMounted(async function () {
           <el-input v-model="addConsume.price" style="width: 120px" disabled />
         </el-form-item>
 
-        <!-- <el-form-item prop="sumGold" :label="t('common_add.consumeTotalGold')">
-          <el-input v-model="addConsume.sumGold" style="width: 120px" 
-          @blur="validateRedLimit()" />
-        </el-form-item> -->
         <el-form-item prop="sumGold" :label="t('common_add.consumeTotalGold')">
           <el-input v-model="addConsume.sumGold" style="width: 120px" @blur="validateRedLimit()" />
-          <el-radio v-model="addConsume.redMoney" :label="1" style="margin-left: 10px;">使用红包</el-radio>
-          <el-radio v-model="addConsume.redMoney" :label="0">不使用红包</el-radio>
         </el-form-item>
 
 
@@ -715,11 +693,11 @@ onMounted(async function () {
                 <p>{{ user.market }}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="14">
+            <!-- <el-col :span="14">
               <el-form-item :label="$t('common_add_user.maxReductionAmount')">
                 <p style="color: #2fa1ff">{{ user.red }} </p>
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
         </el-form>
       </el-card>
@@ -934,4 +912,4 @@ p {
     }
   }
 }
-</style>
+</style>

src/views/consume/gold/coinConsumeDetail.vue

@@ -103,6 +103,17 @@ const market = ref("")
 const sortField = ref('')
 const sortOrder = ref('')
 
+//
+const consumeStatus = [
+  {
+    value: '1',
+    label: '正常'
+  },
+  {
+    value: '2',
+    label: '已退款'
+  },
+]
 // 消费平台选项
 const consumePlatform = [
   {
@@ -614,13 +625,18 @@ const getMarket = async function () {
 
     <el-col>
       <div class="select">
+      <div class="selectRow">
+        <el-text size="large" class="text">订单状态：</el-text>
+        <el-select class="selectContent" v-model="consumeUser.status" placeholder="请选择订单状态" clearable>
+          <el-option v-for="item in consumeStatus" :key="item.id" :label="item.label" :value="item.value" />
+        </el-select>
+      </div>
         <div class="selectRow" style="width: 36vw;">
           <el-text class="text" size="large">{{ $t('common.consumeTime') }}：</el-text>
           <el-date-picker class="selectContent" v-model="getTime" type="datetimerange" :range-separator="$t('common.to')"
             :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="margin-right:1vw;width:25vw"
             @change="handleDatePickerChange" :default-time="defaultTime" :disabled-date="disabledDate" />
           <div v-if="false">
-
             <el-button @click="getToday()" style="margin-left: 1vw"
               :type="activeTimeRange === 'today' ? 'primary' : ''">
               今

src/views/managerecharge/rate.vue

@@ -161,7 +161,7 @@ const edit = () => {
   editFormRef.value.validate(async (valid) => {
     if (valid) {
       try {
-        await ElMessageBox.confirm("确认修改？");
+        await ElMessageBox.confirm(t('elmessage.confirmModify'));
         await editRate();
         console.log("修改成功");
         regeEdit.value = false;

src/views/moneyManage/executor/executor.vue

@@ -417,7 +417,7 @@ const hideEditDialog = () => {
     jwcode: ''
   }
 }
-// const currencies = ref(['美元(USD)', '港币(HKD)', '新币(SGD)', '马币(MYR)', '泰铢(THB)', '加币(CAD)', '越南盾(VDN)', '韩元(KRW)'])
+// const currencies = ref(['美元(USD)', '港币(HKD)', '新币(SGD)', '马币(MYR)', '泰铢(THB)', '加币(CAD)', '越南盾(VND)', '韩元(KRW)'])
 const currencies = ref([
     t('cash.currency.usd'),   // 美元(USD)
     t('cash.currency.hkd'),   // 港币(HKD)
@@ -425,7 +425,7 @@ const currencies = ref([
     t('cash.currency.myr'),   // 马币(MYR)
     t('cash.currency.thb'),   // 泰铢(THB)
     t('cash.currency.cad'),   // 加币(CAD)
-    t('cash.currency.vnd'),   // 越南盾(VDN)
+    t('cash.currency.vnd'),   // 越南盾(VND)
     t('cash.currency.krw')    // 韩元(KRW)
 ])
 // const channelOptions = ref(["Stripe-链接收款", "PaymentAsia-链接收款", "Ipay88-链接收款", "银行转账", "刷卡", "现金", "支票", "Grabpay", "Nets", "E-Transfer", "Paypal"])

src/views/moneyManage/receiveDetail/receiveDetail1.vue

@@ -1027,7 +1027,7 @@ const handleEditForm = async () => {
 }
 //付款币种
 const selectedCurrency = ref('');
-const customOptions = ref(['美元(USD)', '港币(HKD)', '新币(SGD)', '马币(MYR)', '泰铢(THB)', '加币(CAD)', '越南盾(VDN)', '韩元(KRW)']);
+const customOptions = ref(['美元(USD)', '港币(HKD)', '新币(SGD)', '马币(MYR)', '泰铢(THB)', '加币(CAD)', '越南盾(VND)', '韩元(KRW)']);
 
 //支付方式
 const paytypeOptions = ref(["Stripe-链接收款", "PaymentAsia-链接收款", "Ipay88-链接收款", "银行转账", "刷卡", "现金", "支票", "Grabpay", "Nets", "E-Transfer", "Paypal"])

src/views/moneyManage/receiveDetail/receiveFinance.vue

@@ -751,7 +751,7 @@ const customOptions = ref([
     t('cash.currency.myr'),   // 马币(MYR)
     t('cash.currency.thb'),   // 泰铢(THB)
     t('cash.currency.cad'),   // 加币(CAD)
-    t('cash.currency.vnd'),   // 越南盾(VDN)
+    t('cash.currency.vnd'),   // 越南盾(VND)
     t('cash.currency.krw')    // 韩元(KRW)
 ])
 const paytypeList = [

src/views/moneyManage/receiveDetail/receiveHead.vue

@@ -727,7 +727,7 @@ const customOptions = ref([
   t('cash.currency.myr'),   // 马币(MYR)
   t('cash.currency.thb'),   // 泰铢(THB)
   t('cash.currency.cad'),   // 加币(CAD)
-  t('cash.currency.vnd'),   // 越南盾(VDN)
+  t('cash.currency.vnd'),   // 越南盾(VND)
   t('cash.currency.krw')    // 韩元(KRW)
 ])
 // 支付类型选项 - 使用cash.payMethods下的键名

src/views/moneyManage/receiveDetail/receiveManage.vue

@@ -751,7 +751,7 @@ const customOptions = ref([
     t('cash.currency.myr'),   // 马币(MYR)
     t('cash.currency.thb'),   // 泰铢(THB)
     t('cash.currency.cad'),   // 加币(CAD)
-    t('cash.currency.vnd'),   // 越南盾(VDN)
+    t('cash.currency.vnd'),   // 越南盾(VND)
     t('cash.currency.krw')    // 韩元(KRW)
 ])
 const paytypeList = [

src/views/moneyManage/receiveDetail/receiveService.vue

@@ -866,7 +866,7 @@ const customOptions = ref([
   t('cash.currency.myr'),   // 马币(MYR)
   t('cash.currency.thb'),   // 泰铢(THB)
   t('cash.currency.cad'),   // 加币(CAD)
-  t('cash.currency.vnd'),   // 越南盾(VDN)
+  t('cash.currency.vnd'),   // 越南盾(VND)
   t('cash.currency.krw')    // 韩元(KRW)
 ])
 // 支付类型选项 - 使用cash.payMethods下的键名

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

@@ -304,7 +304,7 @@ export const CurrencyForId = (name) => {
     return 5
   } else if (name == t('cash.currency.cad') || name == '加币(CAD)' || name == 'Canadian Dollar(CAD)') {
     return 6
-  } else if (name == t('cash.currency.vnd') || name == '越南盾(VDN)' || name == 'Vietnamese Dong(VDN)') {
+  } else if (name == t('cash.currency.vnd') || name == '越南盾(VND)' || name == 'Vietnamese Dong(VND)') {
     return 7
   } else if (name == t('cash.currency.krw') || name == '韩元(KRW)' || name == 'South Korean Won(KRW)') {
     return 8

src/views/permissions/userPermission.vue

@@ -813,9 +813,9 @@ const confirmResetPassword = async function () {
 
 
   // 权限检查
-  if (adminData.value.markets.includes(currentRow.value.market) || adminData.value.markets[0] === '总部' || adminData.value.markets[0] === '研发部' || adminData.value.markets[0] === 'Headquarters' || adminData.value.markets[0] === 'R&D Department') {
+  if (adminData.value.markets.includes(currentRow.value.market) || adminData.value.markets[0] === '总部' || adminData.value.markets[0] === '研发部' || adminData.value.markets[0] === 'Headquarters' || adminData.value.markets[0] === 'R&D Dept') {
 
-    console.log('符合条件，可以操作', adminData.value.markets.includes(currentRow.value.market) || adminData.value.markets[0] === '总部' || adminData.value.markets[0] === '研发部' || adminData.value.markets[0] === 'Headquarters' || adminData.value.markets[0] === 'R&D Department');
+    console.log('符合条件，可以操作', adminData.value.markets.includes(currentRow.value.market) || adminData.value.markets[0] === '总部' || adminData.value.markets[0] === '研发部' || adminData.value.markets[0] === 'Headquarters' || adminData.value.markets[0] === 'R&D Dept');
     const params = {
       account: currentRow.value.account,
     }

src/views/workspace/index.vue

@@ -42,7 +42,7 @@ const getAdminData = async function () {
     loading.value = true; // 开始加载
     const result = await API({url: '/admin/userinfo', data: {}});
     GraphFlag.value = result.markets !== '总部' && result.markets !== '研发部' 
-    && result.markets !== 'Headquarters' && result.markets !== 'R&D Department'
+    && result.markets !== 'Headquarters' && result.markets !== 'R&D Dept'
 
     
     ;