Skip to content

iBizEHR
iBizEHR
提交 90ca1f11 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibizdev提交

上级 f6ccaed2
显示空白字符变更
内嵌 并排
正在显示 包含 20303 行增加 和 638 行删除
app_EHRPim/src/components/login/login.less
浏览文件 @ 90ca1f11
.login{ .login{
width: 100vh; width: 100vh;
height: 100vh; height: 100vh;
> img{ // background-image: url('../assets/images/login_bg.jpg');
width: 100vw; background-size: cover;
height: 100vh; background-position: center;
} position: relative;
.login-logo{
position: fixed;
left: 80px;
top: 80px;
}
.login-content{
position: fixed;
left: 10%;
top: 30%;
width: 60%;
>span{
color: #fff;
font-size: 84px;
}
}
&-con{ &-con{
position: fixed; position: fixed;
right: 160px; right: 160px;
top: 50%; top: 50%;
transform: translateY(-60%); transform: translateY(-60%);
width: 300px; width: 300px;
.ivu-card-head {
padding: 14px 6px;
>p{
line-height: 20px;
font-size: 14px;
color: #17233d;
font-weight: 700;
}
}
&-header{ &-header{
font-size: 16px; font-size: 16px;
font-weight: 300; font-weight: 300;
......
app_EHRPim/src/components/login/login.vue
浏览文件 @ 90ca1f11
<template> <template>
<div class='login'> <div class='login'>
<img src="/assets/img/login_bg.png"/>
<div class="login-logo">
<img src ="/assets/img/logo.svg"/>
</div>
<div class="login-content">
<span>{{appTitle}}</span>
</div>
<div class='login-con'> <div class='login-con'>
<card :bordered="false"> <card :bordered="false">
<p slot='title'> <p slot='title'>
...@@ -62,15 +55,7 @@ export default class Login extends Vue { ...@@ -62,15 +55,7 @@ export default class Login extends Vue {
* @type {*} * @type {*}
* @memberof Login * @memberof Login
*/ */
public form: any = { loginname: 'guest', password: 'guest' }; public form: any = { loginname: null, password: null };
/**
* 应用标题
*
* @type {string}
* @memberof Login
*/
public appTitle:string = Environment.AppTitle;
/** /**
* 值规则 * 值规则
...@@ -133,12 +118,8 @@ export default class Login extends Vue { ...@@ -133,12 +118,8 @@ export default class Login extends Vue {
post.then((response: any) => { post.then((response: any) => {
if (response && response.status === 200) { if (response && response.status === 200) {
const data = response.data; const data = response.data;
if(data && data.token){
localStorage.setItem('token', data.token); localStorage.setItem('token', data.token);
}
if(data && data.user){
localStorage.setItem('user', JSON.stringify(data.user)); localStorage.setItem('user', JSON.stringify(data.user));
}
const url: any = this.$route.query.redirect ? this.$route.query.redirect : '*'; const url: any = this.$route.query.redirect ? this.$route.query.redirect : '*';
this.$router.push({ path: url }); this.$router.push({ path: url });
} }
......
app_EHRPim/src/crm-core/components/app-layout/app-layout.less
浏览文件 @ 90ca1f11
...@@ -154,8 +154,7 @@ body { ...@@ -154,8 +154,7 @@ body {
.dashboard{ .dashboard{
padding: 8px; padding: 8px;
} }
.portlet-card, .portlet-container{ .portlet-container{
// .portlet-container{
background: #efefef; background: #efefef;
} }
.portlet-container::after{ .portlet-container::after{
......
app_EHRPim/src/mock/entity/pimeducations/pimeducations.ts
浏览文件 @ 90ca1f11
...@@ -4,12 +4,12 @@ const mock = MockAdapter.getInstance(); ...@@ -4,12 +4,12 @@ const mock = MockAdapter.getInstance();
// 模拟数据 // 模拟数据
const mockDatas: Array<any> = [ const mockDatas: Array<any> = [
{"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 22:28:50","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"1","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息","pimeducationid":"1","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 22:28:50","createman":"示例操作者","pimpersonname":null}, {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 23:36:49","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"1","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息","pimeducationid":"1","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 23:36:49","createman":"示例操作者","pimpersonname":null},
{"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 22:28:50","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"2","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(1)","pimeducationid":"2","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 22:28:50","createman":"示例操作者","pimpersonname":null}, {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 23:36:49","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"2","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(1)","pimeducationid":"2","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 23:36:49","createman":"示例操作者","pimpersonname":null},
{"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 22:28:50","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"3","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(2)","pimeducationid":"3","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 22:28:50","createman":"示例操作者","pimpersonname":null}, {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 23:36:49","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"3","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(2)","pimeducationid":"3","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 23:36:49","createman":"示例操作者","pimpersonname":null},
{"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 22:28:50","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"4","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(3)","pimeducationid":"4","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 22:28:50","createman":"示例操作者","pimpersonname":null}, {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 23:36:49","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"4","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(3)","pimeducationid":"4","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 23:36:49","createman":"示例操作者","pimpersonname":null},
{"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 22:28:50","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"5","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(4)","pimeducationid":"5","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 22:28:50","createman":"示例操作者","pimpersonname":null}, {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 23:36:49","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"5","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(4)","pimeducationid":"5","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 23:36:49","createman":"示例操作者","pimpersonname":null},
{"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 22:28:50","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"6","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(5)","pimeducationid":"6","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 22:28:50","createman":"示例操作者","pimpersonname":null} {"sxzy":null,"jlczz":null,"ygbh":null,"ormorgsectorid":null,"bz":null,"reason":null,"xl":null,"xkml":null,"jymc":null,"jssj":null,"ormorgid":null,"bdwgznx":null,"createdate":"2020-05-13 23:36:49","enable":1,"updateman":"示例操作者","zjxtgznx":null,"srfkey":"6","gznx":null,"cjgzsj":null,"qssj":null,"fj":null,"pimeducationname":"教育信息(5)","pimeducationid":"6","orgid":null,"bjgznx":null,"xllx":null,"spstate":null,"jlss":null,"byyx":null,"orgsectorid":null,"tozjdate":null,"btz":null,"pimpersonid":null,"sfdyxl":null,"xxxz":null,"xlcx":null,"sfzgxl":null,"jlspzt":null,"xwz":null,"degree":null,"jlglbh":null,"dbdwsj":null,"dzjbjsj":null,"updatedate":"2020-05-13 23:36:49","createman":"示例操作者","pimpersonname":null}
]; ];
......
app_EHRPim/src/service/pimarchives/pimarchives-service-base.ts
浏览文件 @ 90ca1f11
...@@ -85,9 +85,9 @@ export default class PIMARCHIVESServiceBase extends EntityService { ...@@ -85,9 +85,9 @@ export default class PIMARCHIVESServiceBase extends EntityService {
} }
let res:any = await Http.getInstance().get(`/pimarchives/getdraft`,isloading); let res:any = await Http.getInstance().get(`/pimarchives/getdraft`,isloading);
res.data.pimarchives = data.pimarchives; res.data.pimarchives = data.pimarchives;
this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesrecords',JSON.stringify(res.data.pimarchivesrecords));
this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesloanandreturns',JSON.stringify(res.data.pimarchivesloanandreturns)); this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesloanandreturns',JSON.stringify(res.data.pimarchivesloanandreturns));
this.tempStorage.setItem(context.srfsessionkey+'_pimarchiveschanges',JSON.stringify(res.data.pimarchiveschanges)); this.tempStorage.setItem(context.srfsessionkey+'_pimarchiveschanges',JSON.stringify(res.data.pimarchiveschanges));
this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesrecords',JSON.stringify(res.data.pimarchivesrecords));
return res; return res;
} }
...@@ -105,6 +105,21 @@ export default class PIMARCHIVESServiceBase extends EntityService { ...@@ -105,6 +105,21 @@ export default class PIMARCHIVESServiceBase extends EntityService {
return Http.getInstance().post(`/pimpeople/${context.pimperson}/pimarchives/${context.pimarchives}/save`,data,isloading); return Http.getInstance().post(`/pimpeople/${context.pimperson}/pimarchives/${context.pimarchives}/save`,data,isloading);
} }
let masterData:any = {}; let masterData:any = {};
let pimarchivesrecordsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords'),'undefined')){
pimarchivesrecordsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords') as any);
if(pimarchivesrecordsData && pimarchivesrecordsData.length && pimarchivesrecordsData.length > 0){
pimarchivesrecordsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimarchivesrecordid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimarchivesrecords = pimarchivesrecordsData;
let pimarchivesloanandreturnsData:any = []; let pimarchivesloanandreturnsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesloanandreturns'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesloanandreturns'),'undefined')){
pimarchivesloanandreturnsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesloanandreturns') as any); pimarchivesloanandreturnsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesloanandreturns') as any);
...@@ -135,26 +150,11 @@ export default class PIMARCHIVESServiceBase extends EntityService { ...@@ -135,26 +150,11 @@ export default class PIMARCHIVESServiceBase extends EntityService {
} }
} }
masterData.pimarchiveschanges = pimarchiveschangesData; masterData.pimarchiveschanges = pimarchiveschangesData;
let pimarchivesrecordsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords'),'undefined')){
pimarchivesrecordsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords') as any);
if(pimarchivesrecordsData && pimarchivesrecordsData.length && pimarchivesrecordsData.length > 0){
pimarchivesrecordsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimarchivesrecordid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimarchivesrecords = pimarchivesrecordsData;
Object.assign(data,masterData); Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/pimarchives/${context.pimarchives}/save`,data,isloading); let res:any = await Http.getInstance().post(`/pimarchives/${context.pimarchives}/save`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesrecords',JSON.stringify(res.data.pimarchivesrecords));
this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesloanandreturns',JSON.stringify(res.data.pimarchivesloanandreturns)); this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesloanandreturns',JSON.stringify(res.data.pimarchivesloanandreturns));
this.tempStorage.setItem(context.srfsessionkey+'_pimarchiveschanges',JSON.stringify(res.data.pimarchiveschanges)); this.tempStorage.setItem(context.srfsessionkey+'_pimarchiveschanges',JSON.stringify(res.data.pimarchiveschanges));
this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesrecords',JSON.stringify(res.data.pimarchivesrecords));
return res; return res;
} }
...@@ -172,9 +172,9 @@ export default class PIMARCHIVESServiceBase extends EntityService { ...@@ -172,9 +172,9 @@ export default class PIMARCHIVESServiceBase extends EntityService {
return Http.getInstance().get(`/pimpeople/${context.pimperson}/pimarchives/${context.pimarchives}`,isloading); return Http.getInstance().get(`/pimpeople/${context.pimperson}/pimarchives/${context.pimarchives}`,isloading);
} }
let res:any = await Http.getInstance().get(`/pimarchives/${context.pimarchives}`,isloading); let res:any = await Http.getInstance().get(`/pimarchives/${context.pimarchives}`,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesrecords',JSON.stringify(res.data.pimarchivesrecords));
this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesloanandreturns',JSON.stringify(res.data.pimarchivesloanandreturns)); this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesloanandreturns',JSON.stringify(res.data.pimarchivesloanandreturns));
this.tempStorage.setItem(context.srfsessionkey+'_pimarchiveschanges',JSON.stringify(res.data.pimarchiveschanges)); this.tempStorage.setItem(context.srfsessionkey+'_pimarchiveschanges',JSON.stringify(res.data.pimarchiveschanges));
this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesrecords',JSON.stringify(res.data.pimarchivesrecords));
return res; return res;
} }
...@@ -193,6 +193,21 @@ export default class PIMARCHIVESServiceBase extends EntityService { ...@@ -193,6 +193,21 @@ export default class PIMARCHIVESServiceBase extends EntityService {
return Http.getInstance().put(`/pimpeople/${context.pimperson}/pimarchives/${context.pimarchives}`,data,isloading); return Http.getInstance().put(`/pimpeople/${context.pimperson}/pimarchives/${context.pimarchives}`,data,isloading);
} }
let masterData:any = {}; let masterData:any = {};
let pimarchivesrecordsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords'),'undefined')){
pimarchivesrecordsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords') as any);
if(pimarchivesrecordsData && pimarchivesrecordsData.length && pimarchivesrecordsData.length > 0){
pimarchivesrecordsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimarchivesrecordid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimarchivesrecords = pimarchivesrecordsData;
let pimarchivesloanandreturnsData:any = []; let pimarchivesloanandreturnsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesloanandreturns'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesloanandreturns'),'undefined')){
pimarchivesloanandreturnsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesloanandreturns') as any); pimarchivesloanandreturnsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesloanandreturns') as any);
...@@ -223,26 +238,11 @@ export default class PIMARCHIVESServiceBase extends EntityService { ...@@ -223,26 +238,11 @@ export default class PIMARCHIVESServiceBase extends EntityService {
} }
} }
masterData.pimarchiveschanges = pimarchiveschangesData; masterData.pimarchiveschanges = pimarchiveschangesData;
let pimarchivesrecordsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords'),'undefined')){
pimarchivesrecordsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords') as any);
if(pimarchivesrecordsData && pimarchivesrecordsData.length && pimarchivesrecordsData.length > 0){
pimarchivesrecordsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimarchivesrecordid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimarchivesrecords = pimarchivesrecordsData;
Object.assign(data,masterData); Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/pimarchives/${context.pimarchives}`,data,isloading); let res:any = await Http.getInstance().put(`/pimarchives/${context.pimarchives}`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesrecords',JSON.stringify(res.data.pimarchivesrecords));
this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesloanandreturns',JSON.stringify(res.data.pimarchivesloanandreturns)); this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesloanandreturns',JSON.stringify(res.data.pimarchivesloanandreturns));
this.tempStorage.setItem(context.srfsessionkey+'_pimarchiveschanges',JSON.stringify(res.data.pimarchiveschanges)); this.tempStorage.setItem(context.srfsessionkey+'_pimarchiveschanges',JSON.stringify(res.data.pimarchiveschanges));
this.tempStorage.setItem(context.srfsessionkey+'_pimarchivesrecords',JSON.stringify(res.data.pimarchivesrecords));
return res; return res;
} }
...@@ -282,6 +282,21 @@ export default class PIMARCHIVESServiceBase extends EntityService { ...@@ -282,6 +282,21 @@ export default class PIMARCHIVESServiceBase extends EntityService {
return Http.getInstance().post(`/pimpeople/${context.pimperson}/pimarchives`,data,isloading); return Http.getInstance().post(`/pimpeople/${context.pimperson}/pimarchives`,data,isloading);
} }
let masterData:any = {}; let masterData:any = {};
let pimarchivesrecordsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords'),'undefined')){
pimarchivesrecordsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords') as any);
if(pimarchivesrecordsData && pimarchivesrecordsData.length && pimarchivesrecordsData.length > 0){
pimarchivesrecordsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimarchivesrecordid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimarchivesrecords = pimarchivesrecordsData;
let pimarchivesloanandreturnsData:any = []; let pimarchivesloanandreturnsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesloanandreturns'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesloanandreturns'),'undefined')){
pimarchivesloanandreturnsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesloanandreturns') as any); pimarchivesloanandreturnsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesloanandreturns') as any);
...@@ -312,21 +327,6 @@ export default class PIMARCHIVESServiceBase extends EntityService { ...@@ -312,21 +327,6 @@ export default class PIMARCHIVESServiceBase extends EntityService {
} }
} }
masterData.pimarchiveschanges = pimarchiveschangesData; masterData.pimarchiveschanges = pimarchiveschangesData;
let pimarchivesrecordsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords'),'undefined')){
pimarchivesrecordsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchivesrecords') as any);
if(pimarchivesrecordsData && pimarchivesrecordsData.length && pimarchivesrecordsData.length > 0){
pimarchivesrecordsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimarchivesrecordid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimarchivesrecords = pimarchivesrecordsData;
Object.assign(data,masterData); Object.assign(data,masterData);
if(!data.srffrontuf || data.srffrontuf !== "1"){ if(!data.srffrontuf || data.srffrontuf !== "1"){
data[this.APPDEKEY] = null; data[this.APPDEKEY] = null;
...@@ -336,9 +336,9 @@ export default class PIMARCHIVESServiceBase extends EntityService { ...@@ -336,9 +336,9 @@ export default class PIMARCHIVESServiceBase extends EntityService {
} }
let tempContext:any = JSON.parse(JSON.stringify(context)); let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/pimarchives`,data,isloading); let res:any = await Http.getInstance().post(`/pimarchives`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimarchivesrecords',JSON.stringify(res.data.pimarchivesrecords));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimarchivesloanandreturns',JSON.stringify(res.data.pimarchivesloanandreturns)); this.tempStorage.setItem(tempContext.srfsessionkey+'_pimarchivesloanandreturns',JSON.stringify(res.data.pimarchivesloanandreturns));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimarchiveschanges',JSON.stringify(res.data.pimarchiveschanges)); this.tempStorage.setItem(tempContext.srfsessionkey+'_pimarchiveschanges',JSON.stringify(res.data.pimarchiveschanges));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimarchivesrecords',JSON.stringify(res.data.pimarchivesrecords));
return res; return res;
} }
......
app_EHRPim/src/service/pimperson/pimperson-service-base.ts
浏览文件 @ 90ca1f11
...@@ -80,36 +80,21 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -80,36 +80,21 @@ export default class PIMPERSONServiceBase extends EntityService {
} }
} }
masterData.attendancemreportmxes = attendancemreportmxesData; masterData.attendancemreportmxes = attendancemreportmxesData;
let pimeducationsData:any = []; let pimdistirbutionsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions'),'undefined')){
pimeducationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations') as any); pimdistirbutionsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions') as any);
if(pimeducationsData && pimeducationsData.length && pimeducationsData.length > 0){ if(pimdistirbutionsData && pimdistirbutionsData.length && pimdistirbutionsData.length > 0){
pimeducationsData.forEach((item:any) => { pimdistirbutionsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimeducationid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimeducations = pimeducationsData;
let pimpersonchangesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges'),'undefined')){
pimpersonchangesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges') as any);
if(pimpersonchangesData && pimpersonchangesData.length && pimpersonchangesData.length > 0){
pimpersonchangesData.forEach((item:any) => {
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.pimpersonchangeid = null; item.pimdistirbutionid = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
}); });
} }
} }
masterData.pimpersonchanges = pimpersonchangesData; masterData.pimdistirbutions = pimdistirbutionsData;
let pimtitlesData:any = []; let pimtitlesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimtitles'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimtitles'),'undefined')){
pimtitlesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimtitles') as any); pimtitlesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimtitles') as any);
...@@ -125,36 +110,6 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -125,36 +110,6 @@ export default class PIMPERSONServiceBase extends EntityService {
} }
} }
masterData.pimtitles = pimtitlesData; masterData.pimtitles = pimtitlesData;
let pimpersonabilitiesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities'),'undefined')){
pimpersonabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities') as any);
if(pimpersonabilitiesData && pimpersonabilitiesData.length && pimpersonabilitiesData.length > 0){
pimpersonabilitiesData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimpersonabilityid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimpersonabilities = pimpersonabilitiesData;
let pimexitandentriesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries'),'undefined')){
pimexitandentriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries') as any);
if(pimexitandentriesData && pimexitandentriesData.length && pimexitandentriesData.length > 0){
pimexitandentriesData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimexitandentryid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimexitandentries = pimexitandentriesData;
let pimfaminfosData:any = []; let pimfaminfosData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimfaminfos'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimfaminfos'),'undefined')){
pimfaminfosData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimfaminfos') as any); pimfaminfosData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimfaminfos') as any);
...@@ -170,36 +125,21 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -170,36 +125,21 @@ export default class PIMPERSONServiceBase extends EntityService {
} }
} }
masterData.pimfaminfos = pimfaminfosData; masterData.pimfaminfos = pimfaminfosData;
let pimdistirbutionsData:any = []; let pimresearchfindingsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings'),'undefined')){
pimdistirbutionsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions') as any); pimresearchfindingsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings') as any);
if(pimdistirbutionsData && pimdistirbutionsData.length && pimdistirbutionsData.length > 0){ if(pimresearchfindingsData && pimresearchfindingsData.length && pimresearchfindingsData.length > 0){
pimdistirbutionsData.forEach((item:any) => { pimresearchfindingsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimdistirbutionid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimdistirbutions = pimdistirbutionsData;
let pimarmycadresData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres'),'undefined')){
pimarmycadresData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres') as any);
if(pimarmycadresData && pimarmycadresData.length && pimarmycadresData.length > 0){
pimarmycadresData.forEach((item:any) => {
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.pimarmycadresid = null; item.pimresearchfindingsid = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
}); });
} }
} }
masterData.pimarmycadres = pimarmycadresData; masterData.pimresearchfindings = pimresearchfindingsData;
let pimworkhistoriesData:any = []; let pimworkhistoriesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimworkhistories'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimworkhistories'),'undefined')){
pimworkhistoriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimworkhistories') as any); pimworkhistoriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimworkhistories') as any);
...@@ -215,36 +155,21 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -215,36 +155,21 @@ export default class PIMPERSONServiceBase extends EntityService {
} }
} }
masterData.pimworkhistories = pimworkhistoriesData; masterData.pimworkhistories = pimworkhistoriesData;
let pimpatentsData:any = []; let pimvocationalsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals'),'undefined')){
pimpatentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents') as any); pimvocationalsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals') as any);
if(pimpatentsData && pimpatentsData.length && pimpatentsData.length > 0){ if(pimvocationalsData && pimvocationalsData.length && pimvocationalsData.length > 0){
pimpatentsData.forEach((item:any) => { pimvocationalsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimpatentid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimpatents = pimpatentsData;
let pimvacationsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations'),'undefined')){
pimvacationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations') as any);
if(pimvacationsData && pimvacationsData.length && pimvacationsData.length > 0){
pimvacationsData.forEach((item:any) => {
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.pimvacationid = null; item.pimvocationalid = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
}); });
} }
} }
masterData.pimvacations = pimvacationsData; masterData.pimvocationals = pimvocationalsData;
let pimarchivesData:any = []; let pimarchivesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchives'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchives'),'undefined')){
pimarchivesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchives') as any); pimarchivesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchives') as any);
...@@ -305,21 +230,36 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -305,21 +230,36 @@ export default class PIMPERSONServiceBase extends EntityService {
} }
} }
masterData.pimpapers = pimpapersData; masterData.pimpapers = pimpapersData;
let pimresearchfindingsData:any = []; let pimpersonchangesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges'),'undefined')){
pimresearchfindingsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings') as any); pimpersonchangesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges') as any);
if(pimresearchfindingsData && pimresearchfindingsData.length && pimresearchfindingsData.length > 0){ if(pimpersonchangesData && pimpersonchangesData.length && pimpersonchangesData.length > 0){
pimresearchfindingsData.forEach((item:any) => { pimpersonchangesData.forEach((item:any) => {
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.pimresearchfindingsid = null; item.pimpersonchangeid = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
}); });
} }
} }
masterData.pimresearchfindings = pimresearchfindingsData; masterData.pimpersonchanges = pimpersonchangesData;
let pimexitandentriesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries'),'undefined')){
pimexitandentriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries') as any);
if(pimexitandentriesData && pimexitandentriesData.length && pimexitandentriesData.length > 0){
pimexitandentriesData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimexitandentryid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimexitandentries = pimexitandentriesData;
let pimrewardpunishmentsData:any = []; let pimrewardpunishmentsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimrewardpunishments'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimrewardpunishments'),'undefined')){
pimrewardpunishmentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimrewardpunishments') as any); pimrewardpunishmentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimrewardpunishments') as any);
...@@ -335,36 +275,36 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -335,36 +275,36 @@ export default class PIMPERSONServiceBase extends EntityService {
} }
} }
masterData.pimrewardpunishments = pimrewardpunishmentsData; masterData.pimrewardpunishments = pimrewardpunishmentsData;
let pimvocationalsData:any = []; let pimarmycadresData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres'),'undefined')){
pimvocationalsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals') as any); pimarmycadresData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres') as any);
if(pimvocationalsData && pimvocationalsData.length && pimvocationalsData.length > 0){ if(pimarmycadresData && pimarmycadresData.length && pimarmycadresData.length > 0){
pimvocationalsData.forEach((item:any) => { pimarmycadresData.forEach((item:any) => {
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.pimvocationalid = null; item.pimarmycadresid = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
}); });
} }
} }
masterData.pimvocationals = pimvocationalsData; masterData.pimarmycadres = pimarmycadresData;
let pimlanguageabilitiesData:any = []; let pimpatentsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents'),'undefined')){
pimlanguageabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities') as any); pimpatentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents') as any);
if(pimlanguageabilitiesData && pimlanguageabilitiesData.length && pimlanguageabilitiesData.length > 0){ if(pimpatentsData && pimpatentsData.length && pimpatentsData.length > 0){
pimlanguageabilitiesData.forEach((item:any) => { pimpatentsData.forEach((item:any) => {
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.pimlanguageabilityid = null; item.pimpatentid = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
}); });
} }
} }
masterData.pimlanguageabilities = pimlanguageabilitiesData; masterData.pimpatents = pimpatentsData;
let pimcontractsData:any = []; let pimcontractsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimcontracts'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimcontracts'),'undefined')){
pimcontractsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimcontracts') as any); pimcontractsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimcontracts') as any);
...@@ -380,29 +320,89 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -380,29 +320,89 @@ export default class PIMPERSONServiceBase extends EntityService {
} }
} }
masterData.pimcontracts = pimcontractsData; masterData.pimcontracts = pimcontractsData;
let pimeducationsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations'),'undefined')){
pimeducationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations') as any);
if(pimeducationsData && pimeducationsData.length && pimeducationsData.length > 0){
pimeducationsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimeducationid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimeducations = pimeducationsData;
let pimvacationsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations'),'undefined')){
pimvacationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations') as any);
if(pimvacationsData && pimvacationsData.length && pimvacationsData.length > 0){
pimvacationsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimvacationid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimvacations = pimvacationsData;
let pimlanguageabilitiesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities'),'undefined')){
pimlanguageabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities') as any);
if(pimlanguageabilitiesData && pimlanguageabilitiesData.length && pimlanguageabilitiesData.length > 0){
pimlanguageabilitiesData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimlanguageabilityid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimlanguageabilities = pimlanguageabilitiesData;
let pimpersonabilitiesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities'),'undefined')){
pimpersonabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities') as any);
if(pimpersonabilitiesData && pimpersonabilitiesData.length && pimpersonabilitiesData.length > 0){
pimpersonabilitiesData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimpersonabilityid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimpersonabilities = pimpersonabilitiesData;
Object.assign(data,masterData); Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/pimpeople/${context.pimperson}`,data,isloading); let res:any = await Http.getInstance().put(`/pimpeople/${context.pimperson}`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_attendancemreportmxes',JSON.stringify(res.data.attendancemreportmxes)); this.tempStorage.setItem(context.srfsessionkey+'_attendancemreportmxes',JSON.stringify(res.data.attendancemreportmxes));
this.tempStorage.setItem(context.srfsessionkey+'_pimeducations',JSON.stringify(res.data.pimeducations)); this.tempStorage.setItem(context.srfsessionkey+'_pimdistirbutions',JSON.stringify(res.data.pimdistirbutions));
this.tempStorage.setItem(context.srfsessionkey+'_pimpersonchanges',JSON.stringify(res.data.pimpersonchanges));
this.tempStorage.setItem(context.srfsessionkey+'_pimtitles',JSON.stringify(res.data.pimtitles)); this.tempStorage.setItem(context.srfsessionkey+'_pimtitles',JSON.stringify(res.data.pimtitles));
this.tempStorage.setItem(context.srfsessionkey+'_pimpersonabilities',JSON.stringify(res.data.pimpersonabilities));
this.tempStorage.setItem(context.srfsessionkey+'_pimexitandentries',JSON.stringify(res.data.pimexitandentries));
this.tempStorage.setItem(context.srfsessionkey+'_pimfaminfos',JSON.stringify(res.data.pimfaminfos)); this.tempStorage.setItem(context.srfsessionkey+'_pimfaminfos',JSON.stringify(res.data.pimfaminfos));
this.tempStorage.setItem(context.srfsessionkey+'_pimdistirbutions',JSON.stringify(res.data.pimdistirbutions)); this.tempStorage.setItem(context.srfsessionkey+'_pimresearchfindings',JSON.stringify(res.data.pimresearchfindings));
this.tempStorage.setItem(context.srfsessionkey+'_pimarmycadres',JSON.stringify(res.data.pimarmycadres));
this.tempStorage.setItem(context.srfsessionkey+'_pimworkhistories',JSON.stringify(res.data.pimworkhistories)); this.tempStorage.setItem(context.srfsessionkey+'_pimworkhistories',JSON.stringify(res.data.pimworkhistories));
this.tempStorage.setItem(context.srfsessionkey+'_pimpatents',JSON.stringify(res.data.pimpatents)); this.tempStorage.setItem(context.srfsessionkey+'_pimvocationals',JSON.stringify(res.data.pimvocationals));
this.tempStorage.setItem(context.srfsessionkey+'_pimvacations',JSON.stringify(res.data.pimvacations));
this.tempStorage.setItem(context.srfsessionkey+'_pimarchives',JSON.stringify(res.data.pimarchives)); this.tempStorage.setItem(context.srfsessionkey+'_pimarchives',JSON.stringify(res.data.pimarchives));
this.tempStorage.setItem(context.srfsessionkey+'_trmtrianpeople',JSON.stringify(res.data.trmtrianpeople)); this.tempStorage.setItem(context.srfsessionkey+'_trmtrianpeople',JSON.stringify(res.data.trmtrianpeople));
this.tempStorage.setItem(context.srfsessionkey+'_pimachievements',JSON.stringify(res.data.pimachievements)); this.tempStorage.setItem(context.srfsessionkey+'_pimachievements',JSON.stringify(res.data.pimachievements));
this.tempStorage.setItem(context.srfsessionkey+'_pimpapers',JSON.stringify(res.data.pimpapers)); this.tempStorage.setItem(context.srfsessionkey+'_pimpapers',JSON.stringify(res.data.pimpapers));
this.tempStorage.setItem(context.srfsessionkey+'_pimresearchfindings',JSON.stringify(res.data.pimresearchfindings)); this.tempStorage.setItem(context.srfsessionkey+'_pimpersonchanges',JSON.stringify(res.data.pimpersonchanges));
this.tempStorage.setItem(context.srfsessionkey+'_pimexitandentries',JSON.stringify(res.data.pimexitandentries));
this.tempStorage.setItem(context.srfsessionkey+'_pimrewardpunishments',JSON.stringify(res.data.pimrewardpunishments)); this.tempStorage.setItem(context.srfsessionkey+'_pimrewardpunishments',JSON.stringify(res.data.pimrewardpunishments));
this.tempStorage.setItem(context.srfsessionkey+'_pimvocationals',JSON.stringify(res.data.pimvocationals)); this.tempStorage.setItem(context.srfsessionkey+'_pimarmycadres',JSON.stringify(res.data.pimarmycadres));
this.tempStorage.setItem(context.srfsessionkey+'_pimlanguageabilities',JSON.stringify(res.data.pimlanguageabilities)); this.tempStorage.setItem(context.srfsessionkey+'_pimpatents',JSON.stringify(res.data.pimpatents));
this.tempStorage.setItem(context.srfsessionkey+'_pimcontracts',JSON.stringify(res.data.pimcontracts)); this.tempStorage.setItem(context.srfsessionkey+'_pimcontracts',JSON.stringify(res.data.pimcontracts));
this.tempStorage.setItem(context.srfsessionkey+'_pimeducations',JSON.stringify(res.data.pimeducations));
this.tempStorage.setItem(context.srfsessionkey+'_pimvacations',JSON.stringify(res.data.pimvacations));
this.tempStorage.setItem(context.srfsessionkey+'_pimlanguageabilities',JSON.stringify(res.data.pimlanguageabilities));
this.tempStorage.setItem(context.srfsessionkey+'_pimpersonabilities',JSON.stringify(res.data.pimpersonabilities));
return res; return res;
} }
...@@ -444,26 +444,26 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -444,26 +444,26 @@ export default class PIMPERSONServiceBase extends EntityService {
public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/pimpeople/${context.pimperson}`,isloading); let res:any = await Http.getInstance().get(`/pimpeople/${context.pimperson}`,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_attendancemreportmxes',JSON.stringify(res.data.attendancemreportmxes)); this.tempStorage.setItem(context.srfsessionkey+'_attendancemreportmxes',JSON.stringify(res.data.attendancemreportmxes));
this.tempStorage.setItem(context.srfsessionkey+'_pimeducations',JSON.stringify(res.data.pimeducations)); this.tempStorage.setItem(context.srfsessionkey+'_pimdistirbutions',JSON.stringify(res.data.pimdistirbutions));
this.tempStorage.setItem(context.srfsessionkey+'_pimpersonchanges',JSON.stringify(res.data.pimpersonchanges));
this.tempStorage.setItem(context.srfsessionkey+'_pimtitles',JSON.stringify(res.data.pimtitles)); this.tempStorage.setItem(context.srfsessionkey+'_pimtitles',JSON.stringify(res.data.pimtitles));
this.tempStorage.setItem(context.srfsessionkey+'_pimpersonabilities',JSON.stringify(res.data.pimpersonabilities));
this.tempStorage.setItem(context.srfsessionkey+'_pimexitandentries',JSON.stringify(res.data.pimexitandentries));
this.tempStorage.setItem(context.srfsessionkey+'_pimfaminfos',JSON.stringify(res.data.pimfaminfos)); this.tempStorage.setItem(context.srfsessionkey+'_pimfaminfos',JSON.stringify(res.data.pimfaminfos));
this.tempStorage.setItem(context.srfsessionkey+'_pimdistirbutions',JSON.stringify(res.data.pimdistirbutions)); this.tempStorage.setItem(context.srfsessionkey+'_pimresearchfindings',JSON.stringify(res.data.pimresearchfindings));
this.tempStorage.setItem(context.srfsessionkey+'_pimarmycadres',JSON.stringify(res.data.pimarmycadres));
this.tempStorage.setItem(context.srfsessionkey+'_pimworkhistories',JSON.stringify(res.data.pimworkhistories)); this.tempStorage.setItem(context.srfsessionkey+'_pimworkhistories',JSON.stringify(res.data.pimworkhistories));
this.tempStorage.setItem(context.srfsessionkey+'_pimpatents',JSON.stringify(res.data.pimpatents)); this.tempStorage.setItem(context.srfsessionkey+'_pimvocationals',JSON.stringify(res.data.pimvocationals));
this.tempStorage.setItem(context.srfsessionkey+'_pimvacations',JSON.stringify(res.data.pimvacations));
this.tempStorage.setItem(context.srfsessionkey+'_pimarchives',JSON.stringify(res.data.pimarchives)); this.tempStorage.setItem(context.srfsessionkey+'_pimarchives',JSON.stringify(res.data.pimarchives));
this.tempStorage.setItem(context.srfsessionkey+'_trmtrianpeople',JSON.stringify(res.data.trmtrianpeople)); this.tempStorage.setItem(context.srfsessionkey+'_trmtrianpeople',JSON.stringify(res.data.trmtrianpeople));
this.tempStorage.setItem(context.srfsessionkey+'_pimachievements',JSON.stringify(res.data.pimachievements)); this.tempStorage.setItem(context.srfsessionkey+'_pimachievements',JSON.stringify(res.data.pimachievements));
this.tempStorage.setItem(context.srfsessionkey+'_pimpapers',JSON.stringify(res.data.pimpapers)); this.tempStorage.setItem(context.srfsessionkey+'_pimpapers',JSON.stringify(res.data.pimpapers));
this.tempStorage.setItem(context.srfsessionkey+'_pimresearchfindings',JSON.stringify(res.data.pimresearchfindings)); this.tempStorage.setItem(context.srfsessionkey+'_pimpersonchanges',JSON.stringify(res.data.pimpersonchanges));
this.tempStorage.setItem(context.srfsessionkey+'_pimexitandentries',JSON.stringify(res.data.pimexitandentries));
this.tempStorage.setItem(context.srfsessionkey+'_pimrewardpunishments',JSON.stringify(res.data.pimrewardpunishments)); this.tempStorage.setItem(context.srfsessionkey+'_pimrewardpunishments',JSON.stringify(res.data.pimrewardpunishments));
this.tempStorage.setItem(context.srfsessionkey+'_pimvocationals',JSON.stringify(res.data.pimvocationals)); this.tempStorage.setItem(context.srfsessionkey+'_pimarmycadres',JSON.stringify(res.data.pimarmycadres));
this.tempStorage.setItem(context.srfsessionkey+'_pimlanguageabilities',JSON.stringify(res.data.pimlanguageabilities)); this.tempStorage.setItem(context.srfsessionkey+'_pimpatents',JSON.stringify(res.data.pimpatents));
this.tempStorage.setItem(context.srfsessionkey+'_pimcontracts',JSON.stringify(res.data.pimcontracts)); this.tempStorage.setItem(context.srfsessionkey+'_pimcontracts',JSON.stringify(res.data.pimcontracts));
this.tempStorage.setItem(context.srfsessionkey+'_pimeducations',JSON.stringify(res.data.pimeducations));
this.tempStorage.setItem(context.srfsessionkey+'_pimvacations',JSON.stringify(res.data.pimvacations));
this.tempStorage.setItem(context.srfsessionkey+'_pimlanguageabilities',JSON.stringify(res.data.pimlanguageabilities));
this.tempStorage.setItem(context.srfsessionkey+'_pimpersonabilities',JSON.stringify(res.data.pimpersonabilities));
return res; return res;
} }
...@@ -520,36 +520,21 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -520,36 +520,21 @@ export default class PIMPERSONServiceBase extends EntityService {
} }
} }
masterData.attendancemreportmxes = attendancemreportmxesData; masterData.attendancemreportmxes = attendancemreportmxesData;
let pimeducationsData:any = []; let pimdistirbutionsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions'),'undefined')){
pimeducationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations') as any); pimdistirbutionsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions') as any);
if(pimeducationsData && pimeducationsData.length && pimeducationsData.length > 0){ if(pimdistirbutionsData && pimdistirbutionsData.length && pimdistirbutionsData.length > 0){
pimeducationsData.forEach((item:any) => { pimdistirbutionsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimeducationid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimeducations = pimeducationsData;
let pimpersonchangesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges'),'undefined')){
pimpersonchangesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges') as any);
if(pimpersonchangesData && pimpersonchangesData.length && pimpersonchangesData.length > 0){
pimpersonchangesData.forEach((item:any) => {
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.pimpersonchangeid = null; item.pimdistirbutionid = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
}); });
} }
} }
masterData.pimpersonchanges = pimpersonchangesData; masterData.pimdistirbutions = pimdistirbutionsData;
let pimtitlesData:any = []; let pimtitlesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimtitles'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimtitles'),'undefined')){
pimtitlesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimtitles') as any); pimtitlesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimtitles') as any);
...@@ -565,36 +550,6 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -565,36 +550,6 @@ export default class PIMPERSONServiceBase extends EntityService {
} }
} }
masterData.pimtitles = pimtitlesData; masterData.pimtitles = pimtitlesData;
let pimpersonabilitiesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities'),'undefined')){
pimpersonabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities') as any);
if(pimpersonabilitiesData && pimpersonabilitiesData.length && pimpersonabilitiesData.length > 0){
pimpersonabilitiesData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimpersonabilityid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimpersonabilities = pimpersonabilitiesData;
let pimexitandentriesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries'),'undefined')){
pimexitandentriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries') as any);
if(pimexitandentriesData && pimexitandentriesData.length && pimexitandentriesData.length > 0){
pimexitandentriesData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimexitandentryid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimexitandentries = pimexitandentriesData;
let pimfaminfosData:any = []; let pimfaminfosData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimfaminfos'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimfaminfos'),'undefined')){
pimfaminfosData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimfaminfos') as any); pimfaminfosData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimfaminfos') as any);
...@@ -610,36 +565,21 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -610,36 +565,21 @@ export default class PIMPERSONServiceBase extends EntityService {
} }
} }
masterData.pimfaminfos = pimfaminfosData; masterData.pimfaminfos = pimfaminfosData;
let pimdistirbutionsData:any = []; let pimresearchfindingsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings'),'undefined')){
pimdistirbutionsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions') as any); pimresearchfindingsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings') as any);
if(pimdistirbutionsData && pimdistirbutionsData.length && pimdistirbutionsData.length > 0){ if(pimresearchfindingsData && pimresearchfindingsData.length && pimresearchfindingsData.length > 0){
pimdistirbutionsData.forEach((item:any) => { pimresearchfindingsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimdistirbutionid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimdistirbutions = pimdistirbutionsData;
let pimarmycadresData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres'),'undefined')){
pimarmycadresData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres') as any);
if(pimarmycadresData && pimarmycadresData.length && pimarmycadresData.length > 0){
pimarmycadresData.forEach((item:any) => {
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.pimarmycadresid = null; item.pimresearchfindingsid = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
}); });
} }
} }
masterData.pimarmycadres = pimarmycadresData; masterData.pimresearchfindings = pimresearchfindingsData;
let pimworkhistoriesData:any = []; let pimworkhistoriesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimworkhistories'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimworkhistories'),'undefined')){
pimworkhistoriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimworkhistories') as any); pimworkhistoriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimworkhistories') as any);
...@@ -655,36 +595,21 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -655,36 +595,21 @@ export default class PIMPERSONServiceBase extends EntityService {
} }
} }
masterData.pimworkhistories = pimworkhistoriesData; masterData.pimworkhistories = pimworkhistoriesData;
let pimpatentsData:any = []; let pimvocationalsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals'),'undefined')){
pimpatentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents') as any); pimvocationalsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals') as any);
if(pimpatentsData && pimpatentsData.length && pimpatentsData.length > 0){ if(pimvocationalsData && pimvocationalsData.length && pimvocationalsData.length > 0){
pimpatentsData.forEach((item:any) => { pimvocationalsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimpatentid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimpatents = pimpatentsData;
let pimvacationsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations'),'undefined')){
pimvacationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations') as any);
if(pimvacationsData && pimvacationsData.length && pimvacationsData.length > 0){
pimvacationsData.forEach((item:any) => {
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.pimvacationid = null; item.pimvocationalid = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
}); });
} }
} }
masterData.pimvacations = pimvacationsData; masterData.pimvocationals = pimvocationalsData;
let pimarchivesData:any = []; let pimarchivesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchives'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchives'),'undefined')){
pimarchivesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchives') as any); pimarchivesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchives') as any);
...@@ -745,21 +670,36 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -745,21 +670,36 @@ export default class PIMPERSONServiceBase extends EntityService {
} }
} }
masterData.pimpapers = pimpapersData; masterData.pimpapers = pimpapersData;
let pimresearchfindingsData:any = []; let pimpersonchangesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges'),'undefined')){
pimresearchfindingsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings') as any); pimpersonchangesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges') as any);
if(pimresearchfindingsData && pimresearchfindingsData.length && pimresearchfindingsData.length > 0){ if(pimpersonchangesData && pimpersonchangesData.length && pimpersonchangesData.length > 0){
pimresearchfindingsData.forEach((item:any) => { pimpersonchangesData.forEach((item:any) => {
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.pimresearchfindingsid = null; item.pimpersonchangeid = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
}); });
} }
} }
masterData.pimresearchfindings = pimresearchfindingsData; masterData.pimpersonchanges = pimpersonchangesData;
let pimexitandentriesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries'),'undefined')){
pimexitandentriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries') as any);
if(pimexitandentriesData && pimexitandentriesData.length && pimexitandentriesData.length > 0){
pimexitandentriesData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimexitandentryid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimexitandentries = pimexitandentriesData;
let pimrewardpunishmentsData:any = []; let pimrewardpunishmentsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimrewardpunishments'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimrewardpunishments'),'undefined')){
pimrewardpunishmentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimrewardpunishments') as any); pimrewardpunishmentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimrewardpunishments') as any);
...@@ -775,36 +715,36 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -775,36 +715,36 @@ export default class PIMPERSONServiceBase extends EntityService {
} }
} }
masterData.pimrewardpunishments = pimrewardpunishmentsData; masterData.pimrewardpunishments = pimrewardpunishmentsData;
let pimvocationalsData:any = []; let pimarmycadresData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres'),'undefined')){
pimvocationalsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals') as any); pimarmycadresData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres') as any);
if(pimvocationalsData && pimvocationalsData.length && pimvocationalsData.length > 0){ if(pimarmycadresData && pimarmycadresData.length && pimarmycadresData.length > 0){
pimvocationalsData.forEach((item:any) => { pimarmycadresData.forEach((item:any) => {
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.pimvocationalid = null; item.pimarmycadresid = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
}); });
} }
} }
masterData.pimvocationals = pimvocationalsData; masterData.pimarmycadres = pimarmycadresData;
let pimlanguageabilitiesData:any = []; let pimpatentsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents'),'undefined')){
pimlanguageabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities') as any); pimpatentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents') as any);
if(pimlanguageabilitiesData && pimlanguageabilitiesData.length && pimlanguageabilitiesData.length > 0){ if(pimpatentsData && pimpatentsData.length && pimpatentsData.length > 0){
pimlanguageabilitiesData.forEach((item:any) => { pimpatentsData.forEach((item:any) => {
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.pimlanguageabilityid = null; item.pimpatentid = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
}); });
} }
} }
masterData.pimlanguageabilities = pimlanguageabilitiesData; masterData.pimpatents = pimpatentsData;
let pimcontractsData:any = []; let pimcontractsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimcontracts'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimcontracts'),'undefined')){
pimcontractsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimcontracts') as any); pimcontractsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimcontracts') as any);
...@@ -820,6 +760,66 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -820,6 +760,66 @@ export default class PIMPERSONServiceBase extends EntityService {
} }
} }
masterData.pimcontracts = pimcontractsData; masterData.pimcontracts = pimcontractsData;
let pimeducationsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations'),'undefined')){
pimeducationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations') as any);
if(pimeducationsData && pimeducationsData.length && pimeducationsData.length > 0){
pimeducationsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimeducationid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimeducations = pimeducationsData;
let pimvacationsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations'),'undefined')){
pimvacationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations') as any);
if(pimvacationsData && pimvacationsData.length && pimvacationsData.length > 0){
pimvacationsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimvacationid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimvacations = pimvacationsData;
let pimlanguageabilitiesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities'),'undefined')){
pimlanguageabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities') as any);
if(pimlanguageabilitiesData && pimlanguageabilitiesData.length && pimlanguageabilitiesData.length > 0){
pimlanguageabilitiesData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimlanguageabilityid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimlanguageabilities = pimlanguageabilitiesData;
let pimpersonabilitiesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities'),'undefined')){
pimpersonabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities') as any);
if(pimpersonabilitiesData && pimpersonabilitiesData.length && pimpersonabilitiesData.length > 0){
pimpersonabilitiesData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimpersonabilityid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimpersonabilities = pimpersonabilitiesData;
Object.assign(data,masterData); Object.assign(data,masterData);
if(!data.srffrontuf || data.srffrontuf !== "1"){ if(!data.srffrontuf || data.srffrontuf !== "1"){
data[this.APPDEKEY] = null; data[this.APPDEKEY] = null;
...@@ -830,26 +830,26 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -830,26 +830,26 @@ export default class PIMPERSONServiceBase extends EntityService {
let tempContext:any = JSON.parse(JSON.stringify(context)); let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/pimpeople`,data,isloading); let res:any = await Http.getInstance().post(`/pimpeople`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_attendancemreportmxes',JSON.stringify(res.data.attendancemreportmxes)); this.tempStorage.setItem(tempContext.srfsessionkey+'_attendancemreportmxes',JSON.stringify(res.data.attendancemreportmxes));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimeducations',JSON.stringify(res.data.pimeducations)); this.tempStorage.setItem(tempContext.srfsessionkey+'_pimdistirbutions',JSON.stringify(res.data.pimdistirbutions));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimpersonchanges',JSON.stringify(res.data.pimpersonchanges));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimtitles',JSON.stringify(res.data.pimtitles)); this.tempStorage.setItem(tempContext.srfsessionkey+'_pimtitles',JSON.stringify(res.data.pimtitles));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimpersonabilities',JSON.stringify(res.data.pimpersonabilities));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimexitandentries',JSON.stringify(res.data.pimexitandentries));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimfaminfos',JSON.stringify(res.data.pimfaminfos)); this.tempStorage.setItem(tempContext.srfsessionkey+'_pimfaminfos',JSON.stringify(res.data.pimfaminfos));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimdistirbutions',JSON.stringify(res.data.pimdistirbutions)); this.tempStorage.setItem(tempContext.srfsessionkey+'_pimresearchfindings',JSON.stringify(res.data.pimresearchfindings));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimarmycadres',JSON.stringify(res.data.pimarmycadres));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimworkhistories',JSON.stringify(res.data.pimworkhistories)); this.tempStorage.setItem(tempContext.srfsessionkey+'_pimworkhistories',JSON.stringify(res.data.pimworkhistories));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimpatents',JSON.stringify(res.data.pimpatents)); this.tempStorage.setItem(tempContext.srfsessionkey+'_pimvocationals',JSON.stringify(res.data.pimvocationals));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimvacations',JSON.stringify(res.data.pimvacations));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimarchives',JSON.stringify(res.data.pimarchives)); this.tempStorage.setItem(tempContext.srfsessionkey+'_pimarchives',JSON.stringify(res.data.pimarchives));
this.tempStorage.setItem(tempContext.srfsessionkey+'_trmtrianpeople',JSON.stringify(res.data.trmtrianpeople)); this.tempStorage.setItem(tempContext.srfsessionkey+'_trmtrianpeople',JSON.stringify(res.data.trmtrianpeople));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimachievements',JSON.stringify(res.data.pimachievements)); this.tempStorage.setItem(tempContext.srfsessionkey+'_pimachievements',JSON.stringify(res.data.pimachievements));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimpapers',JSON.stringify(res.data.pimpapers)); this.tempStorage.setItem(tempContext.srfsessionkey+'_pimpapers',JSON.stringify(res.data.pimpapers));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimresearchfindings',JSON.stringify(res.data.pimresearchfindings)); this.tempStorage.setItem(tempContext.srfsessionkey+'_pimpersonchanges',JSON.stringify(res.data.pimpersonchanges));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimexitandentries',JSON.stringify(res.data.pimexitandentries));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimrewardpunishments',JSON.stringify(res.data.pimrewardpunishments)); this.tempStorage.setItem(tempContext.srfsessionkey+'_pimrewardpunishments',JSON.stringify(res.data.pimrewardpunishments));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimvocationals',JSON.stringify(res.data.pimvocationals)); this.tempStorage.setItem(tempContext.srfsessionkey+'_pimarmycadres',JSON.stringify(res.data.pimarmycadres));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimlanguageabilities',JSON.stringify(res.data.pimlanguageabilities)); this.tempStorage.setItem(tempContext.srfsessionkey+'_pimpatents',JSON.stringify(res.data.pimpatents));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimcontracts',JSON.stringify(res.data.pimcontracts)); this.tempStorage.setItem(tempContext.srfsessionkey+'_pimcontracts',JSON.stringify(res.data.pimcontracts));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimeducations',JSON.stringify(res.data.pimeducations));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimvacations',JSON.stringify(res.data.pimvacations));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimlanguageabilities',JSON.stringify(res.data.pimlanguageabilities));
this.tempStorage.setItem(tempContext.srfsessionkey+'_pimpersonabilities',JSON.stringify(res.data.pimpersonabilities));
return res; return res;
} }
...@@ -864,96 +864,51 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -864,96 +864,51 @@ export default class PIMPERSONServiceBase extends EntityService {
*/ */
public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let masterData:any = {}; let masterData:any = {};
let attendancemreportmxesData:any = []; let attendancemreportmxesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_attendancemreportmxes'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_attendancemreportmxes'),'undefined')){
attendancemreportmxesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_attendancemreportmxes') as any); attendancemreportmxesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_attendancemreportmxes') as any);
if(attendancemreportmxesData && attendancemreportmxesData.length && attendancemreportmxesData.length > 0){ if(attendancemreportmxesData && attendancemreportmxesData.length && attendancemreportmxesData.length > 0){
attendancemreportmxesData.forEach((item:any) => { attendancemreportmxesData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.attendancemreportmxid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.attendancemreportmxes = attendancemreportmxesData;
let pimeducationsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations'),'undefined')){
pimeducationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations') as any);
if(pimeducationsData && pimeducationsData.length && pimeducationsData.length > 0){
pimeducationsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimeducationid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimeducations = pimeducationsData;
let pimpersonchangesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges'),'undefined')){
pimpersonchangesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges') as any);
if(pimpersonchangesData && pimpersonchangesData.length && pimpersonchangesData.length > 0){
pimpersonchangesData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimpersonchangeid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimpersonchanges = pimpersonchangesData;
let pimtitlesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimtitles'),'undefined')){
pimtitlesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimtitles') as any);
if(pimtitlesData && pimtitlesData.length && pimtitlesData.length > 0){
pimtitlesData.forEach((item:any) => {
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.pimtitleid = null; item.attendancemreportmxid = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
}); });
} }
} }
masterData.pimtitles = pimtitlesData; masterData.attendancemreportmxes = attendancemreportmxesData;
let pimpersonabilitiesData:any = []; let pimdistirbutionsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions'),'undefined')){
pimpersonabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities') as any); pimdistirbutionsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions') as any);
if(pimpersonabilitiesData && pimpersonabilitiesData.length && pimpersonabilitiesData.length > 0){ if(pimdistirbutionsData && pimdistirbutionsData.length && pimdistirbutionsData.length > 0){
pimpersonabilitiesData.forEach((item:any) => { pimdistirbutionsData.forEach((item:any) => {
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.pimpersonabilityid = null; item.pimdistirbutionid = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
}); });
} }
} }
masterData.pimpersonabilities = pimpersonabilitiesData; masterData.pimdistirbutions = pimdistirbutionsData;
let pimexitandentriesData:any = []; let pimtitlesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimtitles'),'undefined')){
pimexitandentriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries') as any); pimtitlesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimtitles') as any);
if(pimexitandentriesData && pimexitandentriesData.length && pimexitandentriesData.length > 0){ if(pimtitlesData && pimtitlesData.length && pimtitlesData.length > 0){
pimexitandentriesData.forEach((item:any) => { pimtitlesData.forEach((item:any) => {
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.pimexitandentryid = null; item.pimtitleid = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
}); });
} }
} }
masterData.pimexitandentries = pimexitandentriesData; masterData.pimtitles = pimtitlesData;
let pimfaminfosData:any = []; let pimfaminfosData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimfaminfos'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimfaminfos'),'undefined')){
pimfaminfosData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimfaminfos') as any); pimfaminfosData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimfaminfos') as any);
...@@ -969,36 +924,21 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -969,36 +924,21 @@ export default class PIMPERSONServiceBase extends EntityService {
} }
} }
masterData.pimfaminfos = pimfaminfosData; masterData.pimfaminfos = pimfaminfosData;
let pimdistirbutionsData:any = []; let pimresearchfindingsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings'),'undefined')){
pimdistirbutionsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimdistirbutions') as any); pimresearchfindingsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings') as any);
if(pimdistirbutionsData && pimdistirbutionsData.length && pimdistirbutionsData.length > 0){ if(pimresearchfindingsData && pimresearchfindingsData.length && pimresearchfindingsData.length > 0){
pimdistirbutionsData.forEach((item:any) => { pimresearchfindingsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimdistirbutionid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimdistirbutions = pimdistirbutionsData;
let pimarmycadresData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres'),'undefined')){
pimarmycadresData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres') as any);
if(pimarmycadresData && pimarmycadresData.length && pimarmycadresData.length > 0){
pimarmycadresData.forEach((item:any) => {
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.pimarmycadresid = null; item.pimresearchfindingsid = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
}); });
} }
} }
masterData.pimarmycadres = pimarmycadresData; masterData.pimresearchfindings = pimresearchfindingsData;
let pimworkhistoriesData:any = []; let pimworkhistoriesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimworkhistories'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimworkhistories'),'undefined')){
pimworkhistoriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimworkhistories') as any); pimworkhistoriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimworkhistories') as any);
...@@ -1014,36 +954,21 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -1014,36 +954,21 @@ export default class PIMPERSONServiceBase extends EntityService {
} }
} }
masterData.pimworkhistories = pimworkhistoriesData; masterData.pimworkhistories = pimworkhistoriesData;
let pimpatentsData:any = []; let pimvocationalsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals'),'undefined')){
pimpatentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents') as any); pimvocationalsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals') as any);
if(pimpatentsData && pimpatentsData.length && pimpatentsData.length > 0){ if(pimvocationalsData && pimvocationalsData.length && pimvocationalsData.length > 0){
pimpatentsData.forEach((item:any) => { pimvocationalsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimpatentid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimpatents = pimpatentsData;
let pimvacationsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations'),'undefined')){
pimvacationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations') as any);
if(pimvacationsData && pimvacationsData.length && pimvacationsData.length > 0){
pimvacationsData.forEach((item:any) => {
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.pimvacationid = null; item.pimvocationalid = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
}); });
} }
} }
masterData.pimvacations = pimvacationsData; masterData.pimvocationals = pimvocationalsData;
let pimarchivesData:any = []; let pimarchivesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchives'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarchives'),'undefined')){
pimarchivesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchives') as any); pimarchivesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarchives') as any);
...@@ -1104,21 +1029,36 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -1104,21 +1029,36 @@ export default class PIMPERSONServiceBase extends EntityService {
} }
} }
masterData.pimpapers = pimpapersData; masterData.pimpapers = pimpapersData;
let pimresearchfindingsData:any = []; let pimpersonchangesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges'),'undefined')){
pimresearchfindingsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimresearchfindings') as any); pimpersonchangesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonchanges') as any);
if(pimresearchfindingsData && pimresearchfindingsData.length && pimresearchfindingsData.length > 0){ if(pimpersonchangesData && pimpersonchangesData.length && pimpersonchangesData.length > 0){
pimresearchfindingsData.forEach((item:any) => { pimpersonchangesData.forEach((item:any) => {
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.pimresearchfindingsid = null; item.pimpersonchangeid = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
}); });
} }
} }
masterData.pimresearchfindings = pimresearchfindingsData; masterData.pimpersonchanges = pimpersonchangesData;
let pimexitandentriesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries'),'undefined')){
pimexitandentriesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimexitandentries') as any);
if(pimexitandentriesData && pimexitandentriesData.length && pimexitandentriesData.length > 0){
pimexitandentriesData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimexitandentryid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimexitandentries = pimexitandentriesData;
let pimrewardpunishmentsData:any = []; let pimrewardpunishmentsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimrewardpunishments'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimrewardpunishments'),'undefined')){
pimrewardpunishmentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimrewardpunishments') as any); pimrewardpunishmentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimrewardpunishments') as any);
...@@ -1134,36 +1074,36 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -1134,36 +1074,36 @@ export default class PIMPERSONServiceBase extends EntityService {
} }
} }
masterData.pimrewardpunishments = pimrewardpunishmentsData; masterData.pimrewardpunishments = pimrewardpunishmentsData;
let pimvocationalsData:any = []; let pimarmycadresData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres'),'undefined')){
pimvocationalsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvocationals') as any); pimarmycadresData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimarmycadres') as any);
if(pimvocationalsData && pimvocationalsData.length && pimvocationalsData.length > 0){ if(pimarmycadresData && pimarmycadresData.length && pimarmycadresData.length > 0){
pimvocationalsData.forEach((item:any) => { pimarmycadresData.forEach((item:any) => {
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.pimvocationalid = null; item.pimarmycadresid = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
}); });
} }
} }
masterData.pimvocationals = pimvocationalsData; masterData.pimarmycadres = pimarmycadresData;
let pimlanguageabilitiesData:any = []; let pimpatentsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents'),'undefined')){
pimlanguageabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities') as any); pimpatentsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpatents') as any);
if(pimlanguageabilitiesData && pimlanguageabilitiesData.length && pimlanguageabilitiesData.length > 0){ if(pimpatentsData && pimpatentsData.length && pimpatentsData.length > 0){
pimlanguageabilitiesData.forEach((item:any) => { pimpatentsData.forEach((item:any) => {
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.pimlanguageabilityid = null; item.pimpatentid = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
}); });
} }
} }
masterData.pimlanguageabilities = pimlanguageabilitiesData; masterData.pimpatents = pimpatentsData;
let pimcontractsData:any = []; let pimcontractsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimcontracts'),'undefined')){ if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimcontracts'),'undefined')){
pimcontractsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimcontracts') as any); pimcontractsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimcontracts') as any);
...@@ -1179,29 +1119,89 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -1179,29 +1119,89 @@ export default class PIMPERSONServiceBase extends EntityService {
} }
} }
masterData.pimcontracts = pimcontractsData; masterData.pimcontracts = pimcontractsData;
let pimeducationsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations'),'undefined')){
pimeducationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimeducations') as any);
if(pimeducationsData && pimeducationsData.length && pimeducationsData.length > 0){
pimeducationsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimeducationid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimeducations = pimeducationsData;
let pimvacationsData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations'),'undefined')){
pimvacationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimvacations') as any);
if(pimvacationsData && pimvacationsData.length && pimvacationsData.length > 0){
pimvacationsData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimvacationid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimvacations = pimvacationsData;
let pimlanguageabilitiesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities'),'undefined')){
pimlanguageabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimlanguageabilities') as any);
if(pimlanguageabilitiesData && pimlanguageabilitiesData.length && pimlanguageabilitiesData.length > 0){
pimlanguageabilitiesData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimlanguageabilityid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimlanguageabilities = pimlanguageabilitiesData;
let pimpersonabilitiesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities'),'undefined')){
pimpersonabilitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_pimpersonabilities') as any);
if(pimpersonabilitiesData && pimpersonabilitiesData.length && pimpersonabilitiesData.length > 0){
pimpersonabilitiesData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.pimpersonabilityid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.pimpersonabilities = pimpersonabilitiesData;
Object.assign(data,masterData); Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/pimpeople/${context.pimperson}/save`,data,isloading); let res:any = await Http.getInstance().post(`/pimpeople/${context.pimperson}/save`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_attendancemreportmxes',JSON.stringify(res.data.attendancemreportmxes)); this.tempStorage.setItem(context.srfsessionkey+'_attendancemreportmxes',JSON.stringify(res.data.attendancemreportmxes));
this.tempStorage.setItem(context.srfsessionkey+'_pimeducations',JSON.stringify(res.data.pimeducations)); this.tempStorage.setItem(context.srfsessionkey+'_pimdistirbutions',JSON.stringify(res.data.pimdistirbutions));
this.tempStorage.setItem(context.srfsessionkey+'_pimpersonchanges',JSON.stringify(res.data.pimpersonchanges));
this.tempStorage.setItem(context.srfsessionkey+'_pimtitles',JSON.stringify(res.data.pimtitles)); this.tempStorage.setItem(context.srfsessionkey+'_pimtitles',JSON.stringify(res.data.pimtitles));
this.tempStorage.setItem(context.srfsessionkey+'_pimpersonabilities',JSON.stringify(res.data.pimpersonabilities));
this.tempStorage.setItem(context.srfsessionkey+'_pimexitandentries',JSON.stringify(res.data.pimexitandentries));
this.tempStorage.setItem(context.srfsessionkey+'_pimfaminfos',JSON.stringify(res.data.pimfaminfos)); this.tempStorage.setItem(context.srfsessionkey+'_pimfaminfos',JSON.stringify(res.data.pimfaminfos));
this.tempStorage.setItem(context.srfsessionkey+'_pimdistirbutions',JSON.stringify(res.data.pimdistirbutions)); this.tempStorage.setItem(context.srfsessionkey+'_pimresearchfindings',JSON.stringify(res.data.pimresearchfindings));
this.tempStorage.setItem(context.srfsessionkey+'_pimarmycadres',JSON.stringify(res.data.pimarmycadres));
this.tempStorage.setItem(context.srfsessionkey+'_pimworkhistories',JSON.stringify(res.data.pimworkhistories)); this.tempStorage.setItem(context.srfsessionkey+'_pimworkhistories',JSON.stringify(res.data.pimworkhistories));
this.tempStorage.setItem(context.srfsessionkey+'_pimpatents',JSON.stringify(res.data.pimpatents)); this.tempStorage.setItem(context.srfsessionkey+'_pimvocationals',JSON.stringify(res.data.pimvocationals));
this.tempStorage.setItem(context.srfsessionkey+'_pimvacations',JSON.stringify(res.data.pimvacations));
this.tempStorage.setItem(context.srfsessionkey+'_pimarchives',JSON.stringify(res.data.pimarchives)); this.tempStorage.setItem(context.srfsessionkey+'_pimarchives',JSON.stringify(res.data.pimarchives));
this.tempStorage.setItem(context.srfsessionkey+'_trmtrianpeople',JSON.stringify(res.data.trmtrianpeople)); this.tempStorage.setItem(context.srfsessionkey+'_trmtrianpeople',JSON.stringify(res.data.trmtrianpeople));
this.tempStorage.setItem(context.srfsessionkey+'_pimachievements',JSON.stringify(res.data.pimachievements)); this.tempStorage.setItem(context.srfsessionkey+'_pimachievements',JSON.stringify(res.data.pimachievements));
this.tempStorage.setItem(context.srfsessionkey+'_pimpapers',JSON.stringify(res.data.pimpapers)); this.tempStorage.setItem(context.srfsessionkey+'_pimpapers',JSON.stringify(res.data.pimpapers));
this.tempStorage.setItem(context.srfsessionkey+'_pimresearchfindings',JSON.stringify(res.data.pimresearchfindings)); this.tempStorage.setItem(context.srfsessionkey+'_pimpersonchanges',JSON.stringify(res.data.pimpersonchanges));
this.tempStorage.setItem(context.srfsessionkey+'_pimexitandentries',JSON.stringify(res.data.pimexitandentries));
this.tempStorage.setItem(context.srfsessionkey+'_pimrewardpunishments',JSON.stringify(res.data.pimrewardpunishments)); this.tempStorage.setItem(context.srfsessionkey+'_pimrewardpunishments',JSON.stringify(res.data.pimrewardpunishments));
this.tempStorage.setItem(context.srfsessionkey+'_pimvocationals',JSON.stringify(res.data.pimvocationals)); this.tempStorage.setItem(context.srfsessionkey+'_pimarmycadres',JSON.stringify(res.data.pimarmycadres));
this.tempStorage.setItem(context.srfsessionkey+'_pimlanguageabilities',JSON.stringify(res.data.pimlanguageabilities)); this.tempStorage.setItem(context.srfsessionkey+'_pimpatents',JSON.stringify(res.data.pimpatents));
this.tempStorage.setItem(context.srfsessionkey+'_pimcontracts',JSON.stringify(res.data.pimcontracts)); this.tempStorage.setItem(context.srfsessionkey+'_pimcontracts',JSON.stringify(res.data.pimcontracts));
this.tempStorage.setItem(context.srfsessionkey+'_pimeducations',JSON.stringify(res.data.pimeducations));
this.tempStorage.setItem(context.srfsessionkey+'_pimvacations',JSON.stringify(res.data.pimvacations));
this.tempStorage.setItem(context.srfsessionkey+'_pimlanguageabilities',JSON.stringify(res.data.pimlanguageabilities));
this.tempStorage.setItem(context.srfsessionkey+'_pimpersonabilities',JSON.stringify(res.data.pimpersonabilities));
return res; return res;
} }
...@@ -1286,26 +1286,26 @@ export default class PIMPERSONServiceBase extends EntityService { ...@@ -1286,26 +1286,26 @@ export default class PIMPERSONServiceBase extends EntityService {
let res:any = await Http.getInstance().get(`/pimpeople/getdraft`,isloading); let res:any = await Http.getInstance().get(`/pimpeople/getdraft`,isloading);
res.data.pimperson = data.pimperson; res.data.pimperson = data.pimperson;
this.tempStorage.setItem(context.srfsessionkey+'_attendancemreportmxes',JSON.stringify(res.data.attendancemreportmxes)); this.tempStorage.setItem(context.srfsessionkey+'_attendancemreportmxes',JSON.stringify(res.data.attendancemreportmxes));
this.tempStorage.setItem(context.srfsessionkey+'_pimeducations',JSON.stringify(res.data.pimeducations)); this.tempStorage.setItem(context.srfsessionkey+'_pimdistirbutions',JSON.stringify(res.data.pimdistirbutions));
this.tempStorage.setItem(context.srfsessionkey+'_pimpersonchanges',JSON.stringify(res.data.pimpersonchanges));
this.tempStorage.setItem(context.srfsessionkey+'_pimtitles',JSON.stringify(res.data.pimtitles)); this.tempStorage.setItem(context.srfsessionkey+'_pimtitles',JSON.stringify(res.data.pimtitles));
this.tempStorage.setItem(context.srfsessionkey+'_pimpersonabilities',JSON.stringify(res.data.pimpersonabilities));
this.tempStorage.setItem(context.srfsessionkey+'_pimexitandentries',JSON.stringify(res.data.pimexitandentries));
this.tempStorage.setItem(context.srfsessionkey+'_pimfaminfos',JSON.stringify(res.data.pimfaminfos)); this.tempStorage.setItem(context.srfsessionkey+'_pimfaminfos',JSON.stringify(res.data.pimfaminfos));
this.tempStorage.setItem(context.srfsessionkey+'_pimdistirbutions',JSON.stringify(res.data.pimdistirbutions)); this.tempStorage.setItem(context.srfsessionkey+'_pimresearchfindings',JSON.stringify(res.data.pimresearchfindings));
this.tempStorage.setItem(context.srfsessionkey+'_pimarmycadres',JSON.stringify(res.data.pimarmycadres));
this.tempStorage.setItem(context.srfsessionkey+'_pimworkhistories',JSON.stringify(res.data.pimworkhistories)); this.tempStorage.setItem(context.srfsessionkey+'_pimworkhistories',JSON.stringify(res.data.pimworkhistories));
this.tempStorage.setItem(context.srfsessionkey+'_pimpatents',JSON.stringify(res.data.pimpatents)); this.tempStorage.setItem(context.srfsessionkey+'_pimvocationals',JSON.stringify(res.data.pimvocationals));
this.tempStorage.setItem(context.srfsessionkey+'_pimvacations',JSON.stringify(res.data.pimvacations));
this.tempStorage.setItem(context.srfsessionkey+'_pimarchives',JSON.stringify(res.data.pimarchives)); this.tempStorage.setItem(context.srfsessionkey+'_pimarchives',JSON.stringify(res.data.pimarchives));
this.tempStorage.setItem(context.srfsessionkey+'_trmtrianpeople',JSON.stringify(res.data.trmtrianpeople)); this.tempStorage.setItem(context.srfsessionkey+'_trmtrianpeople',JSON.stringify(res.data.trmtrianpeople));
this.tempStorage.setItem(context.srfsessionkey+'_pimachievements',JSON.stringify(res.data.pimachievements)); this.tempStorage.setItem(context.srfsessionkey+'_pimachievements',JSON.stringify(res.data.pimachievements));
this.tempStorage.setItem(context.srfsessionkey+'_pimpapers',JSON.stringify(res.data.pimpapers)); this.tempStorage.setItem(context.srfsessionkey+'_pimpapers',JSON.stringify(res.data.pimpapers));
this.tempStorage.setItem(context.srfsessionkey+'_pimresearchfindings',JSON.stringify(res.data.pimresearchfindings)); this.tempStorage.setItem(context.srfsessionkey+'_pimpersonchanges',JSON.stringify(res.data.pimpersonchanges));
this.tempStorage.setItem(context.srfsessionkey+'_pimexitandentries',JSON.stringify(res.data.pimexitandentries));
this.tempStorage.setItem(context.srfsessionkey+'_pimrewardpunishments',JSON.stringify(res.data.pimrewardpunishments)); this.tempStorage.setItem(context.srfsessionkey+'_pimrewardpunishments',JSON.stringify(res.data.pimrewardpunishments));
this.tempStorage.setItem(context.srfsessionkey+'_pimvocationals',JSON.stringify(res.data.pimvocationals)); this.tempStorage.setItem(context.srfsessionkey+'_pimarmycadres',JSON.stringify(res.data.pimarmycadres));
this.tempStorage.setItem(context.srfsessionkey+'_pimlanguageabilities',JSON.stringify(res.data.pimlanguageabilities)); this.tempStorage.setItem(context.srfsessionkey+'_pimpatents',JSON.stringify(res.data.pimpatents));
this.tempStorage.setItem(context.srfsessionkey+'_pimcontracts',JSON.stringify(res.data.pimcontracts)); this.tempStorage.setItem(context.srfsessionkey+'_pimcontracts',JSON.stringify(res.data.pimcontracts));
this.tempStorage.setItem(context.srfsessionkey+'_pimeducations',JSON.stringify(res.data.pimeducations));
this.tempStorage.setItem(context.srfsessionkey+'_pimvacations',JSON.stringify(res.data.pimvacations));
this.tempStorage.setItem(context.srfsessionkey+'_pimlanguageabilities',JSON.stringify(res.data.pimlanguageabilities));
this.tempStorage.setItem(context.srfsessionkey+'_pimpersonabilities',JSON.stringify(res.data.pimpersonabilities));
return res; return res;
} }
......
app_EHRPim/src/user-register.ts
浏览文件 @ 90ca1f11
import { UserDefaultComponent } from './user-default-register'; import { UserDefaultComponent } from './user-default-register';
import AppOrgPNum from './components/app-org-p-num/app-org-p-num.vue'
import AppOrgVocNumList from './components/app-org-voc-num-list/app-org-voc-num-list.vue'
export const UserComponent = { export const UserComponent = {
install(v: any, opt: any) { install(v: any, opt: any) {
UserDefaultComponent.install(v, opt); UserDefaultComponent.install(v, opt);
v.component('app-org-p-num', AppOrgPNum);
v.component('app-org-voc-num-list', AppOrgVocNumList);
} }
}; };
\ No newline at end of file
app_EHRPim/src/widgets/app/pim-portal-view-db-dashboard/pim-portal-view-db-dashboard-base.vue
浏览文件 @ 90ca1f11
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<row v-if="!isHasCustomized"> <row v-if="!isHasCustomized">
<div style = ''> <div style = ''>
<i-col :xs="{ span: 8, offset: 0}" :sm="{ span: 8, offset: 0}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }"> <i-col :xs="{ span: 8, offset: 0}" :sm="{ span: 8, offset: 0}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }">
<card class="portlet-card" :bordered="false" dis-hover :padding="0"> <card :bordered="false" dis-hover :padding="0">
<span> <span>
<view_db_sysportlet1 <view_db_sysportlet1
:viewState="viewState" :viewState="viewState"
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</card> </card>
</i-col> </i-col>
<i-col :xs="{ span: 16, offset: 0}" :sm="{ span: 16, offset: 0}" :md="{ span: 16, offset: 0 }" :lg="{ span: 16, offset: 0 }"> <i-col :xs="{ span: 16, offset: 0}" :sm="{ span: 16, offset: 0}" :md="{ span: 16, offset: 0 }" :lg="{ span: 16, offset: 0 }">
<card class="portlet-card" :bordered="false" dis-hover :padding="0"> <card :bordered="false" dis-hover :padding="0">
<span> <span>
<view_db_sysportlet2 <view_db_sysportlet2
:viewState="viewState" :viewState="viewState"
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</card> </card>
</i-col> </i-col>
<i-col :xs="{ span: 8, offset: 0}" :sm="{ span: 8, offset: 0}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }"> <i-col :xs="{ span: 8, offset: 0}" :sm="{ span: 8, offset: 0}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }">
<card class="portlet-card" :bordered="false" dis-hover :padding="0"> <card :bordered="false" dis-hover :padding="0">
<span> <span>
<view_db_sysportlet4 <view_db_sysportlet4
:viewState="viewState" :viewState="viewState"
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</card> </card>
</i-col> </i-col>
<i-col :xs="{ span: 8, offset: 0}" :sm="{ span: 8, offset: 0}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }"> <i-col :xs="{ span: 8, offset: 0}" :sm="{ span: 8, offset: 0}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }">
<card class="portlet-card" :bordered="false" dis-hover :padding="0"> <card :bordered="false" dis-hover :padding="0">
<span> <span>
<view_db_sysportlet3 <view_db_sysportlet3
:viewState="viewState" :viewState="viewState"
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</card> </card>
</i-col> </i-col>
<i-col :xs="{ span: 8, offset: 0}" :sm="{ span: 8, offset: 0}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }"> <i-col :xs="{ span: 8, offset: 0}" :sm="{ span: 8, offset: 0}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }">
<card class="portlet-card" :bordered="false" dis-hover :padding="0"> <card :bordered="false" dis-hover :padding="0">
<span> <span>
<view_db_sysportlet5 <view_db_sysportlet5
:viewState="viewState" :viewState="viewState"
......
app_EHRPim/src/widgets/pimvocational/org-voc-num-list-list/org-voc-num-list-list.less
浏览文件 @ 90ca1f11
...@@ -3,10 +3,6 @@ ...@@ -3,10 +3,6 @@
.app-list { .app-list {
flex-grow: 1; flex-grow: 1;
overflow-y: auto; overflow-y: auto;
height: 100%;
>div{
height: 100%;
}
.app-list-item { .app-list-item {
line-height: 34px; line-height: 34px;
} }
......
config.xml
浏览文件 @ 90ca1f11
...@@ -38,6 +38,11 @@ ...@@ -38,6 +38,11 @@
git clone -b master $para2 ehr/ git clone -b master $para2 ehr/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd ehr/ cd ehr/
mvn clean package -Pehrpim
cd ehr-app/ehr-app-ehrpim
mvn -Pehrpim docker:build
mvn -Pehrpim docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ehr-app-ehrpim.yaml iBizEE --with-registry-auth
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
ehr-app/ehr-app-ehr/src/main/docker/Dockerfile
浏览文件 @ 90ca1f11
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehr.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehr.jar
EXPOSE 8080 EXPOSE 6092
ADD ehr-app-ehr.jar /ehr-app-ehr.jar ADD ehr-app-ehr.jar /ehr-app-ehr.jar
ehr-app/ehr-app-ehr/src/main/docker/ehr-app-ehr.yaml
浏览文件 @ 90ca1f11
...@@ -3,9 +3,11 @@ services: ...@@ -3,9 +3,11 @@ services:
ehr-app-ehr: ehr-app-ehr:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehr:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehr:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
ehr-app/ehr-app-ehr/src/main/resources/application-ehr-dev.yml
浏览文件 @ 90ca1f11
server: server:
port: 8080 port: 6092
\ No newline at end of file \ No newline at end of file
ehr-app/ehr-app-ehr/src/main/resources/application-ehr-prod.yml
浏览文件 @ 90ca1f11
server: server:
port: 8080 port: 6092
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
ehr-app/ehr-app-ehrapp/src/main/docker/Dockerfile
浏览文件 @ 90ca1f11
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrapp.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrapp.jar
EXPOSE 8080 EXPOSE 6092
ADD ehr-app-ehrapp.jar /ehr-app-ehrapp.jar ADD ehr-app-ehrapp.jar /ehr-app-ehrapp.jar
ehr-app/ehr-app-ehrapp/src/main/docker/ehr-app-ehrapp.yaml
浏览文件 @ 90ca1f11
...@@ -3,9 +3,11 @@ services: ...@@ -3,9 +3,11 @@ services:
ehr-app-ehrapp: ehr-app-ehrapp:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrapp:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrapp:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
ehr-app/ehr-app-ehrapp/src/main/resources/application-ehrapp-dev.yml
浏览文件 @ 90ca1f11
server: server:
port: 8080 port: 6092
\ No newline at end of file \ No newline at end of file
ehr-app/ehr-app-ehrapp/src/main/resources/application-ehrapp-prod.yml
浏览文件 @ 90ca1f11
server: server:
port: 8080 port: 6092
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
ehr-app/ehr-app-ehrhelp/src/main/docker/Dockerfile
浏览文件 @ 90ca1f11
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrhelp.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrhelp.jar
EXPOSE 8080 EXPOSE 6092
ADD ehr-app-ehrhelp.jar /ehr-app-ehrhelp.jar ADD ehr-app-ehrhelp.jar /ehr-app-ehrhelp.jar
ehr-app/ehr-app-ehrhelp/src/main/docker/ehr-app-ehrhelp.yaml
浏览文件 @ 90ca1f11
...@@ -3,9 +3,11 @@ services: ...@@ -3,9 +3,11 @@ services:
ehr-app-ehrhelp: ehr-app-ehrhelp:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrhelp:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrhelp:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
ehr-app/ehr-app-ehrhelp/src/main/resources/application-ehrhelp-dev.yml
浏览文件 @ 90ca1f11
server: server:
port: 8080 port: 6092
\ No newline at end of file \ No newline at end of file
ehr-app/ehr-app-ehrhelp/src/main/resources/application-ehrhelp-prod.yml
浏览文件 @ 90ca1f11
server: server:
port: 8080 port: 6092
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
ehr-app/ehr-app-ehrmob/src/main/docker/Dockerfile
浏览文件 @ 90ca1f11
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrmob.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrmob.jar
EXPOSE 8080 EXPOSE 6092
ADD ehr-app-ehrmob.jar /ehr-app-ehrmob.jar ADD ehr-app-ehrmob.jar /ehr-app-ehrmob.jar
ehr-app/ehr-app-ehrmob/src/main/docker/ehr-app-ehrmob.yaml
浏览文件 @ 90ca1f11
...@@ -3,9 +3,11 @@ services: ...@@ -3,9 +3,11 @@ services:
ehr-app-ehrmob: ehr-app-ehrmob:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrmob:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrmob:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
ehr-app/ehr-app-ehrmob/src/main/resources/application-ehrmob-dev.yml
浏览文件 @ 90ca1f11
server: server:
port: 8080 port: 6092
\ No newline at end of file \ No newline at end of file
ehr-app/ehr-app-ehrmob/src/main/resources/application-ehrmob-prod.yml
浏览文件 @ 90ca1f11
server: server:
port: 8080 port: 6092
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
ehr-app/ehr-app-ehrorm/src/main/docker/Dockerfile
浏览文件 @ 90ca1f11
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrorm.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrorm.jar
EXPOSE 8080 EXPOSE 6092
ADD ehr-app-ehrorm.jar /ehr-app-ehrorm.jar ADD ehr-app-ehrorm.jar /ehr-app-ehrorm.jar
ehr-app/ehr-app-ehrorm/src/main/docker/ehr-app-ehrorm.yaml
浏览文件 @ 90ca1f11
...@@ -3,9 +3,11 @@ services: ...@@ -3,9 +3,11 @@ services:
ehr-app-ehrorm: ehr-app-ehrorm:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrorm:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrorm:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
ehr-app/ehr-app-ehrorm/src/main/resources/application-ehrorm-dev.yml
浏览文件 @ 90ca1f11
server: server:
port: 8080 port: 6092
\ No newline at end of file \ No newline at end of file
ehr-app/ehr-app-ehrorm/src/main/resources/application-ehrorm-prod.yml
浏览文件 @ 90ca1f11
server: server:
port: 8080 port: 6092
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
ehr-app/ehr-app-ehrpcm/src/main/docker/Dockerfile
浏览文件 @ 90ca1f11
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpcm.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpcm.jar
EXPOSE 8080 EXPOSE 6092
ADD ehr-app-ehrpcm.jar /ehr-app-ehrpcm.jar ADD ehr-app-ehrpcm.jar /ehr-app-ehrpcm.jar
ehr-app/ehr-app-ehrpcm/src/main/docker/ehr-app-ehrpcm.yaml
浏览文件 @ 90ca1f11
...@@ -3,9 +3,11 @@ services: ...@@ -3,9 +3,11 @@ services:
ehr-app-ehrpcm: ehr-app-ehrpcm:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
ehr-app/ehr-app-ehrpcm/src/main/resources/application-ehrpcm-dev.yml
浏览文件 @ 90ca1f11
server: server:
port: 8080 port: 6092
\ No newline at end of file \ No newline at end of file
ehr-app/ehr-app-ehrpcm/src/main/resources/application-ehrpcm-prod.yml
浏览文件 @ 90ca1f11
server: server:
port: 8080 port: 6092
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
ehr-app/ehr-app-ehrpcm2/src/main/docker/Dockerfile
浏览文件 @ 90ca1f11
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpcm2.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpcm2.jar
EXPOSE 8080 EXPOSE 6092
ADD ehr-app-ehrpcm2.jar /ehr-app-ehrpcm2.jar ADD ehr-app-ehrpcm2.jar /ehr-app-ehrpcm2.jar
ehr-app/ehr-app-ehrpcm2/src/main/docker/ehr-app-ehrpcm2.yaml
浏览文件 @ 90ca1f11
...@@ -3,9 +3,11 @@ services: ...@@ -3,9 +3,11 @@ services:
ehr-app-ehrpcm2: ehr-app-ehrpcm2:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm2:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpcm2:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
ehr-app/ehr-app-ehrpcm2/src/main/resources/application-ehrpcm2-dev.yml
浏览文件 @ 90ca1f11
server: server:
port: 8080 port: 6092
\ No newline at end of file \ No newline at end of file
ehr-app/ehr-app-ehrpcm2/src/main/resources/application-ehrpcm2-prod.yml
浏览文件 @ 90ca1f11
server: server:
port: 8080 port: 6092
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
ehr-app/ehr-app-ehrpim/src/main/docker/Dockerfile
浏览文件 @ 90ca1f11
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpim.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrpim.jar
EXPOSE 8080 EXPOSE 6092
ADD ehr-app-ehrpim.jar /ehr-app-ehrpim.jar ADD ehr-app-ehrpim.jar /ehr-app-ehrpim.jar
ehr-app/ehr-app-ehrpim/src/main/docker/ehr-app-ehrpim.yaml
浏览文件 @ 90ca1f11
...@@ -3,9 +3,11 @@ services: ...@@ -3,9 +3,11 @@ services:
ehr-app-ehrpim: ehr-app-ehrpim:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpim:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrpim:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
ehr-app/ehr-app-ehrpim/src/main/resources/application-ehrpim-dev.yml
浏览文件 @ 90ca1f11
server: server:
port: 8080 port: 6092
\ No newline at end of file \ No newline at end of file
ehr-app/ehr-app-ehrpim/src/main/resources/application-ehrpim-prod.yml
浏览文件 @ 90ca1f11
server: server:
port: 8080 port: 6092
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
ehr-app/ehr-app-ehrweb/src/main/docker/Dockerfile
浏览文件 @ 90ca1f11
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrweb.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-ehrweb.jar
EXPOSE 8080 EXPOSE 6092
ADD ehr-app-ehrweb.jar /ehr-app-ehrweb.jar ADD ehr-app-ehrweb.jar /ehr-app-ehrweb.jar
ehr-app/ehr-app-ehrweb/src/main/docker/ehr-app-ehrweb.yaml
浏览文件 @ 90ca1f11
...@@ -3,9 +3,11 @@ services: ...@@ -3,9 +3,11 @@ services:
ehr-app-ehrweb: ehr-app-ehrweb:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrweb:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-ehrweb:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
ehr-app/ehr-app-ehrweb/src/main/resources/application-ehrweb-dev.yml
浏览文件 @ 90ca1f11
server: server:
port: 8080 port: 6092
\ No newline at end of file \ No newline at end of file
ehr-app/ehr-app-ehrweb/src/main/resources/application-ehrweb-prod.yml
浏览文件 @ 90ca1f11
server: server:
port: 8080 port: 6092
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
ehr-app/ehr-app-web/src/main/docker/Dockerfile
浏览文件 @ 90ca1f11
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-web.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ehr-app-web.jar
EXPOSE 8080 EXPOSE 6092
ADD ehr-app-web.jar /ehr-app-web.jar ADD ehr-app-web.jar /ehr-app-web.jar
ehr-app/ehr-app-web/src/main/docker/ehr-app-web.yaml
浏览文件 @ 90ca1f11
...@@ -3,9 +3,11 @@ services: ...@@ -3,9 +3,11 @@ services:
ehr-app-web: ehr-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-web:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ehr-app-web:latest
ports: ports:
- "8080:8080" - "6092:6092"
networks: networks:
- agent_network - agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.240.110
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
ehr-app/ehr-app-web/src/main/resources/application-web-dev.yml
浏览文件 @ 90ca1f11
server: server:
port: 8080 port: 6092
\ No newline at end of file \ No newline at end of file
ehr-app/ehr-app-web/src/main/resources/application-web-prod.yml
浏览文件 @ 90ca1f11
server: server:
port: 8080 port: 6092
#zuul网关路由设置 #zuul网关路由设置
zuul: zuul:
......
ehr-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 90ca1f11
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
ehr-core/src/main/resources/liquibase/view.xml
浏览文件 @ 90ca1f11
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
ehr-util/src/main/java/cn/ibizlab/ehr/util/job/PermissionSyncJob.java
浏览文件 @ 90ca1f11
...@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner { ...@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
@Value("${ibiz.enablePermissionValid:false}") @Value("${ibiz.enablePermissionValid:false}")
boolean enablePermissionValid; //是否开启权限校验 boolean enablePermissionValid; //是否开启权限校验
@Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}") @Value("${ibiz.systemid:1A92486F-D8D6-42F7-BD14-426751088CC5}")
private String systemId; private String systemId;
@Override @Override
......
ehr-util/src/main/resources/application-sys.yml
浏览文件 @ 90ca1f11
...@@ -3,7 +3,7 @@ spring: ...@@ -3,7 +3,7 @@ spring:
cloud: cloud:
nacos: nacos:
discovery: discovery:
server-addr: 172.16.102.211:8848 server-addr: 172.16.240.110:8848
cache: cache:
redis: redis:
time-to-live: 3600 time-to-live: 3600
...@@ -20,6 +20,32 @@ spring: ...@@ -20,6 +20,32 @@ spring:
max-wait: 300ms max-wait: 300ms
max-idle: 16 max-idle: 16
min-idle: 8 min-idle: 8
datasource:
username: BPMEHR
password: 'sys'
url: jdbc:oracle:thin:@172.16.170.71:1521:localorcl
driver-class-name: oracle.jdbc.driver.OracleDriver
filters: stat,wall,log4j2
#配置初始化大小/最小/最大
initial-size: 1
min-idle: 1
max-active: 20
#获取连接等待超时时间
max-wait: 60000
#间隔多久进行一次检测，检测需要关闭的空闲连接
time-between-eviction-runs-millis: 60000
#一个连接在池中最小生存的时间
min-evictable-idle-time-millis: 300000
validation-query: SELECT 1 FROM DUAL
test-while-idle: true
test-on-borrow: false
test-on-return: false
#打开PSCache，并指定每个连接上PSCache的大小。oracle设为true，mysql设为false。分库分表较多推荐设置为false
pool-prepared-statements: false
max-pool-prepared-statement-per-connection-size: 20
isSyncDBSchema: false
defaultSchema: BPMEHR
conf: classpath:liquibase/master.xml
#Mybatis-plus配置 #Mybatis-plus配置
mybatis-plus: mybatis-plus:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或