🎨 按要求修改退回显示

src/api/collect/AssessmentContent.ts

@@ -839,6 +839,7 @@ export class AssessmentContentApi extends AppServerRequestModule<DataModel> {
     keywords?: string;
     page?: number;
     pageSize?: number;
+    logStatus?: number;
   }) {
     const res = await this.post<KeyValue>('/ich/check/getInheritorList', '传承人列表', {
       user_id: data.userId,
@@ -848,6 +849,7 @@ export class AssessmentContentApi extends AppServerRequestModule<DataModel> {
       keywords: data.keywords,
       page: data.page,
       pageSize: data.pageSize,
+      log_status: data.logStatus,
     });
     return normalizePaginated<InheritorCheckListRow>(InheritorCheckListRow, res.requireData());
   }

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

@@ -17,6 +17,14 @@
             label: '等级',
             defaultSelectedValue: lastSelfAssessmentLevel,
           },
+          {
+            options: [
+              { id: 1, name: '正常' },
+              { id: 2, name: '退回' },
+            ],
+            label: '退回',
+            defaultSelectedValue: 1,
+          }
         ]"
         :load="(page: number, pageSize: number, _tag: number, searchText: string, drop: number[]) => loadSelfAssessmentAdminList(page, pageSize, searchText, drop)"
         :show-detail="handleReviewSelfAssessment"
@@ -29,12 +37,9 @@
             <template #content>
               <div style="max-width: 300px">{{ item.rejectReason || '无' }}</div>
             </template>
-            <span v-if="item.progress <= 0" class="mr-3 text-sm" style="color: #f5222d; cursor: pointer;">
+            <span class="mr-3 text-sm" style="color: #f5222d; cursor: pointer;">
               <ExclamationCircleOutlined /> 已退回
             </span>
-            <span v-if="item.progress > 0" class="mr-3 text-sm">
-              <InfoCircleOutlined /> 之前退回过
-            </span>
           </a-popover>
           <span class="mr-3 text-sm text-gray-600">{{ selfAssessmentProgressLabel(item.progress) }}</span>
           <a-button type="link" @click.stop="router.push({ name: 'CollectEvaluationForm', query: { id: item.checkId ?? item.id, userId: item.userId } })">编辑</a-button>
@@ -189,6 +194,7 @@ function selfAssessmentProgressLabel(progress: number | null | undefined) {
 async function loadSelfAssessmentAdminList(page: number, pageSize: number, searchText: string, dropDownValues: number[]) {
   const pv = dropDownValues?.[0];
   const lv = dropDownValues?.[1];
+  const st = dropDownValues?.[2];
   lastSelfAssessmentProgress.value = pv ?? -100;
   lastSelfAssessmentLevel.value = lv ?? 0;
   const progress = pv != null && pv > -50 ? pv : undefined;
@@ -200,6 +206,7 @@ async function loadSelfAssessmentAdminList(page: number, pageSize: number, searc
     keywords: searchText?.trim() || undefined,
     progress,
     level,
+    logStatus: st,
   });
   return {
     page,