⚙️ 修改细节问题

src/api/collect/AssessmentContent.ts

@@ -166,6 +166,10 @@ export class InheritorCheckBasicInfo extends DataModel<InheritorCheckBasicInfo>
   educationText = '' as string;
   levelText = '' as string;
   regionText = '' as string;
+  /** 已填写的传承协议ID */
+  agreementId = 0 as number;
+  /** 已填写的自查表ID */
+  checkId = 0 as number;
 }
 
 /** 详情中已选计分项 */

src/pages/collect/assessment/argeement-sign.vue

@@ -214,16 +214,11 @@ const loader = useSimpleDataLoader(async () => {
     partyBSignDate.value = { year: '', month: '', day: '' };
     return currentAgreement.value;
   }
-  const list = await AssessmentContentApi.getAgreementList({
-    userId: authStore.userInfo?.id,
-    year: new Date().getFullYear(),
-  });
-  const currentYear = new Date().getFullYear();
-  if (list.data.length > 0) {
-    const currentYearItem = list.data.find((item) => item.year === currentYear);
+  const basicInfo = await AssessmentContentApi.getInheritorBasic(authStore.userInfo?.id);
+  if (basicInfo.agreementId > 0) {
     const detail = await AssessmentContentApi.getAgreementDetail(
-      currentYearItem?.id || list.data[0].id, 
-      currentYearItem?.userId || authStore.userInfo?.id
+      basicInfo.agreementId, 
+      authStore.userInfo?.id
     );
     currentAgreement.value = detail;
     partyAStampDate.value = { year: '', month: '', day: '' };

src/pages/collect/assessment/evaluation-form.vue

@@ -294,7 +294,7 @@ const formOptions : IDynamicFormOptions = {
         },
         {
           label: '传承人签名',
-          name: 'sign',
+          name: 'inheritorSign',
           type: 'sign',
           formProps: {
             showRightArrow: true,
@@ -436,16 +436,11 @@ const loader = useSimpleDataLoader(async () => {
     await loadAnnexList();
     return;
   }
-  const currentYear = new Date().getFullYear();
-  const list = await AssessmentContentApi.getSelfAssessmentList({
-    userId: authStore.userInfo?.id,
-    year: currentYear,
-  });
-  if (list.data.length > 0) {
-    const currentYearItem = list.data.find((item) => item.year === currentYear);
+  const basicInfo = await AssessmentContentApi.getInheritorBasic(authStore.userInfo?.id);
+  if (basicInfo.checkId > 0) {
     const detail = await AssessmentContentApi.getSelfAssessmentDetail(
-      currentYearItem?.id || list.data[0].id,
-      currentYearItem?.userId || authStore.userInfo?.id
+      basicInfo.checkId,
+      authStore.userInfo?.id
     );
     currentForm.value = detail;
     await loadAnnexList();