jackwang 部署微服务应用

app_PIM/public/assets/json/data-dictionary.json

@@ -440,6 +440,123 @@
             }
         ]
     }, 
+    {
+        "srfkey": "CL_HR_0014",
+        "emptytext": "未定义",
+        "codelisttype":"static",
+        "items": [
+             {
+                "id": "10",
+                "label": "博士后",
+                "text": "博士后",
+                "data":"",
+                "codename":"Item_10",
+                "value": "10",
+                
+                "disabled": false,
+                "default": false
+            }
+            , {
+                "id": "20",
+                "label": "硕士研究生",
+                "text": "硕士研究生",
+                "data":"",
+                "codename":"Item_20",
+                "value": "20",
+                
+                "disabled": false,
+                "default": false
+            }
+            , {
+                "id": "30",
+                "label": "大学本科",
+                "text": "大学本科",
+                "data":"",
+                "codename":"Item_30",
+                "value": "30",
+                
+                "disabled": false,
+                "default": false
+            }
+            , {
+                "id": "40",
+                "label": "中等专科",
+                "text": "中等专科",
+                "data":"",
+                "codename":"Item_40",
+                "value": "40",
+                
+                "disabled": false,
+                "default": false
+            }
+            , {
+                "id": "50",
+                "label": "职业高中",
+                "text": "职业高中",
+                "data":"",
+                "codename":"Item_50",
+                "value": "50",
+                
+                "disabled": false,
+                "default": false
+            }
+            , {
+                "id": "60",
+                "label": "技工学校",
+                "text": "技工学校",
+                "data":"",
+                "codename":"Item_60",
+                "value": "60",
+                
+                "disabled": false,
+                "default": false
+            }
+            , {
+                "id": "70",
+                "label": "普通高中",
+                "text": "普通高中",
+                "data":"",
+                "codename":"Item_70",
+                "value": "70",
+                
+                "disabled": false,
+                "default": false
+            }
+            , {
+                "id": "80",
+                "label": "初中",
+                "text": "初中",
+                "data":"",
+                "codename":"Item_80",
+                "value": "80",
+                
+                "disabled": false,
+                "default": false
+            }
+            , {
+                "id": "90",
+                "label": "小学",
+                "text": "小学",
+                "data":"",
+                "codename":"Item_90",
+                "value": "90",
+                
+                "disabled": false,
+                "default": false
+            }
+            , {
+                "id": "100",
+                "label": "其他",
+                "text": "其他",
+                "data":"",
+                "codename":"Item_100",
+                "value": "100",
+                
+                "disabled": false,
+                "default": false
+            }
+        ]
+    }, 
     {
         "srfkey": "CL_HR_0005",
         "emptytext": "未定义",

app_PIM/src/authservice/auth-service-register.ts

@@ -47,6 +47,7 @@ export class AuthServiceRegister {
         this.allAuthService.set('hrcertificate', () => import('@/authservice/hrcertificate/hrcertificate-auth-service'));
         this.allAuthService.set('hrorgcontact', () => import('@/authservice/hrorg-contact/hrorg-contact-auth-service'));
         this.allAuthService.set('hrempstate', () => import('@/authservice/hremp-state/hremp-state-auth-service'));
+        this.allAuthService.set('hrtransferapply', () => import('@/authservice/hrtransfer-apply/hrtransfer-apply-auth-service'));
         this.allAuthService.set('hrtechnicaltitle', () => import('@/authservice/hrtechnical-title/hrtechnical-title-auth-service'));
         this.allAuthService.set('hremployee', () => import('@/authservice/hremployee/hremployee-auth-service'));
         this.allAuthService.set('hrlegal', () => import('@/authservice/hrlegal/hrlegal-auth-service'));

app_PIM/src/authservice/hrtransfer-apply/hrtransfer-apply-auth-service-base.ts

+import AuthService from '../auth-service';
+
+/**
+ * 调动申请权限服务对象基类
+ *
+ * @export
+ * @class HRTransferApplyAuthServiceBase
+ * @extends {AuthService}
+ */
+export default class HRTransferApplyAuthServiceBase extends AuthService {
+
+    /**
+     * Creates an instance of  HRTransferApplyAuthServiceBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  HRTransferApplyAuthServiceBase
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+    /**
+     * 根据当前数据获取实体操作标识
+     *
+     * @param {*} mainSateOPPrivs 传入数据操作标识
+     * @returns {any}
+     * @memberof HRTransferApplyAuthServiceBase
+     */
+    public getOPPrivs(mainSateOPPrivs:any):any{
+        let curDefaultOPPrivs:any = JSON.parse(JSON.stringify(this.defaultOPPrivs));
+        if(mainSateOPPrivs){
+            Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
+        }
+        return curDefaultOPPrivs;
+    }
+
+}
\ No newline at end of file

app_PIM/src/authservice/hrtransfer-apply/hrtransfer-apply-auth-service.ts

+import HRTransferApplyAuthServiceBase from './hrtransfer-apply-auth-service-base';
+
+
+/**
+ * 调动申请权限服务对象
+ *
+ * @export
+ * @class HRTransferApplyAuthService
+ * @extends {HRTransferApplyAuthServiceBase}
+ */
+export default class HRTransferApplyAuthService extends HRTransferApplyAuthServiceBase {
+
+    /**
+     * Creates an instance of  HRTransferApplyAuthService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  HRTransferApplyAuthService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+
+}
\ No newline at end of file

app_PIM/src/interface/entity/hrtransfer-apply.ts

+/**
+ * 调动申请
+ *
+ * @export
+ * @interface HRTransferApply
+ */
+export interface HRTransferApply {
+
+    /**
+     * 调动申请标识
+     *
+     * @returns {*}
+     * @memberof HRTransferApply
+     */
+    hrtransferapplyid?: any;
+
+    /**
+     * 调动申请名称
+     *
+     * @returns {*}
+     * @memberof HRTransferApply
+     */
+    hrtransferapplyname?: any;
+
+    /**
+     * 更新人
+     *
+     * @returns {*}
+     * @memberof HRTransferApply
+     */
+    updateman?: any;
+
+    /**
+     * 建立时间
+     *
+     * @returns {*}
+     * @memberof HRTransferApply
+     */
+    createdate?: any;
+
+    /**
+     * 建立人
+     *
+     * @returns {*}
+     * @memberof HRTransferApply
+     */
+    createman?: any;
+
+    /**
+     * 更新时间
+     *
+     * @returns {*}
+     * @memberof HRTransferApply
+     */
+    updatedate?: any;
+
+    /**
+     * 员工标识
+     *
+     * @returns {*}
+     * @memberof HRTransferApply
+     */
+    hremployeeid?: any;
+
+    /**
+     * 员工姓名
+     *
+     * @returns {*}
+     * @memberof HRTransferApply
+     */
+    hremployeename?: any;
+
+    /**
+     * 部门ID
+     *
+     * @returns {*}
+     * @memberof HRTransferApply
+     */
+    organizationid?: any;
+
+    /**
+     * 部门
+     *
+     * @returns {*}
+     * @memberof HRTransferApply
+     */
+    organizationname?: any;
+
+    /**
+     * 职务
+     *
+     * @returns {*}
+     * @memberof HRTransferApply
+     */
+    hrdutyname?: any;
+
+    /**
+     * 职位
+     *
+     * @returns {*}
+     * @memberof HRTransferApply
+     */
+    hrpostname?: any;
+
+    /**
+     * 新组织ID
+     *
+     * @returns {*}
+     * @memberof HRTransferApply
+     */
+    hrorganizationid2?: any;
+
+    /**
+     * 新部门
+     *
+     * @returns {*}
+     * @memberof HRTransferApply
+     */
+    hrorganizationname2?: any;
+
+    /**
+     * 新职位标识
+     *
+     * @returns {*}
+     * @memberof HRTransferApply
+     */
+    hrpostid2?: any;
+
+    /**
+     * 新职位
+     *
+     * @returns {*}
+     * @memberof HRTransferApply
+     */
+    hrpostname2?: any;
+
+    /**
+     * 新职务
+     *
+     * @returns {*}
+     * @memberof HRTransferApply
+     */
+    hrdutyname2?: any;
+
+    /**
+     * 生效日期
+     *
+     * @returns {*}
+     * @memberof HRTransferApply
+     */
+    activetime?: any;
+
+    /**
+     * 任职文件
+     *
+     * @returns {*}
+     * @memberof HRTransferApply
+     */
+    attachment?: any;
+}
\ No newline at end of file

app_PIM/src/locale/lang/en-US.ts

@@ -6,6 +6,7 @@ import hromhierarchycat_en_US from '@locale/lanres/entities/hromhierarchy-cat/hr
 import hrcertificate_en_US from '@locale/lanres/entities/hrcertificate/hrcertificate_en_US';
 import hrorgcontact_en_US from '@locale/lanres/entities/hrorg-contact/hrorg-contact_en_US';
 import hrempstate_en_US from '@locale/lanres/entities/hremp-state/hremp-state_en_US';
+import hrtransferapply_en_US from '@locale/lanres/entities/hrtransfer-apply/hrtransfer-apply_en_US';
 import hrtechnicaltitle_en_US from '@locale/lanres/entities/hrtechnical-title/hrtechnical-title_en_US';
 import hremployee_en_US from '@locale/lanres/entities/hremployee/hremployee_en_US';
 import hrlegal_en_US from '@locale/lanres/entities/hrlegal/hrlegal_en_US';
@@ -275,6 +276,7 @@ export default {
         hrcertificate: hrcertificate_en_US,
         hrorgcontact: hrorgcontact_en_US,
         hrempstate: hrempstate_en_US,
+        hrtransferapply: hrtransferapply_en_US,
         hrtechnicaltitle: hrtechnicaltitle_en_US,
         hremployee: hremployee_en_US,
         hrlegal: hrlegal_en_US,

app_PIM/src/locale/lang/zh-CN.ts

@@ -6,6 +6,7 @@ import hromhierarchycat_zh_CN from '@locale/lanres/entities/hromhierarchy-cat/hr
 import hrcertificate_zh_CN from '@locale/lanres/entities/hrcertificate/hrcertificate_zh_CN';
 import hrorgcontact_zh_CN from '@locale/lanres/entities/hrorg-contact/hrorg-contact_zh_CN';
 import hrempstate_zh_CN from '@locale/lanres/entities/hremp-state/hremp-state_zh_CN';
+import hrtransferapply_zh_CN from '@locale/lanres/entities/hrtransfer-apply/hrtransfer-apply_zh_CN';
 import hrtechnicaltitle_zh_CN from '@locale/lanres/entities/hrtechnical-title/hrtechnical-title_zh_CN';
 import hremployee_zh_CN from '@locale/lanres/entities/hremployee/hremployee_zh_CN';
 import hrlegal_zh_CN from '@locale/lanres/entities/hrlegal/hrlegal_zh_CN';
@@ -274,6 +275,7 @@ export default {
         hrcertificate: hrcertificate_zh_CN,
         hrorgcontact: hrorgcontact_zh_CN,
         hrempstate: hrempstate_zh_CN,
+        hrtransferapply: hrtransferapply_zh_CN,
         hrtechnicaltitle: hrtechnicaltitle_zh_CN,
         hremployee: hremployee_zh_CN,
         hrlegal: hrlegal_zh_CN,

app_PIM/src/locale/lanres/codelist/codelist_en_US.ts

@@ -65,6 +65,19 @@ export default {
         "其他": "其他",
         "empty": ""
     },
+    CL_HR_0014: {
+        "10": "博士后",
+        "20": "硕士研究生",
+        "30": "大学本科",
+        "40": "中等专科",
+        "50": "职业高中",
+        "60": "技工学校",
+        "70": "普通高中",
+        "80": "初中",
+        "90": "小学",
+        "100": "其他",
+        "empty": ""
+    },
     CL_HR_0005: {
         "HIGH": "高",
         "MID": "中",

app_PIM/src/locale/lanres/codelist/codelist_zh_CN.ts

@@ -65,6 +65,19 @@ export default {
         "其他": "其他",
         "empty": "",
     },
+    CL_HR_0014: {
+        "10": "博士后",
+        "20": "硕士研究生",
+        "30": "大学本科",
+        "40": "中等专科",
+        "50": "职业高中",
+        "60": "技工学校",
+        "70": "普通高中",
+        "80": "初中",
+        "90": "小学",
+        "100": "其他",
+        "empty": "",
+    },
     CL_HR_0005: {
         "HIGH": "高",
         "MID": "中",

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

@@ -36,10 +36,8 @@ export default {
 	},
 	main_form: {
 		details: {
-			group1: "教育信息基本信息", 
+			group1: "教育信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "教育信息标识", 
@@ -48,11 +46,22 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			hreducationname: "教育信息名称", 
-			createman: "建立人", 
-			createdate: "建立时间", 
-			updateman: "更新人", 
-			updatedate: "更新时间", 
+			hremployeename: "员工姓名", 
+			degree: "学历", 
+			begintime: "入学时间", 
+			endtime: "毕业时间", 
+			school: "毕业院校", 
+			subject: "一级学科", 
+			major: "专业", 
+			learnmodality: "学习形式", 
+			schooltype: "学校性质", 
+			firstdegreeflag: "是否第一学历", 
+			highdegreeflag: "是否最高学历", 
+			attachment2: "学位证", 
+			attachment1: "毕业证", 
+			attachment: "其他附件", 
+			attachment3: "学历验证", 
+			hremployeeid: "员工标识", 
 			hreducationid: "教育信息标识", 
 		},
 		uiactions: {
@@ -60,9 +69,16 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			hreducationname: "教育信息名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			degree: "学历",
+			begintime: "入学时间",
+			endtime: "毕业时间",
+			school: "毕业院校",
+			subject: "一级学科",
+			major: "专业",
+			learnmodality: "学习形式",
+			schooltype: "学校性质",
+			highdegreeflag: "是否最高学历",
+			firstdegreeflag: "是否第一学历",
 		},
 		uiactions: {
 		},

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

@@ -35,10 +35,8 @@ export default {
 	},
 	main_form: {
 		details: {
-			group1: "教育信息基本信息", 
+			group1: "教育信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "教育信息标识", 
@@ -47,11 +45,22 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			hreducationname: "教育信息名称", 
-			createman: "建立人", 
-			createdate: "建立时间", 
-			updateman: "更新人", 
-			updatedate: "更新时间", 
+			hremployeename: "员工姓名", 
+			degree: "学历", 
+			begintime: "入学时间", 
+			endtime: "毕业时间", 
+			school: "毕业院校", 
+			subject: "一级学科", 
+			major: "专业", 
+			learnmodality: "学习形式", 
+			schooltype: "学校性质", 
+			firstdegreeflag: "是否第一学历", 
+			highdegreeflag: "是否最高学历", 
+			attachment2: "学位证", 
+			attachment1: "毕业证", 
+			attachment: "其他附件", 
+			attachment3: "学历验证", 
+			hremployeeid: "员工标识", 
 			hreducationid: "教育信息标识", 
 		},
 		uiactions: {
@@ -59,9 +68,16 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			hreducationname: "教育信息名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			degree: "学历",
+			begintime: "入学时间",
+			endtime: "毕业时间",
+			school: "毕业院校",
+			subject: "一级学科",
+			major: "专业",
+			learnmodality: "学习形式",
+			schooltype: "学校性质",
+			highdegreeflag: "是否最高学历",
+			firstdegreeflag: "是否第一学历",
 		},
 		uiactions: {
 		},

app_PIM/src/locale/lanres/entities/hremployee/hremployee_en_US.ts

@@ -100,6 +100,8 @@ export default {
 			certtype: "证件类型", 
 			certnum: "证件号码", 
 			organizationname: "单位", 
+			hrpostname: "职位", 
+			hrpostid: "职位标识", 
 			organizationid: "组织ID", 
 			employeeid: "员工标识", 
 		},
@@ -212,6 +214,8 @@ export default {
 			employeecode: "员工编号",
 			employeename: "员工姓名",
 			organizationname: "单位",
+			hrdutyname: "职务",
+			hrpostname: "职位",
 			certnum: "证件号码",
 			birthday: "出生日期",
 			age: "年龄",

app_PIM/src/locale/lanres/entities/hremployee/hremployee_zh_CN.ts

@@ -99,6 +99,8 @@ export default {
 			certtype: "证件类型", 
 			certnum: "证件号码", 
 			organizationname: "单位", 
+			hrpostname: "职位", 
+			hrpostid: "职位标识", 
 			organizationid: "组织ID", 
 			employeeid: "员工标识", 
 		},
@@ -211,6 +213,8 @@ export default {
 			employeecode: "员工编号",
 			employeename: "员工姓名",
 			organizationname: "单位",
+			hrdutyname: "职务",
+			hrpostname: "职位",
 			certnum: "证件号码",
 			birthday: "出生日期",
 			age: "年龄",

app_PIM/src/locale/lanres/entities/hrtransfer-apply/hrtransfer-apply_en_US.ts

+
+export default {
+  fields: {
+    hrtransferapplyid: "调动申请标识",
+    hrtransferapplyname: "调动申请名称",
+    updateman: "更新人",
+    createdate: "建立时间",
+    createman: "建立人",
+    updatedate: "更新时间",
+    hremployeeid: "员工标识",
+    hremployeename: "员工姓名",
+    organizationid: "部门ID",
+    organizationname: "部门",
+    hrdutyname: "职务",
+    hrpostname: "职位",
+    hrorganizationid2: "新组织ID",
+    hrorganizationname2: "新部门",
+    hrpostid2: "新职位标识",
+    hrpostname2: "新职位",
+    hrdutyname2: "新职务",
+    activetime: "生效日期",
+    attachment: "任职文件",
+  },
+};
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hrtransfer-apply/hrtransfer-apply_zh_CN.ts

+export default {
+  fields: {
+    hrtransferapplyid: "调动申请标识",
+    hrtransferapplyname: "调动申请名称",
+    updateman: "更新人",
+    createdate: "建立时间",
+    createman: "建立人",
+    updatedate: "更新时间",
+    hremployeeid: "员工标识",
+    hremployeename: "员工姓名",
+    organizationid: "部门ID",
+    organizationname: "部门",
+    hrdutyname: "职务",
+    hrpostname: "职位",
+    hrorganizationid2: "新组织ID",
+    hrorganizationname2: "新部门",
+    hrpostid2: "新职位标识",
+    hrpostname2: "新职位",
+    hrdutyname2: "新职务",
+    activetime: "生效日期",
+    attachment: "任职文件",
+  },
+};
\ No newline at end of file

app_PIM/src/mock/codelist/codelist.ts

@@ -415,6 +415,113 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
             },
         ]
     },
+    {
+        srfkey: "CL_HR_0014",
+        emptytext: "未定义",
+        "codelisttype":"static",
+        items: [
+            {
+                id: "10",
+                label: "博士后",
+                text: "博士后",
+                "data":"",
+                "codename":"Item_10",
+                value: "10",
+                
+                disabled: false,
+            },
+            {
+                id: "20",
+                label: "硕士研究生",
+                text: "硕士研究生",
+                "data":"",
+                "codename":"Item_20",
+                value: "20",
+                
+                disabled: false,
+            },
+            {
+                id: "30",
+                label: "大学本科",
+                text: "大学本科",
+                "data":"",
+                "codename":"Item_30",
+                value: "30",
+                
+                disabled: false,
+            },
+            {
+                id: "40",
+                label: "中等专科",
+                text: "中等专科",
+                "data":"",
+                "codename":"Item_40",
+                value: "40",
+                
+                disabled: false,
+            },
+            {
+                id: "50",
+                label: "职业高中",
+                text: "职业高中",
+                "data":"",
+                "codename":"Item_50",
+                value: "50",
+                
+                disabled: false,
+            },
+            {
+                id: "60",
+                label: "技工学校",
+                text: "技工学校",
+                "data":"",
+                "codename":"Item_60",
+                value: "60",
+                
+                disabled: false,
+            },
+            {
+                id: "70",
+                label: "普通高中",
+                text: "普通高中",
+                "data":"",
+                "codename":"Item_70",
+                value: "70",
+                
+                disabled: false,
+            },
+            {
+                id: "80",
+                label: "初中",
+                text: "初中",
+                "data":"",
+                "codename":"Item_80",
+                value: "80",
+                
+                disabled: false,
+            },
+            {
+                id: "90",
+                label: "小学",
+                text: "小学",
+                "data":"",
+                "codename":"Item_90",
+                value: "90",
+                
+                disabled: false,
+            },
+            {
+                id: "100",
+                label: "其他",
+                text: "其他",
+                "data":"",
+                "codename":"Item_100",
+                value: "100",
+                
+                disabled: false,
+            },
+        ]
+    },
     {
         srfkey: "CL_HR_0005",
         emptytext: "未定义",

app_PIM/src/mock/entity/hrtransfer-applys/hrtransfer-applys.ts

+import qs from 'qs';
+import { MockAdapter } from '@/mock/mock-adapter';
+const mock = MockAdapter.getInstance();
+
+// 模拟数据
+const mockDatas: Array<any> = [
+];
+
+
+//getwflink
+mock.onGet(new RegExp(/^\/wfcore\/ibizhumanresources-app-pim\/hrtransferapplies\/[a-zA-Z0-9\-\;]+\/usertasks\/[a-zA-Z0-9\-\;]+\/ways$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hrtransferapply 方法: getwflink");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status,[
+        {"sequenceFlowId":"dfdsfdsfdsfdsfds","sequenceFlowName":"同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddlfldldfldsfds","refViewKey":""},
+        {"sequenceFlowId":"ddssdfdfdfdfsfdf","sequenceFlowName":"不同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddfdsldlfdlldsf","refViewKey":"workorder_ltform_editview"}
+        ]];
+});
+
+// getwfstep
+mock.onGet(new RegExp(/^\/wfcore\/ibizhumanresources-app-pim\/hrtransferapplies\/process-definitions-nodes$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hrtransferapply 方法: getwfstep");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, [
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-dfdfd",
+        "userTaskName":"待审",
+        "cnt":0,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"
+        },
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-87927",
+        "userTaskName":"待分配",
+        "cnt":3,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"}
+        ]];
+});
+
+// createBatch
+mock.onPost(new RegExp(/^\/hrtransferapplies\/batch$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hrtransferapply 方法: createBatch");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, {}];
+});
+
+// updateBatch
+mock.onPut(new RegExp(/^\/hrtransferapplies\/batch$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hrtransferapply 方法: updateBatch");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, {}];
+});
+
+// removeBatch
+mock.onDelete(new RegExp(/^\/hrtransferapplies\/batch$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hrtransferapply 方法: removeBatch");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, {}];
+});
+
+
+// Select
+mock.onGet(new RegExp(/^\/hrtransferapplies\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hrtransferapply 方法: Select");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['hrtransferapplyid'];
+    const matchArray:any = new RegExp(/^\/hrtransferapplies\/([a-zA-Z0-9\-\;]{1,35})\/select$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    let items = mockDatas ? mockDatas : [];
+    let _items = items.find((item: any) => Object.is(item.hrtransferapplyid, tempValue.hrtransferapplyid));
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(_items);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, _items];
+});
+        
+// Create
+mock.onPost(new RegExp(/^\/hrtransferapplies\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hrtransferapply 方法: Create");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['hrtransferapplyid'];
+    const matchArray:any = new RegExp(/^\/hrtransferapplies\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(mockDatas[0]);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, mockDatas[0]];
+});
+        
+// Update
+mock.onPut(new RegExp(/^\/hrtransferapplies\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hrtransferapply 方法: Update");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['hrtransferapplyid'];
+    const matchArray:any = new RegExp(/^\/hrtransferapplies\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    //let items = mockDatas ? mockDatas : [];
+    //let _items = items.find((item: any) => Object.is(item.hrtransferapplyid, tempValue.hrtransferapplyid));
+      let data = JSON.parse(config.data);
+    mockDatas.forEach((item)=>{
+        if(item['hrtransferapplyid'] == tempValue['hrtransferapplyid'] ){
+            for(let value in data){
+              if(item.hasOwnProperty(value)){
+                  item[value] = data[value];
+              }
+            }
+        }
+    })
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(data);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, data];
+});
+
+// GetDraft
+mock.onGet(new RegExp(/^\/hrtransferapplies\/getdraft$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hrtransferapply 方法: GetDraft");
+    console.table({url:config.url, method: config.method, data:config.data});
+    // GetDraft
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table({});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, {}];
+});
+        
+// CheckKey
+mock.onPost(new RegExp(/^\/hrtransferapplies\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hrtransferapply 方法: CheckKey");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['hrtransferapplyid'];
+    const matchArray:any = new RegExp(/^\/hrtransferapplies\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    //let items = mockDatas ? mockDatas : [];
+    //let _items = items.find((item: any) => Object.is(item.hrtransferapplyid, tempValue.hrtransferapplyid));
+      let data = JSON.parse(config.data);
+    mockDatas.forEach((item)=>{
+        if(item['hrtransferapplyid'] == tempValue['hrtransferapplyid'] ){
+            for(let value in data){
+              if(item.hasOwnProperty(value)){
+                  item[value] = data[value];
+              }
+            }
+        }
+    })
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(data);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, data];
+});
+        
+// Save
+mock.onPost(new RegExp(/^\/hrtransferapplies\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hrtransferapply 方法: Save");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['hrtransferapplyid'];
+    const matchArray:any = new RegExp(/^\/hrtransferapplies\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    //let items = mockDatas ? mockDatas : [];
+    //let _items = items.find((item: any) => Object.is(item.hrtransferapplyid, tempValue.hrtransferapplyid));
+      let data = JSON.parse(config.data);
+    mockDatas.forEach((item)=>{
+        if(item['hrtransferapplyid'] == tempValue['hrtransferapplyid'] ){
+            for(let value in data){
+              if(item.hasOwnProperty(value)){
+                  item[value] = data[value];
+              }
+            }
+        }
+    })
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(data);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, data];
+});
+    
+// FetchDefault
+mock.onGet(new RegExp(/^\/hrtransferapplies\/fetchdefault$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hrtransferapply 方法: FetchDefault");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(mockDatas);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, mockDatas ? mockDatas : []];
+});
+
+// FetchDefault
+mock.onGet(new RegExp(/^\/hrtransferapplies\/fetchdefault(\?[\w-./?%&=,]*)*$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hrtransferapply 方法: FetchDefault");
+    console.table({url:config.url, method: config.method, data:config.data});
+    if(config.url.includes('page')){
+        let url = config.url.split('?')[1];
+        let params  =  qs.parse(url);
+        Object.assign(config, params);
+    }
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    let total = mockDatas.length;
+    let records: Array<any> = [];
+    if(!config.page || !config.size){
+        records = mockDatas;
+    }else{
+        if((config.page-1)*config.size < total){
+          records = mockDatas.slice(config.page,config.size);
+        }
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(records ?  records : []);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, records ?  records : []];
+});
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+
+
+// Remove
+mock.onDelete(new RegExp(/^\/hrtransferapplies\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hrtransferapply 方法: Remove");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['hrtransferapplyid'];
+    const matchArray:any = new RegExp(/^\/hrtransferapplies\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    let items = mockDatas ? mockDatas : [];
+    let _items = items.find((item: any) => Object.is(item.hrtransferapplyid, tempValue.hrtransferapplyid));
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(_items?_items:{});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, _items?_items:{}];
+});
+
+// Get
+mock.onGet(new RegExp(/^\/hrtransferapplies\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hrtransferapply 方法: Get");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['hrtransferapplyid'];
+    const matchArray:any = new RegExp(/^\/hrtransferapplies\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    let items = mockDatas ? mockDatas : [];
+    let _items = items.find((item: any) => Object.is(item.hrtransferapplyid, tempValue.hrtransferapplyid));
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(_items?_items:{});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, _items?_items:{}];
+});

app_PIM/src/mock/index.ts

@@ -15,6 +15,7 @@ import './entity/hromhierarchy-cats/hromhierarchy-cats';
 import './entity/hrcertificates/hrcertificates';
 import './entity/hrorg-contacts/hrorg-contacts';
 import './entity/hremp-states/hremp-states';
+import './entity/hrtransfer-applys/hrtransfer-applys';
 import './entity/hrtechnical-titles/hrtechnical-titles';
 import './entity/hremployees/hremployees';
 import './entity/hrlegals/hrlegals';

app_PIM/src/pages/ungroup/pim/page-register.ts

@@ -16,8 +16,8 @@ export const PageComponents = {
         Vue.component('hrlegal-grid-view', () => import('@pages/base/hrlegal-grid-view/hrlegal-grid-view.vue'));
         Vue.component('hromhierarchy-tree-exp-view', () => import('@pages/base/hromhierarchy-tree-exp-view/hromhierarchy-tree-exp-view.vue'));
         Vue.component('hrlegal-v-002', () => import('@pages/base/hrlegal-v-002/hrlegal-v-002.vue'));
-        Vue.component('hrduty-tab-exp-view', () => import('@pages/human-resource/hrduty-tab-exp-view/hrduty-tab-exp-view.vue'));
         Vue.component('hrpost-pickup-view', () => import('@pages/human-resource/hrpost-pickup-view/hrpost-pickup-view.vue'));
+        Vue.component('hrduty-tab-exp-view', () => import('@pages/human-resource/hrduty-tab-exp-view/hrduty-tab-exp-view.vue'));
         Vue.component('hrorganization-pickup-grid-view', () => import('@pages/base/hrorganization-pickup-grid-view/hrorganization-pickup-grid-view.vue'));
         Vue.component('hrpost-pickup-grid-view', () => import('@pages/human-resource/hrpost-pickup-grid-view/hrpost-pickup-grid-view.vue'));
         Vue.component('hrduty-edu-v-001', () => import('@pages/human-resource/hrduty-edu-v-001/hrduty-edu-v-001.vue'));
@@ -61,9 +61,9 @@ export const PageComponents = {
         Vue.component('hrduty-skill-v-002', () => import('@pages/human-resource/hrduty-skill-v-002/hrduty-skill-v-002.vue'));
         Vue.component('hremployee-tree-exp-view', () => import('@pages/human-resource/hremployee-tree-exp-view/hremployee-tree-exp-view.vue'));
         Vue.component('hrcontract-edit-view', () => import('@pages/human-resource/hrcontract-edit-view/hrcontract-edit-view.vue'));
-        Vue.component('hrduty-edu-grid-view', () => import('@pages/human-resource/hrduty-edu-grid-view/hrduty-edu-grid-view.vue'));
         Vue.component('hromhierarchy-cat-dashboard-view', () => import('@pages/base/hromhierarchy-cat-dashboard-view/hromhierarchy-cat-dashboard-view.vue'));
         Vue.component('hrorganization-pickup-view', () => import('@pages/base/hrorganization-pickup-view/hrorganization-pickup-view.vue'));
+        Vue.component('hrduty-edu-grid-view', () => import('@pages/human-resource/hrduty-edu-grid-view/hrduty-edu-grid-view.vue'));
         Vue.component('hrlanguage-ability-grid-view', () => import('@pages/human-resource/hrlanguage-ability-grid-view/hrlanguage-ability-grid-view.vue'));
         Vue.component('hroperation-unit-tab-exp-view', () => import('@pages/base/hroperation-unit-tab-exp-view/hroperation-unit-tab-exp-view.vue'));
         Vue.component('hrorg-address-grid-view', () => import('@pages/base/hrorg-address-grid-view/hrorg-address-grid-view.vue'));

app_PIM/src/pages/ungroup/pim/router.ts

@@ -358,32 +358,32 @@ const router = new Router({
                     component: () => import('@pages/base/hrlegal-v-002/hrlegal-v-002.vue'),
                 },
                 {
-                    path: 'hrduties/:hrduty?/tabexpview/:tabexpview?',
+                    path: 'hrposts/:hrpost?/pickupview/:pickupview?',
                     meta: {
-                        caption: 'entities.hrduty.views.tabexpview.title',
+                        caption: 'entities.hrpost.views.pickupview.title',
                         info:'',
                         parameters: [
                             { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hrduties', parameterName: 'hrduty' },
-                            { pathName: 'tabexpview', parameterName: 'tabexpview' },
+                            { pathName: 'hrposts', parameterName: 'hrpost' },
+                            { pathName: 'pickupview', parameterName: 'pickupview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/human-resource/hrduty-tab-exp-view/hrduty-tab-exp-view.vue'),
+                    component: () => import('@pages/human-resource/hrpost-pickup-view/hrpost-pickup-view.vue'),
                 },
                 {
-                    path: 'hrposts/:hrpost?/pickupview/:pickupview?',
+                    path: 'hrduties/:hrduty?/tabexpview/:tabexpview?',
                     meta: {
-                        caption: 'entities.hrpost.views.pickupview.title',
+                        caption: 'entities.hrduty.views.tabexpview.title',
                         info:'',
                         parameters: [
                             { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hrposts', parameterName: 'hrpost' },
-                            { pathName: 'pickupview', parameterName: 'pickupview' },
+                            { pathName: 'hrduties', parameterName: 'hrduty' },
+                            { pathName: 'tabexpview', parameterName: 'tabexpview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/human-resource/hrpost-pickup-view/hrpost-pickup-view.vue'),
+                    component: () => import('@pages/human-resource/hrduty-tab-exp-view/hrduty-tab-exp-view.vue'),
                 },
                 {
                     path: 'hrorganizations/:hrorganization?/pickupgridview/:pickupgridview?',
@@ -1318,61 +1318,61 @@ const router = new Router({
                     component: () => import('@pages/human-resource/hrcontract-edit-view/hrcontract-edit-view.vue'),
                 },
                 {
-                    path: 'hrduties/:hrduty?/hrdutyedus/:hrdutyedu?/gridview/:gridview?',
+                    path: 'hromhierarchycats/:hromhierarchycat?/dashboardview/:dashboardview?',
                     meta: {
-                        caption: 'entities.hrdutyedu.views.gridview.title',
+                        caption: 'entities.hromhierarchycat.views.dashboardview.title',
                         info:'',
                         parameters: [
                             { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hrduties', parameterName: 'hrduty' },
-                            { pathName: 'hrdutyedus', parameterName: 'hrdutyedu' },
-                            { pathName: 'gridview', parameterName: 'gridview' },
+                            { pathName: 'hromhierarchycats', parameterName: 'hromhierarchycat' },
+                            { pathName: 'dashboardview', parameterName: 'dashboardview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/human-resource/hrduty-edu-grid-view/hrduty-edu-grid-view.vue'),
+                    component: () => import('@pages/base/hromhierarchy-cat-dashboard-view/hromhierarchy-cat-dashboard-view.vue'),
                 },
                 {
-                    path: 'hrdutyedus/:hrdutyedu?/gridview/:gridview?',
+                    path: 'hrorganizations/:hrorganization?/pickupview/:pickupview?',
                     meta: {
-                        caption: 'entities.hrdutyedu.views.gridview.title',
+                        caption: 'entities.hrorganization.views.pickupview.title',
                         info:'',
                         parameters: [
                             { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hrdutyedus', parameterName: 'hrdutyedu' },
-                            { pathName: 'gridview', parameterName: 'gridview' },
+                            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+                            { pathName: 'pickupview', parameterName: 'pickupview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/human-resource/hrduty-edu-grid-view/hrduty-edu-grid-view.vue'),
+                    component: () => import('@pages/base/hrorganization-pickup-view/hrorganization-pickup-view.vue'),
                 },
                 {
-                    path: 'hromhierarchycats/:hromhierarchycat?/dashboardview/:dashboardview?',
+                    path: 'hrduties/:hrduty?/hrdutyedus/:hrdutyedu?/gridview/:gridview?',
                     meta: {
-                        caption: 'entities.hromhierarchycat.views.dashboardview.title',
+                        caption: 'entities.hrdutyedu.views.gridview.title',
                         info:'',
                         parameters: [
                             { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hromhierarchycats', parameterName: 'hromhierarchycat' },
-                            { pathName: 'dashboardview', parameterName: 'dashboardview' },
+                            { pathName: 'hrduties', parameterName: 'hrduty' },
+                            { pathName: 'hrdutyedus', parameterName: 'hrdutyedu' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/base/hromhierarchy-cat-dashboard-view/hromhierarchy-cat-dashboard-view.vue'),
+                    component: () => import('@pages/human-resource/hrduty-edu-grid-view/hrduty-edu-grid-view.vue'),
                 },
                 {
-                    path: 'hrorganizations/:hrorganization?/pickupview/:pickupview?',
+                    path: 'hrdutyedus/:hrdutyedu?/gridview/:gridview?',
                     meta: {
-                        caption: 'entities.hrorganization.views.pickupview.title',
+                        caption: 'entities.hrdutyedu.views.gridview.title',
                         info:'',
                         parameters: [
                             { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
-                            { pathName: 'pickupview', parameterName: 'pickupview' },
+                            { pathName: 'hrdutyedus', parameterName: 'hrdutyedu' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/base/hrorganization-pickup-view/hrorganization-pickup-view.vue'),
+                    component: () => import('@pages/human-resource/hrduty-edu-grid-view/hrduty-edu-grid-view.vue'),
                 },
                 {
                     path: 'hremployees/:hremployee?/hrlanguageabilities/:hrlanguageability?/gridview/:gridview?',

app_PIM/src/service/entity-service-register.ts

@@ -47,6 +47,7 @@ export class EntityServiceRegister {
         this.allEntityService.set('hrcertificate', () => import('@/service/hrcertificate/hrcertificate-service'));
         this.allEntityService.set('hrorgcontact', () => import('@/service/hrorg-contact/hrorg-contact-service'));
         this.allEntityService.set('hrempstate', () => import('@/service/hremp-state/hremp-state-service'));
+        this.allEntityService.set('hrtransferapply', () => import('@/service/hrtransfer-apply/hrtransfer-apply-service'));
         this.allEntityService.set('hrtechnicaltitle', () => import('@/service/hrtechnical-title/hrtechnical-title-service'));
         this.allEntityService.set('hremployee', () => import('@/service/hremployee/hremployee-service'));
         this.allEntityService.set('hrlegal', () => import('@/service/hrlegal/hrlegal-service'));

app_PIM/src/service/hrtransfer-apply/hrtransfer-apply-service-base.ts

+import { Http,Util } from '@/utils';
+import EntityService from '../entity-service';
+
+
+
+/**
+ * 调动申请服务对象基类
+ *
+ * @export
+ * @class HRTransferApplyServiceBase
+ * @extends {EntityServie}
+ */
+export default class HRTransferApplyServiceBase extends EntityService {
+
+    /**
+     * Creates an instance of  HRTransferApplyServiceBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  HRTransferApplyServiceBase
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+    /**
+     * 初始化基础数据
+     *
+     * @memberof HRTransferApplyServiceBase
+     */
+    public initBasicData(){
+        this.APPLYDEKEY ='hrtransferapply';
+        this.APPDEKEY = 'hrtransferapplyid';
+        this.APPDENAME = 'hrtransferapplies';
+        this.APPDETEXT = 'hrtransferapplyname';
+        this.APPNAME = 'pim';
+        this.SYSTEMNAME = 'ibizhumanresources';
+    }
+
+// 实体接口
+
+    /**
+     * Select接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof HRTransferApplyServiceBase
+     */
+    public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().get(`/hrtransferapplies/${context.hrtransferapply}/select`,isloading);
+            
+            return res;
+    }
+
+    /**
+     * Create接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof HRTransferApplyServiceBase
+     */
+    public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let masterData:any = {};
+        Object.assign(data,masterData);
+        if(!data.srffrontuf || data.srffrontuf !== "1"){
+            data[this.APPDEKEY] = null;
+        }
+        if(data.srffrontuf){
+            delete data.srffrontuf;
+        }
+        let tempContext:any = JSON.parse(JSON.stringify(context));
+        let res:any = await Http.getInstance().post(`/hrtransferapplies`,data,isloading);
+        
+        return res;
+    }
+
+    /**
+     * Update接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof HRTransferApplyServiceBase
+     */
+    public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let masterData:any = {};
+        Object.assign(data,masterData);
+            let res:any = await  Http.getInstance().put(`/hrtransferapplies/${context.hrtransferapply}`,data,isloading);
+            
+            return res;
+    }
+
+    /**
+     * Remove接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof HRTransferApplyServiceBase
+     */
+    public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().delete(`/hrtransferapplies/${context.hrtransferapply}`,isloading);
+            return res;
+    }
+
+    /**
+     * Get接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof HRTransferApplyServiceBase
+     */
+    public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = await Http.getInstance().get(`/hrtransferapplies/${context.hrtransferapply}`,isloading);
+            
+            return res;
+    }
+
+    /**
+     * GetDraft接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof HRTransferApplyServiceBase
+     */
+    public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let res:any = await  Http.getInstance().get(`/hrtransferapplies/getdraft`,isloading);
+        res.data.hrtransferapply = data.hrtransferapply;
+        
+        return res;
+    }
+
+    /**
+     * CheckKey接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof HRTransferApplyServiceBase
+     */
+    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = Http.getInstance().post(`/hrtransferapplies/${context.hrtransferapply}/checkkey`,data,isloading);
+            return res;
+    }
+
+    /**
+     * Save接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof HRTransferApplyServiceBase
+     */
+    public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let masterData:any = {};
+        Object.assign(data,masterData);
+            let res:any = await  Http.getInstance().post(`/hrtransferapplies/${context.hrtransferapply}/save`,data,isloading);
+            
+            return res;
+    }
+
+    /**
+     * FetchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof HRTransferApplyServiceBase
+     */
+    public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        let res:any = Http.getInstance().get(`/hrtransferapplies/fetchdefault`,tempData,isloading);
+        return res;
+    }
+}
\ No newline at end of file

app_PIM/src/service/hrtransfer-apply/hrtransfer-apply-service.ts

+import { Http,Util } from '@/utils';
+import HRTransferApplyServiceBase from './hrtransfer-apply-service-base';
+
+
+/**
+ * 调动申请服务对象
+ *
+ * @export
+ * @class HRTransferApplyService
+ * @extends {HRTransferApplyServiceBase}
+ */
+export default class HRTransferApplyService extends HRTransferApplyServiceBase {
+
+    /**
+     * Creates an instance of  HRTransferApplyService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  HRTransferApplyService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+
+}
\ No newline at end of file

app_PIM/src/store/modules/view-action/state.ts

@@ -171,6 +171,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '04c02737ae62a4f4c014607441ee0401',
                 'e7ba37699bd458dc8dd5c02abac8dadd',
             ],
         },
@@ -509,6 +510,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                'ec9d9fe37bbfc3fcb623e2dc34b48dbc',
             ],
         },
         {

app_PIM/src/uiservice/hrtransfer-apply/hrtransfer-apply-ui-service-base.ts

+import { Environment } from '@/environments/environment';
+import { UIActionTool,Util } from '@/utils';
+import UIService from '../ui-service';
+import { Subject } from 'rxjs';
+import HRTransferApplyService from '@/service/hrtransfer-apply/hrtransfer-apply-service';
+import HRTransferApplyAuthService from '@/authservice/hrtransfer-apply/hrtransfer-apply-auth-service';
+
+/**
+ * 调动申请UI服务对象基类
+ *
+ * @export
+ * @class HRTransferApplyUIServiceBase
+ */
+export default class HRTransferApplyUIServiceBase extends UIService {
+
+    /**
+     * 是否支持工作流
+     * 
+     * @memberof  HRTransferApplyUIServiceBase
+     */
+    public isEnableWorkflow:boolean = false;
+
+    /**
+     * 当前UI服务对应的数据服务对象
+     * 
+     * @memberof  HRTransferApplyUIServiceBase
+     */
+    public dataService:HRTransferApplyService = new HRTransferApplyService();
+
+    /**
+     * 所有关联视图
+     * 
+     * @memberof  HRTransferApplyUIServiceBase
+     */ 
+    public allViewMap: Map<string, Object> = new Map();
+
+    /**
+     * 状态值
+     * 
+     * @memberof  HRTransferApplyUIServiceBase
+     */ 
+    public stateValue: number = 0;
+
+    /**
+     * 状态属性
+     * 
+     * @memberof  HRTransferApplyUIServiceBase
+     */ 
+    public stateField: string = "";
+
+    /**
+     * 主状态属性集合
+     * 
+     * @memberof  HRTransferApplyUIServiceBase
+     */  
+    public mainStateFields:Array<any> = [];
+
+    /**
+     * 主状态集合Map
+     * 
+     * @memberof  HRTransferApplyUIServiceBase
+     */  
+    public allDeMainStateMap:Map<string,string> = new Map();
+
+    /**
+     * 主状态操作标识Map
+     * 
+     * @memberof  HRTransferApplyUIServiceBase
+     */ 
+    public allDeMainStateOPPrivsMap:Map<string,any> = new Map();
+
+    /**
+     * Creates an instance of  HRTransferApplyUIServiceBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  HRTransferApplyUIServiceBase
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+        this.authService = new HRTransferApplyAuthService(opts);
+        this.initViewMap();
+        this.initDeMainStateMap();
+        this.initDeMainStateOPPrivsMap();
+    }
+
+    /**
+     * 初始化视图Map
+     * 
+     * @memberof  HRTransferApplyUIServiceBase
+     */  
+    public initViewMap(){
+    }
+
+    /**
+     * 初始化主状态集合
+     * 
+     * @memberof  HRTransferApplyUIServiceBase
+     */  
+    public initDeMainStateMap(){
+    }
+
+    /**
+     * 初始化主状态操作标识
+     * 
+     * @memberof  HRTransferApplyUIServiceBase
+     */  
+    public initDeMainStateOPPrivsMap(){
+    }
+
+
+    /**
+     * 获取指定数据的重定向页面
+     * 
+     * @param srfkey 数据主键
+     * @param isEnableWorkflow  重定向视图是否需要处理流程中的数据
+     * @memberof  HRTransferApplyUIServiceBase
+     */
+    public async getRDAppView(srfkey:string,isEnableWorkflow:boolean){
+        this.isEnableWorkflow = isEnableWorkflow;
+        // 进行数据查询
+        let result:any = await this.dataService.Get({hrtransferapply:srfkey});
+        const curData:any = result.data;
+        //判断当前数据模式,默认为true，todo
+        const iRealDEModel:boolean = true;
+
+        let bDataInWF:boolean = false;
+		let bWFMode:any = false;
+		// 计算数据模式
+		if (this.isEnableWorkflow) {
+			bDataInWF = await this.dataService.testDataInWF({stateValue:this.stateValue,stateField:this.stateField},curData);
+			if (bDataInWF) {
+				bDataInWF = true;
+				bWFMode = await this.dataService.testUserExistWorklist(null,curData);
+			}
+        }
+        let strPDTViewParam:string = await this.getDESDDEViewPDTParam(curData, bDataInWF, bWFMode);
+        //若不是当前数据模式，处理strPDTViewParam，todo
+
+        //查找视图
+
+        //返回视图
+        return this.allViewMap.get(strPDTViewParam);
+    }
+
+    /**
+	 * 获取实际的数据类型
+     * 
+     * @memberof  HRTransferApplyUIServiceBase
+	 */
+	public getRealDEType(entity:any){
+
+    }
+
+    /**
+     * 获取实体单数据实体视图预定义参数
+     * 
+     * @param curData 当前数据
+     * @param bDataInWF 是否有数据在工作流中
+     * @param bWFMode   是否工作流模式
+     * @memberof  HRTransferApplyUIServiceBase
+     */
+    public async getDESDDEViewPDTParam(curData:any, bDataInWF:boolean, bWFMode:boolean){
+        let strPDTParam:string = '';
+		if (bDataInWF) {
+			// 判断数据是否在流程中
+        }
+        //多表单，todo
+        const isEnableMultiForm:boolean = false;
+        const multiFormDEField:string|null =null;
+
+        if (isEnableMultiForm && multiFormDEField) {
+			const objFormValue:string = curData[multiFormDEField];
+			if(!Environment.isAppMode){
+				return 'MOBEDITVIEW'+objFormValue;
+			}
+			return 'EDITVIEW'+objFormValue;
+        }
+		if(!Environment.isAppMode){
+            if(this.getDEMainStateTag(curData)){
+                return `MOBEDITVIEW:MSTAG:${ this.getDEMainStateTag(curData)}`;
+            }
+			return 'MOBEDITVIEW:';
+        }
+        if(this.getDEMainStateTag(curData)){
+            return `EDITVIEW:MSTAG:${ this.getDEMainStateTag(curData)}`;
+        }
+		return 'EDITVIEW:';
+    }
+
+    /**
+     * 获取数据对象的主状态标识
+     * 
+     * @param curData 当前数据
+     * @memberof  HRTransferApplyUIServiceBase
+     */  
+    public getDEMainStateTag(curData:any){
+        if(this.mainStateFields.length === 0) return null;
+
+        this.mainStateFields.forEach((singleMainField:any) =>{
+            if(!(singleMainField in curData)){
+                console.warn(`当前数据对象不包含属性${singleMainField}，可能会发生错误`);
+            }
+        })
+        for (let i = 0; i <= 1; i++) {
+            let strTag:string = (curData[this.mainStateFields[0]])?(i == 0) ? curData[this.mainStateFields[0]] : "":"";
+            if (this.mainStateFields.length >= 2) {
+                for (let j = 0; j <= 1; j++) {
+                    let strTag2:string = (curData[this.mainStateFields[1]])?`${strTag}__${(j == 0) ? curData[this.mainStateFields[1]] : ""}`:strTag;
+                    if (this.mainStateFields.length >= 3) {
+                        for (let k = 0; k <= 1; k++) {
+                            let strTag3:string = (curData[this.mainStateFields[2]])?`${strTag2}__${(k == 0) ? curData[this.mainStateFields[2]] : ""}`:strTag2;
+                            // 判断是否存在
+                            return this.allDeMainStateMap.get(strTag3);
+                        }
+                    }else{
+                        return this.allDeMainStateMap.get(strTag2);
+                    }
+                }
+            }else{
+                return this.allDeMainStateMap.get(strTag);
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取数据对象当前操作标识
+    * 
+    * @param data 当前数据
+    * @memberof  HRTransferApplyUIServiceBase
+    */  
+   public getDEMainStateOPPrivs(data:any){
+        if(this.getDEMainStateTag(data)){
+            return this.allDeMainStateOPPrivsMap.get((this.getDEMainStateTag(data) as string));
+        }else{
+            return null;
+        }
+   }
+
+    /**
+    * 获取数据对象所有的操作标识
+    * 
+    * @param data 当前数据
+    * @memberof  HRTransferApplyUIServiceBase
+    */ 
+   public getAllOPPrivs(data:any){
+       return this.authService.getOPPrivs(this.getDEMainStateOPPrivs(data));
+   }
+
+}
\ No newline at end of file

app_PIM/src/uiservice/hrtransfer-apply/hrtransfer-apply-ui-service.ts

+import HRTransferApplyUIServiceBase from './hrtransfer-apply-ui-service-base';
+
+/**
+ * 调动申请UI服务对象
+ *
+ * @export
+ * @class HRTransferApplyUIService
+ */
+export default class HRTransferApplyUIService extends HRTransferApplyUIServiceBase {
+
+    /**
+     * Creates an instance of  HRTransferApplyUIService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  HRTransferApplyUIService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+}
\ No newline at end of file

app_PIM/src/uiservice/ui-service-register.ts

@@ -47,6 +47,7 @@ export class UIServiceRegister {
         this.allUIService.set('hrcertificate', () => import('@/uiservice/hrcertificate/hrcertificate-ui-service'));
         this.allUIService.set('hrorgcontact', () => import('@/uiservice/hrorg-contact/hrorg-contact-ui-service'));
         this.allUIService.set('hrempstate', () => import('@/uiservice/hremp-state/hremp-state-ui-service'));
+        this.allUIService.set('hrtransferapply', () => import('@/uiservice/hrtransfer-apply/hrtransfer-apply-ui-service'));
         this.allUIService.set('hrtechnicaltitle', () => import('@/uiservice/hrtechnical-title/hrtechnical-title-ui-service'));
         this.allUIService.set('hremployee', () => import('@/uiservice/hremployee/hremployee-ui-service'));
         this.allUIService.set('hrlegal', () => import('@/uiservice/hrlegal/hrlegal-ui-service'));

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

@@ -82,11 +82,22 @@ export class MainEditFormBase extends EditFormControlBase {
         srfuf: null,
         srfdeid: null,
         srfsourcekey: null,
-        hreducationname: null,
-        createman: null,
-        createdate: null,
-        updateman: null,
-        updatedate: null,
+        hremployeename: null,
+        degree: null,
+        begintime: null,
+        endtime: null,
+        school: null,
+        subject: null,
+        major: null,
+        learnmodality: null,
+        schooltype: null,
+        firstdegreeflag: null,
+        highdegreeflag: null,
+        attachment2: null,
+        attachment1: null,
+        attachment: null,
+        attachment3: null,
+        hremployeeid: null,
         hreducationid: null,
         hreducation:null,
     };
@@ -98,6 +109,18 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public rules: any = {
+        hremployeename: [
+            { required: true, type: 'string', message: '员工姓名 值不能为空', trigger: 'change' },
+            { required: true, type: 'string', message: '员工姓名 值不能为空', trigger: 'blur' },
+        ],
+        degree: [
+            { required: true, type: 'string', message: '学历 值不能为空', trigger: 'change' },
+            { required: true, type: 'string', message: '学历 值不能为空', trigger: 'blur' },
+        ],
+        begintime: [
+            { required: true, type: 'string', message: '入学时间 值不能为空', trigger: 'change' },
+            { required: true, type: 'string', message: '入学时间 值不能为空', trigger: 'blur' },
+        ],
     }
 
     /**
@@ -116,14 +139,10 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public detailsModel: any = {
-        group1: new FormGroupPanelModel({ caption: '教育信息基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hreducation.main_form', extractMode: 'ITEM', details: [] } }),
+        group1: new FormGroupPanelModel({ caption: '教育信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hreducation.main_form', extractMode: 'ITEM', details: [] } }),
 
         formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
 
-        group2: new FormGroupPanelModel({ caption: '操作信息', detailType: 'GROUPPANEL', name: 'group2', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hreducation.main_form', extractMode: 'ITEM', details: [] } }),
-
-        formpage2: new FormPageModel({ caption: '其它', detailType: 'FORMPAGE', name: 'formpage2', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
-
         srfupdatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
@@ -140,18 +159,39 @@ 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 }),
 
-        hreducationname: new FormItemModel({ caption: '教育信息名称', detailType: 'FORMITEM', name: 'hreducationname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        hremployeename: new FormItemModel({ caption: '员工姓名', detailType: 'FORMITEM', name: 'hremployeename', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        degree: new FormItemModel({ caption: '学历', detailType: 'FORMITEM', name: 'degree', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        begintime: new FormItemModel({ caption: '入学时间', detailType: 'FORMITEM', name: 'begintime', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        endtime: new FormItemModel({ caption: '毕业时间', detailType: 'FORMITEM', name: 'endtime', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        school: new FormItemModel({ caption: '毕业院校', detailType: 'FORMITEM', name: 'school', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        subject: new FormItemModel({ caption: '一级学科', detailType: 'FORMITEM', name: 'subject', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        major: new FormItemModel({ caption: '专业', detailType: 'FORMITEM', name: 'major', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        learnmodality: new FormItemModel({ caption: '学习形式', detailType: 'FORMITEM', name: 'learnmodality', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        schooltype: new FormItemModel({ caption: '学校性质', detailType: 'FORMITEM', name: 'schooltype', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        firstdegreeflag: new FormItemModel({ caption: '是否第一学历', detailType: 'FORMITEM', name: 'firstdegreeflag', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        highdegreeflag: new FormItemModel({ caption: '是否最高学历', detailType: 'FORMITEM', name: 'highdegreeflag', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        attachment2: new FormItemModel({ caption: '学位证', detailType: 'FORMITEM', name: 'attachment2', 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 }),
+        attachment1: new FormItemModel({ caption: '毕业证', detailType: 'FORMITEM', name: 'attachment1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        createdate: new FormItemModel({ caption: '建立时间', detailType: 'FORMITEM', name: 'createdate', 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 }),
 
-        updateman: new FormItemModel({ caption: '更新人', detailType: 'FORMITEM', name: 'updateman', 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 }),
 
-        updatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'updatedate', 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 }),
 
-        form: new FormTabPanelModel({ caption: 'form', detailType: 'TABPANEL', name: 'form', visible: true, isShowCaption: true, form: this, tabPages: [{ name: 'formpage1', index: 0, visible: true }, { name: 'formpage2', index: 1, visible: true }] }),
     };
 }
\ No newline at end of file

app_PIM/src/widgets/hreducation/main-form/main-form-model.ts

@@ -56,29 +56,84 @@ export default class MainModel {
         name: 'srfsourcekey',
       },
       {
-        name: 'hreducationname',
-        prop: 'hreducationname',
+        name: 'hremployeename',
+        prop: 'hremployeename',
+        dataType: 'PICKUPTEXT',
+      },
+      {
+        name: 'degree',
+        prop: 'degree',
+        dataType: 'SSCODELIST',
+      },
+      {
+        name: 'begintime',
+        prop: 'begintime',
+        dataType: 'DATE',
+      },
+      {
+        name: 'endtime',
+        prop: 'endtime',
+        dataType: 'DATE',
+      },
+      {
+        name: 'school',
+        prop: 'school',
         dataType: 'TEXT',
       },
       {
-        name: 'createman',
-        prop: 'createman',
+        name: 'subject',
+        prop: 'subject',
         dataType: 'TEXT',
       },
       {
-        name: 'createdate',
-        prop: 'createdate',
-        dataType: 'DATETIME',
+        name: 'major',
+        prop: 'major',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'learnmodality',
+        prop: 'learnmodality',
+        dataType: 'SSCODELIST',
+      },
+      {
+        name: 'schooltype',
+        prop: 'schooltype',
+        dataType: 'SSCODELIST',
       },
       {
-        name: 'updateman',
-        prop: 'updateman',
+        name: 'firstdegreeflag',
+        prop: 'firstdegreeflag',
+        dataType: 'YESNO',
+      },
+      {
+        name: 'highdegreeflag',
+        prop: 'highdegreeflag',
+        dataType: 'YESNO',
+      },
+      {
+        name: 'attachment2',
+        prop: 'attachment2',
         dataType: 'TEXT',
       },
       {
-        name: 'updatedate',
-        prop: 'updatedate',
-        dataType: 'DATETIME',
+        name: 'attachment1',
+        prop: 'attachment1',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'attachment',
+        prop: 'attachment',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'attachment3',
+        prop: 'attachment3',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'hremployeeid',
+        prop: 'hremployeeid',
+        dataType: 'PICKUP',
       },
       {
         name: 'hreducationid',

app_PIM/src/widgets/hreducation/main-form/main-form-service.ts

@@ -2,6 +2,7 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import HREducationService from '@/service/hreducation/hreducation-service';
 import MainModel from './main-form-model';
+import HREmployeeService from '@/service/hremployee/hremployee-service';
 
 
 /**
@@ -41,6 +42,14 @@ export default class MainService extends ControlService {
         this.model = new MainModel();
     }
 
+    /**
+     * 员工服务对象
+     *
+     * @type {HREmployeeService}
+     * @memberof MainService
+     */
+    public hremployeeService: HREmployeeService = new HREmployeeService();
+
     /**
      * 处理数据
      *
@@ -82,6 +91,9 @@ export default class MainService extends ControlService {
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
         data.page = data.page ? data.page : 0;
         data.size = data.size ? data.size : 1000;
+        if (Object.is(serviceName, 'HREmployeeService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.hremployeeService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'employeeid', 'hremployee');
+        }
 
         return Promise.reject([])
     }

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

 <i-form :model="this.data" class='app-form' ref='form'  id='hreducation_main' style="">
     <input style="display:none;" />
     <row >
-    <tabs :animated="false" size="small" name='main' :value="detailsModel.form.activiedPage" 
-        @on-click="detailsModel.form.clickPage($event)">
-            <tab-pane v-show="detailsModel.formpage1.visible" name='formpage1' :index="0" tab='main' class=''  
-                :label="(h) =>{
-                    return h('span',{
-                        class:'caption'
-                    },[
-                    $t('entities.hreducation.main_form.details.formpage1')
-                    ])
-                }">
-                    
+            
 <i-col class="form-layout-container" v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <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="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <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.hreducationname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='hreducationname' :itemRules="this.rules.hreducationname" class='' :caption="$t('entities.hreducation.main_form.details.hreducationname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.hreducationname.error" :isEmptyCaption="false" labelPos="LEFT">
+        <i-col class="form-layout-container" v-show="detailsModel.hremployeename.visible" :style="{}"  :lg="{ span: 24, 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 
+  :formState="formState"
+  :data="data"
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.hremployeename.disabled"
+  name='hremployeename'
+  deMajorField='employeename'
+  deKeyField='hremployee'
+  :service="service"
+  :acParams="{ serviceName: 'HREmployeeService', interfaceName: 'FetchDefault'}"
+  valueitem='hremployeeid' 
+  :value="data.hremployeename"
+  :pickupView="{ viewname: 'hremployee-pickup-view', title: $t('entities.hremployee.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'hremployees', parameterName: 'hremployee' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+  style=""  
+  @formitemvaluechange="onFormItemValueChange($event)">
+</app-picker>
+
+</app-form-item>
+
+</i-col>
+<i-col class="form-layout-container" v-show="detailsModel.degree.visible" :style="{}"  :lg="{ span: 24, 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 
+    v-model="data.degree"
+    :data="data"
+    :context="context"
+    :viewparams="viewparams"
+    :localContext ='{ }' 
+    :localParam ='{ }' 
+    :disabled="detailsModel.degree.disabled"
+    valueType="string"
+    tag='CL_HR_0014'
+    codelistType='STATIC'
+    placeholder='请选择...'
+    
+/>
+</app-form-item>
+
+</i-col>
+<i-col class="form-layout-container" v-show="detailsModel.begintime.visible" :style="{}"  :lg="{ span: 24, 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 }">
+    <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 }">
+    <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.hreducationname"  
+    v-model="data.school"  
     @enter="onEnter($event)"  
      unit=""  
-    :disabled="detailsModel.hreducationname.disabled" 
+    :disabled="detailsModel.school.disabled" 
     type='text' 
     style="">
 </input-box>
@@ -30,64 +80,131 @@
 </app-form-item>
 
 </i-col>
-    
-    </row>
-</app-form-group>
+<i-col class="form-layout-container" v-show="detailsModel.subject.visible" :style="{}"  :lg="{ span: 24, 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"  
+    @enter="onEnter($event)"  
+     unit=""  
+    :disabled="detailsModel.subject.disabled" 
+    type='text' 
+    style="">
+</input-box>
+
+</app-form-item>
 
 </i-col>
+<i-col class="form-layout-container" v-show="detailsModel.major.visible" :style="{}"  :lg="{ span: 24, 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"  
+    @enter="onEnter($event)"  
+     unit=""  
+    :disabled="detailsModel.major.disabled" 
+    type='text' 
+    style="">
+</input-box>
 
+</app-form-item>
 
-            </tab-pane> 
-            <tab-pane v-show="detailsModel.formpage2.visible" name='formpage2' :index="1" tab='main' class=''  
-                :label="(h) =>{
-                    return h('span',{
-                        class:'caption'
-                    },[
-                    $t('entities.hreducation.main_form.details.formpage2')
-                    ])
-                }">
-                    
-<i-col class="form-layout-container" v-show="detailsModel.group2.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group :model="detailsModel.group2" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hreducation.main_form.details.group2')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
-    <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group2" :data="data" :context="context" :viewparams="viewparams"/>
-    <row>
-        <i-col class="form-layout-container" v-show="detailsModel.createman.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='createman' :itemRules="this.rules.createman" class='' :caption="$t('entities.hreducation.main_form.details.createman')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.createman.error" :isEmptyCaption="false" labelPos="LEFT">
+</i-col>
+<i-col class="form-layout-container" v-show="detailsModel.learnmodality.visible" :style="{}"  :lg="{ span: 24, 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">
     
-<app-span name='createman' :value="data.createman" dataType="TEXT"     :precision="0"
-tag='SysOperator' codelistType='DYNAMIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
-</app-span>
-
+<dropdown-list 
+    v-model="data.learnmodality"
+    :data="data"
+    :context="context"
+    :viewparams="viewparams"
+    :localContext ='{ }' 
+    :localParam ='{ }' 
+    :disabled="detailsModel.learnmodality.disabled"
+    valueType="string"
+    placeholder='请选择...'
+    
+/>
 </app-form-item>
 
 </i-col>
-<i-col class="form-layout-container" v-show="detailsModel.createdate.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='createdate' :itemRules="this.rules.createdate" class='' :caption="$t('entities.hreducation.main_form.details.createdate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.createdate.error" :isEmptyCaption="false" labelPos="LEFT">
+<i-col class="form-layout-container" v-show="detailsModel.schooltype.visible" :style="{}"  :lg="{ span: 24, 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 
+    v-model="data.schooltype"
+    :data="data"
+    :context="context"
+    :viewparams="viewparams"
+    :localContext ='{ }' 
+    :localParam ='{ }' 
+    :disabled="detailsModel.schooltype.disabled"
+    valueType="string"
+    placeholder='请选择...'
     
-<app-span name='createdate' :value="data.createdate" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"     :precision="0"
-:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
-</app-span>
+/>
+</app-form-item>
 
+</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-form-item>
 
 </i-col>
-<i-col class="form-layout-container" v-show="detailsModel.updateman.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='updateman' :itemRules="this.rules.updateman" class='' :caption="$t('entities.hreducation.main_form.details.updateman')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.updateman.error" :isEmptyCaption="false" labelPos="LEFT">
+<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">
     
-<app-span name='updateman' :value="data.updateman" dataType="TEXT"     :precision="0"
-tag='SysOperator' codelistType='DYNAMIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
-</app-span>
+<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-form-item>
 
+</i-col>
+<i-col class="form-layout-container" v-show="detailsModel.attachment2.visible" :style="{}"  :lg="{ span: 24, 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.updatedate.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='updatedate' :itemRules="this.rules.updatedate" class='' :caption="$t('entities.hreducation.main_form.details.updatedate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.updatedate.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-span name='updatedate' :value="data.updatedate" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"     :precision="0"
-:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
-</app-span>
+<i-col class="form-layout-container" v-show="detailsModel.attachment1.visible" :style="{}"  :lg="{ span: 24, 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>
+</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>
 </app-form-item>
 
 </i-col>
@@ -98,7 +215,5 @@ tag='SysOperator' codelistType='DYNAMIC' :data="data" :context="context" :viewpa
 </i-col>
 
 
-            </tab-pane> 
-    </tabs>
     </row>
 </i-form>
\ No newline at end of file

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

@@ -93,25 +93,81 @@ export class MainGridBase extends GridControlBase {
      */
     public allColumns: any[] = [
         {
-            name: 'hreducationname',
-            label: '教育信息名称',
-            langtag: 'entities.hreducation.main_grid.columns.hreducationname',
+            name: 'degree',
+            label: '学历',
+            langtag: 'entities.hreducation.main_grid.columns.degree',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
         },
         {
-            name: 'updateman',
-            label: '更新人',
-            langtag: 'entities.hreducation.main_grid.columns.updateman',
+            name: 'begintime',
+            label: '入学时间',
+            langtag: 'entities.hreducation.main_grid.columns.begintime',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
         },
         {
-            name: 'updatedate',
-            label: '更新时间',
-            langtag: 'entities.hreducation.main_grid.columns.updatedate',
+            name: 'endtime',
+            label: '毕业时间',
+            langtag: 'entities.hreducation.main_grid.columns.endtime',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'school',
+            label: '毕业院校',
+            langtag: 'entities.hreducation.main_grid.columns.school',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'subject',
+            label: '一级学科',
+            langtag: 'entities.hreducation.main_grid.columns.subject',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'major',
+            label: '专业',
+            langtag: 'entities.hreducation.main_grid.columns.major',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'learnmodality',
+            label: '学习形式',
+            langtag: 'entities.hreducation.main_grid.columns.learnmodality',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'schooltype',
+            label: '学校性质',
+            langtag: 'entities.hreducation.main_grid.columns.schooltype',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'highdegreeflag',
+            label: '是否最高学历',
+            langtag: 'entities.hreducation.main_grid.columns.highdegreeflag',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'firstdegreeflag',
+            label: '是否第一学历',
+            langtag: 'entities.hreducation.main_grid.columns.firstdegreeflag',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
@@ -150,9 +206,16 @@ export class MainGridBase extends GridControlBase {
      * @memberof MainBase
      */
     public hasRowEdit: any = {
-        'hreducationname':false,
-        'updateman':false,
-        'updatedate':false,
+        'degree':false,
+        'begintime':false,
+        'endtime':false,
+        'school':false,
+        'subject':false,
+        'major':false,
+        'learnmodality':false,
+        'schooltype':false,
+        'highdegreeflag':false,
+        'firstdegreeflag':false,
     };
 
     /**
@@ -179,9 +242,25 @@ 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: 'degree',
+                srfkey: 'CL_HR_0014',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+            {
+                name: 'highdegreeflag',
+                srfkey: 'YesNo',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+            {
+                name: 'firstdegreeflag',
+                srfkey: 'YesNo',
+                codelistType : 'STATIC',
                 renderMode: 'other',
                 textSeparator: '、',
                 valueSeparator: ',',

app_PIM/src/widgets/hreducation/main-grid/main-grid-model.ts

@@ -27,19 +27,39 @@ export default class MainModel {
     }else{
 		  return [
         {
-          name: 'hremployeeid',
-          prop: 'hremployeeid',
-          dataType: 'PICKUP',
+          name: 'endtime',
+          prop: 'endtime',
+          dataType: 'DATE',
+        },
+        {
+          name: 'learnmodality',
+          prop: 'learnmodality',
+          dataType: 'SSCODELIST',
+        },
+        {
+          name: 'firstdegreeflag',
+          prop: 'firstdegreeflag',
+          dataType: 'YESNO',
         },
         {
-          name: 'updateman',
-          prop: 'updateman',
+          name: 'begintime',
+          prop: 'begintime',
+          dataType: 'DATE',
+        },
+        {
+          name: 'subject',
+          prop: 'subject',
           dataType: 'TEXT',
         },
         {
-          name: 'updatedate',
-          prop: 'updatedate',
-          dataType: 'DATETIME',
+          name: 'highdegreeflag',
+          prop: 'highdegreeflag',
+          dataType: 'YESNO',
+        },
+        {
+          name: 'schooltype',
+          prop: 'schooltype',
+          dataType: 'SSCODELIST',
         },
         {
           name: 'srfmajortext',
@@ -47,19 +67,34 @@ export default class MainModel {
           dataType: 'TEXT',
         },
         {
-          name: 'srfdataaccaction',
+          name: 'srfkey',
           prop: 'hreducationid',
           dataType: 'GUID',
+          isEditable:true
         },
         {
-          name: 'srfkey',
+          name: 'srfdataaccaction',
           prop: 'hreducationid',
           dataType: 'GUID',
-          isEditable:true
         },
         {
-          name: 'hreducationname',
-          prop: 'hreducationname',
+          name: 'hremployeeid',
+          prop: 'hremployeeid',
+          dataType: 'PICKUP',
+        },
+        {
+          name: 'degree',
+          prop: 'degree',
+          dataType: 'SSCODELIST',
+        },
+        {
+          name: 'school',
+          prop: 'school',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'major',
+          prop: 'major',
           dataType: 'TEXT',
         },
         {

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

@@ -23,41 +23,129 @@
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
-            <template v-if="getColumnState('hreducationname')">
-                <el-table-column show-overflow-tooltip :prop="'hreducationname'" :label="$t('entities.hreducation.main_grid.columns.hreducationname')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('degree')">
+                <el-table-column show-overflow-tooltip :prop="'degree'" :label="$t('entities.hreducation.main_grid.columns.degree')" :width="150"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.hreducation.main_grid.columns.hreducationname')}}
+                        {{$t('entities.hreducation.main_grid.columns.degree')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.hreducationname}}</span>
+                        <template >
+            <codelist :value="row.degree" tag='CL_HR_0014' codelistType='STATIC' ></codelist>
+                        </template>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('begintime')">
+                <el-table-column show-overflow-tooltip :prop="'begintime'" :label="$t('entities.hreducation.main_grid.columns.begintime')" :width="150"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hreducation.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.hreducation.main_grid.columns.endtime')" :width="150"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hreducation.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('school')">
+                <el-table-column show-overflow-tooltip :prop="'school'" :label="$t('entities.hreducation.main_grid.columns.school')" :width="150"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hreducation.main_grid.columns.school')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.school}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('subject')">
+                <el-table-column show-overflow-tooltip :prop="'subject'" :label="$t('entities.hreducation.main_grid.columns.subject')" :width="150"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hreducation.main_grid.columns.subject')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.subject}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('major')">
+                <el-table-column show-overflow-tooltip :prop="'major'" :label="$t('entities.hreducation.main_grid.columns.major')" :width="150"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hreducation.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('learnmodality')">
+                <el-table-column show-overflow-tooltip :prop="'learnmodality'" :label="$t('entities.hreducation.main_grid.columns.learnmodality')" :width="150"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hreducation.main_grid.columns.learnmodality')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.learnmodality}}</span>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updateman')">
-                <el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hreducation.main_grid.columns.updateman')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('schooltype')">
+                <el-table-column show-overflow-tooltip :prop="'schooltype'" :label="$t('entities.hreducation.main_grid.columns.schooltype')" :width="150"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.hreducation.main_grid.columns.updateman')}}
+                        {{$t('entities.hreducation.main_grid.columns.schooltype')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.schooltype}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('highdegreeflag')">
+                <el-table-column show-overflow-tooltip :prop="'highdegreeflag'" :label="$t('entities.hreducation.main_grid.columns.highdegreeflag')" :width="150"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hreducation.main_grid.columns.highdegreeflag')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
                         <template >
-            <codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
+            <codelist :value="row.highdegreeflag" tag='YesNo' codelistType='STATIC' ></codelist>
                         </template>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updatedate')">
-                <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hreducation.main_grid.columns.updatedate')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('firstdegreeflag')">
+                <el-table-column show-overflow-tooltip :prop="'firstdegreeflag'" :label="$t('entities.hreducation.main_grid.columns.firstdegreeflag')" :width="150"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.hreducation.main_grid.columns.updatedate')}}
+                        {{$t('entities.hreducation.main_grid.columns.firstdegreeflag')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <app-format-data format="YYYY-MM-DD HH:mm:ss" :data="row.updatedate"></app-format-data>
+                        <template >
+            <codelist :value="row.firstdegreeflag" tag='YesNo' codelistType='STATIC' ></codelist>
+                        </template>
                     </template>
                 </el-table-column>
             </template>

app_PIM/src/widgets/hremployee/ef-001-form/ef-001-form-base.tsx

@@ -88,6 +88,8 @@ export class EF_001EditFormBase extends EditFormControlBase {
         certtype: null,
         certnum: null,
         organizationname: null,
+        hrpostname: null,
+        hrpostid: null,
         organizationid: null,
         employeeid: null,
         hremployee:null,
@@ -170,6 +172,10 @@ export class EF_001EditFormBase extends EditFormControlBase {
 
         organizationname: new FormItemModel({ caption: '单位', detailType: 'FORMITEM', name: 'organizationname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
+        hrpostname: new FormItemModel({ caption: '职位', detailType: 'FORMITEM', name: 'hrpostname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        hrpostid: new FormItemModel({ caption: '职位标识', detailType: 'FORMITEM', name: 'hrpostid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
         organizationid: new FormItemModel({ caption: '组织ID', detailType: 'FORMITEM', name: 'organizationid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         employeeid: new FormItemModel({ caption: '员工标识', detailType: 'FORMITEM', name: 'employeeid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),

app_PIM/src/widgets/hremployee/ef-001-form/ef-001-form-model.ts

@@ -85,6 +85,16 @@ export default class EF_001Model {
         prop: 'organizationname',
         dataType: 'PICKUPTEXT',
       },
+      {
+        name: 'hrpostname',
+        prop: 'hrpostname',
+        dataType: 'PICKUPTEXT',
+      },
+      {
+        name: 'hrpostid',
+        prop: 'hrpostid',
+        dataType: 'PICKUP',
+      },
       {
         name: 'organizationid',
         prop: 'organizationid',

app_PIM/src/widgets/hremployee/ef-001-form/ef-001-form-service.ts

@@ -3,6 +3,7 @@ import ControlService from '@/widgets/control-service';
 import HREmployeeService from '@/service/hremployee/hremployee-service';
 import EF_001Model from './ef-001-form-model';
 import HROrganizationService from '@/service/hrorganization/hrorganization-service';
+import HRPostService from '@/service/hrpost/hrpost-service';
 
 
 /**
@@ -50,6 +51,14 @@ export default class EF_001Service extends ControlService {
      */
     public hrorganizationService: HROrganizationService = new HROrganizationService();
 
+    /**
+     * 职位服务对象
+     *
+     * @type {HRPostService}
+     * @memberof EF_001Service
+     */
+    public hrpostService: HRPostService = new HRPostService();
+
     /**
      * 处理数据
      *
@@ -94,6 +103,9 @@ export default class EF_001Service extends ControlService {
         if (Object.is(serviceName, 'HROrganizationService') && Object.is(interfaceName, 'FetchDefault')) {
             return this.doItems(this.hrorganizationService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'organizationid', 'hrorganization');
         }
+        if (Object.is(serviceName, 'HRPostService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.hrpostService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'hrpostid', 'hrpost');
+        }
 
         return Promise.reject([])
     }

app_PIM/src/widgets/hremployee/ef-001-form/ef-001-form.html

@@ -113,6 +113,32 @@
 
 </app-form-item>
 
+</i-col>
+<i-col class="form-layout-container" v-show="detailsModel.hrpostname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='hrpostname' :itemRules="this.rules.hrpostname" class='' :caption="$t('entities.hremployee.ef_001_form.details.hrpostname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.hrpostname.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-picker 
+  :formState="formState"
+  :data="data"
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.hrpostname.disabled"
+  name='hrpostname'
+  deMajorField='hrpostname'
+  deKeyField='hrpost'
+  :service="service"
+  :acParams="{ serviceName: 'HRPostService', interfaceName: 'FetchDefault'}"
+  valueitem='hrpostid' 
+  :value="data.hrpostname"
+  :pickupView="{ viewname: 'hrpost-pickup-view', title: $t('entities.hrpost.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'hrposts', parameterName: 'hrpost' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+  style=""  
+  @formitemvaluechange="onFormItemValueChange($event)">
+</app-picker>
+
+</app-form-item>
+
 </i-col>
     
     </row>

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

@@ -116,6 +116,22 @@ export class MainGridBase extends GridControlBase {
             util: 'PX',
             isEnableRowEdit: false,
         },
+        {
+            name: 'hrdutyname',
+            label: '职务',
+            langtag: 'entities.hremployee.main_grid.columns.hrdutyname',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'hrpostname',
+            label: '职位',
+            langtag: 'entities.hremployee.main_grid.columns.hrpostname',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
         {
             name: 'certnum',
             label: '证件号码',
@@ -201,6 +217,8 @@ export class MainGridBase extends GridControlBase {
         'employeecode':false,
         'employeename':false,
         'organizationname':false,
+        'hrdutyname':false,
+        'hrpostname':false,
         'certnum':false,
         'birthday':false,
         'age':false,

app_PIM/src/widgets/hremployee/main-grid/main-grid-model.ts

@@ -46,6 +46,16 @@ export default class MainModel {
           prop: 'empstate',
           dataType: 'PICKUP',
         },
+        {
+          name: 'hrdutyname',
+          prop: 'hrdutyname',
+          dataType: 'PICKUPDATA',
+        },
+        {
+          name: 'hrpostname',
+          prop: 'hrpostname',
+          dataType: 'PICKUPTEXT',
+        },
         {
           name: 'employeename',
           prop: 'employeename',
@@ -62,15 +72,15 @@ export default class MainModel {
           dataType: 'TEXT',
         },
         {
-          name: 'srfkey',
+          name: 'srfdataaccaction',
           prop: 'employeeid',
           dataType: 'GUID',
-          isEditable:true
         },
         {
-          name: 'srfdataaccaction',
+          name: 'srfkey',
           prop: 'employeeid',
           dataType: 'GUID',
+          isEditable:true
         },
         {
           name: 'organizationid',

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

@@ -59,6 +59,30 @@
                     </template>
                 </el-table-column>
             </template>
+            <template v-if="getColumnState('hrdutyname')">
+                <el-table-column show-overflow-tooltip :prop="'hrdutyname'" :label="$t('entities.hremployee.main_grid.columns.hrdutyname')" :width="150"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hremployee.main_grid.columns.hrdutyname')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.hrdutyname}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('hrpostname')">
+                <el-table-column show-overflow-tooltip :prop="'hrpostname'" :label="$t('entities.hremployee.main_grid.columns.hrpostname')" :width="150"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hremployee.main_grid.columns.hrpostname')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.hrpostname}}</span>
+                    </template>
+                </el-table-column>
+            </template>
             <template v-if="getColumnState('certnum')">
                 <el-table-column show-overflow-tooltip :prop="'certnum'" :label="$t('entities.hremployee.main_grid.columns.certnum')" :width="150"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">

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-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: