Skip to content

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

jackwang 部署微服务应用

上级 a121135c
隐藏空白字符变更
内嵌 并排
正在显示 包含 287 行增加 和 33 行删除
app_PIM/src/locale/lanres/entities/hrfamily/hrfamily_en_US.ts
浏览文件 @ 2444d080
...@@ -56,9 +56,17 @@ export default { ...@@ -56,9 +56,17 @@ export default {
}, },
main_grid: { main_grid: {
columns: { columns: {
relationship: "与本人关系",
hrfamilyname: "姓名", hrfamilyname: "姓名",
updateman: "更新人", sex: "性别",
updatedate: "更新时间", certtype: "证件类型",
certnum: "证件号码",
birthday: "出生日期",
age: "年龄",
workorganization: "工作单位",
duty: "职务",
political: "政治面貌",
emergencyflag: "是否紧急联系人",
}, },
uiactions: { uiactions: {
}, },
......
app_PIM/src/locale/lanres/entities/hrfamily/hrfamily_zh_CN.ts
浏览文件 @ 2444d080
...@@ -55,9 +55,17 @@ export default { ...@@ -55,9 +55,17 @@ export default {
}, },
main_grid: { main_grid: {
columns: { columns: {
relationship: "与本人关系",
hrfamilyname: "姓名", hrfamilyname: "姓名",
updateman: "更新人", sex: "性别",
updatedate: "更新时间", certtype: "证件类型",
certnum: "证件号码",
birthday: "出生日期",
age: "年龄",
workorganization: "工作单位",
duty: "职务",
political: "政治面貌",
emergencyflag: "是否紧急联系人",
}, },
uiactions: { uiactions: {
}, },
......
app_PIM/src/widgets/hrfamily/main-grid/main-grid-base.tsx
浏览文件 @ 2444d080
...@@ -92,6 +92,14 @@ export class MainGridBase extends GridControlBase { ...@@ -92,6 +92,14 @@ export class MainGridBase extends GridControlBase {
* @memberof MainGridBase * @memberof MainGridBase
*/ */
public allColumns: any[] = [ public allColumns: any[] = [
{
name: 'relationship',
label: '与本人关系',
langtag: 'entities.hrfamily.main_grid.columns.relationship',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{ {
name: 'hrfamilyname', name: 'hrfamilyname',
label: '姓名', label: '姓名',
...@@ -101,17 +109,73 @@ export class MainGridBase extends GridControlBase { ...@@ -101,17 +109,73 @@ export class MainGridBase extends GridControlBase {
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updateman', name: 'sex',
label: '更新人', label: '性别',
langtag: 'entities.hrfamily.main_grid.columns.updateman', langtag: 'entities.hrfamily.main_grid.columns.sex',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'certtype',
label: '证件类型',
langtag: 'entities.hrfamily.main_grid.columns.certtype',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'certnum',
label: '证件号码',
langtag: 'entities.hrfamily.main_grid.columns.certnum',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'birthday',
label: '出生日期',
langtag: 'entities.hrfamily.main_grid.columns.birthday',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'age',
label: '年龄',
langtag: 'entities.hrfamily.main_grid.columns.age',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updatedate', name: 'workorganization',
label: '更新时间', label: '工作单位',
langtag: 'entities.hrfamily.main_grid.columns.updatedate', langtag: 'entities.hrfamily.main_grid.columns.workorganization',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'duty',
label: '职务',
langtag: 'entities.hrfamily.main_grid.columns.duty',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'political',
label: '政治面貌',
langtag: 'entities.hrfamily.main_grid.columns.political',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'emergencyflag',
label: '是否紧急联系人',
langtag: 'entities.hrfamily.main_grid.columns.emergencyflag',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
...@@ -150,9 +214,17 @@ export class MainGridBase extends GridControlBase { ...@@ -150,9 +214,17 @@ export class MainGridBase extends GridControlBase {
* @memberof MainBase * @memberof MainBase
*/ */
public hasRowEdit: any = { public hasRowEdit: any = {
'relationship':false,
'hrfamilyname':false, 'hrfamilyname':false,
'updateman':false, 'sex':false,
'updatedate':false, 'certtype':false,
'certnum':false,
'birthday':false,
'age':false,
'workorganization':false,
'duty':false,
'political':false,
'emergencyflag':false,
}; };
/** /**
...@@ -179,9 +251,33 @@ export class MainGridBase extends GridControlBase { ...@@ -179,9 +251,33 @@ export class MainGridBase extends GridControlBase {
public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> { public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
return super.formatExcelData(filterVal, jsonData, [ return super.formatExcelData(filterVal, jsonData, [
{ {
name: 'updateman', name: 'sex',
srfkey: 'SysOperator', srfkey: 'CL_HR_0010',
codelistType : 'DYNAMIC', codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
{
name: 'certtype',
srfkey: 'CL_HR_0009',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
{
name: 'political',
srfkey: 'CL_HR_0013',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
{
name: 'emergencyflag',
srfkey: 'YesNo',
codelistType : 'STATIC',
renderMode: 'other', renderMode: 'other',
textSeparator: '、', textSeparator: '、',
valueSeparator: ',', valueSeparator: ',',
......
app_PIM/src/widgets/hrfamily/main-grid/main-grid-model.ts
浏览文件 @ 2444d080
...@@ -27,25 +27,35 @@ export default class MainModel { ...@@ -27,25 +27,35 @@ export default class MainModel {
}else{ }else{
return [ return [
{ {
name: 'hremployeeid', name: 'birthday',
prop: 'hremployeeid', prop: 'birthday',
dataType: 'PICKUP', dataType: 'DATE',
}, },
{ {
name: 'updateman', name: 'workorganization',
prop: 'updateman', prop: 'workorganization',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{
name: 'sex',
prop: 'sex',
dataType: 'SSCODELIST',
},
{
name: 'political',
prop: 'political',
dataType: 'SSCODELIST',
},
{
name: 'emergencyflag',
prop: 'emergencyflag',
dataType: 'YESNO',
},
{ {
name: 'hrfamilyname', name: 'hrfamilyname',
prop: 'hrfamilyname', prop: 'hrfamilyname',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{
name: 'updatedate',
prop: 'updatedate',
dataType: 'DATETIME',
},
{ {
name: 'srfmajortext', name: 'srfmajortext',
prop: 'hrfamilyname', prop: 'hrfamilyname',
...@@ -62,6 +72,36 @@ export default class MainModel { ...@@ -62,6 +72,36 @@ export default class MainModel {
dataType: 'GUID', dataType: 'GUID',
isEditable:true isEditable:true
}, },
{
name: 'relationship',
prop: 'relationship',
dataType: 'SSCODELIST',
},
{
name: 'hremployeeid',
prop: 'hremployeeid',
dataType: 'PICKUP',
},
{
name: 'duty',
prop: 'duty',
dataType: 'TEXT',
},
{
name: 'certtype',
prop: 'certtype',
dataType: 'SSCODELIST',
},
{
name: 'age',
prop: 'age',
dataType: 'TEXT',
},
{
name: 'certnum',
prop: 'certnum',
dataType: 'TEXT',
},
{ {
name: 'hrfamily', name: 'hrfamily',
prop: 'hrfamilyid', prop: 'hrfamilyid',
......
app_PIM/src/widgets/hrfamily/main-grid/main-grid.html
浏览文件 @ 2444d080
...@@ -23,6 +23,18 @@ ...@@ -23,6 +23,18 @@
<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('relationship')">
<el-table-column show-overflow-tooltip :prop="'relationship'" :label="$t('entities.hrfamily.main_grid.columns.relationship')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrfamily.main_grid.columns.relationship')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.relationship}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('hrfamilyname')"> <template v-if="getColumnState('hrfamilyname')">
<el-table-column show-overflow-tooltip :prop="'hrfamilyname'" :label="$t('entities.hrfamily.main_grid.columns.hrfamilyname')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'hrfamilyname'" :label="$t('entities.hrfamily.main_grid.columns.hrfamilyname')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
...@@ -35,29 +47,119 @@ ...@@ -35,29 +47,119 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updateman')"> <template v-if="getColumnState('sex')">
<el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hrfamily.main_grid.columns.updateman')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'sex'" :label="$t('entities.hrfamily.main_grid.columns.sex')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrfamily.main_grid.columns.sex')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.sex" tag='CL_HR_0010' codelistType='STATIC' ></codelist>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('certtype')">
<el-table-column show-overflow-tooltip :prop="'certtype'" :label="$t('entities.hrfamily.main_grid.columns.certtype')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrfamily.main_grid.columns.certtype')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.certtype" tag='CL_HR_0009' codelistType='STATIC' ></codelist>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('certnum')">
<el-table-column show-overflow-tooltip :prop="'certnum'" :label="$t('entities.hrfamily.main_grid.columns.certnum')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrfamily.main_grid.columns.certnum')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.certnum}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('birthday')">
<el-table-column show-overflow-tooltip :prop="'birthday'" :label="$t('entities.hrfamily.main_grid.columns.birthday')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrfamily.main_grid.columns.birthday')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<app-format-data format="YYYY-MM-DD" :data="row.birthday"></app-format-data>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('age')">
<el-table-column show-overflow-tooltip :prop="'age'" :label="$t('entities.hrfamily.main_grid.columns.age')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.hrfamily.main_grid.columns.updateman')}} {{$t('entities.hrfamily.main_grid.columns.age')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.age}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('workorganization')">
<el-table-column show-overflow-tooltip :prop="'workorganization'" :label="$t('entities.hrfamily.main_grid.columns.workorganization')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrfamily.main_grid.columns.workorganization')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.workorganization}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('duty')">
<el-table-column show-overflow-tooltip :prop="'duty'" :label="$t('entities.hrfamily.main_grid.columns.duty')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrfamily.main_grid.columns.duty')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.duty}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('political')">
<el-table-column show-overflow-tooltip :prop="'political'" :label="$t('entities.hrfamily.main_grid.columns.political')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrfamily.main_grid.columns.political')}}
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<template > <template >
<codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist> <codelist :value="row.political" tag='CL_HR_0013' codelistType='STATIC' ></codelist>
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updatedate')"> <template v-if="getColumnState('emergencyflag')">
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hrfamily.main_grid.columns.updatedate')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'emergencyflag'" :label="$t('entities.hrfamily.main_grid.columns.emergencyflag')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.hrfamily.main_grid.columns.updatedate')}} {{$t('entities.hrfamily.main_grid.columns.emergencyflag')}}
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<app-format-data format="YYYY-MM-DD HH:mm:ss" :data="row.updatedate"></app-format-data> <template >
<codelist :value="row.emergencyflag" tag='YesNo' codelistType='STATIC' ></codelist>
</template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或