feat：【antd】【crm】增加 clue detail 的优化想法

apps/web-antd/src/views/crm/clue/modules/detail-data.ts

@@ -66,7 +66,12 @@ export function useDetailBaseSchema(): DescriptionItemSchema[] {
     {
       field: 'areaName',
       label: '地址',
-      content: (data) => data?.areaName + data?.detailAddress,
+      content: (data) => {
+        const areaName =
+          typeof data?.areaName === 'string' ? data.areaName : '';
+        const detailAddress = data?.detailAddress ?? '';
+        return [areaName, detailAddress].filter((item) => !!item).join(' ');
+      },
     },
     {
       field: 'qq',

apps/web-antd/src/views/crm/clue/modules/detail-info.vue

@@ -34,6 +34,7 @@ const [SystemDescriptions] = useDescription({
 </script>
 
 <template>
+  <!-- TODO @芋艿：为什么 p-4？ -->
   <div class="p-4">
     <BaseDescriptions :data="clue" />
     <Divider />

apps/web-antd/src/views/crm/clue/modules/detail.vue

@@ -7,6 +7,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import { confirm, Page, useVbenModal } from '@vben/common-ui';
 import { useTabs } from '@vben/hooks';
+// TODO @芋艿：这里要不要改成 icon 组件？
 import { ArrowLeft } from '@vben/icons';
 
 import { Button, Card, message, Tabs } from 'ant-design-vue';
@@ -15,13 +16,16 @@ import { getClue, transformClue } from '#/api/crm/clue';
 import { getOperateLogPage } from '#/api/crm/operateLog';
 import { BizTypeEnum } from '#/api/crm/permission';
 import { useDescription } from '#/components/description';
+// TODO @芋艿：要不要 AsyncOperateLog 风格？
 import { AsyncOperateLog } from '#/components/operate-log';
 import { FollowUp } from '#/views/crm/followup';
 import { PermissionList, TransferForm } from '#/views/crm/permission';
 
+// TODO @芋艿：待讨论，要不要独立一个 detail/index.vue
 import { useDetailSchema } from './detail-data';
 import ClueForm from './form.vue';
 
+// TODO @芋艿：待讨论
 const ClueDetailsInfo = defineAsyncComponent(() => import('./detail-info.vue'));
 
 const loading = ref(false);
@@ -30,13 +34,12 @@ const route = useRoute();
 const router = useRouter();
 const tabs = useTabs();
 
-const clueId = ref(0);
-
-const clue = ref<CrmClueApi.Clue>({} as CrmClueApi.Clue);
-const clueLogList = ref<SystemOperateLogApi.OperateLog[]>([]);
+const clueId = ref(0); // 线索编号
+const clue = ref<CrmClueApi.Clue>({} as CrmClueApi.Clue); // 线索详情
+const logList = ref<SystemOperateLogApi.OperateLog[]>([]); // 操作日志
 const permissionListRef = ref<InstanceType<typeof PermissionList>>(); // 团队成员列表 Ref
 
-// 校验负责人权限和编辑权限
+/** 校验负责人权限和编辑权限 */
 const validateOwnerUser = computed(
   () => permissionListRef.value?.validateOwnerUser,
 );
@@ -62,17 +65,19 @@ const [TransferModal, transferModalApi] = useVbenModal({
 });
 
 /** 加载线索详情 */
-async function loadClueDetail() {
+async function getClueDetail() {
   loading.value = true;
-  const data = await getClue(clueId.value);
-  clue.value = data;
-  // 操作日志
-  const logList = await getOperateLogPage({
-    bizType: BizTypeEnum.CRM_CLUE,
-    bizId: clueId.value,
-  });
-  clueLogList.value = logList.list;
-  loading.value = false;
+  try {
+    clue.value = await getClue(clueId.value);
+    // 操作日志
+    const logList = await getOperateLogPage({
+      bizType: BizTypeEnum.CRM_CLUE,
+      bizId: clueId.value,
+    });
+    logList.value = logList.list;
+  } finally {
+    loading.value = false;
+  }
 }
 
 /** 返回列表页 */
@@ -113,17 +118,17 @@ async function handleTransform(): Promise<boolean | undefined> {
   });
 }
 
-// 加载数据
+/** 加载数据 */
 onMounted(() => {
-  clueId.value = Number(route.params.id);
-  loadClueDetail();
+  clueId.value = route.params.id as number;
+  getClueDetail();
 });
 </script>
 
 <template>
   <Page auto-content-height :title="clue?.name" :loading="loading">
-    <FormModal @success="loadClueDetail" />
-    <TransferModal @success="loadClueDetail" />
+    <FormModal @success="getClueDetail" />
+    <TransferModal @success="getClueDetail" />
     <template #extra>
       <div class="flex items-center gap-2">
         <Button @click="handleBack">
@@ -154,13 +159,13 @@ onMounted(() => {
       <Descriptions :data="clue" />
     </Card>
     <Card class="mt-4 min-h-[60%]">
-      <Tabs>
-        <Tabs.TabPane tab="详细资料" key="1" :force-render="true">
-          <ClueDetailsInfo :clue="clue" />
-        </Tabs.TabPane>
-        <Tabs.TabPane tab="线索跟进" key="2" :force-render="true">
+      <Tabs class="tabs-tight" :tab-bar-gutter="16">
+        <Tabs.TabPane tab="跟进记录" key="1" :force-render="true">
           <FollowUp :biz-id="clueId" :biz-type="BizTypeEnum.CRM_CLUE" />
         </Tabs.TabPane>
+        <Tabs.TabPane tab="基本信息" key="2" :force-render="true">
+          <ClueDetailsInfo :clue="clue" />
+        </Tabs.TabPane>
         <Tabs.TabPane tab="团队成员" key="3" :force-render="true">
           <PermissionList
             ref="permissionListRef"
@@ -171,7 +176,7 @@ onMounted(() => {
           />
         </Tabs.TabPane>
         <Tabs.TabPane tab="操作日志" key="4" :force-render="true">
-          <AsyncOperateLog :log-list="clueLogList" />
+          <AsyncOperateLog :log-list="logList" />
         </Tabs.TabPane>
       </Tabs>
     </Card>

apps/web-antd/src/views/crm/clue/modules/form.vue

@@ -28,7 +28,6 @@ const [Form, formApi] = useVbenForm({
     },
     labelWidth: 100,
   },
-  // 一共3列
   wrapperClass: 'grid-cols-2',
   layout: 'horizontal',
   schema: useFormSchema(),