jackwang 部署微服务应用

app_PIM/src/interface/entity/hrcertificate.ts

@@ -15,7 +15,7 @@ export interface HRCertificate {
     hrcertificateid?: any;
 
     /**
-     * 证书信息名称
+     * 证书名称
      *
      * @returns {*}
      * @memberof HRCertificate
@@ -69,4 +69,84 @@ export interface HRCertificate {
      * @memberof HRCertificate
      */
     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

@@ -117,4 +117,44 @@ export interface HRContract {
      * @memberof HRContract
      */
     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

@@ -39,7 +39,7 @@ export interface HRPaper {
     updateman?: any;
 
     /**
-     * 论文信息名称
+     * 论文名称
      *
      * @returns {*}
      * @memberof HRPaper
@@ -69,4 +69,52 @@ export interface HRPaper {
      * @memberof HRPaper
      */
     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

@@ -23,7 +23,7 @@ export interface HRPatent {
     createman?: any;
 
     /**
-     * 专利信息名称
+     * 专利名称
      *
      * @returns {*}
      * @memberof HRPatent
@@ -69,4 +69,36 @@ export interface HRPatent {
      * @memberof HRPatent
      */
     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

@@ -69,4 +69,20 @@ export interface HRResearch {
      * @memberof HRResearch
      */
     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

@@ -7,7 +7,7 @@
 export interface HRReward {
 
     /**
-     * 奖励惩罚名称
+     * 奖惩名称
      *
      * @returns {*}
      * @memberof HRReward
@@ -69,4 +69,60 @@ export interface HRReward {
      * @memberof HRReward
      */
     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

@@ -47,7 +47,7 @@ export interface HRTechnicalTitle {
     createdate?: any;
 
     /**
-     * 职称信息名称
+     * 职称名称
      *
      * @returns {*}
      * @memberof HRTechnicalTitle
@@ -69,4 +69,76 @@ export interface HRTechnicalTitle {
      * @memberof HRTechnicalTitle
      */
     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

@@ -2,13 +2,23 @@
 export default {
   fields: {
     hrcertificateid: "证书信息标识",
-    hrcertificatename: "证书信息名称",
+    hrcertificatename: "证书名称",
     createdate: "建立时间",
     updateman: "更新人",
     createman: "建立人",
     updatedate: "更新时间",
     hremployeeid: "员工标识",
     hremployeename: "员工姓名",
+    attachment: "附件",
+    certificatecode: "证书编号",
+    authorganization: "签发机构",
+    authdate: "签发日期",
+    expiredate: "失效日期",
+    registercode: "注册编号",
+    registertime: "初始注册时间",
+    memo: "备注",
+    registerorganizationid: "注册单位ID",
+    registerorganizationname: "注册单位",
   },
 	views: {
 		gridview: {
@@ -29,12 +39,12 @@ export default {
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "证书信息标识", 
-			srfmajortext: "证书信息名称", 
+			srfmajortext: "证书名称", 
 			srftempmode: "", 
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			hrcertificatename: "证书信息名称", 
+			hrcertificatename: "证书名称", 
 			createman: "建立人", 
 			createdate: "建立时间", 
 			updateman: "更新人", 
@@ -46,9 +56,14 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			hrcertificatename: "证书信息名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			hrcertificatename: "证书名称",
+			certificatecode: "证书编号",
+			authdate: "签发日期",
+			expiredate: "失效日期",
+			authorganization: "签发机构",
+			registercode: "注册编号",
+			registerorganizationname: "注册单位",
+			registertime: "初始注册时间",
 		},
 		uiactions: {
 		},

app_PIM/src/locale/lanres/entities/hrcertificate/hrcertificate_zh_CN.ts

 export default {
   fields: {
     hrcertificateid: "证书信息标识",
-    hrcertificatename: "证书信息名称",
+    hrcertificatename: "证书名称",
     createdate: "建立时间",
     updateman: "更新人",
     createman: "建立人",
     updatedate: "更新时间",
     hremployeeid: "员工标识",
     hremployeename: "员工姓名",
+    attachment: "附件",
+    certificatecode: "证书编号",
+    authorganization: "签发机构",
+    authdate: "签发日期",
+    expiredate: "失效日期",
+    registercode: "注册编号",
+    registertime: "初始注册时间",
+    memo: "备注",
+    registerorganizationid: "注册单位ID",
+    registerorganizationname: "注册单位",
   },
 	views: {
 		gridview: {
@@ -28,12 +38,12 @@ export default {
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "证书信息标识", 
-			srfmajortext: "证书信息名称", 
+			srfmajortext: "证书名称", 
 			srftempmode: "", 
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			hrcertificatename: "证书信息名称", 
+			hrcertificatename: "证书名称", 
 			createman: "建立人", 
 			createdate: "建立时间", 
 			updateman: "更新人", 
@@ -45,9 +55,14 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			hrcertificatename: "证书信息名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			hrcertificatename: "证书名称",
+			certificatecode: "证书编号",
+			authdate: "签发日期",
+			expiredate: "失效日期",
+			authorganization: "签发机构",
+			registercode: "注册编号",
+			registerorganizationname: "注册单位",
+			registertime: "初始注册时间",
 		},
 		uiactions: {
 		},

app_PIM/src/locale/lanres/entities/hrcontract/hrcontract_en_US.ts

@@ -15,6 +15,11 @@ export default {
     begintime: "开始日期",
     endtime: "结束日期",
     contractstate: "合同状态",
+    mgrorganizationid: "合同管理单位ID",
+    mgrorganizationname: "合同管理单位",
+    signorganizationid: "合同签约单位ID",
+    signorganizationname: "合同签约单位",
+    probationtime: "试用期",
   },
 	views: {
 		gridview: {
@@ -52,9 +57,14 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			hrcontractname: "合同信息名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			contractcode: "合同编号",
+			contractmode: "合同类别",
+			contracttype: "合同类型",
+			begintime: "开始日期",
+			endtime: "结束日期",
+			mgrorganizationname: "合同管理单位",
+			signorganizationname: "合同签约单位",
+			contractstate: "合同状态",
 		},
 		uiactions: {
 		},

app_PIM/src/locale/lanres/entities/hrcontract/hrcontract_zh_CN.ts

@@ -14,6 +14,11 @@ export default {
     begintime: "开始日期",
     endtime: "结束日期",
     contractstate: "合同状态",
+    mgrorganizationid: "合同管理单位ID",
+    mgrorganizationname: "合同管理单位",
+    signorganizationid: "合同签约单位ID",
+    signorganizationname: "合同签约单位",
+    probationtime: "试用期",
   },
 	views: {
 		gridview: {
@@ -51,9 +56,14 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			hrcontractname: "合同信息名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			contractcode: "合同编号",
+			contractmode: "合同类别",
+			contracttype: "合同类型",
+			begintime: "开始日期",
+			endtime: "结束日期",
+			mgrorganizationname: "合同管理单位",
+			signorganizationname: "合同签约单位",
+			contractstate: "合同状态",
 		},
 		uiactions: {
 		},

app_PIM/src/locale/lanres/entities/hreducation/hreducation_en_US.ts

@@ -40,6 +40,7 @@ export default {
 	},
 	main_form: {
 		details: {
+			rawitem1: "", 
 			group1: "教育信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
@@ -63,8 +64,8 @@ export default {
 			highdegreeflag: "是否最高学历", 
 			attachment2: "学位证", 
 			attachment1: "毕业证", 
-			attachment: "其他附件", 
 			attachment3: "学历验证", 
+			attachment: "其他附件", 
 			hremployeeid: "员工标识", 
 			hreducationid: "教育信息标识", 
 		},

app_PIM/src/locale/lanres/entities/hreducation/hreducation_zh_CN.ts

@@ -39,6 +39,7 @@ export default {
 	},
 	main_form: {
 		details: {
+			rawitem1: "", 
 			group1: "教育信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
@@ -62,8 +63,8 @@ export default {
 			highdegreeflag: "是否最高学历", 
 			attachment2: "学位证", 
 			attachment1: "毕业证", 
-			attachment: "其他附件", 
 			attachment3: "学历验证", 
+			attachment: "其他附件", 
 			hremployeeid: "员工标识", 
 			hreducationid: "教育信息标识", 
 		},

app_PIM/src/locale/lanres/entities/hrlanguage-ability/hrlanguage-ability_en_US.ts

@@ -50,9 +50,10 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			hrlanguageabilityname: "语言能力名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			languagetype: "语种",
+			languagelevel: "外语等级",
+			languagetime: "获取时间",
+			attachment: "附件",
 		},
 		uiactions: {
 		},

app_PIM/src/locale/lanres/entities/hrlanguage-ability/hrlanguage-ability_zh_CN.ts

@@ -49,9 +49,10 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			hrlanguageabilityname: "语言能力名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			languagetype: "语种",
+			languagelevel: "外语等级",
+			languagetime: "获取时间",
+			attachment: "附件",
 		},
 		uiactions: {
 		},

app_PIM/src/locale/lanres/entities/hrpaper/hrpaper_en_US.ts

@@ -5,9 +5,15 @@ export default {
     createman: "建立人",
     updatedate: "更新时间",
     updateman: "更新人",
-    hrpapername: "论文信息名称",
+    hrpapername: "论文名称",
     createdate: "建立时间",
     hremployeeid: "员工标识",
     hremployeename: "员工姓名",
+    activetime: "发表时间",
+    attachment: "附件",
+    publisher: "出版社",
+    publication: "刊物名称",
+    publicationnum: "刊物期数",
+    position: "个人在论文著作中排名",
   },
 };
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hrpaper/hrpaper_zh_CN.ts

@@ -4,9 +4,15 @@ export default {
     createman: "建立人",
     updatedate: "更新时间",
     updateman: "更新人",
-    hrpapername: "论文信息名称",
+    hrpapername: "论文名称",
     createdate: "建立时间",
     hremployeeid: "员工标识",
     hremployeename: "员工姓名",
+    activetime: "发表时间",
+    attachment: "附件",
+    publisher: "出版社",
+    publication: "刊物名称",
+    publicationnum: "刊物期数",
+    position: "个人在论文著作中排名",
   },
 };
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hrpatent/hrpatent_en_US.ts

@@ -3,11 +3,15 @@ export default {
   fields: {
     hrpatentid: "专利信息标识",
     createman: "建立人",
-    hrpatentname: "专利信息名称",
+    hrpatentname: "专利名称",
     createdate: "建立时间",
     updateman: "更新人",
     updatedate: "更新时间",
     hremployeeid: "员工标识",
     hremployeename: "员工姓名",
+    activetime: "获取时间",
+    attachment: "附件",
+    patentcode: "专利号",
+    patentcountry: "专利批准国别",
   },
 };
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hrpatent/hrpatent_zh_CN.ts

@@ -2,11 +2,15 @@ export default {
   fields: {
     hrpatentid: "专利信息标识",
     createman: "建立人",
-    hrpatentname: "专利信息名称",
+    hrpatentname: "专利名称",
     createdate: "建立时间",
     updateman: "更新人",
     updatedate: "更新时间",
     hremployeeid: "员工标识",
     hremployeename: "员工姓名",
+    activetime: "获取时间",
+    attachment: "附件",
+    patentcode: "专利号",
+    patentcountry: "专利批准国别",
   },
 };
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hrresearch/hrresearch_en_US.ts

@@ -9,6 +9,8 @@ export default {
     updateman: "更新人",
     hremployeeid: "员工标识",
     hremployeename: "员工姓名",
+    activetime: "获取时间",
+    attachment: "附件",
   },
 	views: {
 		editview: {
@@ -47,8 +49,8 @@ export default {
 	main_grid: {
 		columns: {
 			hrresearchname: "科研成果名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			activetime: "获取时间",
+			attachment: "附件",
 		},
 		uiactions: {
 		},

app_PIM/src/locale/lanres/entities/hrresearch/hrresearch_zh_CN.ts

@@ -8,6 +8,8 @@ export default {
     updateman: "更新人",
     hremployeeid: "员工标识",
     hremployeename: "员工姓名",
+    activetime: "获取时间",
+    attachment: "附件",
   },
 	views: {
 		editview: {
@@ -46,8 +48,8 @@ export default {
 	main_grid: {
 		columns: {
 			hrresearchname: "科研成果名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			activetime: "获取时间",
+			attachment: "附件",
 		},
 		uiactions: {
 		},

app_PIM/src/locale/lanres/entities/hrreward/hrreward_en_US.ts

 
 export default {
   fields: {
-    hrrewardname: "奖励惩罚名称",
+    hrrewardname: "奖惩名称",
     hrrewardid: "奖励惩罚标识",
     createman: "建立人",
     updatedate: "更新时间",
@@ -9,6 +9,13 @@ export default {
     updateman: "更新人",
     hremployeeid: "员工标识",
     hremployeename: "员工姓名",
+    rewardtype: "奖惩分类",
+    rewardlevel: "奖惩级别",
+    rewardmoney: "奖惩金额",
+    rewardtime: "奖惩时间",
+    authorganization: "授予单位",
+    attachment: "附件",
+    rewardevent: "奖惩事件",
   },
 	views: {
 		gridview: {
@@ -29,12 +36,12 @@ export default {
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "奖励惩罚标识", 
-			srfmajortext: "奖励惩罚名称", 
+			srfmajortext: "奖惩名称", 
 			srftempmode: "", 
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			hrrewardname: "奖励惩罚名称", 
+			hrrewardname: "奖惩名称", 
 			createman: "建立人", 
 			createdate: "建立时间", 
 			updateman: "更新人", 
@@ -46,9 +53,12 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			hrrewardname: "奖励惩罚名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			rewardtype: "奖惩分类",
+			hrrewardname: "奖惩名称",
+			rewardlevel: "奖惩级别",
+			rewardmoney: "奖惩金额",
+			rewardtime: "奖惩时间",
+			rewardevent: "奖惩事件",
 		},
 		uiactions: {
 		},

app_PIM/src/locale/lanres/entities/hrreward/hrreward_zh_CN.ts

 export default {
   fields: {
-    hrrewardname: "奖励惩罚名称",
+    hrrewardname: "奖惩名称",
     hrrewardid: "奖励惩罚标识",
     createman: "建立人",
     updatedate: "更新时间",
@@ -8,6 +8,13 @@ export default {
     updateman: "更新人",
     hremployeeid: "员工标识",
     hremployeename: "员工姓名",
+    rewardtype: "奖惩分类",
+    rewardlevel: "奖惩级别",
+    rewardmoney: "奖惩金额",
+    rewardtime: "奖惩时间",
+    authorganization: "授予单位",
+    attachment: "附件",
+    rewardevent: "奖惩事件",
   },
 	views: {
 		gridview: {
@@ -28,12 +35,12 @@ export default {
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "奖励惩罚标识", 
-			srfmajortext: "奖励惩罚名称", 
+			srfmajortext: "奖惩名称", 
 			srftempmode: "", 
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			hrrewardname: "奖励惩罚名称", 
+			hrrewardname: "奖惩名称", 
 			createman: "建立人", 
 			createdate: "建立时间", 
 			updateman: "更新人", 
@@ -45,9 +52,12 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			hrrewardname: "奖励惩罚名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			rewardtype: "奖惩分类",
+			hrrewardname: "奖惩名称",
+			rewardlevel: "奖惩级别",
+			rewardmoney: "奖惩金额",
+			rewardtime: "奖惩时间",
+			rewardevent: "奖惩事件",
 		},
 		uiactions: {
 		},

app_PIM/src/locale/lanres/entities/hrtechnical-title/hrtechnical-title_en_US.ts

@@ -6,9 +6,18 @@ export default {
     updatedate: "更新时间",
     updateman: "更新人",
     createdate: "建立时间",
-    hrtechnicaltitlename: "职称信息名称",
+    hrtechnicaltitlename: "职称名称",
     hremployeeid: "员工标识",
     hremployeename: "员工姓名",
+    titletime: "获取时间",
+    titlelevel: "职称等级",
+    majortype: "专业类别",
+    major: "专业名称",
+    authorganization: "签发机构",
+    validorganization: "评审机构",
+    hightitle: "最高职称",
+    attachment: "附件",
+    certificatecode: "证书编号",
   },
 	views: {
 		editview: {
@@ -29,12 +38,12 @@ export default {
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "职称信息标识", 
-			srfmajortext: "职称信息名称", 
+			srfmajortext: "职称名称", 
 			srftempmode: "", 
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			hrtechnicaltitlename: "职称信息名称", 
+			hrtechnicaltitlename: "职称名称", 
 			createman: "建立人", 
 			createdate: "建立时间", 
 			updateman: "更新人", 
@@ -46,9 +55,13 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			hrtechnicaltitlename: "职称信息名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			hrtechnicaltitlename: "职称名称",
+			titlelevel: "职称等级",
+			majortype: "专业类别",
+			major: "专业名称",
+			titletime: "获取时间",
+			authorganization: "签发机构",
+			hightitle: "最高职称",
 		},
 		uiactions: {
 		},

app_PIM/src/locale/lanres/entities/hrtechnical-title/hrtechnical-title_zh_CN.ts

@@ -5,9 +5,18 @@ export default {
     updatedate: "更新时间",
     updateman: "更新人",
     createdate: "建立时间",
-    hrtechnicaltitlename: "职称信息名称",
+    hrtechnicaltitlename: "职称名称",
     hremployeeid: "员工标识",
     hremployeename: "员工姓名",
+    titletime: "获取时间",
+    titlelevel: "职称等级",
+    majortype: "专业类别",
+    major: "专业名称",
+    authorganization: "签发机构",
+    validorganization: "评审机构",
+    hightitle: "最高职称",
+    attachment: "附件",
+    certificatecode: "证书编号",
   },
 	views: {
 		editview: {
@@ -28,12 +37,12 @@ export default {
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "职称信息标识", 
-			srfmajortext: "职称信息名称", 
+			srfmajortext: "职称名称", 
 			srftempmode: "", 
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			hrtechnicaltitlename: "职称信息名称", 
+			hrtechnicaltitlename: "职称名称", 
 			createman: "建立人", 
 			createdate: "建立时间", 
 			updateman: "更新人", 
@@ -45,9 +54,13 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			hrtechnicaltitlename: "职称信息名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			hrtechnicaltitlename: "职称名称",
+			titlelevel: "职称等级",
+			majortype: "专业类别",
+			major: "专业名称",
+			titletime: "获取时间",
+			authorganization: "签发机构",
+			hightitle: "最高职称",
 		},
 		uiactions: {
 		},

app_PIM/src/locale/lanres/entities/hrwork-record/hrwork-record_en_US.ts

@@ -53,9 +53,13 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			hrworkrecordname: "工作履历名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			begintime: "开始时间",
+			endtime: "结束时间",
+			workorganization: "工作单位",
+			workdepartment: "部门",
+			duty: "职务",
+			post: "职位",
+			mainwork: "主要经历",
 		},
 		uiactions: {
 		},

app_PIM/src/locale/lanres/entities/hrwork-record/hrwork-record_zh_CN.ts

@@ -52,9 +52,13 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			hrworkrecordname: "工作履历名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			begintime: "开始时间",
+			endtime: "结束时间",
+			workorganization: "工作单位",
+			workdepartment: "部门",
+			duty: "职务",
+			post: "职位",
+			mainwork: "主要经历",
 		},
 		uiactions: {
 		},

app_PIM/src/pages/human-resource/hrcertificate-grid-view/hrcertificate-grid-view.html

 <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">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>
     <template slot="searchForm">

app_PIM/src/pages/human-resource/hreducation-grid-view/hreducation-grid-view.html

 <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)"/>
     <template slot="toolbar">
                 <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

 <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">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>
     <template slot="searchForm">

app_PIM/src/pages/human-resource/hrtechnical-title-grid-view/hrtechnical-title-grid-view.html

 <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">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>
     <template slot="searchForm">

app_PIM/src/widgets/hrcertificate/main-form/main-form-base.tsx

@@ -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 }),
 
-        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 }),
 
@@ -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 }),
 
-        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 }),
 

app_PIM/src/widgets/hrcertificate/main-grid/main-grid-base.tsx

@@ -94,24 +94,64 @@ export class MainGridBase extends GridControlBase {
     public allColumns: any[] = [
         {
             name: 'hrcertificatename',
-            label: '证书信息名称',
+            label: '证书名称',
             langtag: 'entities.hrcertificate.main_grid.columns.hrcertificatename',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
         },
         {
-            name: 'updateman',
-            label: '更新人',
-            langtag: 'entities.hrcertificate.main_grid.columns.updateman',
+            name: 'certificatecode',
+            label: '证书编号',
+            langtag: 'entities.hrcertificate.main_grid.columns.certificatecode',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
         },
         {
-            name: 'updatedate',
-            label: '更新时间',
-            langtag: 'entities.hrcertificate.main_grid.columns.updatedate',
+            name: 'authdate',
+            label: '签发日期',
+            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,
             util: 'PX',
             isEnableRowEdit: false,
@@ -151,8 +191,13 @@ export class MainGridBase extends GridControlBase {
      */
     public hasRowEdit: any = {
         'hrcertificatename':false,
-        'updateman':false,
-        'updatedate':false,
+        'certificatecode':false,
+        'authdate':false,
+        'expiredate':false,
+        'authorganization':false,
+        'registercode':false,
+        'registerorganizationname':false,
+        'registertime':false,
     };
 
     /**
@@ -178,14 +223,6 @@ export class MainGridBase extends GridControlBase {
      */
     public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
         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

@@ -27,19 +27,24 @@ export default class MainModel {
     }else{
 		  return [
         {
-          name: 'hremployeeid',
-          prop: 'hremployeeid',
-          dataType: 'PICKUP',
+          name: 'registerorganizationname',
+          prop: 'registerorganizationname',
+          dataType: 'PICKUPTEXT',
         },
         {
-          name: 'updateman',
-          prop: 'updateman',
-          dataType: 'TEXT',
+          name: 'registertime',
+          prop: 'registertime',
+          dataType: 'DATE',
         },
         {
-          name: 'updatedate',
-          prop: 'updatedate',
-          dataType: 'DATETIME',
+          name: 'authdate',
+          prop: 'authdate',
+          dataType: 'DATE',
+        },
+        {
+          name: 'expiredate',
+          prop: 'expiredate',
+          dataType: 'DATE',
         },
         {
           name: 'srfmajortext',
@@ -47,21 +52,46 @@ export default class MainModel {
           dataType: 'TEXT',
         },
         {
-          name: 'srfdataaccaction',
+          name: 'srfkey',
           prop: 'hrcertificateid',
           dataType: 'GUID',
+          isEditable:true
         },
         {
-          name: 'srfkey',
+          name: 'srfdataaccaction',
           prop: 'hrcertificateid',
           dataType: 'GUID',
-          isEditable:true
         },
         {
           name: 'hrcertificatename',
           prop: 'hrcertificatename',
           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',
           prop: 'hrcertificateid',

app_PIM/src/widgets/hrcertificate/main-grid/main-grid.html

@@ -35,29 +35,87 @@
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updateman')">
-                <el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hrcertificate.main_grid.columns.updateman')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('certificatecode')">
+                <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}">
                       <span class="column-header ">
-                        {{$t('entities.hrcertificate.main_grid.columns.updateman')}}
+                        {{$t('entities.hrcertificate.main_grid.columns.certificatecode')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <template >
-            <codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
-                        </template>
+                        <span>{{row.certificatecode}}</span>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updatedate')">
-                <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hrcertificate.main_grid.columns.updatedate')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('authdate')">
+                <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}">
                       <span class="column-header ">
-                        {{$t('entities.hrcertificate.main_grid.columns.updatedate')}}
+                        {{$t('entities.hrcertificate.main_grid.columns.authdate')}}
                       </span>
                     </template>
                     <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>
                 </el-table-column>
             </template>

app_PIM/src/widgets/hrcontract/main-grid/main-grid-base.tsx

@@ -93,25 +93,65 @@ export class MainGridBase extends GridControlBase {
      */
     public allColumns: any[] = [
         {
-            name: 'hrcontractname',
-            label: '合同信息名称',
-            langtag: 'entities.hrcontract.main_grid.columns.hrcontractname',
+            name: 'contractcode',
+            label: '合同编号',
+            langtag: 'entities.hrcontract.main_grid.columns.contractcode',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
         },
         {
-            name: 'updateman',
-            label: '更新人',
-            langtag: 'entities.hrcontract.main_grid.columns.updateman',
+            name: 'contractmode',
+            label: '合同类别',
+            langtag: 'entities.hrcontract.main_grid.columns.contractmode',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
         },
         {
-            name: 'updatedate',
-            label: '更新时间',
-            langtag: 'entities.hrcontract.main_grid.columns.updatedate',
+            name: 'contracttype',
+            label: '合同类型',
+            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,
             util: 'PX',
             isEnableRowEdit: false,
@@ -150,9 +190,14 @@ export class MainGridBase extends GridControlBase {
      * @memberof MainBase
      */
     public hasRowEdit: any = {
-        'hrcontractname':false,
-        'updateman':false,
-        'updatedate':false,
+        'contractcode':false,
+        'contractmode':false,
+        'contracttype':false,
+        'begintime':false,
+        'endtime':false,
+        'mgrorganizationname':false,
+        'signorganizationname':false,
+        'contractstate':false,
     };
 
     /**
@@ -178,14 +223,6 @@ export class MainGridBase extends GridControlBase {
      */
     public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
         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

@@ -27,19 +27,29 @@ export default class MainModel {
     }else{
 		  return [
         {
-          name: 'hremployeeid',
-          prop: 'hremployeeid',
-          dataType: 'PICKUP',
+          name: 'endtime',
+          prop: 'endtime',
+          dataType: 'DATE',
+        },
+        {
+          name: 'mgrorganizationname',
+          prop: 'mgrorganizationname',
+          dataType: 'PICKUPTEXT',
         },
         {
-          name: 'updateman',
-          prop: 'updateman',
+          name: 'contractcode',
+          prop: 'contractcode',
           dataType: 'TEXT',
         },
         {
-          name: 'updatedate',
-          prop: 'updatedate',
-          dataType: 'DATETIME',
+          name: 'begintime',
+          prop: 'begintime',
+          dataType: 'DATE',
+        },
+        {
+          name: 'mgrorganizationid',
+          prop: 'mgrorganizationid',
+          dataType: 'PICKUP',
         },
         {
           name: 'srfmajortext',
@@ -47,20 +57,45 @@ export default class MainModel {
           dataType: 'TEXT',
         },
         {
-          name: 'srfdataaccaction',
+          name: 'srfkey',
           prop: 'hrcontractid',
           dataType: 'GUID',
+          isEditable:true
         },
         {
-          name: 'srfkey',
+          name: 'srfdataaccaction',
           prop: 'hrcontractid',
           dataType: 'GUID',
-          isEditable:true
         },
         {
-          name: 'hrcontractname',
-          prop: 'hrcontractname',
-          dataType: 'TEXT',
+          name: 'signorganizationid',
+          prop: 'signorganizationid',
+          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',

app_PIM/src/widgets/hrcontract/main-grid/main-grid.html

@@ -23,41 +23,99 @@
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
-            <template v-if="getColumnState('hrcontractname')">
-                <el-table-column show-overflow-tooltip :prop="'hrcontractname'" :label="$t('entities.hrcontract.main_grid.columns.hrcontractname')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('contractcode')">
+                <el-table-column show-overflow-tooltip :prop="'contractcode'" :label="$t('entities.hrcontract.main_grid.columns.contractcode')" :width="120"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.hrcontract.main_grid.columns.hrcontractname')}}
+                        {{$t('entities.hrcontract.main_grid.columns.contractcode')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.hrcontractname}}</span>
+                        <span>{{row.contractcode}}</span>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updateman')">
-                <el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hrcontract.main_grid.columns.updateman')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('contractmode')">
+                <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}">
                       <span class="column-header ">
-                        {{$t('entities.hrcontract.main_grid.columns.updateman')}}
+                        {{$t('entities.hrcontract.main_grid.columns.contractmode')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <template >
-            <codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
-                        </template>
+                        <span>{{row.contractmode}}</span>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updatedate')">
-                <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hrcontract.main_grid.columns.updatedate')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('contracttype')">
+                <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}">
                       <span class="column-header ">
-                        {{$t('entities.hrcontract.main_grid.columns.updatedate')}}
+                        {{$t('entities.hrcontract.main_grid.columns.contracttype')}}
                       </span>
                     </template>
                     <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>
                 </el-table-column>
             </template>

app_PIM/src/widgets/hreducation/main-form/main-form-base.tsx

@@ -95,8 +95,8 @@ export class MainEditFormBase extends EditFormControlBase {
         highdegreeflag: null,
         attachment2: null,
         attachment1: null,
-        attachment: null,
         attachment3: null,
+        attachment: null,
         hremployeeid: null,
         hreducationid: null,
         hreducation:null,
@@ -139,6 +139,8 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     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: [] } }),
 
         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 {
 
         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 }),
 
+        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 }),
 
         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

@@ -121,13 +121,13 @@ export default class MainModel {
         dataType: 'TEXT',
       },
       {
-        name: 'attachment',
-        prop: 'attachment',
+        name: 'attachment3',
+        prop: 'attachment3',
         dataType: 'TEXT',
       },
       {
-        name: 'attachment3',
-        prop: 'attachment3',
+        name: 'attachment',
+        prop: 'attachment',
         dataType: 'TEXT',
       },
       {

app_PIM/src/widgets/hreducation/main-form/main-form.html

@@ -6,7 +6,7 @@
     <app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hreducation.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group1" :data="data" :context="context" :viewparams="viewparams"/>
     <row>
-        <i-col class="form-layout-container" v-show="detailsModel.hremployeename.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+        <i-col class="form-layout-container" v-show="detailsModel.hremployeename.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
     <app-form-item name='hremployeename' :itemRules="this.rules.hremployeename" class='' :caption="$t('entities.hreducation.main_form.details.hremployeename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.hremployeename.error" :isEmptyCaption="false" labelPos="LEFT">
     
 <app-picker 
@@ -32,7 +32,13 @@
 </app-form-item>
 
 </i-col>
-<i-col class="form-layout-container" v-show="detailsModel.degree.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+<i-col class="form-layout-container" v-show="detailsModel.rawitem1.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
+    <div class="" style="">
+    
+</div>
+
+</i-col>
+<i-col class="form-layout-container" v-show="detailsModel.degree.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
     <app-form-item name='degree' :itemRules="this.rules.degree" class='' :caption="$t('entities.hreducation.main_form.details.degree')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.degree.error" :isEmptyCaption="false" labelPos="LEFT">
     
 <dropdown-list 
@@ -52,21 +58,21 @@
 </app-form-item>
 
 </i-col>
-<i-col class="form-layout-container" v-show="detailsModel.begintime.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+<i-col class="form-layout-container" v-show="detailsModel.begintime.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
     <app-form-item name='begintime' :itemRules="this.rules.begintime" class='' :caption="$t('entities.hreducation.main_form.details.begintime')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.begintime.error" :isEmptyCaption="false" labelPos="LEFT">
     <date-picker type="date" :transfer="true" format="yyyy-MM-dd" placeholder="请选择时间..." :value="data.begintime" :disabled="detailsModel.begintime.disabled" style="min-width: 150px; width:100px;" @on-change="(val1, val2) => { this.data.begintime = val1 }"></date-picker>
 
 </app-form-item>
 
 </i-col>
-<i-col class="form-layout-container" v-show="detailsModel.endtime.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+<i-col class="form-layout-container" v-show="detailsModel.endtime.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
     <app-form-item name='endtime' :itemRules="this.rules.endtime" class='' :caption="$t('entities.hreducation.main_form.details.endtime')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.endtime.error" :isEmptyCaption="false" labelPos="LEFT">
     <date-picker type="date" :transfer="true" format="yyyy-MM-dd" placeholder="请选择时间..." :value="data.endtime" :disabled="detailsModel.endtime.disabled" style="min-width: 150px; width:100px;" @on-change="(val1, val2) => { this.data.endtime = val1 }"></date-picker>
 
 </app-form-item>
 
 </i-col>
-<i-col class="form-layout-container" v-show="detailsModel.school.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+<i-col class="form-layout-container" v-show="detailsModel.school.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
     <app-form-item name='school' :itemRules="this.rules.school" class='' :caption="$t('entities.hreducation.main_form.details.school')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.school.error" :isEmptyCaption="false" labelPos="LEFT">
     <input-box 
     v-model="data.school"  
@@ -80,7 +86,7 @@
 </app-form-item>
 
 </i-col>
-<i-col class="form-layout-container" v-show="detailsModel.subject.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+<i-col class="form-layout-container" v-show="detailsModel.subject.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
     <app-form-item name='subject' :itemRules="this.rules.subject" class='' :caption="$t('entities.hreducation.main_form.details.subject')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.subject.error" :isEmptyCaption="false" labelPos="LEFT">
     <input-box 
     v-model="data.subject"  
@@ -94,7 +100,7 @@
 </app-form-item>
 
 </i-col>
-<i-col class="form-layout-container" v-show="detailsModel.major.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+<i-col class="form-layout-container" v-show="detailsModel.major.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
     <app-form-item name='major' :itemRules="this.rules.major" class='' :caption="$t('entities.hreducation.main_form.details.major')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.major.error" :isEmptyCaption="false" labelPos="LEFT">
     <input-box 
     v-model="data.major"  
@@ -108,7 +114,7 @@
 </app-form-item>
 
 </i-col>
-<i-col class="form-layout-container" v-show="detailsModel.learnmodality.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+<i-col class="form-layout-container" v-show="detailsModel.learnmodality.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
     <app-form-item name='learnmodality' :itemRules="this.rules.learnmodality" class='' :caption="$t('entities.hreducation.main_form.details.learnmodality')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.learnmodality.error" :isEmptyCaption="false" labelPos="LEFT">
     
 <dropdown-list 
@@ -126,7 +132,7 @@
 </app-form-item>
 
 </i-col>
-<i-col class="form-layout-container" v-show="detailsModel.schooltype.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+<i-col class="form-layout-container" v-show="detailsModel.schooltype.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
     <app-form-item name='schooltype' :itemRules="this.rules.schooltype" class='' :caption="$t('entities.hreducation.main_form.details.schooltype')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.schooltype.error" :isEmptyCaption="false" labelPos="LEFT">
     
 <dropdown-list 
@@ -146,65 +152,39 @@
 </i-col>
 <i-col class="form-layout-container" v-show="detailsModel.firstdegreeflag.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
     <app-form-item name='firstdegreeflag' :itemRules="this.rules.firstdegreeflag" class='' :caption="$t('entities.hreducation.main_form.details.firstdegreeflag')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.firstdegreeflag.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<dropdown-list 
-    v-model="data.firstdegreeflag"
-    :data="data"
-    :context="context"
-    :viewparams="viewparams"
-    :localContext ='{ }' 
-    :localParam ='{ }' 
-    :disabled="detailsModel.firstdegreeflag.disabled"
-    style="width:100px;width: 100px;"
-    valueType="number"
-    tag='YesNo' 
-    codelistType='STATIC'
-    placeholder='请选择...'
-/>
+    <app-switch name='firstdegreeflag' :value="this.data.firstdegreeflag" @change="($event)=>{this.data.firstdegreeflag = $event} " :disabled="detailsModel.firstdegreeflag.disabled" style=""></app-switch>
+
 </app-form-item>
 
 </i-col>
 <i-col class="form-layout-container" v-show="detailsModel.highdegreeflag.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
     <app-form-item name='highdegreeflag' :itemRules="this.rules.highdegreeflag" class='' :caption="$t('entities.hreducation.main_form.details.highdegreeflag')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.highdegreeflag.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<dropdown-list 
-    v-model="data.highdegreeflag"
-    :data="data"
-    :context="context"
-    :viewparams="viewparams"
-    :localContext ='{ }' 
-    :localParam ='{ }' 
-    :disabled="detailsModel.highdegreeflag.disabled"
-    style="width:100px;width: 100px;"
-    valueType="number"
-    tag='YesNo' 
-    codelistType='STATIC'
-    placeholder='请选择...'
-/>
+    <app-switch name='highdegreeflag' :value="this.data.highdegreeflag" @change="($event)=>{this.data.highdegreeflag = $event} " :disabled="detailsModel.highdegreeflag.disabled" style=""></app-switch>
+
 </app-form-item>
 
 </i-col>
-<i-col class="form-layout-container" v-show="detailsModel.attachment2.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+<i-col class="form-layout-container" v-show="detailsModel.attachment2.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
     <app-form-item name='attachment2' :itemRules="this.rules.attachment2" class='' :caption="$t('entities.hreducation.main_form.details.attachment2')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.attachment2.error" :isEmptyCaption="false" labelPos="LEFT">
      <app-image-upload :multiple="true" :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange($event)" :data="JSON.stringify(this.data)" name='attachment2' :value="data.attachment2" :disabled="detailsModel.attachment2.disabled" :uploadparams='{}' :exportparams='{}' style="overflow: auto;"></app-image-upload>
 </app-form-item>
 
 </i-col>
-<i-col class="form-layout-container" v-show="detailsModel.attachment1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+<i-col class="form-layout-container" v-show="detailsModel.attachment1.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
     <app-form-item name='attachment1' :itemRules="this.rules.attachment1" class='' :caption="$t('entities.hreducation.main_form.details.attachment1')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.attachment1.error" :isEmptyCaption="false" labelPos="LEFT">
      <app-image-upload :multiple="true" :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange($event)" :data="JSON.stringify(this.data)" name='attachment1' :value="data.attachment1" :disabled="detailsModel.attachment1.disabled" :uploadparams='{}' :exportparams='{}' style="overflow: auto;"></app-image-upload>
 </app-form-item>
 
 </i-col>
-<i-col class="form-layout-container" v-show="detailsModel.attachment.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='attachment' :itemRules="this.rules.attachment" class='' :caption="$t('entities.hreducation.main_form.details.attachment')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.attachment.error" :isEmptyCaption="false" labelPos="LEFT">
-     <app-image-upload :multiple="true" :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange($event)" :data="JSON.stringify(this.data)" name='attachment' :value="data.attachment" :disabled="detailsModel.attachment.disabled" :uploadparams='{}' :exportparams='{}' style="overflow: auto;"></app-image-upload>
+<i-col class="form-layout-container" v-show="detailsModel.attachment3.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
+    <app-form-item name='attachment3' :itemRules="this.rules.attachment3" class='' :caption="$t('entities.hreducation.main_form.details.attachment3')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.attachment3.error" :isEmptyCaption="false" labelPos="LEFT">
+     <app-image-upload :multiple="true" :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange($event)" :data="JSON.stringify(this.data)" name='attachment3' :value="data.attachment3" :disabled="detailsModel.attachment3.disabled" :uploadparams='{}' :exportparams='{}' style="overflow: auto;"></app-image-upload>
 </app-form-item>
 
 </i-col>
-<i-col class="form-layout-container" v-show="detailsModel.attachment3.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='attachment3' :itemRules="this.rules.attachment3" class='' :caption="$t('entities.hreducation.main_form.details.attachment3')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.attachment3.error" :isEmptyCaption="false" labelPos="LEFT">
-     <app-image-upload :multiple="true" :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange($event)" :data="JSON.stringify(this.data)" name='attachment3' :value="data.attachment3" :disabled="detailsModel.attachment3.disabled" :uploadparams='{}' :exportparams='{}' style="overflow: auto;"></app-image-upload>
+<i-col class="form-layout-container" v-show="detailsModel.attachment.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
+    <app-form-item name='attachment' :itemRules="this.rules.attachment" class='' :caption="$t('entities.hreducation.main_form.details.attachment')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.attachment.error" :isEmptyCaption="false" labelPos="LEFT">
+     <app-image-upload :multiple="true" :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange($event)" :data="JSON.stringify(this.data)" name='attachment' :value="data.attachment" :disabled="detailsModel.attachment.disabled" :uploadparams='{}' :exportparams='{}' style="overflow: auto;"></app-image-upload>
 </app-form-item>
 
 </i-col>

app_PIM/src/widgets/hrlanguage-ability/main-grid/main-grid-base.tsx

@@ -93,25 +93,33 @@ export class MainGridBase extends GridControlBase {
      */
     public allColumns: any[] = [
         {
-            name: 'hrlanguageabilityname',
-            label: '语言能力名称',
-            langtag: 'entities.hrlanguageability.main_grid.columns.hrlanguageabilityname',
+            name: 'languagetype',
+            label: '语种',
+            langtag: 'entities.hrlanguageability.main_grid.columns.languagetype',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
         },
         {
-            name: 'updateman',
-            label: '更新人',
-            langtag: 'entities.hrlanguageability.main_grid.columns.updateman',
+            name: 'languagelevel',
+            label: '外语等级',
+            langtag: 'entities.hrlanguageability.main_grid.columns.languagelevel',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
         },
         {
-            name: 'updatedate',
-            label: '更新时间',
-            langtag: 'entities.hrlanguageability.main_grid.columns.updatedate',
+            name: 'languagetime',
+            label: '获取时间',
+            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,
             util: 'PX',
             isEnableRowEdit: false,
@@ -150,9 +158,10 @@ export class MainGridBase extends GridControlBase {
      * @memberof MainBase
      */
     public hasRowEdit: any = {
-        'hrlanguageabilityname':false,
-        'updateman':false,
-        'updatedate':false,
+        'languagetype':false,
+        'languagelevel':false,
+        'languagetime':false,
+        'attachment':false,
     };
 
     /**
@@ -178,14 +187,6 @@ export class MainGridBase extends GridControlBase {
      */
     public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
         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

@@ -32,14 +32,14 @@ export default class MainModel {
           dataType: 'PICKUP',
         },
         {
-          name: 'updateman',
-          prop: 'updateman',
-          dataType: 'TEXT',
+          name: 'languagetime',
+          prop: 'languagetime',
+          dataType: 'DATE',
         },
         {
-          name: 'updatedate',
-          prop: 'updatedate',
-          dataType: 'DATETIME',
+          name: 'attachment',
+          prop: 'attachment',
+          dataType: 'TEXT',
         },
         {
           name: 'srfmajortext',
@@ -58,9 +58,14 @@ export default class MainModel {
           isEditable:true
         },
         {
-          name: 'hrlanguageabilityname',
-          prop: 'hrlanguageabilityname',
-          dataType: 'TEXT',
+          name: 'languagelevel',
+          prop: 'languagelevel',
+          dataType: 'SSCODELIST',
+        },
+        {
+          name: 'languagetype',
+          prop: 'languagetype',
+          dataType: 'SSCODELIST',
         },
         {
           name: 'hrlanguageability',

app_PIM/src/widgets/hrlanguage-ability/main-grid/main-grid.html

@@ -23,41 +23,51 @@
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
-            <template v-if="getColumnState('hrlanguageabilityname')">
-                <el-table-column show-overflow-tooltip :prop="'hrlanguageabilityname'" :label="$t('entities.hrlanguageability.main_grid.columns.hrlanguageabilityname')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('languagetype')">
+                <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}">
                       <span class="column-header ">
-                        {{$t('entities.hrlanguageability.main_grid.columns.hrlanguageabilityname')}}
+                        {{$t('entities.hrlanguageability.main_grid.columns.languagetype')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.hrlanguageabilityname}}</span>
+                        <span>{{row.languagetype}}</span>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updateman')">
-                <el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hrlanguageability.main_grid.columns.updateman')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('languagelevel')">
+                <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}">
                       <span class="column-header ">
-                        {{$t('entities.hrlanguageability.main_grid.columns.updateman')}}
+                        {{$t('entities.hrlanguageability.main_grid.columns.languagelevel')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <template >
-            <codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
-                        </template>
+                        <span>{{row.languagelevel}}</span>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updatedate')">
-                <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hrlanguageability.main_grid.columns.updatedate')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('languagetime')">
+                <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}">
                       <span class="column-header ">
-                        {{$t('entities.hrlanguageability.main_grid.columns.updatedate')}}
+                        {{$t('entities.hrlanguageability.main_grid.columns.languagetime')}}
                       </span>
                     </template>
                     <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>
                 </el-table-column>
             </template>

app_PIM/src/widgets/hrresearch/main-grid/main-grid-base.tsx

@@ -101,17 +101,17 @@ export class MainGridBase extends GridControlBase {
             isEnableRowEdit: false,
         },
         {
-            name: 'updateman',
-            label: '更新人',
-            langtag: 'entities.hrresearch.main_grid.columns.updateman',
+            name: 'activetime',
+            label: '获取时间',
+            langtag: 'entities.hrresearch.main_grid.columns.activetime',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
         },
         {
-            name: 'updatedate',
-            label: '更新时间',
-            langtag: 'entities.hrresearch.main_grid.columns.updatedate',
+            name: 'attachment',
+            label: '附件',
+            langtag: 'entities.hrresearch.main_grid.columns.attachment',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
@@ -151,8 +151,8 @@ export class MainGridBase extends GridControlBase {
      */
     public hasRowEdit: any = {
         'hrresearchname':false,
-        'updateman':false,
-        'updatedate':false,
+        'activetime':false,
+        'attachment':false,
     };
 
     /**
@@ -178,14 +178,6 @@ export class MainGridBase extends GridControlBase {
      */
     public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
         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

@@ -32,8 +32,13 @@ export default class MainModel {
           dataType: 'PICKUP',
         },
         {
-          name: 'updateman',
-          prop: 'updateman',
+          name: 'activetime',
+          prop: 'activetime',
+          dataType: 'DATE',
+        },
+        {
+          name: 'attachment',
+          prop: 'attachment',
           dataType: 'TEXT',
         },
         {
@@ -41,11 +46,6 @@ export default class MainModel {
           prop: 'hrresearchname',
           dataType: 'TEXT',
         },
-        {
-          name: 'updatedate',
-          prop: 'updatedate',
-          dataType: 'DATETIME',
-        },
         {
           name: 'srfmajortext',
           prop: 'hrresearchname',

app_PIM/src/widgets/hrresearch/main-grid/main-grid.html

@@ -35,29 +35,27 @@
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updateman')">
-                <el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hrresearch.main_grid.columns.updateman')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('activetime')">
+                <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}">
                       <span class="column-header ">
-                        {{$t('entities.hrresearch.main_grid.columns.updateman')}}
+                        {{$t('entities.hrresearch.main_grid.columns.activetime')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <template >
-            <codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
-                        </template>
+                        <app-format-data format="YYYY-MM-DD" :data="row.activetime"></app-format-data>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updatedate')">
-                <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hrresearch.main_grid.columns.updatedate')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('attachment')">
+                <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}">
                       <span class="column-header ">
-                        {{$t('entities.hrresearch.main_grid.columns.updatedate')}}
+                        {{$t('entities.hrresearch.main_grid.columns.attachment')}}
                       </span>
                     </template>
                     <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>
                 </el-table-column>
             </template>

app_PIM/src/widgets/hrreward/main-form/main-form-base.tsx

@@ -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 }),
 
-        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 }),
 
@@ -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 }),
 
-        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 }),
 

app_PIM/src/widgets/hrreward/main-grid/main-grid-base.tsx

@@ -92,26 +92,50 @@ export class MainGridBase extends GridControlBase {
      * @memberof MainGridBase
      */
     public allColumns: any[] = [
+        {
+            name: 'rewardtype',
+            label: '奖惩分类',
+            langtag: 'entities.hrreward.main_grid.columns.rewardtype',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
         {
             name: 'hrrewardname',
-            label: '奖励惩罚名称',
+            label: '奖惩名称',
             langtag: 'entities.hrreward.main_grid.columns.hrrewardname',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
         },
         {
-            name: 'updateman',
-            label: '更新人',
-            langtag: 'entities.hrreward.main_grid.columns.updateman',
+            name: 'rewardlevel',
+            label: '奖惩级别',
+            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,
             util: 'PX',
             isEnableRowEdit: false,
         },
         {
-            name: 'updatedate',
-            label: '更新时间',
-            langtag: 'entities.hrreward.main_grid.columns.updatedate',
+            name: 'rewardevent',
+            label: '奖惩事件',
+            langtag: 'entities.hrreward.main_grid.columns.rewardevent',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
@@ -150,9 +174,12 @@ export class MainGridBase extends GridControlBase {
      * @memberof MainBase
      */
     public hasRowEdit: any = {
+        'rewardtype':false,
         'hrrewardname':false,
-        'updateman':false,
-        'updatedate':false,
+        'rewardlevel':false,
+        'rewardmoney':false,
+        'rewardtime':false,
+        'rewardevent':false,
     };
 
     /**
@@ -178,14 +205,6 @@ export class MainGridBase extends GridControlBase {
      */
     public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
         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

@@ -26,15 +26,30 @@ export default class MainModel {
       ]
     }else{
 		  return [
+        {
+          name: 'rewardlevel',
+          prop: 'rewardlevel',
+          dataType: 'SSCODELIST',
+        },
         {
           name: 'hremployeeid',
           prop: 'hremployeeid',
           dataType: 'PICKUP',
         },
         {
-          name: 'updateman',
-          prop: 'updateman',
-          dataType: 'TEXT',
+          name: 'rewardmoney',
+          prop: 'rewardmoney',
+          dataType: 'DECIMAL',
+        },
+        {
+          name: 'rewardtype',
+          prop: 'rewardtype',
+          dataType: 'SSCODELIST',
+        },
+        {
+          name: 'rewardevent',
+          prop: 'rewardevent',
+          dataType: 'LONGTEXT_1000',
         },
         {
           name: 'hrrewardname',
@@ -42,9 +57,9 @@ export default class MainModel {
           dataType: 'TEXT',
         },
         {
-          name: 'updatedate',
-          prop: 'updatedate',
-          dataType: 'DATETIME',
+          name: 'rewardtime',
+          prop: 'rewardtime',
+          dataType: 'DATE',
         },
         {
           name: 'srfmajortext',

app_PIM/src/widgets/hrreward/main-grid/main-grid.html

@@ -23,6 +23,18 @@
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </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')">
                 <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}">
@@ -35,29 +47,51 @@
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updateman')">
-                <el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hrreward.main_grid.columns.updateman')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('rewardlevel')">
+                <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}">
                       <span class="column-header ">
-                        {{$t('entities.hrreward.main_grid.columns.updateman')}}
+                        {{$t('entities.hrreward.main_grid.columns.rewardtime')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <template >
-            <codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
-                        </template>
+                        <app-format-data format="YYYY-MM-DD" :data="row.rewardtime"></app-format-data>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updatedate')">
-                <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hrreward.main_grid.columns.updatedate')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('rewardevent')">
+                <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}">
                       <span class="column-header ">
-                        {{$t('entities.hrreward.main_grid.columns.updatedate')}}
+                        {{$t('entities.hrreward.main_grid.columns.rewardevent')}}
                       </span>
                     </template>
                     <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>
                 </el-table-column>
             </template>

app_PIM/src/widgets/hrtechnical-title/main-form/main-form-base.tsx

@@ -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 }),
 
-        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 }),
 
@@ -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 }),
 
-        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 }),
 

app_PIM/src/widgets/hrtechnical-title/main-grid/main-grid-base.tsx

@@ -94,24 +94,56 @@ export class MainGridBase extends GridControlBase {
     public allColumns: any[] = [
         {
             name: 'hrtechnicaltitlename',
-            label: '职称信息名称',
+            label: '职称名称',
             langtag: 'entities.hrtechnicaltitle.main_grid.columns.hrtechnicaltitlename',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
         },
         {
-            name: 'updateman',
-            label: '更新人',
-            langtag: 'entities.hrtechnicaltitle.main_grid.columns.updateman',
+            name: 'titlelevel',
+            label: '职称等级',
+            langtag: 'entities.hrtechnicaltitle.main_grid.columns.titlelevel',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
         },
         {
-            name: 'updatedate',
-            label: '更新时间',
-            langtag: 'entities.hrtechnicaltitle.main_grid.columns.updatedate',
+            name: 'majortype',
+            label: '专业类别',
+            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,
             util: 'PX',
             isEnableRowEdit: false,
@@ -151,8 +183,12 @@ export class MainGridBase extends GridControlBase {
      */
     public hasRowEdit: any = {
         'hrtechnicaltitlename':false,
-        'updateman':false,
-        'updatedate':false,
+        'titlelevel':false,
+        'majortype':false,
+        'major':false,
+        'titletime':false,
+        'authorganization':false,
+        'hightitle':false,
     };
 
     /**
@@ -179,9 +215,9 @@ export class MainGridBase extends GridControlBase {
     public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
         return super.formatExcelData(filterVal, jsonData, [
             {
-                name: 'updateman',
-                srfkey: 'SysOperator',
-                codelistType : 'DYNAMIC',
+                name: 'hightitle',
+                srfkey: 'YesNo',
+                codelistType : 'STATIC',
                 renderMode: 'other',
                 textSeparator: '、',
                 valueSeparator: ',',

app_PIM/src/widgets/hrtechnical-title/main-grid/main-grid-model.ts

@@ -26,14 +26,29 @@ export default class MainModel {
       ]
     }else{
 		  return [
+        {
+          name: 'hightitle',
+          prop: 'hightitle',
+          dataType: 'YESNO',
+        },
         {
           name: 'hremployeeid',
           prop: 'hremployeeid',
           dataType: 'PICKUP',
         },
         {
-          name: 'updateman',
-          prop: 'updateman',
+          name: 'titlelevel',
+          prop: 'titlelevel',
+          dataType: 'SSCODELIST',
+        },
+        {
+          name: 'titletime',
+          prop: 'titletime',
+          dataType: 'DATE',
+        },
+        {
+          name: 'majortype',
+          prop: 'majortype',
           dataType: 'TEXT',
         },
         {
@@ -42,9 +57,9 @@ export default class MainModel {
           dataType: 'TEXT',
         },
         {
-          name: 'updatedate',
-          prop: 'updatedate',
-          dataType: 'DATETIME',
+          name: 'authorganization',
+          prop: 'authorganization',
+          dataType: 'TEXT',
         },
         {
           name: 'srfmajortext',
@@ -62,6 +77,11 @@ export default class MainModel {
           dataType: 'GUID',
           isEditable:true
         },
+        {
+          name: 'major',
+          prop: 'major',
+          dataType: 'TEXT',
+        },
         {
           name: 'hrtechnicaltitle',
           prop: 'hrtechnicaltitleid',

app_PIM/src/widgets/hrtechnical-title/main-grid/main-grid.html

@@ -35,29 +35,77 @@
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updateman')">
-                <el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hrtechnicaltitle.main_grid.columns.updateman')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('titlelevel')">
+                <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}">
                       <span class="column-header ">
-                        {{$t('entities.hrtechnicaltitle.main_grid.columns.updateman')}}
+                        {{$t('entities.hrtechnicaltitle.main_grid.columns.titlelevel')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <template >
-            <codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
-                        </template>
+                        <span>{{row.titlelevel}}</span>
+                    </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>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updatedate')">
-                <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hrtechnicaltitle.main_grid.columns.updatedate')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('titletime')">
+                <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}">
                       <span class="column-header ">
-                        {{$t('entities.hrtechnicaltitle.main_grid.columns.updatedate')}}
+                        {{$t('entities.hrtechnicaltitle.main_grid.columns.titletime')}}
                       </span>
                     </template>
                     <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>
                 </el-table-column>
             </template>

app_PIM/src/widgets/hrwork-record/main-grid/main-grid-base.tsx

@@ -93,25 +93,57 @@ export class MainGridBase extends GridControlBase {
      */
     public allColumns: any[] = [
         {
-            name: 'hrworkrecordname',
-            label: '工作履历名称',
-            langtag: 'entities.hrworkrecord.main_grid.columns.hrworkrecordname',
+            name: 'begintime',
+            label: '开始时间',
+            langtag: 'entities.hrworkrecord.main_grid.columns.begintime',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
         },
         {
-            name: 'updateman',
-            label: '更新人',
-            langtag: 'entities.hrworkrecord.main_grid.columns.updateman',
+            name: 'endtime',
+            label: '结束时间',
+            langtag: 'entities.hrworkrecord.main_grid.columns.endtime',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
         },
         {
-            name: 'updatedate',
-            label: '更新时间',
-            langtag: 'entities.hrworkrecord.main_grid.columns.updatedate',
+            name: 'workorganization',
+            label: '工作单位',
+            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,
             util: 'PX',
             isEnableRowEdit: false,
@@ -150,9 +182,13 @@ export class MainGridBase extends GridControlBase {
      * @memberof MainBase
      */
     public hasRowEdit: any = {
-        'hrworkrecordname':false,
-        'updateman':false,
-        'updatedate':false,
+        'begintime':false,
+        'endtime':false,
+        'workorganization':false,
+        'workdepartment':false,
+        'duty':false,
+        'post':false,
+        'mainwork':false,
     };
 
     /**
@@ -179,9 +215,9 @@ export class MainGridBase extends GridControlBase {
     public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
         return super.formatExcelData(filterVal, jsonData, [
             {
-                name: 'updateman',
-                srfkey: 'SysOperator',
-                codelistType : 'DYNAMIC',
+                name: 'mainwork',
+                srfkey: 'YesNo',
+                codelistType : 'STATIC',
                 renderMode: 'other',
                 textSeparator: '、',
                 valueSeparator: ',',

app_PIM/src/widgets/hrwork-record/main-grid/main-grid-model.ts

@@ -27,8 +27,13 @@ export default class MainModel {
     }else{
 		  return [
         {
-          name: 'hrworkrecordname',
-          prop: 'hrworkrecordname',
+          name: 'endtime',
+          prop: 'endtime',
+          dataType: 'DATE',
+        },
+        {
+          name: 'workorganization',
+          prop: 'workorganization',
           dataType: 'TEXT',
         },
         {
@@ -37,14 +42,29 @@ export default class MainModel {
           dataType: 'PICKUP',
         },
         {
-          name: 'updateman',
-          prop: 'updateman',
+          name: 'post',
+          prop: 'post',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'workdepartment',
+          prop: 'workdepartment',
           dataType: 'TEXT',
         },
         {
-          name: 'updatedate',
-          prop: 'updatedate',
-          dataType: 'DATETIME',
+          name: 'duty',
+          prop: 'duty',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'begintime',
+          prop: 'begintime',
+          dataType: 'DATE',
+        },
+        {
+          name: 'mainwork',
+          prop: 'mainwork',
+          dataType: 'YESNO',
         },
         {
           name: 'srfmajortext',

app_PIM/src/widgets/hrwork-record/main-grid/main-grid.html

@@ -23,41 +23,89 @@
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
-            <template v-if="getColumnState('hrworkrecordname')">
-                <el-table-column show-overflow-tooltip :prop="'hrworkrecordname'" :label="$t('entities.hrworkrecord.main_grid.columns.hrworkrecordname')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('begintime')">
+                <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}">
                       <span class="column-header ">
-                        {{$t('entities.hrworkrecord.main_grid.columns.hrworkrecordname')}}
+                        {{$t('entities.hrworkrecord.main_grid.columns.begintime')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.hrworkrecordname}}</span>
+                        <app-format-data format="YYYY-MM-DD" :data="row.begintime"></app-format-data>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updateman')">
-                <el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hrworkrecord.main_grid.columns.updateman')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('endtime')">
+                <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}">
                       <span class="column-header ">
-                        {{$t('entities.hrworkrecord.main_grid.columns.updateman')}}
+                        {{$t('entities.hrworkrecord.main_grid.columns.endtime')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <template >
-            <codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
-                        </template>
+                        <app-format-data format="YYYY-MM-DD" :data="row.endtime"></app-format-data>
+                    </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>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updatedate')">
-                <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hrworkrecord.main_grid.columns.updatedate')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('duty')">
+                <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}">
                       <span class="column-header ">
-                        {{$t('entities.hrworkrecord.main_grid.columns.updatedate')}}
+                        {{$t('entities.hrworkrecord.main_grid.columns.duty')}}
                       </span>
                     </template>
                     <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>
                 </el-table-column>
             </template>

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibizhumanresources/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizhumanresources/
-      mvn clean package -Phrapi
-      cd humanresource-provider/humanresource-provider-hrapi
-      mvn -Phrapi docker:build
-      mvn -Phrapi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-provider-hrapi.yaml iBizEE --with-registry-auth      
+      mvn clean package -Ppim
+      cd humanresource-app/humanresource-app-pim
+      mvn -Ppim docker:build
+      mvn -Ppim docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-app-pim.yaml iBizEE --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

humanresource-app/humanresource-app-pim/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar
 
-EXPOSE 8080
+EXPOSE 10327
 
 ADD humanresource-app-pim.jar /humanresource-app-pim.jar

humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml

@@ -3,9 +3,25 @@ services:
   humanresource-app-pim:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
     ports:
-      - "8080:8080"
+      - "10327:10327"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=10327
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
+      - SPRING_REDIS_HOST=172.16.240.110
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
+      - SPRING_DATASOURCE_PASSWORD=b1@@@772
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
+      - CAS=https://passport.ibizlab.cn
+      - NACOS=172.16.240.110:8848
+      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
+      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRTechnicalTitle.java

@@ -104,7 +104,7 @@ public class HRTechnicalTitle extends EntityMP implements Serializable {
     @JsonProperty("hremployeename")
     private String hremployeename;
     /**
-     * 职称获取时间
+     * 获取时间
      */
     @TableField(value = "titletime")
     @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
@@ -195,7 +195,7 @@ public class HRTechnicalTitle extends EntityMP implements Serializable {
     }
 
     /**
-     * 设置 [职称获取时间]
+     * 设置 [获取时间]
      */
     public void setTitletime(Timestamp titletime){
         this.titletime = titletime ;
@@ -203,7 +203,7 @@ public class HRTechnicalTitle extends EntityMP implements Serializable {
     }
 
     /**
-     * 格式化日期 [职称获取时间]
+     * 格式化日期 [获取时间]
      */
     public String formatTitletime(){
         if (this.titletime == null) {

humanresource-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-provider-hrapi.jar
 
-EXPOSE 10317
+EXPOSE 8081
 
 ADD humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar

humanresource-provider/humanresource-provider-hrapi/src/main/docker/humanresource-provider-hrapi.yaml

@@ -3,25 +3,9 @@ services:
   humanresource-provider-hrapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
     ports:
-      - "10317:10317"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10317
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-      - SPRING_DATASOURCE_PASSWORD=b1@@@772
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
     deploy:
       resources:
            limits: