Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz人力资源
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz企业套件
iBiz人力资源
提交
c420a725
提交
c420a725
编写于
8月 12, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
JunZai 发布系统代码
上级
f54864c8
变更
11
隐藏空白字符变更
内嵌
并排
正在显示
11 个修改的文件
包含
408 行增加
和
91 行删除
+408
-91
hrarchives_en_US.ts
...src/locale/lanres/entities/hrarchives/hrarchives_en_US.ts
+15
-1
hrarchives_zh_CN.ts
...src/locale/lanres/entities/hrarchives/hrarchives_zh_CN.ts
+15
-1
hrtransfer-apply-wfdyna-exp-grid-view.html
...-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view.html
+0
-54
page-register.ts
app_PIM/src/pages/ungroup/pim/page-register.ts
+2
-2
router.ts
app_PIM/src/pages/ungroup/pim/router.ts
+24
-24
state.ts
app_PIM/src/store/modules/view-action/state.ts
+2
-0
main-form-base.tsx
app_PIM/src/widgets/hrarchives/main-form/main-form-base.tsx
+80
-2
main-form-model.ts
app_PIM/src/widgets/hrarchives/main-form/main-form-model.ts
+72
-2
main-form-service.ts
...PIM/src/widgets/hrarchives/main-form/main-form-service.ts
+24
-0
main-form.html
app_PIM/src/widgets/hrarchives/main-form/main-form.html
+173
-5
HRArchives.java
...b/humanresource/core/humanresource/domain/HRArchives.java
+1
-0
未找到文件。
app_PIM/src/locale/lanres/entities/hrarchives/hrarchives_en_US.ts
浏览文件 @
c420a725
...
...
@@ -54,7 +54,21 @@ export default {
srfuf
:
""
,
srfdeid
:
""
,
srfsourcekey
:
""
,
hrarchivesname
:
"档案信息名称"
,
archivescode
:
"档案编号"
,
hrorganizationname
:
"档案管理单位"
,
archivesplace
:
"档案保管地"
,
archivesroom
:
"档案室"
,
hremployeename
:
"员工姓名"
,
employeecode
:
"员工编号"
,
organizationname
:
"单位"
,
activeflag
:
"是否有效"
,
degree
:
"档案学历"
,
birthday
:
"档案出生日期"
,
startworktime
:
"档案参加工作时间"
,
politicaltime
:
"档案入党时间"
,
memo
:
"备注"
,
hremployeeid
:
"员工标识"
,
hrorganizationid
:
"档案管理单位ID"
,
hrarchivesid
:
"档案信息标识"
,
},
uiactions
:
{
...
...
app_PIM/src/locale/lanres/entities/hrarchives/hrarchives_zh_CN.ts
浏览文件 @
c420a725
...
...
@@ -53,7 +53,21 @@ export default {
srfuf
:
""
,
srfdeid
:
""
,
srfsourcekey
:
""
,
hrarchivesname
:
"档案信息名称"
,
archivescode
:
"档案编号"
,
hrorganizationname
:
"档案管理单位"
,
archivesplace
:
"档案保管地"
,
archivesroom
:
"档案室"
,
hremployeename
:
"员工姓名"
,
employeecode
:
"员工编号"
,
organizationname
:
"单位"
,
activeflag
:
"是否有效"
,
degree
:
"档案学历"
,
birthday
:
"档案出生日期"
,
startworktime
:
"档案参加工作时间"
,
politicaltime
:
"档案入党时间"
,
memo
:
"备注"
,
hremployeeid
:
"员工标识"
,
hrorganizationid
:
"档案管理单位ID"
,
hrarchivesid
:
"档案信息标识"
,
},
uiactions
:
{
...
...
app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view.html
浏览文件 @
c420a725
<template
slot=
'title'
>
<span
class=
'caption-info'
>
{{viewCaption}}
</span>
</template>
<split
id=
"hrtransferapplywfdynaexpgridview"
v-model=
"split"
mode=
"horizontal"
>
<div
slot=
'left'
>
<el-tree
ref=
"tree"
:data=
"wfStepModel"
node-key=
"userTaskId"
:highlight-current=
"true"
:props=
"defaultProps"
@
node-click=
"handleNodeClick"
></el-tree>
</div>
<div
slot=
"right"
>
<div
class=
"content-container"
>
<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
>
<view
_grid
:viewState=
"viewState"
:viewparams=
"viewparams"
:context=
"context"
:isSingleSelect=
"isGridSingleSelect"
:showBusyIndicator=
"true"
updateAction=
""
removeAction=
"Remove"
loaddraftAction=
""
loadAction=
""
createAction=
""
fetchAction=
"FetchDefault"
: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
>
</div>
</div>
</split>
</card>
</div>
-->
<studio-view-style2
viewName=
"hrtransferapplywfdynaexpgridview"
viewTitle=
"调动申请工作流导航表格视图"
class=
'dewfdynaexpgridview hrtransfer-apply-wfdyna-exp-grid-view'
>
<template
slot=
'title'
>
<span
class=
'caption-info'
>
{{viewCaption}}
</span>
...
...
@@ -124,5 +71,4 @@
</div>
</div>
</split>
</card>
</studio-view-style2>
\ No newline at end of file
app_PIM/src/pages/ungroup/pim/page-register.ts
浏览文件 @
c420a725
...
...
@@ -53,8 +53,8 @@ export const PageComponents = {
Vue
.
component
(
'hrtechnical-title-v-003'
,
()
=>
import
(
'@pages/human-resource/hrtechnical-title-v-003/hrtechnical-title-v-003.vue'
));
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
(
'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
(
'hrorganization-grid-view'
,
()
=>
import
(
'@pages/base/hrorganization-grid-view/hrorganization-grid-view.vue'
));
Vue
.
component
(
'hrtransfer-apply-wfdyna-exp-grid-view'
,
()
=>
import
(
'@pages/pcm/hrtransfer-apply-wfdyna-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view.vue'
));
Vue
.
component
(
'hremployee-v-006'
,
()
=>
import
(
'@pages/human-resource/hremployee-v-006/hremployee-v-006.vue'
));
Vue
.
component
(
'hremployee-v-002'
,
()
=>
import
(
'@pages/human-resource/hremployee-v-002/hremployee-v-002.vue'
));
...
...
@@ -89,9 +89,9 @@ export const PageComponents = {
Vue
.
component
(
'hremployee-tree-exp-view'
,
()
=>
import
(
'@pages/human-resource/hremployee-tree-exp-view/hremployee-tree-exp-view.vue'
));
Vue
.
component
(
'hremployee-tab-exp-view'
,
()
=>
import
(
'@pages/human-resource/hremployee-tab-exp-view/hremployee-tab-exp-view.vue'
));
Vue
.
component
(
'hrcontract-edit-view'
,
()
=>
import
(
'@pages/human-resource/hrcontract-edit-view/hrcontract-edit-view.vue'
));
Vue
.
component
(
'hrorganization-pickup-view'
,
()
=>
import
(
'@pages/base/hrorganization-pickup-view/hrorganization-pickup-view.vue'
));
Vue
.
component
(
'hromhierarchy-cat-dashboard-view'
,
()
=>
import
(
'@pages/base/hromhierarchy-cat-dashboard-view/hromhierarchy-cat-dashboard-view.vue'
));
Vue
.
component
(
'hrduty-edu-grid-view'
,
()
=>
import
(
'@pages/human-resource/hrduty-edu-grid-view/hrduty-edu-grid-view.vue'
));
Vue
.
component
(
'hrorganization-pickup-view'
,
()
=>
import
(
'@pages/base/hrorganization-pickup-view/hrorganization-pickup-view.vue'
));
Vue
.
component
(
'hroperation-unit-tab-exp-view'
,
()
=>
import
(
'@pages/base/hroperation-unit-tab-exp-view/hroperation-unit-tab-exp-view.vue'
));
Vue
.
component
(
'hrlanguage-ability-grid-view'
,
()
=>
import
(
'@pages/human-resource/hrlanguage-ability-grid-view/hrlanguage-ability-grid-view.vue'
));
Vue
.
component
(
'hrorg-address-grid-view'
,
()
=>
import
(
'@pages/base/hrorg-address-grid-view/hrorg-address-grid-view.vue'
));
...
...
app_PIM/src/pages/ungroup/pim/router.ts
浏览文件 @
c420a725
...
...
@@ -1311,32 +1311,32 @@ const router = new Router({
component
:
()
=>
import
(
'@pages/base/hrlegal-edit-view/hrlegal-edit-view.vue'
),
},
{
path
:
'hr
organizations/:hrorganization?/gridview/:grid
view?'
,
path
:
'hr
duties/:hrduty?/pickupview/:pickup
view?'
,
meta
:
{
caption
:
'entities.hr
organization.views.grid
view.title'
,
caption
:
'entities.hr
duty.views.pickup
view.title'
,
info
:
''
,
parameters
:
[
{
pathName
:
'pim'
,
parameterName
:
'pim'
},
{
pathName
:
'hr
organizations'
,
parameterName
:
'hrorganization
'
},
{
pathName
:
'
gridview'
,
parameterName
:
'grid
view'
},
{
pathName
:
'hr
duties'
,
parameterName
:
'hrduty
'
},
{
pathName
:
'
pickupview'
,
parameterName
:
'pickup
view'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/
base/hrorganization-grid-view/hrorganization-grid
-view.vue'
),
component
:
()
=>
import
(
'@pages/
human-resource/hrduty-pickup-view/hrduty-pickup
-view.vue'
),
},
{
path
:
'hr
duties/:hrduty?/pickupview/:pickup
view?'
,
path
:
'hr
organizations/:hrorganization?/gridview/:grid
view?'
,
meta
:
{
caption
:
'entities.hr
duty.views.pickup
view.title'
,
caption
:
'entities.hr
organization.views.grid
view.title'
,
info
:
''
,
parameters
:
[
{
pathName
:
'pim'
,
parameterName
:
'pim'
},
{
pathName
:
'hr
duties'
,
parameterName
:
'hrduty
'
},
{
pathName
:
'
pickupview'
,
parameterName
:
'pickup
view'
},
{
pathName
:
'hr
organizations'
,
parameterName
:
'hrorganization
'
},
{
pathName
:
'
gridview'
,
parameterName
:
'grid
view'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/
human-resource/hrduty-pickup-view/hrduty-pickup
-view.vue'
),
component
:
()
=>
import
(
'@pages/
base/hrorganization-grid-view/hrorganization-grid
-view.vue'
),
},
{
path
:
'hrposts/:hrpost?/hrtransferapplies/:hrtransferapply?/wfdynaexpgridview/:wfdynaexpgridview?'
,
...
...
@@ -2249,6 +2249,20 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/human-resource/hrcontract-edit-view/hrcontract-edit-view.vue'
),
},
{
path
:
'hrorganizations/:hrorganization?/pickupview/:pickupview?'
,
meta
:
{
caption
:
'entities.hrorganization.views.pickupview.title'
,
info
:
''
,
parameters
:
[
{
pathName
:
'pim'
,
parameterName
:
'pim'
},
{
pathName
:
'hrorganizations'
,
parameterName
:
'hrorganization'
},
{
pathName
:
'pickupview'
,
parameterName
:
'pickupview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/base/hrorganization-pickup-view/hrorganization-pickup-view.vue'
),
},
{
path
:
'hromhierarchycats/:hromhierarchycat?/dashboardview/:dashboardview?'
,
meta
:
{
...
...
@@ -2292,20 +2306,6 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/human-resource/hrduty-edu-grid-view/hrduty-edu-grid-view.vue'
),
},
{
path
:
'hrorganizations/:hrorganization?/pickupview/:pickupview?'
,
meta
:
{
caption
:
'entities.hrorganization.views.pickupview.title'
,
info
:
''
,
parameters
:
[
{
pathName
:
'pim'
,
parameterName
:
'pim'
},
{
pathName
:
'hrorganizations'
,
parameterName
:
'hrorganization'
},
{
pathName
:
'pickupview'
,
parameterName
:
'pickupview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/base/hrorganization-pickup-view/hrorganization-pickup-view.vue'
),
},
{
path
:
'hroperationunits/:hroperationunit?/tabexpview/:tabexpview?'
,
meta
:
{
...
...
app_PIM/src/store/modules/view-action/state.ts
浏览文件 @
c420a725
...
...
@@ -395,6 +395,8 @@ export const viewstate: any = {
viewaction
:
''
,
viewdatachange
:
false
,
refviews
:
[
'ec9d9fe37bbfc3fcb623e2dc34b48dbc'
,
'e7ba37699bd458dc8dd5c02abac8dadd'
,
],
},
{
...
...
app_PIM/src/widgets/hrarchives/main-form/main-form-base.tsx
浏览文件 @
c420a725
...
...
@@ -82,7 +82,21 @@ export class MainEditFormBase extends EditFormControlBase {
srfuf
:
null
,
srfdeid
:
null
,
srfsourcekey
:
null
,
hrarchivesname
:
null
,
archivescode
:
null
,
hrorganizationname
:
null
,
archivesplace
:
null
,
archivesroom
:
null
,
hremployeename
:
null
,
employeecode
:
null
,
organizationname
:
null
,
activeflag
:
null
,
degree
:
null
,
birthday
:
null
,
startworktime
:
null
,
politicaltime
:
null
,
memo
:
null
,
hremployeeid
:
null
,
hrorganizationid
:
null
,
hrarchivesid
:
null
,
hrarchives
:
null
,
};
...
...
@@ -94,6 +108,22 @@ export class MainEditFormBase extends EditFormControlBase {
* @memberof MainEditFormBase
*/
public
rules
:
any
=
{
archivescode
:
[
{
required
:
true
,
type
:
'string'
,
message
:
'档案编号 值不能为空'
,
trigger
:
'change'
},
{
required
:
true
,
type
:
'string'
,
message
:
'档案编号 值不能为空'
,
trigger
:
'blur'
},
],
hrorganizationname
:
[
{
required
:
true
,
type
:
'string'
,
message
:
'档案管理单位 值不能为空'
,
trigger
:
'change'
},
{
required
:
true
,
type
:
'string'
,
message
:
'档案管理单位 值不能为空'
,
trigger
:
'blur'
},
],
hremployeename
:
[
{
required
:
true
,
type
:
'string'
,
message
:
'员工姓名 值不能为空'
,
trigger
:
'change'
},
{
required
:
true
,
type
:
'string'
,
message
:
'员工姓名 值不能为空'
,
trigger
:
'blur'
},
],
activeflag
:
[
{
required
:
true
,
type
:
'number'
,
message
:
'是否有效 值不能为空'
,
trigger
:
'change'
},
{
required
:
true
,
type
:
'number'
,
message
:
'是否有效 值不能为空'
,
trigger
:
'blur'
},
],
}
/**
...
...
@@ -132,9 +162,57 @@ export class MainEditFormBase extends EditFormControlBase {
srfsourcekey
:
new
FormItemModel
({
caption
:
''
,
detailType
:
'FORMITEM'
,
name
:
'srfsourcekey'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
showMoreMode
:
0
,
disabled
:
false
,
enableCond
:
3
}),
hrarchivesname
:
new
FormItemModel
({
caption
:
'档案信息名称'
,
detailType
:
'FORMITEM'
,
name
:
'hrarchivesname'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
showMoreMode
:
0
,
disabled
:
false
,
enableCond
:
3
}),
archivescode
:
new
FormItemModel
({
caption
:
'档案编号'
,
detailType
:
'FORMITEM'
,
name
:
'archivescode'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
showMoreMode
:
0
,
disabled
:
false
,
enableCond
:
3
}),
hrorganizationname
:
new
FormItemModel
({
caption
:
'档案管理单位'
,
detailType
:
'FORMITEM'
,
name
:
'hrorganizationname'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
showMoreMode
:
0
,
disabled
:
false
,
enableCond
:
3
}),
archivesplace
:
new
FormItemModel
({
caption
:
'档案保管地'
,
detailType
:
'FORMITEM'
,
name
:
'archivesplace'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
showMoreMode
:
0
,
disabled
:
false
,
enableCond
:
3
}),
archivesroom
:
new
FormItemModel
({
caption
:
'档案室'
,
detailType
:
'FORMITEM'
,
name
:
'archivesroom'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
showMoreMode
:
0
,
disabled
:
false
,
enableCond
:
3
}),
hremployeename
:
new
FormItemModel
({
caption
:
'员工姓名'
,
detailType
:
'FORMITEM'
,
name
:
'hremployeename'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
showMoreMode
:
0
,
disabled
:
false
,
enableCond
:
3
}),
employeecode
:
new
FormItemModel
({
caption
:
'员工编号'
,
detailType
:
'FORMITEM'
,
name
:
'employeecode'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
showMoreMode
:
0
,
disabled
:
false
,
enableCond
:
3
}),
organizationname
:
new
FormItemModel
({
caption
:
'单位'
,
detailType
:
'FORMITEM'
,
name
:
'organizationname'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
showMoreMode
:
0
,
disabled
:
false
,
enableCond
:
3
}),
activeflag
:
new
FormItemModel
({
caption
:
'是否有效'
,
detailType
:
'FORMITEM'
,
name
:
'activeflag'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
showMoreMode
:
0
,
disabled
:
false
,
enableCond
:
3
}),
degree
:
new
FormItemModel
({
caption
:
'档案学历'
,
detailType
:
'FORMITEM'
,
name
:
'degree'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
showMoreMode
:
0
,
disabled
:
false
,
enableCond
:
3
}),
birthday
:
new
FormItemModel
({
caption
:
'档案出生日期'
,
detailType
:
'FORMITEM'
,
name
:
'birthday'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
showMoreMode
:
0
,
disabled
:
false
,
enableCond
:
3
}),
startworktime
:
new
FormItemModel
({
caption
:
'档案参加工作时间'
,
detailType
:
'FORMITEM'
,
name
:
'startworktime'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
showMoreMode
:
0
,
disabled
:
false
,
enableCond
:
3
}),
politicaltime
:
new
FormItemModel
({
caption
:
'档案入党时间'
,
detailType
:
'FORMITEM'
,
name
:
'politicaltime'
,
visible
:
true
,
isShowCaption
:
true
,
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
}),
hremployeeid
:
new
FormItemModel
({
caption
:
'员工标识'
,
detailType
:
'FORMITEM'
,
name
:
'hremployeeid'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
showMoreMode
:
0
,
disabled
:
false
,
enableCond
:
3
}),
hrorganizationid
:
new
FormItemModel
({
caption
:
'档案管理单位ID'
,
detailType
:
'FORMITEM'
,
name
:
'hrorganizationid'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
showMoreMode
:
0
,
disabled
:
false
,
enableCond
:
3
}),
hrarchivesid
:
new
FormItemModel
({
caption
:
'档案信息标识'
,
detailType
:
'FORMITEM'
,
name
:
'hrarchivesid'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
showMoreMode
:
0
,
disabled
:
false
,
enableCond
:
3
}),
};
/**
* 新建默认值
* @memberof MainEditFormBase
*/
public
createDefault
(){
if
(
this
.
data
.
hasOwnProperty
(
'activeflag'
))
{
this
.
data
[
'activeflag'
]
=
1
;
}
}
/**
* 更新默认值
* @memberof MainEditFormBase
*/
public
updateDefault
(){
if
(
this
.
data
.
hasOwnProperty
(
'activeflag'
)
&&
!
this
.
data
.
activeflag
)
{
this
.
data
[
'activeflag'
]
=
1
;
}
}
}
\ No newline at end of file
app_PIM/src/widgets/hrarchives/main-form/main-form-model.ts
浏览文件 @
c420a725
...
...
@@ -56,10 +56,80 @@ export default class MainModel {
name
:
'srfsourcekey'
,
},
{
name
:
'hrarchivesname'
,
prop
:
'hrarchivesname'
,
name
:
'archivescode'
,
prop
:
'archivescode'
,
dataType
:
'TEXT'
,
},
{
name
:
'hrorganizationname'
,
prop
:
'hrorganizationname'
,
dataType
:
'PICKUPTEXT'
,
},
{
name
:
'archivesplace'
,
prop
:
'archivesplace'
,
dataType
:
'TEXT'
,
},
{
name
:
'archivesroom'
,
prop
:
'archivesroom'
,
dataType
:
'TEXT'
,
},
{
name
:
'hremployeename'
,
prop
:
'hremployeename'
,
dataType
:
'PICKUPTEXT'
,
},
{
name
:
'employeecode'
,
prop
:
'employeecode'
,
dataType
:
'PICKUPDATA'
,
},
{
name
:
'organizationname'
,
prop
:
'organizationname'
,
dataType
:
'PICKUPDATA'
,
},
{
name
:
'activeflag'
,
prop
:
'activeflag'
,
dataType
:
'YESNO'
,
},
{
name
:
'degree'
,
prop
:
'degree'
,
dataType
:
'SSCODELIST'
,
},
{
name
:
'birthday'
,
prop
:
'birthday'
,
dataType
:
'DATE'
,
},
{
name
:
'startworktime'
,
prop
:
'startworktime'
,
dataType
:
'DATE'
,
},
{
name
:
'politicaltime'
,
prop
:
'politicaltime'
,
dataType
:
'DATE'
,
},
{
name
:
'memo'
,
prop
:
'memo'
,
dataType
:
'LONGTEXT_1000'
,
},
{
name
:
'hremployeeid'
,
prop
:
'hremployeeid'
,
dataType
:
'PICKUP'
,
},
{
name
:
'hrorganizationid'
,
prop
:
'hrorganizationid'
,
dataType
:
'PICKUP'
,
},
{
name
:
'hrarchivesid'
,
prop
:
'hrarchivesid'
,
...
...
app_PIM/src/widgets/hrarchives/main-form/main-form-service.ts
浏览文件 @
c420a725
...
...
@@ -2,6 +2,8 @@ import { Http,Util,Errorlog } from '@/utils';
import
ControlService
from
'@/widgets/control-service'
;
import
HRArchivesService
from
'@/service/hrarchives/hrarchives-service'
;
import
MainModel
from
'./main-form-model'
;
import
HROrganizationService
from
'@/service/hrorganization/hrorganization-service'
;
import
HREmployeeService
from
'@/service/hremployee/hremployee-service'
;
/**
...
...
@@ -41,6 +43,22 @@ export default class MainService extends ControlService {
this
.
model
=
new
MainModel
();
}
/**
* 组织服务对象
*
* @type {HROrganizationService}
* @memberof MainService
*/
public
hrorganizationService
:
HROrganizationService
=
new
HROrganizationService
();
/**
* 员工服务对象
*
* @type {HREmployeeService}
* @memberof MainService
*/
public
hremployeeService
:
HREmployeeService
=
new
HREmployeeService
();
/**
* 处理数据
*
...
...
@@ -82,6 +100,12 @@ export default class MainService extends ControlService {
public
getItems
(
serviceName
:
string
,
interfaceName
:
string
,
context
:
any
=
{},
data
:
any
,
isloading
?:
boolean
):
Promise
<
any
[]
>
{
data
.
page
=
data
.
page
?
data
.
page
:
0
;
data
.
size
=
data
.
size
?
data
.
size
:
1000
;
if
(
Object
.
is
(
serviceName
,
'HROrganizationService'
)
&&
Object
.
is
(
interfaceName
,
'FetchDefault'
))
{
return
this
.
doItems
(
this
.
hrorganizationService
.
FetchDefault
(
JSON
.
parse
(
JSON
.
stringify
(
context
)),
data
,
isloading
),
'organizationid'
,
'hrorganization'
);
}
if
(
Object
.
is
(
serviceName
,
'HREmployeeService'
)
&&
Object
.
is
(
interfaceName
,
'FetchDefault'
))
{
return
this
.
doItems
(
this
.
hremployeeService
.
FetchDefault
(
JSON
.
parse
(
JSON
.
stringify
(
context
)),
data
,
isloading
),
'employeeid'
,
'hremployee'
);
}
return
Promise
.
reject
([])
}
...
...
app_PIM/src/widgets/hrarchives/main-form/main-form.html
浏览文件 @
c420a725
...
...
@@ -3,22 +3,190 @@
<row
>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.group1.visible"
:style=
"{}"
:lg=
"{ span: 24, offset: 0 }"
>
<app-form-group
:model=
"detailsModel.group1"
layoutType=
"TABLE_24COL"
titleStyle=
""
class=
''
:uiActionGroup=
"detailsModel.group1.uiActionGroup"
@
groupuiactionclick=
"groupUIActionClick($event)"
:caption=
"$t('entities.hrarchives.main_form.details.group1')"
:isShowCaption=
"true"
uiStyle=
"DEFAULT"
:titleBarCloseMode=
"
0
"
:isInfoGroupMode=
"false"
>
<app-form-group
:model=
"detailsModel.group1"
layoutType=
"TABLE_24COL"
titleStyle=
""
class=
''
:uiActionGroup=
"detailsModel.group1.uiActionGroup"
@
groupuiactionclick=
"groupUIActionClick($event)"
:caption=
"$t('entities.hrarchives.main_form.details.group1')"
:isShowCaption=
"true"
uiStyle=
"DEFAULT"
:titleBarCloseMode=
"
1
"
:isInfoGroupMode=
"false"
>
<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.
hrarchivesname.visible"
:style=
"{}"
:lg=
"{ span: 24
, offset: 0 }"
>
<app-form-item
name=
'
hrarchivesname'
:itemRules=
"this.rules.hrarchivesname"
class=
''
:caption=
"$t('entities.hrarchives.main_form.details.hrarchivesname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.hrarchivesnam
e.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.
archivescode.visible"
:style=
"{}"
:sm=
"{ span: 24, offset: 0 }"
:md=
"{ span: 12, offset: 0 }"
:lg=
"{ span: 6, offset: 0 }"
:xl=
"{ span: 6
, offset: 0 }"
>
<app-form-item
name=
'
archivescode'
:itemRules=
"this.rules.archivescode"
class=
''
:caption=
"$t('entities.hrarchives.main_form.details.archivescode')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.archivescod
e.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<input-box
v-model=
"data.
hrarchivesnam
e"
v-model=
"data.
archivescod
e"
@
enter=
"onEnter($event)"
unit=
""
:disabled=
"detailsModel.
hrarchivesnam
e.disabled"
:disabled=
"detailsModel.
archivescod
e.disabled"
type=
'text'
style=
""
>
</input-box>
</app-form-item>
</i-col>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.hrorganizationname.visible"
:style=
"{}"
:sm=
"{ span: 24, offset: 0 }"
:md=
"{ span: 12, offset: 0 }"
:lg=
"{ span: 6, offset: 0 }"
:xl=
"{ span: 6, offset: 0 }"
>
<app-form-item
name=
'hrorganizationname'
:itemRules=
"this.rules.hrorganizationname"
class=
''
:caption=
"$t('entities.hrarchives.main_form.details.hrorganizationname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.hrorganizationname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-picker
:formState=
"formState"
:data=
"data"
:context=
"context"
:viewparams=
"viewparams"
:localContext =
'{ }'
:localParam =
'{ }'
:disabled=
"detailsModel.hrorganizationname.disabled"
name=
'hrorganizationname'
deMajorField=
'organizationname'
deKeyField=
'hrorganization'
:service=
"service"
:acParams=
"{ serviceName: 'HROrganizationService', interfaceName: 'FetchDefault'}"
valueitem=
'hrorganizationid'
:value=
"data.hrorganizationname"
:pickupView=
"{ viewname: 'hrorganization-pickup-view', title: $t('entities.hrorganization.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'hrorganizations', parameterName: 'hrorganization' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
style=
""
@
formitemvaluechange=
"onFormItemValueChange($event)"
>
</app-picker>
</app-form-item>
</i-col>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.archivesplace.visible"
:style=
"{}"
:sm=
"{ span: 24, offset: 0 }"
:md=
"{ span: 12, offset: 0 }"
:lg=
"{ span: 6, offset: 0 }"
:xl=
"{ span: 6, offset: 0 }"
>
<app-form-item
name=
'archivesplace'
:itemRules=
"this.rules.archivesplace"
class=
''
:caption=
"$t('entities.hrarchives.main_form.details.archivesplace')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.archivesplace.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<input-box
v-model=
"data.archivesplace"
@
enter=
"onEnter($event)"
unit=
""
:disabled=
"detailsModel.archivesplace.disabled"
type=
'text'
style=
""
>
</input-box>
</app-form-item>
</i-col>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.archivesroom.visible"
:style=
"{}"
:sm=
"{ span: 24, offset: 0 }"
:md=
"{ span: 12, offset: 0 }"
:lg=
"{ span: 6, offset: 0 }"
:xl=
"{ span: 6, offset: 0 }"
>
<app-form-item
name=
'archivesroom'
:itemRules=
"this.rules.archivesroom"
class=
''
:caption=
"$t('entities.hrarchives.main_form.details.archivesroom')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.archivesroom.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<input-box
v-model=
"data.archivesroom"
@
enter=
"onEnter($event)"
unit=
""
:disabled=
"detailsModel.archivesroom.disabled"
type=
'text'
style=
""
>
</input-box>
</app-form-item>
</i-col>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.hremployeename.visible"
:style=
"{}"
:sm=
"{ span: 24, offset: 0 }"
:md=
"{ span: 12, offset: 0 }"
:lg=
"{ span: 6, offset: 0 }"
:xl=
"{ span: 6, offset: 0 }"
>
<app-form-item
name=
'hremployeename'
:itemRules=
"this.rules.hremployeename"
class=
''
:caption=
"$t('entities.hrarchives.main_form.details.hremployeename')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.hremployeename.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-picker
:formState=
"formState"
:data=
"data"
:context=
"context"
:viewparams=
"viewparams"
:localContext =
'{ }'
:localParam =
'{ }'
:disabled=
"detailsModel.hremployeename.disabled"
name=
'hremployeename'
deMajorField=
'employeename'
deKeyField=
'hremployee'
:service=
"service"
:acParams=
"{ serviceName: 'HREmployeeService', interfaceName: 'FetchDefault'}"
valueitem=
'hremployeeid'
:value=
"data.hremployeename"
:pickupView=
"{ viewname: 'hremployee-pickup-view', title: $t('entities.hremployee.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'hremployees', parameterName: 'hremployee' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
style=
""
@
formitemvaluechange=
"onFormItemValueChange($event)"
>
</app-picker>
</app-form-item>
</i-col>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.employeecode.visible"
:style=
"{}"
:sm=
"{ span: 24, offset: 0 }"
:md=
"{ span: 12, offset: 0 }"
:lg=
"{ span: 6, offset: 0 }"
:xl=
"{ span: 6, offset: 0 }"
>
<app-form-item
name=
'employeecode'
:itemRules=
"this.rules.employeecode"
class=
''
:caption=
"$t('entities.hrarchives.main_form.details.employeecode')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.employeecode.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-span
name=
'employeecode'
:value=
"data.employeecode"
dataType=
"PICKUPDATA"
:precision=
"0"
:data=
"data"
:context=
"context"
:viewparams=
"viewparams"
:localContext =
'{ }'
:localParam =
'{ }'
style=
""
>
</app-span>
</app-form-item>
</i-col>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.organizationname.visible"
:style=
"{}"
:sm=
"{ span: 24, offset: 0 }"
:md=
"{ span: 12, offset: 0 }"
:lg=
"{ span: 6, offset: 0 }"
:xl=
"{ span: 6, offset: 0 }"
>
<app-form-item
name=
'organizationname'
:itemRules=
"this.rules.organizationname"
class=
''
:caption=
"$t('entities.hrarchives.main_form.details.organizationname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.organizationname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-span
name=
'organizationname'
:value=
"data.organizationname"
dataType=
"PICKUPDATA"
:precision=
"0"
:data=
"data"
:context=
"context"
:viewparams=
"viewparams"
:localContext =
'{ }'
:localParam =
'{ }'
style=
""
>
</app-span>
</app-form-item>
</i-col>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.activeflag.visible"
:style=
"{}"
:sm=
"{ span: 24, offset: 0 }"
:md=
"{ span: 12, offset: 0 }"
:lg=
"{ span: 6, offset: 0 }"
:xl=
"{ span: 6, offset: 0 }"
>
<app-form-item
name=
'activeflag'
:itemRules=
"this.rules.activeflag"
class=
''
:caption=
"$t('entities.hrarchives.main_form.details.activeflag')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.activeflag.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<dropdown-list
v-model=
"data.activeflag"
:data=
"data"
:context=
"context"
:viewparams=
"viewparams"
:localContext =
'{ }'
:localParam =
'{ }'
:disabled=
"detailsModel.activeflag.disabled"
style=
"width:100px;width: 100px;"
valueType=
"number"
tag=
'YesNo'
codelistType=
'STATIC'
placeholder=
'请选择...'
/>
</app-form-item>
</i-col>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.degree.visible"
:style=
"{}"
:sm=
"{ span: 24, offset: 0 }"
:md=
"{ span: 12, offset: 0 }"
:lg=
"{ span: 6, offset: 0 }"
:xl=
"{ span: 6, offset: 0 }"
>
<app-form-item
name=
'degree'
:itemRules=
"this.rules.degree"
class=
''
:caption=
"$t('entities.hrarchives.main_form.details.degree')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.degree.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<dropdown-list
v-model=
"data.degree"
:data=
"data"
:context=
"context"
:viewparams=
"viewparams"
:localContext =
'{ }'
:localParam =
'{ }'
:disabled=
"detailsModel.degree.disabled"
valueType=
"string"
tag=
'CL_HR_0014'
codelistType=
'STATIC'
placeholder=
'请选择...'
/>
</app-form-item>
</i-col>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.birthday.visible"
:style=
"{}"
:sm=
"{ span: 24, offset: 0 }"
:md=
"{ span: 12, offset: 0 }"
:lg=
"{ span: 6, offset: 0 }"
:xl=
"{ span: 6, offset: 0 }"
>
<app-form-item
name=
'birthday'
:itemRules=
"this.rules.birthday"
class=
''
:caption=
"$t('entities.hrarchives.main_form.details.birthday')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.birthday.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<date-picker
type=
"date"
:transfer=
"true"
format=
"yyyy-MM-dd"
placeholder=
"请选择时间..."
:value=
"data.birthday"
:disabled=
"detailsModel.birthday.disabled"
style=
"min-width: 150px; width:100px;"
@
on-change=
"(val1, val2) => { this.data.birthday = val1 }"
></date-picker>
</app-form-item>
</i-col>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.startworktime.visible"
:style=
"{}"
:sm=
"{ span: 24, offset: 0 }"
:md=
"{ span: 12, offset: 0 }"
:lg=
"{ span: 6, offset: 0 }"
:xl=
"{ span: 6, offset: 0 }"
>
<app-form-item
name=
'startworktime'
:itemRules=
"this.rules.startworktime"
class=
''
:caption=
"$t('entities.hrarchives.main_form.details.startworktime')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.startworktime.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<date-picker
type=
"date"
:transfer=
"true"
format=
"yyyy-MM-dd"
placeholder=
"请选择时间..."
:value=
"data.startworktime"
:disabled=
"detailsModel.startworktime.disabled"
style=
"min-width: 150px; width:100px;"
@
on-change=
"(val1, val2) => { this.data.startworktime = val1 }"
></date-picker>
</app-form-item>
</i-col>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.politicaltime.visible"
:style=
"{}"
:sm=
"{ span: 24, offset: 0 }"
:md=
"{ span: 12, offset: 0 }"
:lg=
"{ span: 6, offset: 0 }"
:xl=
"{ span: 6, offset: 0 }"
>
<app-form-item
name=
'politicaltime'
:itemRules=
"this.rules.politicaltime"
class=
''
:caption=
"$t('entities.hrarchives.main_form.details.politicaltime')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.politicaltime.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<date-picker
type=
"date"
:transfer=
"true"
format=
"yyyy-MM-dd"
placeholder=
"请选择时间..."
:value=
"data.politicaltime"
:disabled=
"detailsModel.politicaltime.disabled"
style=
"min-width: 150px; width:100px;"
@
on-change=
"(val1, val2) => { this.data.politicaltime = val1 }"
></date-picker>
</app-form-item>
</i-col>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.memo.visible"
:style=
"{}"
:sm=
"{ span: 24, offset: 0 }"
:md=
"{ span: 12, offset: 0 }"
:lg=
"{ span: 24, offset: 0 }"
:xl=
"{ span: 24, offset: 0 }"
>
<app-form-item
name=
'memo'
:itemRules=
"this.rules.memo"
class=
''
:caption=
"$t('entities.hrarchives.main_form.details.memo')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.memo.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<input-box
v-model=
"data.memo"
:textareaId=
"this.$util.createUUID()"
:disabled=
"detailsModel.memo.disabled"
type=
'textarea'
textareaStyle=
"height:200px;"
></input-box>
</app-form-item>
</i-col>
</row>
...
...
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRArchives.java
浏览文件 @
c420a725
...
...
@@ -193,6 +193,7 @@ public class HRArchives extends EntityMP implements Serializable {
/**
* 是否有效
*/
@DEField
(
defaultValue
=
"1"
)
@TableField
(
value
=
"activeflag"
)
@JSONField
(
name
=
"activeflag"
)
@JsonProperty
(
"activeflag"
)
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录