提交 d90f1b24 编写于 作者: ibizdev's avatar ibizdev

jackwang 部署微服务应用

上级 dd92657c
...@@ -9,6 +9,16 @@ ...@@ -9,6 +9,16 @@
"viewtag": "02571ad88a921ccc490d7b727b4f767d", "viewtag": "02571ad88a921ccc490d7b727b4f767d",
"memo": "" "memo": ""
}, },
"hremployeev_006": {
"title": "员工",
"caption": "员工",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
"viewname": "HREmployeeV_006",
"viewfilename": "hremployee-v-006",
"viewtag": "0276c23869eb449c9c9308aea58f8239",
"memo": "系统自动添加"
},
"hromhierarchycatpickupgridview": { "hromhierarchycatpickupgridview": {
"title": "结构层次类别选择表格视图", "title": "结构层次类别选择表格视图",
"caption": "结构层次类别", "caption": "结构层次类别",
...@@ -229,6 +239,16 @@ ...@@ -229,6 +239,16 @@
"viewtag": "2b64c322042da1808776304d21c90e45", "viewtag": "2b64c322042da1808776304d21c90e45",
"memo": "系统自动添加" "memo": "系统自动添加"
}, },
"hremployeev_004": {
"title": "员工",
"caption": "员工",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
"viewname": "HREmployeeV_004",
"viewfilename": "hremployee-v-004",
"viewtag": "2be7fce8ded3576d64c338d4d1ee2e34",
"memo": "系统自动添加"
},
"hromhierarchycatpickupview": { "hromhierarchycatpickupview": {
"title": "结构层次类别数据选择视图", "title": "结构层次类别数据选择视图",
"caption": "结构层次类别", "caption": "结构层次类别",
...@@ -650,8 +670,8 @@ ...@@ -650,8 +670,8 @@
"memo": "系统自动添加" "memo": "系统自动添加"
}, },
"hremployeegridview": { "hremployeegridview": {
"title": "员工清单", "title": "员工",
"caption": "员工清单", "caption": "员工",
"viewtype": "DEGRIDVIEW", "viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource", "viewmodule": "HumanResource",
"viewname": "HREmployeeGridView", "viewname": "HREmployeeGridView",
...@@ -659,6 +679,16 @@ ...@@ -659,6 +679,16 @@
"viewtag": "9559258a9c3ac118e15ead941b780682", "viewtag": "9559258a9c3ac118e15ead941b780682",
"memo": "" "memo": ""
}, },
"hremployeetabexpview": {
"title": "员工分页表格",
"caption": "员工",
"viewtype": "DETABEXPVIEW",
"viewmodule": "HumanResource",
"viewname": "HREmployeeTabExpView",
"viewfilename": "hremployee-tab-exp-view",
"viewtag": "997c27311a28f6ed4e41153c43a5f723",
"memo": ""
},
"hrtrainingrecordeditview": { "hrtrainingrecordeditview": {
"title": "培训记录编辑视图", "title": "培训记录编辑视图",
"caption": "培训记录", "caption": "培训记录",
...@@ -699,6 +729,16 @@ ...@@ -699,6 +729,16 @@
"viewtag": "a54a950e4550856191ac9bb32f77b863", "viewtag": "a54a950e4550856191ac9bb32f77b863",
"memo": "系统自动添加" "memo": "系统自动添加"
}, },
"hremployeev_003": {
"title": "员工",
"caption": "员工",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
"viewname": "HREmployeeV_003",
"viewfilename": "hremployee-v-003",
"viewtag": "a761b3f62ea851c3de0c6febb2df7fb3",
"memo": "系统自动添加"
},
"hromhierarchycateditview": { "hromhierarchycateditview": {
"title": "结构层次类别编辑视图", "title": "结构层次类别编辑视图",
"caption": "结构层次类别", "caption": "结构层次类别",
...@@ -979,6 +1019,16 @@ ...@@ -979,6 +1019,16 @@
"viewtag": "de53ae7d577a526b3b268951df885868", "viewtag": "de53ae7d577a526b3b268951df885868",
"memo": "系统自动添加" "memo": "系统自动添加"
}, },
"hremployeev_005": {
"title": "员工",
"caption": "员工",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
"viewname": "HREmployeeV_005",
"viewfilename": "hremployee-v-005",
"viewtag": "df641376a477230f2dac638fe717516a",
"memo": "系统自动添加"
},
"hrfamilyeditview": { "hrfamilyeditview": {
"title": "家庭情况编辑视图", "title": "家庭情况编辑视图",
"caption": "家庭情况", "caption": "家庭情况",
......
...@@ -341,4 +341,12 @@ export interface HREmployee { ...@@ -341,4 +341,12 @@ export interface HREmployee {
* @memberof HREmployee * @memberof HREmployee
*/ */
hrdutyname?: any; hrdutyname?: any;
/**
* 试用期
*
* @returns {*}
* @memberof HREmployee
*/
probationtime?: any;
} }
\ No newline at end of file
...@@ -60,6 +60,40 @@ export default { ...@@ -60,6 +60,40 @@ export default {
uiactions: { uiactions: {
}, },
}, },
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "New",
tip: "New",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
editviewtoolbar_toolbar: { editviewtoolbar_toolbar: {
tbitem3: { tbitem3: {
caption: "Save", caption: "Save",
...@@ -106,38 +140,4 @@ export default { ...@@ -106,38 +140,4 @@ export default {
tip: "Help", tip: "Help",
}, },
}, },
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "New",
tip: "New",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
}; };
\ No newline at end of file
...@@ -59,6 +59,40 @@ export default { ...@@ -59,6 +59,40 @@ export default {
uiactions: { uiactions: {
}, },
}, },
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "新建",
tip: "新建",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
},
editviewtoolbar_toolbar: { editviewtoolbar_toolbar: {
tbitem3: { tbitem3: {
caption: "保存", caption: "保存",
...@@ -105,38 +139,4 @@ export default { ...@@ -105,38 +139,4 @@ export default {
tip: "帮助", tip: "帮助",
}, },
}, },
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "新建",
tip: "新建",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
},
}; };
\ No newline at end of file
...@@ -76,6 +76,40 @@ export default { ...@@ -76,6 +76,40 @@ export default {
uiactions: { uiactions: {
}, },
}, },
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "New",
tip: "New",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
editviewtoolbar_toolbar: { editviewtoolbar_toolbar: {
tbitem3: { tbitem3: {
caption: "Save", caption: "Save",
...@@ -122,38 +156,4 @@ export default { ...@@ -122,38 +156,4 @@ export default {
tip: "Help", tip: "Help",
}, },
}, },
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "New",
tip: "New",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
}; };
\ No newline at end of file
...@@ -75,6 +75,40 @@ export default { ...@@ -75,6 +75,40 @@ export default {
uiactions: { uiactions: {
}, },
}, },
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "新建",
tip: "新建",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
},
editviewtoolbar_toolbar: { editviewtoolbar_toolbar: {
tbitem3: { tbitem3: {
caption: "保存", caption: "保存",
...@@ -121,38 +155,4 @@ export default { ...@@ -121,38 +155,4 @@ export default {
tip: "帮助", tip: "帮助",
}, },
}, },
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "新建",
tip: "新建",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
},
}; };
\ No newline at end of file
...@@ -43,12 +43,21 @@ export default { ...@@ -43,12 +43,21 @@ export default {
hrpostid: "职位标识", hrpostid: "职位标识",
hrpostname: "职位", hrpostname: "职位",
hrdutyname: "职务", hrdutyname: "职务",
probationtime: "试用期",
}, },
views: { views: {
v_006: {
caption: "员工",
title: "员工",
},
v_001: { v_001: {
caption: "快速新建", caption: "快速新建",
title: "快速新建", title: "快速新建",
}, },
v_004: {
caption: "员工",
title: "员工",
},
v_002: { v_002: {
caption: "员工信息", caption: "员工信息",
title: "员工信息", title: "员工信息",
...@@ -62,8 +71,16 @@ export default { ...@@ -62,8 +71,16 @@ export default {
title: "员工信息", title: "员工信息",
}, },
gridview: { gridview: {
caption: "员工清单", caption: "员工",
title: "员工清单", title: "员工",
},
tabexpview: {
caption: "员工",
title: "员工分页表格",
},
v_003: {
caption: "员工",
title: "员工",
}, },
editview: { editview: {
caption: "员工信息", caption: "员工信息",
...@@ -77,6 +94,10 @@ export default { ...@@ -77,6 +94,10 @@ export default {
caption: "员工看板", caption: "员工看板",
title: "员工看板", title: "员工看板",
}, },
v_005: {
caption: "员工",
title: "员工",
},
pickupview: { pickupview: {
caption: "员工", caption: "员工",
title: "员工数据选择视图", title: "员工数据选择视图",
...@@ -269,6 +290,132 @@ export default { ...@@ -269,6 +290,132 @@ export default {
tip: "关闭", tip: "关闭",
}, },
}, },
v_006toolbar_toolbar: {
tbitem1_ff_002: {
caption: "新建",
tip: "新建",
},
tbitem2: {
caption: "-",
tip: "",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem6: {
caption: "Copy",
tip: "Copy {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
v_004toolbar_toolbar: {
tbitem1_ff_002: {
caption: "新建",
tip: "新建",
},
tbitem2: {
caption: "-",
tip: "",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem6: {
caption: "Copy",
tip: "Copy {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
v_005toolbar_toolbar: {
tbitem1_ff_002: {
caption: "新建",
tip: "新建",
},
tbitem2: {
caption: "-",
tip: "",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem6: {
caption: "Copy",
tip: "Copy {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
gridviewtoolbar_toolbar: { gridviewtoolbar_toolbar: {
tbitem1_ff_002: { tbitem1_ff_002: {
caption: "新建", caption: "新建",
...@@ -311,6 +458,48 @@ export default { ...@@ -311,6 +458,48 @@ export default {
tip: "Filter", tip: "Filter",
}, },
}, },
v_003toolbar_toolbar: {
tbitem1_ff_002: {
caption: "新建",
tip: "新建",
},
tbitem2: {
caption: "-",
tip: "",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem6: {
caption: "Copy",
tip: "Copy {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
listexpviewtoolbar_toolbar: { listexpviewtoolbar_toolbar: {
tbitem3: { tbitem3: {
caption: "New", caption: "New",
......
...@@ -42,12 +42,21 @@ export default { ...@@ -42,12 +42,21 @@ export default {
hrpostid: "职位标识", hrpostid: "职位标识",
hrpostname: "职位", hrpostname: "职位",
hrdutyname: "职务", hrdutyname: "职务",
probationtime: "试用期",
}, },
views: { views: {
v_006: {
caption: "员工",
title: "员工",
},
v_001: { v_001: {
caption: "快速新建", caption: "快速新建",
title: "快速新建", title: "快速新建",
}, },
v_004: {
caption: "员工",
title: "员工",
},
v_002: { v_002: {
caption: "员工信息", caption: "员工信息",
title: "员工信息", title: "员工信息",
...@@ -61,8 +70,16 @@ export default { ...@@ -61,8 +70,16 @@ export default {
title: "员工信息", title: "员工信息",
}, },
gridview: { gridview: {
caption: "员工清单", caption: "员工",
title: "员工清单", title: "员工",
},
tabexpview: {
caption: "员工",
title: "员工分页表格",
},
v_003: {
caption: "员工",
title: "员工",
}, },
editview: { editview: {
caption: "员工信息", caption: "员工信息",
...@@ -76,6 +93,10 @@ export default { ...@@ -76,6 +93,10 @@ export default {
caption: "员工看板", caption: "员工看板",
title: "员工看板", title: "员工看板",
}, },
v_005: {
caption: "员工",
title: "员工",
},
pickupview: { pickupview: {
caption: "员工", caption: "员工",
title: "员工数据选择视图", title: "员工数据选择视图",
...@@ -268,6 +289,132 @@ export default { ...@@ -268,6 +289,132 @@ export default {
tip: "关闭", tip: "关闭",
}, },
}, },
v_006toolbar_toolbar: {
tbitem1_ff_002: {
caption: "新建",
tip: "新建",
},
tbitem2: {
caption: "-",
tip: "",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem6: {
caption: "拷贝",
tip: "拷贝",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
},
v_004toolbar_toolbar: {
tbitem1_ff_002: {
caption: "新建",
tip: "新建",
},
tbitem2: {
caption: "-",
tip: "",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem6: {
caption: "拷贝",
tip: "拷贝",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
},
v_005toolbar_toolbar: {
tbitem1_ff_002: {
caption: "新建",
tip: "新建",
},
tbitem2: {
caption: "-",
tip: "",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem6: {
caption: "拷贝",
tip: "拷贝",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
},
gridviewtoolbar_toolbar: { gridviewtoolbar_toolbar: {
tbitem1_ff_002: { tbitem1_ff_002: {
caption: "新建", caption: "新建",
...@@ -310,6 +457,48 @@ export default { ...@@ -310,6 +457,48 @@ export default {
tip: "过滤", tip: "过滤",
}, },
}, },
v_003toolbar_toolbar: {
tbitem1_ff_002: {
caption: "新建",
tip: "新建",
},
tbitem2: {
caption: "-",
tip: "",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem6: {
caption: "拷贝",
tip: "拷贝",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
},
listexpviewtoolbar_toolbar: { listexpviewtoolbar_toolbar: {
tbitem3: { tbitem3: {
caption: "新建", caption: "新建",
......
...@@ -271,6 +271,50 @@ mock.onPost(new RegExp(/^\/hremployees\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply ...@@ -271,6 +271,50 @@ mock.onPost(new RegExp(/^\/hremployees\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply
return [status, data]; return [status, data];
}); });
// FetchAfterProbation
mock.onGet(new RegExp(/^\/hremployees\/fetchafterprobation$/)).reply((config: any) => {
console.groupCollapsed("实体:hremployee 方法: FetchAfterProbation");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(mockDatas);
console.groupEnd();
console.groupEnd();
return [status, mockDatas ? mockDatas : []];
});
// FetchAfterProbation
mock.onGet(new RegExp(/^\/hremployees\/fetchafterprobation(\?[\w-./?%&=,]*)*$/)).reply((config: any) => {
console.groupCollapsed("实体:hremployee 方法: FetchAfterProbation");
console.table({url:config.url, method: config.method, data:config.data});
if(config.url.includes('page')){
let url = config.url.split('?')[1];
let params = qs.parse(url);
Object.assign(config, params);
}
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
let total = mockDatas.length;
let records: Array<any> = [];
if(!config.page || !config.size){
records = mockDatas;
}else{
if((config.page-1)*config.size < total){
records = mockDatas.slice(config.page,config.size);
}
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(records ? records : []);
console.groupEnd();
console.groupEnd();
return [status, records ? records : []];
});
// FetchDefault // FetchDefault
mock.onGet(new RegExp(/^\/hremployees\/fetchdefault$/)).reply((config: any) => { mock.onGet(new RegExp(/^\/hremployees\/fetchdefault$/)).reply((config: any) => {
console.groupCollapsed("实体:hremployee 方法: FetchDefault"); console.groupCollapsed("实体:hremployee 方法: FetchDefault");
...@@ -314,6 +358,138 @@ mock.onGet(new RegExp(/^\/hremployees\/fetchdefault(\?[\w-./?%&=,]*)*$/)).reply( ...@@ -314,6 +358,138 @@ mock.onGet(new RegExp(/^\/hremployees\/fetchdefault(\?[\w-./?%&=,]*)*$/)).reply(
console.groupEnd(); console.groupEnd();
return [status, records ? records : []]; return [status, records ? records : []];
}); });
// FetchLeaveDuty
mock.onGet(new RegExp(/^\/hremployees\/fetchleaveduty$/)).reply((config: any) => {
console.groupCollapsed("实体:hremployee 方法: FetchLeaveDuty");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(mockDatas);
console.groupEnd();
console.groupEnd();
return [status, mockDatas ? mockDatas : []];
});
// FetchLeaveDuty
mock.onGet(new RegExp(/^\/hremployees\/fetchleaveduty(\?[\w-./?%&=,]*)*$/)).reply((config: any) => {
console.groupCollapsed("实体:hremployee 方法: FetchLeaveDuty");
console.table({url:config.url, method: config.method, data:config.data});
if(config.url.includes('page')){
let url = config.url.split('?')[1];
let params = qs.parse(url);
Object.assign(config, params);
}
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
let total = mockDatas.length;
let records: Array<any> = [];
if(!config.page || !config.size){
records = mockDatas;
}else{
if((config.page-1)*config.size < total){
records = mockDatas.slice(config.page,config.size);
}
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(records ? records : []);
console.groupEnd();
console.groupEnd();
return [status, records ? records : []];
});
// FetchOnDuty
mock.onGet(new RegExp(/^\/hremployees\/fetchonduty$/)).reply((config: any) => {
console.groupCollapsed("实体:hremployee 方法: FetchOnDuty");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(mockDatas);
console.groupEnd();
console.groupEnd();
return [status, mockDatas ? mockDatas : []];
});
// FetchOnDuty
mock.onGet(new RegExp(/^\/hremployees\/fetchonduty(\?[\w-./?%&=,]*)*$/)).reply((config: any) => {
console.groupCollapsed("实体:hremployee 方法: FetchOnDuty");
console.table({url:config.url, method: config.method, data:config.data});
if(config.url.includes('page')){
let url = config.url.split('?')[1];
let params = qs.parse(url);
Object.assign(config, params);
}
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
let total = mockDatas.length;
let records: Array<any> = [];
if(!config.page || !config.size){
records = mockDatas;
}else{
if((config.page-1)*config.size < total){
records = mockDatas.slice(config.page,config.size);
}
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(records ? records : []);
console.groupEnd();
console.groupEnd();
return [status, records ? records : []];
});
// FetchWaitDuty
mock.onGet(new RegExp(/^\/hremployees\/fetchwaitduty$/)).reply((config: any) => {
console.groupCollapsed("实体:hremployee 方法: FetchWaitDuty");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(mockDatas);
console.groupEnd();
console.groupEnd();
return [status, mockDatas ? mockDatas : []];
});
// FetchWaitDuty
mock.onGet(new RegExp(/^\/hremployees\/fetchwaitduty(\?[\w-./?%&=,]*)*$/)).reply((config: any) => {
console.groupCollapsed("实体:hremployee 方法: FetchWaitDuty");
console.table({url:config.url, method: config.method, data:config.data});
if(config.url.includes('page')){
let url = config.url.split('?')[1];
let params = qs.parse(url);
Object.assign(config, params);
}
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
let total = mockDatas.length;
let records: Array<any> = [];
if(!config.page || !config.size){
records = mockDatas;
}else{
if((config.page-1)*config.size < total){
records = mockDatas.slice(config.page,config.size);
}
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(records ? records : []);
console.groupEnd();
console.groupEnd();
return [status, records ? records : []];
});
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
// URI参数传递情况未实现 // URI参数传递情况未实现
......
...@@ -15,6 +15,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -15,6 +15,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "HRDutyV_001", "viewname": "HRDutyV_001",
"viewtag": "02571ad88a921ccc490d7b727b4f767d" "viewtag": "02571ad88a921ccc490d7b727b4f767d"
}, },
"hremployeev_006": {
"title": "员工",
"caption": "员工",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
"viewname": "HREmployeeV_006",
"viewtag": "0276c23869eb449c9c9308aea58f8239"
},
"hromhierarchycatpickupgridview": { "hromhierarchycatpickupgridview": {
"title": "结构层次类别选择表格视图", "title": "结构层次类别选择表格视图",
"caption": "结构层次类别", "caption": "结构层次类别",
...@@ -191,6 +199,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -191,6 +199,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "HROrgAddressGridView", "viewname": "HROrgAddressGridView",
"viewtag": "2b64c322042da1808776304d21c90e45" "viewtag": "2b64c322042da1808776304d21c90e45"
}, },
"hremployeev_004": {
"title": "员工",
"caption": "员工",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
"viewname": "HREmployeeV_004",
"viewtag": "2be7fce8ded3576d64c338d4d1ee2e34"
},
"hromhierarchycatpickupview": { "hromhierarchycatpickupview": {
"title": "结构层次类别数据选择视图", "title": "结构层次类别数据选择视图",
"caption": "结构层次类别", "caption": "结构层次类别",
...@@ -528,13 +544,21 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -528,13 +544,21 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtag": "9420eeffff765c2a6e4ac27dfae7fb2d" "viewtag": "9420eeffff765c2a6e4ac27dfae7fb2d"
}, },
"hremployeegridview": { "hremployeegridview": {
"title": "员工清单", "title": "员工",
"caption": "员工清单", "caption": "员工",
"viewtype": "DEGRIDVIEW", "viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource", "viewmodule": "HumanResource",
"viewname": "HREmployeeGridView", "viewname": "HREmployeeGridView",
"viewtag": "9559258a9c3ac118e15ead941b780682" "viewtag": "9559258a9c3ac118e15ead941b780682"
}, },
"hremployeetabexpview": {
"title": "员工分页表格",
"caption": "员工",
"viewtype": "DETABEXPVIEW",
"viewmodule": "HumanResource",
"viewname": "HREmployeeTabExpView",
"viewtag": "997c27311a28f6ed4e41153c43a5f723"
},
"hrtrainingrecordeditview": { "hrtrainingrecordeditview": {
"title": "培训记录编辑视图", "title": "培训记录编辑视图",
"caption": "培训记录", "caption": "培训记录",
...@@ -567,6 +591,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -567,6 +591,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "HRDutySkillEditView", "viewname": "HRDutySkillEditView",
"viewtag": "a54a950e4550856191ac9bb32f77b863" "viewtag": "a54a950e4550856191ac9bb32f77b863"
}, },
"hremployeev_003": {
"title": "员工",
"caption": "员工",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
"viewname": "HREmployeeV_003",
"viewtag": "a761b3f62ea851c3de0c6febb2df7fb3"
},
"hromhierarchycateditview": { "hromhierarchycateditview": {
"title": "结构层次类别编辑视图", "title": "结构层次类别编辑视图",
"caption": "结构层次类别", "caption": "结构层次类别",
...@@ -791,6 +823,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -791,6 +823,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "HRDutyPickupGridView", "viewname": "HRDutyPickupGridView",
"viewtag": "de53ae7d577a526b3b268951df885868" "viewtag": "de53ae7d577a526b3b268951df885868"
}, },
"hremployeev_005": {
"title": "员工",
"caption": "员工",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
"viewname": "HREmployeeV_005",
"viewtag": "df641376a477230f2dac638fe717516a"
},
"hrfamilyeditview": { "hrfamilyeditview": {
"title": "家庭情况编辑视图", "title": "家庭情况编辑视图",
"caption": "家庭情况", "caption": "家庭情况",
......
...@@ -9,7 +9,7 @@ import CodeListService from "@service/app/codelist-service"; ...@@ -9,7 +9,7 @@ import CodeListService from "@service/app/codelist-service";
/** /**
* 员工清单视图基类 * 员工视图基类
* *
* @export * @export
* @class HREmployeeGridViewBase * @class HREmployeeGridViewBase
......
<studio-view-style2 viewName="hremployeegridview" viewTitle="员工清单" class='degridview hremployee-grid-view'> <studio-view-style2 viewName="hremployeegridview" viewTitle="员工" class='degridview hremployee-grid-view'>
<i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="员工姓名" search @on-search="onSearch($event)"/> <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="员工姓名" search @on-search="onSearch($event)"/>
<template slot="toolbar"> <template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template> <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template>
......
...@@ -7,7 +7,7 @@ import view_grid from '@widgets/hremployee/main-grid/main-grid.vue'; ...@@ -7,7 +7,7 @@ import view_grid from '@widgets/hremployee/main-grid/main-grid.vue';
import view_searchform from '@widgets/hremployee/default-searchform/default-searchform.vue'; import view_searchform from '@widgets/hremployee/default-searchform/default-searchform.vue';
/** /**
* 员工清单视图 * 员工视图
* *
* @export * @export
* @class HREmployeeGridView * @class HREmployeeGridView
......
import { Subject } from 'rxjs';
import { TabExpViewBase } from '@/studio-core';
import HREmployeeService from '@/service/hremployee/hremployee-service';
import HREmployeeAuthService from '@/authservice/hremployee/hremployee-auth-service';
import TabExpViewEngine from '@engine/view/tab-exp-view-engine';
import HREmployeeUIService from '@/uiservice/hremployee/hremployee-ui-service';
/**
* 员工分页表格视图基类
*
* @export
* @class HREmployeeTabExpViewBase
* @extends {TabExpViewBase}
*/
export class HREmployeeTabExpViewBase extends TabExpViewBase {
/**
* 视图对应应用实体名称
*
* @protected
* @type {string}
* @memberof HREmployeeTabExpViewBase
*/
protected appDeName: string = 'hremployee';
/**
* 应用实体主键
*
* @protected
* @type {string}
* @memberof HREmployeeTabExpViewBase
*/
protected appDeKey: string = 'employeeid';
/**
* 应用实体主信息
*
* @protected
* @type {string}
* @memberof HREmployeeTabExpViewBase
*/
protected appDeMajor: string = 'employeename';
/**
* 实体服务对象
*
* @type {HREmployeeService}
* @memberof HREmployeeTabExpViewBase
*/
protected appEntityService: HREmployeeService = new HREmployeeService;
/**
* 实体权限服务对象
*
* @type HREmployeeUIService
* @memberof HREmployeeTabExpViewBase
*/
public appUIService: HREmployeeUIService = new HREmployeeUIService(this.$store);
/**
* 计数器服务对象集合
*
* @protected
* @type {Array<*>}
* @memberof HREmployeeTabExpViewBase
*/
protected counterServiceArray: Array<any> = [];
/**
* 视图模型数据
*
* @protected
* @type {*}
* @memberof HREmployeeTabExpViewBase
*/
protected model: any = {
srfCaption: 'entities.hremployee.views.tabexpview.caption',
srfTitle: 'entities.hremployee.views.tabexpview.title',
srfSubTitle: 'entities.hremployee.views.tabexpview.subtitle',
dataInfo: ''
}
/**
* 容器模型
*
* @protected
* @type {*}
* @memberof HREmployeeTabExpViewBase
*/
protected containerModel: any = {
view_tabexppanel: { name: 'tabexppanel', type: 'TABEXPPANEL' },
};
/**
* 视图唯一标识
*
* @protected
* @type {string}
* @memberof ViewBase
*/
protected viewtag: string = '997c27311a28f6ed4e41153c43a5f723';
/**
* 视图引擎
*
* @public
* @type {Engine}
* @memberof HREmployeeTabExpViewBase
*/
public engine: TabExpViewEngine = new TabExpViewEngine();
/**
* 引擎初始化
*
* @public
* @memberof HREmployeeTabExpViewBase
*/
public engineInit(): void {
this.engine.init({
view: this,
keyPSDEField: 'hremployee',
majorPSDEField: 'employeename',
isLoadDefault: true,
});
}
}
\ No newline at end of file
<studio-view-style2 viewName="hremployeetabexpview" viewTitle="员工分页表格" class='detabexpview hremployee-tab-exp-view'>
<view_tabexppanel
:viewState="viewState"
:viewparams="viewparams"
:context="context"
name="tabexppanel"
ref='tabexppanel'
@closeview="closeView($event)">
</view_tabexppanel>
</studio-view-style2>
\ No newline at end of file
<template src="./hremployee-tab-exp-view.html"/>
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { HREmployeeTabExpViewBase } from './hremployee-tab-exp-view-base';
import view_tabexppanel from '@widgets/hremployee/tab-exp-viewtabexppanel-tabexppanel/tab-exp-viewtabexppanel-tabexppanel.vue';
/**
* 员工分页表格视图
*
* @export
* @class HREmployeeTabExpView
* @extends {HREmployeeTabExpViewBase}
*/
@Component({
components: {
view_tabexppanel,
}
})
@VueLifeCycleProcessing()
export default class HREmployeeTabExpView extends HREmployeeTabExpViewBase { }
</script>
<studio-view-style2 viewName="hremployeev_003" viewTitle="员工" class='degridview hremployee-v-003'>
<i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="员工姓名" search @on-search="onSearch($event)"/>
<template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template>
<template slot="searchForm">
<view_searchform
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:showBusyIndicator="true"
v-show="isExpandSearchForm"
loaddraftAction="FilterGetDraft"
loadAction="FilterGet"
name="searchform"
ref='searchform'
@save="searchform_save($event)"
@search="searchform_search($event)"
@load="searchform_load($event)"
@closeview="closeView($event)">
</view_searchform>
</template>
<view_grid
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
@save="onSave.apply(_self, arguments)"
updateAction=""
removeAction="Remove"
loaddraftAction=""
loadAction=""
createAction=""
fetchAction="FetchOnDuty"
:newdata="newdata.bind(_self)"
:opendata="opendata.bind(_self)"
name="grid"
ref='grid'
@selectionchange="grid_selectionchange($event)"
@beforeload="grid_beforeload($event)"
@rowdblclick="grid_rowdblclick($event)"
@remove="grid_remove($event)"
@load="grid_load($event)"
@closeview="closeView($event)">
</view_grid>
</studio-view-style2>
\ No newline at end of file
<template src="./hremployee-v-003.html"/>
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { HREmployeeV_003Base } from './hremployee-v-003-base';
import view_grid from '@widgets/hremployee/main-grid/main-grid.vue';
import view_searchform from '@widgets/hremployee/default-searchform/default-searchform.vue';
/**
* 员工视图
*
* @export
* @class HREmployeeV_003
* @extends {HREmployeeV_003Base}
*/
@Component({
components: {
view_grid,
view_searchform,
}
})
@VueLifeCycleProcessing()
export default class HREmployeeV_003 extends HREmployeeV_003Base { }
</script>
<studio-view-style2 viewName="hremployeev_004" viewTitle="员工" class='degridview hremployee-v-004'>
<i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="员工姓名" search @on-search="onSearch($event)"/>
<template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template>
<template slot="searchForm">
<view_searchform
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:showBusyIndicator="true"
v-show="isExpandSearchForm"
loaddraftAction="FilterGetDraft"
loadAction="FilterGet"
name="searchform"
ref='searchform'
@save="searchform_save($event)"
@search="searchform_search($event)"
@load="searchform_load($event)"
@closeview="closeView($event)">
</view_searchform>
</template>
<view_grid
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
@save="onSave.apply(_self, arguments)"
updateAction=""
removeAction="Remove"
loaddraftAction=""
loadAction=""
createAction=""
fetchAction="FetchLeaveDuty"
:newdata="newdata.bind(_self)"
:opendata="opendata.bind(_self)"
name="grid"
ref='grid'
@selectionchange="grid_selectionchange($event)"
@beforeload="grid_beforeload($event)"
@rowdblclick="grid_rowdblclick($event)"
@remove="grid_remove($event)"
@load="grid_load($event)"
@closeview="closeView($event)">
</view_grid>
</studio-view-style2>
\ No newline at end of file
<template src="./hremployee-v-004.html"/>
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { HREmployeeV_004Base } from './hremployee-v-004-base';
import view_grid from '@widgets/hremployee/main-grid/main-grid.vue';
import view_searchform from '@widgets/hremployee/default-searchform/default-searchform.vue';
/**
* 员工视图
*
* @export
* @class HREmployeeV_004
* @extends {HREmployeeV_004Base}
*/
@Component({
components: {
view_grid,
view_searchform,
}
})
@VueLifeCycleProcessing()
export default class HREmployeeV_004 extends HREmployeeV_004Base { }
</script>
<studio-view-style2 viewName="hremployeev_005" viewTitle="员工" class='degridview hremployee-v-005'>
<i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="员工姓名" search @on-search="onSearch($event)"/>
<template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template>
<template slot="searchForm">
<view_searchform
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:showBusyIndicator="true"
v-show="isExpandSearchForm"
loaddraftAction="FilterGetDraft"
loadAction="FilterGet"
name="searchform"
ref='searchform'
@save="searchform_save($event)"
@search="searchform_search($event)"
@load="searchform_load($event)"
@closeview="closeView($event)">
</view_searchform>
</template>
<view_grid
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
@save="onSave.apply(_self, arguments)"
updateAction=""
removeAction="Remove"
loaddraftAction=""
loadAction=""
createAction=""
fetchAction="FetchWaitDuty"
:newdata="newdata.bind(_self)"
:opendata="opendata.bind(_self)"
name="grid"
ref='grid'
@selectionchange="grid_selectionchange($event)"
@beforeload="grid_beforeload($event)"
@rowdblclick="grid_rowdblclick($event)"
@remove="grid_remove($event)"
@load="grid_load($event)"
@closeview="closeView($event)">
</view_grid>
</studio-view-style2>
\ No newline at end of file
<template src="./hremployee-v-005.html"/>
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { HREmployeeV_005Base } from './hremployee-v-005-base';
import view_grid from '@widgets/hremployee/main-grid/main-grid.vue';
import view_searchform from '@widgets/hremployee/default-searchform/default-searchform.vue';
/**
* 员工视图
*
* @export
* @class HREmployeeV_005
* @extends {HREmployeeV_005Base}
*/
@Component({
components: {
view_grid,
view_searchform,
}
})
@VueLifeCycleProcessing()
export default class HREmployeeV_005 extends HREmployeeV_005Base { }
</script>
<studio-view-style2 viewName="hremployeev_006" viewTitle="员工" class='degridview hremployee-v-006'>
<i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="员工姓名" search @on-search="onSearch($event)"/>
<template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template>
<template slot="searchForm">
<view_searchform
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:showBusyIndicator="true"
v-show="isExpandSearchForm"
loaddraftAction="FilterGetDraft"
loadAction="FilterGet"
name="searchform"
ref='searchform'
@save="searchform_save($event)"
@search="searchform_search($event)"
@load="searchform_load($event)"
@closeview="closeView($event)">
</view_searchform>
</template>
<view_grid
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode"
@save="onSave.apply(_self, arguments)"
updateAction=""
removeAction="Remove"
loaddraftAction=""
loadAction=""
createAction=""
fetchAction="FetchAfterProbation"
:newdata="newdata.bind(_self)"
:opendata="opendata.bind(_self)"
name="grid"
ref='grid'
@selectionchange="grid_selectionchange($event)"
@beforeload="grid_beforeload($event)"
@rowdblclick="grid_rowdblclick($event)"
@remove="grid_remove($event)"
@load="grid_load($event)"
@closeview="closeView($event)">
</view_grid>
</studio-view-style2>
\ No newline at end of file
<template src="./hremployee-v-006.html"/>
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import { VueLifeCycleProcessing } from '@/studio-core';
import { HREmployeeV_006Base } from './hremployee-v-006-base';
import view_grid from '@widgets/hremployee/main-grid/main-grid.vue';
import view_searchform from '@widgets/hremployee/default-searchform/default-searchform.vue';
/**
* 员工视图
*
* @export
* @class HREmployeeV_006
* @extends {HREmployeeV_006Base}
*/
@Component({
components: {
view_grid,
view_searchform,
}
})
@VueLifeCycleProcessing()
export default class HREmployeeV_006 extends HREmployeeV_006Base { }
</script>
...@@ -184,6 +184,21 @@ export default class HREmployeeServiceBase extends EntityService { ...@@ -184,6 +184,21 @@ export default class HREmployeeServiceBase extends EntityService {
return res; return res;
} }
/**
* FetchAfterProbation接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof HREmployeeServiceBase
*/
public async FetchAfterProbation(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = Http.getInstance().get(`/hremployees/fetchafterprobation`,tempData,isloading);
return res;
}
/** /**
* FetchDefault接口方法 * FetchDefault接口方法
* *
...@@ -198,4 +213,49 @@ export default class HREmployeeServiceBase extends EntityService { ...@@ -198,4 +213,49 @@ export default class HREmployeeServiceBase extends EntityService {
let res:any = Http.getInstance().get(`/hremployees/fetchdefault`,tempData,isloading); let res:any = Http.getInstance().get(`/hremployees/fetchdefault`,tempData,isloading);
return res; return res;
} }
/**
* FetchLeaveDuty接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof HREmployeeServiceBase
*/
public async FetchLeaveDuty(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = Http.getInstance().get(`/hremployees/fetchleaveduty`,tempData,isloading);
return res;
}
/**
* FetchOnDuty接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof HREmployeeServiceBase
*/
public async FetchOnDuty(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = Http.getInstance().get(`/hremployees/fetchonduty`,tempData,isloading);
return res;
}
/**
* FetchWaitDuty接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof HREmployeeServiceBase
*/
public async FetchWaitDuty(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
let res:any = Http.getInstance().get(`/hremployees/fetchwaitduty`,tempData,isloading);
return res;
}
} }
\ No newline at end of file
...@@ -12,6 +12,17 @@ export const viewstate: any = { ...@@ -12,6 +12,17 @@ export const viewstate: any = {
refviews: [ refviews: [
], ],
}, },
{
viewtag: '0276c23869eb449c9c9308aea58f8239',
viewmodule: 'HumanResource',
viewname: 'HREmployeeV_006',
viewaction: '',
viewdatachange: false,
refviews: [
'ba512ad6a392dc170b1959cebd038fb8',
'1fda62030d6149cb5ee6f088bc4f0aa7',
],
},
{ {
viewtag: '045cc74f78937b52db67b8239361d181', viewtag: '045cc74f78937b52db67b8239361d181',
viewmodule: 'Base', viewmodule: 'Base',
...@@ -216,6 +227,17 @@ export const viewstate: any = { ...@@ -216,6 +227,17 @@ export const viewstate: any = {
'90f2bd2f58c482b25a1e1db0f8e4ca26', '90f2bd2f58c482b25a1e1db0f8e4ca26',
], ],
}, },
{
viewtag: '2be7fce8ded3576d64c338d4d1ee2e34',
viewmodule: 'HumanResource',
viewname: 'HREmployeeV_004',
viewaction: '',
viewdatachange: false,
refviews: [
'ba512ad6a392dc170b1959cebd038fb8',
'1fda62030d6149cb5ee6f088bc4f0aa7',
],
},
{ {
viewtag: '2cc9f94bc50095005332a93eb120c828', viewtag: '2cc9f94bc50095005332a93eb120c828',
viewmodule: 'Base', viewmodule: 'Base',
...@@ -305,8 +327,8 @@ export const viewstate: any = { ...@@ -305,8 +327,8 @@ export const viewstate: any = {
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
'286e8ac9eca7b6eb8058fde93995db10', '286e8ac9eca7b6eb8058fde93995db10',
'997c27311a28f6ed4e41153c43a5f723',
'bae1de77dc5bd2584e2dcf7201a06495', 'bae1de77dc5bd2584e2dcf7201a06495',
'9559258a9c3ac118e15ead941b780682',
'0d8ac739134947cc5f6545d4041024de', '0d8ac739134947cc5f6545d4041024de',
'b9130f18de0b66cd31ecaddb5a841aae', 'b9130f18de0b66cd31ecaddb5a841aae',
'41036146909ab3f28ff59b80370514b2', '41036146909ab3f28ff59b80370514b2',
...@@ -613,6 +635,20 @@ export const viewstate: any = { ...@@ -613,6 +635,20 @@ export const viewstate: any = {
'1fda62030d6149cb5ee6f088bc4f0aa7', '1fda62030d6149cb5ee6f088bc4f0aa7',
], ],
}, },
{
viewtag: '997c27311a28f6ed4e41153c43a5f723',
viewmodule: 'HumanResource',
viewname: 'HREmployeeTabExpView',
viewaction: '',
viewdatachange: false,
refviews: [
'9559258a9c3ac118e15ead941b780682',
'2be7fce8ded3576d64c338d4d1ee2e34',
'df641376a477230f2dac638fe717516a',
'0276c23869eb449c9c9308aea58f8239',
'a761b3f62ea851c3de0c6febb2df7fb3',
],
},
{ {
viewtag: '9a109700b8b076cc83d40cdfc6ce4f96', viewtag: '9a109700b8b076cc83d40cdfc6ce4f96',
viewmodule: 'HumanResource', viewmodule: 'HumanResource',
...@@ -642,6 +678,17 @@ export const viewstate: any = { ...@@ -642,6 +678,17 @@ export const viewstate: any = {
refviews: [ refviews: [
], ],
}, },
{
viewtag: 'a761b3f62ea851c3de0c6febb2df7fb3',
viewmodule: 'HumanResource',
viewname: 'HREmployeeV_003',
viewaction: '',
viewdatachange: false,
refviews: [
'ba512ad6a392dc170b1959cebd038fb8',
'1fda62030d6149cb5ee6f088bc4f0aa7',
],
},
{ {
viewtag: 'aa2c4d945f9d880dd836ebe74ca9f547', viewtag: 'aa2c4d945f9d880dd836ebe74ca9f547',
viewmodule: 'Base', viewmodule: 'Base',
...@@ -935,6 +982,17 @@ export const viewstate: any = { ...@@ -935,6 +982,17 @@ export const viewstate: any = {
refviews: [ refviews: [
], ],
}, },
{
viewtag: 'df641376a477230f2dac638fe717516a',
viewmodule: 'HumanResource',
viewname: 'HREmployeeV_005',
viewaction: '',
viewdatachange: false,
refviews: [
'ba512ad6a392dc170b1959cebd038fb8',
'1fda62030d6149cb5ee6f088bc4f0aa7',
],
},
{ {
viewtag: 'e09349c39faf8e8dbe63ac7be3aaa781', viewtag: 'e09349c39faf8e8dbe63ac7be3aaa781',
viewmodule: 'HumanResource', viewmodule: 'HumanResource',
......
...@@ -89,14 +89,19 @@ export default class HREmployeeUIServiceBase extends UIService { ...@@ -89,14 +89,19 @@ export default class HREmployeeUIServiceBase extends UIService {
* @memberof HREmployeeUIServiceBase * @memberof HREmployeeUIServiceBase
*/ */
public initViewMap(){ public initViewMap(){
this.allViewMap.set(':',{viewname:'v_006',srfappde:'hremployees'});
this.allViewMap.set(':',{viewname:'v_001',srfappde:'hremployees'}); this.allViewMap.set(':',{viewname:'v_001',srfappde:'hremployees'});
this.allViewMap.set(':',{viewname:'v_004',srfappde:'hremployees'});
this.allViewMap.set(':',{viewname:'v_002',srfappde:'hremployees'}); this.allViewMap.set(':',{viewname:'v_002',srfappde:'hremployees'});
this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'hremployees'}); this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'hremployees'});
this.allViewMap.set(':',{viewname:'listexpview',srfappde:'hremployees'}); this.allViewMap.set(':',{viewname:'listexpview',srfappde:'hremployees'});
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'hremployees'}); this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'hremployees'});
this.allViewMap.set(':',{viewname:'tabexpview',srfappde:'hremployees'});
this.allViewMap.set(':',{viewname:'v_003',srfappde:'hremployees'});
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'hremployees'}); this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'hremployees'});
this.allViewMap.set(':',{viewname:'treeexpview',srfappde:'hremployees'}); this.allViewMap.set(':',{viewname:'treeexpview',srfappde:'hremployees'});
this.allViewMap.set(':',{viewname:'dashboardview',srfappde:'hremployees'}); this.allViewMap.set(':',{viewname:'dashboardview',srfappde:'hremployees'});
this.allViewMap.set(':',{viewname:'v_005',srfappde:'hremployees'});
this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'hremployees'}); this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'hremployees'});
} }
......
...@@ -120,7 +120,7 @@ export class PIMBase extends Vue { ...@@ -120,7 +120,7 @@ export class PIMBase extends Vue {
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
{ pathName: 'hremployees', parameterName: 'hremployee' }, { pathName: 'hremployees', parameterName: 'hremployee' },
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'tabexpview', parameterName: 'tabexpview' },
]; ];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam); const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
if(Object.is(this.$route.fullPath,path)){ if(Object.is(this.$route.fullPath,path)){
......
...@@ -149,7 +149,7 @@ export default class PIMModel { ...@@ -149,7 +149,7 @@ export default class PIMModel {
textcls: '', textcls: '',
appfunctag: '_4', appfunctag: '_4',
appfuncyype: 'APPVIEW', appfuncyype: 'APPVIEW',
viewname: 'hremployee-grid-view', viewname: 'hremployee-tab-exp-view',
resourcetag: '', resourcetag: '',
} }
, ,
...@@ -453,12 +453,12 @@ export default class PIMModel { ...@@ -453,12 +453,12 @@ export default class PIMModel {
appfunctag: '_4', appfunctag: '_4',
appfuncyype: 'APPVIEW', appfuncyype: 'APPVIEW',
openmode: '', openmode: '',
codename: 'hremployeegridview', codename: 'hremployeetabexpview',
deResParameters: [], deResParameters: [],
routepath: '/pim/:pim?/hremployees/:hremployee?/gridview/:gridview?', routepath: '/pim/:pim?/hremployees/:hremployee?/tabexpview/:tabexpview?',
parameters: [ parameters: [
{ pathName: 'hremployees', parameterName: 'hremployee' }, { pathName: 'hremployees', parameterName: 'hremployee' },
{ pathName: 'gridview', parameterName: 'gridview' }, { pathName: 'tabexpview', parameterName: 'tabexpview' },
], ],
}, },
{ {
......
...@@ -141,6 +141,9 @@ export default class PickupViewpickupviewpanelModel { ...@@ -141,6 +141,9 @@ export default class PickupViewpickupviewpanelModel {
{ {
name: 'hrdutyname', name: 'hrdutyname',
}, },
{
name: 'probationtime',
},
] ]
} }
......
import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
import { Subject, Subscription } from 'rxjs';
import { Watch, TabExpPanelControlBase } from '@/studio-core';
import HREmployeeService from '@/service/hremployee/hremployee-service';
import TabExpViewtabexppanelService from './tab-exp-viewtabexppanel-tabexppanel-service';
import HREmployeeUIService from '@/uiservice/hremployee/hremployee-ui-service';
/**
* tabexppanel部件基类
*
* @export
* @class TabExpPanelControlBase
* @extends {TabExpViewtabexppanelTabexppanelBase}
*/
export class TabExpViewtabexppanelTabexppanelBase extends TabExpPanelControlBase {
/**
* 获取部件类型
*
* @protected
* @type {string}
* @memberof TabExpViewtabexppanelTabexppanelBase
*/
protected controlType: string = 'TABEXPPANEL';
/**
* 建构部件服务对象
*
* @type {TabExpViewtabexppanelService}
* @memberof TabExpViewtabexppanelTabexppanelBase
*/
public service: TabExpViewtabexppanelService = new TabExpViewtabexppanelService({ $store: this.$store });
/**
* 实体服务对象
*
* @type {HREmployeeService}
* @memberof TabExpViewtabexppanelTabexppanelBase
*/
public appEntityService: HREmployeeService = new HREmployeeService({ $store: this.$store });
/**
* 应用实体名称
*
* @protected
* @type {string}
* @memberof TabExpViewtabexppanelTabexppanelBase
*/
protected appDeName: string = 'hremployee';
/**
* 应用实体中文名称
*
* @protected
* @type {string}
* @memberof TabExpViewtabexppanelTabexppanelBase
*/
protected appDeLogicName: string = '员工';
/**
* 是否初始化
*
* @protected
* @returns {any}
* @memberof TabExpViewtabexppanel
*/
protected isInit: any = {
tabviewpanel5: true ,
tabviewpanel4: false ,
tabviewpanel3: false ,
tabviewpanel: false ,
tabviewpanel2: false ,
}
/**
* 被激活的分页面板
*
* @protected
* @type {string}
* @memberof TabExpViewtabexppanel
*/
protected activatedTabViewPanel: string = 'tabviewpanel5';
/**
* 组件创建完毕
*
* @protected
* @memberof TabExpViewtabexppanel
*/
protected ctrlCreated(): void {
//设置分页导航srfparentdename和srfparentkey
if (this.context.hremployee) {
Object.assign(this.context, { srfparentdename: 'HREmployee', srfparentkey: this.context.hremployee });
}
super.ctrlCreated();
}
}
\ No newline at end of file
/**
* TabExpViewtabexppanel 部件模型
*
* @export
* @class TabExpViewtabexppanelModel
*/
export default class TabExpViewtabexppanelModel {
/**
* 获取数据项集合
*
* @returns {any[]}
* @memberof TabExpViewtabexppanelModel
*/
public getDataItems(): any[] {
return [
{
name: 'employeename',
},
{
name: 'updateman',
},
{
name: 'createman',
},
{
name: 'hremployee',
prop: 'employeeid',
},
{
name: 'updatedate',
},
{
name: 'createdate',
},
{
name: 'organizationid',
},
{
name: 'employeecode',
},
{
name: 'certtype',
},
{
name: 'certnum',
},
{
name: 'birthday',
},
{
name: 'age',
},
{
name: 'organizationname',
},
{
name: 'sex',
},
{
name: 'bloodtype',
},
{
name: 'telephone',
},
{
name: 'mobile',
},
{
name: 'email',
},
{
name: 'marriage',
},
{
name: 'nation',
},
{
name: 'nativetype',
},
{
name: 'nativeaddress',
},
{
name: 'birthaddress',
},
{
name: 'postaladdress',
},
{
name: 'hobby',
},
{
name: 'health',
},
{
name: 'political',
},
{
name: 'startworktime',
},
{
name: 'startorgtime',
},
{
name: 'photo',
},
{
name: 'firstdegree',
},
{
name: 'highestdegree',
},
{
name: 'technicaltitle',
},
{
name: 'certificates',
},
{
name: 'entrytype',
},
{
name: 'politicaltime',
},
{
name: 'empstate',
},
{
name: 'jobstate',
},
{
name: 'nativeplace',
},
{
name: 'hrpostid',
},
{
name: 'hrpostname',
},
{
name: 'hrdutyname',
},
{
name: 'probationtime',
},
]
}
}
\ No newline at end of file
import { Http,Util,Errorlog } from '@/utils';
import ControlService from '@/widgets/control-service';
import HREmployeeService from '@/service/hremployee/hremployee-service';
import TabExpViewtabexppanelModel from './tab-exp-viewtabexppanel-tabexppanel-model';
/**
* TabExpViewtabexppanel 部件服务对象
*
* @export
* @class TabExpViewtabexppanelService
*/
export default class TabExpViewtabexppanelService extends ControlService {
/**
* 员工服务对象
*
* @type {HREmployeeService}
* @memberof TabExpViewtabexppanelService
*/
public appEntityService: HREmployeeService = new HREmployeeService({ $store: this.getStore() });
/**
* 设置从数据模式
*
* @type {boolean}
* @memberof TabExpViewtabexppanelService
*/
public setTempMode(){
this.isTempMode = false;
}
/**
* Creates an instance of TabExpViewtabexppanelService.
*
* @param {*} [opts={}]
* @memberof TabExpViewtabexppanelService
*/
constructor(opts: any = {}) {
super(opts);
this.model = new TabExpViewtabexppanelModel();
}
}
\ No newline at end of file
此差异已折叠。
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册