瀏覽代碼

🎨 增加退回显示

快乐的梦鱼 2 周之前
父節點
當前提交
8d097d87fc
共有 2 個文件被更改,包括 12 次插入5 次删除
  1. 1 0
      src/components/NavBar.vue
  2. 11 5
      src/pages/collect/assessment/components/SelfAssessmentResultBlock.vue

+ 1 - 0
src/components/NavBar.vue

@@ -48,6 +48,7 @@
     
     <a-dropdown v-if="authStore.isLogged" :trigger="['click']">
       <a-image :src="IconUser" class="right-button" :preview="false" />
+      <span>{{ authStore.userInfo?.nickname || '请登录' }}</span>
       <template #overlay>
         <a-menu>
           <a-menu-item key="2" @click="router.push('/change-password')">修改密码</a-menu-item>

+ 11 - 5
src/pages/collect/assessment/components/SelfAssessmentResultBlock.vue

@@ -3,6 +3,7 @@
     <a-typography-title :level="4">各级审核意见</a-typography-title>
     <div v-for="sec in sections" :key="sec.key" class="mb-6">
       <a-typography-text strong>{{ sec.title }}</a-typography-text>
+      <a-tag v-if="currentForm.rejectType === sec.rejectTypeValue" color="red" class="ml-2!">被退回</a-tag>
       <a-space class="mt-2 ml-2" wrap>
         <a-radio-group
           :value="currentForm[sec.opinionField]"
@@ -25,6 +26,11 @@
         />
         <span v-else>(待审核填写)</span>
       </div>
+      <div v-if="currentForm.rejectType === sec.rejectTypeValue && currentForm.rejectReason" class="mt-2 ml-2">
+        <a-alert type="warning" show-icon>
+          <template #message>退回原因:{{ currentForm.rejectReason }}</template>
+        </a-alert>
+      </div>
     </div>
   </div>
 </template>
@@ -50,11 +56,11 @@ const opinionOptions = [
   { label: '取消资格', value: 5 },
 ];
 
-const sections: { key: string; title: string; opinionField: OpinionField; pointsField: PointsField }[] = [
-  { key: 'ichUnit', title: '1. 项目保护单位意见', opinionField: 'ichUnit', pointsField: 'unitPoints' },
-  { key: 'county', title: '2. 县(区)文旅部门审核意见', opinionField: 'county', pointsField: 'countyPoints' },
-  { key: 'district', title: '3. 设区市文旅部门、省非遗中心审核意见', opinionField: 'district', pointsField: 'districtPoints' },
-  { key: 'province', title: '4. 省文化和旅游厅意见', opinionField: 'province', pointsField: 'provincePoints' },
+const sections: { key: string; title: string; opinionField: OpinionField; pointsField: PointsField; rejectTypeValue: number }[] = [
+  { key: 'ichUnit', title: '1. 项目保护单位意见', opinionField: 'ichUnit', pointsField: 'unitPoints', rejectTypeValue: 2 },
+  { key: 'county', title: '2. 县(区)文旅部门审核意见', opinionField: 'county', pointsField: 'countyPoints', rejectTypeValue: 3 },
+  { key: 'district', title: '3. 设区市文旅部门、省非遗中心审核意见', opinionField: 'district', pointsField: 'districtPoints', rejectTypeValue: 4 },
+  { key: 'province', title: '4. 省文化和旅游厅意见', opinionField: 'province', pointsField: 'provincePoints', rejectTypeValue: 5 },
 ];
 
 function updateField(field: OpinionField | PointsField, value: number) {