Skip to content

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

jackwang 部署微服务应用

上级 3a4a5f11
隐藏空白字符变更
内嵌 并排
正在显示 包含 133 行增加 和 36 行删除
app_PIM/src/locale/lanres/entities/hremployee/hremployee_en_US.ts
浏览文件 @ 6f38b5f1
......@@ -208,9 +208,13 @@ export default {
columns: {
employeecode: "员工编号",
employeename: "员工姓名",
organizationname: "单位",
certnum: "证件号码",
birthday: "出生日期",
age: "年龄",
mobile: "移动电话",
email: "电子邮箱",
empstate: "员工状态",
},
uiactions: {
},
......
app_PIM/src/locale/lanres/entities/hremployee/hremployee_zh_CN.ts
浏览文件 @ 6f38b5f1
......@@ -207,9 +207,13 @@ export default {
columns: {
employeecode: "员工编号",
employeename: "员工姓名",
organizationname: "单位",
certnum: "证件号码",
birthday: "出生日期",
age: "年龄",
mobile: "移动电话",
email: "电子邮箱",
empstate: "员工状态",
},
uiactions: {
},
......
app_PIM/src/widgets/hremployee/if-001-form/if-001-form.html
浏览文件 @ 6f38b5f1
......@@ -33,26 +33,6 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.empstate.visible" :style="{}" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='empstate' :itemRules="this.rules.empstate" class='' :caption="$t('entities.hremployee.if_001_form.details.empstate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.empstate.error" :isEmptyCaption="false" labelPos="LEFT">
<dropdown-list
v-model="data.empstate"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.empstate.disabled"
valueType="string"
tag='CL_HR_0016'
codelistType='DYNAMIC'
placeholder='请选择...'
/>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.certtype.visible" :style="{}" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='certtype' :itemRules="this.rules.certtype" class='' :caption="$t('entities.hremployee.if_001_form.details.certtype')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.certtype.error" :isEmptyCaption="false" labelPos="LEFT">
......
app_PIM/src/widgets/hremployee/main-grid/main-grid-base.tsx
浏览文件 @ 6f38b5f1
......@@ -108,6 +108,14 @@ export class MainGridBase extends GridControlBase {
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'organizationname',
label: '单位',
langtag: 'entities.hremployee.main_grid.columns.organizationname',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'certnum',
label: '证件号码',
......@@ -132,6 +140,30 @@ export class MainGridBase extends GridControlBase {
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'mobile',
label: '移动电话',
langtag: 'entities.hremployee.main_grid.columns.mobile',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'email',
label: '电子邮箱',
langtag: 'entities.hremployee.main_grid.columns.email',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'empstate',
label: '员工状态',
langtag: 'entities.hremployee.main_grid.columns.empstate',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
]
/**
......@@ -168,9 +200,13 @@ export class MainGridBase extends GridControlBase {
public hasRowEdit: any = {
'employeecode':false,
'employeename':false,
'organizationname':false,
'certnum':false,
'birthday':false,
'age':false,
'mobile':false,
'email':false,
'empstate':false,
};
/**
......@@ -196,6 +232,14 @@ export class MainGridBase extends GridControlBase {
*/
public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
return super.formatExcelData(filterVal, jsonData, [
{
name: 'empstate',
srfkey: 'CL_HR_0016',
codelistType : 'DYNAMIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]);
}
......
app_PIM/src/widgets/hremployee/main-grid/main-grid-model.ts
浏览文件 @ 6f38b5f1
......@@ -27,9 +27,9 @@ export default class MainModel {
}else{
return [
{
name: 'organizationid',
prop: 'organizationid',
dataType: 'PICKUP',
name: 'organizationname',
prop: 'organizationname',
dataType: 'PICKUPTEXT',
},
{
name: 'birthday',
......@@ -46,16 +46,6 @@ export default class MainModel {
prop: 'employeename',
dataType: 'TEXT',
},
{
name: 'age',
prop: 'age',
dataType: 'TEXT',
},
{
name: 'certnum',
prop: 'certnum',
dataType: 'TEXT',
},
{
name: 'employeecode',
prop: 'employeecode',
......@@ -67,15 +57,40 @@ export default class MainModel {
dataType: 'TEXT',
},
{
name: 'srfdataaccaction',
name: 'srfkey',
prop: 'employeeid',
dataType: 'GUID',
isEditable:true
},
{
name: 'srfkey',
name: 'srfdataaccaction',
prop: 'employeeid',
dataType: 'GUID',
isEditable:true
},
{
name: 'organizationid',
prop: 'organizationid',
dataType: 'PICKUP',
},
{
name: 'email',
prop: 'email',
dataType: 'TEXT',
},
{
name: 'age',
prop: 'age',
dataType: 'TEXT',
},
{
name: 'certnum',
prop: 'certnum',
dataType: 'TEXT',
},
{
name: 'mobile',
prop: 'mobile',
dataType: 'TEXT',
},
{
name: 'hremployee',
......
app_PIM/src/widgets/hremployee/main-grid/main-grid.html
浏览文件 @ 6f38b5f1
......@@ -47,6 +47,18 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('organizationname')">
<el-table-column show-overflow-tooltip :prop="'organizationname'" :label="$t('entities.hremployee.main_grid.columns.organizationname')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hremployee.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('certnum')">
<el-table-column show-overflow-tooltip :prop="'certnum'" :label="$t('entities.hremployee.main_grid.columns.certnum')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
......@@ -83,6 +95,44 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('mobile')">
<el-table-column show-overflow-tooltip :prop="'mobile'" :label="$t('entities.hremployee.main_grid.columns.mobile')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hremployee.main_grid.columns.mobile')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.mobile}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('email')">
<el-table-column show-overflow-tooltip :prop="'email'" :label="$t('entities.hremployee.main_grid.columns.email')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hremployee.main_grid.columns.email')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.email}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('empstate')">
<el-table-column show-overflow-tooltip :prop="'empstate'" :label="$t('entities.hremployee.main_grid.columns.empstate')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hremployee.main_grid.columns.empstate')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.empstate" tag='CL_HR_0016' codelistType='DYNAMIC' ></codelist>
</template>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState">
<el-table-column></el-table-column>
</template>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或