Skip to content

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

jackwang 部署微服务应用

上级 dbc8cdfb
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 1414 行增加 和 422 行删除
app_PIM/src/interface/entity/hrcertificate.ts
浏览文件 @ a121135c
...@@ -15,7 +15,7 @@ export interface HRCertificate { ...@@ -15,7 +15,7 @@ export interface HRCertificate {
hrcertificateid?: any; hrcertificateid?: any;
/** /**
* 证书信息名称 * 证书名称
* *
* @returns {*} * @returns {*}
* @memberof HRCertificate * @memberof HRCertificate
...@@ -69,4 +69,84 @@ export interface HRCertificate { ...@@ -69,4 +69,84 @@ export interface HRCertificate {
* @memberof HRCertificate * @memberof HRCertificate
*/ */
hremployeename?: any; hremployeename?: any;
/**
* 附件
*
* @returns {*}
* @memberof HRCertificate
*/
attachment?: any;
/**
* 证书编号
*
* @returns {*}
* @memberof HRCertificate
*/
certificatecode?: any;
/**
* 签发机构
*
* @returns {*}
* @memberof HRCertificate
*/
authorganization?: any;
/**
* 签发日期
*
* @returns {*}
* @memberof HRCertificate
*/
authdate?: any;
/**
* 失效日期
*
* @returns {*}
* @memberof HRCertificate
*/
expiredate?: any;
/**
* 注册编号
*
* @returns {*}
* @memberof HRCertificate
*/
registercode?: any;
/**
* 初始注册时间
*
* @returns {*}
* @memberof HRCertificate
*/
registertime?: any;
/**
* 备注
*
* @returns {*}
* @memberof HRCertificate
*/
memo?: any;
/**
* 注册单位ID
*
* @returns {*}
* @memberof HRCertificate
*/
registerorganizationid?: any;
/**
* 注册单位
*
* @returns {*}
* @memberof HRCertificate
*/
registerorganizationname?: any;
} }
\ No newline at end of file
app_PIM/src/interface/entity/hrcontract.ts
浏览文件 @ a121135c
...@@ -117,4 +117,44 @@ export interface HRContract { ...@@ -117,4 +117,44 @@ export interface HRContract {
* @memberof HRContract * @memberof HRContract
*/ */
contractstate?: any; contractstate?: any;
/**
* 合同管理单位ID
*
* @returns {*}
* @memberof HRContract
*/
mgrorganizationid?: any;
/**
* 合同管理单位
*
* @returns {*}
* @memberof HRContract
*/
mgrorganizationname?: any;
/**
* 合同签约单位ID
*
* @returns {*}
* @memberof HRContract
*/
signorganizationid?: any;
/**
* 合同签约单位
*
* @returns {*}
* @memberof HRContract
*/
signorganizationname?: any;
/**
* 试用期
*
* @returns {*}
* @memberof HRContract
*/
probationtime?: any;
} }
\ No newline at end of file
app_PIM/src/interface/entity/hrpaper.ts
浏览文件 @ a121135c
...@@ -39,7 +39,7 @@ export interface HRPaper { ...@@ -39,7 +39,7 @@ export interface HRPaper {
updateman?: any; updateman?: any;
/** /**
* 论文信息名称 * 论文名称
* *
* @returns {*} * @returns {*}
* @memberof HRPaper * @memberof HRPaper
...@@ -69,4 +69,52 @@ export interface HRPaper { ...@@ -69,4 +69,52 @@ export interface HRPaper {
* @memberof HRPaper * @memberof HRPaper
*/ */
hremployeename?: any; hremployeename?: any;
/**
* 发表时间
*
* @returns {*}
* @memberof HRPaper
*/
activetime?: any;
/**
* 附件
*
* @returns {*}
* @memberof HRPaper
*/
attachment?: any;
/**
* 出版社
*
* @returns {*}
* @memberof HRPaper
*/
publisher?: any;
/**
* 刊物名称
*
* @returns {*}
* @memberof HRPaper
*/
publication?: any;
/**
* 刊物期数
*
* @returns {*}
* @memberof HRPaper
*/
publicationnum?: any;
/**
* 个人在论文著作中排名
*
* @returns {*}
* @memberof HRPaper
*/
position?: any;
} }
\ No newline at end of file
app_PIM/src/interface/entity/hrpatent.ts
浏览文件 @ a121135c
...@@ -23,7 +23,7 @@ export interface HRPatent { ...@@ -23,7 +23,7 @@ export interface HRPatent {
createman?: any; createman?: any;
/** /**
* 专利信息名称 * 专利名称
* *
* @returns {*} * @returns {*}
* @memberof HRPatent * @memberof HRPatent
...@@ -69,4 +69,36 @@ export interface HRPatent { ...@@ -69,4 +69,36 @@ export interface HRPatent {
* @memberof HRPatent * @memberof HRPatent
*/ */
hremployeename?: any; hremployeename?: any;
/**
* 获取时间
*
* @returns {*}
* @memberof HRPatent
*/
activetime?: any;
/**
* 附件
*
* @returns {*}
* @memberof HRPatent
*/
attachment?: any;
/**
* 专利号
*
* @returns {*}
* @memberof HRPatent
*/
patentcode?: any;
/**
* 专利批准国别
*
* @returns {*}
* @memberof HRPatent
*/
patentcountry?: any;
} }
\ No newline at end of file
app_PIM/src/interface/entity/hrresearch.ts
浏览文件 @ a121135c
...@@ -69,4 +69,20 @@ export interface HRResearch { ...@@ -69,4 +69,20 @@ export interface HRResearch {
* @memberof HRResearch * @memberof HRResearch
*/ */
hremployeename?: any; hremployeename?: any;
/**
* 获取时间
*
* @returns {*}
* @memberof HRResearch
*/
activetime?: any;
/**
* 附件
*
* @returns {*}
* @memberof HRResearch
*/
attachment?: any;
} }
\ No newline at end of file
app_PIM/src/interface/entity/hrreward.ts
浏览文件 @ a121135c
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
export interface HRReward { export interface HRReward {
/** /**
* 奖励惩罚名称 * 奖惩名称
* *
* @returns {*} * @returns {*}
* @memberof HRReward * @memberof HRReward
...@@ -69,4 +69,60 @@ export interface HRReward { ...@@ -69,4 +69,60 @@ export interface HRReward {
* @memberof HRReward * @memberof HRReward
*/ */
hremployeename?: any; hremployeename?: any;
/**
* 奖惩分类
*
* @returns {*}
* @memberof HRReward
*/
rewardtype?: any;
/**
* 奖惩级别
*
* @returns {*}
* @memberof HRReward
*/
rewardlevel?: any;
/**
* 奖惩金额
*
* @returns {*}
* @memberof HRReward
*/
rewardmoney?: any;
/**
* 奖惩时间
*
* @returns {*}
* @memberof HRReward
*/
rewardtime?: any;
/**
* 授予单位
*
* @returns {*}
* @memberof HRReward
*/
authorganization?: any;
/**
* 附件
*
* @returns {*}
* @memberof HRReward
*/
attachment?: any;
/**
* 奖惩事件
*
* @returns {*}
* @memberof HRReward
*/
rewardevent?: any;
} }
\ No newline at end of file
app_PIM/src/interface/entity/hrtechnical-title.ts
浏览文件 @ a121135c
...@@ -47,7 +47,7 @@ export interface HRTechnicalTitle { ...@@ -47,7 +47,7 @@ export interface HRTechnicalTitle {
createdate?: any; createdate?: any;
/** /**
* 职称信息名称 * 职称名称
* *
* @returns {*} * @returns {*}
* @memberof HRTechnicalTitle * @memberof HRTechnicalTitle
...@@ -69,4 +69,76 @@ export interface HRTechnicalTitle { ...@@ -69,4 +69,76 @@ export interface HRTechnicalTitle {
* @memberof HRTechnicalTitle * @memberof HRTechnicalTitle
*/ */
hremployeename?: any; hremployeename?: any;
/**
* 获取时间
*
* @returns {*}
* @memberof HRTechnicalTitle
*/
titletime?: any;
/**
* 职称等级
*
* @returns {*}
* @memberof HRTechnicalTitle
*/
titlelevel?: any;
/**
* 专业类别
*
* @returns {*}
* @memberof HRTechnicalTitle
*/
majortype?: any;
/**
* 专业名称
*
* @returns {*}
* @memberof HRTechnicalTitle
*/
major?: any;
/**
* 签发机构
*
* @returns {*}
* @memberof HRTechnicalTitle
*/
authorganization?: any;
/**
* 评审机构
*
* @returns {*}
* @memberof HRTechnicalTitle
*/
validorganization?: any;
/**
* 最高职称
*
* @returns {*}
* @memberof HRTechnicalTitle
*/
hightitle?: any;
/**
* 附件
*
* @returns {*}
* @memberof HRTechnicalTitle
*/
attachment?: any;
/**
* 证书编号
*
* @returns {*}
* @memberof HRTechnicalTitle
*/
certificatecode?: any;
} }
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrcertificate/hrcertificate_en_US.ts
浏览文件 @ a121135c
...@@ -2,13 +2,23 @@ ...@@ -2,13 +2,23 @@
export default { export default {
fields: { fields: {
hrcertificateid: "证书信息标识", hrcertificateid: "证书信息标识",
hrcertificatename: "证书信息名称", hrcertificatename: "证书名称",
createdate: "建立时间", createdate: "建立时间",
updateman: "更新人", updateman: "更新人",
createman: "建立人", createman: "建立人",
updatedate: "更新时间", updatedate: "更新时间",
hremployeeid: "员工标识", hremployeeid: "员工标识",
hremployeename: "员工姓名", hremployeename: "员工姓名",
attachment: "附件",
certificatecode: "证书编号",
authorganization: "签发机构",
authdate: "签发日期",
expiredate: "失效日期",
registercode: "注册编号",
registertime: "初始注册时间",
memo: "备注",
registerorganizationid: "注册单位ID",
registerorganizationname: "注册单位",
}, },
views: { views: {
gridview: { gridview: {
...@@ -29,12 +39,12 @@ export default { ...@@ -29,12 +39,12 @@ export default {
srfupdatedate: "更新时间", srfupdatedate: "更新时间",
srforikey: "", srforikey: "",
srfkey: "证书信息标识", srfkey: "证书信息标识",
srfmajortext: "证书信息名称", srfmajortext: "证书名称",
srftempmode: "", srftempmode: "",
srfuf: "", srfuf: "",
srfdeid: "", srfdeid: "",
srfsourcekey: "", srfsourcekey: "",
hrcertificatename: "证书信息名称", hrcertificatename: "证书名称",
createman: "建立人", createman: "建立人",
createdate: "建立时间", createdate: "建立时间",
updateman: "更新人", updateman: "更新人",
...@@ -46,9 +56,14 @@ export default { ...@@ -46,9 +56,14 @@ export default {
}, },
main_grid: { main_grid: {
columns: { columns: {
hrcertificatename: "证书信息名称", hrcertificatename: "证书名称",
updateman: "更新人", certificatecode: "证书编号",
updatedate: "更新时间", authdate: "签发日期",
expiredate: "失效日期",
authorganization: "签发机构",
registercode: "注册编号",
registerorganizationname: "注册单位",
registertime: "初始注册时间",
}, },
uiactions: { uiactions: {
}, },
......
app_PIM/src/locale/lanres/entities/hrcertificate/hrcertificate_zh_CN.ts
浏览文件 @ a121135c
export default { export default {
fields: { fields: {
hrcertificateid: "证书信息标识", hrcertificateid: "证书信息标识",
hrcertificatename: "证书信息名称", hrcertificatename: "证书名称",
createdate: "建立时间", createdate: "建立时间",
updateman: "更新人", updateman: "更新人",
createman: "建立人", createman: "建立人",
updatedate: "更新时间", updatedate: "更新时间",
hremployeeid: "员工标识", hremployeeid: "员工标识",
hremployeename: "员工姓名", hremployeename: "员工姓名",
attachment: "附件",
certificatecode: "证书编号",
authorganization: "签发机构",
authdate: "签发日期",
expiredate: "失效日期",
registercode: "注册编号",
registertime: "初始注册时间",
memo: "备注",
registerorganizationid: "注册单位ID",
registerorganizationname: "注册单位",
}, },
views: { views: {
gridview: { gridview: {
...@@ -28,12 +38,12 @@ export default { ...@@ -28,12 +38,12 @@ export default {
srfupdatedate: "更新时间", srfupdatedate: "更新时间",
srforikey: "", srforikey: "",
srfkey: "证书信息标识", srfkey: "证书信息标识",
srfmajortext: "证书信息名称", srfmajortext: "证书名称",
srftempmode: "", srftempmode: "",
srfuf: "", srfuf: "",
srfdeid: "", srfdeid: "",
srfsourcekey: "", srfsourcekey: "",
hrcertificatename: "证书信息名称", hrcertificatename: "证书名称",
createman: "建立人", createman: "建立人",
createdate: "建立时间", createdate: "建立时间",
updateman: "更新人", updateman: "更新人",
...@@ -45,9 +55,14 @@ export default { ...@@ -45,9 +55,14 @@ export default {
}, },
main_grid: { main_grid: {
columns: { columns: {
hrcertificatename: "证书信息名称", hrcertificatename: "证书名称",
updateman: "更新人", certificatecode: "证书编号",
updatedate: "更新时间", authdate: "签发日期",
expiredate: "失效日期",
authorganization: "签发机构",
registercode: "注册编号",
registerorganizationname: "注册单位",
registertime: "初始注册时间",
}, },
uiactions: { uiactions: {
}, },
......
app_PIM/src/locale/lanres/entities/hrcontract/hrcontract_en_US.ts
浏览文件 @ a121135c
...@@ -15,6 +15,11 @@ export default { ...@@ -15,6 +15,11 @@ export default {
begintime: "开始日期", begintime: "开始日期",
endtime: "结束日期", endtime: "结束日期",
contractstate: "合同状态", contractstate: "合同状态",
mgrorganizationid: "合同管理单位ID",
mgrorganizationname: "合同管理单位",
signorganizationid: "合同签约单位ID",
signorganizationname: "合同签约单位",
probationtime: "试用期",
}, },
views: { views: {
gridview: { gridview: {
...@@ -52,9 +57,14 @@ export default { ...@@ -52,9 +57,14 @@ export default {
}, },
main_grid: { main_grid: {
columns: { columns: {
hrcontractname: "合同信息名称", contractcode: "合同编号",
updateman: "更新人", contractmode: "合同类别",
updatedate: "更新时间", contracttype: "合同类型",
begintime: "开始日期",
endtime: "结束日期",
mgrorganizationname: "合同管理单位",
signorganizationname: "合同签约单位",
contractstate: "合同状态",
}, },
uiactions: { uiactions: {
}, },
......
app_PIM/src/locale/lanres/entities/hrcontract/hrcontract_zh_CN.ts
浏览文件 @ a121135c
...@@ -14,6 +14,11 @@ export default { ...@@ -14,6 +14,11 @@ export default {
begintime: "开始日期", begintime: "开始日期",
endtime: "结束日期", endtime: "结束日期",
contractstate: "合同状态", contractstate: "合同状态",
mgrorganizationid: "合同管理单位ID",
mgrorganizationname: "合同管理单位",
signorganizationid: "合同签约单位ID",
signorganizationname: "合同签约单位",
probationtime: "试用期",
}, },
views: { views: {
gridview: { gridview: {
...@@ -51,9 +56,14 @@ export default { ...@@ -51,9 +56,14 @@ export default {
}, },
main_grid: { main_grid: {
columns: { columns: {
hrcontractname: "合同信息名称", contractcode: "合同编号",
updateman: "更新人", contractmode: "合同类别",
updatedate: "更新时间", contracttype: "合同类型",
begintime: "开始日期",
endtime: "结束日期",
mgrorganizationname: "合同管理单位",
signorganizationname: "合同签约单位",
contractstate: "合同状态",
}, },
uiactions: { uiactions: {
}, },
......
app_PIM/src/locale/lanres/entities/hreducation/hreducation_en_US.ts
浏览文件 @ a121135c
...@@ -40,6 +40,7 @@ export default { ...@@ -40,6 +40,7 @@ export default {
}, },
main_form: { main_form: {
details: { details: {
rawitem1: "",
group1: "教育信息", group1: "教育信息",
formpage1: "基本信息", formpage1: "基本信息",
srfupdatedate: "更新时间", srfupdatedate: "更新时间",
...@@ -63,8 +64,8 @@ export default { ...@@ -63,8 +64,8 @@ export default {
highdegreeflag: "是否最高学历", highdegreeflag: "是否最高学历",
attachment2: "学位证", attachment2: "学位证",
attachment1: "毕业证", attachment1: "毕业证",
attachment: "其他附件",
attachment3: "学历验证", attachment3: "学历验证",
attachment: "其他附件",
hremployeeid: "员工标识", hremployeeid: "员工标识",
hreducationid: "教育信息标识", hreducationid: "教育信息标识",
}, },
......
app_PIM/src/locale/lanres/entities/hreducation/hreducation_zh_CN.ts
浏览文件 @ a121135c
...@@ -39,6 +39,7 @@ export default { ...@@ -39,6 +39,7 @@ export default {
}, },
main_form: { main_form: {
details: { details: {
rawitem1: "",
group1: "教育信息", group1: "教育信息",
formpage1: "基本信息", formpage1: "基本信息",
srfupdatedate: "更新时间", srfupdatedate: "更新时间",
...@@ -62,8 +63,8 @@ export default { ...@@ -62,8 +63,8 @@ export default {
highdegreeflag: "是否最高学历", highdegreeflag: "是否最高学历",
attachment2: "学位证", attachment2: "学位证",
attachment1: "毕业证", attachment1: "毕业证",
attachment: "其他附件",
attachment3: "学历验证", attachment3: "学历验证",
attachment: "其他附件",
hremployeeid: "员工标识", hremployeeid: "员工标识",
hreducationid: "教育信息标识", hreducationid: "教育信息标识",
}, },
......
app_PIM/src/locale/lanres/entities/hrlanguage-ability/hrlanguage-ability_en_US.ts
浏览文件 @ a121135c
...@@ -50,9 +50,10 @@ export default { ...@@ -50,9 +50,10 @@ export default {
}, },
main_grid: { main_grid: {
columns: { columns: {
hrlanguageabilityname: "语言能力名称", languagetype: "语种",
updateman: "更新人", languagelevel: "外语等级",
updatedate: "更新时间", languagetime: "获取时间",
attachment: "附件",
}, },
uiactions: { uiactions: {
}, },
......
app_PIM/src/locale/lanres/entities/hrlanguage-ability/hrlanguage-ability_zh_CN.ts
浏览文件 @ a121135c
...@@ -49,9 +49,10 @@ export default { ...@@ -49,9 +49,10 @@ export default {
}, },
main_grid: { main_grid: {
columns: { columns: {
hrlanguageabilityname: "语言能力名称", languagetype: "语种",
updateman: "更新人", languagelevel: "外语等级",
updatedate: "更新时间", languagetime: "获取时间",
attachment: "附件",
}, },
uiactions: { uiactions: {
}, },
......
app_PIM/src/locale/lanres/entities/hrpaper/hrpaper_en_US.ts
浏览文件 @ a121135c
...@@ -5,9 +5,15 @@ export default { ...@@ -5,9 +5,15 @@ export default {
createman: "建立人", createman: "建立人",
updatedate: "更新时间", updatedate: "更新时间",
updateman: "更新人", updateman: "更新人",
hrpapername: "论文信息名称", hrpapername: "论文名称",
createdate: "建立时间", createdate: "建立时间",
hremployeeid: "员工标识", hremployeeid: "员工标识",
hremployeename: "员工姓名", hremployeename: "员工姓名",
activetime: "发表时间",
attachment: "附件",
publisher: "出版社",
publication: "刊物名称",
publicationnum: "刊物期数",
position: "个人在论文著作中排名",
}, },
}; };
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrpaper/hrpaper_zh_CN.ts
浏览文件 @ a121135c
...@@ -4,9 +4,15 @@ export default { ...@@ -4,9 +4,15 @@ export default {
createman: "建立人", createman: "建立人",
updatedate: "更新时间", updatedate: "更新时间",
updateman: "更新人", updateman: "更新人",
hrpapername: "论文信息名称", hrpapername: "论文名称",
createdate: "建立时间", createdate: "建立时间",
hremployeeid: "员工标识", hremployeeid: "员工标识",
hremployeename: "员工姓名", hremployeename: "员工姓名",
activetime: "发表时间",
attachment: "附件",
publisher: "出版社",
publication: "刊物名称",
publicationnum: "刊物期数",
position: "个人在论文著作中排名",
}, },
}; };
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrpatent/hrpatent_en_US.ts
浏览文件 @ a121135c
...@@ -3,11 +3,15 @@ export default { ...@@ -3,11 +3,15 @@ export default {
fields: { fields: {
hrpatentid: "专利信息标识", hrpatentid: "专利信息标识",
createman: "建立人", createman: "建立人",
hrpatentname: "专利信息名称", hrpatentname: "专利名称",
createdate: "建立时间", createdate: "建立时间",
updateman: "更新人", updateman: "更新人",
updatedate: "更新时间", updatedate: "更新时间",
hremployeeid: "员工标识", hremployeeid: "员工标识",
hremployeename: "员工姓名", hremployeename: "员工姓名",
activetime: "获取时间",
attachment: "附件",
patentcode: "专利号",
patentcountry: "专利批准国别",
}, },
}; };
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrpatent/hrpatent_zh_CN.ts
浏览文件 @ a121135c
...@@ -2,11 +2,15 @@ export default { ...@@ -2,11 +2,15 @@ export default {
fields: { fields: {
hrpatentid: "专利信息标识", hrpatentid: "专利信息标识",
createman: "建立人", createman: "建立人",
hrpatentname: "专利信息名称", hrpatentname: "专利名称",
createdate: "建立时间", createdate: "建立时间",
updateman: "更新人", updateman: "更新人",
updatedate: "更新时间", updatedate: "更新时间",
hremployeeid: "员工标识", hremployeeid: "员工标识",
hremployeename: "员工姓名", hremployeename: "员工姓名",
activetime: "获取时间",
attachment: "附件",
patentcode: "专利号",
patentcountry: "专利批准国别",
}, },
}; };
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrresearch/hrresearch_en_US.ts
浏览文件 @ a121135c
...@@ -9,6 +9,8 @@ export default { ...@@ -9,6 +9,8 @@ export default {
updateman: "更新人", updateman: "更新人",
hremployeeid: "员工标识", hremployeeid: "员工标识",
hremployeename: "员工姓名", hremployeename: "员工姓名",
activetime: "获取时间",
attachment: "附件",
}, },
views: { views: {
editview: { editview: {
...@@ -47,8 +49,8 @@ export default { ...@@ -47,8 +49,8 @@ export default {
main_grid: { main_grid: {
columns: { columns: {
hrresearchname: "科研成果名称", hrresearchname: "科研成果名称",
updateman: "更新人", activetime: "获取时间",
updatedate: "更新时间", attachment: "附件",
}, },
uiactions: { uiactions: {
}, },
......
app_PIM/src/locale/lanres/entities/hrresearch/hrresearch_zh_CN.ts
浏览文件 @ a121135c
...@@ -8,6 +8,8 @@ export default { ...@@ -8,6 +8,8 @@ export default {
updateman: "更新人", updateman: "更新人",
hremployeeid: "员工标识", hremployeeid: "员工标识",
hremployeename: "员工姓名", hremployeename: "员工姓名",
activetime: "获取时间",
attachment: "附件",
}, },
views: { views: {
editview: { editview: {
...@@ -46,8 +48,8 @@ export default { ...@@ -46,8 +48,8 @@ export default {
main_grid: { main_grid: {
columns: { columns: {
hrresearchname: "科研成果名称", hrresearchname: "科研成果名称",
updateman: "更新人", activetime: "获取时间",
updatedate: "更新时间", attachment: "附件",
}, },
uiactions: { uiactions: {
}, },
......
app_PIM/src/locale/lanres/entities/hrreward/hrreward_en_US.ts
浏览文件 @ a121135c
export default { export default {
fields: { fields: {
hrrewardname: "奖励惩罚名称", hrrewardname: "奖惩名称",
hrrewardid: "奖励惩罚标识", hrrewardid: "奖励惩罚标识",
createman: "建立人", createman: "建立人",
updatedate: "更新时间", updatedate: "更新时间",
...@@ -9,6 +9,13 @@ export default { ...@@ -9,6 +9,13 @@ export default {
updateman: "更新人", updateman: "更新人",
hremployeeid: "员工标识", hremployeeid: "员工标识",
hremployeename: "员工姓名", hremployeename: "员工姓名",
rewardtype: "奖惩分类",
rewardlevel: "奖惩级别",
rewardmoney: "奖惩金额",
rewardtime: "奖惩时间",
authorganization: "授予单位",
attachment: "附件",
rewardevent: "奖惩事件",
}, },
views: { views: {
gridview: { gridview: {
...@@ -29,12 +36,12 @@ export default { ...@@ -29,12 +36,12 @@ export default {
srfupdatedate: "更新时间", srfupdatedate: "更新时间",
srforikey: "", srforikey: "",
srfkey: "奖励惩罚标识", srfkey: "奖励惩罚标识",
srfmajortext: "奖励惩罚名称", srfmajortext: "奖惩名称",
srftempmode: "", srftempmode: "",
srfuf: "", srfuf: "",
srfdeid: "", srfdeid: "",
srfsourcekey: "", srfsourcekey: "",
hrrewardname: "奖励惩罚名称", hrrewardname: "奖惩名称",
createman: "建立人", createman: "建立人",
createdate: "建立时间", createdate: "建立时间",
updateman: "更新人", updateman: "更新人",
...@@ -46,9 +53,12 @@ export default { ...@@ -46,9 +53,12 @@ export default {
}, },
main_grid: { main_grid: {
columns: { columns: {
hrrewardname: "奖励惩罚名称", rewardtype: "奖惩分类",
updateman: "更新人", hrrewardname: "奖惩名称",
updatedate: "更新时间", rewardlevel: "奖惩级别",
rewardmoney: "奖惩金额",
rewardtime: "奖惩时间",
rewardevent: "奖惩事件",
}, },
uiactions: { uiactions: {
}, },
......
app_PIM/src/locale/lanres/entities/hrreward/hrreward_zh_CN.ts
浏览文件 @ a121135c
export default { export default {
fields: { fields: {
hrrewardname: "奖励惩罚名称", hrrewardname: "奖惩名称",
hrrewardid: "奖励惩罚标识", hrrewardid: "奖励惩罚标识",
createman: "建立人", createman: "建立人",
updatedate: "更新时间", updatedate: "更新时间",
...@@ -8,6 +8,13 @@ export default { ...@@ -8,6 +8,13 @@ export default {
updateman: "更新人", updateman: "更新人",
hremployeeid: "员工标识", hremployeeid: "员工标识",
hremployeename: "员工姓名", hremployeename: "员工姓名",
rewardtype: "奖惩分类",
rewardlevel: "奖惩级别",
rewardmoney: "奖惩金额",
rewardtime: "奖惩时间",
authorganization: "授予单位",
attachment: "附件",
rewardevent: "奖惩事件",
}, },
views: { views: {
gridview: { gridview: {
...@@ -28,12 +35,12 @@ export default { ...@@ -28,12 +35,12 @@ export default {
srfupdatedate: "更新时间", srfupdatedate: "更新时间",
srforikey: "", srforikey: "",
srfkey: "奖励惩罚标识", srfkey: "奖励惩罚标识",
srfmajortext: "奖励惩罚名称", srfmajortext: "奖惩名称",
srftempmode: "", srftempmode: "",
srfuf: "", srfuf: "",
srfdeid: "", srfdeid: "",
srfsourcekey: "", srfsourcekey: "",
hrrewardname: "奖励惩罚名称", hrrewardname: "奖惩名称",
createman: "建立人", createman: "建立人",
createdate: "建立时间", createdate: "建立时间",
updateman: "更新人", updateman: "更新人",
...@@ -45,9 +52,12 @@ export default { ...@@ -45,9 +52,12 @@ export default {
}, },
main_grid: { main_grid: {
columns: { columns: {
hrrewardname: "奖励惩罚名称", rewardtype: "奖惩分类",
updateman: "更新人", hrrewardname: "奖惩名称",
updatedate: "更新时间", rewardlevel: "奖惩级别",
rewardmoney: "奖惩金额",
rewardtime: "奖惩时间",
rewardevent: "奖惩事件",
}, },
uiactions: { uiactions: {
}, },
......
app_PIM/src/locale/lanres/entities/hrtechnical-title/hrtechnical-title_en_US.ts
浏览文件 @ a121135c
...@@ -6,9 +6,18 @@ export default { ...@@ -6,9 +6,18 @@ export default {
updatedate: "更新时间", updatedate: "更新时间",
updateman: "更新人", updateman: "更新人",
createdate: "建立时间", createdate: "建立时间",
hrtechnicaltitlename: "职称信息名称", hrtechnicaltitlename: "职称名称",
hremployeeid: "员工标识", hremployeeid: "员工标识",
hremployeename: "员工姓名", hremployeename: "员工姓名",
titletime: "获取时间",
titlelevel: "职称等级",
majortype: "专业类别",
major: "专业名称",
authorganization: "签发机构",
validorganization: "评审机构",
hightitle: "最高职称",
attachment: "附件",
certificatecode: "证书编号",
}, },
views: { views: {
editview: { editview: {
...@@ -29,12 +38,12 @@ export default { ...@@ -29,12 +38,12 @@ export default {
srfupdatedate: "更新时间", srfupdatedate: "更新时间",
srforikey: "", srforikey: "",
srfkey: "职称信息标识", srfkey: "职称信息标识",
srfmajortext: "职称信息名称", srfmajortext: "职称名称",
srftempmode: "", srftempmode: "",
srfuf: "", srfuf: "",
srfdeid: "", srfdeid: "",
srfsourcekey: "", srfsourcekey: "",
hrtechnicaltitlename: "职称信息名称", hrtechnicaltitlename: "职称名称",
createman: "建立人", createman: "建立人",
createdate: "建立时间", createdate: "建立时间",
updateman: "更新人", updateman: "更新人",
...@@ -46,9 +55,13 @@ export default { ...@@ -46,9 +55,13 @@ export default {
}, },
main_grid: { main_grid: {
columns: { columns: {
hrtechnicaltitlename: "职称信息名称", hrtechnicaltitlename: "职称名称",
updateman: "更新人", titlelevel: "职称等级",
updatedate: "更新时间", majortype: "专业类别",
major: "专业名称",
titletime: "获取时间",
authorganization: "签发机构",
hightitle: "最高职称",
}, },
uiactions: { uiactions: {
}, },
......
app_PIM/src/locale/lanres/entities/hrtechnical-title/hrtechnical-title_zh_CN.ts
浏览文件 @ a121135c
...@@ -5,9 +5,18 @@ export default { ...@@ -5,9 +5,18 @@ export default {
updatedate: "更新时间", updatedate: "更新时间",
updateman: "更新人", updateman: "更新人",
createdate: "建立时间", createdate: "建立时间",
hrtechnicaltitlename: "职称信息名称", hrtechnicaltitlename: "职称名称",
hremployeeid: "员工标识", hremployeeid: "员工标识",
hremployeename: "员工姓名", hremployeename: "员工姓名",
titletime: "获取时间",
titlelevel: "职称等级",
majortype: "专业类别",
major: "专业名称",
authorganization: "签发机构",
validorganization: "评审机构",
hightitle: "最高职称",
attachment: "附件",
certificatecode: "证书编号",
}, },
views: { views: {
editview: { editview: {
...@@ -28,12 +37,12 @@ export default { ...@@ -28,12 +37,12 @@ export default {
srfupdatedate: "更新时间", srfupdatedate: "更新时间",
srforikey: "", srforikey: "",
srfkey: "职称信息标识", srfkey: "职称信息标识",
srfmajortext: "职称信息名称", srfmajortext: "职称名称",
srftempmode: "", srftempmode: "",
srfuf: "", srfuf: "",
srfdeid: "", srfdeid: "",
srfsourcekey: "", srfsourcekey: "",
hrtechnicaltitlename: "职称信息名称", hrtechnicaltitlename: "职称名称",
createman: "建立人", createman: "建立人",
createdate: "建立时间", createdate: "建立时间",
updateman: "更新人", updateman: "更新人",
...@@ -45,9 +54,13 @@ export default { ...@@ -45,9 +54,13 @@ export default {
}, },
main_grid: { main_grid: {
columns: { columns: {
hrtechnicaltitlename: "职称信息名称", hrtechnicaltitlename: "职称名称",
updateman: "更新人", titlelevel: "职称等级",
updatedate: "更新时间", majortype: "专业类别",
major: "专业名称",
titletime: "获取时间",
authorganization: "签发机构",
hightitle: "最高职称",
}, },
uiactions: { uiactions: {
}, },
......
app_PIM/src/locale/lanres/entities/hrwork-record/hrwork-record_en_US.ts
浏览文件 @ a121135c
...@@ -53,9 +53,13 @@ export default { ...@@ -53,9 +53,13 @@ export default {
}, },
main_grid: { main_grid: {
columns: { columns: {
hrworkrecordname: "工作履历名称", begintime: "开始时间",
updateman: "更新人", endtime: "结束时间",
updatedate: "更新时间", workorganization: "工作单位",
workdepartment: "部门",
duty: "职务",
post: "职位",
mainwork: "主要经历",
}, },
uiactions: { uiactions: {
}, },
......
app_PIM/src/locale/lanres/entities/hrwork-record/hrwork-record_zh_CN.ts
浏览文件 @ a121135c
...@@ -52,9 +52,13 @@ export default { ...@@ -52,9 +52,13 @@ export default {
}, },
main_grid: { main_grid: {
columns: { columns: {
hrworkrecordname: "工作履历名称", begintime: "开始时间",
updateman: "更新人", endtime: "结束时间",
updatedate: "更新时间", workorganization: "工作单位",
workdepartment: "部门",
duty: "职务",
post: "职位",
mainwork: "主要经历",
}, },
uiactions: { uiactions: {
}, },
......
app_PIM/src/pages/human-resource/hrcertificate-grid-view/hrcertificate-grid-view.html
浏览文件 @ a121135c
<studio-view-style2 viewName="hrcertificategridview" viewTitle="证书信息表格视图" class='degridview hrcertificate-grid-view'> <studio-view-style2 viewName="hrcertificategridview" viewTitle="证书信息表格视图" class='degridview hrcertificate-grid-view'>
<i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="证书信息名称" search @on-search="onSearch($event)"/> <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="证书名称" search @on-search="onSearch($event)"/>
<template slot="toolbar"> <template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template> <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template>
<template slot="searchForm"> <template slot="searchForm">
......
app_PIM/src/pages/human-resource/hreducation-grid-view/hreducation-grid-view.html
浏览文件 @ a121135c
<studio-view-style2 viewName="hreducationgridview" viewTitle="教育信息表格视图" class='degridview hreducation-grid-view'> <studio-view-style2 viewName="hreducationgridview" viewTitle="教育信息表格视图" class='degridview hreducation-grid-view'>
<template slot='title'>
<span class='caption-info'>{{viewCaption}}</span>
</template>
<i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="教育信息名称" search @on-search="onSearch($event)"/> <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="教育信息名称" search @on-search="onSearch($event)"/>
<template slot="toolbar"> <template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template> <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template>
......
app_PIM/src/pages/human-resource/hrreward-grid-view/hrreward-grid-view.html
浏览文件 @ a121135c
<studio-view-style2 viewName="hrrewardgridview" viewTitle="奖励惩罚表格视图" class='degridview hrreward-grid-view'> <studio-view-style2 viewName="hrrewardgridview" viewTitle="奖励惩罚表格视图" class='degridview hrreward-grid-view'>
<i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="奖励惩罚名称" search @on-search="onSearch($event)"/> <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="奖惩名称" search @on-search="onSearch($event)"/>
<template slot="toolbar"> <template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template> <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template>
<template slot="searchForm"> <template slot="searchForm">
......
app_PIM/src/pages/human-resource/hrtechnical-title-grid-view/hrtechnical-title-grid-view.html
浏览文件 @ a121135c
<studio-view-style2 viewName="hrtechnicaltitlegridview" viewTitle="职称信息表格视图" class='degridview hrtechnical-title-grid-view'> <studio-view-style2 viewName="hrtechnicaltitlegridview" viewTitle="职称信息表格视图" class='degridview hrtechnical-title-grid-view'>
<i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="职称信息名称" search @on-search="onSearch($event)"/> <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="职称名称" search @on-search="onSearch($event)"/>
<template slot="toolbar"> <template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template> <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template>
<template slot="searchForm"> <template slot="searchForm">
......
app_PIM/src/widgets/hrcertificate/main-form/main-form-base.tsx
浏览文件 @ a121135c
...@@ -130,7 +130,7 @@ export class MainEditFormBase extends EditFormControlBase { ...@@ -130,7 +130,7 @@ export class MainEditFormBase extends EditFormControlBase {
srfkey: new FormItemModel({ caption: '证书信息标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), srfkey: new FormItemModel({ caption: '证书信息标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
srfmajortext: new FormItemModel({ caption: '证书信息名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), srfmajortext: new FormItemModel({ caption: '证书名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
...@@ -140,7 +140,7 @@ export class MainEditFormBase extends EditFormControlBase { ...@@ -140,7 +140,7 @@ export class MainEditFormBase extends EditFormControlBase {
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
hrcertificatename: new FormItemModel({ caption: '证书信息名称', detailType: 'FORMITEM', name: 'hrcertificatename', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), hrcertificatename: new FormItemModel({ caption: '证书名称', detailType: 'FORMITEM', name: 'hrcertificatename', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
createman: new FormItemModel({ caption: '建立人', detailType: 'FORMITEM', name: 'createman', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), createman: new FormItemModel({ caption: '建立人', detailType: 'FORMITEM', name: 'createman', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
......
app_PIM/src/widgets/hrcertificate/main-grid/main-grid-base.tsx
浏览文件 @ a121135c
...@@ -94,24 +94,64 @@ export class MainGridBase extends GridControlBase { ...@@ -94,24 +94,64 @@ export class MainGridBase extends GridControlBase {
public allColumns: any[] = [ public allColumns: any[] = [
{ {
name: 'hrcertificatename', name: 'hrcertificatename',
label: '证书信息名称', label: '证书名称',
langtag: 'entities.hrcertificate.main_grid.columns.hrcertificatename', langtag: 'entities.hrcertificate.main_grid.columns.hrcertificatename',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updateman', name: 'certificatecode',
label: '更新人', label: '证书编号',
langtag: 'entities.hrcertificate.main_grid.columns.updateman', langtag: 'entities.hrcertificate.main_grid.columns.certificatecode',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updatedate', name: 'authdate',
label: '更新时间', label: '签发日期',
langtag: 'entities.hrcertificate.main_grid.columns.updatedate', langtag: 'entities.hrcertificate.main_grid.columns.authdate',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'expiredate',
label: '失效日期',
langtag: 'entities.hrcertificate.main_grid.columns.expiredate',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'authorganization',
label: '签发机构',
langtag: 'entities.hrcertificate.main_grid.columns.authorganization',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'registercode',
label: '注册编号',
langtag: 'entities.hrcertificate.main_grid.columns.registercode',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'registerorganizationname',
label: '注册单位',
langtag: 'entities.hrcertificate.main_grid.columns.registerorganizationname',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'registertime',
label: '初始注册时间',
langtag: 'entities.hrcertificate.main_grid.columns.registertime',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
...@@ -151,8 +191,13 @@ export class MainGridBase extends GridControlBase { ...@@ -151,8 +191,13 @@ export class MainGridBase extends GridControlBase {
*/ */
public hasRowEdit: any = { public hasRowEdit: any = {
'hrcertificatename':false, 'hrcertificatename':false,
'updateman':false, 'certificatecode':false,
'updatedate':false, 'authdate':false,
'expiredate':false,
'authorganization':false,
'registercode':false,
'registerorganizationname':false,
'registertime':false,
}; };
/** /**
...@@ -178,14 +223,6 @@ export class MainGridBase extends GridControlBase { ...@@ -178,14 +223,6 @@ 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',
srfkey: 'SysOperator',
codelistType : 'DYNAMIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]); ]);
} }
......
app_PIM/src/widgets/hrcertificate/main-grid/main-grid-model.ts
浏览文件 @ a121135c
...@@ -27,19 +27,24 @@ export default class MainModel { ...@@ -27,19 +27,24 @@ export default class MainModel {
}else{ }else{
return [ return [
{ {
name: 'hremployeeid', name: 'registerorganizationname',
prop: 'hremployeeid', prop: 'registerorganizationname',
dataType: 'PICKUP', dataType: 'PICKUPTEXT',
}, },
{ {
name: 'updateman', name: 'registertime',
prop: 'updateman', prop: 'registertime',
dataType: 'TEXT', dataType: 'DATE',
}, },
{ {
name: 'updatedate', name: 'authdate',
prop: 'updatedate', prop: 'authdate',
dataType: 'DATETIME', dataType: 'DATE',
},
{
name: 'expiredate',
prop: 'expiredate',
dataType: 'DATE',
}, },
{ {
name: 'srfmajortext', name: 'srfmajortext',
...@@ -47,21 +52,46 @@ export default class MainModel { ...@@ -47,21 +52,46 @@ export default class MainModel {
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'srfdataaccaction', name: 'srfkey',
prop: 'hrcertificateid', prop: 'hrcertificateid',
dataType: 'GUID', dataType: 'GUID',
isEditable:true
}, },
{ {
name: 'srfkey', name: 'srfdataaccaction',
prop: 'hrcertificateid', prop: 'hrcertificateid',
dataType: 'GUID', dataType: 'GUID',
isEditable:true
}, },
{ {
name: 'hrcertificatename', name: 'hrcertificatename',
prop: 'hrcertificatename', prop: 'hrcertificatename',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{
name: 'certificatecode',
prop: 'certificatecode',
dataType: 'TEXT',
},
{
name: 'hremployeeid',
prop: 'hremployeeid',
dataType: 'PICKUP',
},
{
name: 'registerorganizationid',
prop: 'registerorganizationid',
dataType: 'PICKUP',
},
{
name: 'registercode',
prop: 'registercode',
dataType: 'TEXT',
},
{
name: 'authorganization',
prop: 'authorganization',
dataType: 'TEXT',
},
{ {
name: 'hrcertificate', name: 'hrcertificate',
prop: 'hrcertificateid', prop: 'hrcertificateid',
......
app_PIM/src/widgets/hrcertificate/main-grid/main-grid.html
浏览文件 @ a121135c
...@@ -35,29 +35,87 @@ ...@@ -35,29 +35,87 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updateman')"> <template v-if="getColumnState('certificatecode')">
<el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hrcertificate.main_grid.columns.updateman')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'certificatecode'" :label="$t('entities.hrcertificate.main_grid.columns.certificatecode')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.hrcertificate.main_grid.columns.updateman')}} {{$t('entities.hrcertificate.main_grid.columns.certificatecode')}}
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<template > <span>{{row.certificatecode}}</span>
<codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
</template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updatedate')"> <template v-if="getColumnState('authdate')">
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hrcertificate.main_grid.columns.updatedate')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'authdate'" :label="$t('entities.hrcertificate.main_grid.columns.authdate')" :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.hrcertificate.main_grid.columns.updatedate')}} {{$t('entities.hrcertificate.main_grid.columns.authdate')}}
</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> <app-format-data format="YYYY-MM-DD" :data="row.authdate"></app-format-data>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('expiredate')">
<el-table-column show-overflow-tooltip :prop="'expiredate'" :label="$t('entities.hrcertificate.main_grid.columns.expiredate')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrcertificate.main_grid.columns.expiredate')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<app-format-data format="YYYY-MM-DD" :data="row.expiredate"></app-format-data>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('authorganization')">
<el-table-column show-overflow-tooltip :prop="'authorganization'" :label="$t('entities.hrcertificate.main_grid.columns.authorganization')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrcertificate.main_grid.columns.authorganization')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.authorganization}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('registercode')">
<el-table-column show-overflow-tooltip :prop="'registercode'" :label="$t('entities.hrcertificate.main_grid.columns.registercode')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrcertificate.main_grid.columns.registercode')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.registercode}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('registerorganizationname')">
<el-table-column show-overflow-tooltip :prop="'registerorganizationname'" :label="$t('entities.hrcertificate.main_grid.columns.registerorganizationname')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrcertificate.main_grid.columns.registerorganizationname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.registerorganizationname}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('registertime')">
<el-table-column show-overflow-tooltip :prop="'registertime'" :label="$t('entities.hrcertificate.main_grid.columns.registertime')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrcertificate.main_grid.columns.registertime')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<app-format-data format="YYYY-MM-DD" :data="row.registertime"></app-format-data>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
......
app_PIM/src/widgets/hrcontract/main-grid/main-grid-base.tsx
浏览文件 @ a121135c
...@@ -93,25 +93,65 @@ export class MainGridBase extends GridControlBase { ...@@ -93,25 +93,65 @@ export class MainGridBase extends GridControlBase {
*/ */
public allColumns: any[] = [ public allColumns: any[] = [
{ {
name: 'hrcontractname', name: 'contractcode',
label: '合同信息名称', label: '合同编号',
langtag: 'entities.hrcontract.main_grid.columns.hrcontractname', langtag: 'entities.hrcontract.main_grid.columns.contractcode',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updateman', name: 'contractmode',
label: '更新人', label: '合同类别',
langtag: 'entities.hrcontract.main_grid.columns.updateman', langtag: 'entities.hrcontract.main_grid.columns.contractmode',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updatedate', name: 'contracttype',
label: '更新时间', label: '合同类型',
langtag: 'entities.hrcontract.main_grid.columns.updatedate', langtag: 'entities.hrcontract.main_grid.columns.contracttype',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'begintime',
label: '开始日期',
langtag: 'entities.hrcontract.main_grid.columns.begintime',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'endtime',
label: '结束日期',
langtag: 'entities.hrcontract.main_grid.columns.endtime',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'mgrorganizationname',
label: '合同管理单位',
langtag: 'entities.hrcontract.main_grid.columns.mgrorganizationname',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'signorganizationname',
label: '合同签约单位',
langtag: 'entities.hrcontract.main_grid.columns.signorganizationname',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'contractstate',
label: '合同状态',
langtag: 'entities.hrcontract.main_grid.columns.contractstate',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
...@@ -150,9 +190,14 @@ export class MainGridBase extends GridControlBase { ...@@ -150,9 +190,14 @@ export class MainGridBase extends GridControlBase {
* @memberof MainBase * @memberof MainBase
*/ */
public hasRowEdit: any = { public hasRowEdit: any = {
'hrcontractname':false, 'contractcode':false,
'updateman':false, 'contractmode':false,
'updatedate':false, 'contracttype':false,
'begintime':false,
'endtime':false,
'mgrorganizationname':false,
'signorganizationname':false,
'contractstate':false,
}; };
/** /**
...@@ -178,14 +223,6 @@ export class MainGridBase extends GridControlBase { ...@@ -178,14 +223,6 @@ 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',
srfkey: 'SysOperator',
codelistType : 'DYNAMIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]); ]);
} }
......
app_PIM/src/widgets/hrcontract/main-grid/main-grid-model.ts
浏览文件 @ a121135c
...@@ -27,19 +27,29 @@ export default class MainModel { ...@@ -27,19 +27,29 @@ export default class MainModel {
}else{ }else{
return [ return [
{ {
name: 'hremployeeid', name: 'endtime',
prop: 'hremployeeid', prop: 'endtime',
dataType: 'PICKUP', dataType: 'DATE',
},
{
name: 'mgrorganizationname',
prop: 'mgrorganizationname',
dataType: 'PICKUPTEXT',
}, },
{ {
name: 'updateman', name: 'contractcode',
prop: 'updateman', prop: 'contractcode',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'updatedate', name: 'begintime',
prop: 'updatedate', prop: 'begintime',
dataType: 'DATETIME', dataType: 'DATE',
},
{
name: 'mgrorganizationid',
prop: 'mgrorganizationid',
dataType: 'PICKUP',
}, },
{ {
name: 'srfmajortext', name: 'srfmajortext',
...@@ -47,20 +57,45 @@ export default class MainModel { ...@@ -47,20 +57,45 @@ export default class MainModel {
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'srfdataaccaction', name: 'srfkey',
prop: 'hrcontractid', prop: 'hrcontractid',
dataType: 'GUID', dataType: 'GUID',
isEditable:true
}, },
{ {
name: 'srfkey', name: 'srfdataaccaction',
prop: 'hrcontractid', prop: 'hrcontractid',
dataType: 'GUID', dataType: 'GUID',
isEditable:true
}, },
{ {
name: 'hrcontractname', name: 'signorganizationid',
prop: 'hrcontractname', prop: 'signorganizationid',
dataType: 'TEXT', dataType: 'PICKUP',
},
{
name: 'hremployeeid',
prop: 'hremployeeid',
dataType: 'PICKUP',
},
{
name: 'contracttype',
prop: 'contracttype',
dataType: 'SSCODELIST',
},
{
name: 'contractstate',
prop: 'contractstate',
dataType: 'SSCODELIST',
},
{
name: 'signorganizationname',
prop: 'signorganizationname',
dataType: 'PICKUPTEXT',
},
{
name: 'contractmode',
prop: 'contractmode',
dataType: 'SSCODELIST',
}, },
{ {
name: 'hrcontract', name: 'hrcontract',
......
app_PIM/src/widgets/hrcontract/main-grid/main-grid.html
浏览文件 @ a121135c
...@@ -23,41 +23,99 @@ ...@@ -23,41 +23,99 @@
<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('hrcontractname')"> <template v-if="getColumnState('contractcode')">
<el-table-column show-overflow-tooltip :prop="'hrcontractname'" :label="$t('entities.hrcontract.main_grid.columns.hrcontractname')" :width="150" :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}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.hrcontract.main_grid.columns.hrcontractname')}} {{$t('entities.hrcontract.main_grid.columns.contractcode')}}
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<span>{{row.hrcontractname}}</span> <span>{{row.contractcode}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updateman')"> <template v-if="getColumnState('contractmode')">
<el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hrcontract.main_grid.columns.updateman')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'contractmode'" :label="$t('entities.hrcontract.main_grid.columns.contractmode')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.hrcontract.main_grid.columns.updateman')}} {{$t('entities.hrcontract.main_grid.columns.contractmode')}}
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<template > <span>{{row.contractmode}}</span>
<codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
</template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updatedate')"> <template v-if="getColumnState('contracttype')">
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hrcontract.main_grid.columns.updatedate')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'contracttype'" :label="$t('entities.hrcontract.main_grid.columns.contracttype')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.hrcontract.main_grid.columns.updatedate')}} {{$t('entities.hrcontract.main_grid.columns.contracttype')}}
</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> <span>{{row.contracttype}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('begintime')">
<el-table-column show-overflow-tooltip :prop="'begintime'" :label="$t('entities.hrcontract.main_grid.columns.begintime')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrcontract.main_grid.columns.begintime')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<app-format-data format="YYYY-MM-DD" :data="row.begintime"></app-format-data>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('endtime')">
<el-table-column show-overflow-tooltip :prop="'endtime'" :label="$t('entities.hrcontract.main_grid.columns.endtime')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrcontract.main_grid.columns.endtime')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<app-format-data format="YYYY-MM-DD" :data="row.endtime"></app-format-data>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('mgrorganizationname')">
<el-table-column show-overflow-tooltip :prop="'mgrorganizationname'" :label="$t('entities.hrcontract.main_grid.columns.mgrorganizationname')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrcontract.main_grid.columns.mgrorganizationname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.mgrorganizationname}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('signorganizationname')">
<el-table-column show-overflow-tooltip :prop="'signorganizationname'" :label="$t('entities.hrcontract.main_grid.columns.signorganizationname')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrcontract.main_grid.columns.signorganizationname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.signorganizationname}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('contractstate')">
<el-table-column show-overflow-tooltip :prop="'contractstate'" :label="$t('entities.hrcontract.main_grid.columns.contractstate')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrcontract.main_grid.columns.contractstate')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.contractstate}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
......
app_PIM/src/widgets/hreducation/main-form/main-form-base.tsx
浏览文件 @ a121135c
...@@ -95,8 +95,8 @@ export class MainEditFormBase extends EditFormControlBase { ...@@ -95,8 +95,8 @@ export class MainEditFormBase extends EditFormControlBase {
highdegreeflag: null, highdegreeflag: null,
attachment2: null, attachment2: null,
attachment1: null, attachment1: null,
attachment: null,
attachment3: null, attachment3: null,
attachment: null,
hremployeeid: null, hremployeeid: null,
hreducationid: null, hreducationid: null,
hreducation:null, hreducation:null,
...@@ -139,6 +139,8 @@ export class MainEditFormBase extends EditFormControlBase { ...@@ -139,6 +139,8 @@ export class MainEditFormBase extends EditFormControlBase {
* @memberof MainEditFormBase * @memberof MainEditFormBase
*/ */
public detailsModel: any = { public detailsModel: any = {
rawitem1: new FormRowItemModel({ caption: '', detailType: 'RAWITEM', name: 'rawitem1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
group1: new FormGroupPanelModel({ caption: '教育信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hreducation.main_form', extractMode: 'ITEM', details: [] } }), group1: new FormGroupPanelModel({ caption: '教育信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hreducation.main_form', extractMode: 'ITEM', details: [] } }),
formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }), formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
...@@ -185,10 +187,10 @@ export class MainEditFormBase extends EditFormControlBase { ...@@ -185,10 +187,10 @@ export class MainEditFormBase extends EditFormControlBase {
attachment1: new FormItemModel({ caption: '毕业证', detailType: 'FORMITEM', name: 'attachment1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), attachment1: new FormItemModel({ caption: '毕业证', detailType: 'FORMITEM', name: 'attachment1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
attachment: new FormItemModel({ caption: '其他附件', detailType: 'FORMITEM', name: 'attachment', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
attachment3: new FormItemModel({ caption: '学历验证', detailType: 'FORMITEM', name: 'attachment3', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), attachment3: new FormItemModel({ caption: '学历验证', detailType: 'FORMITEM', name: 'attachment3', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
attachment: new FormItemModel({ caption: '其他附件', detailType: 'FORMITEM', name: 'attachment', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
hremployeeid: new FormItemModel({ caption: '员工标识', detailType: 'FORMITEM', name: 'hremployeeid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), hremployeeid: new FormItemModel({ caption: '员工标识', detailType: 'FORMITEM', name: 'hremployeeid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
hreducationid: new FormItemModel({ caption: '教育信息标识', detailType: 'FORMITEM', name: 'hreducationid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), hreducationid: new FormItemModel({ caption: '教育信息标识', detailType: 'FORMITEM', name: 'hreducationid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
......
app_PIM/src/widgets/hreducation/main-form/main-form-model.ts
浏览文件 @ a121135c
...@@ -121,13 +121,13 @@ export default class MainModel { ...@@ -121,13 +121,13 @@ export default class MainModel {
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'attachment', name: 'attachment3',
prop: 'attachment', prop: 'attachment3',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'attachment3', name: 'attachment',
prop: 'attachment3', prop: 'attachment',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
......
app_PIM/src/widgets/hrlanguage-ability/main-grid/main-grid-base.tsx
浏览文件 @ a121135c
...@@ -93,25 +93,33 @@ export class MainGridBase extends GridControlBase { ...@@ -93,25 +93,33 @@ export class MainGridBase extends GridControlBase {
*/ */
public allColumns: any[] = [ public allColumns: any[] = [
{ {
name: 'hrlanguageabilityname', name: 'languagetype',
label: '语言能力名称', label: '语种',
langtag: 'entities.hrlanguageability.main_grid.columns.hrlanguageabilityname', langtag: 'entities.hrlanguageability.main_grid.columns.languagetype',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updateman', name: 'languagelevel',
label: '更新人', label: '外语等级',
langtag: 'entities.hrlanguageability.main_grid.columns.updateman', langtag: 'entities.hrlanguageability.main_grid.columns.languagelevel',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updatedate', name: 'languagetime',
label: '更新时间', label: '获取时间',
langtag: 'entities.hrlanguageability.main_grid.columns.updatedate', langtag: 'entities.hrlanguageability.main_grid.columns.languagetime',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'attachment',
label: '附件',
langtag: 'entities.hrlanguageability.main_grid.columns.attachment',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
...@@ -150,9 +158,10 @@ export class MainGridBase extends GridControlBase { ...@@ -150,9 +158,10 @@ export class MainGridBase extends GridControlBase {
* @memberof MainBase * @memberof MainBase
*/ */
public hasRowEdit: any = { public hasRowEdit: any = {
'hrlanguageabilityname':false, 'languagetype':false,
'updateman':false, 'languagelevel':false,
'updatedate':false, 'languagetime':false,
'attachment':false,
}; };
/** /**
...@@ -178,14 +187,6 @@ export class MainGridBase extends GridControlBase { ...@@ -178,14 +187,6 @@ 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',
srfkey: 'SysOperator',
codelistType : 'DYNAMIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]); ]);
} }
......
app_PIM/src/widgets/hrlanguage-ability/main-grid/main-grid-model.ts
浏览文件 @ a121135c
...@@ -32,14 +32,14 @@ export default class MainModel { ...@@ -32,14 +32,14 @@ export default class MainModel {
dataType: 'PICKUP', dataType: 'PICKUP',
}, },
{ {
name: 'updateman', name: 'languagetime',
prop: 'updateman', prop: 'languagetime',
dataType: 'TEXT', dataType: 'DATE',
}, },
{ {
name: 'updatedate', name: 'attachment',
prop: 'updatedate', prop: 'attachment',
dataType: 'DATETIME', dataType: 'TEXT',
}, },
{ {
name: 'srfmajortext', name: 'srfmajortext',
...@@ -58,9 +58,14 @@ export default class MainModel { ...@@ -58,9 +58,14 @@ export default class MainModel {
isEditable:true isEditable:true
}, },
{ {
name: 'hrlanguageabilityname', name: 'languagelevel',
prop: 'hrlanguageabilityname', prop: 'languagelevel',
dataType: 'TEXT', dataType: 'SSCODELIST',
},
{
name: 'languagetype',
prop: 'languagetype',
dataType: 'SSCODELIST',
}, },
{ {
name: 'hrlanguageability', name: 'hrlanguageability',
......
app_PIM/src/widgets/hrlanguage-ability/main-grid/main-grid.html
浏览文件 @ a121135c
...@@ -23,41 +23,51 @@ ...@@ -23,41 +23,51 @@
<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('hrlanguageabilityname')"> <template v-if="getColumnState('languagetype')">
<el-table-column show-overflow-tooltip :prop="'hrlanguageabilityname'" :label="$t('entities.hrlanguageability.main_grid.columns.hrlanguageabilityname')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'languagetype'" :label="$t('entities.hrlanguageability.main_grid.columns.languagetype')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.hrlanguageability.main_grid.columns.hrlanguageabilityname')}} {{$t('entities.hrlanguageability.main_grid.columns.languagetype')}}
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<span>{{row.hrlanguageabilityname}}</span> <span>{{row.languagetype}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updateman')"> <template v-if="getColumnState('languagelevel')">
<el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hrlanguageability.main_grid.columns.updateman')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'languagelevel'" :label="$t('entities.hrlanguageability.main_grid.columns.languagelevel')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.hrlanguageability.main_grid.columns.updateman')}} {{$t('entities.hrlanguageability.main_grid.columns.languagelevel')}}
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<template > <span>{{row.languagelevel}}</span>
<codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
</template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updatedate')"> <template v-if="getColumnState('languagetime')">
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hrlanguageability.main_grid.columns.updatedate')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'languagetime'" :label="$t('entities.hrlanguageability.main_grid.columns.languagetime')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.hrlanguageability.main_grid.columns.updatedate')}} {{$t('entities.hrlanguageability.main_grid.columns.languagetime')}}
</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> <app-format-data format="YYYY-MM-DD" :data="row.languagetime"></app-format-data>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('attachment')">
<el-table-column show-overflow-tooltip :prop="'attachment'" :label="$t('entities.hrlanguageability.main_grid.columns.attachment')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrlanguageability.main_grid.columns.attachment')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.attachment}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
......
app_PIM/src/widgets/hrresearch/main-grid/main-grid-base.tsx
浏览文件 @ a121135c
...@@ -101,17 +101,17 @@ export class MainGridBase extends GridControlBase { ...@@ -101,17 +101,17 @@ export class MainGridBase extends GridControlBase {
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updateman', name: 'activetime',
label: '更新人', label: '获取时间',
langtag: 'entities.hrresearch.main_grid.columns.updateman', langtag: 'entities.hrresearch.main_grid.columns.activetime',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updatedate', name: 'attachment',
label: '更新时间', label: '附件',
langtag: 'entities.hrresearch.main_grid.columns.updatedate', langtag: 'entities.hrresearch.main_grid.columns.attachment',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
...@@ -151,8 +151,8 @@ export class MainGridBase extends GridControlBase { ...@@ -151,8 +151,8 @@ export class MainGridBase extends GridControlBase {
*/ */
public hasRowEdit: any = { public hasRowEdit: any = {
'hrresearchname':false, 'hrresearchname':false,
'updateman':false, 'activetime':false,
'updatedate':false, 'attachment':false,
}; };
/** /**
...@@ -178,14 +178,6 @@ export class MainGridBase extends GridControlBase { ...@@ -178,14 +178,6 @@ 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',
srfkey: 'SysOperator',
codelistType : 'DYNAMIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]); ]);
} }
......
app_PIM/src/widgets/hrresearch/main-grid/main-grid-model.ts
浏览文件 @ a121135c
...@@ -32,8 +32,13 @@ export default class MainModel { ...@@ -32,8 +32,13 @@ export default class MainModel {
dataType: 'PICKUP', dataType: 'PICKUP',
}, },
{ {
name: 'updateman', name: 'activetime',
prop: 'updateman', prop: 'activetime',
dataType: 'DATE',
},
{
name: 'attachment',
prop: 'attachment',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
...@@ -41,11 +46,6 @@ export default class MainModel { ...@@ -41,11 +46,6 @@ export default class MainModel {
prop: 'hrresearchname', prop: 'hrresearchname',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{
name: 'updatedate',
prop: 'updatedate',
dataType: 'DATETIME',
},
{ {
name: 'srfmajortext', name: 'srfmajortext',
prop: 'hrresearchname', prop: 'hrresearchname',
......
app_PIM/src/widgets/hrresearch/main-grid/main-grid.html
浏览文件 @ a121135c
...@@ -35,29 +35,27 @@ ...@@ -35,29 +35,27 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updateman')"> <template v-if="getColumnState('activetime')">
<el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hrresearch.main_grid.columns.updateman')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'activetime'" :label="$t('entities.hrresearch.main_grid.columns.activetime')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.hrresearch.main_grid.columns.updateman')}} {{$t('entities.hrresearch.main_grid.columns.activetime')}}
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<template > <app-format-data format="YYYY-MM-DD" :data="row.activetime"></app-format-data>
<codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
</template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updatedate')"> <template v-if="getColumnState('attachment')">
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hrresearch.main_grid.columns.updatedate')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'attachment'" :label="$t('entities.hrresearch.main_grid.columns.attachment')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.hrresearch.main_grid.columns.updatedate')}} {{$t('entities.hrresearch.main_grid.columns.attachment')}}
</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> <span>{{row.attachment}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
......
app_PIM/src/widgets/hrreward/main-form/main-form-base.tsx
浏览文件 @ a121135c
...@@ -130,7 +130,7 @@ export class MainEditFormBase extends EditFormControlBase { ...@@ -130,7 +130,7 @@ export class MainEditFormBase extends EditFormControlBase {
srfkey: new FormItemModel({ caption: '奖励惩罚标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), srfkey: new FormItemModel({ caption: '奖励惩罚标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
srfmajortext: new FormItemModel({ caption: '奖励惩罚名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), srfmajortext: new FormItemModel({ caption: '奖惩名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
...@@ -140,7 +140,7 @@ export class MainEditFormBase extends EditFormControlBase { ...@@ -140,7 +140,7 @@ export class MainEditFormBase extends EditFormControlBase {
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
hrrewardname: new FormItemModel({ caption: '奖励惩罚名称', detailType: 'FORMITEM', name: 'hrrewardname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), hrrewardname: new FormItemModel({ caption: '奖惩名称', detailType: 'FORMITEM', name: 'hrrewardname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
createman: new FormItemModel({ caption: '建立人', detailType: 'FORMITEM', name: 'createman', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), createman: new FormItemModel({ caption: '建立人', detailType: 'FORMITEM', name: 'createman', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
......
app_PIM/src/widgets/hrreward/main-grid/main-grid-base.tsx
浏览文件 @ a121135c
...@@ -92,26 +92,50 @@ export class MainGridBase extends GridControlBase { ...@@ -92,26 +92,50 @@ export class MainGridBase extends GridControlBase {
* @memberof MainGridBase * @memberof MainGridBase
*/ */
public allColumns: any[] = [ public allColumns: any[] = [
{
name: 'rewardtype',
label: '奖惩分类',
langtag: 'entities.hrreward.main_grid.columns.rewardtype',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{ {
name: 'hrrewardname', name: 'hrrewardname',
label: '奖励惩罚名称', label: '奖惩名称',
langtag: 'entities.hrreward.main_grid.columns.hrrewardname', langtag: 'entities.hrreward.main_grid.columns.hrrewardname',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updateman', name: 'rewardlevel',
label: '更新人', label: '奖惩级别',
langtag: 'entities.hrreward.main_grid.columns.updateman', langtag: 'entities.hrreward.main_grid.columns.rewardlevel',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'rewardmoney',
label: '奖惩金额',
langtag: 'entities.hrreward.main_grid.columns.rewardmoney',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'rewardtime',
label: '奖惩时间',
langtag: 'entities.hrreward.main_grid.columns.rewardtime',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updatedate', name: 'rewardevent',
label: '更新时间', label: '奖惩事件',
langtag: 'entities.hrreward.main_grid.columns.updatedate', langtag: 'entities.hrreward.main_grid.columns.rewardevent',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
...@@ -150,9 +174,12 @@ export class MainGridBase extends GridControlBase { ...@@ -150,9 +174,12 @@ export class MainGridBase extends GridControlBase {
* @memberof MainBase * @memberof MainBase
*/ */
public hasRowEdit: any = { public hasRowEdit: any = {
'rewardtype':false,
'hrrewardname':false, 'hrrewardname':false,
'updateman':false, 'rewardlevel':false,
'updatedate':false, 'rewardmoney':false,
'rewardtime':false,
'rewardevent':false,
}; };
/** /**
...@@ -178,14 +205,6 @@ export class MainGridBase extends GridControlBase { ...@@ -178,14 +205,6 @@ 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',
srfkey: 'SysOperator',
codelistType : 'DYNAMIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]); ]);
} }
......
app_PIM/src/widgets/hrreward/main-grid/main-grid-model.ts
浏览文件 @ a121135c
...@@ -26,15 +26,30 @@ export default class MainModel { ...@@ -26,15 +26,30 @@ export default class MainModel {
] ]
}else{ }else{
return [ return [
{
name: 'rewardlevel',
prop: 'rewardlevel',
dataType: 'SSCODELIST',
},
{ {
name: 'hremployeeid', name: 'hremployeeid',
prop: 'hremployeeid', prop: 'hremployeeid',
dataType: 'PICKUP', dataType: 'PICKUP',
}, },
{ {
name: 'updateman', name: 'rewardmoney',
prop: 'updateman', prop: 'rewardmoney',
dataType: 'TEXT', dataType: 'DECIMAL',
},
{
name: 'rewardtype',
prop: 'rewardtype',
dataType: 'SSCODELIST',
},
{
name: 'rewardevent',
prop: 'rewardevent',
dataType: 'LONGTEXT_1000',
}, },
{ {
name: 'hrrewardname', name: 'hrrewardname',
...@@ -42,9 +57,9 @@ export default class MainModel { ...@@ -42,9 +57,9 @@ export default class MainModel {
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'updatedate', name: 'rewardtime',
prop: 'updatedate', prop: 'rewardtime',
dataType: 'DATETIME', dataType: 'DATE',
}, },
{ {
name: 'srfmajortext', name: 'srfmajortext',
......
app_PIM/src/widgets/hrreward/main-grid/main-grid.html
浏览文件 @ a121135c
...@@ -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('rewardtype')">
<el-table-column show-overflow-tooltip :prop="'rewardtype'" :label="$t('entities.hrreward.main_grid.columns.rewardtype')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrreward.main_grid.columns.rewardtype')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.rewardtype}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('hrrewardname')"> <template v-if="getColumnState('hrrewardname')">
<el-table-column show-overflow-tooltip :prop="'hrrewardname'" :label="$t('entities.hrreward.main_grid.columns.hrrewardname')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'hrrewardname'" :label="$t('entities.hrreward.main_grid.columns.hrrewardname')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
...@@ -35,29 +47,51 @@ ...@@ -35,29 +47,51 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updateman')"> <template v-if="getColumnState('rewardlevel')">
<el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hrreward.main_grid.columns.updateman')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'rewardlevel'" :label="$t('entities.hrreward.main_grid.columns.rewardlevel')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrreward.main_grid.columns.rewardlevel')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.rewardlevel}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('rewardmoney')">
<el-table-column show-overflow-tooltip :prop="'rewardmoney'" :label="$t('entities.hrreward.main_grid.columns.rewardmoney')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrreward.main_grid.columns.rewardmoney')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<app-format-data dataType="DECIMAL" precision="2" :data="row.rewardmoney"></app-format-data>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('rewardtime')">
<el-table-column show-overflow-tooltip :prop="'rewardtime'" :label="$t('entities.hrreward.main_grid.columns.rewardtime')" :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.hrreward.main_grid.columns.updateman')}} {{$t('entities.hrreward.main_grid.columns.rewardtime')}}
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<template > <app-format-data format="YYYY-MM-DD" :data="row.rewardtime"></app-format-data>
<codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
</template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updatedate')"> <template v-if="getColumnState('rewardevent')">
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hrreward.main_grid.columns.updatedate')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'rewardevent'" :label="$t('entities.hrreward.main_grid.columns.rewardevent')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.hrreward.main_grid.columns.updatedate')}} {{$t('entities.hrreward.main_grid.columns.rewardevent')}}
</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> <span>{{row.rewardevent}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
......
app_PIM/src/widgets/hrtechnical-title/main-form/main-form-base.tsx
浏览文件 @ a121135c
...@@ -130,7 +130,7 @@ export class MainEditFormBase extends EditFormControlBase { ...@@ -130,7 +130,7 @@ export class MainEditFormBase extends EditFormControlBase {
srfkey: new FormItemModel({ caption: '职称信息标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), srfkey: new FormItemModel({ caption: '职称信息标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
srfmajortext: new FormItemModel({ caption: '职称信息名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), srfmajortext: new FormItemModel({ caption: '职称名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
...@@ -140,7 +140,7 @@ export class MainEditFormBase extends EditFormControlBase { ...@@ -140,7 +140,7 @@ export class MainEditFormBase extends EditFormControlBase {
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
hrtechnicaltitlename: new FormItemModel({ caption: '职称信息名称', detailType: 'FORMITEM', name: 'hrtechnicaltitlename', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), hrtechnicaltitlename: new FormItemModel({ caption: '职称名称', detailType: 'FORMITEM', name: 'hrtechnicaltitlename', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
createman: new FormItemModel({ caption: '建立人', detailType: 'FORMITEM', name: 'createman', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), createman: new FormItemModel({ caption: '建立人', detailType: 'FORMITEM', name: 'createman', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
......
app_PIM/src/widgets/hrtechnical-title/main-grid/main-grid-base.tsx
浏览文件 @ a121135c
...@@ -94,24 +94,56 @@ export class MainGridBase extends GridControlBase { ...@@ -94,24 +94,56 @@ export class MainGridBase extends GridControlBase {
public allColumns: any[] = [ public allColumns: any[] = [
{ {
name: 'hrtechnicaltitlename', name: 'hrtechnicaltitlename',
label: '职称信息名称', label: '职称名称',
langtag: 'entities.hrtechnicaltitle.main_grid.columns.hrtechnicaltitlename', langtag: 'entities.hrtechnicaltitle.main_grid.columns.hrtechnicaltitlename',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updateman', name: 'titlelevel',
label: '更新人', label: '职称等级',
langtag: 'entities.hrtechnicaltitle.main_grid.columns.updateman', langtag: 'entities.hrtechnicaltitle.main_grid.columns.titlelevel',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updatedate', name: 'majortype',
label: '更新时间', label: '专业类别',
langtag: 'entities.hrtechnicaltitle.main_grid.columns.updatedate', langtag: 'entities.hrtechnicaltitle.main_grid.columns.majortype',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'major',
label: '专业名称',
langtag: 'entities.hrtechnicaltitle.main_grid.columns.major',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'titletime',
label: '获取时间',
langtag: 'entities.hrtechnicaltitle.main_grid.columns.titletime',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'authorganization',
label: '签发机构',
langtag: 'entities.hrtechnicaltitle.main_grid.columns.authorganization',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'hightitle',
label: '最高职称',
langtag: 'entities.hrtechnicaltitle.main_grid.columns.hightitle',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
...@@ -151,8 +183,12 @@ export class MainGridBase extends GridControlBase { ...@@ -151,8 +183,12 @@ export class MainGridBase extends GridControlBase {
*/ */
public hasRowEdit: any = { public hasRowEdit: any = {
'hrtechnicaltitlename':false, 'hrtechnicaltitlename':false,
'updateman':false, 'titlelevel':false,
'updatedate':false, 'majortype':false,
'major':false,
'titletime':false,
'authorganization':false,
'hightitle':false,
}; };
/** /**
...@@ -179,9 +215,9 @@ export class MainGridBase extends GridControlBase { ...@@ -179,9 +215,9 @@ 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: 'hightitle',
srfkey: 'SysOperator', srfkey: 'YesNo',
codelistType : 'DYNAMIC', codelistType : 'STATIC',
renderMode: 'other', renderMode: 'other',
textSeparator: '、', textSeparator: '、',
valueSeparator: ',', valueSeparator: ',',
......
app_PIM/src/widgets/hrtechnical-title/main-grid/main-grid-model.ts
浏览文件 @ a121135c
...@@ -26,14 +26,29 @@ export default class MainModel { ...@@ -26,14 +26,29 @@ export default class MainModel {
] ]
}else{ }else{
return [ return [
{
name: 'hightitle',
prop: 'hightitle',
dataType: 'YESNO',
},
{ {
name: 'hremployeeid', name: 'hremployeeid',
prop: 'hremployeeid', prop: 'hremployeeid',
dataType: 'PICKUP', dataType: 'PICKUP',
}, },
{ {
name: 'updateman', name: 'titlelevel',
prop: 'updateman', prop: 'titlelevel',
dataType: 'SSCODELIST',
},
{
name: 'titletime',
prop: 'titletime',
dataType: 'DATE',
},
{
name: 'majortype',
prop: 'majortype',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
...@@ -42,9 +57,9 @@ export default class MainModel { ...@@ -42,9 +57,9 @@ export default class MainModel {
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'updatedate', name: 'authorganization',
prop: 'updatedate', prop: 'authorganization',
dataType: 'DATETIME', dataType: 'TEXT',
}, },
{ {
name: 'srfmajortext', name: 'srfmajortext',
...@@ -62,6 +77,11 @@ export default class MainModel { ...@@ -62,6 +77,11 @@ export default class MainModel {
dataType: 'GUID', dataType: 'GUID',
isEditable:true isEditable:true
}, },
{
name: 'major',
prop: 'major',
dataType: 'TEXT',
},
{ {
name: 'hrtechnicaltitle', name: 'hrtechnicaltitle',
prop: 'hrtechnicaltitleid', prop: 'hrtechnicaltitleid',
......
app_PIM/src/widgets/hrtechnical-title/main-grid/main-grid.html
浏览文件 @ a121135c
...@@ -35,29 +35,77 @@ ...@@ -35,29 +35,77 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updateman')"> <template v-if="getColumnState('titlelevel')">
<el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hrtechnicaltitle.main_grid.columns.updateman')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'titlelevel'" :label="$t('entities.hrtechnicaltitle.main_grid.columns.titlelevel')" :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.hrtechnicaltitle.main_grid.columns.updateman')}} {{$t('entities.hrtechnicaltitle.main_grid.columns.titlelevel')}}
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<template > <span>{{row.titlelevel}}</span>
<codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist> </template>
</template> </el-table-column>
</template>
<template v-if="getColumnState('majortype')">
<el-table-column show-overflow-tooltip :prop="'majortype'" :label="$t('entities.hrtechnicaltitle.main_grid.columns.majortype')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrtechnicaltitle.main_grid.columns.majortype')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.majortype}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('major')">
<el-table-column show-overflow-tooltip :prop="'major'" :label="$t('entities.hrtechnicaltitle.main_grid.columns.major')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrtechnicaltitle.main_grid.columns.major')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.major}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updatedate')"> <template v-if="getColumnState('titletime')">
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hrtechnicaltitle.main_grid.columns.updatedate')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'titletime'" :label="$t('entities.hrtechnicaltitle.main_grid.columns.titletime')" :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.hrtechnicaltitle.main_grid.columns.updatedate')}} {{$t('entities.hrtechnicaltitle.main_grid.columns.titletime')}}
</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> <app-format-data format="YYYY-MM-DD" :data="row.titletime"></app-format-data>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('authorganization')">
<el-table-column show-overflow-tooltip :prop="'authorganization'" :label="$t('entities.hrtechnicaltitle.main_grid.columns.authorganization')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrtechnicaltitle.main_grid.columns.authorganization')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.authorganization}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('hightitle')">
<el-table-column show-overflow-tooltip :prop="'hightitle'" :label="$t('entities.hrtechnicaltitle.main_grid.columns.hightitle')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrtechnicaltitle.main_grid.columns.hightitle')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.hightitle" tag='YesNo' codelistType='STATIC' ></codelist>
</template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
......
app_PIM/src/widgets/hrwork-record/main-grid/main-grid-base.tsx
浏览文件 @ a121135c
...@@ -93,25 +93,57 @@ export class MainGridBase extends GridControlBase { ...@@ -93,25 +93,57 @@ export class MainGridBase extends GridControlBase {
*/ */
public allColumns: any[] = [ public allColumns: any[] = [
{ {
name: 'hrworkrecordname', name: 'begintime',
label: '工作履历名称', label: '开始时间',
langtag: 'entities.hrworkrecord.main_grid.columns.hrworkrecordname', langtag: 'entities.hrworkrecord.main_grid.columns.begintime',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updateman', name: 'endtime',
label: '更新人', label: '结束时间',
langtag: 'entities.hrworkrecord.main_grid.columns.updateman', langtag: 'entities.hrworkrecord.main_grid.columns.endtime',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
}, },
{ {
name: 'updatedate', name: 'workorganization',
label: '更新时间', label: '工作单位',
langtag: 'entities.hrworkrecord.main_grid.columns.updatedate', langtag: 'entities.hrworkrecord.main_grid.columns.workorganization',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'workdepartment',
label: '部门',
langtag: 'entities.hrworkrecord.main_grid.columns.workdepartment',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'duty',
label: '职务',
langtag: 'entities.hrworkrecord.main_grid.columns.duty',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'post',
label: '职位',
langtag: 'entities.hrworkrecord.main_grid.columns.post',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'mainwork',
label: '主要经历',
langtag: 'entities.hrworkrecord.main_grid.columns.mainwork',
show: true, show: true,
util: 'PX', util: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
...@@ -150,9 +182,13 @@ export class MainGridBase extends GridControlBase { ...@@ -150,9 +182,13 @@ export class MainGridBase extends GridControlBase {
* @memberof MainBase * @memberof MainBase
*/ */
public hasRowEdit: any = { public hasRowEdit: any = {
'hrworkrecordname':false, 'begintime':false,
'updateman':false, 'endtime':false,
'updatedate':false, 'workorganization':false,
'workdepartment':false,
'duty':false,
'post':false,
'mainwork':false,
}; };
/** /**
...@@ -179,9 +215,9 @@ export class MainGridBase extends GridControlBase { ...@@ -179,9 +215,9 @@ 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: 'mainwork',
srfkey: 'SysOperator', srfkey: 'YesNo',
codelistType : 'DYNAMIC', codelistType : 'STATIC',
renderMode: 'other', renderMode: 'other',
textSeparator: '、', textSeparator: '、',
valueSeparator: ',', valueSeparator: ',',
......
app_PIM/src/widgets/hrwork-record/main-grid/main-grid-model.ts
浏览文件 @ a121135c
...@@ -27,8 +27,13 @@ export default class MainModel { ...@@ -27,8 +27,13 @@ export default class MainModel {
}else{ }else{
return [ return [
{ {
name: 'hrworkrecordname', name: 'endtime',
prop: 'hrworkrecordname', prop: 'endtime',
dataType: 'DATE',
},
{
name: 'workorganization',
prop: 'workorganization',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
...@@ -37,14 +42,29 @@ export default class MainModel { ...@@ -37,14 +42,29 @@ export default class MainModel {
dataType: 'PICKUP', dataType: 'PICKUP',
}, },
{ {
name: 'updateman', name: 'post',
prop: 'updateman', prop: 'post',
dataType: 'TEXT',
},
{
name: 'workdepartment',
prop: 'workdepartment',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'updatedate', name: 'duty',
prop: 'updatedate', prop: 'duty',
dataType: 'DATETIME', dataType: 'TEXT',
},
{
name: 'begintime',
prop: 'begintime',
dataType: 'DATE',
},
{
name: 'mainwork',
prop: 'mainwork',
dataType: 'YESNO',
}, },
{ {
name: 'srfmajortext', name: 'srfmajortext',
......
app_PIM/src/widgets/hrwork-record/main-grid/main-grid.html
浏览文件 @ a121135c
...@@ -23,41 +23,89 @@ ...@@ -23,41 +23,89 @@
<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('hrworkrecordname')"> <template v-if="getColumnState('begintime')">
<el-table-column show-overflow-tooltip :prop="'hrworkrecordname'" :label="$t('entities.hrworkrecord.main_grid.columns.hrworkrecordname')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'begintime'" :label="$t('entities.hrworkrecord.main_grid.columns.begintime')" :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.hrworkrecord.main_grid.columns.hrworkrecordname')}} {{$t('entities.hrworkrecord.main_grid.columns.begintime')}}
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<span>{{row.hrworkrecordname}}</span> <app-format-data format="YYYY-MM-DD" :data="row.begintime"></app-format-data>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updateman')"> <template v-if="getColumnState('endtime')">
<el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hrworkrecord.main_grid.columns.updateman')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'endtime'" :label="$t('entities.hrworkrecord.main_grid.columns.endtime')" :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.hrworkrecord.main_grid.columns.updateman')}} {{$t('entities.hrworkrecord.main_grid.columns.endtime')}}
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<template > <app-format-data format="YYYY-MM-DD" :data="row.endtime"></app-format-data>
<codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist> </template>
</template> </el-table-column>
</template>
<template v-if="getColumnState('workorganization')">
<el-table-column show-overflow-tooltip :prop="'workorganization'" :label="$t('entities.hrworkrecord.main_grid.columns.workorganization')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrworkrecord.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('workdepartment')">
<el-table-column show-overflow-tooltip :prop="'workdepartment'" :label="$t('entities.hrworkrecord.main_grid.columns.workdepartment')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrworkrecord.main_grid.columns.workdepartment')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.workdepartment}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('updatedate')"> <template v-if="getColumnState('duty')">
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hrworkrecord.main_grid.columns.updatedate')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'duty'" :label="$t('entities.hrworkrecord.main_grid.columns.duty')" :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.hrworkrecord.main_grid.columns.updatedate')}} {{$t('entities.hrworkrecord.main_grid.columns.duty')}}
</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> <span>{{row.duty}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('post')">
<el-table-column show-overflow-tooltip :prop="'post'" :label="$t('entities.hrworkrecord.main_grid.columns.post')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrworkrecord.main_grid.columns.post')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.post}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('mainwork')">
<el-table-column show-overflow-tooltip :prop="'mainwork'" :label="$t('entities.hrworkrecord.main_grid.columns.mainwork')" :width="120" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrworkrecord.main_grid.columns.mainwork')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.mainwork" tag='YesNo' codelistType='STATIC' ></codelist>
</template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
......
config.xml
浏览文件 @ a121135c
...@@ -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 -Phrapi mvn clean package -Ppim
cd humanresource-provider/humanresource-provider-hrapi cd humanresource-app/humanresource-app-pim
mvn -Phrapi docker:build mvn -Ppim docker:build
mvn -Phrapi docker:push mvn -Ppim 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
浏览文件 @ a121135c
...@@ -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
浏览文件 @ a121135c
...@@ -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-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRTechnicalTitle.java
浏览文件 @ a121135c
...@@ -104,7 +104,7 @@ public class HRTechnicalTitle extends EntityMP implements Serializable { ...@@ -104,7 +104,7 @@ public class HRTechnicalTitle extends EntityMP implements Serializable {
@JsonProperty("hremployeename") @JsonProperty("hremployeename")
private String hremployeename; private String hremployeename;
/** /**
* 职称获取时间 * 获取时间
*/ */
@TableField(value = "titletime") @TableField(value = "titletime")
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
...@@ -195,7 +195,7 @@ public class HRTechnicalTitle extends EntityMP implements Serializable { ...@@ -195,7 +195,7 @@ public class HRTechnicalTitle extends EntityMP implements Serializable {
} }
/** /**
* 设置 [职称获取时间] * 设置 [获取时间]
*/ */
public void setTitletime(Timestamp titletime){ public void setTitletime(Timestamp titletime){
this.titletime = titletime ; this.titletime = titletime ;
...@@ -203,7 +203,7 @@ public class HRTechnicalTitle extends EntityMP implements Serializable { ...@@ -203,7 +203,7 @@ public class HRTechnicalTitle extends EntityMP implements Serializable {
} }
/** /**
* 格式化日期 [职称获取时间] * 格式化日期 [获取时间]
*/ */
public String formatTitletime(){ public String formatTitletime(){
if (this.titletime == null) { if (this.titletime == null) {
......
humanresource-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile
浏览文件 @ a121135c
...@@ -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
浏览文件 @ a121135c
...@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或