Преглед на файлове

⚙️ 修改细节问题

快乐的梦鱼 преди 2 дни
родител
ревизия
c77573b2be

+ 4 - 4
src/api/collect/AssessmentContent.ts

@@ -568,16 +568,16 @@ export class AssessmentContentApi extends AppServerRequestModule<DataModel> {
   /**
    * 自查评估表详情
    */
-  async getSelfAssessmentDetail(id: number) {
-    const res = await this.post<KeyValue>('/ich/check/detail', '评估表详情', { id });
+  async getSelfAssessmentDetail(id: number, userId?: number) {
+    const res = await this.post<KeyValue>('/ich/check/detail', '评估表详情', { id, user_id: userId });
     return transformDataModel<SelfAssessmentDetail>(SelfAssessmentDetail, res.requireData());
   }
 
   /**
    * 传承协议详情
    */
-  async getAgreementDetail(id: number) {
-    const res = await this.post<KeyValue>('/ich/check/agreementDetail', '传承协议详情', { id });
+  async getAgreementDetail(id: number, userId?: number) {
+    const res = await this.post<KeyValue>('/ich/check/agreementDetail', '传承协议详情', { id, user_id: userId });
     return transformDataModel<AgreementDetail>(AgreementDetail, res.requireData());
   }
 }

+ 1 - 1
src/pages/collect/assessment/argeement-sign-list.vue

@@ -9,7 +9,7 @@
         backgroundColor="white"
         padding="space.md"
         radius="radius.md"
-        @click="navTo('./argeement-sign', { id: item.id })"
+        @click="navTo('./argeement-sign', { id: item.id, userId: item.userId })"
       >
         <FlexCol>
           <Text :text="item.inheritor ?? '?'" />

+ 6 - 2
src/pages/collect/assessment/argeement-sign.vue

@@ -87,6 +87,7 @@ import { useImageSimpleUploadCo } from '@/common/components/upload/ImageUploadCo
 
 const { querys } = useLoadQuerys({
   id: 0,
+  userId: 0,
 }, () => {
   loader.load();
 });
@@ -207,7 +208,7 @@ const levelTitle = computed(() => {
 });
 const loader = useSimpleDataLoader(async () => {
   if (querys.value.id > 0) {
-    const detail = await AssessmentContentApi.getAgreementDetail(querys.value.id);
+    const detail = await AssessmentContentApi.getAgreementDetail(querys.value.id, querys.value.userId);
     currentAgreement.value = detail;
     partyAStampDate.value = { year: '', month: '', day: '' };
     partyBSignDate.value = { year: '', month: '', day: '' };
@@ -220,7 +221,10 @@ const loader = useSimpleDataLoader(async () => {
   const currentYear = new Date().getFullYear();
   if (list.data.length > 0) {
     const currentYearItem = list.data.find((item) => item.year === currentYear);
-    const detail = await AssessmentContentApi.getAgreementDetail(currentYearItem?.id || list.data[0].id);
+    const detail = await AssessmentContentApi.getAgreementDetail(
+      currentYearItem?.id || list.data[0].id, 
+      currentYearItem?.userId || authStore.userInfo?.id
+    );
     currentAgreement.value = detail;
     partyAStampDate.value = { year: '', month: '', day: '' };
     partyBSignDate.value = { year: detail.updatetime.getFullYear().toString(), month: (detail.updatetime.getMonth() + 1).toString(), day: detail.updatetime.getDate().toString() };

+ 6 - 2
src/pages/collect/assessment/evaluation-form.vue

@@ -84,6 +84,7 @@ let loaded = false;
 
 const { querys } = useLoadQuerys({
   id: 0,
+  userId: 0,
 }, () => {
   if (loaded)
     return;
@@ -385,7 +386,7 @@ const loader = useSimpleDataLoader(async () => {
   await waitTimeOut(1000);
   
   if (querys.value.id > 0) {
-    const detail = await AssessmentContentApi.getSelfAssessmentDetail(querys.value.id);
+    const detail = await AssessmentContentApi.getSelfAssessmentDetail(querys.value.id, querys.value.userId);
     currentForm.value = detail;
     await loadCheckItems();
     await loadAnnexList();
@@ -398,7 +399,10 @@ const loader = useSimpleDataLoader(async () => {
   });
   if (list.data.length > 0) {
     const currentYearItem = list.data.find((item) => item.year === currentYear);
-    const detail = await AssessmentContentApi.getSelfAssessmentDetail(currentYearItem?.id || list.data[0].id);
+    const detail = await AssessmentContentApi.getSelfAssessmentDetail(
+      currentYearItem?.id || list.data[0].id,
+      currentYearItem?.userId || authStore.userInfo?.id
+    );
     currentForm.value = detail;
     await loadAnnexList();
     await loadCheckItems();

+ 1 - 1
src/pages/collect/assessment/evaluation-list.vue

@@ -9,7 +9,7 @@
         padding="space.md"
         radius="radius.md"
         justify="space-between"
-        @click="navTo('./evaluation-form', { id: item.id })"
+        @click="navTo('./evaluation-form', { id: item.id, userId: item.userId })"
       >
         <FlexCol>
           <Text :text="item.inheritor ?? '?'" />