Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz人力资源
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz企业套件
iBiz人力资源
提交
ceab1e0c
提交
ceab1e0c
编写于
8月 11, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
jackwang 部署微服务应用
上级
0e8c8a42
变更
26
隐藏空白字符变更
内嵌
并排
正在显示
26 个修改的文件
包含
709 行增加
和
37 行删除
+709
-37
hrcontract.ts
app_PIM/src/interface/entity/hrcontract.ts
+32
-0
hrcontract_en_US.ts
...src/locale/lanres/entities/hrcontract/hrcontract_en_US.ts
+24
-0
hrcontract_zh_CN.ts
...src/locale/lanres/entities/hrcontract/hrcontract_zh_CN.ts
+24
-0
active-grid-base.tsx
...M/src/widgets/hrcontract/active-grid/active-grid-base.tsx
+45
-0
active-grid-model.ts
...M/src/widgets/hrcontract/active-grid/active-grid-model.ts
+28
-3
active-grid.html
app_PIM/src/widgets/hrcontract/active-grid/active-grid.html
+60
-0
main-grid-base.tsx
app_PIM/src/widgets/hrcontract/main-grid/main-grid-base.tsx
+45
-0
main-grid-model.ts
app_PIM/src/widgets/hrcontract/main-grid/main-grid-model.ts
+28
-3
main-grid.html
app_PIM/src/widgets/hrcontract/main-grid/main-grid.html
+60
-0
tab-exp-viewtabexppanel-tabexppanel-model.ts
...-tabexppanel/tab-exp-viewtabexppanel-tabexppanel-model.ts
+12
-0
tab-exp-viewtabviewpanel-tabviewpanel-model.ts
...bviewpanel/tab-exp-viewtabviewpanel-tabviewpanel-model.ts
+12
-0
tab-exp-viewtabviewpanel2-tabviewpanel-model.ts
...viewpanel/tab-exp-viewtabviewpanel2-tabviewpanel-model.ts
+12
-0
tab-exp-viewtabviewpanel3-tabviewpanel-model.ts
...viewpanel/tab-exp-viewtabviewpanel3-tabviewpanel-model.ts
+12
-0
tab-exp-viewtabviewpanel4-tabviewpanel-model.ts
...viewpanel/tab-exp-viewtabviewpanel4-tabviewpanel-model.ts
+12
-0
tab-exp-viewtabviewpanel5-tabviewpanel-model.ts
...viewpanel/tab-exp-viewtabviewpanel5-tabviewpanel-model.ts
+12
-0
wait-sign-grid-base.tsx
...widgets/hrcontract/wait-sign-grid/wait-sign-grid-base.tsx
+45
-0
wait-sign-grid-model.ts
...widgets/hrcontract/wait-sign-grid/wait-sign-grid-model.ts
+28
-3
wait-sign-grid.html
...src/widgets/hrcontract/wait-sign-grid/wait-sign-grid.html
+60
-0
wait-stop-grid-base.tsx
...widgets/hrcontract/wait-stop-grid/wait-stop-grid-base.tsx
+45
-0
wait-stop-grid-model.ts
...widgets/hrcontract/wait-stop-grid/wait-stop-grid-model.ts
+28
-3
wait-stop-grid.html
...src/widgets/hrcontract/wait-stop-grid/wait-stop-grid.html
+60
-0
config.xml
config.xml
+5
-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
+17
-1
Dockerfile
...r/humanresource-provider-hrapi/src/main/docker/Dockerfile
+1
-1
humanresource-provider-hrapi.yaml
...r-hrapi/src/main/docker/humanresource-provider-hrapi.yaml
+1
-17
未找到文件。
app_PIM/src/interface/entity/hrcontract.ts
浏览文件 @
ceab1e0c
...
@@ -189,4 +189,36 @@ export interface HRContract {
...
@@ -189,4 +189,36 @@ export interface HRContract {
* @memberof HRContract
* @memberof HRContract
*/
*/
attachment
?:
any
;
attachment
?:
any
;
/**
* 单位
*
* @returns {*}
* @memberof HRContract
*/
organizationname
?:
any
;
/**
* 员工状态
*
* @returns {*}
* @memberof HRContract
*/
empstate
?:
any
;
/**
* 到本单位时间
*
* @returns {*}
* @memberof HRContract
*/
startorgtime
?:
any
;
/**
* 员工编号
*
* @returns {*}
* @memberof HRContract
*/
employeecode
?:
any
;
}
}
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrcontract/hrcontract_en_US.ts
浏览文件 @
ceab1e0c
...
@@ -24,6 +24,10 @@ export default {
...
@@ -24,6 +24,10 @@ export default {
memo
:
"备注"
,
memo
:
"备注"
,
contractsignnum
:
"合同签订次数"
,
contractsignnum
:
"合同签订次数"
,
attachment
:
"附件"
,
attachment
:
"附件"
,
organizationname
:
"单位"
,
empstate
:
"员工状态"
,
startorgtime
:
"到本单位时间"
,
employeecode
:
"员工编号"
,
},
},
views
:
{
views
:
{
gridview
:
{
gridview
:
{
...
@@ -108,6 +112,11 @@ export default {
...
@@ -108,6 +112,11 @@ export default {
},
},
main_grid
:
{
main_grid
:
{
columns
:
{
columns
:
{
employeecode
:
"员工编号"
,
hremployeename
:
"员工姓名"
,
organizationname
:
"单位"
,
empstate
:
"员工状态"
,
startorgtime
:
"到本单位时间"
,
contractcode
:
"合同编号"
,
contractcode
:
"合同编号"
,
contractmode
:
"合同类别"
,
contractmode
:
"合同类别"
,
contracttype
:
"合同类型"
,
contracttype
:
"合同类型"
,
...
@@ -122,6 +131,11 @@ export default {
...
@@ -122,6 +131,11 @@ export default {
},
},
waitsign_grid
:
{
waitsign_grid
:
{
columns
:
{
columns
:
{
employeecode
:
"员工编号"
,
hremployeename
:
"员工姓名"
,
organizationname
:
"单位"
,
empstate
:
"员工状态"
,
startorgtime
:
"到本单位时间"
,
contractcode
:
"合同编号"
,
contractcode
:
"合同编号"
,
contractmode
:
"合同类别"
,
contractmode
:
"合同类别"
,
contracttype
:
"合同类型"
,
contracttype
:
"合同类型"
,
...
@@ -139,6 +153,11 @@ export default {
...
@@ -139,6 +153,11 @@ export default {
},
},
waitstop_grid
:
{
waitstop_grid
:
{
columns
:
{
columns
:
{
employeecode
:
"员工编号"
,
hremployeename
:
"员工姓名"
,
organizationname
:
"单位"
,
empstate
:
"员工状态"
,
startorgtime
:
"到本单位时间"
,
contractcode
:
"合同编号"
,
contractcode
:
"合同编号"
,
contractmode
:
"合同类别"
,
contractmode
:
"合同类别"
,
contracttype
:
"合同类型"
,
contracttype
:
"合同类型"
,
...
@@ -155,6 +174,11 @@ export default {
...
@@ -155,6 +174,11 @@ export default {
},
},
active_grid
:
{
active_grid
:
{
columns
:
{
columns
:
{
employeecode
:
"员工编号"
,
hremployeename
:
"员工姓名"
,
organizationname
:
"单位"
,
empstate
:
"员工状态"
,
startorgtime
:
"到本单位时间"
,
contractcode
:
"合同编号"
,
contractcode
:
"合同编号"
,
contractmode
:
"合同类别"
,
contractmode
:
"合同类别"
,
contracttype
:
"合同类型"
,
contracttype
:
"合同类型"
,
...
...
app_PIM/src/locale/lanres/entities/hrcontract/hrcontract_zh_CN.ts
浏览文件 @
ceab1e0c
...
@@ -23,6 +23,10 @@ export default {
...
@@ -23,6 +23,10 @@ export default {
memo
:
"备注"
,
memo
:
"备注"
,
contractsignnum
:
"合同签订次数"
,
contractsignnum
:
"合同签订次数"
,
attachment
:
"附件"
,
attachment
:
"附件"
,
organizationname
:
"单位"
,
empstate
:
"员工状态"
,
startorgtime
:
"到本单位时间"
,
employeecode
:
"员工编号"
,
},
},
views
:
{
views
:
{
gridview
:
{
gridview
:
{
...
@@ -107,6 +111,11 @@ export default {
...
@@ -107,6 +111,11 @@ export default {
},
},
main_grid
:
{
main_grid
:
{
columns
:
{
columns
:
{
employeecode
:
"员工编号"
,
hremployeename
:
"员工姓名"
,
organizationname
:
"单位"
,
empstate
:
"员工状态"
,
startorgtime
:
"到本单位时间"
,
contractcode
:
"合同编号"
,
contractcode
:
"合同编号"
,
contractmode
:
"合同类别"
,
contractmode
:
"合同类别"
,
contracttype
:
"合同类型"
,
contracttype
:
"合同类型"
,
...
@@ -121,6 +130,11 @@ export default {
...
@@ -121,6 +130,11 @@ export default {
},
},
waitsign_grid
:
{
waitsign_grid
:
{
columns
:
{
columns
:
{
employeecode
:
"员工编号"
,
hremployeename
:
"员工姓名"
,
organizationname
:
"单位"
,
empstate
:
"员工状态"
,
startorgtime
:
"到本单位时间"
,
contractcode
:
"合同编号"
,
contractcode
:
"合同编号"
,
contractmode
:
"合同类别"
,
contractmode
:
"合同类别"
,
contracttype
:
"合同类型"
,
contracttype
:
"合同类型"
,
...
@@ -138,6 +152,11 @@ export default {
...
@@ -138,6 +152,11 @@ export default {
},
},
waitstop_grid
:
{
waitstop_grid
:
{
columns
:
{
columns
:
{
employeecode
:
"员工编号"
,
hremployeename
:
"员工姓名"
,
organizationname
:
"单位"
,
empstate
:
"员工状态"
,
startorgtime
:
"到本单位时间"
,
contractcode
:
"合同编号"
,
contractcode
:
"合同编号"
,
contractmode
:
"合同类别"
,
contractmode
:
"合同类别"
,
contracttype
:
"合同类型"
,
contracttype
:
"合同类型"
,
...
@@ -154,6 +173,11 @@ export default {
...
@@ -154,6 +173,11 @@ export default {
},
},
active_grid
:
{
active_grid
:
{
columns
:
{
columns
:
{
employeecode
:
"员工编号"
,
hremployeename
:
"员工姓名"
,
organizationname
:
"单位"
,
empstate
:
"员工状态"
,
startorgtime
:
"到本单位时间"
,
contractcode
:
"合同编号"
,
contractcode
:
"合同编号"
,
contractmode
:
"合同类别"
,
contractmode
:
"合同类别"
,
contracttype
:
"合同类型"
,
contracttype
:
"合同类型"
,
...
...
app_PIM/src/widgets/hrcontract/active-grid/active-grid-base.tsx
浏览文件 @
ceab1e0c
...
@@ -121,6 +121,46 @@ export class ActiveGridBase extends GridControlBase {
...
@@ -121,6 +121,46 @@ export class ActiveGridBase extends GridControlBase {
* @memberof ActiveGridBase
* @memberof ActiveGridBase
*/
*/
public
allColumns
:
any
[]
=
[
public
allColumns
:
any
[]
=
[
{
name
:
'employeecode'
,
label
:
'员工编号'
,
langtag
:
'entities.hrcontract.active_grid.columns.employeecode'
,
show
:
true
,
util
:
'PX'
,
isEnableRowEdit
:
false
,
},
{
name
:
'hremployeename'
,
label
:
'员工姓名'
,
langtag
:
'entities.hrcontract.active_grid.columns.hremployeename'
,
show
:
true
,
util
:
'PX'
,
isEnableRowEdit
:
false
,
},
{
name
:
'organizationname'
,
label
:
'单位'
,
langtag
:
'entities.hrcontract.active_grid.columns.organizationname'
,
show
:
true
,
util
:
'PX'
,
isEnableRowEdit
:
false
,
},
{
name
:
'empstate'
,
label
:
'员工状态'
,
langtag
:
'entities.hrcontract.active_grid.columns.empstate'
,
show
:
true
,
util
:
'PX'
,
isEnableRowEdit
:
false
,
},
{
name
:
'startorgtime'
,
label
:
'到本单位时间'
,
langtag
:
'entities.hrcontract.active_grid.columns.startorgtime'
,
show
:
true
,
util
:
'PX'
,
isEnableRowEdit
:
false
,
},
{
{
name
:
'contractcode'
,
name
:
'contractcode'
,
label
:
'合同编号'
,
label
:
'合同编号'
,
...
@@ -227,6 +267,11 @@ export class ActiveGridBase extends GridControlBase {
...
@@ -227,6 +267,11 @@ export class ActiveGridBase extends GridControlBase {
* @memberof ActiveBase
* @memberof ActiveBase
*/
*/
public
hasRowEdit
:
any
=
{
public
hasRowEdit
:
any
=
{
'employeecode'
:
false
,
'hremployeename'
:
false
,
'organizationname'
:
false
,
'empstate'
:
false
,
'startorgtime'
:
false
,
'contractcode'
:
false
,
'contractcode'
:
false
,
'contractmode'
:
false
,
'contractmode'
:
false
,
'contracttype'
:
false
,
'contracttype'
:
false
,
...
...
app_PIM/src/widgets/hrcontract/active-grid/active-grid-model.ts
浏览文件 @
ceab1e0c
...
@@ -26,6 +26,11 @@ export default class ActiveModel {
...
@@ -26,6 +26,11 @@ export default class ActiveModel {
]
]
}
else
{
}
else
{
return
[
return
[
{
name
:
'organizationname'
,
prop
:
'organizationname'
,
dataType
:
'PICKUPDATA'
,
},
{
{
name
:
'endtime'
,
name
:
'endtime'
,
prop
:
'endtime'
,
prop
:
'endtime'
,
...
@@ -36,6 +41,16 @@ export default class ActiveModel {
...
@@ -36,6 +41,16 @@ export default class ActiveModel {
prop
:
'mgrorganizationname'
,
prop
:
'mgrorganizationname'
,
dataType
:
'PICKUPTEXT'
,
dataType
:
'PICKUPTEXT'
,
},
},
{
name
:
'empstate'
,
prop
:
'empstate'
,
dataType
:
'PICKUPDATA'
,
},
{
name
:
'startorgtime'
,
prop
:
'startorgtime'
,
dataType
:
'PICKUPDATA'
,
},
{
{
name
:
'contractcode'
,
name
:
'contractcode'
,
prop
:
'contractcode'
,
prop
:
'contractcode'
,
...
@@ -46,6 +61,11 @@ export default class ActiveModel {
...
@@ -46,6 +61,11 @@ export default class ActiveModel {
prop
:
'begintime'
,
prop
:
'begintime'
,
dataType
:
'DATE'
,
dataType
:
'DATE'
,
},
},
{
name
:
'employeecode'
,
prop
:
'employeecode'
,
dataType
:
'PICKUPDATA'
,
},
{
{
name
:
'mgrorganizationid'
,
name
:
'mgrorganizationid'
,
prop
:
'mgrorganizationid'
,
prop
:
'mgrorganizationid'
,
...
@@ -57,15 +77,15 @@ export default class ActiveModel {
...
@@ -57,15 +77,15 @@ export default class ActiveModel {
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
},
},
{
{
name
:
'srf
key
'
,
name
:
'srf
dataaccaction
'
,
prop
:
'hrcontractid'
,
prop
:
'hrcontractid'
,
dataType
:
'GUID'
,
dataType
:
'GUID'
,
isEditable
:
true
},
},
{
{
name
:
'srf
dataaccaction
'
,
name
:
'srf
key
'
,
prop
:
'hrcontractid'
,
prop
:
'hrcontractid'
,
dataType
:
'GUID'
,
dataType
:
'GUID'
,
isEditable
:
true
},
},
{
{
name
:
'signorganizationid'
,
name
:
'signorganizationid'
,
...
@@ -82,6 +102,11 @@ export default class ActiveModel {
...
@@ -82,6 +102,11 @@ export default class ActiveModel {
prop
:
'contracttype'
,
prop
:
'contracttype'
,
dataType
:
'SSCODELIST'
,
dataType
:
'SSCODELIST'
,
},
},
{
name
:
'hremployeename'
,
prop
:
'hremployeename'
,
dataType
:
'PICKUPTEXT'
,
},
{
{
name
:
'contractstate'
,
name
:
'contractstate'
,
prop
:
'contractstate'
,
prop
:
'contractstate'
,
...
...
app_PIM/src/widgets/hrcontract/active-grid/active-grid.html
浏览文件 @
ceab1e0c
...
@@ -23,6 +23,66 @@
...
@@ -23,6 +23,66 @@
<template
v-if=
"!isSingleSelect"
>
<template
v-if=
"!isSingleSelect"
>
<el-table-column
align=
"center"
type=
'selection'
:width=
"checkboxColWidth"
></el-table-column>
<el-table-column
align=
"center"
type=
'selection'
:width=
"checkboxColWidth"
></el-table-column>
</template>
</template>
<template
v-if=
"getColumnState('employeecode')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'employeecode'"
:label=
"$t('entities.hrcontract.active_grid.columns.employeecode')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.hrcontract.active_grid.columns.employeecode')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.employeecode}}
</span>
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('hremployeename')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'hremployeename'"
:label=
"$t('entities.hrcontract.active_grid.columns.hremployeename')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.hrcontract.active_grid.columns.hremployeename')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.hremployeename}}
</span>
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('organizationname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'organizationname'"
:label=
"$t('entities.hrcontract.active_grid.columns.organizationname')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.hrcontract.active_grid.columns.organizationname')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.organizationname}}
</span>
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('empstate')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'empstate'"
:label=
"$t('entities.hrcontract.active_grid.columns.empstate')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.hrcontract.active_grid.columns.empstate')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.empstate}}
</span>
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('startorgtime')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'startorgtime'"
:label=
"$t('entities.hrcontract.active_grid.columns.startorgtime')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.hrcontract.active_grid.columns.startorgtime')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.startorgtime}}
</span>
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('contractcode')"
>
<template
v-if=
"getColumnState('contractcode')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'contractcode'"
:label=
"$t('entities.hrcontract.active_grid.columns.contractcode')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'contractcode'"
:label=
"$t('entities.hrcontract.active_grid.columns.contractcode')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<template
v-slot:header=
"{column}"
>
...
...
app_PIM/src/widgets/hrcontract/main-grid/main-grid-base.tsx
浏览文件 @
ceab1e0c
...
@@ -92,6 +92,46 @@ export class MainGridBase extends GridControlBase {
...
@@ -92,6 +92,46 @@ export class MainGridBase extends GridControlBase {
* @memberof MainGridBase
* @memberof MainGridBase
*/
*/
public
allColumns
:
any
[]
=
[
public
allColumns
:
any
[]
=
[
{
name
:
'employeecode'
,
label
:
'员工编号'
,
langtag
:
'entities.hrcontract.main_grid.columns.employeecode'
,
show
:
true
,
util
:
'PX'
,
isEnableRowEdit
:
false
,
},
{
name
:
'hremployeename'
,
label
:
'员工姓名'
,
langtag
:
'entities.hrcontract.main_grid.columns.hremployeename'
,
show
:
true
,
util
:
'PX'
,
isEnableRowEdit
:
false
,
},
{
name
:
'organizationname'
,
label
:
'单位'
,
langtag
:
'entities.hrcontract.main_grid.columns.organizationname'
,
show
:
true
,
util
:
'PX'
,
isEnableRowEdit
:
false
,
},
{
name
:
'empstate'
,
label
:
'员工状态'
,
langtag
:
'entities.hrcontract.main_grid.columns.empstate'
,
show
:
true
,
util
:
'PX'
,
isEnableRowEdit
:
false
,
},
{
name
:
'startorgtime'
,
label
:
'到本单位时间'
,
langtag
:
'entities.hrcontract.main_grid.columns.startorgtime'
,
show
:
true
,
util
:
'PX'
,
isEnableRowEdit
:
false
,
},
{
{
name
:
'contractcode'
,
name
:
'contractcode'
,
label
:
'合同编号'
,
label
:
'合同编号'
,
...
@@ -190,6 +230,11 @@ export class MainGridBase extends GridControlBase {
...
@@ -190,6 +230,11 @@ export class MainGridBase extends GridControlBase {
* @memberof MainBase
* @memberof MainBase
*/
*/
public
hasRowEdit
:
any
=
{
public
hasRowEdit
:
any
=
{
'employeecode'
:
false
,
'hremployeename'
:
false
,
'organizationname'
:
false
,
'empstate'
:
false
,
'startorgtime'
:
false
,
'contractcode'
:
false
,
'contractcode'
:
false
,
'contractmode'
:
false
,
'contractmode'
:
false
,
'contracttype'
:
false
,
'contracttype'
:
false
,
...
...
app_PIM/src/widgets/hrcontract/main-grid/main-grid-model.ts
浏览文件 @
ceab1e0c
...
@@ -26,6 +26,11 @@ export default class MainModel {
...
@@ -26,6 +26,11 @@ export default class MainModel {
]
]
}
else
{
}
else
{
return
[
return
[
{
name
:
'organizationname'
,
prop
:
'organizationname'
,
dataType
:
'PICKUPDATA'
,
},
{
{
name
:
'endtime'
,
name
:
'endtime'
,
prop
:
'endtime'
,
prop
:
'endtime'
,
...
@@ -36,6 +41,16 @@ export default class MainModel {
...
@@ -36,6 +41,16 @@ export default class MainModel {
prop
:
'mgrorganizationname'
,
prop
:
'mgrorganizationname'
,
dataType
:
'PICKUPTEXT'
,
dataType
:
'PICKUPTEXT'
,
},
},
{
name
:
'empstate'
,
prop
:
'empstate'
,
dataType
:
'PICKUPDATA'
,
},
{
name
:
'startorgtime'
,
prop
:
'startorgtime'
,
dataType
:
'PICKUPDATA'
,
},
{
{
name
:
'contractcode'
,
name
:
'contractcode'
,
prop
:
'contractcode'
,
prop
:
'contractcode'
,
...
@@ -46,6 +61,11 @@ export default class MainModel {
...
@@ -46,6 +61,11 @@ export default class MainModel {
prop
:
'begintime'
,
prop
:
'begintime'
,
dataType
:
'DATE'
,
dataType
:
'DATE'
,
},
},
{
name
:
'employeecode'
,
prop
:
'employeecode'
,
dataType
:
'PICKUPDATA'
,
},
{
{
name
:
'mgrorganizationid'
,
name
:
'mgrorganizationid'
,
prop
:
'mgrorganizationid'
,
prop
:
'mgrorganizationid'
,
...
@@ -57,15 +77,15 @@ export default class MainModel {
...
@@ -57,15 +77,15 @@ export default class MainModel {
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
},
},
{
{
name
:
'srf
key
'
,
name
:
'srf
dataaccaction
'
,
prop
:
'hrcontractid'
,
prop
:
'hrcontractid'
,
dataType
:
'GUID'
,
dataType
:
'GUID'
,
isEditable
:
true
},
},
{
{
name
:
'srf
dataaccaction
'
,
name
:
'srf
key
'
,
prop
:
'hrcontractid'
,
prop
:
'hrcontractid'
,
dataType
:
'GUID'
,
dataType
:
'GUID'
,
isEditable
:
true
},
},
{
{
name
:
'signorganizationid'
,
name
:
'signorganizationid'
,
...
@@ -82,6 +102,11 @@ export default class MainModel {
...
@@ -82,6 +102,11 @@ export default class MainModel {
prop
:
'contracttype'
,
prop
:
'contracttype'
,
dataType
:
'SSCODELIST'
,
dataType
:
'SSCODELIST'
,
},
},
{
name
:
'hremployeename'
,
prop
:
'hremployeename'
,
dataType
:
'PICKUPTEXT'
,
},
{
{
name
:
'contractstate'
,
name
:
'contractstate'
,
prop
:
'contractstate'
,
prop
:
'contractstate'
,
...
...
app_PIM/src/widgets/hrcontract/main-grid/main-grid.html
浏览文件 @
ceab1e0c
...
@@ -23,6 +23,66 @@
...
@@ -23,6 +23,66 @@
<template
v-if=
"!isSingleSelect"
>
<template
v-if=
"!isSingleSelect"
>
<el-table-column
align=
"center"
type=
'selection'
:width=
"checkboxColWidth"
></el-table-column>
<el-table-column
align=
"center"
type=
'selection'
:width=
"checkboxColWidth"
></el-table-column>
</template>
</template>
<template
v-if=
"getColumnState('employeecode')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'employeecode'"
:label=
"$t('entities.hrcontract.main_grid.columns.employeecode')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.hrcontract.main_grid.columns.employeecode')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.employeecode}}
</span>
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('hremployeename')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'hremployeename'"
:label=
"$t('entities.hrcontract.main_grid.columns.hremployeename')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.hrcontract.main_grid.columns.hremployeename')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.hremployeename}}
</span>
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('organizationname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'organizationname'"
:label=
"$t('entities.hrcontract.main_grid.columns.organizationname')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.hrcontract.main_grid.columns.organizationname')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.organizationname}}
</span>
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('empstate')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'empstate'"
:label=
"$t('entities.hrcontract.main_grid.columns.empstate')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.hrcontract.main_grid.columns.empstate')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.empstate}}
</span>
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('startorgtime')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'startorgtime'"
:label=
"$t('entities.hrcontract.main_grid.columns.startorgtime')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.hrcontract.main_grid.columns.startorgtime')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.startorgtime}}
</span>
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('contractcode')"
>
<template
v-if=
"getColumnState('contractcode')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'contractcode'"
:label=
"$t('entities.hrcontract.main_grid.columns.contractcode')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'contractcode'"
:label=
"$t('entities.hrcontract.main_grid.columns.contractcode')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<template
v-slot:header=
"{column}"
>
...
...
app_PIM/src/widgets/hrcontract/tab-exp-viewtabexppanel-tabexppanel/tab-exp-viewtabexppanel-tabexppanel-model.ts
浏览文件 @
ceab1e0c
...
@@ -84,6 +84,18 @@ export default class TabExpViewtabexppanelModel {
...
@@ -84,6 +84,18 @@ export default class TabExpViewtabexppanelModel {
{
{
name
:
'attachment'
,
name
:
'attachment'
,
},
},
{
name
:
'organizationname'
,
},
{
name
:
'empstate'
,
},
{
name
:
'startorgtime'
,
},
{
name
:
'employeecode'
,
},
]
]
}
}
...
...
app_PIM/src/widgets/hrcontract/tab-exp-viewtabviewpanel-tabviewpanel/tab-exp-viewtabviewpanel-tabviewpanel-model.ts
浏览文件 @
ceab1e0c
...
@@ -84,6 +84,18 @@ export default class TabExpViewtabviewpanelModel {
...
@@ -84,6 +84,18 @@ export default class TabExpViewtabviewpanelModel {
{
{
name
:
'attachment'
,
name
:
'attachment'
,
},
},
{
name
:
'organizationname'
,
},
{
name
:
'empstate'
,
},
{
name
:
'startorgtime'
,
},
{
name
:
'employeecode'
,
},
]
]
}
}
...
...
app_PIM/src/widgets/hrcontract/tab-exp-viewtabviewpanel2-tabviewpanel/tab-exp-viewtabviewpanel2-tabviewpanel-model.ts
浏览文件 @
ceab1e0c
...
@@ -84,6 +84,18 @@ export default class TabExpViewtabviewpanel2Model {
...
@@ -84,6 +84,18 @@ export default class TabExpViewtabviewpanel2Model {
{
{
name
:
'attachment'
,
name
:
'attachment'
,
},
},
{
name
:
'organizationname'
,
},
{
name
:
'empstate'
,
},
{
name
:
'startorgtime'
,
},
{
name
:
'employeecode'
,
},
]
]
}
}
...
...
app_PIM/src/widgets/hrcontract/tab-exp-viewtabviewpanel3-tabviewpanel/tab-exp-viewtabviewpanel3-tabviewpanel-model.ts
浏览文件 @
ceab1e0c
...
@@ -84,6 +84,18 @@ export default class TabExpViewtabviewpanel3Model {
...
@@ -84,6 +84,18 @@ export default class TabExpViewtabviewpanel3Model {
{
{
name
:
'attachment'
,
name
:
'attachment'
,
},
},
{
name
:
'organizationname'
,
},
{
name
:
'empstate'
,
},
{
name
:
'startorgtime'
,
},
{
name
:
'employeecode'
,
},
]
]
}
}
...
...
app_PIM/src/widgets/hrcontract/tab-exp-viewtabviewpanel4-tabviewpanel/tab-exp-viewtabviewpanel4-tabviewpanel-model.ts
浏览文件 @
ceab1e0c
...
@@ -84,6 +84,18 @@ export default class TabExpViewtabviewpanel4Model {
...
@@ -84,6 +84,18 @@ export default class TabExpViewtabviewpanel4Model {
{
{
name
:
'attachment'
,
name
:
'attachment'
,
},
},
{
name
:
'organizationname'
,
},
{
name
:
'empstate'
,
},
{
name
:
'startorgtime'
,
},
{
name
:
'employeecode'
,
},
]
]
}
}
...
...
app_PIM/src/widgets/hrcontract/tab-exp-viewtabviewpanel5-tabviewpanel/tab-exp-viewtabviewpanel5-tabviewpanel-model.ts
浏览文件 @
ceab1e0c
...
@@ -84,6 +84,18 @@ export default class TabExpViewtabviewpanel5Model {
...
@@ -84,6 +84,18 @@ export default class TabExpViewtabviewpanel5Model {
{
{
name
:
'attachment'
,
name
:
'attachment'
,
},
},
{
name
:
'organizationname'
,
},
{
name
:
'empstate'
,
},
{
name
:
'startorgtime'
,
},
{
name
:
'employeecode'
,
},
]
]
}
}
...
...
app_PIM/src/widgets/hrcontract/wait-sign-grid/wait-sign-grid-base.tsx
浏览文件 @
ceab1e0c
...
@@ -150,6 +150,46 @@ export class WaitSignGridBase extends GridControlBase {
...
@@ -150,6 +150,46 @@ export class WaitSignGridBase extends GridControlBase {
* @memberof WaitSignGridBase
* @memberof WaitSignGridBase
*/
*/
public
allColumns
:
any
[]
=
[
public
allColumns
:
any
[]
=
[
{
name
:
'employeecode'
,
label
:
'员工编号'
,
langtag
:
'entities.hrcontract.waitsign_grid.columns.employeecode'
,
show
:
true
,
util
:
'PX'
,
isEnableRowEdit
:
false
,
},
{
name
:
'hremployeename'
,
label
:
'员工姓名'
,
langtag
:
'entities.hrcontract.waitsign_grid.columns.hremployeename'
,
show
:
true
,
util
:
'PX'
,
isEnableRowEdit
:
false
,
},
{
name
:
'organizationname'
,
label
:
'单位'
,
langtag
:
'entities.hrcontract.waitsign_grid.columns.organizationname'
,
show
:
true
,
util
:
'PX'
,
isEnableRowEdit
:
false
,
},
{
name
:
'empstate'
,
label
:
'员工状态'
,
langtag
:
'entities.hrcontract.waitsign_grid.columns.empstate'
,
show
:
true
,
util
:
'PX'
,
isEnableRowEdit
:
false
,
},
{
name
:
'startorgtime'
,
label
:
'到本单位时间'
,
langtag
:
'entities.hrcontract.waitsign_grid.columns.startorgtime'
,
show
:
true
,
util
:
'PX'
,
isEnableRowEdit
:
false
,
},
{
{
name
:
'contractcode'
,
name
:
'contractcode'
,
label
:
'合同编号'
,
label
:
'合同编号'
,
...
@@ -256,6 +296,11 @@ export class WaitSignGridBase extends GridControlBase {
...
@@ -256,6 +296,11 @@ export class WaitSignGridBase extends GridControlBase {
* @memberof WaitSignBase
* @memberof WaitSignBase
*/
*/
public
hasRowEdit
:
any
=
{
public
hasRowEdit
:
any
=
{
'employeecode'
:
false
,
'hremployeename'
:
false
,
'organizationname'
:
false
,
'empstate'
:
false
,
'startorgtime'
:
false
,
'contractcode'
:
false
,
'contractcode'
:
false
,
'contractmode'
:
false
,
'contractmode'
:
false
,
'contracttype'
:
false
,
'contracttype'
:
false
,
...
...
app_PIM/src/widgets/hrcontract/wait-sign-grid/wait-sign-grid-model.ts
浏览文件 @
ceab1e0c
...
@@ -26,6 +26,11 @@ export default class WaitSignModel {
...
@@ -26,6 +26,11 @@ export default class WaitSignModel {
]
]
}
else
{
}
else
{
return
[
return
[
{
name
:
'organizationname'
,
prop
:
'organizationname'
,
dataType
:
'PICKUPDATA'
,
},
{
{
name
:
'endtime'
,
name
:
'endtime'
,
prop
:
'endtime'
,
prop
:
'endtime'
,
...
@@ -36,6 +41,16 @@ export default class WaitSignModel {
...
@@ -36,6 +41,16 @@ export default class WaitSignModel {
prop
:
'mgrorganizationname'
,
prop
:
'mgrorganizationname'
,
dataType
:
'PICKUPTEXT'
,
dataType
:
'PICKUPTEXT'
,
},
},
{
name
:
'empstate'
,
prop
:
'empstate'
,
dataType
:
'PICKUPDATA'
,
},
{
name
:
'startorgtime'
,
prop
:
'startorgtime'
,
dataType
:
'PICKUPDATA'
,
},
{
{
name
:
'contractcode'
,
name
:
'contractcode'
,
prop
:
'contractcode'
,
prop
:
'contractcode'
,
...
@@ -46,6 +61,11 @@ export default class WaitSignModel {
...
@@ -46,6 +61,11 @@ export default class WaitSignModel {
prop
:
'begintime'
,
prop
:
'begintime'
,
dataType
:
'DATE'
,
dataType
:
'DATE'
,
},
},
{
name
:
'employeecode'
,
prop
:
'employeecode'
,
dataType
:
'PICKUPDATA'
,
},
{
{
name
:
'mgrorganizationid'
,
name
:
'mgrorganizationid'
,
prop
:
'mgrorganizationid'
,
prop
:
'mgrorganizationid'
,
...
@@ -57,15 +77,15 @@ export default class WaitSignModel {
...
@@ -57,15 +77,15 @@ export default class WaitSignModel {
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
},
},
{
{
name
:
'srf
key
'
,
name
:
'srf
dataaccaction
'
,
prop
:
'hrcontractid'
,
prop
:
'hrcontractid'
,
dataType
:
'GUID'
,
dataType
:
'GUID'
,
isEditable
:
true
},
},
{
{
name
:
'srf
dataaccaction
'
,
name
:
'srf
key
'
,
prop
:
'hrcontractid'
,
prop
:
'hrcontractid'
,
dataType
:
'GUID'
,
dataType
:
'GUID'
,
isEditable
:
true
},
},
{
{
name
:
'signorganizationid'
,
name
:
'signorganizationid'
,
...
@@ -82,6 +102,11 @@ export default class WaitSignModel {
...
@@ -82,6 +102,11 @@ export default class WaitSignModel {
prop
:
'contracttype'
,
prop
:
'contracttype'
,
dataType
:
'SSCODELIST'
,
dataType
:
'SSCODELIST'
,
},
},
{
name
:
'hremployeename'
,
prop
:
'hremployeename'
,
dataType
:
'PICKUPTEXT'
,
},
{
{
name
:
'contractstate'
,
name
:
'contractstate'
,
prop
:
'contractstate'
,
prop
:
'contractstate'
,
...
...
app_PIM/src/widgets/hrcontract/wait-sign-grid/wait-sign-grid.html
浏览文件 @
ceab1e0c
...
@@ -23,6 +23,66 @@
...
@@ -23,6 +23,66 @@
<template
v-if=
"!isSingleSelect"
>
<template
v-if=
"!isSingleSelect"
>
<el-table-column
align=
"center"
type=
'selection'
:width=
"checkboxColWidth"
></el-table-column>
<el-table-column
align=
"center"
type=
'selection'
:width=
"checkboxColWidth"
></el-table-column>
</template>
</template>
<template
v-if=
"getColumnState('employeecode')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'employeecode'"
:label=
"$t('entities.hrcontract.waitsign_grid.columns.employeecode')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.hrcontract.waitsign_grid.columns.employeecode')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.employeecode}}
</span>
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('hremployeename')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'hremployeename'"
:label=
"$t('entities.hrcontract.waitsign_grid.columns.hremployeename')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.hrcontract.waitsign_grid.columns.hremployeename')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.hremployeename}}
</span>
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('organizationname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'organizationname'"
:label=
"$t('entities.hrcontract.waitsign_grid.columns.organizationname')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.hrcontract.waitsign_grid.columns.organizationname')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.organizationname}}
</span>
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('empstate')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'empstate'"
:label=
"$t('entities.hrcontract.waitsign_grid.columns.empstate')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.hrcontract.waitsign_grid.columns.empstate')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.empstate}}
</span>
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('startorgtime')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'startorgtime'"
:label=
"$t('entities.hrcontract.waitsign_grid.columns.startorgtime')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.hrcontract.waitsign_grid.columns.startorgtime')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.startorgtime}}
</span>
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('contractcode')"
>
<template
v-if=
"getColumnState('contractcode')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'contractcode'"
:label=
"$t('entities.hrcontract.waitsign_grid.columns.contractcode')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'contractcode'"
:label=
"$t('entities.hrcontract.waitsign_grid.columns.contractcode')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<template
v-slot:header=
"{column}"
>
...
...
app_PIM/src/widgets/hrcontract/wait-stop-grid/wait-stop-grid-base.tsx
浏览文件 @
ceab1e0c
...
@@ -121,6 +121,46 @@ export class WaitStopGridBase extends GridControlBase {
...
@@ -121,6 +121,46 @@ export class WaitStopGridBase extends GridControlBase {
* @memberof WaitStopGridBase
* @memberof WaitStopGridBase
*/
*/
public
allColumns
:
any
[]
=
[
public
allColumns
:
any
[]
=
[
{
name
:
'employeecode'
,
label
:
'员工编号'
,
langtag
:
'entities.hrcontract.waitstop_grid.columns.employeecode'
,
show
:
true
,
util
:
'PX'
,
isEnableRowEdit
:
false
,
},
{
name
:
'hremployeename'
,
label
:
'员工姓名'
,
langtag
:
'entities.hrcontract.waitstop_grid.columns.hremployeename'
,
show
:
true
,
util
:
'PX'
,
isEnableRowEdit
:
false
,
},
{
name
:
'organizationname'
,
label
:
'单位'
,
langtag
:
'entities.hrcontract.waitstop_grid.columns.organizationname'
,
show
:
true
,
util
:
'PX'
,
isEnableRowEdit
:
false
,
},
{
name
:
'empstate'
,
label
:
'员工状态'
,
langtag
:
'entities.hrcontract.waitstop_grid.columns.empstate'
,
show
:
true
,
util
:
'PX'
,
isEnableRowEdit
:
false
,
},
{
name
:
'startorgtime'
,
label
:
'到本单位时间'
,
langtag
:
'entities.hrcontract.waitstop_grid.columns.startorgtime'
,
show
:
true
,
util
:
'PX'
,
isEnableRowEdit
:
false
,
},
{
{
name
:
'contractcode'
,
name
:
'contractcode'
,
label
:
'合同编号'
,
label
:
'合同编号'
,
...
@@ -227,6 +267,11 @@ export class WaitStopGridBase extends GridControlBase {
...
@@ -227,6 +267,11 @@ export class WaitStopGridBase extends GridControlBase {
* @memberof WaitStopBase
* @memberof WaitStopBase
*/
*/
public
hasRowEdit
:
any
=
{
public
hasRowEdit
:
any
=
{
'employeecode'
:
false
,
'hremployeename'
:
false
,
'organizationname'
:
false
,
'empstate'
:
false
,
'startorgtime'
:
false
,
'contractcode'
:
false
,
'contractcode'
:
false
,
'contractmode'
:
false
,
'contractmode'
:
false
,
'contracttype'
:
false
,
'contracttype'
:
false
,
...
...
app_PIM/src/widgets/hrcontract/wait-stop-grid/wait-stop-grid-model.ts
浏览文件 @
ceab1e0c
...
@@ -26,6 +26,11 @@ export default class WaitStopModel {
...
@@ -26,6 +26,11 @@ export default class WaitStopModel {
]
]
}
else
{
}
else
{
return
[
return
[
{
name
:
'organizationname'
,
prop
:
'organizationname'
,
dataType
:
'PICKUPDATA'
,
},
{
{
name
:
'endtime'
,
name
:
'endtime'
,
prop
:
'endtime'
,
prop
:
'endtime'
,
...
@@ -36,6 +41,16 @@ export default class WaitStopModel {
...
@@ -36,6 +41,16 @@ export default class WaitStopModel {
prop
:
'mgrorganizationname'
,
prop
:
'mgrorganizationname'
,
dataType
:
'PICKUPTEXT'
,
dataType
:
'PICKUPTEXT'
,
},
},
{
name
:
'empstate'
,
prop
:
'empstate'
,
dataType
:
'PICKUPDATA'
,
},
{
name
:
'startorgtime'
,
prop
:
'startorgtime'
,
dataType
:
'PICKUPDATA'
,
},
{
{
name
:
'contractcode'
,
name
:
'contractcode'
,
prop
:
'contractcode'
,
prop
:
'contractcode'
,
...
@@ -46,6 +61,11 @@ export default class WaitStopModel {
...
@@ -46,6 +61,11 @@ export default class WaitStopModel {
prop
:
'begintime'
,
prop
:
'begintime'
,
dataType
:
'DATE'
,
dataType
:
'DATE'
,
},
},
{
name
:
'employeecode'
,
prop
:
'employeecode'
,
dataType
:
'PICKUPDATA'
,
},
{
{
name
:
'mgrorganizationid'
,
name
:
'mgrorganizationid'
,
prop
:
'mgrorganizationid'
,
prop
:
'mgrorganizationid'
,
...
@@ -57,15 +77,15 @@ export default class WaitStopModel {
...
@@ -57,15 +77,15 @@ export default class WaitStopModel {
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
},
},
{
{
name
:
'srf
key
'
,
name
:
'srf
dataaccaction
'
,
prop
:
'hrcontractid'
,
prop
:
'hrcontractid'
,
dataType
:
'GUID'
,
dataType
:
'GUID'
,
isEditable
:
true
},
},
{
{
name
:
'srf
dataaccaction
'
,
name
:
'srf
key
'
,
prop
:
'hrcontractid'
,
prop
:
'hrcontractid'
,
dataType
:
'GUID'
,
dataType
:
'GUID'
,
isEditable
:
true
},
},
{
{
name
:
'signorganizationid'
,
name
:
'signorganizationid'
,
...
@@ -82,6 +102,11 @@ export default class WaitStopModel {
...
@@ -82,6 +102,11 @@ export default class WaitStopModel {
prop
:
'contracttype'
,
prop
:
'contracttype'
,
dataType
:
'SSCODELIST'
,
dataType
:
'SSCODELIST'
,
},
},
{
name
:
'hremployeename'
,
prop
:
'hremployeename'
,
dataType
:
'PICKUPTEXT'
,
},
{
{
name
:
'contractstate'
,
name
:
'contractstate'
,
prop
:
'contractstate'
,
prop
:
'contractstate'
,
...
...
app_PIM/src/widgets/hrcontract/wait-stop-grid/wait-stop-grid.html
浏览文件 @
ceab1e0c
...
@@ -23,6 +23,66 @@
...
@@ -23,6 +23,66 @@
<template
v-if=
"!isSingleSelect"
>
<template
v-if=
"!isSingleSelect"
>
<el-table-column
align=
"center"
type=
'selection'
:width=
"checkboxColWidth"
></el-table-column>
<el-table-column
align=
"center"
type=
'selection'
:width=
"checkboxColWidth"
></el-table-column>
</template>
</template>
<template
v-if=
"getColumnState('employeecode')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'employeecode'"
:label=
"$t('entities.hrcontract.waitstop_grid.columns.employeecode')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.hrcontract.waitstop_grid.columns.employeecode')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.employeecode}}
</span>
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('hremployeename')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'hremployeename'"
:label=
"$t('entities.hrcontract.waitstop_grid.columns.hremployeename')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.hrcontract.waitstop_grid.columns.hremployeename')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.hremployeename}}
</span>
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('organizationname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'organizationname'"
:label=
"$t('entities.hrcontract.waitstop_grid.columns.organizationname')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.hrcontract.waitstop_grid.columns.organizationname')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.organizationname}}
</span>
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('empstate')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'empstate'"
:label=
"$t('entities.hrcontract.waitstop_grid.columns.empstate')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.hrcontract.waitstop_grid.columns.empstate')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.empstate}}
</span>
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('startorgtime')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'startorgtime'"
:label=
"$t('entities.hrcontract.waitstop_grid.columns.startorgtime')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<span
class=
"column-header "
>
{{$t('entities.hrcontract.waitstop_grid.columns.startorgtime')}}
</span>
</template>
<template
v-slot=
"{row,column,$index}"
>
<span>
{{row.startorgtime}}
</span>
</template>
</el-table-column>
</template>
<template
v-if=
"getColumnState('contractcode')"
>
<template
v-if=
"getColumnState('contractcode')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'contractcode'"
:label=
"$t('entities.hrcontract.waitstop_grid.columns.contractcode')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'contractcode'"
:label=
"$t('entities.hrcontract.waitstop_grid.columns.contractcode')"
:width=
"120"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"{column}"
>
<template
v-slot:header=
"{column}"
>
...
...
config.xml
浏览文件 @
ceab1e0c
...
@@ -37,11 +37,11 @@
...
@@ -37,11 +37,11 @@
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 -P
hrapi
mvn clean package -P
pim
cd humanresource-
provider/humanresource-provider-hrapi
cd humanresource-
app/humanresource-app-pim
mvn -P
hrapi
docker:build
mvn -P
pim
docker:build
mvn -P
hrapi
docker:push
mvn -P
pim
docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-
provider-hrapi.yaml iBizEE --with-registry-auth
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
浏览文件 @
ceab1e0c
...
@@ -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
8080
EXPOSE
10327
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
浏览文件 @
ceab1e0c
...
@@ -3,9 +3,25 @@ services:
...
@@ -3,9 +3,25 @@ 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
:
-
"
8080:8080
"
-
"
10327:10327
"
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
:
...
...
humanresource-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile
浏览文件 @
ceab1e0c
...
@@ -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-provider-hrapi.jar
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-provider-hrapi.jar
EXPOSE
10317
EXPOSE
8081
ADD
humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar
ADD
humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar
humanresource-provider/humanresource-provider-hrapi/src/main/docker/humanresource-provider-hrapi.yaml
浏览文件 @
ceab1e0c
...
@@ -3,25 +3,9 @@ services:
...
@@ -3,25 +3,9 @@ services:
humanresource-provider-hrapi
:
humanresource-provider-hrapi
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
ports
:
ports
:
-
"
10317:10317
"
-
"
8081:8081
"
networks
:
networks
:
-
agent_network
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-
SERVER_PORT=10317
-
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
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录