修改: bug

src/views/account-management/account/index.vue

@@ -34,12 +34,21 @@
           @selection-change="handleSelectionChange"
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
+          @row-contextmenu="handleRowContextMenu"
         >
           <template #default>
             <ElTableColumn v-for="col in columns" :key="col.prop || col.type" v-bind="col" />
           </template>
         </ArtTable>
 
+        <!-- 右键菜单 -->
+        <ArtMenuRight
+          ref="contextMenuRef"
+          :menu-items="contextMenuItems"
+          :menu-width="120"
+          @select="handleContextMenuSelect"
+        />
+
         <ElDialog
           v-model="dialogVisible"
           :title="dialogType === 'add' ? '添加账号' : '编辑账号'"
@@ -195,6 +204,8 @@
   import { useCheckedColumns } from '@/composables/useCheckedColumns'
   import { useAuth } from '@/composables/useAuth'
   import ArtButtonTable from '@/components/core/forms/ArtButtonTable.vue'
+  import ArtMenuRight from '@/components/core/others/ArtMenuRight.vue'
+  import type { MenuItemType } from '@/components/core/others/ArtMenuRight.vue'
   import { AccountService } from '@/api/modules/account'
   import { RoleService } from '@/api/modules/role'
   import { ShopService, EnterpriseService } from '@/api/modules'
@@ -216,6 +227,8 @@
   const currentAccountId = ref<number>(0)
   const currentAccountName = ref<string>('')
   const currentAccountType = ref<number>(0)
+  const contextMenuRef = ref<InstanceType<typeof ArtMenuRight>>()
+  const currentRow = ref<any | null>(null)
   const selectedRoles = ref<number[]>([])
   const allRoles = ref<PlatformRole[]>([])
   const rolesToAdd = ref<number[]>([])
@@ -355,8 +368,7 @@
     { label: '店铺名称', prop: 'shop_name' },
     { label: '企业名称', prop: 'enterprise_name' },
     { label: '状态', prop: 'status' },
-    { label: '创建时间', prop: 'created_at' },
-    { label: '操作', prop: 'operation' }
+    { label: '创建时间', prop: 'created_at' }
   ]
 
   // 显示对话框
@@ -473,44 +485,6 @@
       label: '创建时间',
       width: 180,
       formatter: (row: any) => formatDateTime(row.created_at)
-    },
-    {
-      prop: 'operation',
-      label: '操作',
-      width: 240,
-      fixed: 'right',
-      formatter: (row: any) => {
-        const buttons = []
-
-        if (hasAuth('account:patch_role')) {
-          buttons.push(
-            h(ArtButtonTable, {
-              text: '分配角色',
-              onClick: () => showRoleDialog(row)
-            })
-          )
-        }
-
-        if (hasAuth('account:edit')) {
-          buttons.push(
-            h(ArtButtonTable, {
-              text: '编辑',
-              onClick: () => showDialog('edit', row)
-            })
-          )
-        }
-
-        if (hasAuth('account:delete')) {
-          buttons.push(
-            h(ArtButtonTable, {
-              text: '删除',
-              onClick: () => deleteAccount(row)
-            })
-          )
-        }
-
-        return h('div', { style: 'display: flex; gap: 8px;' }, buttons)
-      }
     }
   ])
 
@@ -851,6 +825,50 @@
   const handleEnterpriseSearch = (query: string) => {
     loadEnterpriseList(query)
   }
+
+  // 右键菜单项配置
+  const contextMenuItems = computed((): MenuItemType[] => {
+    const items: MenuItemType[] = []
+
+    if (hasAuth('account:patch_role')) {
+      items.push({ key: 'assignRole', label: '分配角色' })
+    }
+
+    if (hasAuth('account:edit')) {
+      items.push({ key: 'edit', label: '编辑' })
+    }
+
+    if (hasAuth('account:delete')) {
+      items.push({ key: 'delete', label: '删除' })
+    }
+
+    return items
+  })
+
+  // 处理表格行右键菜单
+  const handleRowContextMenu = (row: any, column: any, event: MouseEvent) => {
+    event.preventDefault()
+    event.stopPropagation()
+    currentRow.value = row
+    contextMenuRef.value?.show(event)
+  }
+
+  // 处理右键菜单选择
+  const handleContextMenuSelect = (item: MenuItemType) => {
+    if (!currentRow.value) return
+
+    switch (item.key) {
+      case 'assignRole':
+        showRoleDialog(currentRow.value)
+        break
+      case 'edit':
+        showDialog('edit', currentRow.value)
+        break
+      case 'delete':
+        deleteAccount(currentRow.value)
+        break
+    }
+  }
 </script>
 
 <style lang="scss" scoped>

src/views/account-management/enterprise-customer/index.vue

@@ -97,7 +97,8 @@
                   <ElInput v-model="form.district" placeholder="请输入区县" />
                 </ElFormItem>
               </ElCol>
-              <ElCol :span="12">
+              <!-- 只有非代理账号才显示归属店铺选择 -->
+              <ElCol :span="12" v-if="!isAgentAccount">
                 <ElFormItem label="归属店铺" prop="owner_shop_id">
                   <ElSelect
                     v-model="form.owner_shop_id"
@@ -219,6 +220,7 @@
   import type { SearchFormItem } from '@/types'
   import { useCheckedColumns } from '@/composables/useCheckedColumns'
   import { useAuth } from '@/composables/useAuth'
+  import { useUserStore } from '@/store/modules/user'
   import ArtButtonTable from '@/components/core/forms/ArtButtonTable.vue'
   import ArtMenuRight from '@/components/core/others/ArtMenuRight.vue'
   import type { MenuItemType } from '@/components/core/others/ArtMenuRight.vue'
@@ -227,9 +229,13 @@
   defineOptions({ name: 'EnterpriseCustomer' })
 
   const { hasAuth } = useAuth()
+  const userStore = useUserStore()
 
   const router = useRouter()
 
+  // 判断是否是代理账号 (user_type === 3)
+  const isAgentAccount = computed(() => userStore.info.user_type === 3)
+
   const dialogVisible = ref(false)
   const passwordDialogVisible = ref(false)
   const loading = ref(false)
@@ -488,7 +494,10 @@
 
   onMounted(() => {
     getTableData()
-    loadShopList()
+    // 只有非代理账号才需要加载店铺列表
+    if (!isAgentAccount.value) {
+      loadShopList()
+    }
   })
 
   // 加载店铺列表(默认加载20条)
@@ -609,7 +618,8 @@
       form.contact_phone = ''
       form.login_phone = ''
       form.password = ''
-      form.owner_shop_id = null
+      // 如果是代理账号，自动设置归属店铺为当前登录用户的店铺
+      form.owner_shop_id = isAgentAccount.value ? userStore.info.shop_id : null
     }
 
     // 重置表单验证状态