Bladeren bron

报考详情

haogh 7 maanden geleden
bovenliggende
commit
958fb9e558

+ 51 - 0
src/app/routes/art/enrol/report/enrol-report-aspect-detail/enrol-report-aspect-detail.component.html

@@ -0,0 +1,51 @@
+<div class="modal-header">
+  <h4 class="modal-title pull-left">考生报考详情</h4>
+</div>
+
+<div class="table-responsive bg-white table-full">
+  <table class="table table-striped table-hover table-bordered">
+    <thead>
+      <tr>
+        <th>考生姓名</th>
+        <th>证号号码</th>
+        <th>高考报名号</th>
+        <th>性别</th>
+        <th>联系电话</th>
+        <th>高考所在省份</th>
+        <th>报考专业</th>
+        <th>是否缴费</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr *ngFor="let v of pager.getRecords();let i=index">
+        <td>{{v.std_name}}</td>
+        <td>{{v.exam_id}}</td>
+        <td>{{v.cert_id}}</td>
+        <td>{{v.std_sex}}</td>
+        <td>{{v.std_mobile}}</td>
+        <td>{{v.province_name}}</td>
+        <td>{{v.aspect_name}}</td>
+        <td [innerHTML]="v.pay_status | frameStatusCustom : ['已缴费','未缴费']"></td>
+      </tr>
+    </tbody>
+  </table>
+  <frame-pager [url]="'./enrol/report/aspect/detail/page.htm'" [showSearch]="false" [pagerLimit]="10"
+    [pagerParams]="{aspect_name: ResponseEntity.aspect_name, pay_status: ResponseEntity.pay_status, std_sex:ResponseEntity.std_sex, province_flag:ResponseEntity.province_flag }"
+    #pager>
+  </frame-pager>
+</div>
+
+<div class="modal-footer">
+  <div>
+    <div class="btn-group mb-1 mr-1" dropdown>
+      <button class="btn dropdown-toggle btn-secondary " type="button" dropdownToggle>导出
+        <span class="caret"></span>
+      </button>
+      <div *dropdownMenu class="dropdown-menu" role="menu">
+        <a class="dropdown-item text-primary" href="#" (click)="exportStd()">导出考生</a>
+        <div class="dropdown-divider"></div>
+      </div>
+    </div>
+  </div>
+  <button class="btn btn-secondary" type="button" (click)="closeWindow()">关闭窗口</button>
+</div>

+ 0 - 0
src/app/routes/art/enrol/report/enrol-report-aspect-detail/enrol-report-aspect-detail.component.scss


+ 34 - 0
src/app/routes/art/enrol/report/enrol-report-aspect-detail/enrol-report-aspect-detail.component.ts

@@ -0,0 +1,34 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal';
+import { FramePager } from 'src/app/core/frame/pager/frame-pager/frame-pager';
+import { FrameDetailComponent } from 'src/app/routes/frame/core/detail/frame.detail';
+
+@Component({
+  selector: 'app-enrol-report-aspect-detail',
+  templateUrl: './enrol-report-aspect-detail.component.html',
+  styleUrls: ['./enrol-report-aspect-detail.component.scss']
+})
+export class EnrolReportAspectDetailComponent  extends FrameDetailComponent implements OnInit {
+
+  @ViewChild('pager', {static: false}) pager: FramePager;
+
+  constructor(bsModalRef: BsModalRef) {
+    super(bsModalRef);
+  }
+
+  ngOnInit(): void {
+  }
+
+  // 导出考生
+  exportStd() {
+    let entity = {
+      aspect_name: this.ResponseEntity.aspect_name,
+      pay_status: this.ResponseEntity.pay_status,
+      std_sex: this.ResponseEntity.std_sex,
+      province_flag: this.ResponseEntity.province_flag,
+      report_name:'StdRegEnrolReport'
+    };
+    this.FuncService.ajaxDownload('frame/report/download.htm', entity);
+  }
+
+}

+ 20 - 20
src/app/routes/art/enrol/report/enrol-report-aspect/enrol-report-aspect.component.html

@@ -49,29 +49,29 @@
     <tr *ngFor="let v of pager.getRecords(); let i = index">
       <td>{{v.aspect_code}}</td>
       <td>{{v.aspect_name}}</td>
-      <td>{{v.enrol_total}}</td>
-      <td>{{v.pay_total}}</td>
-      <td>{{v.man_total}}</td>
-      <td>{{v.women_total}}</td>
-      <td>{{v.province_total}}</td>
-      <td>{{v.outside_total}}</td>
-      <td>{{v.province_man_total}}</td>
-      <td>{{v.province_women_total}}</td>
-      <td>{{v.outside_man_total}}</td>
-      <td>{{v.outside_women_total}}</td>
+      <td><a href="#" (click)="showStudentDetail(v, null,null,null)">{{v.enrol_total}}</a></td>
+      <td><a href="#" (click)="showStudentDetail(v, 'Active',null,null)">{{v.pay_total}}</a></td>
+      <td><a href="#" (click)="showStudentDetail(v, 'Active','男',null)">{{v.man_total}}</a></td>
+      <td><a href="#" (click)="showStudentDetail(v, 'Active','女',null)">{{v.women_total}}</a></td>
+      <td><a href="#" (click)="showStudentDetail(v, 'Active', null,'Active')">{{v.province_total}}</a></td>
+      <td><a href="#" (click)="showStudentDetail(v, 'Active', null,'InActive')">{{v.outside_total}}</a></td>
+      <td><a href="#" (click)="showStudentDetail(v, 'Active', '男','Active')">{{v.province_man_total}}</a></td>
+      <td><a href="#" (click)="showStudentDetail(v, 'Active', '女','Active')">{{v.province_women_total}}</a></td>
+      <td><a href="#" (click)="showStudentDetail(v, 'Active', '男','InActive')">{{v.outside_man_total}}</a></td>
+      <td><a href="#" (click)="showStudentDetail(v, 'Active', '女','InActive')">{{v.outside_women_total}}</a></td>
     </tr>
     <tr>
       <td [colSpan]="2">合计</td>
-      <td>{{pager.getRecords() | frameSum:'enrol_total'}}</td>
-      <td>{{pager.getRecords() | frameSum:'pay_total'}}</td>
-      <td>{{pager.getRecords() | frameSum:'man_total'}}</td>
-      <td>{{pager.getRecords() | frameSum:'women_total'}}</td>
-      <td>{{pager.getRecords() | frameSum:'province_total'}}</td>
-      <td>{{pager.getRecords() | frameSum:'outside_total'}}</td>
-      <td>{{pager.getRecords() | frameSum:'province_man_total'}}</td>
-      <td>{{pager.getRecords() | frameSum:'province_women_total'}}</td>
-      <td>{{pager.getRecords() | frameSum:'outside_man_total'}}</td>
-      <td>{{pager.getRecords() | frameSum:'outside_women_total'}}</td>
+      <td><a href="#" (click)="showStudentDetail(null, null,null,null)">{{pager.getRecords() | frameSum:'enrol_total'}}</a></td>
+      <td><a href="#" (click)="showStudentDetail(null, 'Active',null,null)">{{pager.getRecords() | frameSum:'pay_total'}}</a></td>
+      <td><a href="#" (click)="showStudentDetail(null, 'Active','男',null)">{{pager.getRecords() | frameSum:'man_total'}}</a></td>
+      <td><a href="#" (click)="showStudentDetail(null, 'Active','女',null)">{{pager.getRecords() | frameSum:'women_total'}}</a></td>
+      <td><a href="#" (click)="showStudentDetail(null, 'Active', null,'Active')">{{pager.getRecords() | frameSum:'province_total'}}</a></td>
+      <td><a href="#" (click)="showStudentDetail(null, 'Active', null,'InActive')">{{pager.getRecords() | frameSum:'outside_total'}}</a></td>
+      <td><a href="#" (click)="showStudentDetail(null, 'Active', '男','Active')">{{pager.getRecords() | frameSum:'province_man_total'}}</a></td>
+      <td><a href="#" (click)="showStudentDetail(null, 'Active', '女','Active')">{{pager.getRecords() | frameSum:'province_women_total'}}</a></td>
+      <td><a href="#" (click)="showStudentDetail(null, 'Active', '男','InActive')">{{pager.getRecords() | frameSum:'outside_man_total'}}</a></td>
+      <td><a href="#" (click)="showStudentDetail(null, 'Active', '女','InActive')">{{pager.getRecords() | frameSum:'outside_women_total'}}</a></td>
     </tbody>
   </table>
   <frame-pager [url]="'./enrol/report/aspect.htm'" [pagerLimit]="100" [autoRequest]="false"  #pager></frame-pager>

+ 12 - 0
src/app/routes/art/enrol/report/enrol-report-aspect/enrol-report-aspect.component.ts

@@ -3,6 +3,7 @@ import {ActivatedRoute, Router} from '@angular/router';
 import { BsModalService } from 'ngx-bootstrap/modal';
 import { AjaxService } from '../../../../../core/service/ajax.service';
 import { FramePageComponent } from '../../../../frame/core/page/frame.page';
+import { EnrolReportAspectDetailComponent } from '../enrol-report-aspect-detail/enrol-report-aspect-detail.component';
 
 @Component({
   selector: 'app-enrol-report-aspect',
@@ -20,6 +21,7 @@ export class EnrolReportAspectComponent extends FramePageComponent implements On
     super(modalService);
     this.batchArr = this.FrameService.DictMap['ExamBatchName'];
     this.batch_id = '1';
+    this.modalComponent = EnrolReportAspectDetailComponent;
 
     let categoryTotal = 0;
     AjaxService.requestArray('conf/category/all.htm', {}, (array) => {
@@ -63,4 +65,14 @@ export class EnrolReportAspectComponent extends FramePageComponent implements On
     this.FuncService.ajaxDownload('enrol/report/aspect/download.htm', {batch_id: this.batch_id, category_id: this.category_id});
   }
 
+  showStudentDetail(v, pay_status, sex, province_flag) {
+    if(!v) {
+      v = {};
+    }
+    v.pay_status = pay_status;
+    v.std_sex = sex;
+    v.province_flag = province_flag;
+    this.showComponentModal(EnrolReportAspectDetailComponent, {ResponseEntity: v});
+  }
+
 }

+ 2 - 1
src/app/routes/art/enrol/report/report.art.module.ts

@@ -12,6 +12,7 @@ import { EnrolReportCommonComponent } from './enrol-report-common/enrol-report-c
 import { TicketDownloadReportComponent } from './ticket-download-report/ticket-download-report.component';
 import { EnrolWorksPageComponent } from './enrol-works-page/enrol-works-page.component';
 import { EnrolWorksReportComponent } from './enrol-works-report/enrol-works-report.component';
+import { EnrolReportAspectDetailComponent } from './enrol-report-aspect-detail/enrol-report-aspect-detail.component';
 
 const routes: Routes = [
   {path: 'province', component: EnrolReportPorvinceComponent},
@@ -37,7 +38,7 @@ const routes: Routes = [
   ],
   entryComponents: [EnrolReportPorvinceComponent,VideoAppReportComponent,VideoAppReportStdComponent],
   declarations: [EnrolReportPorvinceComponent,EnrolReportAspectComponent,EnrolReportReexamineComponent,EnrolReportAgentComponent,VideoAppReportComponent,VideoAppReportStdComponent, EnrolReportAppointmentComponent, 
-    EnrolReportCommonComponent, TicketDownloadReportComponent,EnrolWorksReportComponent,EnrolWorksPageComponent],
+    EnrolReportCommonComponent, TicketDownloadReportComponent,EnrolWorksReportComponent,EnrolWorksPageComponent, EnrolReportAspectDetailComponent],
   exports: [
     RouterModule
   ]

+ 1 - 3
src/app/routes/art/layout/material/layout-material-written/layout-material-written.component.html

@@ -80,8 +80,6 @@
               <a class="dropdown-item" href="#" *ngIf="v.room_total > 0"
                  (click)="FuncService.ajaxDownload('layout/material/written/seat.htm', {ly_group_id:v.ly_group_id})">桌贴(无照片) </a>
               <div class="dropdown-divider"></div>
-              <!-- <a class="dropdown-item" href="#" *ngIf="v.room_total > 0"
-                 (click)="FuncService.ajaxDownload('layout/material/written/seatWithImage.htm', {ly_group_id:v.ly_group_id})">桌贴(带照片)</a> -->
               <a class="dropdown-item" href="#" *ngIf="v.room_total > 0"  (click)="goThreadDownload('layout/material/written/seatWithImage.htm',{ly_group_id:v.ly_group_id})">桌贴(带照片)</a>
               <div class="dropdown-divider"></div>
               <a class="dropdown-item" href="#" *ngIf="v.room_total > 0"
@@ -153,7 +151,7 @@
                (click)="FuncService.ajaxDownload('layout/material/written/seat.htm', {ly_group_id:group.ly_group_id})">桌贴(无照片)</a>
             <div class="dropdown-divider"></div>
             <a class="dropdown-item" href="#" *ngIf="group.room_total > 0"
-               (click)="FuncService.ajaxDownload('layout/material/written/seatWithImage.htm', {ly_group_id:group.ly_group_id})">桌贴(带照片)</a>
+               (click)="goThreadDownload('layout/material/written/seatWithImage.htm', {ly_group_id:group.ly_group_id})">桌贴(带照片)</a>
             <div class="dropdown-divider"></div>  <div class="dropdown-divider"></div>
             <a class="dropdown-item" href="#" *ngIf="group.room_total > 0"
                (click)="goThreadDownload('layout/material/written/sign.htm',{ly_group_id:group.ly_group_id})">签字单</a>