jackwang 部署微服务应用

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

@@ -37,7 +37,47 @@
         ]
     }, 
     {
-        "srfkey": "CL_HR_004",
+        "srfkey": "CL_HR_0005",
+        "emptytext": "未定义",
+        "codelisttype":"static",
+        "items": [
+             {
+                "id": "HIGH",
+                "label": "高",
+                "text": "高",
+                "data":"",
+                "codename":"High",
+                "value": "HIGH",
+                
+                "disabled": false,
+                "default": false
+            }
+            , {
+                "id": "MID",
+                "label": "中",
+                "text": "中",
+                "data":"",
+                "codename":"Mid",
+                "value": "MID",
+                
+                "disabled": false,
+                "default": false
+            }
+            , {
+                "id": "LOW",
+                "label": "低",
+                "text": "低",
+                "data":"",
+                "codename":"Low",
+                "value": "LOW",
+                
+                "disabled": false,
+                "default": false
+            }
+        ]
+    }, 
+    {
+        "srfkey": "CL_HR_0004",
         "emptytext": "未定义",
         "codelisttype":"static",
         "items": [

app_PIM/public/assets/json/view-config.json

 {
+    "hrdutyv_001": {
+        "title": "快速新建",
+        "caption": "快速新建",
+        "viewtype": "DEOPTVIEW",
+        "viewmodule": "HumanResource",
+        "viewname": "HRDutyV_001",
+        "viewfilename": "hrduty-v-001",
+        "viewtag": "02571ad88a921ccc490d7b727b4f767d",
+        "memo": ""
+    },
     "hromhierarchycatpickupgridview": {
         "title": "结构层次类别选择表格视图",
         "caption": "结构层次类别",
@@ -29,6 +39,26 @@
         "viewtag": "0515a652f1ba4326ef610f1d98be95c8",
         "memo": "系统自动添加"
     },
+    "hrdutyeduv_002": {
+        "title": "职务教育嵌入职务",
+        "caption": "职务教育嵌入职务",
+        "viewtype": "DEGRIDVIEW9",
+        "viewmodule": "HumanResource",
+        "viewname": "HRDutyEduV_002",
+        "viewfilename": "hrduty-edu-v-002",
+        "viewtag": "069985244f19f8c6f8e74e39ef573e9a",
+        "memo": ""
+    },
+    "hrdutyeduv_001": {
+        "title": "职务教育",
+        "caption": "职务教育",
+        "viewtype": "DEOPTVIEW",
+        "viewmodule": "HumanResource",
+        "viewname": "HRDutyEduV_001",
+        "viewfilename": "hrduty-edu-v-001",
+        "viewtag": "06dd873e0c67a6a416c76c9803fd80bd",
+        "memo": ""
+    },
     "hrorganizationpickupgridview": {
         "title": "组织选择表格视图",
         "caption": "组织",
@@ -59,6 +89,26 @@
         "viewtag": "114f056047eddd92374e982356e59852",
         "memo": ""
     },
+    "hrdutyedugridview": {
+        "title": "职务教育表格视图",
+        "caption": "职务教育",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "HumanResource",
+        "viewname": "HRDutyEduGridView",
+        "viewfilename": "hrduty-edu-grid-view",
+        "viewtag": "11c1ce686ccb8c2a9bb66a8cde3b93be",
+        "memo": "系统自动添加"
+    },
+    "hrdutycerteditview": {
+        "title": "职务证书编辑视图",
+        "caption": "职务证书",
+        "viewtype": "DEEDITVIEW",
+        "viewmodule": "HumanResource",
+        "viewname": "HRDutyCertEditView",
+        "viewfilename": "hrduty-cert-edit-view",
+        "viewtag": "12bdd00f130135bc6c85947eeaff67fb",
+        "memo": "系统自动添加"
+    },
     "hromhierarchycatv_002": {
         "title": "层次结构",
         "caption": "结构层次类别",
@@ -149,6 +199,16 @@
         "viewtag": "2cc9f94bc50095005332a93eb120c828",
         "memo": ""
     },
+    "hrdutycertv_001": {
+        "title": "职务证书",
+        "caption": "职务证书",
+        "viewtype": "DEOPTVIEW",
+        "viewmodule": "HumanResource",
+        "viewname": "HRDutyCertV_001",
+        "viewfilename": "hrduty-cert-v-001",
+        "viewtag": "2ee255b61cfa5e9bb8991f1421e807c3",
+        "memo": ""
+    },
     "hrorgaddressv_001": {
         "title": "组织地址嵌入组织",
         "caption": "组织地址嵌入组织",
@@ -159,6 +219,16 @@
         "viewtag": "3110aca6f6c27996e9874cfb924c569f",
         "memo": ""
     },
+    "hrdutycertv_002": {
+        "title": "职务证书嵌入职务",
+        "caption": "职务证书嵌入职务",
+        "viewtype": "DEGRIDVIEW9",
+        "viewmodule": "HumanResource",
+        "viewname": "HRDutyCertV_002",
+        "viewfilename": "hrduty-cert-v-002",
+        "viewtag": "3180604a9489c03131e6642e456cd5c0",
+        "memo": ""
+    },
     "hrpostv_003": {
         "title": "失效职位",
         "caption": "职位",
@@ -219,6 +289,16 @@
         "viewtag": "4f567c340cbb4271d44543b278d29d0f",
         "memo": ""
     },
+    "hrdutydashboardview": {
+        "title": "职务看板",
+        "caption": "职务看板",
+        "viewtype": "DEPORTALVIEW",
+        "viewmodule": "HumanResource",
+        "viewname": "HRDutyDashboardView",
+        "viewfilename": "hrduty-dashboard-view",
+        "viewtag": "532833b3a07947f04a46adcc957a0ca6",
+        "memo": ""
+    },
     "hrorgcontactgridview": {
         "title": "组织联系信息表格视图",
         "caption": "组织联系信息",
@@ -229,6 +309,16 @@
         "viewtag": "53de2c13a619e20769cdc9dbfa10e1a5",
         "memo": "系统自动添加"
     },
+    "hrdutyv_002": {
+        "title": "职务信息",
+        "caption": "职务信息",
+        "viewtype": "DEEDITVIEW",
+        "viewmodule": "HumanResource",
+        "viewname": "HRDutyV_002",
+        "viewfilename": "hrduty-v-002",
+        "viewtag": "54e70bcf034bf3715d121537bc8d1d77",
+        "memo": "系统自动添加"
+    },
     "hrpostpickupgridview": {
         "title": "职位选择表格视图",
         "caption": "职位",
@@ -250,8 +340,8 @@
         "memo": ""
     },
     "hrdutyeditview": {
-        "title": "职务编辑视图",
-        "caption": "职务",
+        "title": "职务信息",
+        "caption": "职务信息",
         "viewtype": "DEEDITVIEW",
         "viewmodule": "HumanResource",
         "viewname": "HRDutyEditView",
@@ -299,6 +389,16 @@
         "viewtag": "6cf9411c3f3597947dfee8dad2968182",
         "memo": "系统自动添加"
     },
+    "hrdutyskillv_002": {
+        "title": "职务技能嵌入职务",
+        "caption": "职务技能嵌入职务",
+        "viewtype": "DEGRIDVIEW9",
+        "viewmodule": "HumanResource",
+        "viewname": "HRDutySkillV_002",
+        "viewfilename": "hrduty-skill-v-002",
+        "viewtag": "6d4cab857af2830b37515c2015a40e5f",
+        "memo": ""
+    },
     "hremployeepickupgridview": {
         "title": "员工选择表格视图",
         "caption": "员工",
@@ -359,6 +459,16 @@
         "viewtag": "816f119be45e16d278809f590fb65029",
         "memo": ""
     },
+    "hrdutyskillgridview": {
+        "title": "职务技能表格视图",
+        "caption": "职务技能",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "HumanResource",
+        "viewname": "HRDutySkillGridView",
+        "viewfilename": "hrduty-skill-grid-view",
+        "viewtag": "8959a1a3f5b43dbc52182d6cf04f00a1",
+        "memo": "系统自动添加"
+    },
     "hrorgaddresseditview": {
         "title": "组织地址编辑视图",
         "caption": "组织地址",
@@ -399,6 +509,16 @@
         "viewtag": "9e5d3f17ad97fd735b8abc637018301d",
         "memo": "系统自动添加"
     },
+    "hrdutyskilleditview": {
+        "title": "职务技能编辑视图",
+        "caption": "职务技能",
+        "viewtype": "DEEDITVIEW",
+        "viewmodule": "HumanResource",
+        "viewname": "HRDutySkillEditView",
+        "viewfilename": "hrduty-skill-edit-view",
+        "viewtag": "a54a950e4550856191ac9bb32f77b863",
+        "memo": "系统自动添加"
+    },
     "hromhierarchycateditview": {
         "title": "结构层次类别编辑视图",
         "caption": "结构层次类别",
@@ -409,6 +529,16 @@
         "viewtag": "aa2c4d945f9d880dd836ebe74ca9f547",
         "memo": "系统自动添加"
     },
+    "hrdutycertgridview": {
+        "title": "职务证书表格",
+        "caption": "职务证书",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "HumanResource",
+        "viewname": "HRDutyCertGridView",
+        "viewfilename": "hrduty-cert-grid-view",
+        "viewtag": "aeb8d0367c4a34ad420ba08085acc8ce",
+        "memo": "系统自动添加"
+    },
     "hrlegalv_001": {
         "title": "快速新建",
         "caption": "快速新建",
@@ -439,8 +569,18 @@
         "viewtag": "b4ef4b87eb87fc3a2a8479027d62ac4c",
         "memo": "系统自动添加"
     },
+    "hrdutytabexpview": {
+        "title": "职务信息",
+        "caption": "职务信息",
+        "viewtype": "DETABEXPVIEW",
+        "viewmodule": "HumanResource",
+        "viewname": "HRDutyTabExpView",
+        "viewfilename": "hrduty-tab-exp-view",
+        "viewtag": "b90584e97a642bf5d5d8dac74217c6fc",
+        "memo": ""
+    },
     "hrdutygridview": {
-        "title": "职务表格视图",
+        "title": "职务表格",
         "caption": "职务",
         "viewtype": "DEGRIDVIEW",
         "viewmodule": "HumanResource",
@@ -529,6 +669,16 @@
         "viewtag": "d2137112227c4243e95ffe9ef7eaafab",
         "memo": ""
     },
+    "hrdutyskillv_001": {
+        "title": "职务技能",
+        "caption": "职务技能",
+        "viewtype": "DEOPTVIEW",
+        "viewmodule": "HumanResource",
+        "viewname": "HRDutySkillV_001",
+        "viewfilename": "hrduty-skill-v-001",
+        "viewtag": "d2411142d3398651fb50d214bcfc3e3d",
+        "memo": ""
+    },
     "hroperationunitv_001": {
         "title": "快速新建",
         "caption": "快速新建",
@@ -579,6 +729,16 @@
         "viewtag": "e249cd84a7d955affe21832bbe41c40a",
         "memo": ""
     },
+    "hrdutyedueditview": {
+        "title": "职务教育编辑视图",
+        "caption": "职务教育",
+        "viewtype": "DEEDITVIEW",
+        "viewmodule": "HumanResource",
+        "viewname": "HRDutyEduEditView",
+        "viewfilename": "hrduty-edu-edit-view",
+        "viewtag": "e3878971a0f023a84eb5047806090ef0",
+        "memo": "系统自动添加"
+    },
     "hrlegaleditview": {
         "title": "法人编辑视图",
         "caption": "法人",

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

@@ -45,12 +45,15 @@ export class AuthServiceRegister {
         this.allAuthService.set('hrorgcontact', () => import('@/authservice/hrorg-contact/hrorg-contact-auth-service'));
         this.allAuthService.set('hremployee', () => import('@/authservice/hremployee/hremployee-auth-service'));
         this.allAuthService.set('hrlegal', () => import('@/authservice/hrlegal/hrlegal-auth-service'));
+        this.allAuthService.set('hrdutyedu', () => import('@/authservice/hrduty-edu/hrduty-edu-auth-service'));
         this.allAuthService.set('hromhierarchypurpose', () => import('@/authservice/hromhierarchypurpose/hromhierarchypurpose-auth-service'));
         this.allAuthService.set('hromhierarchy', () => import('@/authservice/hromhierarchy/hromhierarchy-auth-service'));
         this.allAuthService.set('hrdistribution', () => import('@/authservice/hrdistribution/hrdistribution-auth-service'));
         this.allAuthService.set('hrorgaddress', () => import('@/authservice/hrorg-address/hrorg-address-auth-service'));
         this.allAuthService.set('hrpost', () => import('@/authservice/hrpost/hrpost-auth-service'));
         this.allAuthService.set('hrorganization', () => import('@/authservice/hrorganization/hrorganization-auth-service'));
+        this.allAuthService.set('hrdutyskill', () => import('@/authservice/hrduty-skill/hrduty-skill-auth-service'));
+        this.allAuthService.set('hrdutycert', () => import('@/authservice/hrduty-cert/hrduty-cert-auth-service'));
         this.allAuthService.set('hrduty', () => import('@/authservice/hrduty/hrduty-auth-service'));
         this.allAuthService.set('hrpostrel', () => import('@/authservice/hrpost-rel/hrpost-rel-auth-service'));
     }

app_PIM/src/authservice/hrduty-cert/hrduty-cert-auth-service-base.ts

+import AuthService from '../auth-service';
+
+/**
+ * 职务证书权限服务对象基类
+ *
+ * @export
+ * @class HRDutyCertAuthServiceBase
+ * @extends {AuthService}
+ */
+export default class HRDutyCertAuthServiceBase extends AuthService {
+
+    /**
+     * Creates an instance of  HRDutyCertAuthServiceBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  HRDutyCertAuthServiceBase
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+    /**
+     * 根据当前数据获取实体操作标识
+     *
+     * @param {*} mainSateOPPrivs 传入数据操作标识
+     * @returns {any}
+     * @memberof HRDutyCertAuthServiceBase
+     */
+    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/hrduty-cert/hrduty-cert-auth-service.ts

+import HRDutyCertAuthServiceBase from './hrduty-cert-auth-service-base';
+
+
+/**
+ * 职务证书权限服务对象
+ *
+ * @export
+ * @class HRDutyCertAuthService
+ * @extends {HRDutyCertAuthServiceBase}
+ */
+export default class HRDutyCertAuthService extends HRDutyCertAuthServiceBase {
+
+    /**
+     * Creates an instance of  HRDutyCertAuthService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  HRDutyCertAuthService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+
+}
\ No newline at end of file

app_PIM/src/authservice/hrduty-edu/hrduty-edu-auth-service-base.ts

+import AuthService from '../auth-service';
+
+/**
+ * 职务教育权限服务对象基类
+ *
+ * @export
+ * @class HRDutyEduAuthServiceBase
+ * @extends {AuthService}
+ */
+export default class HRDutyEduAuthServiceBase extends AuthService {
+
+    /**
+     * Creates an instance of  HRDutyEduAuthServiceBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  HRDutyEduAuthServiceBase
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+    /**
+     * 根据当前数据获取实体操作标识
+     *
+     * @param {*} mainSateOPPrivs 传入数据操作标识
+     * @returns {any}
+     * @memberof HRDutyEduAuthServiceBase
+     */
+    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/hrduty-edu/hrduty-edu-auth-service.ts

+import HRDutyEduAuthServiceBase from './hrduty-edu-auth-service-base';
+
+
+/**
+ * 职务教育权限服务对象
+ *
+ * @export
+ * @class HRDutyEduAuthService
+ * @extends {HRDutyEduAuthServiceBase}
+ */
+export default class HRDutyEduAuthService extends HRDutyEduAuthServiceBase {
+
+    /**
+     * Creates an instance of  HRDutyEduAuthService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  HRDutyEduAuthService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+
+}
\ No newline at end of file

app_PIM/src/authservice/hrduty-skill/hrduty-skill-auth-service-base.ts

+import AuthService from '../auth-service';
+
+/**
+ * 职务技能权限服务对象基类
+ *
+ * @export
+ * @class HRDutySkillAuthServiceBase
+ * @extends {AuthService}
+ */
+export default class HRDutySkillAuthServiceBase extends AuthService {
+
+    /**
+     * Creates an instance of  HRDutySkillAuthServiceBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  HRDutySkillAuthServiceBase
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+    /**
+     * 根据当前数据获取实体操作标识
+     *
+     * @param {*} mainSateOPPrivs 传入数据操作标识
+     * @returns {any}
+     * @memberof HRDutySkillAuthServiceBase
+     */
+    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/hrduty-skill/hrduty-skill-auth-service.ts

+import HRDutySkillAuthServiceBase from './hrduty-skill-auth-service-base';
+
+
+/**
+ * 职务技能权限服务对象
+ *
+ * @export
+ * @class HRDutySkillAuthService
+ * @extends {HRDutySkillAuthServiceBase}
+ */
+export default class HRDutySkillAuthService extends HRDutySkillAuthServiceBase {
+
+    /**
+     * Creates an instance of  HRDutySkillAuthService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  HRDutySkillAuthService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+
+}
\ No newline at end of file

app_PIM/src/interface/entity/hrduty-cert.ts

+/**
+ * 职务证书
+ *
+ * @export
+ * @interface HRDutyCert
+ */
+export interface HRDutyCert {
+
+    /**
+     * 证书
+     *
+     * @returns {*}
+     * @memberof HRDutyCert
+     */
+    hrdutycertname?: any;
+
+    /**
+     * 职务证书标识
+     *
+     * @returns {*}
+     * @memberof HRDutyCert
+     */
+    hrdutycertid?: any;
+
+    /**
+     * 建立人
+     *
+     * @returns {*}
+     * @memberof HRDutyCert
+     */
+    createman?: any;
+
+    /**
+     * 更新人
+     *
+     * @returns {*}
+     * @memberof HRDutyCert
+     */
+    updateman?: any;
+
+    /**
+     * 建立时间
+     *
+     * @returns {*}
+     * @memberof HRDutyCert
+     */
+    createdate?: any;
+
+    /**
+     * 更新时间
+     *
+     * @returns {*}
+     * @memberof HRDutyCert
+     */
+    updatedate?: any;
+
+    /**
+     * 描述
+     *
+     * @returns {*}
+     * @memberof HRDutyCert
+     */
+    memo?: any;
+
+    /**
+     * 重要性
+     *
+     * @returns {*}
+     * @memberof HRDutyCert
+     */
+    importance?: any;
+
+    /**
+     * 职务标识
+     *
+     * @returns {*}
+     * @memberof HRDutyCert
+     */
+    hrdutyid?: any;
+}
\ No newline at end of file

app_PIM/src/interface/entity/hrduty-edu.ts

+/**
+ * 职务教育
+ *
+ * @export
+ * @interface HRDutyEdu
+ */
+export interface HRDutyEdu {
+
+    /**
+     * 职务教育标识
+     *
+     * @returns {*}
+     * @memberof HRDutyEdu
+     */
+    hrdutyeduid?: any;
+
+    /**
+     * 建立人
+     *
+     * @returns {*}
+     * @memberof HRDutyEdu
+     */
+    createman?: any;
+
+    /**
+     * 更新人
+     *
+     * @returns {*}
+     * @memberof HRDutyEdu
+     */
+    updateman?: any;
+
+    /**
+     * 建立时间
+     *
+     * @returns {*}
+     * @memberof HRDutyEdu
+     */
+    createdate?: any;
+
+    /**
+     * 教育
+     *
+     * @returns {*}
+     * @memberof HRDutyEdu
+     */
+    hrdutyeduname?: any;
+
+    /**
+     * 更新时间
+     *
+     * @returns {*}
+     * @memberof HRDutyEdu
+     */
+    updatedate?: any;
+
+    /**
+     * 描述
+     *
+     * @returns {*}
+     * @memberof HRDutyEdu
+     */
+    memo?: any;
+
+    /**
+     * 重要性
+     *
+     * @returns {*}
+     * @memberof HRDutyEdu
+     */
+    importance?: any;
+
+    /**
+     * 职务标识
+     *
+     * @returns {*}
+     * @memberof HRDutyEdu
+     */
+    hrdutyid?: any;
+}
\ No newline at end of file

app_PIM/src/interface/entity/hrduty-skill.ts

+/**
+ * 职务技能
+ *
+ * @export
+ * @interface HRDutySkill
+ */
+export interface HRDutySkill {
+
+    /**
+     * 技能
+     *
+     * @returns {*}
+     * @memberof HRDutySkill
+     */
+    hrdutyskillname?: any;
+
+    /**
+     * 建立人
+     *
+     * @returns {*}
+     * @memberof HRDutySkill
+     */
+    createman?: any;
+
+    /**
+     * 职务技能标识
+     *
+     * @returns {*}
+     * @memberof HRDutySkill
+     */
+    hrdutyskillid?: any;
+
+    /**
+     * 更新人
+     *
+     * @returns {*}
+     * @memberof HRDutySkill
+     */
+    updateman?: any;
+
+    /**
+     * 更新时间
+     *
+     * @returns {*}
+     * @memberof HRDutySkill
+     */
+    updatedate?: any;
+
+    /**
+     * 建立时间
+     *
+     * @returns {*}
+     * @memberof HRDutySkill
+     */
+    createdate?: any;
+
+    /**
+     * 描述
+     *
+     * @returns {*}
+     * @memberof HRDutySkill
+     */
+    memo?: any;
+
+    /**
+     * 重要性
+     *
+     * @returns {*}
+     * @memberof HRDutySkill
+     */
+    importance?: any;
+
+    /**
+     * 职务标识
+     *
+     * @returns {*}
+     * @memberof HRDutySkill
+     */
+    hrdutyid?: any;
+}
\ No newline at end of file

app_PIM/src/interface/entity/hrduty.ts

@@ -53,4 +53,12 @@ export interface HRDuty {
      * @memberof HRDuty
      */
     updateman?: any;
+
+    /**
+     * 备注
+     *
+     * @returns {*}
+     * @memberof HRDuty
+     */
+    memo?: any;
 }
\ No newline at end of file

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

@@ -4,12 +4,15 @@ import hromhierarchycat_en_US from '@locale/lanres/entities/hromhierarchy-cat/hr
 import hrorgcontact_en_US from '@locale/lanres/entities/hrorg-contact/hrorg-contact_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';
+import hrdutyedu_en_US from '@locale/lanres/entities/hrduty-edu/hrduty-edu_en_US';
 import hromhierarchypurpose_en_US from '@locale/lanres/entities/hromhierarchypurpose/hromhierarchypurpose_en_US';
 import hromhierarchy_en_US from '@locale/lanres/entities/hromhierarchy/hromhierarchy_en_US';
 import hrdistribution_en_US from '@locale/lanres/entities/hrdistribution/hrdistribution_en_US';
 import hrorgaddress_en_US from '@locale/lanres/entities/hrorg-address/hrorg-address_en_US';
 import hrpost_en_US from '@locale/lanres/entities/hrpost/hrpost_en_US';
 import hrorganization_en_US from '@locale/lanres/entities/hrorganization/hrorganization_en_US';
+import hrdutyskill_en_US from '@locale/lanres/entities/hrduty-skill/hrduty-skill_en_US';
+import hrdutycert_en_US from '@locale/lanres/entities/hrduty-cert/hrduty-cert_en_US';
 import hrduty_en_US from '@locale/lanres/entities/hrduty/hrduty_en_US';
 import hrpostrel_en_US from '@locale/lanres/entities/hrpost-rel/hrpost-rel_en_US';
 import components_en_US from '@locale/lanres/components/components_en_US';
@@ -257,12 +260,15 @@ export default {
         hrorgcontact: hrorgcontact_en_US,
         hremployee: hremployee_en_US,
         hrlegal: hrlegal_en_US,
+        hrdutyedu: hrdutyedu_en_US,
         hromhierarchypurpose: hromhierarchypurpose_en_US,
         hromhierarchy: hromhierarchy_en_US,
         hrdistribution: hrdistribution_en_US,
         hrorgaddress: hrorgaddress_en_US,
         hrpost: hrpost_en_US,
         hrorganization: hrorganization_en_US,
+        hrdutyskill: hrdutyskill_en_US,
+        hrdutycert: hrdutycert_en_US,
         hrduty: hrduty_en_US,
         hrpostrel: hrpostrel_en_US,
     },

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

@@ -4,12 +4,15 @@ import hromhierarchycat_zh_CN from '@locale/lanres/entities/hromhierarchy-cat/hr
 import hrorgcontact_zh_CN from '@locale/lanres/entities/hrorg-contact/hrorg-contact_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';
+import hrdutyedu_zh_CN from '@locale/lanres/entities/hrduty-edu/hrduty-edu_zh_CN';
 import hromhierarchypurpose_zh_CN from '@locale/lanres/entities/hromhierarchypurpose/hromhierarchypurpose_zh_CN';
 import hromhierarchy_zh_CN from '@locale/lanres/entities/hromhierarchy/hromhierarchy_zh_CN';
 import hrdistribution_zh_CN from '@locale/lanres/entities/hrdistribution/hrdistribution_zh_CN';
 import hrorgaddress_zh_CN from '@locale/lanres/entities/hrorg-address/hrorg-address_zh_CN';
 import hrpost_zh_CN from '@locale/lanres/entities/hrpost/hrpost_zh_CN';
 import hrorganization_zh_CN from '@locale/lanres/entities/hrorganization/hrorganization_zh_CN';
+import hrdutyskill_zh_CN from '@locale/lanres/entities/hrduty-skill/hrduty-skill_zh_CN';
+import hrdutycert_zh_CN from '@locale/lanres/entities/hrduty-cert/hrduty-cert_zh_CN';
 import hrduty_zh_CN from '@locale/lanres/entities/hrduty/hrduty_zh_CN';
 import hrpostrel_zh_CN from '@locale/lanres/entities/hrpost-rel/hrpost-rel_zh_CN';
 import components_zh_CN from '@locale/lanres/components/components_zh_CN';
@@ -256,12 +259,15 @@ export default {
         hrorgcontact: hrorgcontact_zh_CN,
         hremployee: hremployee_zh_CN,
         hrlegal: hrlegal_zh_CN,
+        hrdutyedu: hrdutyedu_zh_CN,
         hromhierarchypurpose: hromhierarchypurpose_zh_CN,
         hromhierarchy: hromhierarchy_zh_CN,
         hrdistribution: hrdistribution_zh_CN,
         hrorgaddress: hrorgaddress_zh_CN,
         hrpost: hrpost_zh_CN,
         hrorganization: hrorganization_zh_CN,
+        hrdutyskill: hrdutyskill_zh_CN,
+        hrdutycert: hrdutycert_zh_CN,
         hrduty: hrduty_zh_CN,
         hrpostrel: hrpostrel_zh_CN,
     },

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

@@ -7,7 +7,13 @@ export default {
         "0": "否",
         "empty": ""
     },
-    CL_HR_004: {
+    CL_HR_0005: {
+        "HIGH": "高",
+        "MID": "中",
+        "LOW": "低",
+        "empty": ""
+    },
+    CL_HR_0004: {
         "FULLTIME": "全职",
         "PARTTIME": "兼职",
         "empty": ""

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

@@ -7,7 +7,13 @@ export default {
         "0": "否",
         "empty": "",
     },
-    CL_HR_004: {
+    CL_HR_0005: {
+        "HIGH": "高",
+        "MID": "中",
+        "LOW": "低",
+        "empty": "",
+    },
+    CL_HR_0004: {
         "FULLTIME": "全职",
         "PARTTIME": "兼职",
         "empty": "",

app_PIM/src/locale/lanres/entities/hrduty-cert/hrduty-cert_en_US.ts

+
+export default {
+  fields: {
+    hrdutycertname: "证书",
+    hrdutycertid: "职务证书标识",
+    createman: "建立人",
+    updateman: "更新人",
+    createdate: "建立时间",
+    updatedate: "更新时间",
+    memo: "描述",
+    importance: "重要性",
+    hrdutyid: "职务标识",
+  },
+	views: {
+		editview: {
+			caption: "职务证书",
+      		title: "职务证书编辑视图",
+		},
+		v_001: {
+			caption: "职务证书",
+      		title: "职务证书",
+		},
+		v_002: {
+			caption: "职务证书嵌入职务",
+      		title: "职务证书嵌入职务",
+		},
+		gridview: {
+			caption: "职务证书",
+      		title: "职务证书表格",
+		},
+	},
+	main_form: {
+		details: {
+			group1: "职务证书基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "职务证书标识", 
+			srfmajortext: "证书", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			hrdutycertname: "证书", 
+			memo: "描述", 
+			importance: "重要性", 
+			hrdutycertid: "职务证书标识", 
+		},
+		uiactions: {
+		},
+	},
+	main_grid: {
+		columns: {
+			hrdutycertname: "证书",
+			memo: "描述",
+			importance: "重要性",
+		},
+		uiactions: {
+		},
+	},
+	default_searchform: {
+		details: {
+			formpage1: "常规条件", 
+		},
+		uiactions: {
+		},
+	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "Save",
+			tip: "Save",
+		},
+		tbitem4: {
+			caption: "Save And New",
+			tip: "Save And New",
+		},
+		tbitem5: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "Remove And Close",
+			tip: "Remove And Close Window",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem13: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem16: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem22: {
+			caption: "Help",
+			tip: "Help",
+		},
+	},
+	gridviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
+};
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hrduty-cert/hrduty-cert_zh_CN.ts

+export default {
+  fields: {
+    hrdutycertname: "证书",
+    hrdutycertid: "职务证书标识",
+    createman: "建立人",
+    updateman: "更新人",
+    createdate: "建立时间",
+    updatedate: "更新时间",
+    memo: "描述",
+    importance: "重要性",
+    hrdutyid: "职务标识",
+  },
+	views: {
+		editview: {
+			caption: "职务证书",
+      		title: "职务证书编辑视图",
+		},
+		v_001: {
+			caption: "职务证书",
+      		title: "职务证书",
+		},
+		v_002: {
+			caption: "职务证书嵌入职务",
+      		title: "职务证书嵌入职务",
+		},
+		gridview: {
+			caption: "职务证书",
+      		title: "职务证书表格",
+		},
+	},
+	main_form: {
+		details: {
+			group1: "职务证书基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "职务证书标识", 
+			srfmajortext: "证书", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			hrdutycertname: "证书", 
+			memo: "描述", 
+			importance: "重要性", 
+			hrdutycertid: "职务证书标识", 
+		},
+		uiactions: {
+		},
+	},
+	main_grid: {
+		columns: {
+			hrdutycertname: "证书",
+			memo: "描述",
+			importance: "重要性",
+		},
+		uiactions: {
+		},
+	},
+	default_searchform: {
+		details: {
+			formpage1: "常规条件", 
+		},
+		uiactions: {
+		},
+	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "保存",
+			tip: "保存",
+		},
+		tbitem4: {
+			caption: "保存并新建",
+			tip: "保存并新建",
+		},
+		tbitem5: {
+			caption: "保存并关闭",
+			tip: "保存并关闭",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem13: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem16: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem22: {
+			caption: "帮助",
+			tip: "帮助",
+		},
+	},
+	gridviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "导出",
+			tip: "导出",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
+};
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hrduty-edu/hrduty-edu_en_US.ts

+
+export default {
+  fields: {
+    hrdutyeduid: "职务教育标识",
+    createman: "建立人",
+    updateman: "更新人",
+    createdate: "建立时间",
+    hrdutyeduname: "教育",
+    updatedate: "更新时间",
+    memo: "描述",
+    importance: "重要性",
+    hrdutyid: "职务标识",
+  },
+	views: {
+		v_002: {
+			caption: "职务教育嵌入职务",
+      		title: "职务教育嵌入职务",
+		},
+		v_001: {
+			caption: "职务教育",
+      		title: "职务教育",
+		},
+		gridview: {
+			caption: "职务教育",
+      		title: "职务教育表格视图",
+		},
+		editview: {
+			caption: "职务教育",
+      		title: "职务教育编辑视图",
+		},
+	},
+	main_form: {
+		details: {
+			group1: "职务教育基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "职务教育标识", 
+			srfmajortext: "教育", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			hrdutyeduname: "教育", 
+			memo: "描述", 
+			importance: "重要性", 
+			hrdutyeduid: "职务教育标识", 
+		},
+		uiactions: {
+		},
+	},
+	main_grid: {
+		columns: {
+			hrdutyeduname: "教育",
+			memo: "描述",
+			importance: "重要性",
+		},
+		uiactions: {
+		},
+	},
+	default_searchform: {
+		details: {
+			formpage1: "常规条件", 
+		},
+		uiactions: {
+		},
+	},
+	gridviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "Save",
+			tip: "Save",
+		},
+		tbitem4: {
+			caption: "Save And New",
+			tip: "Save And New",
+		},
+		tbitem5: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "Remove And Close",
+			tip: "Remove And Close Window",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem13: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem16: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem22: {
+			caption: "Help",
+			tip: "Help",
+		},
+	},
+};
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hrduty-edu/hrduty-edu_zh_CN.ts

+export default {
+  fields: {
+    hrdutyeduid: "职务教育标识",
+    createman: "建立人",
+    updateman: "更新人",
+    createdate: "建立时间",
+    hrdutyeduname: "教育",
+    updatedate: "更新时间",
+    memo: "描述",
+    importance: "重要性",
+    hrdutyid: "职务标识",
+  },
+	views: {
+		v_002: {
+			caption: "职务教育嵌入职务",
+      		title: "职务教育嵌入职务",
+		},
+		v_001: {
+			caption: "职务教育",
+      		title: "职务教育",
+		},
+		gridview: {
+			caption: "职务教育",
+      		title: "职务教育表格视图",
+		},
+		editview: {
+			caption: "职务教育",
+      		title: "职务教育编辑视图",
+		},
+	},
+	main_form: {
+		details: {
+			group1: "职务教育基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "职务教育标识", 
+			srfmajortext: "教育", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			hrdutyeduname: "教育", 
+			memo: "描述", 
+			importance: "重要性", 
+			hrdutyeduid: "职务教育标识", 
+		},
+		uiactions: {
+		},
+	},
+	main_grid: {
+		columns: {
+			hrdutyeduname: "教育",
+			memo: "描述",
+			importance: "重要性",
+		},
+		uiactions: {
+		},
+	},
+	default_searchform: {
+		details: {
+			formpage1: "常规条件", 
+		},
+		uiactions: {
+		},
+	},
+	gridviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "导出",
+			tip: "导出",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "保存",
+			tip: "保存",
+		},
+		tbitem4: {
+			caption: "保存并新建",
+			tip: "保存并新建",
+		},
+		tbitem5: {
+			caption: "保存并关闭",
+			tip: "保存并关闭",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem13: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem16: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem22: {
+			caption: "帮助",
+			tip: "帮助",
+		},
+	},
+};
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hrduty-skill/hrduty-skill_en_US.ts

+
+export default {
+  fields: {
+    hrdutyskillname: "技能",
+    createman: "建立人",
+    hrdutyskillid: "职务技能标识",
+    updateman: "更新人",
+    updatedate: "更新时间",
+    createdate: "建立时间",
+    memo: "描述",
+    importance: "重要性",
+    hrdutyid: "职务标识",
+  },
+	views: {
+		v_002: {
+			caption: "职务技能嵌入职务",
+      		title: "职务技能嵌入职务",
+		},
+		gridview: {
+			caption: "职务技能",
+      		title: "职务技能表格视图",
+		},
+		editview: {
+			caption: "职务技能",
+      		title: "职务技能编辑视图",
+		},
+		v_001: {
+			caption: "职务技能",
+      		title: "职务技能",
+		},
+	},
+	main_form: {
+		details: {
+			group1: "职务技能基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "职务技能标识", 
+			srfmajortext: "技能", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			hrdutyskillname: "技能", 
+			memo: "描述", 
+			importance: "重要性", 
+			hrdutyskillid: "职务技能标识", 
+		},
+		uiactions: {
+		},
+	},
+	main_grid: {
+		columns: {
+			hrdutyskillname: "技能",
+			memo: "描述",
+			importance: "重要性",
+		},
+		uiactions: {
+		},
+	},
+	default_searchform: {
+		details: {
+			formpage1: "常规条件", 
+		},
+		uiactions: {
+		},
+	},
+	gridviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "Save",
+			tip: "Save",
+		},
+		tbitem4: {
+			caption: "Save And New",
+			tip: "Save And New",
+		},
+		tbitem5: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "Remove And Close",
+			tip: "Remove And Close Window",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem13: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem16: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem22: {
+			caption: "Help",
+			tip: "Help",
+		},
+	},
+};
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hrduty-skill/hrduty-skill_zh_CN.ts

+export default {
+  fields: {
+    hrdutyskillname: "技能",
+    createman: "建立人",
+    hrdutyskillid: "职务技能标识",
+    updateman: "更新人",
+    updatedate: "更新时间",
+    createdate: "建立时间",
+    memo: "描述",
+    importance: "重要性",
+    hrdutyid: "职务标识",
+  },
+	views: {
+		v_002: {
+			caption: "职务技能嵌入职务",
+      		title: "职务技能嵌入职务",
+		},
+		gridview: {
+			caption: "职务技能",
+      		title: "职务技能表格视图",
+		},
+		editview: {
+			caption: "职务技能",
+      		title: "职务技能编辑视图",
+		},
+		v_001: {
+			caption: "职务技能",
+      		title: "职务技能",
+		},
+	},
+	main_form: {
+		details: {
+			group1: "职务技能基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "职务技能标识", 
+			srfmajortext: "技能", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			hrdutyskillname: "技能", 
+			memo: "描述", 
+			importance: "重要性", 
+			hrdutyskillid: "职务技能标识", 
+		},
+		uiactions: {
+		},
+	},
+	main_grid: {
+		columns: {
+			hrdutyskillname: "技能",
+			memo: "描述",
+			importance: "重要性",
+		},
+		uiactions: {
+		},
+	},
+	default_searchform: {
+		details: {
+			formpage1: "常规条件", 
+		},
+		uiactions: {
+		},
+	},
+	gridviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "导出",
+			tip: "导出",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "保存",
+			tip: "保存",
+		},
+		tbitem4: {
+			caption: "保存并新建",
+			tip: "保存并新建",
+		},
+		tbitem5: {
+			caption: "保存并关闭",
+			tip: "保存并关闭",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem13: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem16: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem22: {
+			caption: "帮助",
+			tip: "帮助",
+		},
+	},
+};
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hrduty/hrduty_en_US.ts

@@ -7,15 +7,32 @@ export default {
     hrdutyname: "职务名称",
     createman: "建立人",
     updateman: "更新人",
+    memo: "备注",
   },
 	views: {
+		v_001: {
+			caption: "快速新建",
+      		title: "快速新建",
+		},
+		dashboardview: {
+			caption: "职务看板",
+      		title: "职务看板",
+		},
+		v_002: {
+			caption: "职务信息",
+      		title: "职务信息",
+		},
 		editview: {
-			caption: "职务",
-      		title: "职务编辑视图",
+			caption: "职务信息",
+      		title: "职务信息",
+		},
+		tabexpview: {
+			caption: "职务信息",
+      		title: "职务信息",
 		},
 		gridview: {
 			caption: "职务",
-      		title: "职务表格视图",
+      		title: "职务表格",
 		},
 		pickupgridview: {
 			caption: "职务",
@@ -26,12 +43,29 @@ export default {
       		title: "职务数据选择视图",
 		},
 	},
+	ef_001_form: {
+		details: {
+			group1: "职务基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "职务标识", 
+			srfmajortext: "职务名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			hrdutyname: "职务名称", 
+			memo: "备注", 
+			hrdutyid: "职务标识", 
+		},
+		uiactions: {
+		},
+	},
 	main_form: {
 		details: {
 			group1: "职务基本信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "职务标识", 
@@ -41,10 +75,7 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			hrdutyname: "职务名称", 
-			createman: "建立人", 
-			createdate: "建立时间", 
-			updateman: "更新人", 
-			updatedate: "更新时间", 
+			memo: "备注", 
 			hrdutyid: "职务标识", 
 		},
 		uiactions: {
@@ -66,40 +97,6 @@ export default {
 		uiactions: {
 		},
 	},
-	gridviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem4: {
-			caption: "Edit",
-			tip: "Edit {0}",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "Remove",
-			tip: "Remove {0}",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "Export",
-			tip: "Export {0} Data To Excel",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "Filter",
-			tip: "Filter",
-		},
-	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "Save",
@@ -146,4 +143,68 @@ export default {
 			tip: "Help",
 		},
 	},
+	tabexpviewtoolbar_toolbar: {
+		tbitem1_remove_sep: {
+			caption: "",
+			tip: "",
+		},
+		tbitem1_remove: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem1_ff_003: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem22: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
+	gridviewtoolbar_toolbar: {
+		tbitem1_ff_002: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem6: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
 };
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hrduty/hrduty_zh_CN.ts

@@ -6,15 +6,32 @@ export default {
     hrdutyname: "职务名称",
     createman: "建立人",
     updateman: "更新人",
+    memo: "备注",
   },
 	views: {
+		v_001: {
+			caption: "快速新建",
+      		title: "快速新建",
+		},
+		dashboardview: {
+			caption: "职务看板",
+      		title: "职务看板",
+		},
+		v_002: {
+			caption: "职务信息",
+      		title: "职务信息",
+		},
 		editview: {
-			caption: "职务",
-      		title: "职务编辑视图",
+			caption: "职务信息",
+      		title: "职务信息",
+		},
+		tabexpview: {
+			caption: "职务信息",
+      		title: "职务信息",
 		},
 		gridview: {
 			caption: "职务",
-      		title: "职务表格视图",
+      		title: "职务表格",
 		},
 		pickupgridview: {
 			caption: "职务",
@@ -25,12 +42,29 @@ export default {
       		title: "职务数据选择视图",
 		},
 	},
+	ef_001_form: {
+		details: {
+			group1: "职务基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "职务标识", 
+			srfmajortext: "职务名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			hrdutyname: "职务名称", 
+			memo: "备注", 
+			hrdutyid: "职务标识", 
+		},
+		uiactions: {
+		},
+	},
 	main_form: {
 		details: {
 			group1: "职务基本信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "职务标识", 
@@ -40,10 +74,7 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			hrdutyname: "职务名称", 
-			createman: "建立人", 
-			createdate: "建立时间", 
-			updateman: "更新人", 
-			updatedate: "更新时间", 
+			memo: "备注", 
 			hrdutyid: "职务标识", 
 		},
 		uiactions: {
@@ -65,40 +96,6 @@ export default {
 		uiactions: {
 		},
 	},
-	gridviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem4: {
-			caption: "编辑",
-			tip: "编辑",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "删除",
-			tip: "删除",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "导出",
-			tip: "导出",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "过滤",
-			tip: "过滤",
-		},
-	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "保存",
@@ -145,4 +142,68 @@ export default {
 			tip: "帮助",
 		},
 	},
+	tabexpviewtoolbar_toolbar: {
+		tbitem1_remove_sep: {
+			caption: "",
+			tip: "",
+		},
+		tbitem1_remove: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem1_ff_003: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem22: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
+	gridviewtoolbar_toolbar: {
+		tbitem1_ff_002: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem6: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "导出",
+			tip: "导出",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
 };
\ No newline at end of file

app_PIM/src/mock/codelist/codelist.ts

@@ -43,7 +43,44 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
         ]
     },
     {
-        srfkey: "CL_HR_004",
+        srfkey: "CL_HR_0005",
+        emptytext: "未定义",
+        "codelisttype":"static",
+        items: [
+            {
+                id: "HIGH",
+                label: "高",
+                text: "高",
+                "data":"",
+                "codename":"High",
+                value: "HIGH",
+                
+                disabled: false,
+            },
+            {
+                id: "MID",
+                label: "中",
+                text: "中",
+                "data":"",
+                "codename":"Mid",
+                value: "MID",
+                
+                disabled: false,
+            },
+            {
+                id: "LOW",
+                label: "低",
+                text: "低",
+                "data":"",
+                "codename":"Low",
+                value: "LOW",
+                
+                disabled: false,
+            },
+        ]
+    },
+    {
+        srfkey: "CL_HR_0004",
         emptytext: "未定义",
         "codelisttype":"static",
         items: [

app_PIM/src/mock/index.ts

@@ -13,11 +13,14 @@ import './entity/hromhierarchy-cats/hromhierarchy-cats';
 import './entity/hrorg-contacts/hrorg-contacts';
 import './entity/hremployees/hremployees';
 import './entity/hrlegals/hrlegals';
+import './entity/hrduty-edus/hrduty-edus';
 import './entity/hromhierarchypurposes/hromhierarchypurposes';
 import './entity/hromhierarchys/hromhierarchys';
 import './entity/hrdistributions/hrdistributions';
 import './entity/hrorg-addresss/hrorg-addresss';
 import './entity/hrposts/hrposts';
 import './entity/hrorganizations/hrorganizations';
+import './entity/hrduty-skills/hrduty-skills';
+import './entity/hrduty-certs/hrduty-certs';
 import './entity/hrdutys/hrdutys';
 import './entity/hrpost-rels/hrpost-rels';

app_PIM/src/pages/human-resource/hrduty-cert-edit-view/hrduty-cert-edit-view.html

+<studio-view-style2 viewName="hrdutycerteditview" viewTitle="职务证书编辑视图" class='deeditview hrduty-cert-edit-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>
+    <view_form 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :autosave="false" 
+                :viewtag="viewtag"
+                :showBusyIndicator="true"
+                updateAction="Update"
+                removeAction="Remove"
+                loaddraftAction="GetDraft"
+                loadAction="Get"
+                createAction="Create"
+                WFSubmitAction=""
+                WFStartAction=""
+                style='' 
+                name="form"  
+                ref='form' 
+                @save="form_save($event)"  
+                @remove="form_remove($event)"  
+                @load="form_load($event)"  
+                @closeview="closeView($event)">
+            </view_form>
+</studio-view-style2>
\ No newline at end of file

app_PIM/src/pages/human-resource/hrduty-cert-edit-view/hrduty-cert-edit-view.vue

+<template src="./hrduty-cert-edit-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { HRDutyCertEditViewBase } from './hrduty-cert-edit-view-base';
+import view_form from '@widgets/hrduty-cert/main-form/main-form.vue';
+
+/**
+ * 职务证书编辑视图视图
+ *
+ * @export
+ * @class HRDutyCertEditView
+ * @extends {HRDutyCertEditViewBase}
+ */
+@Component({
+    components: {
+        view_form, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class HRDutyCertEditView extends HRDutyCertEditViewBase { }
+</script>

app_PIM/src/pages/human-resource/hrduty-cert-grid-view/hrduty-cert-grid-view.html

+<studio-view-style2 viewName="hrdutycertgridview" viewTitle="职务证书表格" class='degridview hrduty-cert-grid-view'>
+    <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="证书" search @on-search="onSearch($event)"/>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>
+    <template slot="searchForm">
+                <view_searchform 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :showBusyIndicator="true"
+            v-show="isExpandSearchForm"
+            loaddraftAction="FilterGetDraft"
+            loadAction="FilterGet"
+        
+            name="searchform"  
+            ref='searchform' 
+            @save="searchform_save($event)"  
+            @search="searchform_search($event)"  
+            @load="searchform_load($event)"  
+            @closeview="closeView($event)">
+        </view_searchform>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isGridSingleSelect"
+        :showBusyIndicator="true"
+        :isOpenEdit="false"
+        :gridRowActiveMode="gridRowActiveMode"
+        @save="onSave.apply(_self, arguments)"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchDefault"
+        :newdata="newdata.bind(_self)"
+        :opendata="opendata.bind(_self)"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @remove="grid_remove($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view-style2>
\ No newline at end of file

app_PIM/src/pages/human-resource/hrduty-cert-grid-view/hrduty-cert-grid-view.vue

+<template src="./hrduty-cert-grid-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { HRDutyCertGridViewBase } from './hrduty-cert-grid-view-base';
+import view_grid from '@widgets/hrduty-cert/main-grid/main-grid.vue';
+import view_searchform from '@widgets/hrduty-cert/default-searchform/default-searchform.vue';
+
+/**
+ * 职务证书表格视图
+ *
+ * @export
+ * @class HRDutyCertGridView
+ * @extends {HRDutyCertGridViewBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class HRDutyCertGridView extends HRDutyCertGridViewBase { }
+</script>

app_PIM/src/pages/human-resource/hrduty-dashboard-view/hrduty-dashboard-view-base.tsx

+import { Subject } from 'rxjs';
+import { DashboardViewBase } from '@/studio-core';
+import HRDutyService from '@/service/hrduty/hrduty-service';
+import HRDutyAuthService from '@/authservice/hrduty/hrduty-auth-service';
+import PortalViewEngine from '@engine/view/portal-view-engine';
+import HRDutyUIService from '@/uiservice/hrduty/hrduty-ui-service';
+
+/**
+ * 职务看板视图基类
+ *
+ * @export
+ * @class HRDutyDashboardViewBase
+ * @extends {DashboardViewBase}
+ */
+export class HRDutyDashboardViewBase extends DashboardViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutyDashboardViewBase
+     */
+    protected appDeName: string = 'hrduty';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutyDashboardViewBase
+     */
+    protected appDeKey: string = 'hrdutyid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutyDashboardViewBase
+     */
+    protected appDeMajor: string = 'hrdutyname';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {HRDutyService}
+     * @memberof HRDutyDashboardViewBase
+     */
+    protected appEntityService: HRDutyService = new HRDutyService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type HRDutyUIService
+     * @memberof HRDutyDashboardViewBase
+     */
+    public appUIService: HRDutyUIService = new HRDutyUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof HRDutyDashboardViewBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof HRDutyDashboardViewBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.hrduty.views.dashboardview.caption',
+        srfTitle: 'entities.hrduty.views.dashboardview.title',
+        srfSubTitle: 'entities.hrduty.views.dashboardview.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof HRDutyDashboardViewBase
+     */
+    protected containerModel: any = {
+        view_dashboard: { name: 'dashboard', type: 'DASHBOARD' },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '532833b3a07947f04a46adcc957a0ca6';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof HRDutyDashboardViewBase
+     */
+    public engine: PortalViewEngine = new PortalViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof HRDutyDashboardViewBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            dashboard: this.$refs.dashboard,
+            keyPSDEField: 'hrduty',
+            majorPSDEField: 'hrdutyname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * dashboard 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutyDashboardViewBase
+     */
+    public dashboard_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('dashboard', 'load', $event);
+    }
+
+
+}
\ No newline at end of file

app_PIM/src/pages/human-resource/hrduty-dashboard-view/hrduty-dashboard-view.html

+<studio-view-style2 viewName="hrdutydashboardview" viewTitle="职务看板" class='deportalview hrduty-dashboard-view'>
+    <view_dashboard 
+                    :viewState="viewState"  
+                    :viewparams="viewparams" 
+                    :context="JSON.parse(JSON.stringify(context))" 
+                    :isEnableCustomized = "false"
+                    name="dashboard"  
+                    ref='dashboard' 
+                    @load="dashboard_load($event)"  
+                    @closeview="closeView($event)">
+                </view_dashboard>
+</studio-view-style2>
\ No newline at end of file

app_PIM/src/pages/human-resource/hrduty-dashboard-view/hrduty-dashboard-view.vue

+<template src="./hrduty-dashboard-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { HRDutyDashboardViewBase } from './hrduty-dashboard-view-base';
+import view_dashboard from '@widgets/hrduty/board-001-dashboard/board-001-dashboard.vue';
+
+/**
+ * 职务看板视图
+ *
+ * @export
+ * @class HRDutyDashboardView
+ * @extends {HRDutyDashboardViewBase}
+ */
+@Component({
+    components: {
+        view_dashboard, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class HRDutyDashboardView extends HRDutyDashboardViewBase { }
+</script>

app_PIM/src/pages/human-resource/hrduty-edit-view/hrduty-edit-view-base.tsx

@@ -6,7 +6,7 @@ import EditViewEngine from '@engine/view/edit-view-engine';
 import HRDutyUIService from '@/uiservice/hrduty/hrduty-ui-service';
 
 /**
- * 职务编辑视图视图基类
+ * 职务信息视图基类
  *
  * @export
  * @class HRDutyEditViewBase

app_PIM/src/pages/human-resource/hrduty-edit-view/hrduty-edit-view.html

-<studio-view-style2 viewName="hrdutyeditview" viewTitle="职务编辑视图" class='deeditview hrduty-edit-view'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
+<studio-view-style2 viewName="hrdutyeditview" viewTitle="职务信息" class='deeditview hrduty-edit-view'>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>
     <view_form 

app_PIM/src/pages/human-resource/hrduty-edit-view/hrduty-edit-view.vue

@@ -6,7 +6,7 @@ import { HRDutyEditViewBase } from './hrduty-edit-view-base';
 import view_form from '@widgets/hrduty/main-form/main-form.vue';
 
 /**
- * 职务编辑视图视图
+ * 职务信息视图
  *
  * @export
  * @class HRDutyEditView

app_PIM/src/pages/human-resource/hrduty-edu-edit-view/hrduty-edu-edit-view.html

+<studio-view-style2 viewName="hrdutyedueditview" viewTitle="职务教育编辑视图" class='deeditview hrduty-edu-edit-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>
+    <view_form 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :autosave="false" 
+                :viewtag="viewtag"
+                :showBusyIndicator="true"
+                updateAction="Update"
+                removeAction="Remove"
+                loaddraftAction="GetDraft"
+                loadAction="Get"
+                createAction="Create"
+                WFSubmitAction=""
+                WFStartAction=""
+                style='' 
+                name="form"  
+                ref='form' 
+                @save="form_save($event)"  
+                @remove="form_remove($event)"  
+                @load="form_load($event)"  
+                @closeview="closeView($event)">
+            </view_form>
+</studio-view-style2>
\ No newline at end of file

app_PIM/src/pages/human-resource/hrduty-edu-edit-view/hrduty-edu-edit-view.vue

+<template src="./hrduty-edu-edit-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { HRDutyEduEditViewBase } from './hrduty-edu-edit-view-base';
+import view_form from '@widgets/hrduty-edu/main-form/main-form.vue';
+
+/**
+ * 职务教育编辑视图视图
+ *
+ * @export
+ * @class HRDutyEduEditView
+ * @extends {HRDutyEduEditViewBase}
+ */
+@Component({
+    components: {
+        view_form, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class HRDutyEduEditView extends HRDutyEduEditViewBase { }
+</script>

app_PIM/src/pages/human-resource/hrduty-edu-grid-view/hrduty-edu-grid-view.html

+<studio-view-style2 viewName="hrdutyedugridview" viewTitle="职务教育表格视图" class='degridview hrduty-edu-grid-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="教育" search @on-search="onSearch($event)"/>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>
+    <template slot="searchForm">
+                <view_searchform 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :showBusyIndicator="true"
+            v-show="isExpandSearchForm"
+            loaddraftAction="FilterGetDraft"
+            loadAction="FilterGet"
+        
+            name="searchform"  
+            ref='searchform' 
+            @save="searchform_save($event)"  
+            @search="searchform_search($event)"  
+            @load="searchform_load($event)"  
+            @closeview="closeView($event)">
+        </view_searchform>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isGridSingleSelect"
+        :showBusyIndicator="true"
+        :isOpenEdit="false"
+        :gridRowActiveMode="gridRowActiveMode"
+        @save="onSave.apply(_self, arguments)"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchDefault"
+        :newdata="newdata.bind(_self)"
+        :opendata="opendata.bind(_self)"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @remove="grid_remove($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view-style2>
\ No newline at end of file

app_PIM/src/pages/human-resource/hrduty-edu-grid-view/hrduty-edu-grid-view.vue

+<template src="./hrduty-edu-grid-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { HRDutyEduGridViewBase } from './hrduty-edu-grid-view-base';
+import view_grid from '@widgets/hrduty-edu/main-grid/main-grid.vue';
+import view_searchform from '@widgets/hrduty-edu/default-searchform/default-searchform.vue';
+
+/**
+ * 职务教育表格视图视图
+ *
+ * @export
+ * @class HRDutyEduGridView
+ * @extends {HRDutyEduGridViewBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class HRDutyEduGridView extends HRDutyEduGridViewBase { }
+</script>

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

-<studio-view-style2 viewName="hrdutygridview" viewTitle="职务表格视图" class='degridview hrduty-grid-view'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
+<studio-view-style2 viewName="hrdutygridview" viewTitle="职务表格" class='degridview hrduty-grid-view'>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="职务名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_PIM/src/pages/human-resource/hrduty-grid-view/hrduty-grid-view.vue

@@ -7,7 +7,7 @@ import view_grid from '@widgets/hrduty/main-grid/main-grid.vue';
 import view_searchform from '@widgets/hrduty/default-searchform/default-searchform.vue';
 
 /**
- * 职务表格视图视图
+ * 职务表格视图
  *
  * @export
  * @class HRDutyGridView

app_PIM/src/pages/human-resource/hrduty-skill-edit-view/hrduty-skill-edit-view.html

+<studio-view-style2 viewName="hrdutyskilleditview" viewTitle="职务技能编辑视图" class='deeditview hrduty-skill-edit-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>
+    <view_form 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :autosave="false" 
+                :viewtag="viewtag"
+                :showBusyIndicator="true"
+                updateAction="Update"
+                removeAction="Remove"
+                loaddraftAction="GetDraft"
+                loadAction="Get"
+                createAction="Create"
+                WFSubmitAction=""
+                WFStartAction=""
+                style='' 
+                name="form"  
+                ref='form' 
+                @save="form_save($event)"  
+                @remove="form_remove($event)"  
+                @load="form_load($event)"  
+                @closeview="closeView($event)">
+            </view_form>
+</studio-view-style2>
\ No newline at end of file

app_PIM/src/pages/human-resource/hrduty-skill-edit-view/hrduty-skill-edit-view.vue

+<template src="./hrduty-skill-edit-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { HRDutySkillEditViewBase } from './hrduty-skill-edit-view-base';
+import view_form from '@widgets/hrduty-skill/main-form/main-form.vue';
+
+/**
+ * 职务技能编辑视图视图
+ *
+ * @export
+ * @class HRDutySkillEditView
+ * @extends {HRDutySkillEditViewBase}
+ */
+@Component({
+    components: {
+        view_form, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class HRDutySkillEditView extends HRDutySkillEditViewBase { }
+</script>

app_PIM/src/pages/human-resource/hrduty-skill-grid-view/hrduty-skill-grid-view.html

+<studio-view-style2 viewName="hrdutyskillgridview" viewTitle="职务技能表格视图" class='degridview hrduty-skill-grid-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="技能" search @on-search="onSearch($event)"/>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>
+    <template slot="searchForm">
+                <view_searchform 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :showBusyIndicator="true"
+            v-show="isExpandSearchForm"
+            loaddraftAction="FilterGetDraft"
+            loadAction="FilterGet"
+        
+            name="searchform"  
+            ref='searchform' 
+            @save="searchform_save($event)"  
+            @search="searchform_search($event)"  
+            @load="searchform_load($event)"  
+            @closeview="closeView($event)">
+        </view_searchform>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isGridSingleSelect"
+        :showBusyIndicator="true"
+        :isOpenEdit="false"
+        :gridRowActiveMode="gridRowActiveMode"
+        @save="onSave.apply(_self, arguments)"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchDefault"
+        :newdata="newdata.bind(_self)"
+        :opendata="opendata.bind(_self)"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @remove="grid_remove($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view-style2>
\ No newline at end of file

app_PIM/src/pages/human-resource/hrduty-skill-grid-view/hrduty-skill-grid-view.vue

+<template src="./hrduty-skill-grid-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { HRDutySkillGridViewBase } from './hrduty-skill-grid-view-base';
+import view_grid from '@widgets/hrduty-skill/main-grid/main-grid.vue';
+import view_searchform from '@widgets/hrduty-skill/default-searchform/default-searchform.vue';
+
+/**
+ * 职务技能表格视图视图
+ *
+ * @export
+ * @class HRDutySkillGridView
+ * @extends {HRDutySkillGridViewBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class HRDutySkillGridView extends HRDutySkillGridViewBase { }
+</script>

app_PIM/src/pages/human-resource/hrduty-tab-exp-view/hrduty-tab-exp-view.html

+<studio-view-style2 viewName="hrdutytabexpview" viewTitle="职务信息" class='detabexpview hrduty-tab-exp-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>
+    <view_tabexppanel 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        name="tabexppanel"  
+        ref='tabexppanel' 
+        @closeview="closeView($event)">
+    </view_tabexppanel>
+</studio-view-style2>
\ No newline at end of file

app_PIM/src/pages/human-resource/hrduty-tab-exp-view/hrduty-tab-exp-view.vue

+<template src="./hrduty-tab-exp-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { HRDutyTabExpViewBase } from './hrduty-tab-exp-view-base';
+import view_tabexppanel from '@widgets/hrduty/tab-exp-viewtabexppanel-tabexppanel/tab-exp-viewtabexppanel-tabexppanel.vue';
+
+/**
+ * 职务信息视图
+ *
+ * @export
+ * @class HRDutyTabExpView
+ * @extends {HRDutyTabExpViewBase}
+ */
+@Component({
+    components: {
+        view_tabexppanel, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class HRDutyTabExpView extends HRDutyTabExpViewBase { }
+</script>

app_PIM/src/pages/human-resource/hrduty-v-001/hrduty-v-001.html

+<studio-view-style2 viewName="hrdutyv_001" viewTitle="快速新建" class='deoptview hrduty-v-001'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <view_form 
+                    :viewState="viewState"  
+                    :viewparams="viewparams" 
+                    :context="context" 
+                    :autosave="false" 
+                    :viewtag="viewtag"
+                    :showBusyIndicator="true"
+                    updateAction="Update"
+                    removeAction="Remove"
+                    loaddraftAction="GetDraft"
+                    loadAction="Get"
+                    createAction="Create"
+                    WFSubmitAction=""
+                    WFStartAction=""
+                    style='' 
+                    name="form"  
+                    ref='form' 
+                    @save="form_save($event)"  
+                    @remove="form_remove($event)"  
+                    @load="form_load($event)"  
+                    @closeview="closeView($event)">
+                </view_form>
+    <template slot="footer">
+        <div class="option-view-footer-actions">
+            <i-button type='primary' @click="onClickOk.apply(_self, arguments)">{{ containerModel.view_okbtn.text }}</i-button>
+            &nbsp;&nbsp;
+            <i-button @click="onClickCancel.apply(_self, arguments)">{{ containerModel.view_cancelbtn.text }}</i-button>
+        </div>
+    </template>
+</studio-view-style2>
\ No newline at end of file