xiaweibo 3 miesięcy temu
rodzic
commit
d9f3951cde

+ 2 - 5
src/api/evaluationSystem/index.ts

@@ -438,14 +438,11 @@ export function updateSecurityExamineIssueReviewAgree(params: UpdateSecurityExam
 /**
  * 管理员端复核不通过
  */
-export function updateSecurityExamineIssueReviewDisagree(id: number, reviewRejectReson?: string) {
+export function updateSecurityExamineIssueReviewDisagree(data: { id: number; reviewRejectReson?: string }) {
   return http.request({
     url: '/securityExamine/admin/updateSecurityExamineIssueReviewDisagree',
     method: 'put',
-    data: {
-      id,
-      reviewRejectReson,
-    },
+    data,
   });
 }
 

+ 2 - 0
src/views/production-safety/safetyAssessment/evaluationDepartment/components/EvaluationDepartmentFeedback.vue

@@ -64,6 +64,7 @@
               />
             </template>
           </el-table-column>
+          <el-table-column label="复核不通过原因" prop="reviewRejectReson" min-width="220"></el-table-column>
         </el-table>
       </div>
     </div>
@@ -296,6 +297,7 @@
           scoringMethod: score.scoringWay || '', // 评分方式
           selfScore: score.selfScore || 0, // 自评得分
           materialDescription: score.attachments || '', // 资料说明(使用附件字段,字符串)
+          reviewRejectReson: score.reviewRejectReson || '', // 复核不通过原因
           attachmentFileList: parseAttachmentsToFileList(score.attachments || ''), // 对应的附件文件列表
         }));
       } else {

+ 7 - 2
src/views/production-safety/safetyAssessment/evaluationSystem/components/EvaluationSystemFeedback.vue

@@ -482,7 +482,7 @@
           reviewRejectReson: score.reviewRejectReson || '', // 复核不通过原因
           materialDescription: score.attachments || '', // 资料说明(使用附件字段,字符串)
           attachmentFileList: parseAttachmentsToFileList(score.attachments || ''), // 资料说明对应的附件文件列表
-          isReviewInput: score.isReviewInput == true, // 是否显示复核得分输入框
+          isReviewInput: detail.isSelfApproveButton == true, // 是否显示复核得分输入框
         }));
       } else {
         evaluationItems.value = [];
@@ -589,7 +589,12 @@
 
     try {
       if (rejectType.value === 'review') {
-        await updateSecurityExamineIssueReviewDisagree(props.id, rejectReason.value.trim());
+        const submitData = {
+          id: props.id,
+          reviewRejectReson: rejectReason.value.trim(),
+          scores: evaluationItems.value,
+        };
+        await updateSecurityExamineIssueReviewDisagree(submitData);
         ElMessage.success('复核不通过操作成功');
       } else {
         await updateSecurityExamineIssueApproveDisagree(props.id, rejectReason.value.trim());