jackwang 部署微服务应用

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

@@ -59,6 +59,16 @@
         "viewtag": "2b64c322042da1808776304d21c90e45",
         "memo": "系统自动添加"
     },
+    "hrorgaddressv_001": {
+        "title": "组织地址嵌入组织",
+        "caption": "组织地址嵌入组织",
+        "viewtype": "DEGRIDVIEW9",
+        "viewmodule": "Base",
+        "viewname": "HROrgAddressV_001",
+        "viewfilename": "hrorg-address-v-001",
+        "viewtag": "3110aca6f6c27996e9874cfb924c569f",
+        "memo": ""
+    },
     "hrlegalgridview": {
         "title": "法人",
         "caption": "法人",
@@ -89,6 +99,16 @@
         "viewtag": "53de2c13a619e20769cdc9dbfa10e1a5",
         "memo": "系统自动添加"
     },
+    "hrorgcontactv_001": {
+        "title": "组织联系信息嵌入组织",
+        "caption": "组织联系信息嵌入组织",
+        "viewtype": "DEGRIDVIEW9",
+        "viewmodule": "Base",
+        "viewname": "HROrgContactV_001",
+        "viewfilename": "hrorg-contact-v-001",
+        "viewtag": "7692fb3c8e0208004f100d2da5db17e0",
+        "memo": ""
+    },
     "hrorgaddresseditview": {
         "title": "组织地址编辑视图",
         "caption": "组织地址",

app_PIM/src/locale/lanres/entities/hrlegal/hrlegal_en_US.ts

@@ -75,7 +75,10 @@ export default {
 		details: {
 			group1: "法人信息", 
 			grouppanel1: "银行账号信息", 
-			grouppanel2: "备注", 
+			druipart1: "", 
+			grouppanel2: "地址", 
+			druipart2: "", 
+			grouppanel3: "联系信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 

app_PIM/src/locale/lanres/entities/hrlegal/hrlegal_zh_CN.ts

@@ -74,7 +74,10 @@ export default {
 		details: {
 			group1: "法人信息", 
 			grouppanel1: "银行账号信息", 
-			grouppanel2: "备注", 
+			druipart1: "", 
+			grouppanel2: "地址", 
+			druipart2: "", 
+			grouppanel3: "联系信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 

app_PIM/src/locale/lanres/entities/hrorg-address/hrorg-address_en_US.ts

@@ -17,6 +17,10 @@ export default {
 			caption: "组织地址",
       		title: "组织地址表格视图",
 		},
+		v_001: {
+			caption: "组织地址嵌入组织",
+      		title: "组织地址嵌入组织",
+		},
 		editview: {
 			caption: "组织地址",
       		title: "组织地址编辑视图",
@@ -61,6 +65,52 @@ 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",
+		},
+	},
 	gridviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "New",
@@ -119,50 +169,4 @@ export default {
 			tip: "Help",
 		},
 	},
-	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/hrorg-address/hrorg-address_zh_CN.ts

@@ -16,6 +16,10 @@ export default {
 			caption: "组织地址",
       		title: "组织地址表格视图",
 		},
+		v_001: {
+			caption: "组织地址嵌入组织",
+      		title: "组织地址嵌入组织",
+		},
 		editview: {
 			caption: "组织地址",
       		title: "组织地址编辑视图",
@@ -60,6 +64,52 @@ 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: "帮助",
+		},
+	},
 	gridviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "新建",
@@ -118,50 +168,4 @@ 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/locale/lanres/entities/hrorg-contact/hrorg-contact_en_US.ts

@@ -20,6 +20,10 @@ export default {
 			caption: "组织联系信息",
       		title: "组织联系信息表格视图",
 		},
+		v_001: {
+			caption: "组织联系信息嵌入组织",
+      		title: "组织联系信息嵌入组织",
+		},
 	},
 	main_form: {
 		details: {

app_PIM/src/locale/lanres/entities/hrorg-contact/hrorg-contact_zh_CN.ts

@@ -19,6 +19,10 @@ export default {
 			caption: "组织联系信息",
       		title: "组织联系信息表格视图",
 		},
+		v_001: {
+			caption: "组织联系信息嵌入组织",
+      		title: "组织联系信息嵌入组织",
+		},
 	},
 	main_form: {
 		details: {

app_PIM/src/mock/viewconfig/viewconfig.ts

@@ -55,6 +55,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "HROrgAddressGridView",
             "viewtag": "2b64c322042da1808776304d21c90e45"
         },
+        "hrorgaddressv_001": {
+            "title": "组织地址嵌入组织",
+            "caption": "组织地址嵌入组织",
+            "viewtype": "DEGRIDVIEW9",
+            "viewmodule": "Base",
+            "viewname": "HROrgAddressV_001",
+            "viewtag": "3110aca6f6c27996e9874cfb924c569f"
+        },
         "hrlegalgridview": {
             "title": "法人",
             "caption": "法人",
@@ -79,6 +87,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "HROrgContactGridView",
             "viewtag": "53de2c13a619e20769cdc9dbfa10e1a5"
         },
+        "hrorgcontactv_001": {
+            "title": "组织联系信息嵌入组织",
+            "caption": "组织联系信息嵌入组织",
+            "viewtype": "DEGRIDVIEW9",
+            "viewmodule": "Base",
+            "viewname": "HROrgContactV_001",
+            "viewtag": "7692fb3c8e0208004f100d2da5db17e0"
+        },
         "hrorgaddresseditview": {
             "title": "组织地址编辑视图",
             "caption": "组织地址",

app_PIM/src/pages/base/hrlegal-tab-exp-view/hrlegal-tab-exp-view-base.tsx

@@ -102,7 +102,7 @@ export class HRLegalTabExpViewBase extends TabExpViewBase {
         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: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'SINGLEKEY', class: '' } },
+        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: '' } },
 
         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: '' } },

app_PIM/src/pages/base/hrorg-address-v-001/hrorg-address-v-001-base.tsx

+
+import { Subject } from 'rxjs';
+import { GridView9Base } from '@/studio-core';
+import HROrgAddressService from '@/service/hrorg-address/hrorg-address-service';
+import HROrgAddressAuthService from '@/authservice/hrorg-address/hrorg-address-auth-service';
+import GridView9Engine from '@engine/view/grid-view9-engine';
+import HROrgAddressUIService from '@/uiservice/hrorg-address/hrorg-address-ui-service';
+import CodeListService from "@service/app/codelist-service";
+
+
+/**
+ * 组织地址嵌入组织视图基类
+ *
+ * @export
+ * @class HROrgAddressV_001Base
+ * @extends {GridView9Base}
+ */
+export class HROrgAddressV_001Base extends GridView9Base {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof HROrgAddressV_001Base
+     */
+    protected appDeName: string = 'hrorgaddress';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof HROrgAddressV_001Base
+     */
+    protected appDeKey: string = 'hrorgaddressid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof HROrgAddressV_001Base
+     */
+    protected appDeMajor: string = 'hrorgaddressname';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {HROrgAddressService}
+     * @memberof HROrgAddressV_001Base
+     */
+    protected appEntityService: HROrgAddressService = new HROrgAddressService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type HROrgAddressUIService
+     * @memberof HROrgAddressV_001Base
+     */
+    public appUIService: HROrgAddressUIService = new HROrgAddressUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof HROrgAddressV_001Base
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof HROrgAddressV_001Base
+     */
+    protected model: any = {
+        srfCaption: 'entities.hrorgaddress.views.v_001.caption',
+        srfTitle: 'entities.hrorgaddress.views.v_001.title',
+        srfSubTitle: 'entities.hrorgaddress.views.v_001.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof HROrgAddressV_001Base
+     */
+    protected containerModel: any = {
+        view_grid: { name: 'grid', type: 'GRID' },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '3110aca6f6c27996e9874cfb924c569f';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof HROrgAddressV_001Base
+     */
+    public engine: GridView9Engine = new GridView9Engine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof HROrgAddressV_001Base
+     */
+    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);
+            },
+            grid: this.$refs.grid,
+            keyPSDEField: 'hrorgaddress',
+            majorPSDEField: 'hrorgaddressname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * grid 部件 selectionchange 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HROrgAddressV_001Base
+     */
+    public grid_selectionchange($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'selectionchange', $event);
+    }
+
+    /**
+     * grid 部件 beforeload 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HROrgAddressV_001Base
+     */
+    public grid_beforeload($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'beforeload', $event);
+    }
+
+    /**
+     * grid 部件 rowdblclick 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HROrgAddressV_001Base
+     */
+    public grid_rowdblclick($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
+    }
+
+    /**
+     * grid 部件 remove 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HROrgAddressV_001Base
+     */
+    public grid_remove($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'remove', $event);
+    }
+
+    /**
+     * grid 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HROrgAddressV_001Base
+     */
+    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 HROrgAddressV_001
+     */
+    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]);
+        }
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' },
+        ];
+        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: 'hrorg-address-edit-view', 
+            height: 0, 
+            width: 800,  
+            title: this.$t('entities.hrorgaddress.views.editview.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
+    }
+
+
+}
\ No newline at end of file

app_PIM/src/pages/base/hrorg-address-v-001/hrorg-address-v-001.html

+<studio-embed-view-style2 viewName="hrorgaddressv_001" viewTitle="组织地址嵌入组织" class='degridview9 hrorg-address-v-001'>
+    <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"
+        :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/base/hrorg-address-v-001/hrorg-address-v-001.vue

+<template src="./hrorg-address-v-001.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { HROrgAddressV_001Base } from './hrorg-address-v-001-base';
+import view_grid from '@widgets/hrorg-address/main-grid/main-grid.vue';
+
+/**
+ * 组织地址嵌入组织视图
+ *
+ * @export
+ * @class HROrgAddressV_001
+ * @extends {HROrgAddressV_001Base}
+ */
+@Component({
+    components: {
+        view_grid, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class HROrgAddressV_001 extends HROrgAddressV_001Base { }
+</script>

app_PIM/src/pages/base/hrorg-contact-v-001/hrorg-contact-v-001-base.tsx

+
+import { Subject } from 'rxjs';
+import { GridView9Base } from '@/studio-core';
+import HROrgContactService from '@/service/hrorg-contact/hrorg-contact-service';
+import HROrgContactAuthService from '@/authservice/hrorg-contact/hrorg-contact-auth-service';
+import GridView9Engine from '@engine/view/grid-view9-engine';
+import HROrgContactUIService from '@/uiservice/hrorg-contact/hrorg-contact-ui-service';
+import CodeListService from "@service/app/codelist-service";
+
+
+/**
+ * 组织联系信息嵌入组织视图基类
+ *
+ * @export
+ * @class HROrgContactV_001Base
+ * @extends {GridView9Base}
+ */
+export class HROrgContactV_001Base extends GridView9Base {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof HROrgContactV_001Base
+     */
+    protected appDeName: string = 'hrorgcontact';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof HROrgContactV_001Base
+     */
+    protected appDeKey: string = 'hrorgcontactid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof HROrgContactV_001Base
+     */
+    protected appDeMajor: string = 'hrorgcontactname';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {HROrgContactService}
+     * @memberof HROrgContactV_001Base
+     */
+    protected appEntityService: HROrgContactService = new HROrgContactService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type HROrgContactUIService
+     * @memberof HROrgContactV_001Base
+     */
+    public appUIService: HROrgContactUIService = new HROrgContactUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof HROrgContactV_001Base
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof HROrgContactV_001Base
+     */
+    protected model: any = {
+        srfCaption: 'entities.hrorgcontact.views.v_001.caption',
+        srfTitle: 'entities.hrorgcontact.views.v_001.title',
+        srfSubTitle: 'entities.hrorgcontact.views.v_001.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof HROrgContactV_001Base
+     */
+    protected containerModel: any = {
+        view_grid: { name: 'grid', type: 'GRID' },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '7692fb3c8e0208004f100d2da5db17e0';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof HROrgContactV_001Base
+     */
+    public engine: GridView9Engine = new GridView9Engine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof HROrgContactV_001Base
+     */
+    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: 'hrorgcontact',
+            majorPSDEField: 'hrorgcontactname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * grid 部件 selectionchange 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HROrgContactV_001Base
+     */
+    public grid_selectionchange($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'selectionchange', $event);
+    }
+
+    /**
+     * grid 部件 beforeload 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HROrgContactV_001Base
+     */
+    public grid_beforeload($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'beforeload', $event);
+    }
+
+    /**
+     * grid 部件 rowdblclick 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HROrgContactV_001Base
+     */
+    public grid_rowdblclick($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
+    }
+
+    /**
+     * grid 部件 remove 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HROrgContactV_001Base
+     */
+    public grid_remove($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'remove', $event);
+    }
+
+    /**
+     * grid 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HROrgContactV_001Base
+     */
+    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 HROrgContactV_001
+     */
+    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.hrorgcontact;
+        if(args.length >0){
+            Object.assign(tempContext,args[0]);
+        }
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
+        ];
+        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: 'hrorg-contact-edit-view', 
+            height: 0, 
+            width: 800,  
+            title: this.$t('entities.hrorgcontact.views.editview.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
+    }
+
+
+    /**
+     * 打开编辑数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof HROrgContactV_001
+     */
+    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]);
+        }
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
+        ];
+        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: 'hrorg-contact-edit-view', 
+            height: 0, 
+            width: 800,  
+            title: this.$t('entities.hrorgcontact.views.editview.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
+    }
+
+
+}
\ No newline at end of file

app_PIM/src/pages/base/hrorg-contact-v-001/hrorg-contact-v-001.html

+<studio-embed-view-style2 viewName="hrorgcontactv_001" viewTitle="组织联系信息嵌入组织" class='degridview9 hrorg-contact-v-001'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isGridSingleSelect"
+        :showBusyIndicator="true"
+        :isOpenEdit="false"
+        :gridRowActiveMode="gridRowActiveMode"
+        @save="onSave.apply(_self, arguments)"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchDefault"
+        :newdata="newdata.bind(_self)"
+        :opendata="opendata.bind(_self)"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @remove="grid_remove($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-embed-view-style2>
\ No newline at end of file

app_PIM/src/pages/base/hrorg-contact-v-001/hrorg-contact-v-001.vue

+<template src="./hrorg-contact-v-001.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { HROrgContactV_001Base } from './hrorg-contact-v-001-base';
+import view_grid from '@widgets/hrorg-contact/main-grid/main-grid.vue';
+
+/**
+ * 组织联系信息嵌入组织视图
+ *
+ * @export
+ * @class HROrgContactV_001
+ * @extends {HROrgContactV_001Base}
+ */
+@Component({
+    components: {
+        view_grid, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class HROrgContactV_001 extends HROrgContactV_001Base { }
+</script>

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

@@ -14,6 +14,8 @@ export const PageComponents = {
         Vue.component('hremployee-edit-view', () => import('@pages/human-resource/hremployee-edit-view/hremployee-edit-view.vue'));
         Vue.component('hremployee-grid-view', () => import('@pages/human-resource/hremployee-grid-view/hremployee-grid-view.vue'));
         Vue.component('hrlegal-tab-exp-view', () => import('@pages/base/hrlegal-tab-exp-view/hrlegal-tab-exp-view.vue'));
+        Vue.component('hrorg-contact-v-001', () => import('@pages/base/hrorg-contact-v-001/hrorg-contact-v-001.vue'));
+        Vue.component('hrorg-address-v-001', () => import('@pages/base/hrorg-address-v-001/hrorg-address-v-001.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'));
     }

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

@@ -239,6 +239,34 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/hrlegal-tab-exp-view/hrlegal-tab-exp-view.vue'),
                 },
+                {
+                    path: 'hrorgcontacts/:hrorgcontact?/v_001/:v_001?',
+                    meta: {
+                        caption: 'entities.hrorgcontact.views.v_001.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
+                            { pathName: 'v_001', parameterName: 'v_001' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/hrorg-contact-v-001/hrorg-contact-v-001.vue'),
+                },
+                {
+                    path: 'hrorgaddresses/:hrorgaddress?/v_001/:v_001?',
+                    meta: {
+                        caption: 'entities.hrorgaddress.views.v_001.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' },
+                            { pathName: 'v_001', parameterName: 'v_001' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/hrorg-address-v-001/hrorg-address-v-001.vue'),
+                },
                 {
                     path: 'hrlegals/:hrlegal?/dashboardview/:dashboardview?',
                     meta: {

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

@@ -63,6 +63,16 @@ export const viewstate: any = {
                 '90f2bd2f58c482b25a1e1db0f8e4ca26',
             ],
         },
+        {
+            viewtag: '3110aca6f6c27996e9874cfb924c569f',
+            viewmodule: 'Base',
+            viewname: 'HROrgAddressV_001',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '90f2bd2f58c482b25a1e1db0f8e4ca26',
+            ],
+        },
         {
             viewtag: '41036146909ab3f28ff59b80370514b2',
             viewmodule: 'Base',
@@ -97,6 +107,16 @@ export const viewstate: any = {
                 '0515a652f1ba4326ef610f1d98be95c8',
             ],
         },
+        {
+            viewtag: '7692fb3c8e0208004f100d2da5db17e0',
+            viewmodule: 'Base',
+            viewname: 'HROrgContactV_001',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '0515a652f1ba4326ef610f1d98be95c8',
+            ],
+        },
         {
             viewtag: '90f2bd2f58c482b25a1e1db0f8e4ca26',
             viewmodule: 'Base',
@@ -113,6 +133,8 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '7692fb3c8e0208004f100d2da5db17e0',
+                '3110aca6f6c27996e9874cfb924c569f',
             ],
         },
         {

app_PIM/src/uiservice/hrorg-address/hrorg-address-ui-service-base.ts

@@ -90,6 +90,7 @@ export default class HROrgAddressUIServiceBase extends UIService {
      */  
     public initViewMap(){
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'hrorgaddresses'});
+        this.allViewMap.set(':',{viewname:'v_001',srfappde:'hrorgaddresses'});
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'hrorgaddresses'});
     }
 

app_PIM/src/uiservice/hrorg-contact/hrorg-contact-ui-service-base.ts

@@ -91,6 +91,7 @@ export default class HROrgContactUIServiceBase extends UIService {
     public initViewMap(){
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'hrorgcontacts'});
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'hrorgcontacts'});
+        this.allViewMap.set(':',{viewname:'v_001',srfappde:'hrorgcontacts'});
     }
 
     /**

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

@@ -58,6 +58,15 @@ export class IF_001EditFormBase extends EditFormControlBase {
     public appUIService:HRLegalUIService = new HRLegalUIService(this.$store);
 
 
+    /**
+     * 关系界面数量
+     *
+     * @protected
+     * @type {number}
+     * @memberof IF_001EditFormBase
+     */
+    protected drCount: number = 2;
+
     /**
      * 表单数据对象
      *
@@ -114,7 +123,13 @@ export class IF_001EditFormBase extends EditFormControlBase {
 
         grouppanel1: new FormGroupPanelModel({ caption: '银行账号信息', detailType: 'GROUPPANEL', name: 'grouppanel1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrlegal.if_001_form', extractMode: 'ITEM', details: [] } }),
 
-        grouppanel2: new FormGroupPanelModel({ caption: '备注', detailType: 'GROUPPANEL', name: 'grouppanel2', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hrlegal.if_001_form', extractMode: 'ITEM', details: [] } }),
+        druipart1: new FormDRUIPartModel({ caption: '', detailType: 'DRUIPART', name: 'druipart1', 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.hrlegal.if_001_form', extractMode: 'ITEM', details: [] } }),
+
+        druipart2: new FormDRUIPartModel({ caption: '', detailType: 'DRUIPART', name: 'druipart2', 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.hrlegal.if_001_form', extractMode: 'ITEM', details: [] } }),
 
         formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
 
@@ -148,7 +163,7 @@ export class IF_001EditFormBase extends EditFormControlBase {
 
         uscc: new FormItemModel({ caption: '统一社会信用代码', detailType: 'FORMITEM', name: 'uscc', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        memo: new FormItemModel({ caption: '备注', detailType: 'FORMITEM', name: 'memo', visible: true, isShowCaption: false, 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 }),
 
         legalid: new FormItemModel({ caption: '法人标识', detailType: 'FORMITEM', name: 'legalid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

app_PIM/src/widgets/hrlegal/if-001-form/if-001-form.html

@@ -84,6 +84,16 @@
 
 </app-form-item>
 
+</i-col>
+<i-col class="form-layout-container" v-show="detailsModel.memo.visible" :style="{}"  :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
+    <app-form-item name='memo' :itemRules="this.rules.memo" class='' :caption="$t('entities.hrlegal.if_001_form.details.memo')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.memo.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-span name='memo' :value="data.memo" dataType="INHERIT"     :precision="0"
+:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
+</app-span>
+
+</app-form-item>
+
 </i-col>
     
     </row>
@@ -94,14 +104,63 @@
     <app-form-group :model="detailsModel.grouppanel2" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hrlegal.if_001_form.details.grouppanel2')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="true" >    
     <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.grouppanel2" :data="data" :context="context" :viewparams="viewparams"/>
     <row>
-        <i-col class="form-layout-container" v-show="detailsModel.memo.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='memo' :itemRules="this.rules.memo" class='' :caption="$t('entities.hrlegal.if_001_form.details.memo')" uiStyle="DEFAULT" :labelWidth="0" :isShowCaption="false" :error="detailsModel.memo.error" :isEmptyCaption="false" labelPos="NONE">
+        <i-col class="form-layout-container" v-show="detailsModel.druipart1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-druipart
     
-<app-span name='memo' :value="data.memo" dataType="INHERIT"     :precision="0"
-:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
-</app-span>
+    :formState="formState"
+    :isForbidLoad="this.data.srfuf === '0'"
+    paramItem='hrlegal' 
+    :parentdata='{"srfparentdename":"HRLEGAL","SRFPARENTTYPE":"CUSTOM"}'
+    :parameters="[
+    ]"
+    :context="context"
+    :viewparams="viewparams"
+    :localContext ='{}'
+    :localParam ='{}'
+    parameterName='hrlegal'
+    parentName="HRLegal"  
+    refviewtype='DEGRIDVIEW9' 
+    refreshitems='' 
+    :ignorefieldvaluechange="ignorefieldvaluechange"
+    viewname='hrorg-address-v-001' 
+    :data="JSON.stringify(this.data)" 
+    @drdatasaved="drdatasaved($event)"
+    style="overflow: auto;">
+</app-form-druipart>
 
-</app-form-item>
+</i-col>
+    
+    </row>
+</app-form-group>
+
+</i-col>
+<i-col class="form-layout-container" v-show="detailsModel.grouppanel3.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-group :model="detailsModel.grouppanel3" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel3.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hrlegal.if_001_form.details.grouppanel3')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
+    <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.grouppanel3" :data="data" :context="context" :viewparams="viewparams"/>
+    <row>
+        <i-col class="form-layout-container" v-show="detailsModel.druipart2.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-druipart
+    
+    :formState="formState"
+    :isForbidLoad="this.data.srfuf === '0'"
+    paramItem='hrlegal' 
+    :parentdata='{"srfparentdename":"HRLEGAL","SRFPARENTTYPE":"CUSTOM"}'
+    :parameters="[
+    ]"
+    :context="context"
+    :viewparams="viewparams"
+    :localContext ='{}'
+    :localParam ='{}'
+    parameterName='hrlegal'
+    parentName="HRLegal"  
+    refviewtype='DEGRIDVIEW9' 
+    refreshitems='' 
+    :ignorefieldvaluechange="ignorefieldvaluechange"
+    viewname='hrorg-contact-v-001' 
+    :data="JSON.stringify(this.data)" 
+    @drdatasaved="drdatasaved($event)"
+    style="overflow: auto;">
+</app-form-druipart>
 
 </i-col>
     

app_PIM/src/widgets/hrorg-address/main-grid/main-grid-model.ts

@@ -66,7 +66,6 @@ export default class MainModel {
           name: 'hrorgaddress',
           prop: 'hrorgaddressid',
         },
-
         {
           name:'size',
           prop:'size'

app_PIM/src/widgets/hrorg-contact/main-grid/main-grid-model.ts

@@ -66,7 +66,6 @@ export default class MainModel {
           name: 'hrorgcontact',
           prop: 'hrorgcontactid',
         },
-
         {
           name:'size',
           prop:'size'

humanresource-core/src/main/resources/liquibase/h2_table.xml

@@ -66,7 +66,7 @@
 
 
     <!--输出实体[HRLEGAL]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrlegal-61-4">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrlegal-67-4">
         <createTable tableName="LEGAL">
                 <column name="LEGALNAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -202,7 +202,7 @@
 
 
     <!--输出实体[HRORGADDRESS]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrorgaddress-21-10">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrorgaddress-23-10">
         <createTable tableName="T_HRORGADDRESS">
                 <column name="HRORGADDRESSNAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -230,7 +230,7 @@
 
 
     <!--输出实体[HRORGCONTACT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrorgcontact-16-11">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrorgcontact-18-11">
         <createTable tableName="T_HRORGCONTACT">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>