haogh 6 月之前
父节点
当前提交
40beb28a98

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

@@ -35,6 +35,7 @@
       <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><span class="table-sort">复核答复时间</span></th>
       <th><span class="table-sort">复核答复时间</span></th>
+      <th></th>
     </tr>
     </tr>
     </thead>
     </thead>
     <tbody>
     <tbody>
@@ -60,6 +61,20 @@
       <td>
       <td>
         <span *ngIf="v.check_note"> 2024年1月29日 9:00</span>
         <span *ngIf="v.check_note"> 2024年1月29日 9:00</span>
       </td>
       </td>
+      <td>
+        <div class="btn-group" dropdown style="margin-top: -2px;"  *ngIf="v.wei_gui=='是'">
+          <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)="downloadDecision(v)" *ngIf="v.aspect_image">下载</a>
+            <div class="dropdown-divider"*ngIf="!v.aspect_image"></div>
+            <a class="dropdown-item" href="#" (click)="makeStdDecision(v,false)" *ngIf="!v.aspect_image">生成</a>
+            <div class="dropdown-divider"*ngIf="v.aspect_image"></div>
+            <a class="dropdown-item" href="#" (click)="makeStdDecision(v,true)"  *ngIf="v.aspect_image">重制</a>
+          </div>
+        </div>
+      </td>
     </tr>
     </tr>
     </tbody>
     </tbody>
   </table>
   </table>

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

@@ -1,8 +1,8 @@
-import { Component,ViewChild,OnInit } from '@angular/core';
+import { Component, ViewChild, OnInit } from '@angular/core';
 import { FramePageComponent } from '../../../frame/core/page/frame.page';
 import { FramePageComponent } from '../../../frame/core/page/frame.page';
 import { BsModalService } from 'ngx-bootstrap/modal';
 import { BsModalService } from 'ngx-bootstrap/modal';
-import {ScoreFirstYmDetailComponent} from '../score-first-ym-detail/score-first-ym-detail.component';
-import {ScoreYmReportComponent} from '../score-ym-report/score-ym-report.component';
+import { ScoreFirstYmDetailComponent } from '../score-first-ym-detail/score-first-ym-detail.component';
+import { ScoreYmReportComponent } from '../score-ym-report/score-ym-report.component';
 import { FrameUpload } from '../../../../core/frame/upload/frame-upload/frame-upload';
 import { FrameUpload } from '../../../../core/frame/upload/frame-upload/frame-upload';
 import { ModalService } from '../../../../core/service/modal.service';
 import { ModalService } from '../../../../core/service/modal.service';
 
 
@@ -12,7 +12,7 @@ import { ModalService } from '../../../../core/service/modal.service';
   styleUrls: ['./score-first-ym.component.scss']
   styleUrls: ['./score-first-ym.component.scss']
 })
 })
 export class ScoreFirstYmComponent extends FramePageComponent implements OnInit {
 export class ScoreFirstYmComponent extends FramePageComponent implements OnInit {
-  @ViewChild('uploader', {static: false}) uploader: FrameUpload;
+  @ViewChild('uploader', { static: false }) uploader: FrameUpload;
   constructor(private modalService: BsModalService) {
   constructor(private modalService: BsModalService) {
     super(modalService);
     super(modalService);
     this.modalComponent = ScoreFirstYmDetailComponent;
     this.modalComponent = ScoreFirstYmDetailComponent;
@@ -21,15 +21,15 @@ export class ScoreFirstYmComponent extends FramePageComponent implements OnInit
   ngOnInit() {
   ngOnInit() {
   }
   }
 
 
-  showConfrimModal () {
+  showConfrimModal() {
     this.showComponentModal(ScoreYmReportComponent);
     this.showComponentModal(ScoreYmReportComponent);
   }
   }
 
 
   doUploaFile() {
   doUploaFile() {
-    ModalService.showUploadWindow(this.bsService,'./score/ymfirst/upload.htm',{},{
-      uploadTitle:'初试成绩',
+    ModalService.showUploadWindow(this.bsService, './score/ymfirst/upload.htm', {}, {
+      uploadTitle: '初试成绩',
       uploadCallback: this.uploadWithThreadCallback.bind(this),
       uploadCallback: this.uploadWithThreadCallback.bind(this),
-      autoClose:true
+      autoClose: true
     });
     });
   }
   }
 
 
@@ -40,4 +40,18 @@ export class ScoreFirstYmComponent extends FramePageComponent implements OnInit
   decisionLetter() {
   decisionLetter() {
     this.FuncService.ajaxDownload('layout/material/written/wg/decision/letter.htm', {});
     this.FuncService.ajaxDownload('layout/material/written/wg/decision/letter.htm', {});
   }
   }
+
+  downloadDecision(v) {
+    window.open(this.FrameService.getParamValue('EnrolMaterialWebPath') + '/' + v.aspect_image);
+  }
+
+  makeStdDecision(v, flag) {
+    let msg = '确定要生成该考生的处罚决定书吗!';
+    if (flag) {
+      msg = '确定要重新生成该考生的处罚决定书吗?';
+    }
+    this.MsgService.confirmAlert(msg, () => {
+      this.FuncService.ajaxDownload('score/ym/make/decision.htm', { cert_id: v.cert_id, aspect_name: v.aspect_name, batch: v.batch });
+    });
+  }
 }
 }