Skip to content

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

jackwang 部署微服务应用

上级 e2b929fc
隐藏空白字符变更
内嵌 并排
正在显示 包含 598 行增加 和 159 行删除
app_PIM/public/assets/json/view-config.json
浏览文件 @ 86d083f7
......@@ -209,6 +209,16 @@
"viewtag": "53de2c13a619e20769cdc9dbfa10e1a5",
"memo": "系统自动添加"
},
"hrdutyeditview": {
"title": "职务编辑视图",
"caption": "职务",
"viewtype": "DEEDITVIEW",
"viewmodule": "HumanResource",
"viewname": "HRDutyEditView",
"viewfilename": "hrduty-edit-view",
"viewtag": "62468a4082892d924fe855427a8cd0cb",
"memo": "系统自动添加"
},
"hrorgcontactv_001": {
"title": "组织联系信息嵌入组织",
"caption": "组织联系信息嵌入组织",
......@@ -329,6 +339,16 @@
"viewtag": "b4ef4b87eb87fc3a2a8479027d62ac4c",
"memo": "系统自动添加"
},
"hrdutygridview": {
"title": "职务表格视图",
"caption": "职务",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
"viewname": "HRDutyGridView",
"viewfilename": "hrduty-grid-view",
"viewtag": "b9130f18de0b66cd31ecaddb5a841aae",
"memo": ""
},
"hremployeeeditview": {
"title": "员工编辑视图",
"caption": "员工",
......
app_PIM/src/locale/lang/en-US.ts
浏览文件 @ 86d083f7
......@@ -134,7 +134,7 @@ export default {
user_menus: "用户菜单",
menuitem3: "设置",
top_menus: "顶部菜单",
menuitem1: "菜单项",
menuitem1: "-",
left_exp: "左侧菜单",
menuitem5: "人员",
menuitem15: "员工信息",
......
app_PIM/src/locale/lang/zh-CN.ts
浏览文件 @ 86d083f7
......@@ -134,7 +134,7 @@ export default {
user_menus: "用户菜单",
menuitem3: "设置",
top_menus: "顶部菜单",
menuitem1: "菜单项",
menuitem1: "-",
left_exp: "左侧菜单",
menuitem5: "人员",
menuitem15: "员工信息",
......
app_PIM/src/locale/lanres/entities/hrduty/hrduty_en_US.ts
浏览文件 @ 86d083f7
......@@ -9,6 +9,14 @@ export default {
updateman: "更新人",
},
views: {
editview: {
caption: "职务",
title: "职务编辑视图",
},
gridview: {
caption: "职务",
title: "职务表格视图",
},
pickupgridview: {
caption: "职务",
title: "职务选择表格视图",
......@@ -18,6 +26,30 @@ export default {
title: "职务数据选择视图",
},
},
main_form: {
details: {
group1: "职务基本信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "职务标识",
srfmajortext: "职务名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
hrdutyname: "职务名称",
createman: "建立人",
createdate: "建立时间",
updateman: "更新人",
updatedate: "更新时间",
hrdutyid: "职务标识",
},
uiactions: {
},
},
main_grid: {
columns: {
hrdutyname: "职务名称",
......@@ -34,4 +66,84 @@ 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",
tip: "Save",
},
tbitem4: {
caption: "Save And New",
tip: "Save And New",
},
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: {
caption: "-",
tip: "",
},
tbitem7: {
caption: "Remove And Close",
tip: "Remove And Close Window",
},
tbitem8: {
caption: "-",
tip: "",
},
tbitem12: {
caption: "New",
tip: "New",
},
tbitem13: {
caption: "-",
tip: "",
},
tbitem14: {
caption: "Copy",
tip: "Copy {0}",
},
tbitem16: {
caption: "-",
tip: "",
},
tbitem22: {
caption: "Help",
tip: "Help",
},
},
};
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrduty/hrduty_zh_CN.ts
浏览文件 @ 86d083f7
......@@ -8,6 +8,14 @@ export default {
updateman: "更新人",
},
views: {
editview: {
caption: "职务",
title: "职务编辑视图",
},
gridview: {
caption: "职务",
title: "职务表格视图",
},
pickupgridview: {
caption: "职务",
title: "职务选择表格视图",
......@@ -17,6 +25,30 @@ export default {
title: "职务数据选择视图",
},
},
main_form: {
details: {
group1: "职务基本信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "职务标识",
srfmajortext: "职务名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
hrdutyname: "职务名称",
createman: "建立人",
createdate: "建立时间",
updateman: "更新人",
updatedate: "更新时间",
hrdutyid: "职务标识",
},
uiactions: {
},
},
main_grid: {
columns: {
hrdutyname: "职务名称",
......@@ -33,4 +65,84 @@ 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: "保存",
tip: "保存",
},
tbitem4: {
caption: "保存并新建",
tip: "保存并新建",
},
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: {
caption: "-",
tip: "",
},
tbitem7: {
caption: "删除并关闭",
tip: "删除并关闭",
},
tbitem8: {
caption: "-",
tip: "",
},
tbitem12: {
caption: "新建",
tip: "新建",
},
tbitem13: {
caption: "-",
tip: "",
},
tbitem14: {
caption: "拷贝",
tip: "拷贝",
},
tbitem16: {
caption: "-",
tip: "",
},
tbitem22: {
caption: "帮助",
tip: "帮助",
},
},
};
\ No newline at end of file
app_PIM/src/mock/app/pim-appmenu/pim-appmenu.ts
浏览文件 @ 86d083f7
......@@ -69,10 +69,10 @@ mock.onGet('v7/pimappmenu').reply((config: any) => {
{
id: 'A8D78DD5-209F-4ADF-8B05-72F646DFCECD',
name: 'menuitem1',
text: '菜单项',
text: '-',
type: 'MENUITEM',
counterid: '',
tooltip: '菜单项',
tooltip: '-',
expanded: false,
separator: false,
hidden: false,
......@@ -211,7 +211,7 @@ mock.onGet('v7/pimappmenu').reply((config: any) => {
iconcls: 'fa fa-signal',
icon: '',
textcls: '',
appfunctag: '_8',
appfunctag: '_9',
resourcetag: '',
},
{
......@@ -229,8 +229,10 @@ mock.onGet('v7/pimappmenu').reply((config: any) => {
iconcls: 'fa fa-sitemap',
icon: '',
textcls: '',
appfunctag: '_7',
appfunctag: '_8',
resourcetag: '',
},
],
},
{
id: 'E065C1FE-A872-4209-A254-67DE568A5F43',
......@@ -265,7 +267,7 @@ mock.onGet('v7/pimappmenu').reply((config: any) => {
iconcls: 'fa fa-cog',
icon: '',
textcls: '',
appfunctag: '_5',
appfunctag: '_6',
resourcetag: '',
},
{
......@@ -283,7 +285,7 @@ mock.onGet('v7/pimappmenu').reply((config: any) => {
iconcls: 'fa fa-cog',
icon: '',
textcls: '',
appfunctag: '',
appfunctag: '_5',
resourcetag: '',
},
{
......@@ -301,14 +303,12 @@ mock.onGet('v7/pimappmenu').reply((config: any) => {
iconcls: '',
icon: '',
textcls: '',
appfunctag: '_6',
appfunctag: '_7',
resourcetag: '',
},
],
},
],
},
],
},
{
id: 'fec63a28f5d99fd4ac7e43004b6a16f8',
......
app_PIM/src/mock/viewconfig/viewconfig.ts
浏览文件 @ 86d083f7
......@@ -175,6 +175,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "HROrgContactGridView",
"viewtag": "53de2c13a619e20769cdc9dbfa10e1a5"
},
"hrdutyeditview": {
"title": "职务编辑视图",
"caption": "职务",
"viewtype": "DEEDITVIEW",
"viewmodule": "HumanResource",
"viewname": "HRDutyEditView",
"viewtag": "62468a4082892d924fe855427a8cd0cb"
},
"hrorgcontactv_001": {
"title": "组织联系信息嵌入组织",
"caption": "组织联系信息嵌入组织",
......@@ -271,6 +279,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "HROrganizationEditView",
"viewtag": "b4ef4b87eb87fc3a2a8479027d62ac4c"
},
"hrdutygridview": {
"title": "职务表格视图",
"caption": "职务",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
"viewname": "HRDutyGridView",
"viewtag": "b9130f18de0b66cd31ecaddb5a841aae"
},
"hremployeeeditview": {
"title": "员工编辑视图",
"caption": "员工",
......
app_PIM/src/pages/human-resource/hrpost-grid-view/hrpost-grid-view-base.tsx
浏览文件 @ 86d083f7
......@@ -564,16 +564,28 @@ export class HRPostGridViewBase extends GridViewBase {
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'hrposts', parameterName: 'hrpost' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
openIndexViewTab(data);
const view: any = {
viewname: 'hrpost-edit-view',
height: 0,
width: 600,
title: this.$t('entities.hrpost.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......@@ -598,14 +610,28 @@ export class HRPostGridViewBase extends GridViewBase {
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'hrposts', parameterName: 'hrpost' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath);
}
openIndexViewTab(data);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
const view: any = {
viewname: 'hrpost-edit-view',
height: 0,
width: 600,
title: this.$t('entities.hrpost.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......
app_PIM/src/pages/human-resource/hrpost-grid-view/hrpost-grid-view.html
浏览文件 @ 86d083f7
<studio-view-style2 viewName="hrpostgridview" viewTitle="职位表格" class='degridview hrpost-grid-view'>
<template slot='title'>
<span class='caption-info'>{{$t(model.srfTitle)}}</span>
</template>
<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($event)"/> </template>
......
app_PIM/src/pages/human-resource/hrpost-v-001/hrpost-v-001-base.tsx
浏览文件 @ 86d083f7
......@@ -564,16 +564,28 @@ export class HRPostV_001Base extends GridViewBase {
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'hrposts', parameterName: 'hrpost' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
openIndexViewTab(data);
const view: any = {
viewname: 'hrpost-edit-view',
height: 0,
width: 600,
title: this.$t('entities.hrpost.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......@@ -598,14 +610,28 @@ export class HRPostV_001Base extends GridViewBase {
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'hrposts', parameterName: 'hrpost' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath);
}
openIndexViewTab(data);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
const view: any = {
viewname: 'hrpost-edit-view',
height: 0,
width: 600,
title: this.$t('entities.hrpost.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......
app_PIM/src/pages/human-resource/hrpost-v-002/hrpost-v-002-base.tsx
浏览文件 @ 86d083f7
......@@ -564,16 +564,28 @@ export class HRPostV_002Base extends GridViewBase {
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'hrposts', parameterName: 'hrpost' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
openIndexViewTab(data);
const view: any = {
viewname: 'hrpost-edit-view',
height: 0,
width: 600,
title: this.$t('entities.hrpost.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......@@ -598,14 +610,28 @@ export class HRPostV_002Base extends GridViewBase {
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'hrposts', parameterName: 'hrpost' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath);
}
openIndexViewTab(data);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
const view: any = {
viewname: 'hrpost-edit-view',
height: 0,
width: 600,
title: this.$t('entities.hrpost.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......
app_PIM/src/pages/human-resource/hrpost-v-003/hrpost-v-003-base.tsx
浏览文件 @ 86d083f7
......@@ -564,16 +564,28 @@ export class HRPostV_003Base extends GridViewBase {
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'hrposts', parameterName: 'hrpost' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
openIndexViewTab(data);
const view: any = {
viewname: 'hrpost-edit-view',
height: 0,
width: 600,
title: this.$t('entities.hrpost.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......@@ -598,14 +610,28 @@ export class HRPostV_003Base extends GridViewBase {
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'hrposts', parameterName: 'hrpost' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath);
}
openIndexViewTab(data);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
const view: any = {
viewname: 'hrpost-edit-view',
height: 0,
width: 600,
title: this.$t('entities.hrpost.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......
app_PIM/src/pages/ungroup/pim/page-register.ts
浏览文件 @ 86d083f7
export const PageComponents = {
install(Vue: any, opt: any) {
Vue.component('hroperation-unit-edit-view', () => import('@pages/base/hroperation-unit-edit-view/hroperation-unit-edit-view.vue'));
Vue.component('hrduty-edit-view', () => import('@pages/human-resource/hrduty-edit-view/hrduty-edit-view.vue'));
Vue.component('hrpost-grid-view', () => import('@pages/human-resource/hrpost-grid-view/hrpost-grid-view.vue'));
Vue.component('hrorg-address-edit-view', () => import('@pages/base/hrorg-address-edit-view/hrorg-address-edit-view.vue'));
Vue.component('hrpost-v-002', () => import('@pages/human-resource/hrpost-v-002/hrpost-v-002.vue'));
......@@ -40,6 +41,7 @@ export const PageComponents = {
Vue.component('hromhierarchy-pickup-grid-view', () => import('@pages/base/hromhierarchy-pickup-grid-view/hromhierarchy-pickup-grid-view.vue'));
Vue.component('hrorganization-pickup-grid-view', () => import('@pages/base/hrorganization-pickup-grid-view/hrorganization-pickup-grid-view.vue'));
Vue.component('hrlegal-dashboard-view', () => import('@pages/base/hrlegal-dashboard-view/hrlegal-dashboard-view.vue'));
Vue.component('hrduty-grid-view', () => import('@pages/human-resource/hrduty-grid-view/hrduty-grid-view.vue'));
Vue.component('hrlegal-v-001', () => import('@pages/base/hrlegal-v-001/hrlegal-v-001.vue'));
Vue.component('hrpost-edit-view', () => import('@pages/human-resource/hrpost-edit-view/hrpost-edit-view.vue'));
}
......
app_PIM/src/pages/ungroup/pim/router.ts
浏览文件 @ 86d083f7
......@@ -57,6 +57,20 @@ const router = new Router({
},
component: () => import('@pages/base/hroperation-unit-edit-view/hroperation-unit-edit-view.vue'),
},
{
path: 'hrduties/:hrduty?/editview/:editview?',
meta: {
caption: 'entities.hrduty.views.editview.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrduties', parameterName: 'hrduty' },
{ pathName: 'editview', parameterName: 'editview' },
],
requireAuth: true,
},
component: () => import('@pages/human-resource/hrduty-edit-view/hrduty-edit-view.vue'),
},
{
path: 'hrposts/:hrpost?/gridview/:gridview?',
meta: {
......@@ -858,6 +872,20 @@ const router = new Router({
},
component: () => import('@pages/base/hrlegal-dashboard-view/hrlegal-dashboard-view.vue'),
},
{
path: 'hrduties/:hrduty?/gridview/:gridview?',
meta: {
caption: 'entities.hrduty.views.gridview.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrduties', parameterName: 'hrduty' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
requireAuth: true,
},
component: () => import('@pages/human-resource/hrduty-grid-view/hrduty-grid-view.vue'),
},
{
path: 'hrlegals/:hrlegal?/v_001/:v_001?',
meta: {
......
app_PIM/src/store/modules/view-action/state.ts
浏览文件 @ 86d083f7
......@@ -189,6 +189,7 @@ export const viewstate: any = {
'bae1de77dc5bd2584e2dcf7201a06495',
'9559258a9c3ac118e15ead941b780682',
'0d8ac739134947cc5f6545d4041024de',
'b9130f18de0b66cd31ecaddb5a841aae',
'41036146909ab3f28ff59b80370514b2',
'188f3997d02da7fc34bac190ccd439e6',
'114f056047eddd92374e982356e59852',
......
app_PIM/src/uiservice/hrduty/hrduty-ui-service-base.ts
浏览文件 @ 86d083f7
......@@ -89,6 +89,8 @@ export default class HRDutyUIServiceBase extends UIService {
* @memberof HRDutyUIServiceBase
*/
public initViewMap(){
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'hrduties'});
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'hrduties'});
this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'hrduties'});
this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'hrduties'});
}
......
app_PIM/src/widgets/app/pim-appmenu/pim-appmenu-base.tsx
浏览文件 @ 86d083f7
......@@ -15,20 +15,22 @@ export class PIMBase extends Vue {
if (item) {
let judge = true;
switch (item.appfunctag) {
case '_7':
this.click_7(item); break;
case '_8':
this.click_8(item); break;
case '_3':
this.click_3(item); break;
case '_2':
this.click_2(item); break;
case '_4':
this.click_4(item); break;
case '_5':
this.click_5(item); break;
case '_8':
this.click_8(item); break;
case '_6':
this.click_6(item); break;
case '_9':
this.click_9(item); break;
case '_5':
this.click_5(item); break;
case '_7':
this.click_7(item); break;
default:
judge = false;
console.warn('未指定应用功能');
......@@ -45,7 +47,7 @@ export class PIMBase extends Vue {
* @param {*} [item={}]
* @memberof PIM
*/
public click_7(item: any = {}) {
public click_8(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
......@@ -137,7 +139,7 @@ export class PIMBase extends Vue {
* @param {*} [item={}]
* @memberof PIM
*/
public click_5(item: any = {}) {
public click_6(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
......@@ -160,7 +162,7 @@ export class PIMBase extends Vue {
* @param {*} [item={}]
* @memberof PIM
*/
public click_8(item: any = {}) {
public click_9(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
......@@ -177,13 +179,36 @@ export class PIMBase extends Vue {
})
}
/**
* 职务
*
* @param {*} [item={}]
* @memberof PIM
*/
public click_5(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'hrduties', parameterName: 'hrduty' },
{ pathName: 'gridview', parameterName: 'gridview' },
];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
}
/**
* 组织层次结构
*
* @param {*} [item={}]
* @memberof PIM
*/
public click_6(item: any = {}) {
public click_7(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
......
app_PIM/src/widgets/app/pim-appmenu/pim-appmenu-model.ts
浏览文件 @ 86d083f7
......@@ -77,10 +77,10 @@ export default class PIMModel {
{
id: 'A8D78DD5-209F-4ADF-8B05-72F646DFCECD',
name: 'menuitem1',
text: '菜单项',
text: '-',
type: 'MENUITEM',
counterid: '',
tooltip: '菜单项',
tooltip: '-',
expanded: false,
separator: false,
hidden: false,
......@@ -231,7 +231,7 @@ export default class PIMModel {
iconcls: 'fa fa-signal',
icon: '',
textcls: '',
appfunctag: '_8',
appfunctag: '_9',
appfuncyype: 'APPVIEW',
viewname: 'hromhierarchy-cat-grid-view',
resourcetag: '',
......@@ -252,15 +252,36 @@ export default class PIMModel {
iconcls: 'fa fa-sitemap',
icon: '',
textcls: '',
appfunctag: '_7',
appfunctag: '_8',
appfuncyype: 'APPVIEW',
viewname: 'hrorganization-grid-view',
resourcetag: '',
}
,
],
}
,
{
id: 'E065C1FE-A872-4209-A254-67DE568A5F43',
name: 'menuitem10',
text: '职位',
type: 'MENUITEM',
counterid: '',
tooltip: '职位',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: 'fa fa-server',
icon: '',
textcls: '',
appfunctag: '',
resourcetag: '',
items: [
{
id: 'E065C1FE-A872-4209-A254-67DE568A5F43',
name: 'menuitem10',
id: 'F40EFB9B-4A24-45F2-8CD1-BD9CFD890109',
name: 'menuitem11',
text: '职位',
type: 'MENUITEM',
counterid: '',
......@@ -270,74 +291,55 @@ export default class PIMModel {
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: 'fa fa-server',
iconcls: 'fa fa-cog',
icon: '',
textcls: '',
appfunctag: '',
appfunctag: '_6',
appfuncyype: 'APPVIEW',
viewname: 'hrpost-tab-exp-view',
resourcetag: '',
}
,
{
id: '5866C16B-4C55-4E2C-8229-15F7533B9E4F',
name: 'menuitem12',
text: '职务',
type: 'MENUITEM',
counterid: '',
tooltip: '职务',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: 'fa fa-cog',
icon: '',
textcls: '',
appfunctag: '_5',
appfuncyype: 'APPVIEW',
viewname: 'hrduty-grid-view',
resourcetag: '',
}
,
{
id: 'ED02F38F-5988-4458-95BB-75F91E922110',
name: 'menuitem8',
text: '测试',
type: 'MENUITEM',
counterid: '',
tooltip: '测试',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: '',
icon: '',
textcls: '',
appfunctag: '_7',
appfuncyype: 'APPVIEW',
viewname: 'hromhierarchy-grid-view',
resourcetag: '',
items: [
{
id: 'F40EFB9B-4A24-45F2-8CD1-BD9CFD890109',
name: 'menuitem11',
text: '职位',
type: 'MENUITEM',
counterid: '',
tooltip: '职位',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: 'fa fa-cog',
icon: '',
textcls: '',
appfunctag: '_5',
appfuncyype: 'APPVIEW',
viewname: 'hrpost-tab-exp-view',
resourcetag: '',
}
,
{
id: '5866C16B-4C55-4E2C-8229-15F7533B9E4F',
name: 'menuitem12',
text: '职务',
type: 'MENUITEM',
counterid: '',
tooltip: '职务',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: 'fa fa-cog',
icon: '',
textcls: '',
appfunctag: '',
resourcetag: '',
}
,
{
id: 'ED02F38F-5988-4458-95BB-75F91E922110',
name: 'menuitem8',
text: '测试',
type: 'MENUITEM',
counterid: '',
tooltip: '测试',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: '',
icon: '',
textcls: '',
appfunctag: '_6',
appfuncyype: 'APPVIEW',
viewname: 'hromhierarchy-grid-view',
resourcetag: '',
}
,
],
}
,
],
......@@ -433,7 +435,7 @@ export default class PIMModel {
*/
private funcs: any[] = [
{
appfunctag: '_7',
appfunctag: '_8',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'hrorganizationgridview',
......@@ -481,7 +483,7 @@ export default class PIMModel {
],
},
{
appfunctag: '_5',
appfunctag: '_6',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'hrposttabexpview',
......@@ -493,7 +495,7 @@ export default class PIMModel {
],
},
{
appfunctag: '_8',
appfunctag: '_9',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'hromhierarchycatgridview',
......@@ -505,7 +507,19 @@ export default class PIMModel {
],
},
{
appfunctag: '_6',
appfunctag: '_5',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'hrdutygridview',
deResParameters: [],
routepath: '/pim/:pim?/hrduties/:hrduty?/gridview/:gridview?',
parameters: [
{ pathName: 'hrduties', parameterName: 'hrduty' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
},
{
appfunctag: '_7',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'hromhierarchygridview',
......
app_PIM/src/widgets/hromhierarchy-cat/ef-001-form/ef-001-form-base.tsx
浏览文件 @ 86d083f7
......@@ -137,7 +137,7 @@ export class EF_001EditFormBase extends EditFormControlBase {
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
omhierarchycatname: new FormItemModel({ caption: '用途', detailType: 'FORMITEM', name: 'omhierarchycatname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
omhierarchycatname: new FormItemModel({ caption: '用途', detailType: 'FORMITEM', name: 'omhierarchycatname', visible: true, isShowCaption: false, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
memo: new FormItemModel({ caption: '备注', detailType: 'FORMITEM', name: 'memo', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
......
app_PIM/src/widgets/hromhierarchy-cat/ef-001-form/ef-001-form.html
浏览文件 @ 86d083f7
......@@ -7,7 +7,7 @@
<app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group1" :data="data" :context="context" :viewparams="viewparams"/>
<row>
<i-col class="form-layout-container" v-show="detailsModel.omhierarchycatname.visible" :style="{}" :sm="{ span: 6, offset: 0 }" :md="{ span: 6, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='omhierarchycatname' :itemRules="this.rules.omhierarchycatname" class='' :caption="$t('entities.hromhierarchycat.ef_001_form.details.omhierarchycatname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.omhierarchycatname.error" :isEmptyCaption="false" labelPos="LEFT">
<app-form-item name='omhierarchycatname' :itemRules="this.rules.omhierarchycatname" class='' :caption="$t('entities.hromhierarchycat.ef_001_form.details.omhierarchycatname')" uiStyle="DEFAULT" :labelWidth="0" :isShowCaption="false" :error="detailsModel.omhierarchycatname.error" :isEmptyCaption="false" labelPos="NONE">
<app-span name='omhierarchycatname' :value="data.omhierarchycatname" dataType="TEXT" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
......
app_PIM/src/widgets/hrpost/tab-exp-viewtabexppanel-tabexppanel/tab-exp-viewtabexppanel-tabexppanel.html
浏览文件 @ 86d083f7
......@@ -93,6 +93,12 @@
<tab-pane :index="3" name='tabviewpanel4' tab='tabexpviewtabexppanel' class=''
:label="(h) =>{
return h('div', [
h('i',{
class:'fa fa-th-list',
style:{
'margin-right' : '2px'
}
}),
h('span', '全部职位'),
h('Badge', {
props: {
......
humanresource-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 86d083f7
......@@ -44,7 +44,7 @@
<!--输出实体[HRDUTY]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrduty-6-3">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrduty-7-3">
<createTable tableName="T_HRDUTY">
<column name="HRDUTYID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_HRDUTY_HRDUTYID"/>
......@@ -180,7 +180,7 @@
<!--输出实体[HROMHIERARCHYCAT]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchycat-67-9">
<changeSet author="a_LAB01_e85d8801c" id="tab-hromhierarchycat-68-9">
<createTable tableName="OMHIERARCHYCAT">
<column name="OMHIERARCHYCATID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_HROMHIERARCHYCAT_OMHIERARCH"/>
......@@ -338,7 +338,7 @@
<!--输出实体[HRPOST]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrpost-40-15">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrpost-44-15">
<createTable tableName="T_HRPOST">
<column name="HRPOSTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_HRPOST_HRPOSTID"/>
......@@ -424,10 +424,10 @@
</changeSet>
<!--输出实体[HRORGANIZATION]外键关系 -->
<!--输出实体[HRPOST]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hrpost-40-25">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrpost-44-25">
<addForeignKeyConstraint baseColumnNames="HRDUTYID" baseTableName="T_HRPOST" constraintName="DER1N_HRPOST_HRDUTY_HRDUTYID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRDUTYID" referencedTableName="T_HRDUTY" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-hrpost-40-26">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrpost-44-26">
<addForeignKeyConstraint baseColumnNames="HRORGANIZATIONID" baseTableName="T_HRPOST" constraintName="DER1N_HRPOST_HRORGANIZATION_HR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
</changeSet>
<!--输出实体[HRPOSTREL]外键关系 -->
......
humanresource-core/src/main/resources/permission/systemResource.json
浏览文件 @ 86d083f7
......@@ -105,7 +105,7 @@
{
"appid":"PIM",
"appname":"基础管理",
"appmenu":[{"menuid":"PIM", "menuname":"PIM", "menuitem":[{ "id":"user_menus" , "name":"用户菜单" , "items":[{ "id":"menuitem3" , "name":"设置" }]},{ "id":"top_menus" , "name":"顶部菜单" , "items":[{ "id":"menuitem1" , "name":"菜单项" }]},{ "id":"left_exp" , "name":"左侧菜单" , "items":[{ "id":"menuitem5" , "name":"人员" , "items":[{ "id":"menuitem15" , "name":"员工信息" }]},{ "id":"menuitem2" , "name":"组织" , "items":[{ "id":"menuitem4" , "name":"法人" },{ "id":"menuitem6" , "name":"运营单位" },{ "id":"menuitem7" , "name":"组织层次结构" },{ "id":"menuitem9" , "name":"所有组织" },{ "id":"menuitem10" , "name":"职位" , "items":[{ "id":"menuitem11" , "name":"职位" },{ "id":"menuitem12" , "name":"职务" },{ "id":"menuitem8" , "name":"测试" }]}]}]},{ "id":"bottom_exp" , "name":"底部内容" },{ "id":"footer_left" , "name":"底部左侧" },{ "id":"footer_center" , "name":"底部中间" },{ "id":"footer_right" , "name":"底部右侧" }] }]
"appmenu":[{"menuid":"PIM", "menuname":"PIM", "menuitem":[{ "id":"user_menus" , "name":"用户菜单" , "items":[{ "id":"menuitem3" , "name":"设置" }]},{ "id":"top_menus" , "name":"顶部菜单" , "items":[{ "id":"menuitem1" , "name":"-" }]},{ "id":"left_exp" , "name":"左侧菜单" , "items":[{ "id":"menuitem5" , "name":"人员" , "items":[{ "id":"menuitem15" , "name":"员工信息" }]},{ "id":"menuitem2" , "name":"组织" , "items":[{ "id":"menuitem4" , "name":"法人" },{ "id":"menuitem6" , "name":"运营单位" },{ "id":"menuitem7" , "name":"组织层次结构" },{ "id":"menuitem9" , "name":"所有组织" }]},{ "id":"menuitem10" , "name":"职位" , "items":[{ "id":"menuitem11" , "name":"职位" },{ "id":"menuitem12" , "name":"职务" },{ "id":"menuitem8" , "name":"测试" }]}]},{ "id":"bottom_exp" , "name":"底部内容" },{ "id":"footer_left" , "name":"底部左侧" },{ "id":"footer_center" , "name":"底部中间" },{ "id":"footer_right" , "name":"底部右侧" }] }]
}
]
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或