Skip to content

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

jackwang 部署微服务应用

上级 15e99894
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 1863 行增加 和 278 行删除
app_PIM/public/assets/json/view-config.json
浏览文件 @ 15e20b21
......@@ -159,6 +159,16 @@
"viewtag": "1ed4d12d0ea81013bc2a4f19a2bb17e7",
"memo": ""
},
"hremployeev_001": {
"title": "快速新建",
"caption": "快速新建",
"viewtype": "DEOPTVIEW",
"viewmodule": "HumanResource",
"viewname": "HREmployeeV_001",
"viewfilename": "hremployee-v-001",
"viewtag": "1fda62030d6149cb5ee6f088bc4f0aa7",
"memo": ""
},
"hroperationunitv_002": {
"title": "运营单位信息编辑",
"caption": "运营单位",
......@@ -349,6 +359,16 @@
"viewtag": "5efdfaf722e7585dfd685922b16f7f88",
"memo": ""
},
"hremployeev_002": {
"title": "员工信息",
"caption": "员工信息",
"viewtype": "DEEDITVIEW",
"viewmodule": "HumanResource",
"viewname": "HREmployeeV_002",
"viewfilename": "hremployee-v-002",
"viewtag": "621c665c0d1c18948c754c33f0bd86e8",
"memo": "系统自动添加"
},
"hrdutyeditview": {
"title": "职务信息",
"caption": "职务信息",
......@@ -610,8 +630,8 @@
"memo": ""
},
"hremployeeeditview": {
"title": "员工编辑视图",
"caption": "员工",
"title": "员工信息",
"caption": "员工信息",
"viewtype": "DEEDITVIEW",
"viewmodule": "HumanResource",
"viewname": "HREmployeeEditView",
......@@ -620,7 +640,7 @@
"memo": "系统自动添加"
},
"hremployeetreeexpview": {
"title": "员工树导航编辑",
"title": "员工信息",
"caption": "员工信息",
"viewtype": "DETREEEXPVIEW",
"viewmodule": "HumanResource",
......@@ -679,6 +699,16 @@
"viewtag": "c62ff001669cca98c0a2a7bc3383c775",
"memo": ""
},
"hremployeedashboardview": {
"title": "员工看板",
"caption": "员工看板",
"viewtype": "DEPORTALVIEW",
"viewmodule": "HumanResource",
"viewname": "HREmployeeDashboardView",
"viewfilename": "hremployee-dashboard-view",
"viewtag": "cb0f52a25a9ed151848e5f134307696c",
"memo": ""
},
"hrdistributionv_002": {
"title": "快速新建",
"caption": "快速新建",
......
app_PIM/src/locale/lanres/entities/hremployee/hremployee_en_US.ts
浏览文件 @ 15e20b21
......@@ -42,6 +42,14 @@ export default {
nativeplace: "籍贯",
},
views: {
v_001: {
caption: "快速新建",
title: "快速新建",
},
v_002: {
caption: "员工信息",
title: "员工信息",
},
pickupgridview: {
caption: "员工",
title: "员工选择表格视图",
......@@ -55,18 +63,46 @@ export default {
title: "员工表格视图",
},
editview: {
caption: "员工",
title: "员工编辑视图",
caption: "员工信息",
title: "员工信息",
},
treeexpview: {
caption: "员工信息",
title: "员工树导航编辑",
title: "员工信息",
},
dashboardview: {
caption: "员工看板",
title: "员工看板",
},
pickupview: {
caption: "员工",
title: "员工数据选择视图",
},
},
ef_001_form: {
details: {
group1: "基本信息",
formpage1: "基本信息",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "员工标识",
srfmajortext: "员工姓名",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
employeename: "员工姓名",
employeecode: "员工编号",
empstate: "员工状态",
certtype: "证件类型",
certnum: "证件号码",
organizationname: "单位",
organizationid: "组织ID",
employeeid: "员工标识",
},
uiactions: {
},
},
main_form: {
details: {
grouppanel1: "分组面板",
......@@ -118,6 +154,56 @@ export default {
uiactions: {
},
},
if_001_form: {
details: {
grouppanel1: "分组面板",
grouppanel2: "first",
grouppanel4: "联系信息",
grouppanel3: "补充信息",
grouppanel5: "工作相关",
group1: "基本信息",
formpage1: "基本信息",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "员工标识",
srfmajortext: "员工姓名",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
employeename: "员工姓名",
employeecode: "员工编号",
empstate: "员工状态",
certtype: "证件类型",
certnum: "证件号码",
sex: "性别",
birthday: "出生日期",
age: "年龄",
nation: "民族",
organizationname: "单位",
photo: "照片",
mobile: "移动电话",
telephone: "固定电话",
email: "电子邮箱",
postaladdress: "通讯地址",
nativetype: "户口类型",
nativeplace: "籍贯",
marriage: "婚姻状况",
bloodtype: "血型",
nativeaddress: "户籍地址",
birthaddress: "出生地",
hobby: "爱好特长",
health: "健康状况",
political: "政治面貌",
politicaltime: "入党时间",
entrytype: "入职渠道",
startworktime: "参加工作时间",
startorgtime: "到本单位时间",
employeeid: "员工标识",
},
uiactions: {
},
},
main_grid: {
columns: {
employeecode: "员工编号",
......@@ -136,40 +222,6 @@ export default {
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: {
tbitem3: {
caption: "Save",
......@@ -216,6 +268,70 @@ export default {
tip: "Help",
},
},
treeexpviewtoolbar_toolbar: {
tbitem1_ff_003: {
caption: "编辑",
tip: "编辑",
},
tbitem1_remove_sep: {
caption: "",
tip: "",
},
tbitem1_remove: {
caption: "删除并关闭",
tip: "删除并关闭",
},
tbitem2: {
caption: "-",
tip: "",
},
tbitem22: {
caption: "关闭",
tip: "关闭",
},
},
gridviewtoolbar_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: {
tbitem3: {
caption: "New",
......@@ -236,9 +352,21 @@ export default {
},
tree_001_treeview: {
nodes: {
tr09: "考勤信息",
tr11: "证书信息",
tr10: "合同信息",
root: "默认根节点",
tr07: "档案信息",
tr04: "语言能力",
tr0: "员工信息",
tr05: "家庭情况",
tr01: "分配信息",
tr12: "奖励惩罚",
tr13: "培训记录",
tr03: "教育信息",
tr08: "绩效信息",
tr06: "工作履历",
tr14: "学术成果",
},
uiactions: {
},
......
app_PIM/src/locale/lanres/entities/hremployee/hremployee_zh_CN.ts
浏览文件 @ 15e20b21
......@@ -41,6 +41,14 @@ export default {
nativeplace: "籍贯",
},
views: {
v_001: {
caption: "快速新建",
title: "快速新建",
},
v_002: {
caption: "员工信息",
title: "员工信息",
},
pickupgridview: {
caption: "员工",
title: "员工选择表格视图",
......@@ -54,18 +62,46 @@ export default {
title: "员工表格视图",
},
editview: {
caption: "员工",
title: "员工编辑视图",
caption: "员工信息",
title: "员工信息",
},
treeexpview: {
caption: "员工信息",
title: "员工树导航编辑",
title: "员工信息",
},
dashboardview: {
caption: "员工看板",
title: "员工看板",
},
pickupview: {
caption: "员工",
title: "员工数据选择视图",
},
},
ef_001_form: {
details: {
group1: "基本信息",
formpage1: "基本信息",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "员工标识",
srfmajortext: "员工姓名",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
employeename: "员工姓名",
employeecode: "员工编号",
empstate: "员工状态",
certtype: "证件类型",
certnum: "证件号码",
organizationname: "单位",
organizationid: "组织ID",
employeeid: "员工标识",
},
uiactions: {
},
},
main_form: {
details: {
grouppanel1: "分组面板",
......@@ -117,6 +153,56 @@ export default {
uiactions: {
},
},
if_001_form: {
details: {
grouppanel1: "分组面板",
grouppanel2: "first",
grouppanel4: "联系信息",
grouppanel3: "补充信息",
grouppanel5: "工作相关",
group1: "基本信息",
formpage1: "基本信息",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "员工标识",
srfmajortext: "员工姓名",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
employeename: "员工姓名",
employeecode: "员工编号",
empstate: "员工状态",
certtype: "证件类型",
certnum: "证件号码",
sex: "性别",
birthday: "出生日期",
age: "年龄",
nation: "民族",
organizationname: "单位",
photo: "照片",
mobile: "移动电话",
telephone: "固定电话",
email: "电子邮箱",
postaladdress: "通讯地址",
nativetype: "户口类型",
nativeplace: "籍贯",
marriage: "婚姻状况",
bloodtype: "血型",
nativeaddress: "户籍地址",
birthaddress: "出生地",
hobby: "爱好特长",
health: "健康状况",
political: "政治面貌",
politicaltime: "入党时间",
entrytype: "入职渠道",
startworktime: "参加工作时间",
startorgtime: "到本单位时间",
employeeid: "员工标识",
},
uiactions: {
},
},
main_grid: {
columns: {
employeecode: "员工编号",
......@@ -135,40 +221,6 @@ export default {
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: {
tbitem3: {
caption: "保存",
......@@ -215,6 +267,70 @@ export default {
tip: "帮助",
},
},
treeexpviewtoolbar_toolbar: {
tbitem1_ff_003: {
caption: "编辑",
tip: "编辑",
},
tbitem1_remove_sep: {
caption: "",
tip: "",
},
tbitem1_remove: {
caption: "删除并关闭",
tip: "删除并关闭",
},
tbitem2: {
caption: "-",
tip: "",
},
tbitem22: {
caption: "关闭",
tip: "关闭",
},
},
gridviewtoolbar_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: {
tbitem3: {
caption: "新建",
......@@ -235,9 +351,21 @@ export default {
},
tree_001_treeview: {
nodes: {
tr09: "考勤信息",
tr11: "证书信息",
tr10: "合同信息",
root: "默认根节点",
tr07: "档案信息",
tr04: "语言能力",
tr0: "员工信息",
tr05: "家庭情况",
tr01: "分配信息",
tr12: "奖励惩罚",
tr13: "培训记录",
tr03: "教育信息",
tr08: "绩效信息",
tr06: "工作履历",
tr14: "学术成果",
},
uiactions: {
},
......
app_PIM/src/mock/viewconfig/viewconfig.ts
浏览文件 @ 15e20b21
......@@ -135,6 +135,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "HROMHierarchyCatMPickupView",
"viewtag": "1ed4d12d0ea81013bc2a4f19a2bb17e7"
},
"hremployeev_001": {
"title": "快速新建",
"caption": "快速新建",
"viewtype": "DEOPTVIEW",
"viewmodule": "HumanResource",
"viewname": "HREmployeeV_001",
"viewtag": "1fda62030d6149cb5ee6f088bc4f0aa7"
},
"hroperationunitv_002": {
"title": "运营单位信息编辑",
"caption": "运营单位",
......@@ -287,6 +295,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "HRPostV_004",
"viewtag": "5efdfaf722e7585dfd685922b16f7f88"
},
"hremployeev_002": {
"title": "员工信息",
"caption": "员工信息",
"viewtype": "DEEDITVIEW",
"viewmodule": "HumanResource",
"viewname": "HREmployeeV_002",
"viewtag": "621c665c0d1c18948c754c33f0bd86e8"
},
"hrdutyeditview": {
"title": "职务信息",
"caption": "职务信息",
......@@ -496,15 +512,15 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtag": "b9130f18de0b66cd31ecaddb5a841aae"
},
"hremployeeeditview": {
"title": "员工编辑视图",
"caption": "员工",
"title": "员工信息",
"caption": "员工信息",
"viewtype": "DEEDITVIEW",
"viewmodule": "HumanResource",
"viewname": "HREmployeeEditView",
"viewtag": "b932c0eb66409c638c29ee27ba4fda37"
},
"hremployeetreeexpview": {
"title": "员工树导航编辑",
"title": "员工信息",
"caption": "员工信息",
"viewtype": "DETREEEXPVIEW",
"viewmodule": "HumanResource",
......@@ -551,6 +567,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "HROMHierarchyCatDashboardView",
"viewtag": "c62ff001669cca98c0a2a7bc3383c775"
},
"hremployeedashboardview": {
"title": "员工看板",
"caption": "员工看板",
"viewtype": "DEPORTALVIEW",
"viewmodule": "HumanResource",
"viewname": "HREmployeeDashboardView",
"viewtag": "cb0f52a25a9ed151848e5f134307696c"
},
"hrdistributionv_002": {
"title": "快速新建",
"caption": "快速新建",
......
app_PIM/src/pages/human-resource/hremployee-edit-view/hremployee-edit-view-base.tsx
浏览文件 @ 15e20b21
......@@ -6,7 +6,7 @@ import EditViewEngine from '@engine/view/edit-view-engine';
import HREmployeeUIService from '@/uiservice/hremployee/hremployee-ui-service';
/**
* 员工编辑视图视图基类
* 员工信息视图基类
*
* @export
* @class HREmployeeEditViewBase
......
app_PIM/src/pages/human-resource/hremployee-edit-view/hremployee-edit-view.html
浏览文件 @ 15e20b21
<studio-view-style2 viewName="hremployeeeditview" viewTitle="员工编辑视图" class='deeditview hremployee-edit-view'>
<template slot='title'>
<span class='caption-info'>{{$t(model.srfTitle)}}</span>
</template>
<studio-view-style2 viewName="hremployeeeditview" viewTitle="员工信息" class='deeditview hremployee-edit-view'>
<template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template>
<view_form
......
app_PIM/src/pages/human-resource/hremployee-edit-view/hremployee-edit-view.vue
浏览文件 @ 15e20b21
......@@ -6,7 +6,7 @@ import { HREmployeeEditViewBase } from './hremployee-edit-view-base';
import view_form from '@widgets/hremployee/main-form/main-form.vue';
/**
* 员工编辑视图视图
* 员工信息视图
*
* @export
* @class HREmployeeEditView
......
app_PIM/src/pages/human-resource/hremployee-tree-exp-view/hremployee-tree-exp-view-base.tsx
浏览文件 @ 15e20b21
......@@ -6,7 +6,7 @@ import TreeExpViewEngine from '@engine/view/tree-exp-view-engine';
import HREmployeeUIService from '@/uiservice/hremployee/hremployee-ui-service';
/**
* 员工树导航编辑视图基类
* 员工信息视图基类
*
* @export
* @class HREmployeeTreeExpViewBase
......@@ -88,9 +88,28 @@ export class HREmployeeTreeExpViewBase extends TreeExpViewBase {
* @memberof HREmployeeTreeExpViewBase
*/
protected containerModel: any = {
view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
view_treeexpbar: { name: 'treeexpbar', type: 'TREEEXPBAR' },
};
/**
* 工具栏模型
*
* @type {*}
* @memberof HREmployeeTreeExpView
*/
public toolBarModels: any = {
tbitem1_ff_003: { name: 'tbitem1_ff_003', caption: '编辑', 'isShowCaption': true, 'isShowIcon': true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FF_003', target: 'SINGLEKEY', class: '' } },
tbitem1_remove_sep: { name: 'tbitem1_remove_sep', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem1_remove: { name: 'tbitem1_remove', caption: '删除并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '删除并关闭', iconcls: 'fa fa-remove', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'SINGLEKEY', class: '' } },
tbitem2: { name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem22: { name: 'tbitem22', caption: '关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Exit', target: '', class: '' } },
};
/**
* 视图唯一标识
......@@ -127,6 +146,25 @@ export class HREmployeeTreeExpViewBase extends TreeExpViewBase {
});
}
/**
* toolbar 部件 click 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof HREmployeeTreeExpViewBase
*/
public toolbar_click($event: any, $event2?: any): void {
if (Object.is($event.tag, 'tbitem1_ff_003')) {
this.toolbar_tbitem1_ff_003_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem1_remove')) {
this.toolbar_tbitem1_remove_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem22')) {
this.toolbar_tbitem22_click(null, '', $event2);
}
}
/**
* treeexpbar 部件 selectionchange 事件
*
......@@ -160,6 +198,89 @@ export class HREmployeeTreeExpViewBase extends TreeExpViewBase {
this.engine.onCtrlEvent('treeexpbar', 'load', $event);
}
/**
* 逻辑事件
*
* @param {*} [params={}]
* @param {*} [tag]
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem1_ff_003_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
let xData: any = null;
// _this 指向容器对象
const _this: any = this;
let paramJO:any = {};
let contextJO:any = {};
if (_this.getDatas && _this.getDatas instanceof Function) {
datas = [..._this.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
const curUIService:HREmployeeUIService = new HREmployeeUIService();
curUIService.HREmployee_FF_003(datas,contextJO, paramJO, $event, xData,this,"HREmployee");
}
/**
* 逻辑事件
*
* @param {*} [params={}]
* @param {*} [tag]
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem1_remove_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
let xData: any = null;
// _this 指向容器对象
const _this: any = this;
let paramJO:any = {};
let contextJO:any = {};
if (_this.getDatas && _this.getDatas instanceof Function) {
datas = [..._this.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
const curUIService:HREmployeeUIService = new HREmployeeUIService();
curUIService.HREmployee_Remove(datas,contextJO, paramJO, $event, xData,this,"HREmployee");
}
/**
* 逻辑事件
*
* @param {*} [params={}]
* @param {*} [tag]
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem22_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
let xData: any = null;
// _this 指向容器对象
const _this: any = this;
let paramJO:any = {};
let contextJO:any = {};
if (_this.getDatas && _this.getDatas instanceof Function) {
datas = [..._this.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Exit(datas, contextJO,paramJO, $event, xData,this,"HREmployee");
}
/**
* 打开新建数据视图
*
......@@ -192,6 +313,24 @@ export class HREmployeeTreeExpViewBase extends TreeExpViewBase {
}
/**
* 关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof HREmployeeTreeExpViewBase
*/
public Exit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
this.closeView(args);
if(window.parent){
window.parent.postMessage([{ ...args }],'*');
}
}
/**
* 视图唯一标识
......
app_PIM/src/pages/human-resource/hremployee-tree-exp-view/hremployee-tree-exp-view.html
浏览文件 @ 15e20b21
<studio-view-style2 viewName="hremployeetreeexpview" viewTitle="员工树导航编辑" class='detreeexpview hremployee-tree-exp-view'>
<studio-view-style2 viewName="hremployeetreeexpview" viewTitle="员工信息" class='detreeexpview hremployee-tree-exp-view'>
<template slot='title'>
<span class='caption-info'>{{$t(model.srfTitle)}}</span>
</template>
<template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template>
<view_treeexpbar
:viewState="viewState"
:viewparams="viewparams"
......
app_PIM/src/pages/human-resource/hremployee-tree-exp-view/hremployee-tree-exp-view.vue
浏览文件 @ 15e20b21
......@@ -6,7 +6,7 @@ import { HREmployeeTreeExpViewBase } from './hremployee-tree-exp-view-base';
import view_treeexpbar from '@widgets/hremployee/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar.vue';
/**
* 员工树导航编辑视图
* 员工信息视图
*
* @export
* @class HREmployeeTreeExpView
......
app_PIM/src/pages/ungroup/pim/page-register.ts
浏览文件 @ 15e20b21
......@@ -47,6 +47,7 @@ export const PageComponents = {
Vue.component('hrduty-dashboard-view', () => import('@pages/human-resource/hrduty-dashboard-view/hrduty-dashboard-view.vue'));
Vue.component('hrorganization-edit-view', () => import('@pages/base/hrorganization-edit-view/hrorganization-edit-view.vue'));
Vue.component('hromhierarchy-cat-grid-view', () => import('@pages/base/hromhierarchy-cat-grid-view/hromhierarchy-cat-grid-view.vue'));
Vue.component('hremployee-v-001', () => import('@pages/human-resource/hremployee-v-001/hremployee-v-001.vue'));
Vue.component('hrpost-rel-v-001', () => import('@pages/human-resource/hrpost-rel-v-001/hrpost-rel-v-001.vue'));
Vue.component('hrdistribution-v-002', () => import('@pages/human-resource/hrdistribution-v-002/hrdistribution-v-002.vue'));
Vue.component('hromhierarchy-pickup-view', () => import('@pages/base/hromhierarchy-pickup-view/hromhierarchy-pickup-view.vue'));
......@@ -67,6 +68,7 @@ export const PageComponents = {
Vue.component('hromhierarchy-cat-edit-view', () => import('@pages/base/hromhierarchy-cat-edit-view/hromhierarchy-cat-edit-view.vue'));
Vue.component('hrorg-contact-edit-view', () => import('@pages/base/hrorg-contact-edit-view/hrorg-contact-edit-view.vue'));
Vue.component('hromhierarchy-cat-v-002', () => import('@pages/base/hromhierarchy-cat-v-002/hromhierarchy-cat-v-002.vue'));
Vue.component('hremployee-v-002', () => import('@pages/human-resource/hremployee-v-002/hremployee-v-002.vue'));
Vue.component('hrdistribution-grid-view', () => import('@pages/human-resource/hrdistribution-grid-view/hrdistribution-grid-view.vue'));
Vue.component('hremployee-edit-view', () => import('@pages/human-resource/hremployee-edit-view/hremployee-edit-view.vue'));
Vue.component('hromhierarchy-pickup-grid-view', () => import('@pages/base/hromhierarchy-pickup-grid-view/hromhierarchy-pickup-grid-view.vue'));
......
app_PIM/src/pages/ungroup/pim/router.ts
浏览文件 @ 15e20b21
......@@ -1031,6 +1031,20 @@ const router = new Router({
},
component: () => import('@pages/base/hromhierarchy-cat-grid-view/hromhierarchy-cat-grid-view.vue'),
},
{
path: 'hremployees/:hremployee?/v_001/:v_001?',
meta: {
caption: 'entities.hremployee.views.v_001.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hremployees', parameterName: 'hremployee' },
{ pathName: 'v_001', parameterName: 'v_001' },
],
requireAuth: true,
},
component: () => import('@pages/human-resource/hremployee-v-001/hremployee-v-001.vue'),
},
{
path: 'hrposts/:hrpost?/hrpostrels/:hrpostrel?/v_001/:v_001?',
meta: {
......@@ -1416,6 +1430,20 @@ const router = new Router({
},
component: () => import('@pages/base/hromhierarchy-cat-v-002/hromhierarchy-cat-v-002.vue'),
},
{
path: 'hremployees/:hremployee?/v_002/:v_002?',
meta: {
caption: 'entities.hremployee.views.v_002.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hremployees', parameterName: 'hremployee' },
{ pathName: 'v_002', parameterName: 'v_002' },
],
requireAuth: true,
},
component: () => import('@pages/human-resource/hremployee-v-002/hremployee-v-002.vue'),
},
{
path: 'hrposts/:hrpost?/hrdistributions/:hrdistribution?/gridview/:gridview?',
meta: {
......
app_PIM/src/store/modules/view-action/state.ts
浏览文件 @ 15e20b21
......@@ -484,7 +484,7 @@ export const viewstate: any = {
viewdatachange: false,
refviews: [
'ba512ad6a392dc170b1959cebd038fb8',
'b932c0eb66409c638c29ee27ba4fda37',
'1fda62030d6149cb5ee6f088bc4f0aa7',
],
},
{
......@@ -589,6 +589,7 @@ export const viewstate: any = {
refviews: [
'6395cba44e6d6151f19e543b55d88845',
'b932c0eb66409c638c29ee27ba4fda37',
'621c665c0d1c18948c754c33f0bd86e8',
],
},
{
......
app_PIM/src/widgets/hremployee/main-form/main-form-base.tsx
浏览文件 @ 15e20b21
......@@ -122,6 +122,26 @@ export class MainEditFormBase extends EditFormControlBase {
* @memberof MainEditFormBase
*/
public rules: any = {
employeename: [
{ required: true, type: 'string', message: '员工姓名 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '员工姓名 值不能为空', trigger: 'blur' },
],
employeecode: [
{ required: true, type: 'string', message: '员工编号 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '员工编号 值不能为空', trigger: 'blur' },
],
empstate: [
{ required: true, type: 'string', message: '员工状态 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '员工状态 值不能为空', trigger: 'blur' },
],
certtype: [
{ required: true, type: 'string', message: '证件类型 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '证件类型 值不能为空', trigger: 'blur' },
],
certnum: [
{ required: true, type: 'string', message: '证件号码 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '证件号码 值不能为空', trigger: 'blur' },
],
}
/**
......
app_PIM/src/widgets/hremployee/main-form/main-form.html
浏览文件 @ 15e20b21
......@@ -153,7 +153,7 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.organizationname.visible" :style="{}" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
<i-col class="form-layout-container" v-show="detailsModel.organizationname.visible" :style="{}" :lg="{ span: 16, offset: 0 }" :xl="{ span: 16, offset: 0 }">
<app-form-item name='organizationname' :itemRules="this.rules.organizationname" class='' :caption="$t('entities.hremployee.main_form.details.organizationname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.organizationname.error" :isEmptyCaption="false" labelPos="LEFT">
<app-picker
......
app_PIM/src/widgets/hremployee/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-base.tsx
浏览文件 @ 15e20b21
......@@ -205,7 +205,7 @@ export class TreeExpViewtreeexpbarTreeExpBarBase extends MainControlBase {
}
if (Object.is(expmode, 'TR0')) {
return {
viewname: 'hremployee-edit-view',
viewname: 'hremployee-v-002',
parentdata: {},
deKeyField:'hremployee'
};
......
app_PIM/src/widgets/hremployee/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar.html
浏览文件 @ 15e20b21
<split id="treeexpviewtreeexpbar" class='app-tree-exp-bar' v-model="split" mode="horizontal" @on-move-end="onSplitChange.apply(_self, arguments)">
<div class="app-tree-exp-bar-left show-title-bar" slot='left'>
<div class='tree-exp-bar-header'>
<div class="tree-exp-bar-title">员工信息</div>
</div>
<div class="app-tree-exp-bar-left" slot='left'>
<div class='tree-exp-content'>
<view_treeexpbar_tree
:viewState="viewState"
......
humanresource-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 15e20b21
......@@ -178,7 +178,7 @@
<!--输出实体[HREMPLOYEE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-115-8">
<changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-162-8">
<createTable tableName="EMPLOYEE">
<column name="EMPLOYEENAME" remarks="" type="VARCHAR(200)">
</column>
......@@ -593,10 +593,10 @@
</changeSet>
<!--输出实体[HREMPSTATE]外键关系 -->
<!--输出实体[HREMPLOYEE]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-115-26">
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-162-26">
<addForeignKeyConstraint baseColumnNames="ORGANIZATIONID" baseTableName="EMPLOYEE" constraintName="DER1N_EMPLOYEE_ORGANIZATION_OR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-115-27">
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-162-27">
<addForeignKeyConstraint baseColumnNames="EMPSTATE" baseTableName="EMPLOYEE" constraintName="DER1N_HREMPLOYEE_HREMPSTATE_EM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HREMPSTATEID" referencedTableName="T_HREMPSTATE" validate="true"/>
</changeSet>
<!--输出实体[HRLEAVE]外键关系 -->
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或