feat: 完善15- 角色默认信用与店铺实际额度管理

src/views/commission-management/agent-fund-overview/index.vue

@@ -618,10 +618,10 @@
             return
           }
 
-          if (value < 0) {
-            callback(new Error('实际信用额度不能小于0'))
-            return
-          }
+           if (value <= 0) {
+             callback(new Error('实际信用额度必须大于0'))
+             return
+           }
 
           callback()
         },
@@ -655,12 +655,13 @@
     { label: '店铺名称', prop: 'shop_name' },
     { label: '用户名', prop: 'username' },
     { label: '手机号', prop: 'phone' },
-    { label: '现金余额', prop: 'balance' },
-    { label: '冻结金额', prop: 'frozen_balance' },
+    { label: '账面余额', prop: 'main_balance' },
+    { label: '冻结金额', prop: 'main_frozen_balance' },
+    { label: '现金可用', prop: 'cash_available_balance' },
     { label: '实际信用额度', prop: 'credit_limit' },
-    { label: '可用金额', prop: 'available_balance' },
+    { label: '总可用金额', prop: 'available_balance' },
     { label: '欠款金额', prop: 'debt_amount' },
-    { label: '版本', prop: 'version' },
+    { label: '钱包版本', prop: 'version' },
     { label: '余额预警', prop: 'low_balance_warning' },
     { label: '总佣金', prop: 'total_commission' },
     { label: '可提现', prop: 'available_commission' },
@@ -748,22 +749,28 @@
       width: 120
     },
     {
-      prop: 'balance',
-      label: '现金余额',
+      prop: 'main_balance',
+      label: '账面余额',
       minWidth: 130,
       formatter: (row: ShopFundSummaryItem) => {
         return h(
           'span',
           { style: 'color: var(--el-color-primary); font-weight: 500' },
-          formatMoney(row.balance)
+          formatMoney(row.main_balance)
         )
       }
     },
     {
-      prop: 'frozen_balance',
+      prop: 'main_frozen_balance',
       label: '冻结金额',
       minWidth: 120,
-      formatter: (row: ShopFundSummaryItem) => formatMoney(row.frozen_balance)
+      formatter: (row: ShopFundSummaryItem) => formatMoney(row.main_frozen_balance)
+    },
+    {
+      prop: 'cash_available_balance',
+      label: '现金可用',
+      minWidth: 120,
+      formatter: (row: ShopFundSummaryItem) => formatMoney(row.cash_available_balance)
     },
     {
       prop: 'credit_limit',
@@ -783,7 +790,7 @@
     },
     {
       prop: 'available_balance',
-      label: '可用金额',
+      label: '总可用金额',
       minWidth: 130,
       formatter: (row: ShopFundSummaryItem) => {
         return h(
@@ -806,7 +813,7 @@
     },
     {
       prop: 'version',
-      label: '版本',
+      label: '钱包版本',
       minWidth: 90,
       formatter: (row: ShopFundSummaryItem) => row.version ?? '-'
     },
@@ -957,11 +964,13 @@
       })
     }
 
-    actions.push({
-      label: '调整额度',
-      handler: () => showCreditDialog(row),
-      type: 'primary'
-    })
+    if (hasAuth('shop:credit-limit:manage')) {
+      actions.push({
+        label: '调整额度',
+        handler: () => showCreditDialog(row),
+        type: 'primary'
+      })
+    }
 
     return actions
   }

src/views/shop-management/detail/index.vue

@@ -0,0 +1,108 @@
+<template>
+  <div class="shop-detail-page">
+    <ElCard shadow="never">
+      <div class="detail-header">
+        <ElButton @click="handleBack">
+          <template #icon>
+            <ElIcon><ArrowLeft /></ElIcon>
+          </template>
+          返回
+        </ElButton>
+        <h2 class="detail-title">店铺详情</h2>
+      </div>
+
+      <div v-loading="loading">
+        <ElDescriptions v-if="shop" :column="2" border>
+          <ElDescriptionsItem label="店铺名称">{{ shop.shop_name || '-' }}</ElDescriptionsItem>
+          <ElDescriptionsItem label="店铺编号">{{ shop.shop_code || '-' }}</ElDescriptionsItem>
+          <ElDescriptionsItem label="店铺层级">{{ shop.level }}</ElDescriptionsItem>
+          <ElDescriptionsItem label="上级店铺">{{ shop.parent_shop_name || '-' }}</ElDescriptionsItem>
+          <ElDescriptionsItem label="联系人">{{ shop.contact_name || '-' }}</ElDescriptionsItem>
+          <ElDescriptionsItem label="联系电话">{{ shop.contact_phone || '-' }}</ElDescriptionsItem>
+          <ElDescriptionsItem label="平台业务员">
+            {{ formatBusinessOwner(shop) }}
+          </ElDescriptionsItem>
+          <ElDescriptionsItem label="业务员通知状态">
+            {{ shop.business_owner_account_id ? (shop.business_owner_available ? '可用' : '已停用') : '-' }}
+          </ElDescriptionsItem>
+          <ElDescriptionsItem label="省份">{{ shop.province || '-' }}</ElDescriptionsItem>
+          <ElDescriptionsItem label="城市">{{ shop.city || '-' }}</ElDescriptionsItem>
+          <ElDescriptionsItem label="区县">{{ shop.district || '-' }}</ElDescriptionsItem>
+          <ElDescriptionsItem label="详细地址">{{ shop.address || '-' }}</ElDescriptionsItem>
+          <ElDescriptionsItem label="状态">{{ shop.status_name || shop.status }}</ElDescriptionsItem>
+          <ElDescriptionsItem label="创建时间">{{ shop.created_at || '-' }}</ElDescriptionsItem>
+          <ElDescriptionsItem label="更新时间">{{ shop.updated_at || '-' }}</ElDescriptionsItem>
+        </ElDescriptions>
+      </div>
+    </ElCard>
+  </div>
+</template>
+
+<script setup lang="ts">
+  import { onMounted, ref } from 'vue'
+  import { useRoute, useRouter } from 'vue-router'
+  import { ArrowLeft } from '@element-plus/icons-vue'
+  import { ElMessage } from 'element-plus'
+  import { ShopService } from '@/api/modules'
+  import type { ShopResponse } from '@/types/api'
+
+  defineOptions({ name: 'ShopDetail' })
+
+  const route = useRoute()
+  const router = useRouter()
+  const loading = ref(false)
+  const shop = ref<ShopResponse | null>(null)
+
+  const formatBusinessOwner = (value: ShopResponse) => {
+    if (!value.business_owner_username) return '-'
+    return value.business_owner_phone_summary
+      ? `${value.business_owner_username} (${value.business_owner_phone_summary})`
+      : value.business_owner_username
+  }
+
+  const handleBack = () => router.back()
+
+  const fetchDetail = async () => {
+    const id = Number(route.params.id)
+    if (!id) {
+      ElMessage.error('缺少店铺 ID')
+      return
+    }
+
+    loading.value = true
+    try {
+      const response = await ShopService.getShopDetail(id)
+      if (response.code !== 0 || !response.data) {
+        ElMessage.error(response.msg || '获取店铺详情失败')
+        return
+      }
+      shop.value = response.data
+    } catch (error: any) {
+      ElMessage.error(error?.message || '获取店铺详情失败')
+    } finally {
+      loading.value = false
+    }
+  }
+
+  onMounted(fetchDetail)
+</script>
+
+<style scoped lang="scss">
+  .shop-detail-page {
+    padding: 20px;
+  }
+
+  .detail-header {
+    display: flex;
+    gap: 16px;
+    align-items: center;
+    padding-bottom: 16px;
+  }
+
+  .detail-title {
+    margin: 0;
+    font-size: 20px;
+    font-weight: 600;
+    color: var(--el-text-color-primary);
+  }
+</style>

src/views/shop-management/list/index.vue

@@ -7,6 +7,7 @@
         :items="searchFormItems"
         show-expand
         @reset="handleReset"
+        label-width="100px"
         @search="handleSearch"
       ></ArtSearchBar>
 
@@ -203,9 +204,9 @@
                     >
                       <ElOption
                         v-for="role in defaultRoleList"
-                        :key="role.ID"
+                        :key="role.id"
                         :label="role.role_name"
-                        :value="role.ID"
+                        :value="role.id"
                       >
                         <div
                           style="display: flex; align-items: center; justify-content: space-between"
@@ -238,16 +239,6 @@
           </template>
         </ElDialog>
 
-        <ElDialog v-model="detailDialogVisible" title="店铺详情" width="500px">
-          <ElDescriptions v-if="detailShop" :column="1" border>
-            <ElDescriptionsItem label="店铺名称">{{ detailShop.shop_name }}</ElDescriptionsItem>
-            <ElDescriptionsItem label="店铺编号">{{ detailShop.shop_code }}</ElDescriptionsItem>
-            <ElDescriptionsItem label="平台业务员">
-              {{ formatBusinessOwner(detailShop) }}
-            </ElDescriptionsItem>
-          </ElDescriptions>
-        </ElDialog>
-
         <!-- 店铺默认角色管理对话框 -->
         <ElDialog
           v-model="defaultRolesDialogVisible"
@@ -337,8 +328,9 @@
    } from '@/types/api'
    import { RoleType, RoleStatus } from '@/types/api'
   import { formatDateTime } from '@/utils/business/format'
-  import { CommonStatus, getStatusText, STATUS_SELECT_OPTIONS } from '@/config/constants'
-  import { regionData } from '@/utils/constants/regionData'
+   import { CommonStatus, getStatusText, STATUS_SELECT_OPTIONS } from '@/config/constants'
+   import { regionData } from '@/utils/constants/regionData'
+   import { RoutesAlias } from '@/router/routesAlias'
 
   defineOptions({ name: 'Shop' })
 
@@ -354,8 +346,6 @@
   const defaultRoleList = ref<any[]>([])
   const salespersonLoading = ref(false)
    const salespersonOptions = ref<ShopBusinessOwnerCandidate[]>([])
-  const detailDialogVisible = ref(false)
-  const detailShop = ref<ShopResponse | null>(null)
 
   // 级联选择相关
   const parentShopCascadeOptions = ref<any[]>([])
@@ -445,20 +435,13 @@
        : shop.business_owner_username
    }
 
-  const showDetail = async (row: ShopResponse) => {
-    try {
-      const response = await ShopService.getShopDetail(row.id)
-      if (response.code !== 0 || !response.data) {
-        ElMessage.error(response.msg || '获取店铺详情失败')
-        return
-      }
-      detailShop.value = response.data
-    } catch (error: any) {
-      ElMessage.error(error?.message || '获取店铺详情失败')
-      return
-    }
-    detailDialogVisible.value = true
-  }
+   const handleNameClick = (row: ShopResponse) => {
+     if (hasAuth('shop:detail')) {
+       void router.push(`${RoutesAlias.ShopDetail}/${row.id}`)
+     } else {
+       ElMessage.warning('您没有查看详情的权限')
+     }
+   }
 
   // 定义表单搜索初始值
   const initialSearchState = {
@@ -685,11 +668,29 @@
 
   // 动态列配置
   const { columnChecks, columns } = useCheckedColumns(() => [
-    {
-      prop: 'shop_name',
-      label: '店铺名称',
-      width: 160,
-      showOverflowTooltip: true
+     {
+       prop: 'shop_name',
+       label: '店铺名称',
+       width: 160,
+       showOverflowTooltip: true,
+       formatter: (row: ShopResponse) => {
+         const hasPermission = hasAuth('shop:detail')
+         return h(
+           'span',
+           {
+             style: hasPermission
+               ? 'color: var(--el-color-primary); cursor: pointer; text-decoration: underline;'
+               : '',
+             onClick: hasPermission
+               ? (event: MouseEvent) => {
+                   event.stopPropagation()
+                   handleNameClick(row)
+                 }
+               : undefined
+           },
+           row.shop_name
+         )
+       }
     },
     {
       prop: 'shop_code',
@@ -768,12 +769,6 @@
   const getActions = (row: ShopResponse) => {
     const actions: any[] = []
 
-    actions.push({
-      label: '详情',
-      handler: () => showDetail(row),
-      type: 'primary'
-    })
-
     if (hasAuth('shop:look_customer')) {
       actions.push({
         label: '账号列表',
@@ -860,10 +855,10 @@
   const searchDefaultRoles = async (query: string) => {
     defaultRoleLoading.value = true
     try {
-      const params: any = {
-        page: 1,
-        pageSize: 20,
-        role_type: RoleType.CUSTOMER, // 仅客户角色
+        const params: any = {
+          page: 1,
+          page_size: 20,
+          role_type: RoleType.CUSTOMER, // 仅客户角色
         status: RoleStatus.ENABLED // 仅启用的角色
       }
       if (query) {
@@ -1129,7 +1124,7 @@
         // 将 PlatformRole 转换为与 ShopRoleResponse 兼容的格式
         availableRoles.value = (res.data.items || []).map((role) => ({
           ...role,
-          role_id: role.ID,
+          role_id: role.id ?? role.ID,
           role_name: role.role_name,
           role_desc: role.role_desc,
           role_type: role.role_type,

src/views/system/role/detail/index.vue

@@ -0,0 +1,111 @@
+<template>
+  <div class="role-detail-page">
+    <ElCard shadow="never">
+      <div class="detail-header">
+        <ElButton @click="handleBack">
+          <template #icon>
+            <ElIcon><ArrowLeft /></ElIcon>
+          </template>
+          返回
+        </ElButton>
+        <h2 class="detail-title">角色详情</h2>
+      </div>
+
+      <div v-loading="loading">
+        <ElDescriptions v-if="role" :column="2" border>
+          <ElDescriptionsItem label="角色名称">{{ role.role_name || '-' }}</ElDescriptionsItem>
+          <ElDescriptionsItem label="角色类型">
+            {{ role.role_type === 1 ? '平台角色' : '客户角色' }}
+          </ElDescriptionsItem>
+          <ElDescriptionsItem label="角色描述">{{ role.role_desc || '-' }}</ElDescriptionsItem>
+          <ElDescriptionsItem label="状态">
+            {{ role.status === 1 ? '启用' : '禁用' }}
+          </ElDescriptionsItem>
+          <ElDescriptionsItem label="新建代理默认信用">
+            {{ role.default_credit_enabled ? '启用' : '未启用' }}
+          </ElDescriptionsItem>
+          <ElDescriptionsItem label="默认信用额度">
+            {{ formatCredit(role.default_credit_limit) }}
+          </ElDescriptionsItem>
+          <ElDescriptionsItem label="信用生效范围">
+            {{ role.default_credit_scope || '-' }}
+          </ElDescriptionsItem>
+          <ElDescriptionsItem label="创建时间">
+            {{ formatDateTime(role.created_at) }}
+          </ElDescriptionsItem>
+          <ElDescriptionsItem label="更新时间">
+            {{ formatDateTime(role.updated_at) }}
+          </ElDescriptionsItem>
+        </ElDescriptions>
+      </div>
+    </ElCard>
+  </div>
+</template>
+
+<script setup lang="ts">
+  import { onMounted, ref } from 'vue'
+  import { useRoute, useRouter } from 'vue-router'
+  import { ArrowLeft } from '@element-plus/icons-vue'
+  import { ElMessage } from 'element-plus'
+  import { RoleService } from '@/api/modules'
+  import type { PlatformRole } from '@/types/api'
+  import { formatDateTime } from '@/utils/business/format'
+
+  defineOptions({ name: 'RoleDetail' })
+
+  const route = useRoute()
+  const router = useRouter()
+  const loading = ref(false)
+  const role = ref<PlatformRole | null>(null)
+
+  const formatCredit = (value?: number) => {
+    if (value === undefined || value === null) return '-'
+    return `${(value / 100).toFixed(2)} 元`
+  }
+
+  const handleBack = () => router.back()
+
+  const fetchDetail = async () => {
+    const id = Number(route.params.id)
+    if (!id) {
+      ElMessage.error('缺少角色 ID')
+      return
+    }
+
+    loading.value = true
+    try {
+      const response = await RoleService.getRole(id)
+      if (response.code !== 0 || !response.data) {
+        ElMessage.error(response.msg || '获取角色详情失败')
+        return
+      }
+      role.value = response.data
+    } catch (error: any) {
+      ElMessage.error(error?.message || '获取角色详情失败')
+    } finally {
+      loading.value = false
+    }
+  }
+
+  onMounted(fetchDetail)
+</script>
+
+<style scoped lang="scss">
+  .role-detail-page {
+    padding: 20px;
+  }
+
+  .detail-header {
+    display: flex;
+    gap: 16px;
+    align-items: center;
+    padding-bottom: 16px;
+  }
+
+  .detail-title {
+    margin: 0;
+    font-size: 20px;
+    font-weight: 600;
+    color: var(--el-text-color-primary);
+  }
+</style>

src/views/system/role/index.vue

@@ -25,7 +25,7 @@
         <!-- 表格 -->
         <ArtTable
           ref="tableRef"
-          row-key="ID"
+           row-key="id"
           :loading="loading"
           :data="roleList"
           :currentPage="pagination.page"
@@ -46,7 +46,7 @@
           :title="dialogType === 'add' ? '新增角色' : '编辑角色'"
           width="30%"
         >
-          <ElForm ref="formRef" :model="form" :rules="rules" label-width="120px">
+          <ElForm ref="formRef" :model="form" :rules="rules" label-width="160px">
             <ElFormItem label="角色名称" prop="role_name">
               <ElInput v-model="form.role_name" placeholder="请输入角色名称" />
             </ElFormItem>
@@ -91,7 +91,7 @@
                 <ElInputNumber
                   v-model="form.credit_limit_yuan"
                   :disabled="!form.credit_enabled"
-                  :min="0"
+                  :min="1"
                   :precision="2"
                   :step="100"
                   controls-position="right"
@@ -250,6 +250,8 @@
   import { RoleType } from '@/types/api'
   import type { PlatformRole, PermissionTreeNode } from '@/types/api'
   import type { SearchFormItem } from '@/types'
+  import { useRouter } from 'vue-router'
+  import { RoutesAlias } from '@/router/routesAlias'
   import { useCheckedColumns } from '@/composables/useCheckedColumns'
   import { useAuth } from '@/composables/useAuth'
   import { fenToYuan, formatDateTime, yuanToFen } from '@/utils/business/format'
@@ -263,6 +265,7 @@
   defineOptions({ name: 'Role' })
 
   const { hasAuth } = useAuth()
+  const router = useRouter()
   const canUpdateRoleStatus = hasAuth('role:update_status')
 
   const dialogVisible = ref(false)
@@ -345,8 +348,10 @@
     { label: '角色名称', prop: 'role_name' },
     { label: '角色描述', prop: 'role_desc' },
     { label: '角色类型', prop: 'role_type' },
+    { label: '新建代理默认信用', prop: 'default_credit_enabled' },
+    { label: '默认信用额度', prop: 'default_credit_limit' },
     ...(canUpdateRoleStatus ? [{ label: '状态', prop: 'status' }] : []),
-    { label: '创建时间', prop: 'CreatedAt' }
+    { label: '创建时间', prop: 'created_at' }
   ]
 
   const formRef = ref<FormInstance>()
@@ -357,7 +362,23 @@
       { min: 2, max: 50, message: '长度在 2 到 50 个字符', trigger: 'blur' }
     ],
     role_desc: [{ max: 200, message: '描述不能超过200个字符', trigger: 'blur' }],
-    role_type: [{ required: true, message: '请选择角色类型', trigger: 'change' }]
+    role_type: [{ required: true, message: '请选择角色类型', trigger: 'change' }],
+    credit_limit_yuan: [
+      {
+        validator: (_rule, value, callback) => {
+          if (!isCustomerRoleForm.value || !form.credit_enabled) {
+            callback()
+            return
+          }
+          if (value === undefined || value === null || value <= 0) {
+            callback(new Error('默认信用额度必须大于0'))
+            return
+          }
+          callback()
+        },
+        trigger: 'blur'
+      }
+    ]
   })
 
   const form = reactive<any>({
@@ -388,12 +409,40 @@
 
   const roleList = ref<PlatformRole[]>([])
 
+  const getRoleId = (role: PlatformRole | any) => role.id ?? role.ID
+
+  const handleNameClick = (row: PlatformRole) => {
+    if (hasAuth('role:detail')) {
+      void router.push(`${RoutesAlias.RoleDetail}/${getRoleId(row)}`)
+    } else {
+      ElMessage.warning('您没有查看详情的权限')
+    }
+  }
+
   // 动态列配置
   const { columnChecks, columns } = useCheckedColumns(() => [
     {
       prop: 'role_name',
       label: '角色名称',
-      width: 180
+      width: 180,
+      formatter: (row: PlatformRole) => {
+        const hasPermission = hasAuth('role:detail')
+        return h(
+          'span',
+          {
+            style: hasPermission
+              ? 'color: var(--el-color-primary); cursor: pointer; text-decoration: underline;'
+              : '',
+            onClick: hasPermission
+              ? (event: MouseEvent) => {
+                  event.stopPropagation()
+                  handleNameClick(row)
+                }
+              : undefined
+          },
+          row.role_name
+        )
+      }
     },
     {
       prop: 'role_type',
@@ -405,6 +454,28 @@
         )
       }
     },
+    {
+      prop: 'default_credit_enabled',
+      label: '新建代理默认信用',
+      width: 150,
+      formatter: (row: PlatformRole) => {
+        if (row.role_type !== RoleType.CUSTOMER) return '-'
+        return h(
+          ElTag,
+          { type: row.default_credit_enabled ? 'success' : 'info' },
+          () => (row.default_credit_enabled ? '启用' : '未启用')
+        )
+      }
+    },
+    {
+      prop: 'default_credit_limit',
+      label: '默认信用额度',
+      width: 140,
+      formatter: (row: PlatformRole) => {
+        if (row.role_type !== RoleType.CUSTOMER || !row.default_credit_enabled) return '-'
+        return `${fenToYuan(row.default_credit_limit)} 元`
+      }
+    },
     ...(canUpdateRoleStatus
       ? [
           {
@@ -431,10 +502,10 @@
       label: '角色描述'
     },
     {
-      prop: 'CreatedAt',
+       prop: 'created_at',
       label: '创建时间',
       width: 180,
-      formatter: (row: any) => formatDateTime(row.CreatedAt)
+       formatter: (row: any) => formatDateTime(row.created_at)
     },
     {
       prop: 'actions',
@@ -934,7 +1005,7 @@
 
   // 显示分配权限对话框
   const showPermissionDialog = async (row: PlatformRole) => {
-    currentRoleId.value = row.ID
+     currentRoleId.value = getRoleId(row)
     currentRole.value = {
       role_name: row.role_name,
       role_type: row.role_type
@@ -1043,7 +1114,7 @@
     if (type === 'edit' && row) {
       let roleDetail = row
       try {
-        const res = await RoleService.getRole(row.ID)
+       const res = await RoleService.getRole(getRoleId(row))
         if (res.code === 0 && res.data) {
           roleDetail = res.data
         }
@@ -1051,13 +1122,17 @@
         console.error('获取角色详情失败:', error)
       }
 
-      form.id = roleDetail.ID
+       form.id = getRoleId(roleDetail)
       form.role_name = roleDetail.role_name
       form.role_desc = roleDetail.role_desc
       form.role_type = roleDetail.role_type
       form.status = roleDetail.status
-      form.credit_enabled = Boolean(roleDetail.credit_enabled)
-      form.credit_limit_yuan = fenToYuan(roleDetail.credit_limit)
+       form.credit_enabled = Boolean(
+         roleDetail.default_credit_enabled ?? roleDetail.credit_enabled
+       )
+       form.credit_limit_yuan = fenToYuan(
+         roleDetail.default_credit_limit ?? roleDetail.credit_limit
+       )
     } else {
       form.id = 0
       form.role_name = ''
@@ -1080,7 +1155,7 @@
     })
       .then(async () => {
         try {
-          await RoleService.deleteRole(row.ID)
+           await RoleService.deleteRole(getRoleId(row))
           ElMessage.success('删除成功')
           await getTableData()
         } catch (error) {
@@ -1118,7 +1193,6 @@
             const data = {
               role_name: form.role_name,
               role_desc: form.role_desc,
-              role_type: form.role_type,
               status: form.status
             }
             await RoleService.updateRole(form.id, data)
@@ -1146,7 +1220,7 @@
     // 先更新UI
     row.status = newStatus
     try {
-      await RoleService.updateRoleStatus(row.ID, newStatus as 0 | 1)
+       await RoleService.updateRoleStatus(getRoleId(row), newStatus as 0 | 1)
       ElMessage.success('状态切换成功')
     } catch (error) {
       // 切换失败，恢复原状态