Skip to content

I
iBiz人力资源
提交 571469eb 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

jackwang 部署微服务应用

上级 2373733e
显示空白字符变更
内嵌 并排
正在显示 包含 895 行增加 和 141 行删除
app_PIM/src/mock/entity/hrorg-addresss/hrorg-addresss.ts
浏览文件 @ 571469eb
...@@ -89,15 +89,44 @@ mock.onDelete(new RegExp(/^\/hrorgaddresses\/batch$/)).reply((config: any) => { ...@@ -89,15 +89,44 @@ mock.onDelete(new RegExp(/^\/hrorgaddresses\/batch$/)).reply((config: any) => {
// Select // Select
mock.onGet(new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => { mock.onGet(new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgaddress 方法: Select"); console.groupCollapsed("实体:hrorgaddress 方法: Select");
console.table({url:config.url, method: config.method, data:config.data}); console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config); let status = MockAdapter.mockStatus(config);
if (status !== 200) { if (status !== 200) {
return [status, null]; return [status, null];
} }
const paramArray:Array<any> = ['organizationid','hrorgaddressid']; const paramArray:Array<any> = ['operationunitid','hrorgaddressid'];
const matchArray:any = new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})\/select$/).exec(config.url); const matchArray:any = new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})\/select$/).exec(config.url);
let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
let items = mockDatas ? mockDatas : [];
let _items = items.find((item: any) => Object.is(item.hrorgaddressid, tempValue.hrorgaddressid));
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(_items);
console.groupEnd();
console.groupEnd();
return [status, _items];
});
// Select
mock.onGet(new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgaddress 方法: Select");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['legalid','hrorgaddressid'];
const matchArray:any = new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})\/select$/).exec(config.url);
let tempValue: any = {}; let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){ if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => { paramArray.forEach((item: any, index: number) => {
...@@ -146,15 +175,42 @@ mock.onGet(new RegExp(/^\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).re ...@@ -146,15 +175,42 @@ mock.onGet(new RegExp(/^\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).re
// Create // Create
mock.onPost(new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => { mock.onPost(new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgaddress 方法: Create");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['operationunitid','hrorgaddressid'];
const matchArray:any = new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table({});
console.groupEnd();
console.groupEnd();
return [status, {}];
});
// Create
mock.onPost(new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgaddress 方法: Create"); console.groupCollapsed("实体:hrorgaddress 方法: Create");
console.table({url:config.url, method: config.method, data:config.data}); console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config); let status = MockAdapter.mockStatus(config);
if (status !== 200) { if (status !== 200) {
return [status, null]; return [status, null];
} }
const paramArray:Array<any> = ['organizationid','hrorgaddressid']; const paramArray:Array<any> = ['legalid','hrorgaddressid'];
const matchArray:any = new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url); const matchArray:any = new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
let tempValue: any = {}; let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){ if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => { paramArray.forEach((item: any, index: number) => {
...@@ -199,15 +255,42 @@ mock.onPost(new RegExp(/^\/hrorgaddresses\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((c ...@@ -199,15 +255,42 @@ mock.onPost(new RegExp(/^\/hrorgaddresses\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((c
// Update // Update
mock.onPut(new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => { mock.onPut(new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgaddress 方法: Update"); console.groupCollapsed("实体:hrorgaddress 方法: Update");
console.table({url:config.url, method: config.method, data:config.data}); console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config); let status = MockAdapter.mockStatus(config);
if (status !== 200) { if (status !== 200) {
return [status, null]; return [status, null];
} }
const paramArray:Array<any> = ['organizationid','hrorgaddressid']; const paramArray:Array<any> = ['operationunitid','hrorgaddressid'];
const matchArray:any = new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url); const matchArray:any = new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table({});
console.groupEnd();
console.groupEnd();
return [status, {}];
});
// Update
mock.onPut(new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgaddress 方法: Update");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['legalid','hrorgaddressid'];
const matchArray:any = new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
let tempValue: any = {}; let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){ if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => { paramArray.forEach((item: any, index: number) => {
...@@ -265,8 +348,27 @@ mock.onPut(new RegExp(/^\/hrorgaddresses\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((co ...@@ -265,8 +348,27 @@ mock.onPut(new RegExp(/^\/hrorgaddresses\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((co
// GetDraft // GetDraft
mock.onGet(new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/getdraft$/)).reply((config: any) => { mock.onGet(new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/getdraft$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgaddress 方法: GetDraft");
console.table({url:config.url, method: config.method, data:config.data});
// GetDraft
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table({});
console.groupEnd();
console.groupEnd();
return [status, {}];
});
// GetDraft
mock.onGet(new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/getdraft$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgaddress 方法: GetDraft"); console.groupCollapsed("实体:hrorgaddress 方法: GetDraft");
console.table({url:config.url, method: config.method, data:config.data}); console.table({url:config.url, method: config.method, data:config.data});
// GetDraft // GetDraft
...@@ -299,15 +401,42 @@ mock.onGet(new RegExp(/^\/hrorgaddresses\/getdraft$/)).reply((config: any) => { ...@@ -299,15 +401,42 @@ mock.onGet(new RegExp(/^\/hrorgaddresses\/getdraft$/)).reply((config: any) => {
// CheckKey // CheckKey
mock.onPost(new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/)).reply((config: any) => { mock.onPost(new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgaddress 方法: CheckKey"); console.groupCollapsed("实体:hrorgaddress 方法: CheckKey");
console.table({url:config.url, method: config.method, data:config.data}); console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config); let status = MockAdapter.mockStatus(config);
if (status !== 200) { if (status !== 200) {
return [status, null]; return [status, null];
} }
const paramArray:Array<any> = ['organizationid','hrorgaddressid']; const paramArray:Array<any> = ['operationunitid','hrorgaddressid'];
const matchArray:any = new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url); const matchArray:any = new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url);
let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table({});
console.groupEnd();
console.groupEnd();
return [status, {}];
});
// CheckKey
mock.onPost(new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgaddress 方法: CheckKey");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['legalid','hrorgaddressid'];
const matchArray:any = new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url);
let tempValue: any = {}; let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){ if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => { paramArray.forEach((item: any, index: number) => {
...@@ -364,15 +493,42 @@ mock.onPost(new RegExp(/^\/hrorgaddresses\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/) ...@@ -364,15 +493,42 @@ mock.onPost(new RegExp(/^\/hrorgaddresses\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)
// Save // Save
mock.onPost(new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})\/save$/)).reply((config: any) => { mock.onPost(new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})\/save$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgaddress 方法: Save");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['operationunitid','hrorgaddressid'];
const matchArray:any = new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url);
let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table({});
console.groupEnd();
console.groupEnd();
return [status, {}];
});
// Save
mock.onPost(new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})\/save$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgaddress 方法: Save"); console.groupCollapsed("实体:hrorgaddress 方法: Save");
console.table({url:config.url, method: config.method, data:config.data}); console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config); let status = MockAdapter.mockStatus(config);
if (status !== 200) { if (status !== 200) {
return [status, null]; return [status, null];
} }
const paramArray:Array<any> = ['organizationid','hrorgaddressid']; const paramArray:Array<any> = ['legalid','hrorgaddressid'];
const matchArray:any = new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url); const matchArray:any = new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url);
let tempValue: any = {}; let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){ if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => { paramArray.forEach((item: any, index: number) => {
...@@ -429,16 +585,61 @@ mock.onPost(new RegExp(/^\/hrorgaddresses\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).re ...@@ -429,16 +585,61 @@ mock.onPost(new RegExp(/^\/hrorgaddresses\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).re
// FetchDefault // FetchDefault
mock.onGet(new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/fetchdefault$/)).reply((config: any) => { mock.onGet(new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/fetchdefault$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgaddress 方法: FetchDefault");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['operationunitid'];
let tempValue: any = {};
const matchArray:any = new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/fetchdefault$/).exec(config.url);
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
let items = mockDatas ? mockDatas : [];
if (items.length > 0 && paramArray.length > 0) {
paramArray.forEach((paramkey: any) => {
if (tempValue[paramkey] && tempValue[paramkey].indexOf(";") > 0) {
let keysGrounp: Array<any> = tempValue[paramkey].split(new RegExp(/[\;]/));
let tempArray: Array<any> = [];
keysGrounp.forEach((singlekey: any) => {
let _items = items.filter((item: any) => { return item[paramkey] == singlekey });
if(_items.length >0){
tempArray.push(..._items);
}
})
items = tempArray;
} else {
items = items.filter((item: any) => { return item[paramkey] == tempValue[paramkey] });
}
})
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(items);
console.groupEnd();
console.groupEnd();
return [status, items];
});
// FetchDefault
mock.onGet(new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/fetchdefault$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgaddress 方法: FetchDefault"); console.groupCollapsed("实体:hrorgaddress 方法: FetchDefault");
console.table({url:config.url, method: config.method, data:config.data}); console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config); let status = MockAdapter.mockStatus(config);
if (status !== 200) { if (status !== 200) {
return [status, null]; return [status, null];
} }
const paramArray:Array<any> = ['organizationid']; const paramArray:Array<any> = ['legalid'];
let tempValue: any = {}; let tempValue: any = {};
const matchArray:any = new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/fetchdefault$/).exec(config.url); const matchArray:any = new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/fetchdefault$/).exec(config.url);
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){ if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => { paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, { Object.defineProperty(tempValue, item, {
...@@ -516,22 +717,36 @@ mock.onGet(new RegExp(/^\/hrorgaddresses\/fetchdefault(\?[\w-./?%&=,]*)*$/)).rep ...@@ -516,22 +717,36 @@ mock.onGet(new RegExp(/^\/hrorgaddresses\/fetchdefault(\?[\w-./?%&=,]*)*$/)).rep
return [status, records ? records : []]; return [status, records ? records : []];
}); });
// URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
...@@ -539,15 +754,43 @@ mock.onGet(new RegExp(/^\/hrorgaddresses\/fetchdefault(\?[\w-./?%&=,]*)*$/)).rep ...@@ -539,15 +754,43 @@ mock.onGet(new RegExp(/^\/hrorgaddresses\/fetchdefault(\?[\w-./?%&=,]*)*$/)).rep
// Remove // Remove
mock.onDelete(new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => { mock.onDelete(new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgaddress 方法: Remove"); console.groupCollapsed("实体:hrorgaddress 方法: Remove");
console.table({url:config.url, method: config.method, data:config.data}); console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config); let status = MockAdapter.mockStatus(config);
if (status !== 200) { if (status !== 200) {
return [status, null]; return [status, null];
} }
const paramArray:Array<any> = ['organizationid','hrorgaddressid']; const paramArray:Array<any> = ['operationunitid','hrorgaddressid'];
const matchArray:any = new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url); const matchArray:any = new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
let items = mockDatas ? mockDatas : [];
let _items = items.find((item: any) => Object.is(item.hrorgaddressid, tempValue.hrorgaddressid));
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(_items?_items:{});
console.groupEnd();
console.groupEnd();
return [status, _items?_items:{}];
});
// Remove
mock.onDelete(new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgaddress 方法: Remove");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['legalid','hrorgaddressid'];
const matchArray:any = new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
let tempValue: any = {}; let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){ if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => { paramArray.forEach((item: any, index: number) => {
...@@ -595,15 +838,43 @@ mock.onDelete(new RegExp(/^\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/)).reply(( ...@@ -595,15 +838,43 @@ mock.onDelete(new RegExp(/^\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((
}); });
// Get // Get
mock.onGet(new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => { mock.onGet(new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgaddress 方法: Get");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['operationunitid','hrorgaddressid'];
const matchArray:any = new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
let items = mockDatas ? mockDatas : [];
let _items = items.find((item: any) => Object.is(item.hrorgaddressid, tempValue.hrorgaddressid));
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(_items?_items:{});
console.groupEnd();
console.groupEnd();
return [status, _items?_items:{}];
});
// Get
mock.onGet(new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgaddress 方法: Get"); console.groupCollapsed("实体:hrorgaddress 方法: Get");
console.table({url:config.url, method: config.method, data:config.data}); console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config); let status = MockAdapter.mockStatus(config);
if (status !== 200) { if (status !== 200) {
return [status, null]; return [status, null];
} }
const paramArray:Array<any> = ['organizationid','hrorgaddressid']; const paramArray:Array<any> = ['legalid','hrorgaddressid'];
const matchArray:any = new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url); const matchArray:any = new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgaddresses\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
let tempValue: any = {}; let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){ if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => { paramArray.forEach((item: any, index: number) => {
......
app_PIM/src/mock/entity/hrorg-contacts/hrorg-contacts.ts
浏览文件 @ 571469eb
...@@ -89,15 +89,44 @@ mock.onDelete(new RegExp(/^\/hrorgcontacts\/batch$/)).reply((config: any) => { ...@@ -89,15 +89,44 @@ mock.onDelete(new RegExp(/^\/hrorgcontacts\/batch$/)).reply((config: any) => {
// Select // Select
mock.onGet(new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => { mock.onGet(new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgcontact 方法: Select"); console.groupCollapsed("实体:hrorgcontact 方法: Select");
console.table({url:config.url, method: config.method, data:config.data}); console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config); let status = MockAdapter.mockStatus(config);
if (status !== 200) { if (status !== 200) {
return [status, null]; return [status, null];
} }
const paramArray:Array<any> = ['organizationid','hrorgcontactid']; const paramArray:Array<any> = ['operationunitid','hrorgcontactid'];
const matchArray:any = new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})\/select$/).exec(config.url); const matchArray:any = new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})\/select$/).exec(config.url);
let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
let items = mockDatas ? mockDatas : [];
let _items = items.find((item: any) => Object.is(item.hrorgcontactid, tempValue.hrorgcontactid));
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(_items);
console.groupEnd();
console.groupEnd();
return [status, _items];
});
// Select
mock.onGet(new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgcontact 方法: Select");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['legalid','hrorgcontactid'];
const matchArray:any = new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})\/select$/).exec(config.url);
let tempValue: any = {}; let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){ if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => { paramArray.forEach((item: any, index: number) => {
...@@ -146,15 +175,42 @@ mock.onGet(new RegExp(/^\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).rep ...@@ -146,15 +175,42 @@ mock.onGet(new RegExp(/^\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).rep
// Create // Create
mock.onPost(new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => { mock.onPost(new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgcontact 方法: Create");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['operationunitid','hrorgcontactid'];
const matchArray:any = new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table({});
console.groupEnd();
console.groupEnd();
return [status, {}];
});
// Create
mock.onPost(new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgcontact 方法: Create"); console.groupCollapsed("实体:hrorgcontact 方法: Create");
console.table({url:config.url, method: config.method, data:config.data}); console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config); let status = MockAdapter.mockStatus(config);
if (status !== 200) { if (status !== 200) {
return [status, null]; return [status, null];
} }
const paramArray:Array<any> = ['organizationid','hrorgcontactid']; const paramArray:Array<any> = ['legalid','hrorgcontactid'];
const matchArray:any = new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url); const matchArray:any = new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
let tempValue: any = {}; let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){ if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => { paramArray.forEach((item: any, index: number) => {
...@@ -199,15 +255,42 @@ mock.onPost(new RegExp(/^\/hrorgcontacts\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((co ...@@ -199,15 +255,42 @@ mock.onPost(new RegExp(/^\/hrorgcontacts\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((co
// Update // Update
mock.onPut(new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => { mock.onPut(new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgcontact 方法: Update"); console.groupCollapsed("实体:hrorgcontact 方法: Update");
console.table({url:config.url, method: config.method, data:config.data}); console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config); let status = MockAdapter.mockStatus(config);
if (status !== 200) { if (status !== 200) {
return [status, null]; return [status, null];
} }
const paramArray:Array<any> = ['organizationid','hrorgcontactid']; const paramArray:Array<any> = ['operationunitid','hrorgcontactid'];
const matchArray:any = new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url); const matchArray:any = new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table({});
console.groupEnd();
console.groupEnd();
return [status, {}];
});
// Update
mock.onPut(new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgcontact 方法: Update");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['legalid','hrorgcontactid'];
const matchArray:any = new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
let tempValue: any = {}; let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){ if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => { paramArray.forEach((item: any, index: number) => {
...@@ -265,8 +348,27 @@ mock.onPut(new RegExp(/^\/hrorgcontacts\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((con ...@@ -265,8 +348,27 @@ mock.onPut(new RegExp(/^\/hrorgcontacts\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((con
// GetDraft // GetDraft
mock.onGet(new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/getdraft$/)).reply((config: any) => { mock.onGet(new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/getdraft$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgcontact 方法: GetDraft");
console.table({url:config.url, method: config.method, data:config.data});
// GetDraft
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table({});
console.groupEnd();
console.groupEnd();
return [status, {}];
});
// GetDraft
mock.onGet(new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/getdraft$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgcontact 方法: GetDraft"); console.groupCollapsed("实体:hrorgcontact 方法: GetDraft");
console.table({url:config.url, method: config.method, data:config.data}); console.table({url:config.url, method: config.method, data:config.data});
// GetDraft // GetDraft
...@@ -299,15 +401,42 @@ mock.onGet(new RegExp(/^\/hrorgcontacts\/getdraft$/)).reply((config: any) => { ...@@ -299,15 +401,42 @@ mock.onGet(new RegExp(/^\/hrorgcontacts\/getdraft$/)).reply((config: any) => {
// CheckKey // CheckKey
mock.onPost(new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/)).reply((config: any) => { mock.onPost(new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgcontact 方法: CheckKey"); console.groupCollapsed("实体:hrorgcontact 方法: CheckKey");
console.table({url:config.url, method: config.method, data:config.data}); console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config); let status = MockAdapter.mockStatus(config);
if (status !== 200) { if (status !== 200) {
return [status, null]; return [status, null];
} }
const paramArray:Array<any> = ['organizationid','hrorgcontactid']; const paramArray:Array<any> = ['operationunitid','hrorgcontactid'];
const matchArray:any = new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url); const matchArray:any = new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url);
let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table({});
console.groupEnd();
console.groupEnd();
return [status, {}];
});
// CheckKey
mock.onPost(new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgcontact 方法: CheckKey");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['legalid','hrorgcontactid'];
const matchArray:any = new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url);
let tempValue: any = {}; let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){ if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => { paramArray.forEach((item: any, index: number) => {
...@@ -364,15 +493,42 @@ mock.onPost(new RegExp(/^\/hrorgcontacts\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)) ...@@ -364,15 +493,42 @@ mock.onPost(new RegExp(/^\/hrorgcontacts\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/))
// Save // Save
mock.onPost(new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})\/save$/)).reply((config: any) => { mock.onPost(new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})\/save$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgcontact 方法: Save");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['operationunitid','hrorgcontactid'];
const matchArray:any = new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url);
let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table({});
console.groupEnd();
console.groupEnd();
return [status, {}];
});
// Save
mock.onPost(new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})\/save$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgcontact 方法: Save"); console.groupCollapsed("实体:hrorgcontact 方法: Save");
console.table({url:config.url, method: config.method, data:config.data}); console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config); let status = MockAdapter.mockStatus(config);
if (status !== 200) { if (status !== 200) {
return [status, null]; return [status, null];
} }
const paramArray:Array<any> = ['organizationid','hrorgcontactid']; const paramArray:Array<any> = ['legalid','hrorgcontactid'];
const matchArray:any = new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url); const matchArray:any = new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url);
let tempValue: any = {}; let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){ if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => { paramArray.forEach((item: any, index: number) => {
...@@ -429,16 +585,61 @@ mock.onPost(new RegExp(/^\/hrorgcontacts\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).rep ...@@ -429,16 +585,61 @@ mock.onPost(new RegExp(/^\/hrorgcontacts\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).rep
// FetchDefault // FetchDefault
mock.onGet(new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/fetchdefault$/)).reply((config: any) => { mock.onGet(new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/fetchdefault$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgcontact 方法: FetchDefault");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['operationunitid'];
let tempValue: any = {};
const matchArray:any = new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/fetchdefault$/).exec(config.url);
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
let items = mockDatas ? mockDatas : [];
if (items.length > 0 && paramArray.length > 0) {
paramArray.forEach((paramkey: any) => {
if (tempValue[paramkey] && tempValue[paramkey].indexOf(";") > 0) {
let keysGrounp: Array<any> = tempValue[paramkey].split(new RegExp(/[\;]/));
let tempArray: Array<any> = [];
keysGrounp.forEach((singlekey: any) => {
let _items = items.filter((item: any) => { return item[paramkey] == singlekey });
if(_items.length >0){
tempArray.push(..._items);
}
})
items = tempArray;
} else {
items = items.filter((item: any) => { return item[paramkey] == tempValue[paramkey] });
}
})
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(items);
console.groupEnd();
console.groupEnd();
return [status, items];
});
// FetchDefault
mock.onGet(new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/fetchdefault$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgcontact 方法: FetchDefault"); console.groupCollapsed("实体:hrorgcontact 方法: FetchDefault");
console.table({url:config.url, method: config.method, data:config.data}); console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config); let status = MockAdapter.mockStatus(config);
if (status !== 200) { if (status !== 200) {
return [status, null]; return [status, null];
} }
const paramArray:Array<any> = ['organizationid']; const paramArray:Array<any> = ['legalid'];
let tempValue: any = {}; let tempValue: any = {};
const matchArray:any = new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/fetchdefault$/).exec(config.url); const matchArray:any = new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/fetchdefault$/).exec(config.url);
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){ if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => { paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, { Object.defineProperty(tempValue, item, {
...@@ -516,22 +717,36 @@ mock.onGet(new RegExp(/^\/hrorgcontacts\/fetchdefault(\?[\w-./?%&=,]*)*$/)).repl ...@@ -516,22 +717,36 @@ mock.onGet(new RegExp(/^\/hrorgcontacts\/fetchdefault(\?[\w-./?%&=,]*)*$/)).repl
return [status, records ? records : []]; return [status, records ? records : []];
}); });
// URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
...@@ -539,15 +754,43 @@ mock.onGet(new RegExp(/^\/hrorgcontacts\/fetchdefault(\?[\w-./?%&=,]*)*$/)).repl ...@@ -539,15 +754,43 @@ mock.onGet(new RegExp(/^\/hrorgcontacts\/fetchdefault(\?[\w-./?%&=,]*)*$/)).repl
// Remove // Remove
mock.onDelete(new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => { mock.onDelete(new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgcontact 方法: Remove"); console.groupCollapsed("实体:hrorgcontact 方法: Remove");
console.table({url:config.url, method: config.method, data:config.data}); console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config); let status = MockAdapter.mockStatus(config);
if (status !== 200) { if (status !== 200) {
return [status, null]; return [status, null];
} }
const paramArray:Array<any> = ['organizationid','hrorgcontactid']; const paramArray:Array<any> = ['operationunitid','hrorgcontactid'];
const matchArray:any = new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url); const matchArray:any = new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
let items = mockDatas ? mockDatas : [];
let _items = items.find((item: any) => Object.is(item.hrorgcontactid, tempValue.hrorgcontactid));
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(_items?_items:{});
console.groupEnd();
console.groupEnd();
return [status, _items?_items:{}];
});
// Remove
mock.onDelete(new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgcontact 方法: Remove");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['legalid','hrorgcontactid'];
const matchArray:any = new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
let tempValue: any = {}; let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){ if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => { paramArray.forEach((item: any, index: number) => {
...@@ -595,15 +838,43 @@ mock.onDelete(new RegExp(/^\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((c ...@@ -595,15 +838,43 @@ mock.onDelete(new RegExp(/^\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((c
}); });
// Get // Get
mock.onGet(new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => { mock.onGet(new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgcontact 方法: Get");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['operationunitid','hrorgcontactid'];
const matchArray:any = new RegExp(/^\/hroperationunits\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
let items = mockDatas ? mockDatas : [];
let _items = items.find((item: any) => Object.is(item.hrorgcontactid, tempValue.hrorgcontactid));
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(_items?_items:{});
console.groupEnd();
console.groupEnd();
return [status, _items?_items:{}];
});
// Get
mock.onGet(new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
console.groupCollapsed("实体:hrorgcontact 方法: Get"); console.groupCollapsed("实体:hrorgcontact 方法: Get");
console.table({url:config.url, method: config.method, data:config.data}); console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config); let status = MockAdapter.mockStatus(config);
if (status !== 200) { if (status !== 200) {
return [status, null]; return [status, null];
} }
const paramArray:Array<any> = ['organizationid','hrorgcontactid']; const paramArray:Array<any> = ['legalid','hrorgcontactid'];
const matchArray:any = new RegExp(/^\/hrorganizations\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url); const matchArray:any = new RegExp(/^\/hrlegals\/([a-zA-Z0-9\-\;]{1,35})\/hrorgcontacts\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
let tempValue: any = {}; let tempValue: any = {};
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){ if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => { paramArray.forEach((item: any, index: number) => {
......
app_PIM/src/pages/base/hrorg-address-grid-view/hrorg-address-grid-view-base.tsx
浏览文件 @ 571469eb
...@@ -564,9 +564,9 @@ export class HROrgAddressGridViewBase extends GridViewBase { ...@@ -564,9 +564,9 @@ export class HROrgAddressGridViewBase extends GridViewBase {
Object.assign(tempContext,args[0]); Object.assign(tempContext,args[0]);
} }
let deResParameters: any[] = []; let deResParameters: any[] = [];
if(tempContext.hrorganization && true){ if(tempContext.hrlegal && true){
deResParameters = [ deResParameters = [
{ pathName: 'hrorganizations', parameterName: 'hrorganization' }, { pathName: 'hrlegals', parameterName: 'hrlegal' },
] ]
} }
const parameters: any[] = [ const parameters: any[] = [
...@@ -615,9 +615,9 @@ export class HROrgAddressGridViewBase extends GridViewBase { ...@@ -615,9 +615,9 @@ export class HROrgAddressGridViewBase extends GridViewBase {
Object.assign(tempContext,args[0]); Object.assign(tempContext,args[0]);
} }
let deResParameters: any[] = []; let deResParameters: any[] = [];
if(tempContext.hrorganization && true){ if(tempContext.hrlegal && true){
deResParameters = [ deResParameters = [
{ pathName: 'hrorganizations', parameterName: 'hrorganization' }, { pathName: 'hrlegals', parameterName: 'hrlegal' },
] ]
} }
const parameters: any[] = [ const parameters: any[] = [
......
app_PIM/src/pages/base/hrorg-address-v-001/hrorg-address-v-001-base.tsx
浏览文件 @ 571469eb
...@@ -207,9 +207,9 @@ export class HROrgAddressV_001Base extends GridView9Base { ...@@ -207,9 +207,9 @@ export class HROrgAddressV_001Base extends GridView9Base {
Object.assign(tempContext,args[0]); Object.assign(tempContext,args[0]);
} }
let deResParameters: any[] = []; let deResParameters: any[] = [];
if(tempContext.hrorganization && true){ if(tempContext.hrlegal && true){
deResParameters = [ deResParameters = [
{ pathName: 'hrorganizations', parameterName: 'hrorganization' }, { pathName: 'hrlegals', parameterName: 'hrlegal' },
] ]
} }
const parameters: any[] = [ const parameters: any[] = [
......
app_PIM/src/pages/base/hrorg-contact-grid-view/hrorg-contact-grid-view-base.tsx
浏览文件 @ 571469eb
...@@ -564,9 +564,9 @@ export class HROrgContactGridViewBase extends GridViewBase { ...@@ -564,9 +564,9 @@ export class HROrgContactGridViewBase extends GridViewBase {
Object.assign(tempContext,args[0]); Object.assign(tempContext,args[0]);
} }
let deResParameters: any[] = []; let deResParameters: any[] = [];
if(tempContext.hrorganization && true){ if(tempContext.hrlegal && true){
deResParameters = [ deResParameters = [
{ pathName: 'hrorganizations', parameterName: 'hrorganization' }, { pathName: 'hrlegals', parameterName: 'hrlegal' },
] ]
} }
const parameters: any[] = [ const parameters: any[] = [
...@@ -615,9 +615,9 @@ export class HROrgContactGridViewBase extends GridViewBase { ...@@ -615,9 +615,9 @@ export class HROrgContactGridViewBase extends GridViewBase {
Object.assign(tempContext,args[0]); Object.assign(tempContext,args[0]);
} }
let deResParameters: any[] = []; let deResParameters: any[] = [];
if(tempContext.hrorganization && true){ if(tempContext.hrlegal && true){
deResParameters = [ deResParameters = [
{ pathName: 'hrorganizations', parameterName: 'hrorganization' }, { pathName: 'hrlegals', parameterName: 'hrlegal' },
] ]
} }
const parameters: any[] = [ const parameters: any[] = [
......
app_PIM/src/pages/base/hrorg-contact-v-001/hrorg-contact-v-001-base.tsx
浏览文件 @ 571469eb
...@@ -214,9 +214,9 @@ export class HROrgContactV_001Base extends GridView9Base { ...@@ -214,9 +214,9 @@ export class HROrgContactV_001Base extends GridView9Base {
Object.assign(tempContext,args[0]); Object.assign(tempContext,args[0]);
} }
let deResParameters: any[] = []; let deResParameters: any[] = [];
if(tempContext.hrorganization && true){ if(tempContext.hrlegal && true){
deResParameters = [ deResParameters = [
{ pathName: 'hrorganizations', parameterName: 'hrorganization' }, { pathName: 'hrlegals', parameterName: 'hrlegal' },
] ]
} }
const parameters: any[] = [ const parameters: any[] = [
...@@ -265,9 +265,9 @@ export class HROrgContactV_001Base extends GridView9Base { ...@@ -265,9 +265,9 @@ export class HROrgContactV_001Base extends GridView9Base {
Object.assign(tempContext,args[0]); Object.assign(tempContext,args[0]);
} }
let deResParameters: any[] = []; let deResParameters: any[] = [];
if(tempContext.hrorganization && true){ if(tempContext.hrlegal && true){
deResParameters = [ deResParameters = [
{ pathName: 'hrorganizations', parameterName: 'hrorganization' }, { pathName: 'hrlegals', parameterName: 'hrlegal' },
] ]
} }
const parameters: any[] = [ const parameters: any[] = [
......
app_PIM/src/pages/ungroup/pim/router.ts
浏览文件 @ 571469eb
...@@ -86,13 +86,28 @@ const router = new Router({ ...@@ -86,13 +86,28 @@ const router = new Router({
component: () => import('@pages/base/hrorganization-grid-view/hrorganization-grid-view.vue'), component: () => import('@pages/base/hrorganization-grid-view/hrorganization-grid-view.vue'),
}, },
{ {
path: 'hrorganizations/:hrorganization?/hrorgcontacts/:hrorgcontact?/editview/:editview?', path: 'hroperationunits/:hroperationunit?/hrorgcontacts/:hrorgcontact?/editview/:editview?',
meta: { meta: {
caption: 'entities.hrorgcontact.views.editview.title', caption: 'entities.hrorgcontact.views.editview.title',
info:'', info:'',
parameters: [ parameters: [
{ pathName: 'pim', parameterName: 'pim' }, { pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrorganizations', parameterName: 'hrorganization' }, { pathName: 'hroperationunits', parameterName: 'hroperationunit' },
{ pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
{ pathName: 'editview', parameterName: 'editview' },
],
requireAuth: true,
},
component: () => import('@pages/base/hrorg-contact-edit-view/hrorg-contact-edit-view.vue'),
},
{
path: 'hrlegals/:hrlegal?/hrorgcontacts/:hrorgcontact?/editview/:editview?',
meta: {
caption: 'entities.hrorgcontact.views.editview.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrlegals', parameterName: 'hrlegal' },
{ pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' }, { pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
{ pathName: 'editview', parameterName: 'editview' }, { pathName: 'editview', parameterName: 'editview' },
], ],
...@@ -143,13 +158,28 @@ const router = new Router({ ...@@ -143,13 +158,28 @@ const router = new Router({
component: () => import('@pages/base/hrlegal-v-002/hrlegal-v-002.vue'), component: () => import('@pages/base/hrlegal-v-002/hrlegal-v-002.vue'),
}, },
{ {
path: 'hrorganizations/:hrorganization?/hrorgaddresses/:hrorgaddress?/editview/:editview?', path: 'hroperationunits/:hroperationunit?/hrorgaddresses/:hrorgaddress?/editview/:editview?',
meta: { meta: {
caption: 'entities.hrorgaddress.views.editview.title', caption: 'entities.hrorgaddress.views.editview.title',
info:'', info:'',
parameters: [ parameters: [
{ pathName: 'pim', parameterName: 'pim' }, { pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrorganizations', parameterName: 'hrorganization' }, { pathName: 'hroperationunits', parameterName: 'hroperationunit' },
{ pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' },
{ pathName: 'editview', parameterName: 'editview' },
],
requireAuth: true,
},
component: () => import('@pages/base/hrorg-address-edit-view/hrorg-address-edit-view.vue'),
},
{
path: 'hrlegals/:hrlegal?/hrorgaddresses/:hrorgaddress?/editview/:editview?',
meta: {
caption: 'entities.hrorgaddress.views.editview.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrlegals', parameterName: 'hrlegal' },
{ pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' }, { pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' },
{ pathName: 'editview', parameterName: 'editview' }, { pathName: 'editview', parameterName: 'editview' },
], ],
...@@ -172,13 +202,28 @@ const router = new Router({ ...@@ -172,13 +202,28 @@ const router = new Router({
component: () => import('@pages/base/hrorg-address-edit-view/hrorg-address-edit-view.vue'), component: () => import('@pages/base/hrorg-address-edit-view/hrorg-address-edit-view.vue'),
}, },
{ {
path: 'hrorganizations/:hrorganization?/hrorgcontacts/:hrorgcontact?/gridview/:gridview?', path: 'hroperationunits/:hroperationunit?/hrorgcontacts/:hrorgcontact?/gridview/:gridview?',
meta: { meta: {
caption: 'entities.hrorgcontact.views.gridview.title', caption: 'entities.hrorgcontact.views.gridview.title',
info:'', info:'',
parameters: [ parameters: [
{ pathName: 'pim', parameterName: 'pim' }, { pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrorganizations', parameterName: 'hrorganization' }, { pathName: 'hroperationunits', parameterName: 'hroperationunit' },
{ pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
requireAuth: true,
},
component: () => import('@pages/base/hrorg-contact-grid-view/hrorg-contact-grid-view.vue'),
},
{
path: 'hrlegals/:hrlegal?/hrorgcontacts/:hrorgcontact?/gridview/:gridview?',
meta: {
caption: 'entities.hrorgcontact.views.gridview.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrlegals', parameterName: 'hrlegal' },
{ pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' }, { pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'gridview', parameterName: 'gridview' },
], ],
...@@ -201,13 +246,28 @@ const router = new Router({ ...@@ -201,13 +246,28 @@ const router = new Router({
component: () => import('@pages/base/hrorg-contact-grid-view/hrorg-contact-grid-view.vue'), component: () => import('@pages/base/hrorg-contact-grid-view/hrorg-contact-grid-view.vue'),
}, },
{ {
path: 'hrorganizations/:hrorganization?/hrorgaddresses/:hrorgaddress?/gridview/:gridview?', path: 'hroperationunits/:hroperationunit?/hrorgaddresses/:hrorgaddress?/gridview/:gridview?',
meta: { meta: {
caption: 'entities.hrorgaddress.views.gridview.title', caption: 'entities.hrorgaddress.views.gridview.title',
info:'', info:'',
parameters: [ parameters: [
{ pathName: 'pim', parameterName: 'pim' }, { pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrorganizations', parameterName: 'hrorganization' }, { pathName: 'hroperationunits', parameterName: 'hroperationunit' },
{ pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
requireAuth: true,
},
component: () => import('@pages/base/hrorg-address-grid-view/hrorg-address-grid-view.vue'),
},
{
path: 'hrlegals/:hrlegal?/hrorgaddresses/:hrorgaddress?/gridview/:gridview?',
meta: {
caption: 'entities.hrorgaddress.views.gridview.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrlegals', parameterName: 'hrlegal' },
{ pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' }, { pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' },
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'gridview', parameterName: 'gridview' },
], ],
...@@ -300,13 +360,28 @@ const router = new Router({ ...@@ -300,13 +360,28 @@ const router = new Router({
component: () => import('@pages/base/hrlegal-tab-exp-view/hrlegal-tab-exp-view.vue'), component: () => import('@pages/base/hrlegal-tab-exp-view/hrlegal-tab-exp-view.vue'),
}, },
{ {
path: 'hrorganizations/:hrorganization?/hrorgcontacts/:hrorgcontact?/v_001/:v_001?', path: 'hroperationunits/:hroperationunit?/hrorgcontacts/:hrorgcontact?/v_001/:v_001?',
meta: { meta: {
caption: 'entities.hrorgcontact.views.v_001.title', caption: 'entities.hrorgcontact.views.v_001.title',
info:'', info:'',
parameters: [ parameters: [
{ pathName: 'pim', parameterName: 'pim' }, { pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrorganizations', parameterName: 'hrorganization' }, { pathName: 'hroperationunits', parameterName: 'hroperationunit' },
{ pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
{ pathName: 'v_001', parameterName: 'v_001' },
],
requireAuth: true,
},
component: () => import('@pages/base/hrorg-contact-v-001/hrorg-contact-v-001.vue'),
},
{
path: 'hrlegals/:hrlegal?/hrorgcontacts/:hrorgcontact?/v_001/:v_001?',
meta: {
caption: 'entities.hrorgcontact.views.v_001.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrlegals', parameterName: 'hrlegal' },
{ pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' }, { pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
{ pathName: 'v_001', parameterName: 'v_001' }, { pathName: 'v_001', parameterName: 'v_001' },
], ],
...@@ -329,13 +404,28 @@ const router = new Router({ ...@@ -329,13 +404,28 @@ const router = new Router({
component: () => import('@pages/base/hrorg-contact-v-001/hrorg-contact-v-001.vue'), component: () => import('@pages/base/hrorg-contact-v-001/hrorg-contact-v-001.vue'),
}, },
{ {
path: 'hrorganizations/:hrorganization?/hrorgaddresses/:hrorgaddress?/v_001/:v_001?', path: 'hroperationunits/:hroperationunit?/hrorgaddresses/:hrorgaddress?/v_001/:v_001?',
meta: { meta: {
caption: 'entities.hrorgaddress.views.v_001.title', caption: 'entities.hrorgaddress.views.v_001.title',
info:'', info:'',
parameters: [ parameters: [
{ pathName: 'pim', parameterName: 'pim' }, { pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrorganizations', parameterName: 'hrorganization' }, { pathName: 'hroperationunits', parameterName: 'hroperationunit' },
{ pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' },
{ pathName: 'v_001', parameterName: 'v_001' },
],
requireAuth: true,
},
component: () => import('@pages/base/hrorg-address-v-001/hrorg-address-v-001.vue'),
},
{
path: 'hrlegals/:hrlegal?/hrorgaddresses/:hrorgaddress?/v_001/:v_001?',
meta: {
caption: 'entities.hrorgaddress.views.v_001.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrlegals', parameterName: 'hrlegal' },
{ pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' }, { pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' },
{ pathName: 'v_001', parameterName: 'v_001' }, { pathName: 'v_001', parameterName: 'v_001' },
], ],
......
app_PIM/src/service/hrlegal/hrlegal-service-base.ts
浏览文件 @ 571469eb
...@@ -73,6 +73,8 @@ export default class HRLegalServiceBase extends EntityService { ...@@ -73,6 +73,8 @@ export default class HRLegalServiceBase 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(`/hrlegals`,data,isloading); let res:any = await Http.getInstance().post(`/hrlegals`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_hrorgaddresses',JSON.stringify(res.data.hrorgaddresses?res.data.hrorgaddresses:[]));
this.tempStorage.setItem(tempContext.srfsessionkey+'_hrorgcontacts',JSON.stringify(res.data.hrorgcontacts?res.data.hrorgcontacts:[]));
return res; return res;
} }
......
app_PIM/src/service/hroperation-unit/hroperation-unit-service-base.ts
浏览文件 @ 571469eb
...@@ -73,6 +73,8 @@ export default class HROperationUnitServiceBase extends EntityService { ...@@ -73,6 +73,8 @@ export default class HROperationUnitServiceBase 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(`/hroperationunits`,data,isloading); let res:any = await Http.getInstance().post(`/hroperationunits`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_hrorgaddresses',JSON.stringify(res.data.hrorgaddresses?res.data.hrorgaddresses:[]));
this.tempStorage.setItem(tempContext.srfsessionkey+'_hrorgcontacts',JSON.stringify(res.data.hrorgcontacts?res.data.hrorgcontacts:[]));
return res; return res;
} }
......
app_PIM/src/service/hrorg-address/hrorg-address-service-base.ts
浏览文件 @ 571469eb
...@@ -48,8 +48,13 @@ export default class HROrgAddressServiceBase extends EntityService { ...@@ -48,8 +48,13 @@ export default class HROrgAddressServiceBase extends EntityService {
* @memberof HROrgAddressServiceBase * @memberof HROrgAddressServiceBase
*/ */
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.hrorganization && context.hrorgaddress){ if(context.hroperationunit && context.hrorgaddress){
let res:any = Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgaddresses/${context.hrorgaddress}/select`,isloading); let res:any = Http.getInstance().get(`/hroperationunits/${context.hroperationunit}/hrorgaddresses/${context.hrorgaddress}/select`,isloading);
return res;
}
if(context.hrlegal && context.hrorgaddress){
let res:any = Http.getInstance().get(`/hrlegals/${context.hrlegal}/hrorgaddresses/${context.hrorgaddress}/select`,isloading);
return res; return res;
} }
...@@ -68,7 +73,7 @@ export default class HROrgAddressServiceBase extends EntityService { ...@@ -68,7 +73,7 @@ export default class HROrgAddressServiceBase extends EntityService {
* @memberof HROrgAddressServiceBase * @memberof HROrgAddressServiceBase
*/ */
public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.hrorganization && true){ if(context.hroperationunit && true){
let masterData:any = {}; let masterData:any = {};
Object.assign(data,masterData); Object.assign(data,masterData);
if(!data.srffrontuf || data.srffrontuf !== "1"){ if(!data.srffrontuf || data.srffrontuf !== "1"){
...@@ -78,7 +83,21 @@ export default class HROrgAddressServiceBase extends EntityService { ...@@ -78,7 +83,21 @@ export default class HROrgAddressServiceBase extends EntityService {
delete data.srffrontuf; delete data.srffrontuf;
} }
let tempContext:any = JSON.parse(JSON.stringify(context)); let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/hrorganizations/${context.hrorganization}/hrorgaddresses`,data,isloading); let res:any = await Http.getInstance().post(`/hroperationunits/${context.hroperationunit}/hrorgaddresses`,data,isloading);
return res;
}
if(context.hrlegal && true){
let masterData:any = {};
Object.assign(data,masterData);
if(!data.srffrontuf || data.srffrontuf !== "1"){
data[this.APPDEKEY] = null;
}
if(data.srffrontuf){
delete data.srffrontuf;
}
let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/hrlegals/${context.hrlegal}/hrorgaddresses`,data,isloading);
return res; return res;
} }
...@@ -106,10 +125,17 @@ export default class HROrgAddressServiceBase extends EntityService { ...@@ -106,10 +125,17 @@ export default class HROrgAddressServiceBase extends EntityService {
* @memberof HROrgAddressServiceBase * @memberof HROrgAddressServiceBase
*/ */
public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.hrorganization && context.hrorgaddress){ if(context.hroperationunit && context.hrorgaddress){
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/hroperationunits/${context.hroperationunit}/hrorgaddresses/${context.hrorgaddress}`,data,isloading);
return res;
}
if(context.hrlegal && context.hrorgaddress){
let masterData:any = {}; let masterData:any = {};
Object.assign(data,masterData); Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/hrorganizations/${context.hrorganization}/hrorgaddresses/${context.hrorgaddress}`,data,isloading); let res:any = await Http.getInstance().put(`/hrlegals/${context.hrlegal}/hrorgaddresses/${context.hrorgaddress}`,data,isloading);
return res; return res;
} }
...@@ -130,8 +156,12 @@ export default class HROrgAddressServiceBase extends EntityService { ...@@ -130,8 +156,12 @@ export default class HROrgAddressServiceBase extends EntityService {
* @memberof HROrgAddressServiceBase * @memberof HROrgAddressServiceBase
*/ */
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.hrorganization && context.hrorgaddress){ if(context.hroperationunit && context.hrorgaddress){
let res:any = Http.getInstance().delete(`/hrorganizations/${context.hrorganization}/hrorgaddresses/${context.hrorgaddress}`,isloading); let res:any = Http.getInstance().delete(`/hroperationunits/${context.hroperationunit}/hrorgaddresses/${context.hrorgaddress}`,isloading);
return res;
}
if(context.hrlegal && context.hrorgaddress){
let res:any = Http.getInstance().delete(`/hrlegals/${context.hrlegal}/hrorgaddresses/${context.hrorgaddress}`,isloading);
return res; return res;
} }
let res:any = Http.getInstance().delete(`/hrorgaddresses/${context.hrorgaddress}`,isloading); let res:any = Http.getInstance().delete(`/hrorgaddresses/${context.hrorgaddress}`,isloading);
...@@ -148,8 +178,13 @@ export default class HROrgAddressServiceBase extends EntityService { ...@@ -148,8 +178,13 @@ export default class HROrgAddressServiceBase extends EntityService {
* @memberof HROrgAddressServiceBase * @memberof HROrgAddressServiceBase
*/ */
public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.hrorganization && context.hrorgaddress){ if(context.hroperationunit && context.hrorgaddress){
let res:any = await Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgaddresses/${context.hrorgaddress}`,isloading); let res:any = await Http.getInstance().get(`/hroperationunits/${context.hroperationunit}/hrorgaddresses/${context.hrorgaddress}`,isloading);
return res;
}
if(context.hrlegal && context.hrorgaddress){
let res:any = await Http.getInstance().get(`/hrlegals/${context.hrlegal}/hrorgaddresses/${context.hrorgaddress}`,isloading);
return res; return res;
} }
...@@ -168,8 +203,14 @@ export default class HROrgAddressServiceBase extends EntityService { ...@@ -168,8 +203,14 @@ export default class HROrgAddressServiceBase extends EntityService {
* @memberof HROrgAddressServiceBase * @memberof HROrgAddressServiceBase
*/ */
public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.hrorganization && true){ if(context.hroperationunit && true){
let res:any = await Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgaddresses/getdraft`,isloading); let res:any = await Http.getInstance().get(`/hroperationunits/${context.hroperationunit}/hrorgaddresses/getdraft`,isloading);
res.data.hrorgaddress = data.hrorgaddress;
return res;
}
if(context.hrlegal && true){
let res:any = await Http.getInstance().get(`/hrlegals/${context.hrlegal}/hrorgaddresses/getdraft`,isloading);
res.data.hrorgaddress = data.hrorgaddress; res.data.hrorgaddress = data.hrorgaddress;
return res; return res;
...@@ -190,10 +231,17 @@ export default class HROrgAddressServiceBase extends EntityService { ...@@ -190,10 +231,17 @@ export default class HROrgAddressServiceBase extends EntityService {
* @memberof HROrgAddressServiceBase * @memberof HROrgAddressServiceBase
*/ */
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.hrorganization && context.hrorgaddress){ if(context.hroperationunit && context.hrorgaddress){
let masterData:any = {}; let masterData:any = {};
Object.assign(data,masterData); Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/hrorganizations/${context.hrorganization}/hrorgaddresses/${context.hrorgaddress}/checkkey`,data,isloading); let res:any = await Http.getInstance().post(`/hroperationunits/${context.hroperationunit}/hrorgaddresses/${context.hrorgaddress}/checkkey`,data,isloading);
return res;
}
if(context.hrlegal && context.hrorgaddress){
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/hrlegals/${context.hrlegal}/hrorgaddresses/${context.hrorgaddress}/checkkey`,data,isloading);
return res; return res;
} }
...@@ -211,10 +259,17 @@ export default class HROrgAddressServiceBase extends EntityService { ...@@ -211,10 +259,17 @@ export default class HROrgAddressServiceBase extends EntityService {
* @memberof HROrgAddressServiceBase * @memberof HROrgAddressServiceBase
*/ */
public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.hrorganization && context.hrorgaddress){ if(context.hroperationunit && context.hrorgaddress){
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/hroperationunits/${context.hroperationunit}/hrorgaddresses/${context.hrorgaddress}/save`,data,isloading);
return res;
}
if(context.hrlegal && context.hrorgaddress){
let masterData:any = {}; let masterData:any = {};
Object.assign(data,masterData); Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/hrorganizations/${context.hrorganization}/hrorgaddresses/${context.hrorgaddress}/save`,data,isloading); let res:any = await Http.getInstance().post(`/hrlegals/${context.hrlegal}/hrorgaddresses/${context.hrorgaddress}/save`,data,isloading);
return res; return res;
} }
...@@ -235,9 +290,14 @@ export default class HROrgAddressServiceBase extends EntityService { ...@@ -235,9 +290,14 @@ export default class HROrgAddressServiceBase extends EntityService {
* @memberof HROrgAddressServiceBase * @memberof HROrgAddressServiceBase
*/ */
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.hrorganization && true){ if(context.hroperationunit && true){
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = Http.getInstance().get(`/hroperationunits/${context.hroperationunit}/hrorgaddresses/fetchdefault`,tempData,isloading);
return res;
}
if(context.hrlegal && true){
let tempData:any = JSON.parse(JSON.stringify(data)); let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgaddresses/fetchdefault`,tempData,isloading); let res:any = Http.getInstance().get(`/hrlegals/${context.hrlegal}/hrorgaddresses/fetchdefault`,tempData,isloading);
return res; return res;
} }
let tempData:any = JSON.parse(JSON.stringify(data)); let tempData:any = JSON.parse(JSON.stringify(data));
......
app_PIM/src/service/hrorg-contact/hrorg-contact-service-base.ts
浏览文件 @ 571469eb
...@@ -48,8 +48,13 @@ export default class HROrgContactServiceBase extends EntityService { ...@@ -48,8 +48,13 @@ export default class HROrgContactServiceBase extends EntityService {
* @memberof HROrgContactServiceBase * @memberof HROrgContactServiceBase
*/ */
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.hrorganization && context.hrorgcontact){ if(context.hroperationunit && context.hrorgcontact){
let res:any = Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgcontacts/${context.hrorgcontact}/select`,isloading); let res:any = Http.getInstance().get(`/hroperationunits/${context.hroperationunit}/hrorgcontacts/${context.hrorgcontact}/select`,isloading);
return res;
}
if(context.hrlegal && context.hrorgcontact){
let res:any = Http.getInstance().get(`/hrlegals/${context.hrlegal}/hrorgcontacts/${context.hrorgcontact}/select`,isloading);
return res; return res;
} }
...@@ -68,7 +73,7 @@ export default class HROrgContactServiceBase extends EntityService { ...@@ -68,7 +73,7 @@ export default class HROrgContactServiceBase extends EntityService {
* @memberof HROrgContactServiceBase * @memberof HROrgContactServiceBase
*/ */
public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.hrorganization && true){ if(context.hroperationunit && true){
let masterData:any = {}; let masterData:any = {};
Object.assign(data,masterData); Object.assign(data,masterData);
if(!data.srffrontuf || data.srffrontuf !== "1"){ if(!data.srffrontuf || data.srffrontuf !== "1"){
...@@ -78,7 +83,21 @@ export default class HROrgContactServiceBase extends EntityService { ...@@ -78,7 +83,21 @@ export default class HROrgContactServiceBase extends EntityService {
delete data.srffrontuf; delete data.srffrontuf;
} }
let tempContext:any = JSON.parse(JSON.stringify(context)); let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/hrorganizations/${context.hrorganization}/hrorgcontacts`,data,isloading); let res:any = await Http.getInstance().post(`/hroperationunits/${context.hroperationunit}/hrorgcontacts`,data,isloading);
return res;
}
if(context.hrlegal && true){
let masterData:any = {};
Object.assign(data,masterData);
if(!data.srffrontuf || data.srffrontuf !== "1"){
data[this.APPDEKEY] = null;
}
if(data.srffrontuf){
delete data.srffrontuf;
}
let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/hrlegals/${context.hrlegal}/hrorgcontacts`,data,isloading);
return res; return res;
} }
...@@ -106,10 +125,17 @@ export default class HROrgContactServiceBase extends EntityService { ...@@ -106,10 +125,17 @@ export default class HROrgContactServiceBase extends EntityService {
* @memberof HROrgContactServiceBase * @memberof HROrgContactServiceBase
*/ */
public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.hrorganization && context.hrorgcontact){ if(context.hroperationunit && context.hrorgcontact){
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/hroperationunits/${context.hroperationunit}/hrorgcontacts/${context.hrorgcontact}`,data,isloading);
return res;
}
if(context.hrlegal && context.hrorgcontact){
let masterData:any = {}; let masterData:any = {};
Object.assign(data,masterData); Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/hrorganizations/${context.hrorganization}/hrorgcontacts/${context.hrorgcontact}`,data,isloading); let res:any = await Http.getInstance().put(`/hrlegals/${context.hrlegal}/hrorgcontacts/${context.hrorgcontact}`,data,isloading);
return res; return res;
} }
...@@ -130,8 +156,12 @@ export default class HROrgContactServiceBase extends EntityService { ...@@ -130,8 +156,12 @@ export default class HROrgContactServiceBase extends EntityService {
* @memberof HROrgContactServiceBase * @memberof HROrgContactServiceBase
*/ */
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.hrorganization && context.hrorgcontact){ if(context.hroperationunit && context.hrorgcontact){
let res:any = Http.getInstance().delete(`/hrorganizations/${context.hrorganization}/hrorgcontacts/${context.hrorgcontact}`,isloading); let res:any = Http.getInstance().delete(`/hroperationunits/${context.hroperationunit}/hrorgcontacts/${context.hrorgcontact}`,isloading);
return res;
}
if(context.hrlegal && context.hrorgcontact){
let res:any = Http.getInstance().delete(`/hrlegals/${context.hrlegal}/hrorgcontacts/${context.hrorgcontact}`,isloading);
return res; return res;
} }
let res:any = Http.getInstance().delete(`/hrorgcontacts/${context.hrorgcontact}`,isloading); let res:any = Http.getInstance().delete(`/hrorgcontacts/${context.hrorgcontact}`,isloading);
...@@ -148,8 +178,13 @@ export default class HROrgContactServiceBase extends EntityService { ...@@ -148,8 +178,13 @@ export default class HROrgContactServiceBase extends EntityService {
* @memberof HROrgContactServiceBase * @memberof HROrgContactServiceBase
*/ */
public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.hrorganization && context.hrorgcontact){ if(context.hroperationunit && context.hrorgcontact){
let res:any = await Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgcontacts/${context.hrorgcontact}`,isloading); let res:any = await Http.getInstance().get(`/hroperationunits/${context.hroperationunit}/hrorgcontacts/${context.hrorgcontact}`,isloading);
return res;
}
if(context.hrlegal && context.hrorgcontact){
let res:any = await Http.getInstance().get(`/hrlegals/${context.hrlegal}/hrorgcontacts/${context.hrorgcontact}`,isloading);
return res; return res;
} }
...@@ -168,8 +203,14 @@ export default class HROrgContactServiceBase extends EntityService { ...@@ -168,8 +203,14 @@ export default class HROrgContactServiceBase extends EntityService {
* @memberof HROrgContactServiceBase * @memberof HROrgContactServiceBase
*/ */
public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.hrorganization && true){ if(context.hroperationunit && true){
let res:any = await Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgcontacts/getdraft`,isloading); let res:any = await Http.getInstance().get(`/hroperationunits/${context.hroperationunit}/hrorgcontacts/getdraft`,isloading);
res.data.hrorgcontact = data.hrorgcontact;
return res;
}
if(context.hrlegal && true){
let res:any = await Http.getInstance().get(`/hrlegals/${context.hrlegal}/hrorgcontacts/getdraft`,isloading);
res.data.hrorgcontact = data.hrorgcontact; res.data.hrorgcontact = data.hrorgcontact;
return res; return res;
...@@ -190,10 +231,17 @@ export default class HROrgContactServiceBase extends EntityService { ...@@ -190,10 +231,17 @@ export default class HROrgContactServiceBase extends EntityService {
* @memberof HROrgContactServiceBase * @memberof HROrgContactServiceBase
*/ */
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.hrorganization && context.hrorgcontact){ if(context.hroperationunit && context.hrorgcontact){
let masterData:any = {}; let masterData:any = {};
Object.assign(data,masterData); Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/hrorganizations/${context.hrorganization}/hrorgcontacts/${context.hrorgcontact}/checkkey`,data,isloading); let res:any = await Http.getInstance().post(`/hroperationunits/${context.hroperationunit}/hrorgcontacts/${context.hrorgcontact}/checkkey`,data,isloading);
return res;
}
if(context.hrlegal && context.hrorgcontact){
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/hrlegals/${context.hrlegal}/hrorgcontacts/${context.hrorgcontact}/checkkey`,data,isloading);
return res; return res;
} }
...@@ -211,10 +259,17 @@ export default class HROrgContactServiceBase extends EntityService { ...@@ -211,10 +259,17 @@ export default class HROrgContactServiceBase extends EntityService {
* @memberof HROrgContactServiceBase * @memberof HROrgContactServiceBase
*/ */
public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.hrorganization && context.hrorgcontact){ if(context.hroperationunit && context.hrorgcontact){
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/hroperationunits/${context.hroperationunit}/hrorgcontacts/${context.hrorgcontact}/save`,data,isloading);
return res;
}
if(context.hrlegal && context.hrorgcontact){
let masterData:any = {}; let masterData:any = {};
Object.assign(data,masterData); Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/hrorganizations/${context.hrorganization}/hrorgcontacts/${context.hrorgcontact}/save`,data,isloading); let res:any = await Http.getInstance().post(`/hrlegals/${context.hrlegal}/hrorgcontacts/${context.hrorgcontact}/save`,data,isloading);
return res; return res;
} }
...@@ -235,9 +290,14 @@ export default class HROrgContactServiceBase extends EntityService { ...@@ -235,9 +290,14 @@ export default class HROrgContactServiceBase extends EntityService {
* @memberof HROrgContactServiceBase * @memberof HROrgContactServiceBase
*/ */
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.hrorganization && true){ if(context.hroperationunit && true){
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = Http.getInstance().get(`/hroperationunits/${context.hroperationunit}/hrorgcontacts/fetchdefault`,tempData,isloading);
return res;
}
if(context.hrlegal && true){
let tempData:any = JSON.parse(JSON.stringify(data)); let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgcontacts/fetchdefault`,tempData,isloading); let res:any = Http.getInstance().get(`/hrlegals/${context.hrlegal}/hrorgcontacts/fetchdefault`,tempData,isloading);
return res; return res;
} }
let tempData:any = JSON.parse(JSON.stringify(data)); let tempData:any = JSON.parse(JSON.stringify(data));
......
app_PIM/src/service/hrorganization/hrorganization-service-base.ts
浏览文件 @ 571469eb
...@@ -73,8 +73,6 @@ export default class HROrganizationServiceBase extends EntityService { ...@@ -73,8 +73,6 @@ export default class HROrganizationServiceBase 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(`/hrorganizations`,data,isloading); let res:any = await Http.getInstance().post(`/hrorganizations`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_hrorgaddresses',JSON.stringify(res.data.hrorgaddresses?res.data.hrorgaddresses:[]));
this.tempStorage.setItem(tempContext.srfsessionkey+'_hrorgcontacts',JSON.stringify(res.data.hrorgcontacts?res.data.hrorgcontacts:[]));
return res; return res;
} }
......
app_PIM/src/widgets/hrlegal/if-001-form/if-001-form.html
浏览文件 @ 571469eb
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
paramItem='hrlegal' paramItem='hrlegal'
:parentdata='{"srfparentdename":"HRLEGAL","SRFPARENTTYPE":"CUSTOM"}' :parentdata='{"srfparentdename":"HRLEGAL","SRFPARENTTYPE":"CUSTOM"}'
:parameters="[ :parameters="[
{ pathName: 'hrorganizations', parameterName: 'hrorganization' }, { pathName: 'hrlegals', parameterName: 'hrlegal' },
]" ]"
:context="context" :context="context"
:viewparams="viewparams" :viewparams="viewparams"
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
paramItem='hrlegal' paramItem='hrlegal'
:parentdata='{"srfparentdename":"HRLEGAL","SRFPARENTTYPE":"CUSTOM"}' :parentdata='{"srfparentdename":"HRLEGAL","SRFPARENTTYPE":"CUSTOM"}'
:parameters="[ :parameters="[
{ pathName: 'hrorganizations', parameterName: 'hrorganization' }, { pathName: 'hrlegals', parameterName: 'hrlegal' },
]" ]"
:context="context" :context="context"
:viewparams="viewparams" :viewparams="viewparams"
......
config.xml
浏览文件 @ 571469eb
...@@ -37,11 +37,11 @@ ...@@ -37,11 +37,11 @@
git clone -b master $para2 ibizhumanresources/ git clone -b master $para2 ibizhumanresources/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd ibizhumanresources/ cd ibizhumanresources/
mvn clean package -Phrapi mvn clean package -Ppim
cd humanresource-provider/humanresource-provider-hrapi cd humanresource-app/humanresource-app-pim
mvn -Phrapi docker:build mvn -Ppim docker:build
mvn -Phrapi docker:push mvn -Ppim docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-provider-hrapi.yaml iBizEE --with-registry-auth docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-app-pim.yaml iBizEE --with-registry-auth
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
humanresource-app/humanresource-app-pim/src/main/docker/Dockerfile
浏览文件 @ 571469eb
...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar
EXPOSE 8080 EXPOSE 10327
ADD humanresource-app-pim.jar /humanresource-app-pim.jar ADD humanresource-app-pim.jar /humanresource-app-pim.jar
humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml
浏览文件 @ 571469eb
...@@ -3,9 +3,25 @@ services: ...@@ -3,9 +3,25 @@ services:
humanresource-app-pim: humanresource-app-pim:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
ports: ports:
- "8080:8080" - "10327:10327"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=10327
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.240.110
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
- SPRING_DATASOURCE_PASSWORD=b1@@@772
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
- SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
- SEATA_ENABLED=true
deploy: deploy:
resources: resources:
limits: limits:
......
humanresource-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile
浏览文件 @ 571469eb
...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-provider-hrapi.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-provider-hrapi.jar
EXPOSE 10317 EXPOSE 8081
ADD humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar ADD humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar
humanresource-provider/humanresource-provider-hrapi/src/main/docker/humanresource-provider-hrapi.yaml
浏览文件 @ 571469eb
...@@ -3,25 +3,9 @@ services: ...@@ -3,25 +3,9 @@ services:
humanresource-provider-hrapi: humanresource-provider-hrapi:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
ports: ports:
- "10317:10317" - "8081:8081"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=10317
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.240.110
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
- SPRING_DATASOURCE_PASSWORD=b1@@@772
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
- SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
- SEATA_ENABLED=true
deploy: deploy:
resources: resources:
limits: limits:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或