告知书和决定书

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

@@ -11,8 +11,6 @@
         <a class="dropdown-item" href="#"
            (click)="FuncService.ajaxDownload('frame/report/download.htm', {report_name:'YmFirstScoreExport', report_title :'央美2021校考初试成绩'})">导出初试成绩</a>
         <div class="dropdown-divider"></div>
-        <a class="dropdown-item" href="#" (click)="requestWithThread('./score/ym/make/decision.htm', {}, {confirmMsg:'确定要重新生成所有违规处理决定书吗？'})">生成违规处理决定书</a>
-        <div class="dropdown-divider"></div>
         <a class="dropdown-item" href="#" (click)="requestWithThread('./score/ym/make/review/log.htm', {}, {confirmMsg:'确定要重新生成所有成绩复核日志吗？'})">生成成绩复核日志</a>
       </div>
     </div>
@@ -37,7 +35,6 @@
       <th><span class="table-sort">复核成绩时间</span></th>
       <th><span class="table-sort">复核结论</span></th>
       <th><span class="table-sort">复核答复时间</span></th>
-      <th>决定书</th>
       <th>成绩复核日志</th>
     </tr>
     </thead>
@@ -68,20 +65,6 @@
       <td>
         <span *ngIf="v.check_note"> {{v.recovery_time}}</span>
       </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>
 
       <td>
         <div class="btn-group" dropdown style="margin-top: -2px;"  *ngIf="v.wei_gui=='是'">

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

@@ -8,6 +8,9 @@
       <div *dropdownMenu class="dropdown-menu" role="menu">
         <a class="dropdown-item" href="#" (click)="doUploaFile()">导入违纪考生</a>
         <div class="dropdown-divider"></div>
+        <a class="dropdown-item" href="#" (click)="requestWithThread('./score/ym/make/notice.htm', {}, {confirmMsg:'确定要重新生成所有违规处理告知书吗？'})">生成违规处理告知书</a>
+        <div class="dropdown-divider"></div>
+        <a class="dropdown-item" href="#" (click)="requestWithThread('./score/ym/make/decision.htm', {}, {confirmMsg:'确定要重新生成所有违规处理决定书吗？'})">生成违规处理决定书</a>
       </div>
     </div>
   </div>
@@ -27,6 +30,8 @@
       <th>违规行为</th>
       <th>国家处理办法</th>
       <th>学校处理办法</th>
+      <th>告知书</th>
+      <th>决定书</th>
     </tr>
     </thead>
     <tbody>
@@ -50,6 +55,36 @@
       <td>
         <span *ngIf="v.school_rule" class="text-success" [tooltip]="v.school_rule">学校处理办法</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)="downloadNotice(v)" *ngIf="v.notice_file">下载</a>
+            <div class="dropdown-divider"*ngIf="!v.notice_file"></div>
+            <a class="dropdown-item" href="#" (click)="makeStdNotice(v,false)" *ngIf="!v.notice_file">生成</a>
+            <div class="dropdown-divider"*ngIf="v.notice_file"></div>
+            <a class="dropdown-item" href="#" (click)="makeStdNotice(v,true)"  *ngIf="v.notice_file">重制</a>
+          </div>
+        </div>
+      </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)="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>
     </tbody>
   </table>

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

@@ -32,4 +32,40 @@ export class ScoreYmViolationComponent extends FramePageComponent implements OnI
     this.pager.reload();
   }
 
+   //下载告知书
+   downloadNotice(v) {
+    window.open(this.FrameService.getParamValue('EnrolMaterialWebPath') + '/' + v.notice_file);
+  }
+
+  //生成告知书
+  makeStdNotice(v, flag) {
+    let msg = '确定要生成该考生的处罚告知书吗！';
+    if (flag) {
+      msg = '确定要重新生成该考生的处罚告知书吗？';
+    }
+    this.MsgService.confirmAlert(msg, () => {
+      this.FuncService.ajaxDownload('score/ym/make/notice.htm', { cert_id: v.cert_id, aspect_name: v.aspect_name, batch: v.batch });
+      setTimeout(() => {
+        this.pager.reload();
+      }, 1000);
+    });
+  }
+
+
+  //下载决定书
+  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 });
+    });
+  }
+
 }