From ef6da4f3c6cd4c17fae7b23ae7e675d7f7ad79a4 Mon Sep 17 00:00:00 2001
From: caiyuchao <caiyuchao@agrandtech.com>
Date: Wed, 13 Aug 2025 15:39:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/alert/index.vue       | 29 +++++++++++--------
 .../src/views/license/customer/index.vue      |  2 +-
 .../src/views/license/license/index.vue       |  7 +++--
 .../src/views/license/project/data.ts         |  2 +-
 .../src/views/license/project/index.vue       |  2 +-
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/apps/web-antd/src/views/alert/index.vue b/apps/web-antd/src/views/alert/index.vue
index 76ba69e..0c437c5 100644
--- a/apps/web-antd/src/views/alert/index.vue
+++ b/apps/web-antd/src/views/alert/index.vue
@@ -1,13 +1,16 @@
 <script lang="ts" setup>
 import { computed, onMounted, ref } from 'vue';
 
+import { useAccess } from '@vben/access';
 import { Page } from '@vben/common-ui';
 
 import { Button, Card, message, Space } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import { getAlertPage, updateAlert } from '#/api/alert/alert';
-import { getUserPage } from '#/api/system/user';
+import { getSimpleUserList } from '#/api/system/user';
+
+const { hasAccessByCodes } = useAccess();
 
 // 表单数据
 const formData = ref({
@@ -48,6 +51,10 @@ const formSchema = computed(() => [
       mode: 'multiple',
       allowClear: true,
       showSearch: true,
+      fieldNames: {
+        label: 'nickname',
+        value: 'id',
+      },
       filterOption: (input: string, option: any) => {
         return option?.label?.toLowerCase().includes(input.toLowerCase());
       },
@@ -140,15 +147,7 @@ function handleReset() {
 async function loadUserList() {
   try {
     // 参考部门管理界面的做法，使用getUserPage接口
-    const { list } = await getUserPage({
-      pageNo: 1,
-      pageSize: 100, // 获取前100个用户
-    });
-
-    userOptions.value = list.map((user) => ({
-      label: user.nickname || user.username,
-      value: user.id,
-    }));
+    userOptions.value = await getSimpleUserList();
   } catch {}
 }
 
@@ -182,8 +181,14 @@ onMounted(async () => {
       <Form />
       <div class="mt-4 flex justify-end">
         <Space>
-          <Button type="primary" @click="handleSubmit">保存</Button>
-          <Button @click="handleReset">重置</Button>
+          <Button
+            type="primary"
+            @click="handleSubmit"
+            v-if="hasAccessByCodes(['license:alert:update'])"
+          >
+            保存
+          </Button>
+          <Button @click="handleReset"> 重置 </Button>
         </Space>
       </div>
       <template #title>
diff --git a/apps/web-antd/src/views/license/customer/index.vue b/apps/web-antd/src/views/license/customer/index.vue
index 60aa055..129718b 100644
--- a/apps/web-antd/src/views/license/customer/index.vue
+++ b/apps/web-antd/src/views/license/customer/index.vue
@@ -139,7 +139,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               label: $t('ui.actionTitle.import', [$t('customer.customer')]),
               type: 'primary',
               icon: ACTION_ICON.UPLOAD,
-              auth: ['license:customer:export'],
+              auth: ['license:customer:import'],
               onClick: handleImport,
             },
           ]"
diff --git a/apps/web-antd/src/views/license/license/index.vue b/apps/web-antd/src/views/license/license/index.vue
index 5d68ad3..7d85cf8 100644
--- a/apps/web-antd/src/views/license/license/index.vue
+++ b/apps/web-antd/src/views/license/license/index.vue
@@ -172,7 +172,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               label: $t('license.applyAction', ['License']),
               type: 'primary',
               icon: ACTION_ICON.ADD,
-              auth: ['license:license:create'],
+              auth: ['license:license:apply'],
               onClick: onCreate,
             },
             {
@@ -186,7 +186,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               label: $t('ui.actionTitle.import', ['License']),
               type: 'primary',
               icon: ACTION_ICON.UPLOAD,
-              auth: ['license:license:export'],
+              auth: ['license:license:import'],
               onClick: handleImport,
             },
           ]"
@@ -199,6 +199,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
             {
               label: $t('license.detail'),
               type: 'link',
+              auth: ['license:license:query'],
               onClick: onDetail.bind(null, row),
             },
             {
@@ -231,7 +232,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               label: $t('license.reapply'),
               type: 'link',
               ifShow: row.status === 3,
-              auth: ['license:license:query'],
+              auth: ['license:license:reapply'],
               onClick: onReapply.bind(null, row),
             },
             {
diff --git a/apps/web-antd/src/views/license/project/data.ts b/apps/web-antd/src/views/license/project/data.ts
index d05d532..809b9bc 100644
--- a/apps/web-antd/src/views/license/project/data.ts
+++ b/apps/web-antd/src/views/license/project/data.ts
@@ -465,7 +465,7 @@ export function useGridColumns(
           {
             code: 'progress',
             text: $t('project.progress'),
-            show: hasAccessByCodes(['license:project:update']),
+            show: hasAccessByCodes(['license:project:comment']),
           },
           {
             code: 'delete',
diff --git a/apps/web-antd/src/views/license/project/index.vue b/apps/web-antd/src/views/license/project/index.vue
index e6512f0..a1e4ab7 100644
--- a/apps/web-antd/src/views/license/project/index.vue
+++ b/apps/web-antd/src/views/license/project/index.vue
@@ -174,7 +174,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               label: $t('ui.actionTitle.import', [$t('project.project')]),
               type: 'primary',
               icon: ACTION_ICON.UPLOAD,
-              auth: ['license:project:export'],
+              auth: ['license:project:import'],
               onClick: handleImport,
             },
           ]"