Skip to content

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

jackwang 部署微服务应用

上级 91cd4b68
隐藏空白字符变更
内嵌 并排
正在显示 包含 101 行增加 和 247 行删除
app_PIM/public/assets/json/view-config.json
浏览文件 @ 0a177a5e
......@@ -169,16 +169,6 @@
"viewtag": "26838780ace211d1714a2887e9039888",
"memo": ""
},
"hremployeeeditview2": {
"title": "员工编辑视图",
"caption": "员工",
"viewtype": "DEEDITVIEW2",
"viewmodule": "HumanResource",
"viewname": "HREmployeeEditView2",
"viewfilename": "hremployee-edit-view2",
"viewtag": "2845c606caf1ce6ad990cfc0adef801b",
"memo": ""
},
"hroperationunitgridview": {
"title": "运营单位",
"caption": "运营单位",
......
app_PIM/src/locale/lanres/entities/hrdistribution/hrdistribution_en_US.ts
浏览文件 @ 0a177a5e
......@@ -69,40 +69,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",
......@@ -149,4 +115,38 @@ export default {
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
app_PIM/src/locale/lanres/entities/hrdistribution/hrdistribution_zh_CN.ts
浏览文件 @ 0a177a5e
......@@ -68,40 +68,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: "保存",
......@@ -148,4 +114,38 @@ export default {
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
app_PIM/src/locale/lanres/entities/hremployee/hremployee_en_US.ts
浏览文件 @ 0a177a5e
......@@ -42,10 +42,6 @@ export default {
nativeplace: "籍贯",
},
views: {
editview2: {
caption: "员工",
title: "员工编辑视图",
},
pickupgridview: {
caption: "员工",
title: "员工选择表格视图",
......@@ -132,52 +128,6 @@ export default {
uiactions: {
},
},
editview2toolbar_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",
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "New",
......
app_PIM/src/locale/lanres/entities/hremployee/hremployee_zh_CN.ts
浏览文件 @ 0a177a5e
......@@ -41,10 +41,6 @@ export default {
nativeplace: "籍贯",
},
views: {
editview2: {
caption: "员工",
title: "员工编辑视图",
},
pickupgridview: {
caption: "员工",
title: "员工选择表格视图",
......@@ -131,52 +127,6 @@ export default {
uiactions: {
},
},
editview2toolbar_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: "帮助",
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "新建",
......
app_PIM/src/mock/viewconfig/viewconfig.ts
浏览文件 @ 0a177a5e
......@@ -143,14 +143,6 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "HROperationUnitV_002",
"viewtag": "26838780ace211d1714a2887e9039888"
},
"hremployeeeditview2": {
"title": "员工编辑视图",
"caption": "员工",
"viewtype": "DEEDITVIEW2",
"viewmodule": "HumanResource",
"viewname": "HREmployeeEditView2",
"viewtag": "2845c606caf1ce6ad990cfc0adef801b"
},
"hroperationunitgridview": {
"title": "运营单位",
"caption": "运营单位",
......
app_PIM/src/pages/human-resource/hremployee-grid-view/hremployee-grid-view-base.tsx
浏览文件 @ 0a177a5e
......@@ -598,7 +598,7 @@ export class HREmployeeGridViewBase extends GridViewBase {
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'hremployees', parameterName: 'hremployee' },
{ pathName: 'editview2', parameterName: 'editview2' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
......
app_PIM/src/pages/ungroup/pim/page-register.ts
浏览文件 @ 0a177a5e
export const PageComponents = {
install(Vue: any, opt: any) {
Vue.component('hrpost-v-004', () => import('@pages/human-resource/hrpost-v-004/hrpost-v-004.vue'));
Vue.component('hremployee-pickup-view', () => import('@pages/human-resource/hremployee-pickup-view/hremployee-pickup-view.vue'));
Vue.component('hremployee-pickup-view', () => import('@pages/human-resource/hremployee-pickup-view/hremployee-pickup-view.vue'));
Vue.component('hrpost-v-004', () => import('@pages/human-resource/hrpost-v-004/hrpost-v-004.vue'));
Vue.component('hroperation-unit-edit-view', () => import('@pages/base/hroperation-unit-edit-view/hroperation-unit-edit-view.vue'));
Vue.component('hrpost-grid-view', () => import('@pages/human-resource/hrpost-grid-view/hrpost-grid-view.vue'));
Vue.component('hrduty-v-001', () => import('@pages/human-resource/hrduty-v-001/hrduty-v-001.vue'));
Vue.component('hremployee-edit-view2', () => import('@pages/human-resource/hremployee-edit-view2/hremployee-edit-view2.vue'));
Vue.component('hromhierarchy-cat-tab-exp-view', () => import('@pages/base/hromhierarchy-cat-tab-exp-view/hromhierarchy-cat-tab-exp-view.vue'));
Vue.component('hrpost-v-002', () => import('@pages/human-resource/hrpost-v-002/hrpost-v-002.vue'));
Vue.component('hrdistribution-edit-view', () => import('@pages/human-resource/hrdistribution-edit-view/hrdistribution-edit-view.vue'));
......@@ -61,9 +60,9 @@ export const PageComponents = {
Vue.component('hrpost-v-005', () => import('@pages/human-resource/hrpost-v-005/hrpost-v-005.vue'));
Vue.component('hrlegal-edit-view', () => import('@pages/base/hrlegal-edit-view/hrlegal-edit-view.vue'));
Vue.component('hromhierarchy-edit-view', () => import('@pages/base/hromhierarchy-edit-view/hromhierarchy-edit-view.vue'));
Vue.component('hrpost-rel-grid-view', () => import('@pages/human-resource/hrpost-rel-grid-view/hrpost-rel-grid-view.vue'));
Vue.component('hrorganization-grid-view', () => import('@pages/base/hrorganization-grid-view/hrorganization-grid-view.vue'));
Vue.component('hrduty-pickup-view', () => import('@pages/human-resource/hrduty-pickup-view/hrduty-pickup-view.vue'));
Vue.component('hrpost-rel-grid-view', () => import('@pages/human-resource/hrpost-rel-grid-view/hrpost-rel-grid-view.vue'));
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'));
......
app_PIM/src/pages/ungroup/pim/router.ts
浏览文件 @ 0a177a5e
......@@ -44,32 +44,32 @@ const router = new Router({
component: () => import('@pages/ungroup/pim/pim.vue'),
children: [
{
path: 'hrposts/:hrpost?/v_004/:v_004?',
path: 'hremployees/:hremployee?/pickupview/:pickupview?',
meta: {
caption: 'entities.hrpost.views.v_004.title',
caption: 'entities.hremployee.views.pickupview.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrposts', parameterName: 'hrpost' },
{ pathName: 'v_004', parameterName: 'v_004' },
{ pathName: 'hremployees', parameterName: 'hremployee' },
{ pathName: 'pickupview', parameterName: 'pickupview' },
],
requireAuth: true,
},
component: () => import('@pages/human-resource/hrpost-v-004/hrpost-v-004.vue'),
component: () => import('@pages/human-resource/hremployee-pickup-view/hremployee-pickup-view.vue'),
},
{
path: 'hremployees/:hremployee?/pickupview/:pickupview?',
path: 'hrposts/:hrpost?/v_004/:v_004?',
meta: {
caption: 'entities.hremployee.views.pickupview.title',
caption: 'entities.hrpost.views.v_004.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hremployees', parameterName: 'hremployee' },
{ pathName: 'pickupview', parameterName: 'pickupview' },
{ pathName: 'hrposts', parameterName: 'hrpost' },
{ pathName: 'v_004', parameterName: 'v_004' },
],
requireAuth: true,
},
component: () => import('@pages/human-resource/hremployee-pickup-view/hremployee-pickup-view.vue'),
component: () => import('@pages/human-resource/hrpost-v-004/hrpost-v-004.vue'),
},
{
path: 'hroperationunits/:hroperationunit?/editview/:editview?',
......@@ -113,20 +113,6 @@ const router = new Router({
},
component: () => import('@pages/human-resource/hrduty-v-001/hrduty-v-001.vue'),
},
{
path: 'hremployees/:hremployee?/editview2/:editview2?',
meta: {
caption: 'entities.hremployee.views.editview2.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hremployees', parameterName: 'hremployee' },
{ pathName: 'editview2', parameterName: 'editview2' },
],
requireAuth: true,
},
component: () => import('@pages/human-resource/hremployee-edit-view2/hremployee-edit-view2.vue'),
},
{
path: 'hromhierarchycats/:hromhierarchycat?/tabexpview/:tabexpview?',
meta: {
......@@ -1288,61 +1274,61 @@ const router = new Router({
component: () => import('@pages/base/hromhierarchy-edit-view/hromhierarchy-edit-view.vue'),
},
{
path: 'hrposts/:hrpost?/hrpostrels/:hrpostrel?/gridview/:gridview?',
path: 'hrorganizations/:hrorganization?/gridview/:gridview?',
meta: {
caption: 'entities.hrpostrel.views.gridview.title',
caption: 'entities.hrorganization.views.gridview.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrposts', parameterName: 'hrpost' },
{ pathName: 'hrpostrels', parameterName: 'hrpostrel' },
{ pathName: 'hrorganizations', parameterName: 'hrorganization' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
requireAuth: true,
},
component: () => import('@pages/human-resource/hrpost-rel-grid-view/hrpost-rel-grid-view.vue'),
component: () => import('@pages/base/hrorganization-grid-view/hrorganization-grid-view.vue'),
},
{
path: 'hrpostrels/:hrpostrel?/gridview/:gridview?',
path: 'hrduties/:hrduty?/pickupview/:pickupview?',
meta: {
caption: 'entities.hrpostrel.views.gridview.title',
caption: 'entities.hrduty.views.pickupview.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrpostrels', parameterName: 'hrpostrel' },
{ pathName: 'gridview', parameterName: 'gridview' },
{ pathName: 'hrduties', parameterName: 'hrduty' },
{ pathName: 'pickupview', parameterName: 'pickupview' },
],
requireAuth: true,
},
component: () => import('@pages/human-resource/hrpost-rel-grid-view/hrpost-rel-grid-view.vue'),
component: () => import('@pages/human-resource/hrduty-pickup-view/hrduty-pickup-view.vue'),
},
{
path: 'hrorganizations/:hrorganization?/gridview/:gridview?',
path: 'hrposts/:hrpost?/hrpostrels/:hrpostrel?/gridview/:gridview?',
meta: {
caption: 'entities.hrorganization.views.gridview.title',
caption: 'entities.hrpostrel.views.gridview.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrorganizations', parameterName: 'hrorganization' },
{ pathName: 'hrposts', parameterName: 'hrpost' },
{ pathName: 'hrpostrels', parameterName: 'hrpostrel' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
requireAuth: true,
},
component: () => import('@pages/base/hrorganization-grid-view/hrorganization-grid-view.vue'),
component: () => import('@pages/human-resource/hrpost-rel-grid-view/hrpost-rel-grid-view.vue'),
},
{
path: 'hrduties/:hrduty?/pickupview/:pickupview?',
path: 'hrpostrels/:hrpostrel?/gridview/:gridview?',
meta: {
caption: 'entities.hrduty.views.pickupview.title',
caption: 'entities.hrpostrel.views.gridview.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrduties', parameterName: 'hrduty' },
{ pathName: 'pickupview', parameterName: 'pickupview' },
{ pathName: 'hrpostrels', parameterName: 'hrpostrel' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
requireAuth: true,
},
component: () => import('@pages/human-resource/hrduty-pickup-view/hrduty-pickup-view.vue'),
component: () => import('@pages/human-resource/hrpost-rel-grid-view/hrpost-rel-grid-view.vue'),
},
{
path: 'hromhierarchycats/:hromhierarchycat?/editview/:editview?',
......
app_PIM/src/store/modules/view-action/state.ts
浏览文件 @ 0a177a5e
......@@ -155,17 +155,6 @@ export const viewstate: any = {
'3110aca6f6c27996e9874cfb924c569f',
],
},
{
viewtag: '2845c606caf1ce6ad990cfc0adef801b',
viewmodule: 'HumanResource',
viewname: 'HREmployeeEditView2',
viewaction: '',
viewdatachange: false,
refviews: [
'6395cba44e6d6151f19e543b55d88845',
'e7ba37699bd458dc8dd5c02abac8dadd',
],
},
{
viewtag: '286e8ac9eca7b6eb8058fde93995db10',
viewmodule: 'Base',
......@@ -495,7 +484,6 @@ export const viewstate: any = {
viewdatachange: false,
refviews: [
'b932c0eb66409c638c29ee27ba4fda37',
'2845c606caf1ce6ad990cfc0adef801b',
],
},
{
......
app_PIM/src/uiservice/hremployee/hremployee-ui-service-base.ts
浏览文件 @ 0a177a5e
......@@ -89,7 +89,6 @@ export default class HREmployeeUIServiceBase extends UIService {
* @memberof HREmployeeUIServiceBase
*/
public initViewMap(){
this.allViewMap.set(':',{viewname:'editview2',srfappde:'hremployees'});
this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'hremployees'});
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'hremployees'});
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'hremployees'});
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或