Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz人力资源
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz企业套件
iBiz人力资源
提交
4849c007
提交
4849c007
编写于
8月 12, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
JunZai 发布系统代码
上级
2c294dea
变更
11
展开全部
显示空白字符变更
内嵌
并排
正在显示
11 个修改的文件
包含
748 行增加
和
101 行删除
+748
-101
hrtransfer-apply_en_US.ts
...anres/entities/hrtransfer-apply/hrtransfer-apply_en_US.ts
+58
-0
hrtransfer-apply_zh_CN.ts
...anres/entities/hrtransfer-apply/hrtransfer-apply_zh_CN.ts
+58
-0
hrtransfer-apply-wfdyna-edit-view-base.tsx
...dyna-edit-view/hrtransfer-apply-wfdyna-edit-view-base.tsx
+616
-0
hrtransfer-apply-wfdyna-edit-view.html
...y-wfdyna-edit-view/hrtransfer-apply-wfdyna-edit-view.html
+2
-0
hrtransfer-apply-wfdyna-exp-grid-view-base.tsx
...-grid-view/hrtransfer-apply-wfdyna-exp-grid-view-base.tsx
+2
-2
hrtransfer-apply-wfdyna-exp-grid-view.html
...-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view.html
+2
-55
default.less
app_PIM/src/styles/default.less
+0
-13
main-form.html
...PIM/src/widgets/hrtransfer-apply/main-form/main-form.html
+8
-8
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/locale/lanres/entities/hrtransfer-apply/hrtransfer-apply_en_US.ts
浏览文件 @
4849c007
...
@@ -370,6 +370,64 @@ export default {
...
@@ -370,6 +370,64 @@ export default {
tip
:
"Help"
,
tip
:
"Help"
,
},
},
},
},
wfdynaeditviewtoolbar_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
:
""
,
},
tbitem9_saveandstart
:
{
caption
:
"开始"
,
tip
:
"开始"
,
},
tbitem10
:
{
caption
:
"Workflow step"
,
tip
:
"当前流程步骤"
,
},
tbitem11
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem12
:
{
caption
:
"New"
,
tip
:
"New"
,
},
tbitem13
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem14
:
{
caption
:
"Copy"
,
tip
:
"Copy {0}"
,
},
tbitem16
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem23
:
{
caption
:
"Help"
,
tip
:
"Help"
,
},
},
gridviewtoolbar_toolbar
:
{
gridviewtoolbar_toolbar
:
{
tbitem3
:
{
tbitem3
:
{
caption
:
"New"
,
caption
:
"New"
,
...
...
app_PIM/src/locale/lanres/entities/hrtransfer-apply/hrtransfer-apply_zh_CN.ts
浏览文件 @
4849c007
...
@@ -369,6 +369,64 @@ export default {
...
@@ -369,6 +369,64 @@ export default {
tip
:
"帮助"
,
tip
:
"帮助"
,
},
},
},
},
wfdynaeditviewtoolbar_toolbar
:
{
tbitem3
:
{
caption
:
"保存"
,
tip
:
"保存"
,
},
tbitem4
:
{
caption
:
"保存并新建"
,
tip
:
"保存并新建"
,
},
tbitem5
:
{
caption
:
"保存并关闭"
,
tip
:
"保存并关闭"
,
},
tbitem6
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem7
:
{
caption
:
"删除并关闭"
,
tip
:
"删除并关闭"
,
},
tbitem8
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem9_saveandstart
:
{
caption
:
"开始"
,
tip
:
"开始"
,
},
tbitem10
:
{
caption
:
"当前流程步骤"
,
tip
:
"当前流程步骤"
,
},
tbitem11
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem12
:
{
caption
:
"新建"
,
tip
:
"新建"
,
},
tbitem13
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem14
:
{
caption
:
"拷贝"
,
tip
:
"拷贝"
,
},
tbitem16
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem23
:
{
caption
:
"帮助"
,
tip
:
"帮助"
,
},
},
gridviewtoolbar_toolbar
:
{
gridviewtoolbar_toolbar
:
{
tbitem3
:
{
tbitem3
:
{
caption
:
"新建"
,
caption
:
"新建"
,
...
...
app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-edit-view/hrtransfer-apply-wfdyna-edit-view-base.tsx
浏览文件 @
4849c007
此差异已折叠。
点击以展开。
app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-edit-view/hrtransfer-apply-wfdyna-edit-view.html
浏览文件 @
4849c007
...
@@ -2,6 +2,8 @@
...
@@ -2,6 +2,8 @@
<template
slot=
'title'
>
<template
slot=
'title'
>
<span
class=
'caption-info'
>
{{viewCaption}}
</span>
<span
class=
'caption-info'
>
{{viewCaption}}
</span>
</template>
</template>
<template
slot=
"toolbar"
>
<view-toolbar
mode=
"STYLE2"
:model=
"toolBarModels"
@
item-click=
"toolbar_click.apply(_self, arguments)"
/>
</template>
<div
class=
'toolbar-container'
>
<div
class=
'toolbar-container'
>
<tooltip
:transfer=
"true"
:max-width=
"600"
v-for=
"(linkItem, index) in linkModel"
:key=
"index"
>
<tooltip
:transfer=
"true"
:max-width=
"600"
v-for=
"(linkItem, index) in linkModel"
:key=
"index"
>
<i-button
@
click=
"dynamic_toolbar_click(linkItem, $event)"
>
<i-button
@
click=
"dynamic_toolbar_click(linkItem, $event)"
>
...
...
app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view-base.tsx
浏览文件 @
4849c007
...
@@ -758,7 +758,7 @@ export class HRTransferApplyWFDynaExpGridViewBase extends ViewBase {
...
@@ -758,7 +758,7 @@ export class HRTransferApplyWFDynaExpGridViewBase extends ViewBase {
const
view
:
any
=
{
const
view
:
any
=
{
viewname
:
'hrtransfer-apply-wfdyna-edit-view'
,
viewname
:
'hrtransfer-apply-wfdyna-edit-view'
,
height
:
0
,
height
:
0
,
width
:
6
00
,
width
:
8
00
,
title
:
this
.
$t
(
'entities.hrtransferapply.views.wfdynaeditview.title'
),
title
:
this
.
$t
(
'entities.hrtransferapply.views.wfdynaeditview.title'
),
placement
:
'DRAWER_RIGHT'
,
placement
:
'DRAWER_RIGHT'
,
};
};
...
@@ -809,7 +809,7 @@ export class HRTransferApplyWFDynaExpGridViewBase extends ViewBase {
...
@@ -809,7 +809,7 @@ export class HRTransferApplyWFDynaExpGridViewBase extends ViewBase {
const
view
:
any
=
{
const
view
:
any
=
{
viewname
:
'hrtransfer-apply-wfdyna-edit-view'
,
viewname
:
'hrtransfer-apply-wfdyna-edit-view'
,
height
:
0
,
height
:
0
,
width
:
6
00
,
width
:
8
00
,
title
:
this
.
$t
(
'entities.hrtransferapply.views.wfdynaeditview.title'
),
title
:
this
.
$t
(
'entities.hrtransferapply.views.wfdynaeditview.title'
),
placement
:
'DRAWER_RIGHT'
,
placement
:
'DRAWER_RIGHT'
,
};
};
...
...
app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view.html
浏览文件 @
4849c007
<studio-view-style2
viewName=
"hrtransferapplywfdynaexpgridview"
viewTitle=
"调动申请工作流导航表格视图"
class=
'dewfdynaexpgridview hrtransfer-apply-wfdyna-exp-grid-view'
>
!!!!模版产生代码错误:Syntax error in template "TEMPLCODE_en_US" in line 55, column 72:
<template
slot=
'title'
>
Unexpected end of file reached. You have an unclosed #if.
<span
class=
'caption-info'
>
{{viewCaption}}
</span>
\ No newline at end of file
</template>
<template
slot=
"toolbar"
>
<view-toolbar
mode=
"STYLE2"
:model=
"toolBarModels"
@
item-click=
"toolbar_click.apply(_self, arguments)"
/>
</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.apply(_self, arguments)"
></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>
</studio-view-style2>
\ No newline at end of file
app_PIM/src/styles/default.less
浏览文件 @
4849c007
...
@@ -1307,9 +1307,6 @@ div::-webkit-scrollbar-thumb {
...
@@ -1307,9 +1307,6 @@ div::-webkit-scrollbar-thumb {
font-size: 15px;
font-size: 15px;
font-family: "Microsoft YaHei";
font-family: "Microsoft YaHei";
}
}
.el-tree-node {
margin-top: 10px;
}
.el-tree-node:nth-child(1) {
.el-tree-node:nth-child(1) {
margin-top: 0px;
margin-top: 0px;
}
}
...
@@ -1331,16 +1328,6 @@ div::-webkit-scrollbar-thumb {
...
@@ -1331,16 +1328,6 @@ div::-webkit-scrollbar-thumb {
-webkit-box-direction: normal;
-webkit-box-direction: normal;
-ms-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
flex-direction: column;
.app-search-form {
display: flex;
flex-direction: column-reverse;
.search-button {
width: 100%;
}
.form-content {
width: 100%;
}
}
}
}
}
}
}
}
...
...
app_PIM/src/widgets/hrtransfer-apply/main-form/main-form.html
浏览文件 @
4849c007
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<app-form-group
:model=
"detailsModel.group1"
layoutType=
"TABLE_24COL"
titleStyle=
""
class=
''
:uiActionGroup=
"detailsModel.group1.uiActionGroup"
@
groupuiactionclick=
"groupUIActionClick($event)"
:caption=
"$t('entities.hrtransferapply.main_form.details.group1')"
:isShowCaption=
"false"
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.hrtransferapply.main_form.details.group1')"
:isShowCaption=
"false"
uiStyle=
"DEFAULT"
:titleBarCloseMode=
"0"
: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=
"{}"
:
sm=
"{ span: 24, offset: 0 }"
:md=
"{ span: 12, offset: 0 }"
:lg=
"{ span: 6, offset: 0 }"
:xl=
"{ span: 6
, offset: 0 }"
>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.hremployeename.visible"
:style=
"{}"
:
lg=
"{ span: 24
, offset: 0 }"
>
<app-form-item
name=
'hremployeename'
:itemRules=
"this.rules.hremployeename"
class=
''
:caption=
"$t('entities.hrtransferapply.main_form.details.hremployeename')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.hremployeename.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-form-item
name=
'hremployeename'
:itemRules=
"this.rules.hremployeename"
class=
''
:caption=
"$t('entities.hrtransferapply.main_form.details.hremployeename')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.hremployeename.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-picker
<app-picker
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
</app-form-item>
</app-form-item>
</i-col>
</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 }"
>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.organizationname.visible"
:style=
"{}"
:
lg=
"{ span: 24
, offset: 0 }"
>
<app-form-item
name=
'organizationname'
:itemRules=
"this.rules.organizationname"
class=
''
:caption=
"$t('entities.hrtransferapply.main_form.details.organizationname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.organizationname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-form-item
name=
'organizationname'
:itemRules=
"this.rules.organizationname"
class=
''
:caption=
"$t('entities.hrtransferapply.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"
<app-span
name=
'organizationname'
:value=
"data.organizationname"
dataType=
"PICKUPDATA"
:precision=
"0"
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
</app-form-item>
</app-form-item>
</i-col>
</i-col>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.hrpostname.visible"
:style=
"{}"
:
sm=
"{ span: 24, offset: 0 }"
:md=
"{ span: 12, offset: 0 }"
:lg=
"{ span: 6, offset: 0 }"
:xl=
"{ span: 6
, offset: 0 }"
>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.hrpostname.visible"
:style=
"{}"
:
lg=
"{ span: 24
, offset: 0 }"
>
<app-form-item
name=
'hrpostname'
:itemRules=
"this.rules.hrpostname"
class=
''
:caption=
"$t('entities.hrtransferapply.main_form.details.hrpostname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.hrpostname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-form-item
name=
'hrpostname'
:itemRules=
"this.rules.hrpostname"
class=
''
:caption=
"$t('entities.hrtransferapply.main_form.details.hrpostname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.hrpostname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-span
name=
'hrpostname'
:value=
"data.hrpostname"
dataType=
"PICKUPDATA"
:precision=
"0"
<app-span
name=
'hrpostname'
:value=
"data.hrpostname"
dataType=
"PICKUPDATA"
:precision=
"0"
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
</app-form-item>
</app-form-item>
</i-col>
</i-col>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.hrdutyname.visible"
:style=
"{}"
:
sm=
"{ span: 24, offset: 0 }"
:md=
"{ span: 12, offset: 0 }"
:lg=
"{ span: 6, offset: 0 }"
:xl=
"{ span: 6
, offset: 0 }"
>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.hrdutyname.visible"
:style=
"{}"
:
lg=
"{ span: 24
, offset: 0 }"
>
<app-form-item
name=
'hrdutyname'
:itemRules=
"this.rules.hrdutyname"
class=
''
:caption=
"$t('entities.hrtransferapply.main_form.details.hrdutyname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.hrdutyname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-form-item
name=
'hrdutyname'
:itemRules=
"this.rules.hrdutyname"
class=
''
:caption=
"$t('entities.hrtransferapply.main_form.details.hrdutyname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.hrdutyname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-span
name=
'hrdutyname'
:value=
"data.hrdutyname"
dataType=
"PICKUPDATA"
:precision=
"0"
<app-span
name=
'hrdutyname'
:value=
"data.hrdutyname"
dataType=
"PICKUPDATA"
:precision=
"0"
...
@@ -62,7 +62,7 @@
...
@@ -62,7 +62,7 @@
</app-form-item>
</app-form-item>
</i-col>
</i-col>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.hrorganizationname2.visible"
:style=
"{}"
:
sm=
"{ span: 24, offset: 0 }"
:md=
"{ span: 12, offset: 0 }"
:lg=
"{ span: 6, offset: 0 }"
:xl=
"{ span: 6
, offset: 0 }"
>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.hrorganizationname2.visible"
:style=
"{}"
:
lg=
"{ span: 24
, offset: 0 }"
>
<app-form-item
name=
'hrorganizationname2'
:itemRules=
"this.rules.hrorganizationname2"
class=
''
:caption=
"$t('entities.hrtransferapply.main_form.details.hrorganizationname2')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.hrorganizationname2.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-form-item
name=
'hrorganizationname2'
:itemRules=
"this.rules.hrorganizationname2"
class=
''
:caption=
"$t('entities.hrtransferapply.main_form.details.hrorganizationname2')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.hrorganizationname2.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-picker
<app-picker
...
@@ -88,7 +88,7 @@
...
@@ -88,7 +88,7 @@
</app-form-item>
</app-form-item>
</i-col>
</i-col>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.hrpostname2.visible"
:style=
"{}"
:
sm=
"{ span: 24, offset: 0 }"
:md=
"{ span: 12, offset: 0 }"
:lg=
"{ span: 6, offset: 0 }"
:xl=
"{ span: 6
, offset: 0 }"
>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.hrpostname2.visible"
:style=
"{}"
:
lg=
"{ span: 24
, offset: 0 }"
>
<app-form-item
name=
'hrpostname2'
:itemRules=
"this.rules.hrpostname2"
class=
''
:caption=
"$t('entities.hrtransferapply.main_form.details.hrpostname2')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.hrpostname2.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-form-item
name=
'hrpostname2'
:itemRules=
"this.rules.hrpostname2"
class=
''
:caption=
"$t('entities.hrtransferapply.main_form.details.hrpostname2')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.hrpostname2.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-picker
<app-picker
...
@@ -114,7 +114,7 @@
...
@@ -114,7 +114,7 @@
</app-form-item>
</app-form-item>
</i-col>
</i-col>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.hrdutyname2.visible"
:style=
"{}"
:
sm=
"{ span: 24, offset: 0 }"
:md=
"{ span: 12, offset: 0 }"
:lg=
"{ span: 6, offset: 0 }"
:xl=
"{ span: 6
, offset: 0 }"
>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.hrdutyname2.visible"
:style=
"{}"
:
lg=
"{ span: 24
, offset: 0 }"
>
<app-form-item
name=
'hrdutyname2'
:itemRules=
"this.rules.hrdutyname2"
class=
''
:caption=
"$t('entities.hrtransferapply.main_form.details.hrdutyname2')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.hrdutyname2.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-form-item
name=
'hrdutyname2'
:itemRules=
"this.rules.hrdutyname2"
class=
''
:caption=
"$t('entities.hrtransferapply.main_form.details.hrdutyname2')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.hrdutyname2.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-span
name=
'hrdutyname2'
:value=
"data.hrdutyname2"
dataType=
"PICKUPDATA"
:precision=
"0"
<app-span
name=
'hrdutyname2'
:value=
"data.hrdutyname2"
dataType=
"PICKUPDATA"
:precision=
"0"
...
@@ -124,7 +124,7 @@
...
@@ -124,7 +124,7 @@
</app-form-item>
</app-form-item>
</i-col>
</i-col>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.activetime.visible"
:style=
"{}"
:
sm=
"{ span: 24, offset: 0 }"
:md=
"{ span: 12, offset: 0 }"
:lg=
"{ span: 6, offset: 0 }"
:xl=
"{ span: 6
, offset: 0 }"
>
<i-col
class=
"form-layout-container"
v-show=
"detailsModel.activetime.visible"
:style=
"{}"
:
lg=
"{ span: 24
, offset: 0 }"
>
<app-form-item
name=
'activetime'
:itemRules=
"this.rules.activetime"
class=
''
:caption=
"$t('entities.hrtransferapply.main_form.details.activetime')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.activetime.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-form-item
name=
'activetime'
:itemRules=
"this.rules.activetime"
class=
''
:caption=
"$t('entities.hrtransferapply.main_form.details.activetime')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.activetime.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<date-picker
type=
"date"
:transfer=
"true"
format=
"yyyy-MM-dd"
placeholder=
"请选择时间..."
:value=
"data.activetime"
:disabled=
"detailsModel.activetime.disabled"
style=
"min-width: 150px; width:100px;"
@
on-change=
"(val1, val2) => { this.data.activetime = val1 }"
></date-picker>
<date-picker
type=
"date"
:transfer=
"true"
format=
"yyyy-MM-dd"
placeholder=
"请选择时间..."
:value=
"data.activetime"
:disabled=
"detailsModel.activetime.disabled"
style=
"min-width: 150px; width:100px;"
@
on-change=
"(val1, val2) => { this.data.activetime = val1 }"
></date-picker>
...
...
config.xml
浏览文件 @
4849c007
...
@@ -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
浏览文件 @
4849c007
...
@@ -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
浏览文件 @
4849c007
...
@@ -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
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录