💊 修复概况获取数据不正确问题

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+  "typescript.preferences.preferTypeOnlyAutoImports": true,
+  "javascript.preferences.preferTypeOnlyAutoImports": true,
+  "typescript.tsdk": "node_modules/typescript/lib"
+}

src/api/inhert/VillageInfoApi.ts

@@ -112,7 +112,7 @@ export class CommonInfoModel extends DataModel<CommonInfoModel> {
   villageVolunteerId = 0;
   villageName = '';
   villageVolunteerName = '';
-  contentId = 0;
+  contentId : number|null = null;
   name = '';
   type = 1;
   audio = '';
@@ -233,6 +233,11 @@ export class VillageInfoApi extends AppServerRequestModule<DataModel> {
       id,
     }, undefined, modelClassCreator)).data as T
   }
+  async getInfoByVillageId(id: number) {
+    return (await this.post(`/village/village/getInfo`, '获取村社信息', {
+      id,
+    }, undefined, VillageListItem)).data as VillageListItem
+  }
   async getList<T extends DataModel = CommonInfoModel>(
     collectModuleId: number|undefined,
     subType: string,

src/common/config/AppCofig.ts

@@ -5,7 +5,7 @@ const buildInfo = `${__BUILD_GUID__}`
  * 说明：应用静态配置
  */
 export default {
-  version: '1.0.0',
+  version: '1.0.6',
   buildTime,
   buildInfo,
   appId: 'wx954621c03f2fa912',

src/pages/dig/forms/common.vue

@@ -49,6 +49,7 @@ import type { IDynamicFormOptions, IDynamicFormRef } from '@/components/dynamic'
 import Alert from '@/components/feedback/Alert.vue';
 import type { UploaderInstance } from '@/components/form/Uploader.vue';
 import type { UploaderFieldInstance } from '@/components/form/UploaderField.vue';
+import VillageApi from '@/api/inhert/VillageApi';
 
 const loading = ref(false);
 const subTitle = ref('');
@@ -101,23 +102,15 @@ const { querys } = useLoadQuerys({
       readonly: querys.isView,
       disabled: querys.isView,
     };
-    if (querys.id >= 0) {
-      let findId = querys.id;
+    let findId = querys.id;
+    if (findId <= 0) {
       if (querys.subType === 'overview') {
-        const list = await VillageInfoApi.getList(
-          collectStore.getCollectModuleId(querys.subType), 
-          querys.subType, 
-          undefined, 
-          undefined, 
-          querys.villageId, 
-          querys.villageVolunteerId,
-          undefined,
-          1,
-          1
-        );
-        if (list?.length > 0)
-          findId = list[0].id;
+        const info = await VillageInfoApi.getInfoByVillageId(querys.villageId);
+        console.log(info);
+        findId = (info.myOverviewId || info.overviewId) as number;
       }
+    }
+    if (findId > 0) {
       formData = await VillageInfoApi.getInfo(
         collectStore.getCollectModuleId(querys.subType),
         querys.subType, 

src/pages/dig/forms/composeable/TaskEntryForm.ts

@@ -9,7 +9,7 @@ export function useTaskEntryForm() {
   
   function goForm(subType: string, subId: number, subKey = 'type', type = 'list', subTitle = '', catalogId : number|undefined = undefined) {
     navTo('/pages/dig/forms/' + type, {
-      id: type === 'common' ? 1 : undefined,
+      id: type === 'common' ? -1 : undefined,
       villageId: querys.value.villageId,  
       villageVolunteerId: querys.value.villageVolunteerId,  
       catalogId,
@@ -21,7 +21,7 @@ export function useTaskEntryForm() {
   }
   function goPreviewForm(subType: string, subId: number, subKey = 'type', type = 'list', subTitle = '', catalogId : number|undefined = undefined) {
     navTo('/pages/dig/forms/' + type, {
-      id: type === 'common' ? 1 : undefined,
+      id: type === 'common' ? -1 : undefined,
       villageId: querys.value.villageId,  
       villageVolunteerId: querys.value.villageVolunteerId,  
       catalogId,
@@ -41,7 +41,7 @@ export function useTaskEntryForm() {
 
 export function goFormStatic(villageId: number, villageVolunteerId: number, subType: string, subId: number, subKey = 'type', type = 'list', subTitle = '', catalogId : number|undefined = undefined) {
   navTo('/pages/dig/forms/' + type, {
-    id: type === 'common' ? 1 : undefined,
+    id: type === 'common' ? -1 : undefined,
     villageId,  
     villageVolunteerId,  
     catalogId,