Skip to content

I
iBiz人力资源
提交 ceab1e0c 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

jackwang 部署微服务应用

上级 0e8c8a42
隐藏空白字符变更
内嵌 并排
正在显示 包含 709 行增加 和 37 行删除
app_PIM/src/interface/entity/hrcontract.ts
浏览文件 @ ceab1e0c
......@@ -189,4 +189,36 @@ export interface HRContract {
* @memberof HRContract
*/
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 {
memo: "备注",
contractsignnum: "合同签订次数",
attachment: "附件",
organizationname: "单位",
empstate: "员工状态",
startorgtime: "到本单位时间",
employeecode: "员工编号",
},
views: {
gridview: {
......@@ -108,6 +112,11 @@ export default {
},
main_grid: {
columns: {
employeecode: "员工编号",
hremployeename: "员工姓名",
organizationname: "单位",
empstate: "员工状态",
startorgtime: "到本单位时间",
contractcode: "合同编号",
contractmode: "合同类别",
contracttype: "合同类型",
......@@ -122,6 +131,11 @@ export default {
},
waitsign_grid: {
columns: {
employeecode: "员工编号",
hremployeename: "员工姓名",
organizationname: "单位",
empstate: "员工状态",
startorgtime: "到本单位时间",
contractcode: "合同编号",
contractmode: "合同类别",
contracttype: "合同类型",
......@@ -139,6 +153,11 @@ export default {
},
waitstop_grid: {
columns: {
employeecode: "员工编号",
hremployeename: "员工姓名",
organizationname: "单位",
empstate: "员工状态",
startorgtime: "到本单位时间",
contractcode: "合同编号",
contractmode: "合同类别",
contracttype: "合同类型",
......@@ -155,6 +174,11 @@ export default {
},
active_grid: {
columns: {
employeecode: "员工编号",
hremployeename: "员工姓名",
organizationname: "单位",
empstate: "员工状态",
startorgtime: "到本单位时间",
contractcode: "合同编号",
contractmode: "合同类别",
contracttype: "合同类型",
......
app_PIM/src/locale/lanres/entities/hrcontract/hrcontract_zh_CN.ts
浏览文件 @ ceab1e0c
......@@ -23,6 +23,10 @@ export default {
memo: "备注",
contractsignnum: "合同签订次数",
attachment: "附件",
organizationname: "单位",
empstate: "员工状态",
startorgtime: "到本单位时间",
employeecode: "员工编号",
},
views: {
gridview: {
......@@ -107,6 +111,11 @@ export default {
},
main_grid: {
columns: {
employeecode: "员工编号",
hremployeename: "员工姓名",
organizationname: "单位",
empstate: "员工状态",
startorgtime: "到本单位时间",
contractcode: "合同编号",
contractmode: "合同类别",
contracttype: "合同类型",
......@@ -121,6 +130,11 @@ export default {
},
waitsign_grid: {
columns: {
employeecode: "员工编号",
hremployeename: "员工姓名",
organizationname: "单位",
empstate: "员工状态",
startorgtime: "到本单位时间",
contractcode: "合同编号",
contractmode: "合同类别",
contracttype: "合同类型",
......@@ -138,6 +152,11 @@ export default {
},
waitstop_grid: {
columns: {
employeecode: "员工编号",
hremployeename: "员工姓名",
organizationname: "单位",
empstate: "员工状态",
startorgtime: "到本单位时间",
contractcode: "合同编号",
contractmode: "合同类别",
contracttype: "合同类型",
......@@ -154,6 +173,11 @@ export default {
},
active_grid: {
columns: {
employeecode: "员工编号",
hremployeename: "员工姓名",
organizationname: "单位",
empstate: "员工状态",
startorgtime: "到本单位时间",
contractcode: "合同编号",
contractmode: "合同类别",
contracttype: "合同类型",
......
app_PIM/src/widgets/hrcontract/active-grid/active-grid-base.tsx
浏览文件 @ ceab1e0c
......@@ -121,6 +121,46 @@ export class ActiveGridBase extends GridControlBase {
* @memberof ActiveGridBase
*/
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',
label: '合同编号',
......@@ -227,6 +267,11 @@ export class ActiveGridBase extends GridControlBase {
* @memberof ActiveBase
*/
public hasRowEdit: any = {
'employeecode':false,
'hremployeename':false,
'organizationname':false,
'empstate':false,
'startorgtime':false,
'contractcode':false,
'contractmode':false,
'contracttype':false,
......
app_PIM/src/widgets/hrcontract/active-grid/active-grid-model.ts
浏览文件 @ ceab1e0c
......@@ -26,6 +26,11 @@ export default class ActiveModel {
]
}else{
return [
{
name: 'organizationname',
prop: 'organizationname',
dataType: 'PICKUPDATA',
},
{
name: 'endtime',
prop: 'endtime',
......@@ -36,6 +41,16 @@ export default class ActiveModel {
prop: 'mgrorganizationname',
dataType: 'PICKUPTEXT',
},
{
name: 'empstate',
prop: 'empstate',
dataType: 'PICKUPDATA',
},
{
name: 'startorgtime',
prop: 'startorgtime',
dataType: 'PICKUPDATA',
},
{
name: 'contractcode',
prop: 'contractcode',
......@@ -46,6 +61,11 @@ export default class ActiveModel {
prop: 'begintime',
dataType: 'DATE',
},
{
name: 'employeecode',
prop: 'employeecode',
dataType: 'PICKUPDATA',
},
{
name: 'mgrorganizationid',
prop: 'mgrorganizationid',
......@@ -57,15 +77,15 @@ export default class ActiveModel {
dataType: 'TEXT',
},
{
name: 'srfkey',
name: 'srfdataaccaction',
prop: 'hrcontractid',
dataType: 'GUID',
isEditable:true
},
{
name: 'srfdataaccaction',
name: 'srfkey',
prop: 'hrcontractid',
dataType: 'GUID',
isEditable:true
},
{
name: 'signorganizationid',
......@@ -82,6 +102,11 @@ export default class ActiveModel {
prop: 'contracttype',
dataType: 'SSCODELIST',
},
{
name: 'hremployeename',
prop: 'hremployeename',
dataType: 'PICKUPTEXT',
},
{
name: 'contractstate',
prop: 'contractstate',
......
app_PIM/src/widgets/hrcontract/active-grid/active-grid.html
浏览文件 @ ceab1e0c
......@@ -23,6 +23,66 @@
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</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')">
<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}">
......
app_PIM/src/widgets/hrcontract/main-grid/main-grid-base.tsx
浏览文件 @ ceab1e0c
......@@ -92,6 +92,46 @@ export class MainGridBase extends GridControlBase {
* @memberof MainGridBase
*/
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',
label: '合同编号',
......@@ -190,6 +230,11 @@ export class MainGridBase extends GridControlBase {
* @memberof MainBase
*/
public hasRowEdit: any = {
'employeecode':false,
'hremployeename':false,
'organizationname':false,
'empstate':false,
'startorgtime':false,
'contractcode':false,
'contractmode':false,
'contracttype':false,
......
app_PIM/src/widgets/hrcontract/main-grid/main-grid-model.ts
浏览文件 @ ceab1e0c
......@@ -26,6 +26,11 @@ export default class MainModel {
]
}else{
return [
{
name: 'organizationname',
prop: 'organizationname',
dataType: 'PICKUPDATA',
},
{
name: 'endtime',
prop: 'endtime',
......@@ -36,6 +41,16 @@ export default class MainModel {
prop: 'mgrorganizationname',
dataType: 'PICKUPTEXT',
},
{
name: 'empstate',
prop: 'empstate',
dataType: 'PICKUPDATA',
},
{
name: 'startorgtime',
prop: 'startorgtime',
dataType: 'PICKUPDATA',
},
{
name: 'contractcode',
prop: 'contractcode',
......@@ -46,6 +61,11 @@ export default class MainModel {
prop: 'begintime',
dataType: 'DATE',
},
{
name: 'employeecode',
prop: 'employeecode',
dataType: 'PICKUPDATA',
},
{
name: 'mgrorganizationid',
prop: 'mgrorganizationid',
......@@ -57,15 +77,15 @@ export default class MainModel {
dataType: 'TEXT',
},
{
name: 'srfkey',
name: 'srfdataaccaction',
prop: 'hrcontractid',
dataType: 'GUID',
isEditable:true
},
{
name: 'srfdataaccaction',
name: 'srfkey',
prop: 'hrcontractid',
dataType: 'GUID',
isEditable:true
},
{
name: 'signorganizationid',
......@@ -82,6 +102,11 @@ export default class MainModel {
prop: 'contracttype',
dataType: 'SSCODELIST',
},
{
name: 'hremployeename',
prop: 'hremployeename',
dataType: 'PICKUPTEXT',
},
{
name: 'contractstate',
prop: 'contractstate',
......
app_PIM/src/widgets/hrcontract/main-grid/main-grid.html
浏览文件 @ ceab1e0c
......@@ -23,6 +23,66 @@
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</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')">
<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}">
......
app_PIM/src/widgets/hrcontract/tab-exp-viewtabexppanel-tabexppanel/tab-exp-viewtabexppanel-tabexppanel-model.ts
浏览文件 @ ceab1e0c
......@@ -84,6 +84,18 @@ export default class TabExpViewtabexppanelModel {
{
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 {
{
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 {
{
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 {
{
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 {
{
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 {
{
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 {
* @memberof WaitSignGridBase
*/
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',
label: '合同编号',
......@@ -256,6 +296,11 @@ export class WaitSignGridBase extends GridControlBase {
* @memberof WaitSignBase
*/
public hasRowEdit: any = {
'employeecode':false,
'hremployeename':false,
'organizationname':false,
'empstate':false,
'startorgtime':false,
'contractcode':false,
'contractmode':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 {
]
}else{
return [
{
name: 'organizationname',
prop: 'organizationname',
dataType: 'PICKUPDATA',
},
{
name: 'endtime',
prop: 'endtime',
......@@ -36,6 +41,16 @@ export default class WaitSignModel {
prop: 'mgrorganizationname',
dataType: 'PICKUPTEXT',
},
{
name: 'empstate',
prop: 'empstate',
dataType: 'PICKUPDATA',
},
{
name: 'startorgtime',
prop: 'startorgtime',
dataType: 'PICKUPDATA',
},
{
name: 'contractcode',
prop: 'contractcode',
......@@ -46,6 +61,11 @@ export default class WaitSignModel {
prop: 'begintime',
dataType: 'DATE',
},
{
name: 'employeecode',
prop: 'employeecode',
dataType: 'PICKUPDATA',
},
{
name: 'mgrorganizationid',
prop: 'mgrorganizationid',
......@@ -57,15 +77,15 @@ export default class WaitSignModel {
dataType: 'TEXT',
},
{
name: 'srfkey',
name: 'srfdataaccaction',
prop: 'hrcontractid',
dataType: 'GUID',
isEditable:true
},
{
name: 'srfdataaccaction',
name: 'srfkey',
prop: 'hrcontractid',
dataType: 'GUID',
isEditable:true
},
{
name: 'signorganizationid',
......@@ -82,6 +102,11 @@ export default class WaitSignModel {
prop: 'contracttype',
dataType: 'SSCODELIST',
},
{
name: 'hremployeename',
prop: 'hremployeename',
dataType: 'PICKUPTEXT',
},
{
name: 'contractstate',
prop: 'contractstate',
......
app_PIM/src/widgets/hrcontract/wait-sign-grid/wait-sign-grid.html
浏览文件 @ ceab1e0c
......@@ -23,6 +23,66 @@
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</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')">
<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}">
......
app_PIM/src/widgets/hrcontract/wait-stop-grid/wait-stop-grid-base.tsx
浏览文件 @ ceab1e0c
......@@ -121,6 +121,46 @@ export class WaitStopGridBase extends GridControlBase {
* @memberof WaitStopGridBase
*/
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',
label: '合同编号',
......@@ -227,6 +267,11 @@ export class WaitStopGridBase extends GridControlBase {
* @memberof WaitStopBase
*/
public hasRowEdit: any = {
'employeecode':false,
'hremployeename':false,
'organizationname':false,
'empstate':false,
'startorgtime':false,
'contractcode':false,
'contractmode':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 {
]
}else{
return [
{
name: 'organizationname',
prop: 'organizationname',
dataType: 'PICKUPDATA',
},
{
name: 'endtime',
prop: 'endtime',
......@@ -36,6 +41,16 @@ export default class WaitStopModel {
prop: 'mgrorganizationname',
dataType: 'PICKUPTEXT',
},
{
name: 'empstate',
prop: 'empstate',
dataType: 'PICKUPDATA',
},
{
name: 'startorgtime',
prop: 'startorgtime',
dataType: 'PICKUPDATA',
},
{
name: 'contractcode',
prop: 'contractcode',
......@@ -46,6 +61,11 @@ export default class WaitStopModel {
prop: 'begintime',
dataType: 'DATE',
},
{
name: 'employeecode',
prop: 'employeecode',
dataType: 'PICKUPDATA',
},
{
name: 'mgrorganizationid',
prop: 'mgrorganizationid',
......@@ -57,15 +77,15 @@ export default class WaitStopModel {
dataType: 'TEXT',
},
{
name: 'srfkey',
name: 'srfdataaccaction',
prop: 'hrcontractid',
dataType: 'GUID',
isEditable:true
},
{
name: 'srfdataaccaction',
name: 'srfkey',
prop: 'hrcontractid',
dataType: 'GUID',
isEditable:true
},
{
name: 'signorganizationid',
......@@ -82,6 +102,11 @@ export default class WaitStopModel {
prop: 'contracttype',
dataType: 'SSCODELIST',
},
{
name: 'hremployeename',
prop: 'hremployeename',
dataType: 'PICKUPTEXT',
},
{
name: 'contractstate',
prop: 'contractstate',
......
app_PIM/src/widgets/hrcontract/wait-stop-grid/wait-stop-grid.html
浏览文件 @ ceab1e0c
......@@ -23,6 +23,66 @@
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</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')">
<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}">
......
config.xml
浏览文件 @ ceab1e0c
......@@ -37,11 +37,11 @@
git clone -b master $para2 ibizhumanresources/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibizhumanresources/
mvn clean package -Phrapi
cd humanresource-provider/humanresource-provider-hrapi
mvn -Phrapi docker:build
mvn -Phrapi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-provider-hrapi.yaml iBizEE --with-registry-auth
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>
</hudson.tasks.Shell>
</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..." && \
sleep ${IBIZ_SLEEP} && \
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
humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml
浏览文件 @ ceab1e0c
......@@ -3,9 +3,25 @@ services:
humanresource-app-pim:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
ports:
- "8080:8080"
- "10327:10327"
networks:
- 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:
resources:
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..." && \
sleep ${IBIZ_SLEEP} && \
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
humanresource-provider/humanresource-provider-hrapi/src/main/docker/humanresource-provider-hrapi.yaml
浏览文件 @ ceab1e0c
......@@ -3,25 +3,9 @@ services:
humanresource-provider-hrapi:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
ports:
- "10317:10317"
- "8081:8081"
networks:
- 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:
resources:
limits:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或