Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzou
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzou
提交
df792ad0
提交
df792ad0
编写于
5月 27, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码
上级
52c7207e
变更
9
显示空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
41 行增加
和
185 行删除
+41
-185
en-US.ts
app_web/src/locale/lang/en-US.ts
+0
-2
zh-CN.ts
app_web/src/locale/lang/zh-CN.ts
+0
-2
ouindex-view-appmenu.ts
...src/mock/app/ouindex-view-appmenu/ouindex-view-appmenu.ts
+1
-37
page-register.ts
app_web/src/pages/ou/ouindex-view/page-register.ts
+2
-2
router.ts
app_web/src/pages/ou/ouindex-view/router.ts
+36
-36
state.ts
app_web/src/store/modules/view-action/state.ts
+0
-2
ouindex-view-appmenu-base.vue
...ts/app/ouindex-view-appmenu/ouindex-view-appmenu-base.vue
+0
-42
ouindex-view-appmenu-model.ts
...ts/app/ouindex-view-appmenu/ouindex-view-appmenu-model.ts
+1
-61
systemResource.json
ibzou-core/src/main/resources/permission/systemResource.json
+1
-1
未找到文件。
app_web/src/locale/lang/en-US.ts
浏览文件 @
df792ad0
...
...
@@ -62,8 +62,6 @@ export default {
menuitem1
:
'单位管理'
,
menuitem2
:
'部门管理'
,
menuitem3
:
'人员管理'
,
menuitem4
:
'组织树'
,
menuitem5
:
'部门树'
,
},
},
},
...
...
app_web/src/locale/lang/zh-CN.ts
浏览文件 @
df792ad0
...
...
@@ -62,8 +62,6 @@ export default {
menuitem1
:
'单位管理'
,
menuitem2
:
'部门管理'
,
menuitem3
:
'人员管理'
,
menuitem4
:
'组织树'
,
menuitem5
:
'部门树'
,
},
},
},
...
...
app_web/src/mock/app/ouindex-view-appmenu/ouindex-view-appmenu.ts
浏览文件 @
df792ad0
...
...
@@ -43,7 +43,7 @@ mock.onGet('v7/ouindex-viewappmenu').reply((config: any) => {
iconcls
:
'fa fa-sitemap'
,
icon
:
''
,
textcls
:
''
,
appfunctag
:
'
Auto2
'
,
appfunctag
:
'
_3
'
,
resourcetag
:
''
,
},
{
...
...
@@ -61,42 +61,6 @@ mock.onGet('v7/ouindex-viewappmenu').reply((config: any) => {
iconcls
:
'fa fa-user'
,
icon
:
''
,
textcls
:
''
,
appfunctag
:
'Auto1'
,
resourcetag
:
''
,
},
{
id
:
'B043B2E4-3E81-4205-B1F8-54935A127BB2'
,
name
:
'menuitem4'
,
text
:
'组织树'
,
type
:
'MENUITEM'
,
counterid
:
''
,
tooltip
:
'组织树'
,
expanded
:
false
,
separator
:
false
,
hidden
:
false
,
hidesidebar
:
false
,
opendefault
:
false
,
iconcls
:
''
,
icon
:
''
,
textcls
:
''
,
appfunctag
:
'_3'
,
resourcetag
:
''
,
},
{
id
:
'F195C919-76BD-4D80-9AAF-4FA48B58A81D'
,
name
:
'menuitem5'
,
text
:
'部门树'
,
type
:
'MENUITEM'
,
counterid
:
''
,
tooltip
:
'部门树'
,
expanded
:
false
,
separator
:
false
,
hidden
:
false
,
hidesidebar
:
false
,
opendefault
:
false
,
iconcls
:
''
,
icon
:
''
,
textcls
:
''
,
appfunctag
:
'_2'
,
resourcetag
:
''
,
},
...
...
app_web/src/pages/ou/ouindex-view/page-register.ts
浏览文件 @
df792ad0
...
...
@@ -3,8 +3,8 @@ export const PageComponents = {
Vue
.
component
(
'ibzemployee-edit-view'
,
()
=>
import
(
'@pages/ou/ibzemployee-edit-view/ibzemployee-edit-view.vue'
));
Vue
.
component
(
'ibzdepartment-option-view'
,
()
=>
import
(
'@pages/ou/ibzdepartment-option-view/ibzdepartment-option-view.vue'
));
Vue
.
component
(
'ibzdepartment-pickup-grid-view'
,
()
=>
import
(
'@pages/ou/ibzdepartment-pickup-grid-view/ibzdepartment-pickup-grid-view.vue'
));
Vue
.
component
(
'ibzemployee-grid-view'
,
()
=>
import
(
'@pages/ou/ibzemployee-grid-view/ibzemployee-grid-view.vue'
));
Vue
.
component
(
'ibzorganization-option-view'
,
()
=>
import
(
'@pages/ou/ibzorganization-option-view/ibzorganization-option-view.vue'
));
Vue
.
component
(
'ibzemployee-grid-view'
,
()
=>
import
(
'@pages/ou/ibzemployee-grid-view/ibzemployee-grid-view.vue'
));
Vue
.
component
(
'ibzorganization-pickup-grid-view'
,
()
=>
import
(
'@pages/ou/ibzorganization-pickup-grid-view/ibzorganization-pickup-grid-view.vue'
));
Vue
.
component
(
'ibzdepartment-grid-view'
,
()
=>
import
(
'@pages/ou/ibzdepartment-grid-view/ibzdepartment-grid-view.vue'
));
Vue
.
component
(
'ibzorganization-grid-view'
,
()
=>
import
(
'@pages/ou/ibzorganization-grid-view/ibzorganization-grid-view.vue'
));
...
...
@@ -18,8 +18,8 @@ export const PageComponents = {
Vue
.
component
(
'ibzdepartment-mpickup-view'
,
()
=>
import
(
'@pages/ou/ibzdepartment-mpickup-view/ibzdepartment-mpickup-view.vue'
));
Vue
.
component
(
'ibzdept-member-edit-view'
,
()
=>
import
(
'@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'
));
Vue
.
component
(
'ibzorganization-pickup-view'
,
()
=>
import
(
'@pages/ou/ibzorganization-pickup-view/ibzorganization-pickup-view.vue'
));
Vue
.
component
(
'ibzdepartment-tree-exp-view'
,
()
=>
import
(
'@pages/ou/ibzdepartment-tree-exp-view/ibzdepartment-tree-exp-view.vue'
));
Vue
.
component
(
'ibzemployee-option-view'
,
()
=>
import
(
'@pages/ou/ibzemployee-option-view/ibzemployee-option-view.vue'
));
Vue
.
component
(
'ibzdepartment-tree-exp-view'
,
()
=>
import
(
'@pages/ou/ibzdepartment-tree-exp-view/ibzdepartment-tree-exp-view.vue'
));
Vue
.
component
(
'ibzdepartment-pickup-view'
,
()
=>
import
(
'@pages/ou/ibzdepartment-pickup-view/ibzdepartment-pickup-view.vue'
));
}
};
\ No newline at end of file
app_web/src/pages/ou/ouindex-view/router.ts
浏览文件 @
df792ad0
...
...
@@ -144,6 +144,19 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/ou/ibzdepartment-pickup-grid-view/ibzdepartment-pickup-grid-view.vue'
),
},
{
path
:
'ibzorganizations/:ibzorganization?/optionview/:optionview?'
,
meta
:
{
caption
:
'entities.ibzorganization.views.optionview.caption'
,
parameters
:
[
{
pathName
:
'ouindexview'
,
parameterName
:
'ouindexview'
},
{
pathName
:
'ibzorganizations'
,
parameterName
:
'ibzorganization'
},
{
pathName
:
'optionview'
,
parameterName
:
'optionview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibzorganization-option-view/ibzorganization-option-view.vue'
),
},
{
path
:
'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/gridview/:gridview?'
,
meta
:
{
...
...
@@ -200,19 +213,6 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/ou/ibzemployee-grid-view/ibzemployee-grid-view.vue'
),
},
{
path
:
'ibzorganizations/:ibzorganization?/optionview/:optionview?'
,
meta
:
{
caption
:
'entities.ibzorganization.views.optionview.caption'
,
parameters
:
[
{
pathName
:
'ouindexview'
,
parameterName
:
'ouindexview'
},
{
pathName
:
'ibzorganizations'
,
parameterName
:
'ibzorganization'
},
{
pathName
:
'optionview'
,
parameterName
:
'optionview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibzorganization-option-view/ibzorganization-option-view.vue'
),
},
{
path
:
'ibzorganizations/:ibzorganization?/pickupgridview/:pickupgridview?'
,
meta
:
{
...
...
@@ -674,39 +674,40 @@ const router = new Router({
component
:
()
=>
import
(
'@pages/ou/ibzorganization-pickup-view/ibzorganization-pickup-view.vue'
),
},
{
path
:
'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/
treeexpview/:treeexp
view?'
,
path
:
'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/
ibzemployees/:ibzemployee?/optionview/:option
view?'
,
meta
:
{
caption
:
'entities.ibz
department.views.treeexp
view.caption'
,
caption
:
'entities.ibz
employee.views.option
view.caption'
,
parameters
:
[
{
pathName
:
'ouindexview'
,
parameterName
:
'ouindexview'
},
{
pathName
:
'ibzorganizations'
,
parameterName
:
'ibzorganization'
},
{
pathName
:
'ibzdepartments'
,
parameterName
:
'ibzdepartment'
},
{
pathName
:
'treeexpview'
,
parameterName
:
'treeexpview'
},
{
pathName
:
'ibzemployees'
,
parameterName
:
'ibzemployee'
},
{
pathName
:
'optionview'
,
parameterName
:
'optionview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibz
department-tree-exp-view/ibzdepartment-tree-exp
-view.vue'
),
component
:
()
=>
import
(
'@pages/ou/ibz
employee-option-view/ibzemployee-option
-view.vue'
),
},
{
path
:
'ibz
departments/:ibzdepartment?/treeexpview/:treeexp
view?'
,
path
:
'ibz
organizations/:ibzorganization?/ibzemployees/:ibzemployee?/optionview/:option
view?'
,
meta
:
{
caption
:
'entities.ibz
department.views.treeexp
view.caption'
,
caption
:
'entities.ibz
employee.views.option
view.caption'
,
parameters
:
[
{
pathName
:
'ouindexview'
,
parameterName
:
'ouindexview'
},
{
pathName
:
'ibzdepartments'
,
parameterName
:
'ibzdepartment'
},
{
pathName
:
'treeexpview'
,
parameterName
:
'treeexpview'
},
{
pathName
:
'ibzorganizations'
,
parameterName
:
'ibzorganization'
},
{
pathName
:
'ibzemployees'
,
parameterName
:
'ibzemployee'
},
{
pathName
:
'optionview'
,
parameterName
:
'optionview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibz
department-tree-exp-view/ibzdepartment-tree-exp
-view.vue'
),
component
:
()
=>
import
(
'@pages/ou/ibz
employee-option-view/ibzemployee-option
-view.vue'
),
},
{
path
:
'ibz
organizations/:ibzorganization?/ibz
departments/:ibzdepartment?/ibzemployees/:ibzemployee?/optionview/:optionview?'
,
path
:
'ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/optionview/:optionview?'
,
meta
:
{
caption
:
'entities.ibzemployee.views.optionview.caption'
,
parameters
:
[
{
pathName
:
'ouindexview'
,
parameterName
:
'ouindexview'
},
{
pathName
:
'ibzorganizations'
,
parameterName
:
'ibzorganization'
},
{
pathName
:
'ibzdepartments'
,
parameterName
:
'ibzdepartment'
},
{
pathName
:
'ibzemployees'
,
parameterName
:
'ibzemployee'
},
{
pathName
:
'optionview'
,
parameterName
:
'optionview'
},
...
...
@@ -716,12 +717,11 @@ const router = new Router({
component
:
()
=>
import
(
'@pages/ou/ibzemployee-option-view/ibzemployee-option-view.vue'
),
},
{
path
:
'ibz
organizations/:ibzorganization?/ibz
employees/:ibzemployee?/optionview/:optionview?'
,
path
:
'ibzemployees/:ibzemployee?/optionview/:optionview?'
,
meta
:
{
caption
:
'entities.ibzemployee.views.optionview.caption'
,
parameters
:
[
{
pathName
:
'ouindexview'
,
parameterName
:
'ouindexview'
},
{
pathName
:
'ibzorganizations'
,
parameterName
:
'ibzorganization'
},
{
pathName
:
'ibzemployees'
,
parameterName
:
'ibzemployee'
},
{
pathName
:
'optionview'
,
parameterName
:
'optionview'
},
],
...
...
@@ -730,31 +730,31 @@ const router = new Router({
component
:
()
=>
import
(
'@pages/ou/ibzemployee-option-view/ibzemployee-option-view.vue'
),
},
{
path
:
'ibz
departments/:ibzdepartment?/ibzemployees/:ibzemployee?/optionview/:option
view?'
,
path
:
'ibz
organizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/treeexpview/:treeexp
view?'
,
meta
:
{
caption
:
'entities.ibz
employee.views.option
view.caption'
,
caption
:
'entities.ibz
department.views.treeexp
view.caption'
,
parameters
:
[
{
pathName
:
'ouindexview'
,
parameterName
:
'ouindexview'
},
{
pathName
:
'ibzorganizations'
,
parameterName
:
'ibzorganization'
},
{
pathName
:
'ibzdepartments'
,
parameterName
:
'ibzdepartment'
},
{
pathName
:
'ibzemployees'
,
parameterName
:
'ibzemployee'
},
{
pathName
:
'optionview'
,
parameterName
:
'optionview'
},
{
pathName
:
'treeexpview'
,
parameterName
:
'treeexpview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibz
employee-option-view/ibzemployee-option
-view.vue'
),
component
:
()
=>
import
(
'@pages/ou/ibz
department-tree-exp-view/ibzdepartment-tree-exp
-view.vue'
),
},
{
path
:
'ibz
employees/:ibzemployee?/optionview/:option
view?'
,
path
:
'ibz
departments/:ibzdepartment?/treeexpview/:treeexp
view?'
,
meta
:
{
caption
:
'entities.ibz
employee.views.option
view.caption'
,
caption
:
'entities.ibz
department.views.treeexp
view.caption'
,
parameters
:
[
{
pathName
:
'ouindexview'
,
parameterName
:
'ouindexview'
},
{
pathName
:
'ibz
employees'
,
parameterName
:
'ibzemployee
'
},
{
pathName
:
'
optionview'
,
parameterName
:
'option
view'
},
{
pathName
:
'ibz
departments'
,
parameterName
:
'ibzdepartment
'
},
{
pathName
:
'
treeexpview'
,
parameterName
:
'treeexp
view'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibz
employee-option-view/ibzemployee-option
-view.vue'
),
component
:
()
=>
import
(
'@pages/ou/ibz
department-tree-exp-view/ibzdepartment-tree-exp
-view.vue'
),
},
{
path
:
'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/pickupview/:pickupview?'
,
...
...
app_web/src/store/modules/view-action/state.ts
浏览文件 @
df792ad0
...
...
@@ -181,8 +181,6 @@ export const viewstate: any = {
viewdatachange
:
false
,
refviews
:
[
'25e23f456601163e730de6c1a825364b'
,
'2300119cfeaff98d4bc48c1679515968'
,
'd2cc126cb4bcf523d72509bef0183ee0'
,
'cace6f75674cff323d90d670e609aa21'
,
'9ed83d4d91fedf510a43bbe8908a21ba'
,
],
...
...
app_web/src/widgets/app/ouindex-view-appmenu/ouindex-view-appmenu-base.vue
浏览文件 @
df792ad0
...
...
@@ -564,12 +564,6 @@ export default class OUIndexViewBase extends Vue implements ControlInterface {
case
'Auto3'
:
this
.
clickAuto3
(
item
);
return
;
case
'Auto1'
:
this
.
clickAuto1
(
item
);
return
;
case
'Auto2'
:
this
.
clickAuto2
(
item
);
return
;
case
'_2'
:
this
.
click_2
(
item
);
return
;
...
...
@@ -616,42 +610,6 @@ export default class OUIndexViewBase extends Vue implements ControlInterface {
this
.
$router
.
push
(
path
);
}
/**
* 人员管理
*
* @param {*} [item={}]
* @memberof OUIndexView
*/
public
clickAuto1
(
item
:
any
=
{})
{
const
viewparam
:
any
=
{};
Object
.
assign
(
viewparam
,
{});
const
deResParameters
:
any
[]
=
[];
const
parameters
:
any
[]
=
[
{
pathName
:
'ibzemployees'
,
parameterName
:
'ibzemployee'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
];
const
path
:
string
=
this
.
$viewTool
.
buildUpRoutePath
(
this
.
$route
,
{},
deResParameters
,
parameters
,
[],
viewparam
);
this
.
$router
.
push
(
path
);
}
/**
* 部门管理
*
* @param {*} [item={}]
* @memberof OUIndexView
*/
public
clickAuto2
(
item
:
any
=
{})
{
const
viewparam
:
any
=
{};
Object
.
assign
(
viewparam
,
{});
const
deResParameters
:
any
[]
=
[];
const
parameters
:
any
[]
=
[
{
pathName
:
'ibzdepartments'
,
parameterName
:
'ibzdepartment'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
];
const
path
:
string
=
this
.
$viewTool
.
buildUpRoutePath
(
this
.
$route
,
{},
deResParameters
,
parameters
,
[],
viewparam
);
this
.
$router
.
push
(
path
);
}
/**
* 部门树
*
...
...
app_web/src/widgets/app/ouindex-view-appmenu/ouindex-view-appmenu-model.ts
浏览文件 @
df792ad0
...
...
@@ -47,7 +47,7 @@ export default class OUIndexViewModel {
iconcls
:
'fa fa-sitemap'
,
icon
:
''
,
textcls
:
''
,
appfunctag
:
'
Auto2
'
,
appfunctag
:
'
_3
'
,
resourcetag
:
''
,
},
{
...
...
@@ -65,42 +65,6 @@ export default class OUIndexViewModel {
iconcls
:
'fa fa-user'
,
icon
:
''
,
textcls
:
''
,
appfunctag
:
'Auto1'
,
resourcetag
:
''
,
},
{
id
:
'B043B2E4-3E81-4205-B1F8-54935A127BB2'
,
name
:
'menuitem4'
,
text
:
'组织树'
,
type
:
'MENUITEM'
,
counterid
:
''
,
tooltip
:
'组织树'
,
expanded
:
false
,
separator
:
false
,
hidden
:
false
,
hidesidebar
:
false
,
opendefault
:
false
,
iconcls
:
''
,
icon
:
''
,
textcls
:
''
,
appfunctag
:
'_3'
,
resourcetag
:
''
,
},
{
id
:
'F195C919-76BD-4D80-9AAF-4FA48B58A81D'
,
name
:
'menuitem5'
,
text
:
'部门树'
,
type
:
'MENUITEM'
,
counterid
:
''
,
tooltip
:
'部门树'
,
expanded
:
false
,
separator
:
false
,
hidden
:
false
,
hidesidebar
:
false
,
opendefault
:
false
,
iconcls
:
''
,
icon
:
''
,
textcls
:
''
,
appfunctag
:
'_2'
,
resourcetag
:
''
,
},
...
...
@@ -138,30 +102,6 @@ export default class OUIndexViewModel {
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
],
},
{
appfunctag
:
'Auto1'
,
appfuncyype
:
'APPVIEW'
,
openmode
:
''
,
codename
:
'ibzemployeegridview'
,
deResParameters
:
[],
routepath
:
'/ouindexview/:ouindexview?/ibzemployees/:ibzemployee?/gridview/:gridview?'
,
parameters
:
[
{
pathName
:
'ibzemployees'
,
parameterName
:
'ibzemployee'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
],
},
{
appfunctag
:
'Auto2'
,
appfuncyype
:
'APPVIEW'
,
openmode
:
''
,
codename
:
'ibzdepartmentgridview'
,
deResParameters
:
[],
routepath
:
'/ouindexview/:ouindexview?/ibzdepartments/:ibzdepartment?/gridview/:gridview?'
,
parameters
:
[
{
pathName
:
'ibzdepartments'
,
parameterName
:
'ibzdepartment'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
],
},
{
appfunctag
:
'_2'
,
appfuncyype
:
'APPVIEW'
,
...
...
ibzou-core/src/main/resources/permission/systemResource.json
浏览文件 @
df792ad0
...
...
@@ -41,7 +41,7 @@
{
"appid"
:
"web"
,
"appname"
:
"统一组织单位"
,
"appmenu"
:[{
"menuid"
:
"OUIndexView"
,
"menuname"
:
"OUIndexView"
,
"menuitem"
:[{
"id"
:
"menuitem1"
,
"name"
:
"单位管理"
},{
"id"
:
"menuitem2"
,
"name"
:
"部门管理"
},{
"id"
:
"menuitem3"
,
"name"
:
"人员管理"
}
,{
"id"
:
"menuitem4"
,
"name"
:
"组织树"
},{
"id"
:
"menuitem5"
,
"name"
:
"部门树"
}
]
}]
"appmenu"
:[{
"menuid"
:
"OUIndexView"
,
"menuname"
:
"OUIndexView"
,
"menuitem"
:[{
"id"
:
"menuitem1"
,
"name"
:
"单位管理"
},{
"id"
:
"menuitem2"
,
"name"
:
"部门管理"
},{
"id"
:
"menuitem3"
,
"name"
:
"人员管理"
}]
}]
}
]
}
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录