优化表单

src/pages/dig/details.vue

@@ -89,7 +89,7 @@ const { querys } = useLoadQuerys({
 });
 
 const authStore = useAuthStore();
-const { canCollect, getCollectModuleInternalNameById, isEmpty } = useCollectStore();
+const { canCollect, isEmpty } = useCollectStore();
 const { goForm } = useTaskEntryForm();
 
 const nextPageData = computed(() => ({
@@ -100,11 +100,7 @@ const taskList = useSimpleDataLoader<(TaskRootMenuDefItem & {
   catalogItem?: VillageCatalogListItem,
 })[]>(async () => {
   const res = (await VillageApi.getCatalogList(querys.value.villageId))
-    .filter(item => item.pid == 0)
-    .map(item => ({
-      ...item,
-      collectModuleName: getCollectModuleInternalNameById(item.collectModuleId),
-    }));
+    .filter(item => item.pid == 0);
 
   if (res.length === 0)
     return TaskRootDef;
@@ -112,12 +108,13 @@ const taskList = useSimpleDataLoader<(TaskRootMenuDefItem & {
   return TaskRootDef
     .map(item => ({
       ...item,
-      catalogItem: res.find(t => t.collectModuleName == item.name || t.title == item.title)
+      catalogItem: res.find(t => t.title == item.title)
     }))
     .filter(item => item.catalogItem)
     .map(item => ({
       ...item,
       title: item.catalogItem?.title || item.title,
+      desc: item.catalogItem?.desc || item.desc,
     }));
 });
 

src/pages/dig/forms/task.vue

@@ -33,7 +33,7 @@ import TaskList from '../components/TaskList.vue';
 import VillageApi from '@/api/inhert/VillageApi';
 
 const { goForm } = useTaskEntryForm();
-const { canCollect, getCollectModuleInternalNameById } = useCollectStore();
+const { canCollect } = useCollectStore();
 
 useLoadQuerys({ 
   villageId: 0,
@@ -42,11 +42,7 @@ useLoadQuerys({
 }, async ({ villageId, taskName, taskPid  }) => {
   currentTaskDefItem.value = { ...TaskMenuDef[taskName] };
   if (taskPid) {
-    const res = (await VillageApi.getCatalogList(villageId, taskPid))
-      .map(item => ({
-        ...item,
-        collectModuleName: getCollectModuleInternalNameById(item.collectModuleId),
-      }));
+    const res = (await VillageApi.getCatalogList(villageId, taskPid));
     if (res.length === 0)
       return;
     currentTaskDefItem.value.list = currentTaskDefItem.value.list
@@ -58,6 +54,7 @@ useLoadQuerys({
       .map(item => ({
         ...item,
         title: item.catalogItem?.title || item.title,
+        desc: item.catalogItem?.desc || item.desc,
       }));
   }
 });