Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz人力资源
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz企业套件
iBiz人力资源
提交
74f9a336
提交
74f9a336
编写于
8月 12, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
JunZai 发布系统代码
上级
050e0dae
变更
7
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
119 行增加
和
88 行删除
+119
-88
hrtransfer-apply-wfdyna-exp-grid-view.html
...-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view.html
+70
-48
default.less
app_PIM/src/styles/default.less
+43
-0
ef-001-form-base.tsx
...M/src/widgets/hrarchives/ef-001-form/ef-001-form-base.tsx
+1
-1
ef-001-form.html
app_PIM/src/widgets/hrarchives/ef-001-form/ef-001-form.html
+3
-16
config.xml
config.xml
+0
-5
Dockerfile
...urce-app/humanresource-app-pim/src/main/docker/Dockerfile
+1
-1
humanresource-app-pim.yaml
...source-app-pim/src/main/docker/humanresource-app-pim.yaml
+1
-17
未找到文件。
app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view.html
浏览文件 @
74f9a336
<studio-view-style2
viewName=
"hrtransferapplywfdynaexpgridview"
viewTitle=
"调动申请工作流导航表格视图"
class=
'dewfdynaexpgridview hrtransfer-apply-wfdyna-exp-grid-view'
>
<studio-view-style2
viewName=
"hrtransferapplywfdynaexpgridview"
viewTitle=
"调动申请工作流导航表格视图"
class=
'dewfdynaexpgridview hrtransfer-apply-wfdyna-exp-grid-view'
>
<template
slot=
'title'
>
<template
slot=
'title'
>
<span
class=
'caption-info'
>
{{viewCaption}}
</span>
<span
class=
'caption-info'
>
{{viewCaption}}
</span>
</template>
</template>
<split
id=
"hrtransferapplywfdynaexpgridview"
v-model=
"split"
mode=
"horizontal"
>
<i-input
slot=
"quickSearch"
v-show=
"!isExpandSearchForm"
v-model=
"query"
placeholder=
"调动申请名称"
search
@
on-search=
"onSearch($event)"
/>
<div
slot=
'left'
>
<template
slot=
"toolbar"
>
<el-tree
ref=
"tree"
:data=
"wfStepModel"
node-key=
"userTaskId"
:highlight-current=
"true"
:props=
"defaultProps"
@
node-click=
"handleNodeClick"
></el-tree>
<view-toolbar
mode=
"STYLE2"
:model=
"toolBarModels"
@
item-click=
"toolbar_click.apply(_self, arguments)"
/>
</template>
</div>
<template
slot=
"searchForm"
>
<div
slot=
"right"
>
<view
_searchform
<div
class=
"content-container"
>
:viewState=
"viewState"
<view
_searchform
:viewparams=
"viewparams"
:viewState=
"viewState"
:context=
"context"
:viewparams=
"viewparams"
:showBusyIndicator=
"true"
:context=
"context"
v-show=
"isExpandSearchForm"
:showBusyIndicator=
"true"
loaddraftAction=
"FilterGetDraft"
v-show=
"isExpandSearchForm"
loadAction=
"FilterGet"
loaddraftAction=
"FilterGetDraft"
loadAction=
"FilterGet"
name=
"searchform"
ref=
'searchform'
name=
"searchform"
@
save=
"searchform_save($event)"
ref=
'searchform'
@
search=
"searchform_search($event)"
@
save=
"searchform_save($event)"
@
load=
"searchform_load($event)"
@
search=
"searchform_search($event)"
@
closeview=
"closeView($event)"
>
@
load=
"searchform_load($event)"
</view
_searchform
>
@
closeview=
"closeView($event)"
>
</template>
</view
_searchform
>
<split
id=
"hrtransferapplywfdynaexpgridview"
v-model=
"split"
mode=
"horizontal"
>
<view
_grid
<div
slot=
'left'
>
:viewState=
"viewState"
<el-tree
ref=
"tree"
:data=
"wfStepModel"
node-key=
"userTaskId"
:highlight-current=
"true"
:props=
"defaultProps"
@
node-click=
"handleNodeClick"
></el-tree>
:viewparams=
"viewparams"
</div>
:context=
"context"
<div
slot=
"right"
>
:isSingleSelect=
"isGridSingleSelect"
<div
class=
"content-container"
>
:showBusyIndicator=
"true"
<view
_searchform
updateAction=
""
:viewState=
"viewState"
removeAction=
"Remove"
:viewparams=
"viewparams"
loaddraftAction=
""
:context=
"context"
loadAction=
""
:showBusyIndicator=
"true"
createAction=
""
v-show=
"isExpandSearchForm"
fetchAction=
"FetchDefault"
loaddraftAction=
"FilterGetDraft"
:newdata=
"newdata.bind(_self)"
loadAction=
"FilterGet"
:opendata=
"opendata.bind(_self)"
name=
"grid"
name=
"searchform"
ref=
'grid'
ref=
'searchform'
@
selectionchange=
"grid_selectionchange($event)"
@
save=
"searchform_save($event)"
@
beforeload=
"grid_beforeload($event)"
@
search=
"searchform_search($event)"
@
rowdblclick=
"grid_rowdblclick($event)"
@
load=
"searchform_load($event)"
@
remove=
"grid_remove($event)"
@
closeview=
"closeView($event)"
>
@
load=
"grid_load($event)"
</view
_searchform
>
@
closeview=
"closeView($event)"
>
<view
_grid
</view
_grid
>
:viewState=
"viewState"
</div>
:viewparams=
"viewparams"
</div>
:context=
"context"
</split>
: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>
</studio-view-style2>
</studio-view-style2>
\ No newline at end of file
app_PIM/src/styles/default.less
浏览文件 @
74f9a336
...
@@ -1292,4 +1292,47 @@ div::-webkit-scrollbar-thumb {
...
@@ -1292,4 +1292,47 @@ div::-webkit-scrollbar-thumb {
color: var(--form-editor-font-color);
color: var(--form-editor-font-color);
}
}
}
}
// 工作流动态导航表格视图
.dewfdynaexpgridview{
.el-tree {
padding-right: 10px;
}
.el-tree-node__content {
height: 40px;
border-left: solid transparent;
}
.el-tree-node__label {
font-size: 15px;
font-family: "Microsoft YaHei";
}
.el-tree-node {
margin-top: 10px;
}
.el-tree-node:nth-child(1) {
margin-top: 0px;
}
.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
background-color: #f0f7ff;
border-color: #1890ff6e;
}
.ivu-split-horizontal {
.ivu-split-pane >div {
height: 100%;
overflow-y: auto;
.content-container {
height: 100%;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
margin: 0;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
}
}
}
}
@import './user.less';
@import './user.less';
\ No newline at end of file
app_PIM/src/widgets/hrarchives/ef-001-form/ef-001-form-base.tsx
浏览文件 @
74f9a336
...
@@ -135,7 +135,7 @@ export class EF_001EditFormBase extends EditFormControlBase {
...
@@ -135,7 +135,7 @@ export class EF_001EditFormBase extends EditFormControlBase {
* @memberof EF_001EditFormBase
* @memberof EF_001EditFormBase
*/
*/
public
detailsModel
:
any
=
{
public
detailsModel
:
any
=
{
group1
:
new
FormGroupPanelModel
({
caption
:
'档案信息'
,
detailType
:
'GROUPPANEL'
,
name
:
'group1'
,
visible
:
true
,
isShowCaption
:
tru
e
,
form
:
this
,
showMoreMode
:
0
,
uiActionGroup
:
{
caption
:
''
,
langbase
:
'entities.hrarchives.ef_001_form'
,
extractMode
:
'ITEM'
,
details
:
[]
}
}),
group1
:
new
FormGroupPanelModel
({
caption
:
'档案信息'
,
detailType
:
'GROUPPANEL'
,
name
:
'group1'
,
visible
:
true
,
isShowCaption
:
fals
e
,
form
:
this
,
showMoreMode
:
0
,
uiActionGroup
:
{
caption
:
''
,
langbase
:
'entities.hrarchives.ef_001_form'
,
extractMode
:
'ITEM'
,
details
:
[]
}
}),
formpage1
:
new
FormPageModel
({
caption
:
'基本信息'
,
detailType
:
'FORMPAGE'
,
name
:
'formpage1'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
showMoreMode
:
0
}),
formpage1
:
new
FormPageModel
({
caption
:
'基本信息'
,
detailType
:
'FORMPAGE'
,
name
:
'formpage1'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
showMoreMode
:
0
}),
...
...
app_PIM/src/widgets/hrarchives/ef-001-form/ef-001-form.html
浏览文件 @
74f9a336
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<row
>
<row
>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.group1.visible"
:style=
"{}"
:lg=
"{ span: 24, offset: 0 }"
>
<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.ef_001_form.details.group1')"
:isShowCaption=
"
tru
e"
uiStyle=
"DEFAULT"
:titleBarCloseMode=
"1"
:isInfoGroupMode=
"false"
>
<app-form-group
:model=
"detailsModel.group1"
layoutType=
"TABLE_24COL"
titleStyle=
""
class=
''
:uiActionGroup=
"detailsModel.group1.uiActionGroup"
@
groupuiactionclick=
"groupUIActionClick($event)"
:caption=
"$t('entities.hrarchives.ef_001_form.details.group1')"
:isShowCaption=
"
fals
e"
uiStyle=
"DEFAULT"
:titleBarCloseMode=
"1"
:isInfoGroupMode=
"false"
>
<app-form-group-data-panel
slot=
"dataInfoPanel"
:model=
"detailsModel.group1"
:data=
"data"
:context=
"context"
:viewparams=
"viewparams"
/>
<app-form-group-data-panel
slot=
"dataInfoPanel"
:model=
"detailsModel.group1"
:data=
"data"
:context=
"context"
:viewparams=
"viewparams"
/>
<row>
<row>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.hremployeename.visible"
:style=
"{}"
:lg=
"{ span: 24, offset: 0 }"
>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.hremployeename.visible"
:style=
"{}"
:lg=
"{ span: 24, offset: 0 }"
>
...
@@ -102,21 +102,8 @@
...
@@ -102,21 +102,8 @@
</i-col>
</i-col>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.activeflag.visible"
:style=
"{}"
:lg=
"{ span: 24, offset: 0 }"
>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.activeflag.visible"
:style=
"{}"
:lg=
"{ span: 24, offset: 0 }"
>
<app-form-item
name=
'activeflag'
:itemRules=
"this.rules.activeflag"
class=
''
:caption=
"$t('entities.hrarchives.ef_001_form.details.activeflag')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.activeflag.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-form-item
name=
'activeflag'
:itemRules=
"this.rules.activeflag"
class=
''
:caption=
"$t('entities.hrarchives.ef_001_form.details.activeflag')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.activeflag.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-switch
name=
'activeflag'
:value=
"this.data.activeflag"
@
change=
"($event)=>{this.data.activeflag = $event} "
:disabled=
"detailsModel.activeflag.disabled"
style=
""
></app-switch>
<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>
</app-form-item>
</i-col>
</i-col>
...
...
config.xml
浏览文件 @
74f9a336
...
@@ -37,11 +37,6 @@
...
@@ -37,11 +37,6 @@
git clone -b master $para2 ibizhumanresources/
git clone -b master $para2 ibizhumanresources/
export NODE_OPTIONS=--max-old-space-size=4096
export NODE_OPTIONS=--max-old-space-size=4096
cd ibizhumanresources/
cd ibizhumanresources/
mvn clean package -Ppim
cd humanresource-app/humanresource-app-pim
mvn -Ppim docker:build
mvn -Ppim docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-app-pim.yaml iBizEE --with-registry-auth
</command>
</command>
</hudson.tasks.Shell>
</hudson.tasks.Shell>
</builders>
</builders>
...
...
humanresource-app/humanresource-app-pim/src/main/docker/Dockerfile
浏览文件 @
74f9a336
...
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
...
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar
EXPOSE
10327
EXPOSE
8080
ADD
humanresource-app-pim.jar /humanresource-app-pim.jar
ADD
humanresource-app-pim.jar /humanresource-app-pim.jar
humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml
浏览文件 @
74f9a336
...
@@ -3,25 +3,9 @@ services:
...
@@ -3,25 +3,9 @@ services:
humanresource-app-pim
:
humanresource-app-pim
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
ports
:
ports
:
-
"
10327:10327
"
-
"
8080:8080
"
networks
:
networks
:
-
agent_network
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-
SERVER_PORT=10327
-
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-
SPRING_REDIS_HOST=172.16.240.110
-
SPRING_REDIS_PORT=6379
-
SPRING_REDIS_DATABASE=0
-
SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-
SPRING_DATASOURCE_PASSWORD=b1@@@772
-
SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-
CAS=https://passport.ibizlab.cn
-
NACOS=172.16.240.110:8848
-
SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-
SEATA_ENABLED=true
deploy
:
deploy
:
resources
:
resources
:
limits
:
limits
:
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录