Skip to content

Y
ydLife
Commit 02bc737d by Sweet Zhang
Options

测试报聘新增字段

parent 0dd13d49
Showing with 72 additions and 36 deletions
src/app/domain/employQuery.ts
......@@ -15,7 +15,13 @@ export class EmployQuery {
public subsystemOwnerId?:number,
public subsystemOwner?:string,
public branchId?:number,
public branch?:string
public branch?:string,
public s3SubordinateSystemName?:string,
public s3TeamLeaderName?:string,
public s2SubordinateSystemName?:string,
public s2TeamLeaderName?:string,
public s1SubordinateSystemName?:string,
public s1TeamLeaderName?:string,
) {
}
}
\ No newline at end of file
src/app/my/application-process/employee-info/employee-info.component.html
......@@ -17,16 +17,32 @@
<div>{{membership?.introducer}}</div>
</div>
<div class="contentItem">
<span>体系名</span>
<div>{{membership?.subsystem}}</div>
<span>分公司</span>
<div>{{membership?.branch}}</div>
</div>
<div class="contentItem">
<span>S3纵队</span>
<div>{{membership?.s3SubordinateSystemName}}</div>
</div>
<div class="contentItem">
<span>纵队负责人</span>
<div>{{membership?.s3TeamLeaderName}}</div>
</div>
<div class="contentItem">
<span>S2体系</span>
<div>{{membership?.s2SubordinateSystemName}}</div>
</div>
<div class="contentItem">
<span>体系负责人</span>
<div>{{membership?.subsystemOwner}}</div>
<div>{{membership?.s2TeamLeaderName}}</div>
</div>
<div class="contentItem">
<span>分公司</span>
<div>{{membership?.branch}}</div>
<span>S1分部</span>
<div>{{membership?.s1SubordinateSystemName}}</div>
</div>
<div class="contentItem">
<span>分部负责人</span>
<div>{{membership?.s1TeamLeaderName}}</div>
</div>
</div>
</div>
......
src/app/my/application-process/employee-info/employee-info.component.scss
......@@ -13,6 +13,7 @@
.content {
padding: 10px 5px;
position: relative;
padding-bottom: 70px;
.contentDetail {
.contentItem {
display: flex;
......
src/app/my/file-upload/file-upload.component.html
......@@ -11,7 +11,7 @@
<ul>
<li *ngFor="let fileUploadItem of fileUploadItemList">
<a href="{{fileUploadItem.filePath}}" download="{{fileUploadItem.itemName}}" target="_blank" *ngIf="!judgmentFile(fileUploadItem.filePath)">
<div>
<div style="overflow-x: hidden; white-space: nowrap;text-overflow: ellipsis;">
<i class="iconfont icon-pdf"></i>
<span title="{{fileUploadItem.itemName}}">{{fileUploadItem.itemName}}</span>
</div>
......@@ -20,7 +20,7 @@
</div>
</a>
<a href="javascript:;" [routerLink]="'/video'" *ngIf="judgmentFile(fileUploadItem.filePath)" (click)="setVideoPath(fileUploadItem.filePath)">
<div>
<div style="overflow-x: hidden; white-space: nowrap;text-overflow: ellipsis;">
<img src="assets/images/videoIcon.png" alt="视频" *ngIf="judgmentFile(fileUploadItem.filePath)" style=" width: 26px;
margin-right: 6px;">
<span title="{{fileUploadItem.itemName}}">{{fileUploadItem.itemName}}</span>
......
src/app/my/file-upload/file-upload.component.ts
......@@ -41,7 +41,7 @@ export class FileUploadComponent implements OnInit {
let filename = picUrl; //文件路径地址
let index1 = filename.lastIndexOf(".");
let index2 = filename.length;
let postf = filename.substring(index1, index2); //获取文bai件后缀名duzhi
let postf = filename.substring(index1, index2).toLowerCase(); //获取文bai件后缀名duzhi
//判断文件后缀名是否等于视频文件的后缀名
if (postf===".avi"||postf===".mp4"||postf===".rmvb"||postf===".mov") {
return true
......
src/app/my/integration-detail/integration-detail.component.html
......@@ -7,14 +7,14 @@
<ul class="dateContent">
<li>
<ListItem
DatePicker
[mode]="'month'"
[(ngModel)]="searchDateFormat"
(onOk)="onOk($event)"
>
{{searchDate}} <i class="iconfont icon-xiangxia" style="margin-left: 10px;"></i>
<ListItem DatePicker [mode]="'month'" [(ngModel)]="searchDateFormat" (onOk)="onOk($event)">
{{searchDateFormat | date:'yyyy-MM'}} <i class="iconfont icon-xiangxia" style="margin-left: 10px;"></i>
</ListItem>
<span> - </span>
<ListItem DatePicker [mode]="'month'" [(ngModel)]="searchDateEndFormat" (onOk)="onOk($event)">
{{searchDateEndFormat | date:'yyyy-MM'}} <i class="iconfont icon-xiangxia" style="margin-left: 10px;"></i>
</ListItem>
</li>
</ul>
......
src/app/my/integration-detail/integration-detail.component.ts
import { Component, OnInit } from '@angular/core';
import { LifeCommonService } from 'src/app/common/life-common.service';
import { MyService } from '../my.service';
@Component({
......@@ -10,12 +11,12 @@ export class IntegrationDetailComponent implements OnInit {
integralGrantInfos:Array<any>;
lists:Array<any>;
status:number = 1;
searchDate:string = '2022年';
searchDateFormat:Date = new Date(2022, 1);
constructor(private myService:MyService) { }
searchDateEndFormat:Date = new Date(2022, 1);
constructor(private myService:MyService,private lifeCommonService:LifeCommonService) { }
ngOnInit() {
this.queryPractitionerIntegralList();
this.queryPractitionerIntegralList(this.lifeCommonService.dateFormat(this.searchDateFormat,'yyyy-MM-01'),this.lifeCommonService.dateFormat(this.searchDateEndFormat,'yyyy-MM-01'));
}
queryLists(status){
this.status = status;
......@@ -29,20 +30,7 @@ export class IntegrationDetailComponent implements OnInit {
})
}
currentDateFormat(date, format: string = 'yyyy-mm'): any {
const pad = (n: number): string => (n < 10 ? `0${n}` : n.toString());
return format
.replace('yyyy', date.getFullYear())
.replace('mm', pad(date.getMonth() + 1))
.replace('dd', pad(date.getDate()))
.replace('HH', pad(date.getHours()))
.replace('MM', pad(date.getMinutes()))
.replace('ss', pad(date.getSeconds()));
}
onOk(result: Date) {
this.searchDate = this.currentDateFormat(result);
this.searchDateFormat = result;
this.queryPractitionerIntegralList(this.searchDate + '-01')
this.queryPractitionerIntegralList(this.lifeCommonService.dateFormat(this.searchDateFormat,'yyyy-MM-01'),this.lifeCommonService.dateFormat(this.searchDateEndFormat,'yyyy-MM-01'));
}
}
src/app/my/integration/integration.component.html
<div class="integrationContainer">
<header>
<div class="left">
<div><strong>{{practitionerIntegrals?.integralCountNumber}}</strong><i class="iconfont icon-zhuyishixiang" [routerLink]="'/integration_rule'"></i></div>
<div><strong>{{practitionerIntegrals?.integralCountNumber ? practitionerIntegrals?.integralCountNumber : 0}}</strong><i class="iconfont icon-zhuyishixiang" [routerLink]="'/integration_rule'"></i></div>
<div style="font-size: 12px;">{{practitionerIntegrals?.integralNumberOld}} 积分有效期至 {{practitionerIntegrals?.effectiveOld}}</div>
</div>
<div class="right">
......
src/app/my/recruiting-detail/recruiting-detail.component.html
......@@ -157,14 +157,14 @@
<span>介绍人</span>
<div (click)="vagueSearch(2)" style="padding-right: 12px;">{{defalutIntroducer}}</div>
</div>
<div class="contentItem">
<!-- <div class="contentItem">
<span>体系名</span>
<div><input type="text" [(ngModel)]="employQuery.subsystem" class="form-control" disabled/></div>
</div>
<div class="contentItem">
<span>体系负责人</span>
<div><input type="text" [(ngModel)]="employQuery.subsystemOwner" class="form-control" disabled/></div>
</div>
</div> -->
<div class="contentItem">
<span>分公司</span>
<div *ngIf="employQuery.mdDropOptionId != 30">
......@@ -178,6 +178,30 @@
</option>
</select>
</div>
<div class="contentItem">
<span>S3纵队</span>
<div>{{employQuery?.s3SubordinateSystemName}}</div>
</div>
<div class="contentItem">
<span>纵队负责人</span>
<div>{{employQuery?.s3TeamLeaderName}}</div>
</div>
<div class="contentItem">
<span>S2体系</span>
<div>{{employQuery?.s2SubordinateSystemName}}</div>
</div>
<div class="contentItem">
<span>体系负责人</span>
<div>{{employQuery?.s2TeamLeaderName}}</div>
</div>
<div class="contentItem">
<span>S1分部</span>
<div>{{employQuery?.s1SubordinateSystemName}}</div>
</div>
<div class="contentItem">
<span>分部负责人</span>
<div>{{employQuery?.s1TeamLeaderName}}</div>
</div>
<!-- <div class="contentItem">
<span>分公司</span>
<div *ngIf="defalutMentor !='请选择辅导人' && defalutMentor != '/'">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment