jackwang 部署微服务应用

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

@@ -151,7 +151,6 @@ export default {
                 menuitem10: "职位",
                 menuitem11: "职位",
                 menuitem12: "职务",
-                menuitem8: "测试",
                 bottom_exp: "底部内容",
                 footer_left: "底部左侧",
                 footer_center: "底部中间",

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

@@ -151,7 +151,6 @@ export default {
                 menuitem10: "职位",
                 menuitem11: "职位",
                 menuitem12: "职务",
-                menuitem8: "测试",
                 bottom_exp: "底部内容",
                 footer_left: "底部左侧",
                 footer_center: "底部中间",

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

@@ -62,6 +62,31 @@ export default {
 		uiactions: {
 		},
 	},
+	if_001_form: {
+		details: {
+			group1: "职务信息", 
+			druipart1: "", 
+			grouppanel1: "技能", 
+			druipart2: "", 
+			grouppanel2: "证书", 
+			druipart3: "", 
+			grouppanel3: "教育", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "职务标识", 
+			srfmajortext: "职务名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			hrdutyname: "职务名称", 
+			memo: "备注", 
+			hrdutyid: "职务标识", 
+		},
+		uiactions: {
+		},
+	},
 	main_form: {
 		details: {
 			group1: "职务基本信息", 
@@ -84,8 +109,7 @@ export default {
 	main_grid: {
 		columns: {
 			hrdutyname: "职务名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			memo: "备注",
 		},
 		uiactions: {
 		},
@@ -97,53 +121,11 @@ export default {
 		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",
-		},
-	},
 	tabexpviewtoolbar_toolbar: {
+		tbitem1_ff_003: {
+			caption: "编辑",
+			tip: "编辑",
+		},
 		tbitem1_remove_sep: {
 			caption: "",
 			tip: "",
@@ -152,10 +134,6 @@ export default {
 			caption: "删除并关闭",
 			tip: "删除并关闭",
 		},
-		tbitem1_ff_003: {
-			caption: "编辑",
-			tip: "编辑",
-		},
 		tbitem2: {
 			caption: "-",
 			tip: "",
@@ -207,4 +185,50 @@ export default {
 			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/hrduty_zh_CN.ts

@@ -61,6 +61,31 @@ export default {
 		uiactions: {
 		},
 	},
+	if_001_form: {
+		details: {
+			group1: "职务信息", 
+			druipart1: "", 
+			grouppanel1: "技能", 
+			druipart2: "", 
+			grouppanel2: "证书", 
+			druipart3: "", 
+			grouppanel3: "教育", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "职务标识", 
+			srfmajortext: "职务名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			hrdutyname: "职务名称", 
+			memo: "备注", 
+			hrdutyid: "职务标识", 
+		},
+		uiactions: {
+		},
+	},
 	main_form: {
 		details: {
 			group1: "职务基本信息", 
@@ -83,8 +108,7 @@ export default {
 	main_grid: {
 		columns: {
 			hrdutyname: "职务名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			memo: "备注",
 		},
 		uiactions: {
 		},
@@ -96,53 +120,11 @@ export default {
 		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: "帮助",
-		},
-	},
 	tabexpviewtoolbar_toolbar: {
+		tbitem1_ff_003: {
+			caption: "编辑",
+			tip: "编辑",
+		},
 		tbitem1_remove_sep: {
 			caption: "",
 			tip: "",
@@ -151,10 +133,6 @@ export default {
 			caption: "删除并关闭",
 			tip: "删除并关闭",
 		},
-		tbitem1_ff_003: {
-			caption: "编辑",
-			tip: "编辑",
-		},
 		tbitem2: {
 			caption: "-",
 			tip: "",
@@ -206,4 +184,50 @@ export default {
 			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/mock/app/pim-appmenu/pim-appmenu.ts

@@ -287,24 +287,6 @@ mock.onGet('v7/pimappmenu').reply((config: any) => {
 	textcls: '',
 	appfunctag: '_5',
 	resourcetag: '',
-},
-		{
-	id: 'ED02F38F-5988-4458-95BB-75F91E922110',
-	name: 'menuitem8',
-	text: '测试',
-	type: 'MENUITEM',
-	counterid: '',
-	tooltip: '测试',
-	expanded: false,
-	separator: false,
-	hidden: false,
-	hidesidebar: false,
-	opendefault: false,
-	iconcls: '',
-	icon: '',
-	textcls: '',
-	appfunctag: '_7',
-	resourcetag: '',
 },
 	],
 },

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

@@ -561,19 +561,36 @@ export class HRDutyCertGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hrduty && true){
+            deResParameters = [
+            { pathName: 'hrduties', parameterName: 'hrduty' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrdutycerts', parameterName: 'hrdutycert' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'hrduty-cert-v-001', 
+            height: 0, 
+            width: 600,  
+            title: this.$t('entities.hrdutycert.views.v_001.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
     }
 
 
@@ -595,17 +612,36 @@ export class HRDutyCertGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hrduty && true){
+            deResParameters = [
+            { pathName: 'hrduties', parameterName: 'hrduty' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrdutycerts', parameterName: 'hrdutycert' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
-            this.$router.push(routePath);
-        }
-        openIndexViewTab(data);
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
+        }
+        const view: any = {
+            viewname: 'hrduty-cert-v-001', 
+            height: 0, 
+            width: 600,  
+            title: this.$t('entities.hrdutycert.views.v_001.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
     }
 
 

app_PIM/src/pages/human-resource/hrduty-cert-v-001/hrduty-cert-v-001-base.tsx

+import { Subject } from 'rxjs';
+import { OptionViewBase } from '@/studio-core';
+import HRDutyCertService from '@/service/hrduty-cert/hrduty-cert-service';
+import HRDutyCertAuthService from '@/authservice/hrduty-cert/hrduty-cert-auth-service';
+import OptionViewEngine from '@engine/view/option-view-engine';
+import HRDutyCertUIService from '@/uiservice/hrduty-cert/hrduty-cert-ui-service';
+
+/**
+ * 职务证书视图基类
+ *
+ * @export
+ * @class HRDutyCertV_001Base
+ * @extends {OptionViewBase}
+ */
+export class HRDutyCertV_001Base extends OptionViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutyCertV_001Base
+     */
+    protected appDeName: string = 'hrdutycert';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutyCertV_001Base
+     */
+    protected appDeKey: string = 'hrdutycertid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutyCertV_001Base
+     */
+    protected appDeMajor: string = 'hrdutycertname';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {HRDutyCertService}
+     * @memberof HRDutyCertV_001Base
+     */
+    protected appEntityService: HRDutyCertService = new HRDutyCertService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type HRDutyCertUIService
+     * @memberof HRDutyCertV_001Base
+     */
+    public appUIService: HRDutyCertUIService = new HRDutyCertUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof HRDutyCertV_001Base
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof HRDutyCertV_001Base
+     */
+    protected model: any = {
+        srfCaption: 'entities.hrdutycert.views.v_001.caption',
+        srfTitle: 'entities.hrdutycert.views.v_001.title',
+        srfSubTitle: 'entities.hrdutycert.views.v_001.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof HRDutyCertV_001Base
+     */
+    protected containerModel: any = {
+        view_form: { name: 'form', type: 'FORM' },
+        view_okbtn: { name: 'okbtn', type: 'button', text: '确定', disabled: true },
+        view_cancelbtn: { name: 'cancelbtn', type: 'button', text: '取消', disabled: false },
+        view_leftbtn: { name: 'leftbtn', type: 'button', text: '左移', disabled: true },
+        view_rightbtn: { name: 'rightbtn', type: 'button', text: '右移', disabled: true },
+        view_allleftbtn: { name: 'allleftbtn', type: 'button', text: '全部左移', disabled: true },
+        view_allrightbtn: { name: 'allrightbtn', type: 'button', text: '全部右移', disabled: true },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '2ee255b61cfa5e9bb8991f1421e807c3';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof HRDutyCertV_001Base
+     */
+    public engine: OptionViewEngine = new OptionViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof HRDutyCertV_001Base
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            form: this.$refs.form,
+            p2k: '0',
+            keyPSDEField: 'hrdutycert',
+            majorPSDEField: 'hrdutycertname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * form 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutyCertV_001Base
+     */
+    public form_save($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'save', $event);
+    }
+
+    /**
+     * form 部件 remove 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutyCertV_001Base
+     */
+    public form_remove($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'remove', $event);
+    }
+
+    /**
+     * form 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutyCertV_001Base
+     */
+    public form_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'load', $event);
+    }
+
+
+}
\ No newline at end of file

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

+<studio-view-style2 viewName="hrdutycertv_001" viewTitle="职务证书" class='deoptview hrduty-cert-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

app_PIM/src/pages/human-resource/hrduty-cert-v-001/hrduty-cert-v-001.vue

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

app_PIM/src/pages/human-resource/hrduty-cert-v-002/hrduty-cert-v-002-base.tsx

+
+import { Subject } from 'rxjs';
+import { GridView9Base } from '@/studio-core';
+import HRDutyCertService from '@/service/hrduty-cert/hrduty-cert-service';
+import HRDutyCertAuthService from '@/authservice/hrduty-cert/hrduty-cert-auth-service';
+import GridView9Engine from '@engine/view/grid-view9-engine';
+import HRDutyCertUIService from '@/uiservice/hrduty-cert/hrduty-cert-ui-service';
+import CodeListService from "@service/app/codelist-service";
+
+
+/**
+ * 职务证书嵌入职务视图基类
+ *
+ * @export
+ * @class HRDutyCertV_002Base
+ * @extends {GridView9Base}
+ */
+export class HRDutyCertV_002Base extends GridView9Base {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutyCertV_002Base
+     */
+    protected appDeName: string = 'hrdutycert';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutyCertV_002Base
+     */
+    protected appDeKey: string = 'hrdutycertid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutyCertV_002Base
+     */
+    protected appDeMajor: string = 'hrdutycertname';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {HRDutyCertService}
+     * @memberof HRDutyCertV_002Base
+     */
+    protected appEntityService: HRDutyCertService = new HRDutyCertService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type HRDutyCertUIService
+     * @memberof HRDutyCertV_002Base
+     */
+    public appUIService: HRDutyCertUIService = new HRDutyCertUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof HRDutyCertV_002Base
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof HRDutyCertV_002Base
+     */
+    protected model: any = {
+        srfCaption: 'entities.hrdutycert.views.v_002.caption',
+        srfTitle: 'entities.hrdutycert.views.v_002.title',
+        srfSubTitle: 'entities.hrdutycert.views.v_002.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof HRDutyCertV_002Base
+     */
+    protected containerModel: any = {
+        view_grid: { name: 'grid', type: 'GRID' },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '3180604a9489c03131e6642e456cd5c0';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof HRDutyCertV_002Base
+     */
+    public engine: GridView9Engine = new GridView9Engine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof HRDutyCertV_002Base
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            opendata: (args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) => {
+                this.opendata(args,fullargs, params, $event, xData);
+            },
+            newdata: (args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) => {
+                this.newdata(args,fullargs, params, $event, xData);
+            },
+            grid: this.$refs.grid,
+            keyPSDEField: 'hrdutycert',
+            majorPSDEField: 'hrdutycertname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * grid 部件 selectionchange 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutyCertV_002Base
+     */
+    public grid_selectionchange($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'selectionchange', $event);
+    }
+
+    /**
+     * grid 部件 beforeload 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutyCertV_002Base
+     */
+    public grid_beforeload($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'beforeload', $event);
+    }
+
+    /**
+     * grid 部件 rowdblclick 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutyCertV_002Base
+     */
+    public grid_rowdblclick($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
+    }
+
+    /**
+     * grid 部件 remove 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutyCertV_002Base
+     */
+    public grid_remove($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'remove', $event);
+    }
+
+    /**
+     * grid 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutyCertV_002Base
+     */
+    public grid_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'load', $event);
+    }
+
+    /**
+     * 打开新建数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof HRDutyCertV_002
+     */
+    public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
+        const data: any = {};
+        if(args[0].srfsourcekey){
+            data.srfsourcekey = args[0].srfsourcekey;
+        }
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        delete tempContext.hrdutycert;
+        if(args.length >0){
+            Object.assign(tempContext,args[0]);
+        }
+        let deResParameters: any[] = [];
+        if(tempContext.hrduty && true){
+            deResParameters = [
+            { pathName: 'hrduties', parameterName: 'hrduty' },
+            ]
+        }
+        const parameters: any[] = [
+            { pathName: 'hrdutycerts', parameterName: 'hrdutycert' },
+        ];
+        const _this: any = this;
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
+        }
+        const view: any = {
+            viewname: 'hrduty-cert-v-001', 
+            height: 0, 
+            width: 600,  
+            title: this.$t('entities.hrdutycert.views.v_001.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
+    }
+
+
+    /**
+     * 打开编辑数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof HRDutyCertV_002
+     */
+    public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        const localContext: any = null;
+        const localViewParam: any =null;
+        const data: any = {};
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        if(args.length >0){
+            Object.assign(tempContext,args[0]);
+        }
+        let deResParameters: any[] = [];
+        if(tempContext.hrduty && true){
+            deResParameters = [
+            { pathName: 'hrduties', parameterName: 'hrduty' },
+            ]
+        }
+        const parameters: any[] = [
+            { pathName: 'hrdutycerts', parameterName: 'hrdutycert' },
+        ];
+        const _this: any = this;
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
+        }
+        const view: any = {
+            viewname: 'hrduty-cert-v-001', 
+            height: 0, 
+            width: 600,  
+            title: this.$t('entities.hrdutycert.views.v_001.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
+    }
+
+
+
+    /**
+     * 表格行数据默认激活模式
+     * 0 不激活
+     * 1 单击激活
+     * 2 双击激活
+     *
+     * @protected
+     * @type {(0 | 1 | 2)}
+     * @memberof HRDutyCertV_002Base
+     */
+    protected gridRowActiveMode: 0 | 1 | 2 = 0;
+}
\ No newline at end of file

app_PIM/src/pages/human-resource/hrduty-cert-v-002/hrduty-cert-v-002.html

+<studio-embed-view-style2 viewName="hrdutycertv_002" viewTitle="职务证书嵌入职务" class='degridview9 hrduty-cert-v-002'>
+    <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-embed-view-style2>
\ No newline at end of file

app_PIM/src/pages/human-resource/hrduty-cert-v-002/hrduty-cert-v-002.vue

+<template src="./hrduty-cert-v-002.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { HRDutyCertV_002Base } from './hrduty-cert-v-002-base';
+import view_grid from '@widgets/hrduty-cert/main-grid/main-grid.vue';
+
+/**
+ * 职务证书嵌入职务视图
+ *
+ * @export
+ * @class HRDutyCertV_002
+ * @extends {HRDutyCertV_002Base}
+ */
+@Component({
+    components: {
+        view_grid, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class HRDutyCertV_002 extends HRDutyCertV_002Base { }
+</script>

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

@@ -561,19 +561,36 @@ export class HRDutyEduGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hrduty && true){
+            deResParameters = [
+            { pathName: 'hrduties', parameterName: 'hrduty' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrdutyedus', parameterName: 'hrdutyedu' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'hrduty-edu-v-001', 
+            height: 0, 
+            width: 600,  
+            title: this.$t('entities.hrdutyedu.views.v_001.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
     }
 
 
@@ -595,17 +612,36 @@ export class HRDutyEduGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hrduty && true){
+            deResParameters = [
+            { pathName: 'hrduties', parameterName: 'hrduty' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrdutyedus', parameterName: 'hrdutyedu' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
-            this.$router.push(routePath);
-        }
-        openIndexViewTab(data);
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
+        }
+        const view: any = {
+            viewname: 'hrduty-edu-v-001', 
+            height: 0, 
+            width: 600,  
+            title: this.$t('entities.hrdutyedu.views.v_001.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
     }
 
 

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>

app_PIM/src/pages/human-resource/hrduty-edu-v-001/hrduty-edu-v-001-base.tsx

+import { Subject } from 'rxjs';
+import { OptionViewBase } from '@/studio-core';
+import HRDutyEduService from '@/service/hrduty-edu/hrduty-edu-service';
+import HRDutyEduAuthService from '@/authservice/hrduty-edu/hrduty-edu-auth-service';
+import OptionViewEngine from '@engine/view/option-view-engine';
+import HRDutyEduUIService from '@/uiservice/hrduty-edu/hrduty-edu-ui-service';
+
+/**
+ * 职务教育视图基类
+ *
+ * @export
+ * @class HRDutyEduV_001Base
+ * @extends {OptionViewBase}
+ */
+export class HRDutyEduV_001Base extends OptionViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutyEduV_001Base
+     */
+    protected appDeName: string = 'hrdutyedu';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutyEduV_001Base
+     */
+    protected appDeKey: string = 'hrdutyeduid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutyEduV_001Base
+     */
+    protected appDeMajor: string = 'hrdutyeduname';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {HRDutyEduService}
+     * @memberof HRDutyEduV_001Base
+     */
+    protected appEntityService: HRDutyEduService = new HRDutyEduService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type HRDutyEduUIService
+     * @memberof HRDutyEduV_001Base
+     */
+    public appUIService: HRDutyEduUIService = new HRDutyEduUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof HRDutyEduV_001Base
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof HRDutyEduV_001Base
+     */
+    protected model: any = {
+        srfCaption: 'entities.hrdutyedu.views.v_001.caption',
+        srfTitle: 'entities.hrdutyedu.views.v_001.title',
+        srfSubTitle: 'entities.hrdutyedu.views.v_001.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof HRDutyEduV_001Base
+     */
+    protected containerModel: any = {
+        view_form: { name: 'form', type: 'FORM' },
+        view_okbtn: { name: 'okbtn', type: 'button', text: '确定', disabled: true },
+        view_cancelbtn: { name: 'cancelbtn', type: 'button', text: '取消', disabled: false },
+        view_leftbtn: { name: 'leftbtn', type: 'button', text: '左移', disabled: true },
+        view_rightbtn: { name: 'rightbtn', type: 'button', text: '右移', disabled: true },
+        view_allleftbtn: { name: 'allleftbtn', type: 'button', text: '全部左移', disabled: true },
+        view_allrightbtn: { name: 'allrightbtn', type: 'button', text: '全部右移', disabled: true },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '06dd873e0c67a6a416c76c9803fd80bd';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof HRDutyEduV_001Base
+     */
+    public engine: OptionViewEngine = new OptionViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof HRDutyEduV_001Base
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            form: this.$refs.form,
+            p2k: '0',
+            keyPSDEField: 'hrdutyedu',
+            majorPSDEField: 'hrdutyeduname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * form 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutyEduV_001Base
+     */
+    public form_save($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'save', $event);
+    }
+
+    /**
+     * form 部件 remove 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutyEduV_001Base
+     */
+    public form_remove($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'remove', $event);
+    }
+
+    /**
+     * form 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutyEduV_001Base
+     */
+    public form_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'load', $event);
+    }
+
+
+}
\ No newline at end of file

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

+<studio-view-style2 viewName="hrdutyeduv_001" viewTitle="职务教育" class='deoptview hrduty-edu-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

app_PIM/src/pages/human-resource/hrduty-edu-v-001/hrduty-edu-v-001.vue

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

app_PIM/src/pages/human-resource/hrduty-edu-v-002/hrduty-edu-v-002-base.tsx

+
+import { Subject } from 'rxjs';
+import { GridView9Base } from '@/studio-core';
+import HRDutyEduService from '@/service/hrduty-edu/hrduty-edu-service';
+import HRDutyEduAuthService from '@/authservice/hrduty-edu/hrduty-edu-auth-service';
+import GridView9Engine from '@engine/view/grid-view9-engine';
+import HRDutyEduUIService from '@/uiservice/hrduty-edu/hrduty-edu-ui-service';
+import CodeListService from "@service/app/codelist-service";
+
+
+/**
+ * 职务教育嵌入职务视图基类
+ *
+ * @export
+ * @class HRDutyEduV_002Base
+ * @extends {GridView9Base}
+ */
+export class HRDutyEduV_002Base extends GridView9Base {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutyEduV_002Base
+     */
+    protected appDeName: string = 'hrdutyedu';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutyEduV_002Base
+     */
+    protected appDeKey: string = 'hrdutyeduid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutyEduV_002Base
+     */
+    protected appDeMajor: string = 'hrdutyeduname';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {HRDutyEduService}
+     * @memberof HRDutyEduV_002Base
+     */
+    protected appEntityService: HRDutyEduService = new HRDutyEduService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type HRDutyEduUIService
+     * @memberof HRDutyEduV_002Base
+     */
+    public appUIService: HRDutyEduUIService = new HRDutyEduUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof HRDutyEduV_002Base
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof HRDutyEduV_002Base
+     */
+    protected model: any = {
+        srfCaption: 'entities.hrdutyedu.views.v_002.caption',
+        srfTitle: 'entities.hrdutyedu.views.v_002.title',
+        srfSubTitle: 'entities.hrdutyedu.views.v_002.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof HRDutyEduV_002Base
+     */
+    protected containerModel: any = {
+        view_grid: { name: 'grid', type: 'GRID' },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '069985244f19f8c6f8e74e39ef573e9a';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof HRDutyEduV_002Base
+     */
+    public engine: GridView9Engine = new GridView9Engine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof HRDutyEduV_002Base
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            opendata: (args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) => {
+                this.opendata(args,fullargs, params, $event, xData);
+            },
+            newdata: (args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) => {
+                this.newdata(args,fullargs, params, $event, xData);
+            },
+            grid: this.$refs.grid,
+            keyPSDEField: 'hrdutyedu',
+            majorPSDEField: 'hrdutyeduname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * grid 部件 selectionchange 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutyEduV_002Base
+     */
+    public grid_selectionchange($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'selectionchange', $event);
+    }
+
+    /**
+     * grid 部件 beforeload 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutyEduV_002Base
+     */
+    public grid_beforeload($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'beforeload', $event);
+    }
+
+    /**
+     * grid 部件 rowdblclick 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutyEduV_002Base
+     */
+    public grid_rowdblclick($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
+    }
+
+    /**
+     * grid 部件 remove 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutyEduV_002Base
+     */
+    public grid_remove($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'remove', $event);
+    }
+
+    /**
+     * grid 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutyEduV_002Base
+     */
+    public grid_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'load', $event);
+    }
+
+    /**
+     * 打开新建数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof HRDutyEduV_002
+     */
+    public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
+        const data: any = {};
+        if(args[0].srfsourcekey){
+            data.srfsourcekey = args[0].srfsourcekey;
+        }
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        delete tempContext.hrdutyedu;
+        if(args.length >0){
+            Object.assign(tempContext,args[0]);
+        }
+        let deResParameters: any[] = [];
+        if(tempContext.hrduty && true){
+            deResParameters = [
+            { pathName: 'hrduties', parameterName: 'hrduty' },
+            ]
+        }
+        const parameters: any[] = [
+            { pathName: 'hrdutyedus', parameterName: 'hrdutyedu' },
+        ];
+        const _this: any = this;
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
+        }
+        const view: any = {
+            viewname: 'hrduty-edu-v-001', 
+            height: 0, 
+            width: 600,  
+            title: this.$t('entities.hrdutyedu.views.v_001.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
+    }
+
+
+    /**
+     * 打开编辑数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof HRDutyEduV_002
+     */
+    public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        const localContext: any = null;
+        const localViewParam: any =null;
+        const data: any = {};
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        if(args.length >0){
+            Object.assign(tempContext,args[0]);
+        }
+        let deResParameters: any[] = [];
+        if(tempContext.hrduty && true){
+            deResParameters = [
+            { pathName: 'hrduties', parameterName: 'hrduty' },
+            ]
+        }
+        const parameters: any[] = [
+            { pathName: 'hrdutyedus', parameterName: 'hrdutyedu' },
+        ];
+        const _this: any = this;
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
+        }
+        const view: any = {
+            viewname: 'hrduty-edu-v-001', 
+            height: 0, 
+            width: 600,  
+            title: this.$t('entities.hrdutyedu.views.v_001.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
+    }
+
+
+
+    /**
+     * 表格行数据默认激活模式
+     * 0 不激活
+     * 1 单击激活
+     * 2 双击激活
+     *
+     * @protected
+     * @type {(0 | 1 | 2)}
+     * @memberof HRDutyEduV_002Base
+     */
+    protected gridRowActiveMode: 0 | 1 | 2 = 0;
+}
\ No newline at end of file

app_PIM/src/pages/human-resource/hrduty-edu-v-002/hrduty-edu-v-002.html

+<studio-embed-view-style2 viewName="hrdutyeduv_002" viewTitle="职务教育嵌入职务" class='degridview9 hrduty-edu-v-002'>
+    <i-input slot="quickSearch" v-model="query" search @on-search="onSearch($event)" placeholder="教育" />
+    <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-embed-view-style2>
\ No newline at end of file

app_PIM/src/pages/human-resource/hrduty-edu-v-002/hrduty-edu-v-002.vue

+<template src="./hrduty-edu-v-002.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { HRDutyEduV_002Base } from './hrduty-edu-v-002-base';
+import view_grid from '@widgets/hrduty-edu/main-grid/main-grid.vue';
+
+/**
+ * 职务教育嵌入职务视图
+ *
+ * @export
+ * @class HRDutyEduV_002
+ * @extends {HRDutyEduV_002Base}
+ */
+@Component({
+    components: {
+        view_grid, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class HRDutyEduV_002 extends HRDutyEduV_002Base { }
+</script>

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

@@ -561,19 +561,36 @@ export class HRDutySkillGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hrduty && true){
+            deResParameters = [
+            { pathName: 'hrduties', parameterName: 'hrduty' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrdutyskills', parameterName: 'hrdutyskill' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'hrduty-skill-v-001', 
+            height: 0, 
+            width: 600,  
+            title: this.$t('entities.hrdutyskill.views.v_001.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
     }
 
 
@@ -595,17 +612,36 @@ export class HRDutySkillGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hrduty && true){
+            deResParameters = [
+            { pathName: 'hrduties', parameterName: 'hrduty' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrdutyskills', parameterName: 'hrdutyskill' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
-            this.$router.push(routePath);
-        }
-        openIndexViewTab(data);
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
+        }
+        const view: any = {
+            viewname: 'hrduty-skill-v-001', 
+            height: 0, 
+            width: 600,  
+            title: this.$t('entities.hrdutyskill.views.v_001.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
     }
 
 

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>

app_PIM/src/pages/human-resource/hrduty-skill-v-001/hrduty-skill-v-001-base.tsx

+import { Subject } from 'rxjs';
+import { OptionViewBase } from '@/studio-core';
+import HRDutySkillService from '@/service/hrduty-skill/hrduty-skill-service';
+import HRDutySkillAuthService from '@/authservice/hrduty-skill/hrduty-skill-auth-service';
+import OptionViewEngine from '@engine/view/option-view-engine';
+import HRDutySkillUIService from '@/uiservice/hrduty-skill/hrduty-skill-ui-service';
+
+/**
+ * 职务技能视图基类
+ *
+ * @export
+ * @class HRDutySkillV_001Base
+ * @extends {OptionViewBase}
+ */
+export class HRDutySkillV_001Base extends OptionViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutySkillV_001Base
+     */
+    protected appDeName: string = 'hrdutyskill';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutySkillV_001Base
+     */
+    protected appDeKey: string = 'hrdutyskillid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutySkillV_001Base
+     */
+    protected appDeMajor: string = 'hrdutyskillname';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {HRDutySkillService}
+     * @memberof HRDutySkillV_001Base
+     */
+    protected appEntityService: HRDutySkillService = new HRDutySkillService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type HRDutySkillUIService
+     * @memberof HRDutySkillV_001Base
+     */
+    public appUIService: HRDutySkillUIService = new HRDutySkillUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof HRDutySkillV_001Base
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof HRDutySkillV_001Base
+     */
+    protected model: any = {
+        srfCaption: 'entities.hrdutyskill.views.v_001.caption',
+        srfTitle: 'entities.hrdutyskill.views.v_001.title',
+        srfSubTitle: 'entities.hrdutyskill.views.v_001.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof HRDutySkillV_001Base
+     */
+    protected containerModel: any = {
+        view_form: { name: 'form', type: 'FORM' },
+        view_okbtn: { name: 'okbtn', type: 'button', text: '确定', disabled: true },
+        view_cancelbtn: { name: 'cancelbtn', type: 'button', text: '取消', disabled: false },
+        view_leftbtn: { name: 'leftbtn', type: 'button', text: '左移', disabled: true },
+        view_rightbtn: { name: 'rightbtn', type: 'button', text: '右移', disabled: true },
+        view_allleftbtn: { name: 'allleftbtn', type: 'button', text: '全部左移', disabled: true },
+        view_allrightbtn: { name: 'allrightbtn', type: 'button', text: '全部右移', disabled: true },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = 'd2411142d3398651fb50d214bcfc3e3d';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof HRDutySkillV_001Base
+     */
+    public engine: OptionViewEngine = new OptionViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof HRDutySkillV_001Base
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            form: this.$refs.form,
+            p2k: '0',
+            keyPSDEField: 'hrdutyskill',
+            majorPSDEField: 'hrdutyskillname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * form 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutySkillV_001Base
+     */
+    public form_save($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'save', $event);
+    }
+
+    /**
+     * form 部件 remove 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutySkillV_001Base
+     */
+    public form_remove($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'remove', $event);
+    }
+
+    /**
+     * form 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutySkillV_001Base
+     */
+    public form_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'load', $event);
+    }
+
+
+}
\ No newline at end of file

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

+<studio-view-style2 viewName="hrdutyskillv_001" viewTitle="职务技能" class='deoptview hrduty-skill-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

app_PIM/src/pages/human-resource/hrduty-skill-v-001/hrduty-skill-v-001.vue

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

app_PIM/src/pages/human-resource/hrduty-skill-v-002/hrduty-skill-v-002-base.tsx

+
+import { Subject } from 'rxjs';
+import { GridView9Base } from '@/studio-core';
+import HRDutySkillService from '@/service/hrduty-skill/hrduty-skill-service';
+import HRDutySkillAuthService from '@/authservice/hrduty-skill/hrduty-skill-auth-service';
+import GridView9Engine from '@engine/view/grid-view9-engine';
+import HRDutySkillUIService from '@/uiservice/hrduty-skill/hrduty-skill-ui-service';
+import CodeListService from "@service/app/codelist-service";
+
+
+/**
+ * 职务技能嵌入职务视图基类
+ *
+ * @export
+ * @class HRDutySkillV_002Base
+ * @extends {GridView9Base}
+ */
+export class HRDutySkillV_002Base extends GridView9Base {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutySkillV_002Base
+     */
+    protected appDeName: string = 'hrdutyskill';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutySkillV_002Base
+     */
+    protected appDeKey: string = 'hrdutyskillid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRDutySkillV_002Base
+     */
+    protected appDeMajor: string = 'hrdutyskillname';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {HRDutySkillService}
+     * @memberof HRDutySkillV_002Base
+     */
+    protected appEntityService: HRDutySkillService = new HRDutySkillService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type HRDutySkillUIService
+     * @memberof HRDutySkillV_002Base
+     */
+    public appUIService: HRDutySkillUIService = new HRDutySkillUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof HRDutySkillV_002Base
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof HRDutySkillV_002Base
+     */
+    protected model: any = {
+        srfCaption: 'entities.hrdutyskill.views.v_002.caption',
+        srfTitle: 'entities.hrdutyskill.views.v_002.title',
+        srfSubTitle: 'entities.hrdutyskill.views.v_002.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof HRDutySkillV_002Base
+     */
+    protected containerModel: any = {
+        view_grid: { name: 'grid', type: 'GRID' },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '6d4cab857af2830b37515c2015a40e5f';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof HRDutySkillV_002Base
+     */
+    public engine: GridView9Engine = new GridView9Engine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof HRDutySkillV_002Base
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            opendata: (args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) => {
+                this.opendata(args,fullargs, params, $event, xData);
+            },
+            newdata: (args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) => {
+                this.newdata(args,fullargs, params, $event, xData);
+            },
+            grid: this.$refs.grid,
+            keyPSDEField: 'hrdutyskill',
+            majorPSDEField: 'hrdutyskillname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * grid 部件 selectionchange 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutySkillV_002Base
+     */
+    public grid_selectionchange($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'selectionchange', $event);
+    }
+
+    /**
+     * grid 部件 beforeload 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutySkillV_002Base
+     */
+    public grid_beforeload($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'beforeload', $event);
+    }
+
+    /**
+     * grid 部件 rowdblclick 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutySkillV_002Base
+     */
+    public grid_rowdblclick($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
+    }
+
+    /**
+     * grid 部件 remove 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutySkillV_002Base
+     */
+    public grid_remove($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'remove', $event);
+    }
+
+    /**
+     * grid 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRDutySkillV_002Base
+     */
+    public grid_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'load', $event);
+    }
+
+    /**
+     * 打开新建数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof HRDutySkillV_002
+     */
+    public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
+        const data: any = {};
+        if(args[0].srfsourcekey){
+            data.srfsourcekey = args[0].srfsourcekey;
+        }
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        delete tempContext.hrdutyskill;
+        if(args.length >0){
+            Object.assign(tempContext,args[0]);
+        }
+        let deResParameters: any[] = [];
+        if(tempContext.hrduty && true){
+            deResParameters = [
+            { pathName: 'hrduties', parameterName: 'hrduty' },
+            ]
+        }
+        const parameters: any[] = [
+            { pathName: 'hrdutyskills', parameterName: 'hrdutyskill' },
+        ];
+        const _this: any = this;
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
+        }
+        const view: any = {
+            viewname: 'hrduty-skill-v-001', 
+            height: 0, 
+            width: 600,  
+            title: this.$t('entities.hrdutyskill.views.v_001.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
+    }
+
+
+    /**
+     * 打开编辑数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof HRDutySkillV_002
+     */
+    public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        const localContext: any = null;
+        const localViewParam: any =null;
+        const data: any = {};
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        if(args.length >0){
+            Object.assign(tempContext,args[0]);
+        }
+        let deResParameters: any[] = [];
+        if(tempContext.hrduty && true){
+            deResParameters = [
+            { pathName: 'hrduties', parameterName: 'hrduty' },
+            ]
+        }
+        const parameters: any[] = [
+            { pathName: 'hrdutyskills', parameterName: 'hrdutyskill' },
+        ];
+        const _this: any = this;
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
+        }
+        const view: any = {
+            viewname: 'hrduty-skill-v-001', 
+            height: 0, 
+            width: 600,  
+            title: this.$t('entities.hrdutyskill.views.v_001.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
+    }
+
+
+
+    /**
+     * 表格行数据默认激活模式
+     * 0 不激活
+     * 1 单击激活
+     * 2 双击激活
+     *
+     * @protected
+     * @type {(0 | 1 | 2)}
+     * @memberof HRDutySkillV_002Base
+     */
+    protected gridRowActiveMode: 0 | 1 | 2 = 0;
+}
\ No newline at end of file

app_PIM/src/pages/human-resource/hrduty-skill-v-002/hrduty-skill-v-002.html

+<studio-embed-view-style2 viewName="hrdutyskillv_002" viewTitle="职务技能嵌入职务" class='degridview9 hrduty-skill-v-002'>
+    <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-embed-view-style2>
\ No newline at end of file

app_PIM/src/pages/human-resource/hrduty-skill-v-002/hrduty-skill-v-002.vue

+<template src="./hrduty-skill-v-002.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { HRDutySkillV_002Base } from './hrduty-skill-v-002-base';
+import view_grid from '@widgets/hrduty-skill/main-grid/main-grid.vue';
+
+/**
+ * 职务技能嵌入职务视图
+ *
+ * @export
+ * @class HRDutySkillV_002
+ * @extends {HRDutySkillV_002Base}
+ */
+@Component({
+    components: {
+        view_grid, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class HRDutySkillV_002 extends HRDutySkillV_002Base { }
+</script>

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

@@ -99,11 +99,11 @@ export class HRDutyTabExpViewBase extends TabExpViewBase {
      * @memberof HRDutyTabExpView
      */
     public toolBarModels: any = {
+        tbitem1_ff_003: { name: 'tbitem1_ff_003', caption: '编辑', 'isShowCaption': true, 'isShowIcon': true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FF_003', target: 'SINGLEKEY', class: '' } },
+
         tbitem1_remove_sep: {  name: 'tbitem1_remove_sep', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem1_remove: { name: 'tbitem1_remove', caption: '删除并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '删除并关闭', iconcls: 'fa fa-remove', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'SINGLEKEY', class: '' } },
 
-        tbitem1_ff_003: { name: 'tbitem1_ff_003', caption: '编辑', 'isShowCaption': true, 'isShowIcon': true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FF_003', target: 'SINGLEKEY', class: '' } },
-
         tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem22: { name: 'tbitem22', caption: '关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Exit', target: '', class: '' } },
 
@@ -153,12 +153,12 @@ export class HRDutyTabExpViewBase extends TabExpViewBase {
      * @memberof HRDutyTabExpViewBase
      */
     public toolbar_click($event: any, $event2?: any): void {
-        if (Object.is($event.tag, 'tbitem1_remove')) {
-            this.toolbar_tbitem1_remove_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem1_ff_003')) {
             this.toolbar_tbitem1_ff_003_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem1_remove')) {
+            this.toolbar_tbitem1_remove_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem22')) {
             this.toolbar_tbitem22_click(null, '', $event2);
         }
@@ -172,7 +172,7 @@ export class HRDutyTabExpViewBase extends TabExpViewBase {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem1_remove_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem1_ff_003_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -189,7 +189,7 @@ export class HRDutyTabExpViewBase extends TabExpViewBase {
         }
         // 界面行为
         const curUIService:HRDutyUIService  = new HRDutyUIService();
-        curUIService.HRDuty_Remove(datas,contextJO, paramJO,  $event, xData,this,"HRDuty");
+        curUIService.HRDuty_FF_003(datas,contextJO, paramJO,  $event, xData,this,"HRDuty");
     }
 
     /**
@@ -200,7 +200,7 @@ export class HRDutyTabExpViewBase extends TabExpViewBase {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem1_ff_003_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem1_remove_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -217,7 +217,7 @@ export class HRDutyTabExpViewBase extends TabExpViewBase {
         }
         // 界面行为
         const curUIService:HRDutyUIService  = new HRDutyUIService();
-        curUIService.HRDuty_FF_003(datas,contextJO, paramJO,  $event, xData,this,"HRDuty");
+        curUIService.HRDuty_Remove(datas,contextJO, paramJO,  $event, xData,this,"HRDuty");
     }
 
     /**

app_PIM/src/pages/human-resource/hrduty-v-002/hrduty-v-002.vue

@@ -3,7 +3,7 @@
 import { Component } from 'vue-property-decorator';
 import { VueLifeCycleProcessing } from '@/studio-core';
 import { HRDutyV_002Base } from './hrduty-v-002-base';
-import view_form from '@widgets/hrduty/main-form/main-form.vue';
+import view_form from '@widgets/hrduty/if-001-form/if-001-form.vue';
 
 /**
  * 职务信息视图

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

@@ -3,11 +3,11 @@ export const PageComponents = {
                 Vue.component('hremployee-pickup-view', () => import('@pages/human-resource/hremployee-pickup-view/hremployee-pickup-view.vue'));
         Vue.component('hrpost-v-004', () => import('@pages/human-resource/hrpost-v-004/hrpost-v-004.vue'));
         Vue.component('hroperation-unit-edit-view', () => import('@pages/base/hroperation-unit-edit-view/hroperation-unit-edit-view.vue'));
-        Vue.component('hrduty-edit-view', () => import('@pages/human-resource/hrduty-edit-view/hrduty-edit-view.vue'));
         Vue.component('hrpost-grid-view', () => import('@pages/human-resource/hrpost-grid-view/hrpost-grid-view.vue'));
         Vue.component('hrduty-v-001', () => import('@pages/human-resource/hrduty-v-001/hrduty-v-001.vue'));
         Vue.component('hrpost-v-002', () => import('@pages/human-resource/hrpost-v-002/hrpost-v-002.vue'));
         Vue.component('hrdistribution-edit-view', () => import('@pages/human-resource/hrdistribution-edit-view/hrdistribution-edit-view.vue'));
+        Vue.component('hrduty-cert-v-002', () => import('@pages/human-resource/hrduty-cert-v-002/hrduty-cert-v-002.vue'));
         Vue.component('hrorg-contact-grid-view', () => import('@pages/base/hrorg-contact-grid-view/hrorg-contact-grid-view.vue'));
         Vue.component('hroperation-unit-v-001', () => import('@pages/base/hroperation-unit-v-001/hroperation-unit-v-001.vue'));
         Vue.component('hroperation-unit-grid-view', () => import('@pages/base/hroperation-unit-grid-view/hroperation-unit-grid-view.vue'));
@@ -18,28 +18,29 @@ export const PageComponents = {
         Vue.component('hromhierarchy-grid-view', () => import('@pages/base/hromhierarchy-grid-view/hromhierarchy-grid-view.vue'));
         Vue.component('hroperation-unit-v-002', () => import('@pages/base/hroperation-unit-v-002/hroperation-unit-v-002.vue'));
         Vue.component('hrduty-cert-grid-view', () => import('@pages/human-resource/hrduty-cert-grid-view/hrduty-cert-grid-view.vue'));
+        Vue.component('hrduty-skill-v-002', () => import('@pages/human-resource/hrduty-skill-v-002/hrduty-skill-v-002.vue'));
         Vue.component('hrpost-rel-v-002', () => import('@pages/human-resource/hrpost-rel-v-002/hrpost-rel-v-002.vue'));
         Vue.component('hremployee-pickup-grid-view', () => import('@pages/human-resource/hremployee-pickup-grid-view/hremployee-pickup-grid-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('hrorganization-pickup-view', () => import('@pages/base/hrorganization-pickup-view/hrorganization-pickup-view.vue'));
         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('hrpost-v-006', () => import('@pages/human-resource/hrpost-v-006/hrpost-v-006.vue'));
         Vue.component('hrlegal-v-002', () => import('@pages/base/hrlegal-v-002/hrlegal-v-002.vue'));
         Vue.component('hroperation-unit-tab-exp-view', () => import('@pages/base/hroperation-unit-tab-exp-view/hroperation-unit-tab-exp-view.vue'));
-        Vue.component('hrduty-edu-edit-view', () => import('@pages/human-resource/hrduty-edu-edit-view/hrduty-edu-edit-view.vue'));
         Vue.component('hrorg-address-grid-view', () => import('@pages/base/hrorg-address-grid-view/hrorg-address-grid-view.vue'));
         Vue.component('hrpost-pickup-view', () => import('@pages/human-resource/hrpost-pickup-view/hrpost-pickup-view.vue'));
+        Vue.component('hrduty-cert-v-001', () => import('@pages/human-resource/hrduty-cert-v-001/hrduty-cert-v-001.vue'));
         Vue.component('hrduty-tab-exp-view', () => import('@pages/human-resource/hrduty-tab-exp-view/hrduty-tab-exp-view.vue'));
-        Vue.component('hrduty-cert-edit-view', () => import('@pages/human-resource/hrduty-cert-edit-view/hrduty-cert-edit-view.vue'));
-        Vue.component('hrlegal-dashboard-view', () => import('@pages/base/hrlegal-dashboard-view/hrlegal-dashboard-view.vue'));
         Vue.component('hrorganization-pickup-grid-view', () => import('@pages/base/hrorganization-pickup-grid-view/hrorganization-pickup-grid-view.vue'));
+        Vue.component('hrlegal-dashboard-view', () => import('@pages/base/hrlegal-dashboard-view/hrlegal-dashboard-view.vue'));
         Vue.component('hrlegal-v-001', () => import('@pages/base/hrlegal-v-001/hrlegal-v-001.vue'));
         Vue.component('hrpost-pickup-grid-view', () => import('@pages/human-resource/hrpost-pickup-grid-view/hrpost-pickup-grid-view.vue'));
         Vue.component('hrduty-skill-grid-view', () => import('@pages/human-resource/hrduty-skill-grid-view/hrduty-skill-grid-view.vue'));
+        Vue.component('hrduty-edu-v-001', () => import('@pages/human-resource/hrduty-edu-v-001/hrduty-edu-v-001.vue'));
         Vue.component('hrpost-dashboard-view', () => import('@pages/human-resource/hrpost-dashboard-view/hrpost-dashboard-view.vue'));
-        Vue.component('hrduty-skill-edit-view', () => import('@pages/human-resource/hrduty-skill-edit-view/hrduty-skill-edit-view.vue'));
         Vue.component('hrorg-address-edit-view', () => import('@pages/base/hrorg-address-edit-view/hrorg-address-edit-view.vue'));
+        Vue.component('hrduty-skill-v-001', () => import('@pages/human-resource/hrduty-skill-v-001/hrduty-skill-v-001.vue'));
         Vue.component('hrduty-dashboard-view', () => import('@pages/human-resource/hrduty-dashboard-view/hrduty-dashboard-view.vue'));
         Vue.component('hrorganization-edit-view', () => import('@pages/base/hrorganization-edit-view/hrorganization-edit-view.vue'));
         Vue.component('hromhierarchy-cat-grid-view', () => import('@pages/base/hromhierarchy-cat-grid-view/hromhierarchy-cat-grid-view.vue'));
@@ -56,10 +57,10 @@ export const PageComponents = {
         Vue.component('hromhierarchy-cat-pickup-view', () => import('@pages/base/hromhierarchy-cat-pickup-view/hromhierarchy-cat-pickup-view.vue'));
         Vue.component('hrpost-v-005', () => import('@pages/human-resource/hrpost-v-005/hrpost-v-005.vue'));
         Vue.component('hrlegal-edit-view', () => import('@pages/base/hrlegal-edit-view/hrlegal-edit-view.vue'));
-        Vue.component('hrpost-rel-grid-view', () => import('@pages/human-resource/hrpost-rel-grid-view/hrpost-rel-grid-view.vue'));
-        Vue.component('hrorganization-grid-view', () => import('@pages/base/hrorganization-grid-view/hrorganization-grid-view.vue'));
         Vue.component('hromhierarchy-edit-view', () => import('@pages/base/hromhierarchy-edit-view/hromhierarchy-edit-view.vue'));
+        Vue.component('hrorganization-grid-view', () => import('@pages/base/hrorganization-grid-view/hrorganization-grid-view.vue'));
         Vue.component('hrduty-pickup-view', () => import('@pages/human-resource/hrduty-pickup-view/hrduty-pickup-view.vue'));
+        Vue.component('hrpost-rel-grid-view', () => import('@pages/human-resource/hrpost-rel-grid-view/hrpost-rel-grid-view.vue'));
         Vue.component('hromhierarchy-cat-edit-view', () => import('@pages/base/hromhierarchy-cat-edit-view/hromhierarchy-cat-edit-view.vue'));
         Vue.component('hrorg-contact-edit-view', () => import('@pages/base/hrorg-contact-edit-view/hrorg-contact-edit-view.vue'));
         Vue.component('hromhierarchy-cat-v-002', () => import('@pages/base/hromhierarchy-cat-v-002/hromhierarchy-cat-v-002.vue'));
@@ -70,5 +71,6 @@ export const PageComponents = {
         Vue.component('hrdistribution-v-001', () => import('@pages/human-resource/hrdistribution-v-001/hrdistribution-v-001.vue'));
         Vue.component('hrduty-grid-view', () => import('@pages/human-resource/hrduty-grid-view/hrduty-grid-view.vue'));
         Vue.component('hrpost-edit-view', () => import('@pages/human-resource/hrpost-edit-view/hrpost-edit-view.vue'));
+        Vue.component('hrduty-edu-v-002', () => import('@pages/human-resource/hrduty-edu-v-002/hrduty-edu-v-002.vue'));
     }
 };
\ No newline at end of file

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

@@ -48,6 +48,11 @@ export default class HRDutyCertServiceBase extends EntityService {
      * @memberof HRDutyCertServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && context.hrdutycert){
+            let res:any = Http.getInstance().get(`/hrduties/${context.hrduty}/hrdutycerts/${context.hrdutycert}/select`,isloading);
+            
+            return res;
+        }
             let res:any = Http.getInstance().get(`/hrdutycerts/${context.hrdutycert}/select`,isloading);
             
             return res;
@@ -63,6 +68,20 @@ export default class HRDutyCertServiceBase extends EntityService {
      * @memberof HRDutyCertServiceBase
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && true){
+            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(`/hrduties/${context.hrduty}/hrdutycerts`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
@@ -87,6 +106,13 @@ export default class HRDutyCertServiceBase extends EntityService {
      * @memberof HRDutyCertServiceBase
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && context.hrdutycert){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/hrduties/${context.hrduty}/hrdutycerts/${context.hrdutycert}`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/hrdutycerts/${context.hrdutycert}`,data,isloading);
@@ -104,6 +130,10 @@ export default class HRDutyCertServiceBase extends EntityService {
      * @memberof HRDutyCertServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && context.hrdutycert){
+            let res:any = Http.getInstance().delete(`/hrduties/${context.hrduty}/hrdutycerts/${context.hrdutycert}`,isloading);
+            return res;
+        }
             let res:any = Http.getInstance().delete(`/hrdutycerts/${context.hrdutycert}`,isloading);
             return res;
     }
@@ -118,6 +148,11 @@ export default class HRDutyCertServiceBase extends EntityService {
      * @memberof HRDutyCertServiceBase
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && context.hrdutycert){
+            let res:any = await Http.getInstance().get(`/hrduties/${context.hrduty}/hrdutycerts/${context.hrdutycert}`,isloading);
+            
+            return res;
+        }
             let res:any = await Http.getInstance().get(`/hrdutycerts/${context.hrdutycert}`,isloading);
             
             return res;
@@ -133,6 +168,12 @@ export default class HRDutyCertServiceBase extends EntityService {
      * @memberof HRDutyCertServiceBase
      */
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && true){
+            let res:any = await Http.getInstance().get(`/hrduties/${context.hrduty}/hrdutycerts/getdraft`,isloading);
+            res.data.hrdutycert = data.hrdutycert;
+            
+            return res;
+        }
         let res:any = await  Http.getInstance().get(`/hrdutycerts/getdraft`,isloading);
         res.data.hrdutycert = data.hrdutycert;
         
@@ -149,6 +190,13 @@ export default class HRDutyCertServiceBase extends EntityService {
      * @memberof HRDutyCertServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && context.hrdutycert){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hrduties/${context.hrduty}/hrdutycerts/${context.hrdutycert}/checkkey`,data,isloading);
+            
+            return res;
+        }
             let res:any = Http.getInstance().post(`/hrdutycerts/${context.hrdutycert}/checkkey`,data,isloading);
             return res;
     }
@@ -163,6 +211,13 @@ export default class HRDutyCertServiceBase extends EntityService {
      * @memberof HRDutyCertServiceBase
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && context.hrdutycert){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hrduties/${context.hrduty}/hrdutycerts/${context.hrdutycert}/save`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/hrdutycerts/${context.hrdutycert}/save`,data,isloading);
@@ -180,6 +235,11 @@ export default class HRDutyCertServiceBase extends EntityService {
      * @memberof HRDutyCertServiceBase
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            let res:any = Http.getInstance().get(`/hrduties/${context.hrduty}/hrdutycerts/fetchdefault`,tempData,isloading);
+            return res;
+        }
         let tempData:any = JSON.parse(JSON.stringify(data));
         let res:any = Http.getInstance().get(`/hrdutycerts/fetchdefault`,tempData,isloading);
         return res;

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

@@ -48,6 +48,11 @@ export default class HRDutyEduServiceBase extends EntityService {
      * @memberof HRDutyEduServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && context.hrdutyedu){
+            let res:any = Http.getInstance().get(`/hrduties/${context.hrduty}/hrdutyedus/${context.hrdutyedu}/select`,isloading);
+            
+            return res;
+        }
             let res:any = Http.getInstance().get(`/hrdutyedus/${context.hrdutyedu}/select`,isloading);
             
             return res;
@@ -63,6 +68,20 @@ export default class HRDutyEduServiceBase extends EntityService {
      * @memberof HRDutyEduServiceBase
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && true){
+            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(`/hrduties/${context.hrduty}/hrdutyedus`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
@@ -87,6 +106,13 @@ export default class HRDutyEduServiceBase extends EntityService {
      * @memberof HRDutyEduServiceBase
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && context.hrdutyedu){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/hrduties/${context.hrduty}/hrdutyedus/${context.hrdutyedu}`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/hrdutyedus/${context.hrdutyedu}`,data,isloading);
@@ -104,6 +130,10 @@ export default class HRDutyEduServiceBase extends EntityService {
      * @memberof HRDutyEduServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && context.hrdutyedu){
+            let res:any = Http.getInstance().delete(`/hrduties/${context.hrduty}/hrdutyedus/${context.hrdutyedu}`,isloading);
+            return res;
+        }
             let res:any = Http.getInstance().delete(`/hrdutyedus/${context.hrdutyedu}`,isloading);
             return res;
     }
@@ -118,6 +148,11 @@ export default class HRDutyEduServiceBase extends EntityService {
      * @memberof HRDutyEduServiceBase
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && context.hrdutyedu){
+            let res:any = await Http.getInstance().get(`/hrduties/${context.hrduty}/hrdutyedus/${context.hrdutyedu}`,isloading);
+            
+            return res;
+        }
             let res:any = await Http.getInstance().get(`/hrdutyedus/${context.hrdutyedu}`,isloading);
             
             return res;
@@ -133,6 +168,12 @@ export default class HRDutyEduServiceBase extends EntityService {
      * @memberof HRDutyEduServiceBase
      */
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && true){
+            let res:any = await Http.getInstance().get(`/hrduties/${context.hrduty}/hrdutyedus/getdraft`,isloading);
+            res.data.hrdutyedu = data.hrdutyedu;
+            
+            return res;
+        }
         let res:any = await  Http.getInstance().get(`/hrdutyedus/getdraft`,isloading);
         res.data.hrdutyedu = data.hrdutyedu;
         
@@ -149,6 +190,13 @@ export default class HRDutyEduServiceBase extends EntityService {
      * @memberof HRDutyEduServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && context.hrdutyedu){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hrduties/${context.hrduty}/hrdutyedus/${context.hrdutyedu}/checkkey`,data,isloading);
+            
+            return res;
+        }
             let res:any = Http.getInstance().post(`/hrdutyedus/${context.hrdutyedu}/checkkey`,data,isloading);
             return res;
     }
@@ -163,6 +211,13 @@ export default class HRDutyEduServiceBase extends EntityService {
      * @memberof HRDutyEduServiceBase
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && context.hrdutyedu){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hrduties/${context.hrduty}/hrdutyedus/${context.hrdutyedu}/save`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/hrdutyedus/${context.hrdutyedu}/save`,data,isloading);
@@ -180,6 +235,11 @@ export default class HRDutyEduServiceBase extends EntityService {
      * @memberof HRDutyEduServiceBase
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            let res:any = Http.getInstance().get(`/hrduties/${context.hrduty}/hrdutyedus/fetchdefault`,tempData,isloading);
+            return res;
+        }
         let tempData:any = JSON.parse(JSON.stringify(data));
         let res:any = Http.getInstance().get(`/hrdutyedus/fetchdefault`,tempData,isloading);
         return res;

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

@@ -48,6 +48,11 @@ export default class HRDutySkillServiceBase extends EntityService {
      * @memberof HRDutySkillServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && context.hrdutyskill){
+            let res:any = Http.getInstance().get(`/hrduties/${context.hrduty}/hrdutyskills/${context.hrdutyskill}/select`,isloading);
+            
+            return res;
+        }
             let res:any = Http.getInstance().get(`/hrdutyskills/${context.hrdutyskill}/select`,isloading);
             
             return res;
@@ -63,6 +68,20 @@ export default class HRDutySkillServiceBase extends EntityService {
      * @memberof HRDutySkillServiceBase
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && true){
+            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(`/hrduties/${context.hrduty}/hrdutyskills`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
@@ -87,6 +106,13 @@ export default class HRDutySkillServiceBase extends EntityService {
      * @memberof HRDutySkillServiceBase
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && context.hrdutyskill){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/hrduties/${context.hrduty}/hrdutyskills/${context.hrdutyskill}`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/hrdutyskills/${context.hrdutyskill}`,data,isloading);
@@ -104,6 +130,10 @@ export default class HRDutySkillServiceBase extends EntityService {
      * @memberof HRDutySkillServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && context.hrdutyskill){
+            let res:any = Http.getInstance().delete(`/hrduties/${context.hrduty}/hrdutyskills/${context.hrdutyskill}`,isloading);
+            return res;
+        }
             let res:any = Http.getInstance().delete(`/hrdutyskills/${context.hrdutyskill}`,isloading);
             return res;
     }
@@ -118,6 +148,11 @@ export default class HRDutySkillServiceBase extends EntityService {
      * @memberof HRDutySkillServiceBase
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && context.hrdutyskill){
+            let res:any = await Http.getInstance().get(`/hrduties/${context.hrduty}/hrdutyskills/${context.hrdutyskill}`,isloading);
+            
+            return res;
+        }
             let res:any = await Http.getInstance().get(`/hrdutyskills/${context.hrdutyskill}`,isloading);
             
             return res;
@@ -133,6 +168,12 @@ export default class HRDutySkillServiceBase extends EntityService {
      * @memberof HRDutySkillServiceBase
      */
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && true){
+            let res:any = await Http.getInstance().get(`/hrduties/${context.hrduty}/hrdutyskills/getdraft`,isloading);
+            res.data.hrdutyskill = data.hrdutyskill;
+            
+            return res;
+        }
         let res:any = await  Http.getInstance().get(`/hrdutyskills/getdraft`,isloading);
         res.data.hrdutyskill = data.hrdutyskill;
         
@@ -149,6 +190,13 @@ export default class HRDutySkillServiceBase extends EntityService {
      * @memberof HRDutySkillServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && context.hrdutyskill){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hrduties/${context.hrduty}/hrdutyskills/${context.hrdutyskill}/checkkey`,data,isloading);
+            
+            return res;
+        }
             let res:any = Http.getInstance().post(`/hrdutyskills/${context.hrdutyskill}/checkkey`,data,isloading);
             return res;
     }
@@ -163,6 +211,13 @@ export default class HRDutySkillServiceBase extends EntityService {
      * @memberof HRDutySkillServiceBase
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && context.hrdutyskill){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hrduties/${context.hrduty}/hrdutyskills/${context.hrdutyskill}/save`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/hrdutyskills/${context.hrdutyskill}/save`,data,isloading);
@@ -180,6 +235,11 @@ export default class HRDutySkillServiceBase extends EntityService {
      * @memberof HRDutySkillServiceBase
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrduty && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            let res:any = Http.getInstance().get(`/hrduties/${context.hrduty}/hrdutyskills/fetchdefault`,tempData,isloading);
+            return res;
+        }
         let tempData:any = JSON.parse(JSON.stringify(data));
         let res:any = Http.getInstance().get(`/hrdutyskills/fetchdefault`,tempData,isloading);
         return res;

app_PIM/src/service/hrduty/hrduty-service-base.ts

@@ -73,6 +73,9 @@ export default class HRDutyServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/hrduties`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_hrdutycerts',JSON.stringify(res.data.hrdutycerts?res.data.hrdutycerts:[]));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_hrdutyedus',JSON.stringify(res.data.hrdutyedus?res.data.hrdutyedus:[]));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_hrdutyskills',JSON.stringify(res.data.hrdutyskills?res.data.hrdutyskills:[]));
         
         return res;
     }

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

@@ -40,6 +40,25 @@ export const viewstate: any = {
             refviews: [
             ],
         },
+        {
+            viewtag: '069985244f19f8c6f8e74e39ef573e9a',
+            viewmodule: 'HumanResource',
+            viewname: 'HRDutyEduV_002',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '06dd873e0c67a6a416c76c9803fd80bd',
+            ],
+        },
+        {
+            viewtag: '06dd873e0c67a6a416c76c9803fd80bd',
+            viewmodule: 'HumanResource',
+            viewname: 'HRDutyEduV_001',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: '07e98f33b8d972b70860e615aaa10b89',
             viewmodule: 'Base',
@@ -79,16 +98,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                'e3878971a0f023a84eb5047806090ef0',
-            ],
-        },
-        {
-            viewtag: '12bdd00f130135bc6c85947eeaff67fb',
-            viewmodule: 'HumanResource',
-            viewname: 'HRDutyCertEditView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
+                '06dd873e0c67a6a416c76c9803fd80bd',
             ],
         },
         {
@@ -175,6 +185,15 @@ export const viewstate: any = {
                 '045cc74f78937b52db67b8239361d181',
             ],
         },
+        {
+            viewtag: '2ee255b61cfa5e9bb8991f1421e807c3',
+            viewmodule: 'HumanResource',
+            viewname: 'HRDutyCertV_001',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: '3110aca6f6c27996e9874cfb924c569f',
             viewmodule: 'Base',
@@ -185,6 +204,16 @@ export const viewstate: any = {
                 '90f2bd2f58c482b25a1e1db0f8e4ca26',
             ],
         },
+        {
+            viewtag: '3180604a9489c03131e6642e456cd5c0',
+            viewmodule: 'HumanResource',
+            viewname: 'HRDutyCertV_002',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '2ee255b61cfa5e9bb8991f1421e807c3',
+            ],
+        },
         {
             viewtag: '3274463a5fe4c1bcb99fee2240c044ed',
             viewmodule: 'HumanResource',
@@ -231,7 +260,6 @@ export const viewstate: any = {
                 '0d8ac739134947cc5f6545d4041024de',
                 'b9130f18de0b66cd31ecaddb5a841aae',
                 '41036146909ab3f28ff59b80370514b2',
-                '188f3997d02da7fc34bac190ccd439e6',
                 '114f056047eddd92374e982356e59852',
             ],
         },
@@ -284,6 +312,9 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '3180604a9489c03131e6642e456cd5c0',
+                '6d4cab857af2830b37515c2015a40e5f',
+                '069985244f19f8c6f8e74e39ef573e9a',
             ],
         },
         {
@@ -306,15 +337,6 @@ export const viewstate: any = {
                 '4f567c340cbb4271d44543b278d29d0f',
             ],
         },
-        {
-            viewtag: '62468a4082892d924fe855427a8cd0cb',
-            viewmodule: 'HumanResource',
-            viewname: 'HRDutyEditView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-            ],
-        },
         {
             viewtag: '6395cba44e6d6151f19e543b55d88845',
             viewmodule: 'HumanResource',
@@ -355,6 +377,16 @@ export const viewstate: any = {
                 '04c02737ae62a4f4c014607441ee0401',
             ],
         },
+        {
+            viewtag: '6d4cab857af2830b37515c2015a40e5f',
+            viewmodule: 'HumanResource',
+            viewname: 'HRDutySkillV_002',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                'd2411142d3398651fb50d214bcfc3e3d',
+            ],
+        },
         {
             viewtag: '73f27ddcf2a626455aa88f4a052db014',
             viewmodule: 'HumanResource',
@@ -411,7 +443,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                'a54a950e4550856191ac9bb32f77b863',
+                'd2411142d3398651fb50d214bcfc3e3d',
             ],
         },
         {
@@ -454,15 +486,6 @@ export const viewstate: any = {
                 'ec9d9fe37bbfc3fcb623e2dc34b48dbc',
             ],
         },
-        {
-            viewtag: 'a54a950e4550856191ac9bb32f77b863',
-            viewmodule: 'HumanResource',
-            viewname: 'HRDutySkillEditView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-            ],
-        },
         {
             viewtag: 'aa2c4d945f9d880dd836ebe74ca9f547',
             viewmodule: 'Base',
@@ -479,7 +502,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '12bdd00f130135bc6c85947eeaff67fb',
+                '2ee255b61cfa5e9bb8991f1421e807c3',
             ],
         },
         {
@@ -518,8 +541,8 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '62468a4082892d924fe855427a8cd0cb',
                 '11c1ce686ccb8c2a9bb66a8cde3b93be',
+                '02571ad88a921ccc490d7b727b4f767d',
                 'aeb8d0367c4a34ad420ba08085acc8ce',
                 '532833b3a07947f04a46adcc957a0ca6',
                 '8959a1a3f5b43dbc52182d6cf04f00a1',
@@ -615,6 +638,15 @@ export const viewstate: any = {
                 '7ad274dc8cc9e8f7e464195ca0953dc3',
             ],
         },
+        {
+            viewtag: 'd2411142d3398651fb50d214bcfc3e3d',
+            viewmodule: 'HumanResource',
+            viewname: 'HRDutySkillV_001',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: 'd32b549b3c49b790b092eca97d1de2c1',
             viewmodule: 'Base',
@@ -664,15 +696,6 @@ export const viewstate: any = {
                 '26838780ace211d1714a2887e9039888',
             ],
         },
-        {
-            viewtag: 'e3878971a0f023a84eb5047806090ef0',
-            viewmodule: 'HumanResource',
-            viewname: 'HRDutyEduEditView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-            ],
-        },
         {
             viewtag: 'e50ad3e1883bafa2d6f264d44ca8ff89',
             viewmodule: 'Base',

app_PIM/src/uiservice/hrduty/hrduty-ui-service-base.ts

@@ -153,17 +153,28 @@ export default class HRDutyUIServiceBase extends UIService {
         let deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'hrduties', parameterName: 'hrduty' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
-        const openIndexViewTab = (data: any) => {
-            const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
-            actionContext.$router.push(routePath);
-            if (xData && xData.refresh && xData.refresh instanceof Function) {
-                xData.refresh(args);
+            const openDrawer = (view: any, data: any) => {
+                let container: Subject<any> = actionContext.$appdrawer.openDrawer(view, context,data);
+                container.subscribe((result: any) => {
+                    if (!result || !Object.is(result.ret, 'OK')) {
+                        return;
+                    }
+                    const _this: any = actionContext;
+                    if (xData && xData.refresh && xData.refresh instanceof Function) {
+                        xData.refresh(args);
+                    }
+                    return result.datas;
+                });
             }
-            return null;
-        }
-        openIndexViewTab(data);
+            const view: any = {
+                viewname: 'hrduty-v-001', 
+                height: 0, 
+                width: 600,  
+                title: actionContext.$t('entities.hrduty.views.v_001.title'),
+                placement: 'DRAWER_RIGHT',
+            };
+            openDrawer(view, data);
     }
 
     /**

app_PIM/src/widgets/app/pim-appmenu/pim-appmenu-base.tsx

@@ -29,8 +29,6 @@ export class PIMBase extends Vue {
                     this.click_9(item); break;
                 case '_5': 
                     this.click_5(item); break;
-                case '_7': 
-                    this.click_7(item); break;
                 default:
                     judge = false;
                     console.warn('未指定应用功能');
@@ -201,29 +199,6 @@ export class PIMBase extends Vue {
             this.$router.push(path);
         })
     }
-    
-    /**
-     * 组织层次结构
-     *
-     * @param {*} [item={}]
-     * @memberof PIM
-     */
-    public click_7(item: any = {}) {
-        const viewparam: any = {};
-        Object.assign(viewparam, {});
-        const deResParameters: any[] = [];
-        const parameters: any[] = [
-            { pathName: 'hromhierarchies', parameterName: 'hromhierarchy' },
-            { pathName: 'gridview', parameterName: 'gridview' },
-        ];
-        const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
-        if(Object.is(this.$route.fullPath,path)){
-            return;
-        }
-        this.$nextTick(function(){
-            this.$router.push(path);
-        })
-    }
 
     /**
      * 绘制内容

app_PIM/src/widgets/app/pim-appmenu/pim-appmenu-model.ts

@@ -320,27 +320,6 @@ export default class PIMModel {
                         	viewname: 'hrduty-grid-view',
                         	resourcetag: '',
                         }
-                        ,
-                        		        {
-                        	id: 'ED02F38F-5988-4458-95BB-75F91E922110',
-                        	name: 'menuitem8',
-                        	text: '测试',
-                        	type: 'MENUITEM',
-                        	counterid: '',
-                        	tooltip: '测试',
-                        	expanded: false,
-                        	separator: false,
-                        	hidden: false,
-                        	hidesidebar: false,
-                        	opendefault: false,
-                        	iconcls: '',
-                        	icon: '',
-                        	textcls: '',
-                        	appfunctag: '_7',
-                        	appfuncyype: 'APPVIEW',
-                        	viewname: 'hromhierarchy-grid-view',
-                        	resourcetag: '',
-                        }
                         ,
                 	],
                 }
@@ -518,18 +497,6 @@ export default class PIMModel {
                 { pathName: 'gridview', parameterName: 'gridview' },
             ],
         },
-        {
-            appfunctag: '_7',
-            appfuncyype: 'APPVIEW',
-            openmode: '',
-            codename: 'hromhierarchygridview',
-            deResParameters: [],
-            routepath: '/pim/:pim?/hromhierarchies/:hromhierarchy?/gridview/:gridview?',
-            parameters: [
-                { pathName: 'hromhierarchies', parameterName: 'hromhierarchy' },
-                { pathName: 'gridview', parameterName: 'gridview' },
-            ],
-        },
 	];
 
 	/**

app_PIM/src/widgets/hrduty/if-001-form/if-001-form-base.tsx

+import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
+import { Subject, Subscription } from 'rxjs';
+import { Watch, EditFormControlBase } from '@/studio-core';
+import HRDutyService from '@/service/hrduty/hrduty-service';
+import IF_001Service from './if-001-form-service';
+import HRDutyUIService from '@/uiservice/hrduty/hrduty-ui-service';
+import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail';
+
+
+/**
+ * form部件基类
+ *
+ * @export
+ * @class EditFormControlBase
+ * @extends {IF_001EditFormBase}
+ */
+export class IF_001EditFormBase extends EditFormControlBase {
+
+    /**
+     * 获取部件类型
+     *
+     * @protected
+     * @type {string}
+     * @memberof IF_001EditFormBase
+     */
+    protected controlType: string = 'FORM';
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {IF_001Service}
+     * @memberof IF_001EditFormBase
+     */
+    public service: IF_001Service = new IF_001Service({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {HRDutyService}
+     * @memberof IF_001EditFormBase
+     */
+    public appEntityService: HRDutyService = new HRDutyService({ $store: this.$store });
+
+    /**
+     * 应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof IF_001EditFormBase
+     */
+    protected appDeName: string = 'hrduty';
+
+    /**
+     * 应用实体中文名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof IF_001EditFormBase
+     */
+    protected appDeLogicName: string = '职务';
+    /**
+     * 界面UI服务对象
+     *
+     * @type {HRDutyUIService}
+     * @memberof IF_001EditFormBase
+     */  
+    public appUIService:HRDutyUIService = new HRDutyUIService(this.$store);
+
+
+    /**
+     * 关系界面数量
+     *
+     * @protected
+     * @type {number}
+     * @memberof IF_001EditFormBase
+     */
+    protected drCount: number = 3;
+
+    /**
+     * 表单数据对象
+     *
+     * @type {*}
+     * @memberof IF_001EditFormBase
+     */
+    public data: any = {
+        srfupdatedate: null,
+        srforikey: null,
+        srfkey: null,
+        srfmajortext: null,
+        srftempmode: null,
+        srfuf: null,
+        srfdeid: null,
+        srfsourcekey: null,
+        hrdutyname: null,
+        memo: null,
+        hrdutyid: null,
+        hrduty:null,
+    };
+
+    /**
+     * 属性值规则
+     *
+     * @type {*}
+     * @memberof IF_001EditFormBase
+     */
+    public rules: any = {
+    }
+
+    /**
+     * 属性值规则
+     *
+     * @type {*}
+     * @memberof IF_001Base
+     */
+    public deRules:any = {
+    };
+
+    /**
+     * 详情模型集合
+     *
+     * @type {*}
+     * @memberof IF_001EditFormBase
+     */
+    public detailsModel: any = {
+        group1: new FormGroupPanelModel({ caption: '职务信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrduty.if_001_form', extractMode: 'ITEM', details: [] } }),
+
+        druipart1: new FormDRUIPartModel({ caption: '', detailType: 'DRUIPART', name: 'druipart1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
+
+        grouppanel1: new FormGroupPanelModel({ caption: '技能', detailType: 'GROUPPANEL', name: 'grouppanel1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrduty.if_001_form', extractMode: 'ITEM', details: [] } }),
+
+        druipart2: new FormDRUIPartModel({ caption: '', detailType: 'DRUIPART', name: 'druipart2', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
+
+        grouppanel2: new FormGroupPanelModel({ caption: '证书', detailType: 'GROUPPANEL', name: 'grouppanel2', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrduty.if_001_form', extractMode: 'ITEM', details: [] } }),
+
+        druipart3: new FormDRUIPartModel({ caption: '', detailType: 'DRUIPART', name: 'druipart3', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
+
+        grouppanel3: new FormGroupPanelModel({ caption: '教育', detailType: 'GROUPPANEL', name: 'grouppanel3', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrduty.if_001_form', extractMode: 'ITEM', details: [] } }),
+
+        formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', 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 }),
+
+        srfkey: new FormItemModel({ caption: '职务标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfmajortext: new FormItemModel({ caption: '职务名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfuf: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfuf', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        hrdutyname: new FormItemModel({ caption: '职务名称', detailType: 'FORMITEM', name: 'hrdutyname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        memo: new FormItemModel({ caption: '备注', detailType: 'FORMITEM', name: 'memo', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        hrdutyid: new FormItemModel({ caption: '职务标识', detailType: 'FORMITEM', name: 'hrdutyid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+    };
+}
\ No newline at end of file

app_PIM/src/widgets/hrduty/if-001-form/if-001-form-model.ts

+/**
+ * IF_001 部件模型
+ *
+ * @export
+ * @class IF_001Model
+ */
+export default class IF_001Model {
+
+  /**
+  * 获取数据项集合
+  *
+  * @returns {any[]}
+  * @memberof IF_001Model
+  */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'srfwfmemo',
+        prop: 'srfwfmemo',
+        dataType: 'TEXT',
+      },
+      // 前端新增修改标识，新增为"0",修改为"1"或未设值
+      {
+        name: 'srffrontuf',
+        prop: 'srffrontuf',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'srfupdatedate',
+        prop: 'updatedate',
+        dataType: 'DATETIME',
+      },
+      {
+        name: 'srforikey',
+      },
+      {
+        name: 'srfkey',
+        prop: 'hrdutyid',
+        dataType: 'GUID',
+      },
+      {
+        name: 'srfmajortext',
+        prop: 'hrdutyname',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'srftempmode',
+      },
+      {
+        name: 'srfuf',
+      },
+      {
+        name: 'srfdeid',
+      },
+      {
+        name: 'srfsourcekey',
+      },
+      {
+        name: 'hrdutyname',
+        prop: 'hrdutyname',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'memo',
+        prop: 'memo',
+        dataType: 'LONGTEXT_1000',
+      },
+      {
+        name: 'hrdutyid',
+        prop: 'hrdutyid',
+        dataType: 'GUID',
+      },
+      {
+        name: 'hrduty',
+        prop: 'hrdutyid',
+        dataType: 'FONTKEY',
+      },
+    ]
+  }
+
+}
\ No newline at end of file

app_PIM/src/widgets/hrduty/if-001-form/if-001-form.vue

+<template src="./if-001-form.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { IF_001EditFormBase } from './if-001-form-base';
+ 
+
+/**
+ * form部件
+ *
+ * @export
+ * @class IF_001EditForm
+ * @extends {IF_001EditFormBase}
+ */
+@Component({
+    components: {
+         
+    }
+})
+@VueLifeCycleProcessing()
+export default class IF_001EditForm extends IF_001EditFormBase { }
+</script>

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>