告知书和决定书

src/app/routes/art/score/score-final-ym/score-final-ym.component.html

@@ -10,6 +10,8 @@
         <div class="dropdown-divider"></div>
         <a class="dropdown-item" href="#"
            (click)="FuncService.ajaxDownload('frame/report/download.htm', {report_name:'YmFinalScoreExport', report_title :'央美2021校考复试成绩'})">导出复试成绩</a>
+        <div class="dropdown-divider"></div>
+        <a class="dropdown-item" href="#" (click)="requestWithThread('./score/ym/make/review/log.htm', {batch: 'final'}, {confirmMsg:'确定要重新生成复试的所有成绩复核日志吗？'})">生成成绩复核日志</a>
 
       </div>
     </div>
@@ -32,6 +34,11 @@
       <th><span class="table-sort" (click)="pager.sort('subject_name_3')">科目名3</span></th>
       <th><span class="table-sort" (click)="pager.sort('subject_score_3')">科目分3</span></th>
       <th><span class="table-sort" (click)="pager.sort('aspect_qualified')">合格状态</span></th>
+      <th><span class="table-sort">复核成绩内容</span></th>
+      <th><span class="table-sort">复核成绩时间</span></th>
+      <th><span class="table-sort">复核结论</span></th>
+      <th><span class="table-sort">复核答复时间</span></th>
+      <th>成绩复核日志</th>
     </tr>
     </thead>
     <tbody>
@@ -48,7 +55,38 @@
       <td>{{v.subject_score_2}}</td>
       <td>{{v.subject_name_3}}</td>
       <td>{{v.subject_score_3}}</td>
-      <td>{{v.aspect_qualified}}</td>
+      <td>
+        <span class="text-danger" *ngIf="v.aspect_qualified == '不合格' || v.aspect_qualified == '作弊'">{{v.aspect_qualified}}</span>
+        <span class="text-success" *ngIf="v.aspect_qualified == '合格'">{{v.aspect_qualified}}</span>
+        <span *ngIf="v.aspect_qualified != '不合格' && v.aspect_qualified != '作弊' && v.aspect_qualified !='合格'">{{v.aspect_qualified}}</span>
+      </td>
+
+      <td>
+        <span *ngIf="v.apply_msg" class="text-success" [tooltip]="v.apply_msg">复核内容</span>
+      </td>
+      <td>{{v.check_flag}}</td>
+      <td>
+        <span *ngIf="v.check_note" class="text-success" [tooltip]="v.check_note">复核结论</span>
+      </td>
+      <td>
+        <span *ngIf="v.check_note"> {{v.recovery_time}}</span>
+      </td>
+
+      <td>
+        <div class="btn-group" dropdown style="margin-top: -2px;">
+          <button class="btn dropdown-toggle btn-secondary btn-sm" type="button" dropdownToggle>成绩复核日志
+            <span class="caret"></span>
+          </button>
+          <div *dropdownMenu class="dropdown-menu modal-lg" role="menu">
+            <a class="dropdown-item" href="#" (click)="downloadReviewLog(v)" *ngIf="v.review_log_file">下载</a>
+            <div class="dropdown-divider"*ngIf="!v.review_log_file"></div>
+            <a class="dropdown-item" href="#" (click)="makeStdReviewLog(v,false)" *ngIf="!v.review_log_file">生成</a>
+            <div class="dropdown-divider"*ngIf="v.review_log_file"></div>
+            <a class="dropdown-item" href="#" (click)="makeStdReviewLog(v,true)"  *ngIf="v.review_log_file">重制</a>
+          </div>
+        </div>
+      </td>
+
     </tr>
     </tbody>
   </table>

src/app/routes/art/score/score-final-ym/score-final-ym.component.ts

@@ -37,4 +37,24 @@ export class ScoreFinalYmComponent extends FramePageComponent implements OnInit
   uploadWithThreadCallback(ajax) {
     this.pager.reload();
   }
+
+
+  downloadReviewLog(v) {
+    window.open(this.FrameService.getParamValue('EnrolMaterialWebPath') + '/' + v.review_log_file);
+  }
+
+  makeStdReviewLog(v, flag) {
+    let msg = '确定要生成该考生的成绩复核日志吗！';
+    if (flag) {
+      msg = '确定要重新生成该考生的成绩复核日志吗？';
+    }
+    this.MsgService.confirmAlert(msg, () => {
+      this.FuncService.ajaxDownload('score/ym/make/review/log.htm', { cert_id: v.cert_id, aspect_name: v.aspect_name, batch: v.batch });
+      setTimeout(() => {
+        this.pager.reload();
+      }, 1000);
+    });
+  }
+
+
 }

src/app/routes/art/score/score-first-ym/score-first-ym.component.html

@@ -9,9 +9,9 @@
         <a class="dropdown-item" href="#" (click)="doUploaFile()">导入初试成绩</a>
         <div class="dropdown-divider"></div>
         <a class="dropdown-item" href="#"
-           (click)="FuncService.ajaxDownload('frame/report/download.htm', {report_name:'YmFirstScoreExport', report_title :'央美2021校考初试成绩'})">导出初试成绩</a>
+           (click)="FuncService.ajaxDownload('frame/report/download.htm', {report_name:'YmFirstScoreExport', report_title :'央美校考初试成绩'})">导出初试成绩</a>
         <div class="dropdown-divider"></div>
-        <a class="dropdown-item" href="#" (click)="requestWithThread('./score/ym/make/review/log.htm', {}, {confirmMsg:'确定要重新生成所有成绩复核日志吗？'})">生成成绩复核日志</a>
+        <a class="dropdown-item" href="#" (click)="requestWithThread('./score/ym/make/review/log.htm', {batch: 'first'}, {confirmMsg:'确定要重新生成所有成绩复核日志吗？'})">生成成绩复核日志</a>
       </div>
     </div>
   </div>
@@ -67,7 +67,8 @@
       </td>
 
       <td>
-        <div class="btn-group" dropdown style="margin-top: -2px;"  *ngIf="v.wei_gui=='是'">
+        <!-- *ngIf="v.wei_gui=='是' -->
+        <div class="btn-group" dropdown style="margin-top: -2px;">
           <button class="btn dropdown-toggle btn-secondary btn-sm" type="button" dropdownToggle>成绩复核日志
             <span class="caret"></span>
           </button>

src/app/routes/art/score/score-first-ym/score-first-ym.component.ts

@@ -67,6 +67,9 @@ export class ScoreFirstYmComponent extends FramePageComponent implements OnInit
     }
     this.MsgService.confirmAlert(msg, () => {
       this.FuncService.ajaxDownload('score/ym/make/review/log.htm', { cert_id: v.cert_id, aspect_name: v.aspect_name, batch: v.batch });
+      setTimeout(() => {
+        this.pager.reload();
+      }, 1000);
     });
   }