jackwang 部署微服务应用

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

 {
+    "hromhierarchycatpickupgridview": {
+        "title": "结构层次类别选择表格视图",
+        "caption": "结构层次类别",
+        "viewtype": "DEPICKUPGRIDVIEW",
+        "viewmodule": "Base",
+        "viewname": "HROMHierarchyCatPickupGridView",
+        "viewfilename": "hromhierarchy-cat-pickup-grid-view",
+        "viewtag": "045cc74f78937b52db67b8239361d181",
+        "memo": ""
+    },
     "hrorgcontacteditview": {
         "title": "组织联系信息编辑视图",
         "caption": "组织联系信息",
@@ -69,6 +79,16 @@
         "viewtag": "188f3997d02da7fc34bac190ccd439e6",
         "memo": ""
     },
+    "hromhierarchycatmpickupview": {
+        "title": "结构层次类别数据多项选择视图",
+        "caption": "结构层次类别",
+        "viewtype": "DEMPICKUPVIEW",
+        "viewmodule": "Base",
+        "viewname": "HROMHierarchyCatMPickupView",
+        "viewfilename": "hromhierarchy-cat-mpickup-view",
+        "viewtag": "1ed4d12d0ea81013bc2a4f19a2bb17e7",
+        "memo": ""
+    },
     "hroperationunitv_002": {
         "title": "运营单位信息编辑",
         "caption": "运营单位",
@@ -109,6 +129,16 @@
         "viewtag": "2b64c322042da1808776304d21c90e45",
         "memo": "系统自动添加"
     },
+    "hromhierarchycatpickupview": {
+        "title": "结构层次类别数据选择视图",
+        "caption": "结构层次类别",
+        "viewtype": "DEPICKUPVIEW",
+        "viewmodule": "Base",
+        "viewname": "HROMHierarchyCatPickupView",
+        "viewfilename": "hromhierarchy-cat-pickup-view",
+        "viewtag": "2cc9f94bc50095005332a93eb120c828",
+        "memo": ""
+    },
     "hrorgaddressv_001": {
         "title": "组织地址嵌入组织",
         "caption": "组织地址嵌入组织",

app_PIM/src/interface/entity/hromhierarchy.ts

@@ -101,4 +101,12 @@ export interface HROMHierarchy {
      * @memberof HROMHierarchy
      */
     showorder?: any;
+
+    /**
+     * 名称
+     *
+     * @returns {*}
+     * @memberof HROMHierarchy
+     */
+    hromhierarchycatname?: any;
 }
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hromhierarchy-cat/hromhierarchy-cat_en_US.ts

@@ -10,6 +10,10 @@ export default {
     memo: "备注",
   },
 	views: {
+		pickupgridview: {
+			caption: "结构层次类别",
+      		title: "结构层次类别选择表格视图",
+		},
 		gridview: {
 			caption: "结构层次类别",
       		title: "组织层次结构",
@@ -18,6 +22,14 @@ export default {
 			caption: "结构层次类别",
       		title: "结构层次类别编辑视图",
 		},
+		mpickupview: {
+			caption: "结构层次类别",
+      		title: "结构层次类别数据多项选择视图",
+		},
+		pickupview: {
+			caption: "结构层次类别",
+      		title: "结构层次类别数据选择视图",
+		},
 		editview: {
 			caption: "结构层次类别",
       		title: "结构层次类别编辑视图",

app_PIM/src/locale/lanres/entities/hromhierarchy-cat/hromhierarchy-cat_zh_CN.ts

@@ -9,6 +9,10 @@ export default {
     memo: "备注",
   },
 	views: {
+		pickupgridview: {
+			caption: "结构层次类别",
+      		title: "结构层次类别选择表格视图",
+		},
 		gridview: {
 			caption: "结构层次类别",
       		title: "组织层次结构",
@@ -17,6 +21,14 @@ export default {
 			caption: "结构层次类别",
       		title: "结构层次类别编辑视图",
 		},
+		mpickupview: {
+			caption: "结构层次类别",
+      		title: "结构层次类别数据多项选择视图",
+		},
+		pickupview: {
+			caption: "结构层次类别",
+      		title: "结构层次类别数据选择视图",
+		},
 		editview: {
 			caption: "结构层次类别",
       		title: "结构层次类别编辑视图",

app_PIM/src/locale/lanres/entities/hromhierarchy/hromhierarchy_en_US.ts

@@ -13,6 +13,7 @@ export default {
     pomhierarchyname: "上级组织",
     organizationname: "组织名称",
     showorder: "排序号",
+    hromhierarchycatname: "名称",
   },
 	views: {
 		gridview: {
@@ -48,10 +49,12 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
+			hromhierarchycatname: "层次结构类别", 
 			organizationname: "组织名称", 
 			pomhierarchyname: "上级组织", 
 			showorder: "排序号", 
 			pomhierarchyid: "上级层次结构标识", 
+			hromhierarchycatid: "结构层次类别标识", 
 			organizationid: "组织", 
 			omhierarchyid: "组织层次结构标识", 
 		},

app_PIM/src/locale/lanres/entities/hromhierarchy/hromhierarchy_zh_CN.ts

@@ -12,6 +12,7 @@ export default {
     pomhierarchyname: "上级组织",
     organizationname: "组织名称",
     showorder: "排序号",
+    hromhierarchycatname: "名称",
   },
 	views: {
 		gridview: {
@@ -47,10 +48,12 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
+			hromhierarchycatname: "层次结构类别", 
 			organizationname: "组织名称", 
 			pomhierarchyname: "上级组织", 
 			showorder: "排序号", 
 			pomhierarchyid: "上级层次结构标识", 
+			hromhierarchycatid: "结构层次类别标识", 
 			organizationid: "组织", 
 			omhierarchyid: "组织层次结构标识", 
 		},

app_PIM/src/mock/viewconfig/viewconfig.ts

@@ -7,7 +7,15 @@ import Mock from 'mockjs'
 mock.onGet('./assets/json/view-config.json').reply((config: any) => {
     let status = MockAdapter.mockStatus(config);
     return [status,{
-                "hrorgcontacteditview": {
+                "hromhierarchycatpickupgridview": {
+            "title": "结构层次类别选择表格视图",
+            "caption": "结构层次类别",
+            "viewtype": "DEPICKUPGRIDVIEW",
+            "viewmodule": "Base",
+            "viewname": "HROMHierarchyCatPickupGridView",
+            "viewtag": "045cc74f78937b52db67b8239361d181"
+        },
+        "hrorgcontacteditview": {
             "title": "组织联系信息编辑视图",
             "caption": "组织联系信息",
             "viewtype": "DEEDITVIEW",
@@ -63,6 +71,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "HROMHierarchyGridView",
             "viewtag": "188f3997d02da7fc34bac190ccd439e6"
         },
+        "hromhierarchycatmpickupview": {
+            "title": "结构层次类别数据多项选择视图",
+            "caption": "结构层次类别",
+            "viewtype": "DEMPICKUPVIEW",
+            "viewmodule": "Base",
+            "viewname": "HROMHierarchyCatMPickupView",
+            "viewtag": "1ed4d12d0ea81013bc2a4f19a2bb17e7"
+        },
         "hroperationunitv_002": {
             "title": "运营单位信息编辑",
             "caption": "运营单位",
@@ -95,6 +111,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "HROrgAddressGridView",
             "viewtag": "2b64c322042da1808776304d21c90e45"
         },
+        "hromhierarchycatpickupview": {
+            "title": "结构层次类别数据选择视图",
+            "caption": "结构层次类别",
+            "viewtype": "DEPICKUPVIEW",
+            "viewmodule": "Base",
+            "viewname": "HROMHierarchyCatPickupView",
+            "viewtag": "2cc9f94bc50095005332a93eb120c828"
+        },
         "hrorgaddressv_001": {
             "title": "组织地址嵌入组织",
             "caption": "组织地址嵌入组织",

app_PIM/src/pages/base/hromhierarchy-cat-pickup-grid-view/hromhierarchy-cat-pickup-grid-view-base.tsx

+import { Subject } from 'rxjs';
+import { PickupGridViewBase } from '@/studio-core';
+import HROMHierarchyCatService from '@/service/hromhierarchy-cat/hromhierarchy-cat-service';
+import HROMHierarchyCatAuthService from '@/authservice/hromhierarchy-cat/hromhierarchy-cat-auth-service';
+import PickupGridViewEngine from '@engine/view/pickup-grid-view-engine';
+import HROMHierarchyCatUIService from '@/uiservice/hromhierarchy-cat/hromhierarchy-cat-ui-service';
+
+/**
+ * 结构层次类别选择表格视图视图基类
+ *
+ * @export
+ * @class HROMHierarchyCatPickupGridViewBase
+ * @extends {PickupGridViewBase}
+ */
+export class HROMHierarchyCatPickupGridViewBase extends PickupGridViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof HROMHierarchyCatPickupGridViewBase
+     */
+    protected appDeName: string = 'hromhierarchycat';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof HROMHierarchyCatPickupGridViewBase
+     */
+    protected appDeKey: string = 'omhierarchycatid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof HROMHierarchyCatPickupGridViewBase
+     */
+    protected appDeMajor: string = 'omhierarchycatname';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {HROMHierarchyCatService}
+     * @memberof HROMHierarchyCatPickupGridViewBase
+     */
+    protected appEntityService: HROMHierarchyCatService = new HROMHierarchyCatService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type HROMHierarchyCatUIService
+     * @memberof HROMHierarchyCatPickupGridViewBase
+     */
+    public appUIService: HROMHierarchyCatUIService = new HROMHierarchyCatUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof HROMHierarchyCatPickupGridViewBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof HROMHierarchyCatPickupGridViewBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.hromhierarchycat.views.pickupgridview.caption',
+        srfTitle: 'entities.hromhierarchycat.views.pickupgridview.title',
+        srfSubTitle: 'entities.hromhierarchycat.views.pickupgridview.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof HROMHierarchyCatPickupGridViewBase
+     */
+    protected containerModel: any = {
+        view_grid: { name: 'grid', type: 'GRID' },
+        view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '045cc74f78937b52db67b8239361d181';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof HROMHierarchyCatPickupGridViewBase
+     */
+    public engine: PickupGridViewEngine = new PickupGridViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof HROMHierarchyCatPickupGridViewBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            grid: this.$refs.grid,
+            searchform: this.$refs.searchform,
+            keyPSDEField: 'hromhierarchycat',
+            majorPSDEField: 'omhierarchycatname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * grid 部件 selectionchange 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HROMHierarchyCatPickupGridViewBase
+     */
+    public grid_selectionchange($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'selectionchange', $event);
+    }
+
+    /**
+     * grid 部件 beforeload 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HROMHierarchyCatPickupGridViewBase
+     */
+    public grid_beforeload($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'beforeload', $event);
+    }
+
+    /**
+     * grid 部件 rowdblclick 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HROMHierarchyCatPickupGridViewBase
+     */
+    public grid_rowdblclick($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
+    }
+
+    /**
+     * grid 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HROMHierarchyCatPickupGridViewBase
+     */
+    public grid_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'load', $event);
+    }
+
+    /**
+     * searchform 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HROMHierarchyCatPickupGridViewBase
+     */
+    public searchform_save($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('searchform', 'save', $event);
+    }
+
+    /**
+     * searchform 部件 search 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HROMHierarchyCatPickupGridViewBase
+     */
+    public searchform_search($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('searchform', 'search', $event);
+    }
+
+    /**
+     * searchform 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HROMHierarchyCatPickupGridViewBase
+     */
+    public searchform_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('searchform', 'load', $event);
+    }
+
+
+
+    /**
+     * 是否展开搜索表单
+     *
+     * @protected
+     * @type {boolean}
+     * @memberof HROMHierarchyCatPickupGridViewBase
+     */
+    protected isExpandSearchForm: boolean = true;
+
+
+}
\ No newline at end of file

app_PIM/src/pages/base/hromhierarchy-cat-pickup-grid-view/hromhierarchy-cat-pickup-grid-view.html

+<studio-view-style2 viewName="hromhierarchycatpickupgridview" viewTitle="结构层次类别选择表格视图" class='depickupgridview hromhierarchy-cat-pickup-grid-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <template slot="searchForm">
+                <view_searchform 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :showBusyIndicator="true"
+            v-show="isExpandSearchForm"
+            loaddraftAction="FilterGetDraft"
+            loadAction="FilterGet"
+        
+            name="searchform"  
+            ref='searchform' 
+            @save="searchform_save($event)"  
+            @search="searchform_search($event)"  
+            @load="searchform_load($event)"  
+            @closeview="closeView($event)">
+        </view_searchform>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isGridSingleSelect"
+        :selectedData="selectedData"
+        :showBusyIndicator="true"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchDefault"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view-style2>
\ No newline at end of file

app_PIM/src/pages/base/hromhierarchy-cat-pickup-grid-view/hromhierarchy-cat-pickup-grid-view.vue

+<template src="./hromhierarchy-cat-pickup-grid-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { HROMHierarchyCatPickupGridViewBase } from './hromhierarchy-cat-pickup-grid-view-base';
+import view_grid from '@widgets/hromhierarchy-cat/main-grid/main-grid.vue';
+import view_searchform from '@widgets/hromhierarchy-cat/default-searchform/default-searchform.vue';
+
+/**
+ * 结构层次类别选择表格视图视图
+ *
+ * @export
+ * @class HROMHierarchyCatPickupGridView
+ * @extends {HROMHierarchyCatPickupGridViewBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class HROMHierarchyCatPickupGridView extends HROMHierarchyCatPickupGridViewBase { }
+</script>

app_PIM/src/pages/base/hromhierarchy-cat-pickup-view/hromhierarchy-cat-pickup-view-base.tsx

+import { Subject } from 'rxjs';
+import { PickupViewBase } from '@/studio-core';
+import HROMHierarchyCatService from '@/service/hromhierarchy-cat/hromhierarchy-cat-service';
+import HROMHierarchyCatAuthService from '@/authservice/hromhierarchy-cat/hromhierarchy-cat-auth-service';
+import PickupViewEngine from '@engine/view/pickup-view-engine';
+import HROMHierarchyCatUIService from '@/uiservice/hromhierarchy-cat/hromhierarchy-cat-ui-service';
+
+/**
+ * 结构层次类别数据选择视图视图基类
+ *
+ * @export
+ * @class HROMHierarchyCatPickupViewBase
+ * @extends {PickupViewBase}
+ */
+export class HROMHierarchyCatPickupViewBase extends PickupViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof HROMHierarchyCatPickupViewBase
+     */
+    protected appDeName: string = 'hromhierarchycat';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof HROMHierarchyCatPickupViewBase
+     */
+    protected appDeKey: string = 'omhierarchycatid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof HROMHierarchyCatPickupViewBase
+     */
+    protected appDeMajor: string = 'omhierarchycatname';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {HROMHierarchyCatService}
+     * @memberof HROMHierarchyCatPickupViewBase
+     */
+    protected appEntityService: HROMHierarchyCatService = new HROMHierarchyCatService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type HROMHierarchyCatUIService
+     * @memberof HROMHierarchyCatPickupViewBase
+     */
+    public appUIService: HROMHierarchyCatUIService = new HROMHierarchyCatUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof HROMHierarchyCatPickupViewBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof HROMHierarchyCatPickupViewBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.hromhierarchycat.views.pickupview.caption',
+        srfTitle: 'entities.hromhierarchycat.views.pickupview.title',
+        srfSubTitle: 'entities.hromhierarchycat.views.pickupview.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof HROMHierarchyCatPickupViewBase
+     */
+    protected containerModel: any = {
+        view_pickupviewpanel: { name: 'pickupviewpanel', type: 'PICKUPVIEWPANEL' },
+        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 = '2cc9f94bc50095005332a93eb120c828';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof HROMHierarchyCatPickupViewBase
+     */
+    public engine: PickupViewEngine = new PickupViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof HROMHierarchyCatPickupViewBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            pickupviewpanel: this.$refs.pickupviewpanel,
+            keyPSDEField: 'hromhierarchycat',
+            majorPSDEField: 'omhierarchycatname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * pickupviewpanel 部件 selectionchange 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HROMHierarchyCatPickupViewBase
+     */
+    public pickupviewpanel_selectionchange($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('pickupviewpanel', 'selectionchange', $event);
+    }
+
+    /**
+     * pickupviewpanel 部件 activated 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HROMHierarchyCatPickupViewBase
+     */
+    public pickupviewpanel_activated($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('pickupviewpanel', 'activated', $event);
+    }
+
+    /**
+     * pickupviewpanel 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HROMHierarchyCatPickupViewBase
+     */
+    public pickupviewpanel_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('pickupviewpanel', 'load', $event);
+    }
+
+
+}
\ No newline at end of file

app_PIM/src/pages/base/hromhierarchy-cat-pickup-view/hromhierarchy-cat-pickup-view.html

+<studio-view-style2 viewName="hromhierarchycatpickupview" viewTitle="结构层次类别数据选择视图" class='depickupview hromhierarchy-cat-pickup-view'>
+    <div class="content-container pickup-view">
+                <view_pickupviewpanel 
+                    :viewState="viewState"  
+                    :viewparams="JSON.parse(JSON.stringify(viewparams))" 
+                    :context="JSON.parse(JSON.stringify(context))" 
+                    :isSingleSelect="isSingleSelect"
+                    :selectedData="selectedData"
+                    :isShowButton="isShowButton"
+                    name="pickupviewpanel"  
+                    ref='pickupviewpanel' 
+                    @selectionchange="pickupviewpanel_selectionchange($event)"  
+                    @activated="pickupviewpanel_activated($event)"  
+                    @load="pickupviewpanel_load($event)"  
+                    @closeview="closeView($event)">
+                </view_pickupviewpanel>
+        </div>
+        <template slot="footer">
+            <div v-if="isShowButton" :style="{ textAlign: 'right' }">
+                <i-button type="primary" :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk.apply(_self, arguments)">{{this.containerModel.view_okbtn.text}}</i-button>
+                    &nbsp;&nbsp;
+                <i-button @click="onClickCancel.apply(_self, arguments)">{{this.containerModel.view_cancelbtn.text}}</i-button>
+            </div>
+        </template>
+</studio-view-style2>
\ No newline at end of file

app_PIM/src/pages/base/hromhierarchy-cat-pickup-view/hromhierarchy-cat-pickup-view.vue

+<template src="./hromhierarchy-cat-pickup-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { HROMHierarchyCatPickupViewBase } from './hromhierarchy-cat-pickup-view-base';
+import view_pickupviewpanel from '@widgets/hromhierarchy-cat/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.vue';
+
+/**
+ * 结构层次类别数据选择视图视图
+ *
+ * @export
+ * @class HROMHierarchyCatPickupView
+ * @extends {HROMHierarchyCatPickupViewBase}
+ */
+@Component({
+    components: {
+        view_pickupviewpanel, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class HROMHierarchyCatPickupView extends HROMHierarchyCatPickupViewBase { }
+</script>

app_PIM/src/pages/base/hromhierarchy-grid-view/hromhierarchy-grid-view-base.tsx

@@ -526,40 +526,29 @@ export class HROMHierarchyGridViewBase extends GridViewBase {
     public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
         let localContext:any = null;
         let localViewParam:any =null;
-        let batchAddPSAppViews:Array<any>=[];
-        batchAddPSAppViews=[
-            {view:{viewname:'hrorganization-mpickup-view',height: 0,width: 0,title: '组织数据多项选择视图'},
-            res:[],
-            'resAppKey':''}
-        ];
-        if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
-            this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });
-            return;
+        const data: any = {};
+        if(args[0].srfsourcekey){
+            data.srfsourcekey = args[0].srfsourcekey;
         }
-        let openViewModel:any = batchAddPSAppViews.find((item:any) =>{
-            return (item.res && (item.res[0] !== this.context.srfparentdename));
-        })
-        let otherViewModel:any = batchAddPSAppViews.find((item:any) =>{
-            return (item.res && (item.res[0] == this.context.srfparentdename));
-        })
-        let container: Subject<any> = this.$appmodal.openModal(openViewModel.view, JSON.parse(JSON.stringify(this.context)), args[0]);
-        container.subscribe((result: any) => {
-            if (!result || !Object.is(result.ret, 'OK')) {
-                return;
-            }
-            if(result.datas && result.datas.length == 0){
-                return;
-            }
-            let requestParam:Array<any> = [];
-            result.datas.forEach((record:any) => {
-                let tempParam:any = {};
-                tempParam[otherViewModel.resAppKey] = this.context['srfparentkey'];
-                tempParam[openViewModel.resAppKey] = record.srfkey;
-                requestParam.push(tempParam);
-            });
-            this.appEntityService.createBatch(JSON.parse(JSON.stringify(this.context)),requestParam,true).then((response:any) =>{
-                if (!response || response.status !== 200) {
-                    this.$Notice.error({ title: '错误', desc: '批处理操作失败' });
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        delete tempContext.hromhierarchy;
+        if(args.length >0){
+            Object.assign(tempContext,args[0]);
+        }
+        let deResParameters: any[] = [];
+        if(tempContext.hromhierarchycat && true){
+            deResParameters = [
+            { pathName: 'hromhierarchycats', parameterName: 'hromhierarchycat' },
+            ]
+        }
+        const parameters: any[] = [
+            { pathName: 'hromhierarchies', parameterName: 'hromhierarchy' },
+        ];
+        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)) {
@@ -567,7 +556,15 @@ export class HROMHierarchyGridViewBase extends GridViewBase {
                 }
                 xData.refresh(result.datas);
             });
-        });
+        }
+        const view: any = {
+            viewname: 'hromhierarchy-edit-view', 
+            height: 0, 
+            width: 600,  
+            title: this.$t('entities.hromhierarchy.views.editview.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
     }
 
 

app_PIM/src/pages/base/hromhierarchy-tree-exp-view/hromhierarchy-tree-exp-view-base.tsx

@@ -173,43 +173,7 @@ export class HROMHierarchyTreeExpViewBase extends TreeExpViewBase {
     public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
         let localContext:any = null;
         let localViewParam:any =null;
-        let batchAddPSAppViews:Array<any>=[];
-        if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
-            this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });
-            return;
-        }
-        let openViewModel:any = batchAddPSAppViews.find((item:any) =>{
-            return (item.res && (item.res[0] !== this.context.srfparentdename));
-        })
-        let otherViewModel:any = batchAddPSAppViews.find((item:any) =>{
-            return (item.res && (item.res[0] == this.context.srfparentdename));
-        })
-        let container: Subject<any> = this.$appmodal.openModal(openViewModel.view, JSON.parse(JSON.stringify(this.context)), args[0]);
-        container.subscribe((result: any) => {
-            if (!result || !Object.is(result.ret, 'OK')) {
-                return;
-            }
-            if(result.datas && result.datas.length == 0){
-                return;
-            }
-            let requestParam:Array<any> = [];
-            result.datas.forEach((record:any) => {
-                let tempParam:any = {};
-                tempParam[otherViewModel.resAppKey] = this.context['srfparentkey'];
-                tempParam[openViewModel.resAppKey] = record.srfkey;
-                requestParam.push(tempParam);
-            });
-            this.appEntityService.createBatch(JSON.parse(JSON.stringify(this.context)),requestParam,true).then((response:any) =>{
-                if (!response || response.status !== 200) {
-                    this.$Notice.error({ title: '错误', desc: '批处理操作失败' });
-                    return;
-                }
-                if (!xData || !(xData.refresh instanceof Function)) {
-                    return;
-                }
-                xData.refresh(result.datas);
-            });
-        });
+    this.$Notice.warning({ title: '错误', desc: '未指定关系视图' });
     }
 
 

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

 export const PageComponents = {
     install(Vue: any, opt: any) {
                 Vue.component('hroperation-unit-edit-view', () => import('@pages/base/hroperation-unit-edit-view/hroperation-unit-edit-view.vue'));
-        Vue.component('hrorganization-mpickup-view', () => import('@pages/base/hrorganization-mpickup-view/hrorganization-mpickup-view.vue'));
         Vue.component('hrorg-address-edit-view', () => import('@pages/base/hrorg-address-edit-view/hrorg-address-edit-view.vue'));
         Vue.component('hrorg-contact-grid-view', () => import('@pages/base/hrorg-contact-grid-view/hrorg-contact-grid-view.vue'));
         Vue.component('hromhierarchy-cat-grid-view', () => import('@pages/base/hromhierarchy-cat-grid-view/hromhierarchy-cat-grid-view.vue'));
@@ -15,15 +14,17 @@ export const PageComponents = {
         Vue.component('hrorg-address-v-001', () => import('@pages/base/hrorg-address-v-001/hrorg-address-v-001.vue'));
         Vue.component('hroperation-unit-dashboard-view', () => import('@pages/base/hroperation-unit-dashboard-view/hroperation-unit-dashboard-view.vue'));
         Vue.component('hromhierarchy-grid-view', () => import('@pages/base/hromhierarchy-grid-view/hromhierarchy-grid-view.vue'));
+        Vue.component('hromhierarchy-cat-pickup-grid-view', () => import('@pages/base/hromhierarchy-cat-pickup-grid-view/hromhierarchy-cat-pickup-grid-view.vue'));
         Vue.component('hroperation-unit-v-002', () => import('@pages/base/hroperation-unit-v-002/hroperation-unit-v-002.vue'));
+        Vue.component('hromhierarchy-cat-pickup-view', () => import('@pages/base/hromhierarchy-cat-pickup-view/hromhierarchy-cat-pickup-view.vue'));
         Vue.component('hrlegal-edit-view', () => import('@pages/base/hrlegal-edit-view/hrlegal-edit-view.vue'));
         Vue.component('hrorganization-pickup-view', () => import('@pages/base/hrorganization-pickup-view/hrorganization-pickup-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('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-tree-exp-view', () => import('@pages/base/hromhierarchy-tree-exp-view/hromhierarchy-tree-exp-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('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('hromhierarchy-cat-v-002', () => import('@pages/base/hromhierarchy-cat-v-002/hromhierarchy-cat-v-002.vue'));

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

@@ -57,20 +57,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/hroperation-unit-edit-view/hroperation-unit-edit-view.vue'),
                 },
-                {
-                    path: 'hrorganizations/:hrorganization?/mpickupview/:mpickupview?',
-                    meta: {
-                        caption: 'entities.hrorganization.views.mpickupview.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
-                            { pathName: 'mpickupview', parameterName: 'mpickupview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/base/hrorganization-mpickup-view/hrorganization-mpickup-view.vue'),
-                },
                 {
                     path: 'hroperationunits/:hroperationunit?/hrorgaddresses/:hrorgaddress?/editview/:editview?',
                     meta: {
@@ -403,6 +389,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/hromhierarchy-grid-view/hromhierarchy-grid-view.vue'),
                 },
+                {
+                    path: 'hromhierarchycats/:hromhierarchycat?/pickupgridview/:pickupgridview?',
+                    meta: {
+                        caption: 'entities.hromhierarchycat.views.pickupgridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hromhierarchycats', parameterName: 'hromhierarchycat' },
+                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/hromhierarchy-cat-pickup-grid-view/hromhierarchy-cat-pickup-grid-view.vue'),
+                },
                 {
                     path: 'hroperationunits/:hroperationunit?/v_002/:v_002?',
                     meta: {
@@ -417,6 +417,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/hroperation-unit-v-002/hroperation-unit-v-002.vue'),
                 },
+                {
+                    path: 'hromhierarchycats/:hromhierarchycat?/pickupview/:pickupview?',
+                    meta: {
+                        caption: 'entities.hromhierarchycat.views.pickupview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hromhierarchycats', parameterName: 'hromhierarchycat' },
+                            { pathName: 'pickupview', parameterName: 'pickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/hromhierarchy-cat-pickup-view/hromhierarchy-cat-pickup-view.vue'),
+                },
                 {
                     path: 'hrlegals/:hrlegal?/editview/:editview?',
                     meta: {
@@ -547,27 +561,27 @@ const router = new Router({
                     component: () => import('@pages/base/hrorg-contact-edit-view/hrorg-contact-edit-view.vue'),
                 },
                 {
-                    path: 'hromhierarchycats/:hromhierarchycat?/hromhierarchies/:hromhierarchy?/treeexpview/:treeexpview?',
+                    path: 'hrlegals/:hrlegal?/gridview/:gridview?',
                     meta: {
-                        caption: 'entities.hromhierarchy.views.treeexpview.title',
+                        caption: 'entities.hrlegal.views.gridview.title',
                         info:'',
                         parameters: [
                             { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hromhierarchycats', parameterName: 'hromhierarchycat' },
-                            { pathName: 'hromhierarchies', parameterName: 'hromhierarchy' },
-                            { pathName: 'treeexpview', parameterName: 'treeexpview' },
+                            { pathName: 'hrlegals', parameterName: 'hrlegal' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/base/hromhierarchy-tree-exp-view/hromhierarchy-tree-exp-view.vue'),
+                    component: () => import('@pages/base/hrlegal-grid-view/hrlegal-grid-view.vue'),
                 },
                 {
-                    path: 'hromhierarchies/:hromhierarchy?/treeexpview/:treeexpview?',
+                    path: 'hromhierarchycats/:hromhierarchycat?/hromhierarchies/:hromhierarchy?/treeexpview/:treeexpview?',
                     meta: {
                         caption: 'entities.hromhierarchy.views.treeexpview.title',
                         info:'',
                         parameters: [
                             { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hromhierarchycats', parameterName: 'hromhierarchycat' },
                             { pathName: 'hromhierarchies', parameterName: 'hromhierarchy' },
                             { pathName: 'treeexpview', parameterName: 'treeexpview' },
                         ],
@@ -576,18 +590,18 @@ const router = new Router({
                     component: () => import('@pages/base/hromhierarchy-tree-exp-view/hromhierarchy-tree-exp-view.vue'),
                 },
                 {
-                    path: 'hrlegals/:hrlegal?/gridview/:gridview?',
+                    path: 'hromhierarchies/:hromhierarchy?/treeexpview/:treeexpview?',
                     meta: {
-                        caption: 'entities.hrlegal.views.gridview.title',
+                        caption: 'entities.hromhierarchy.views.treeexpview.title',
                         info:'',
                         parameters: [
                             { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hrlegals', parameterName: 'hrlegal' },
-                            { pathName: 'gridview', parameterName: 'gridview' },
+                            { pathName: 'hromhierarchies', parameterName: 'hromhierarchy' },
+                            { pathName: 'treeexpview', parameterName: 'treeexpview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/base/hrlegal-grid-view/hrlegal-grid-view.vue'),
+                    component: () => import('@pages/base/hromhierarchy-tree-exp-view/hromhierarchy-tree-exp-view.vue'),
                 },
                 {
                     path: 'hrlegals/:hrlegal?/v_002/:v_002?',

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

@@ -3,6 +3,15 @@
  */
 export const viewstate: any = {
     appviews: [
+        {
+            viewtag: '045cc74f78937b52db67b8239361d181',
+            viewmodule: 'Base',
+            viewname: 'HROMHierarchyCatPickupGridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: '0515a652f1ba4326ef610f1d98be95c8',
             viewmodule: 'Base',
@@ -73,7 +82,6 @@ export const viewstate: any = {
             refviews: [
                 '7933350eca0f8dbcb5402928a860c4ec',
                 '4a61d63445d504cab11cf5f45536b314',
-                '816f119be45e16d278809f590fb65029',
             ],
         },
         {
@@ -117,6 +125,16 @@ export const viewstate: any = {
                 '90f2bd2f58c482b25a1e1db0f8e4ca26',
             ],
         },
+        {
+            viewtag: '2cc9f94bc50095005332a93eb120c828',
+            viewmodule: 'Base',
+            viewname: 'HROMHierarchyCatPickupView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '045cc74f78937b52db67b8239361d181',
+            ],
+        },
         {
             viewtag: '3110aca6f6c27996e9874cfb924c569f',
             viewmodule: 'Base',
@@ -162,6 +180,7 @@ export const viewstate: any = {
             refviews: [
                 '7933350eca0f8dbcb5402928a860c4ec',
                 'e7ba37699bd458dc8dd5c02abac8dadd',
+                '2cc9f94bc50095005332a93eb120c828',
             ],
         },
         {
@@ -203,16 +222,6 @@ export const viewstate: any = {
             refviews: [
             ],
         },
-        {
-            viewtag: '816f119be45e16d278809f590fb65029',
-            viewmodule: 'Base',
-            viewname: 'HROrganizationMPickupView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                '07e98f33b8d972b70860e615aaa10b89',
-            ],
-        },
         {
             viewtag: '90f2bd2f58c482b25a1e1db0f8e4ca26',
             viewmodule: 'Base',

app_PIM/src/uiservice/hromhierarchy-cat/hromhierarchy-cat-ui-service-base.ts

@@ -89,8 +89,11 @@ export default class HROMHierarchyCatUIServiceBase extends UIService {
      * @memberof  HROMHierarchyCatUIServiceBase
      */  
     public initViewMap(){
+        this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'hromhierarchycats'});
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'hromhierarchycats'});
         this.allViewMap.set(':',{viewname:'v_002',srfappde:'hromhierarchycats'});
+        this.allViewMap.set('MPICKUPVIEW:',{viewname:'mpickupview',srfappde:'hromhierarchycats'});
+        this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'hromhierarchycats'});
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'hromhierarchycats'});
     }
 

app_PIM/src/widgets/hromhierarchy-cat/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-base.tsx

+import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
+import { Subject, Subscription } from 'rxjs';
+import { Watch, MainControlBase } from '@/studio-core';
+import HROMHierarchyCatService from '@/service/hromhierarchy-cat/hromhierarchy-cat-service';
+import PickupViewpickupviewpanelService from './pickup-viewpickupviewpanel-pickupviewpanel-service';
+import HROMHierarchyCatUIService from '@/uiservice/hromhierarchy-cat/hromhierarchy-cat-ui-service';
+import PickupViewpickupviewpanelModel from './pickup-viewpickupviewpanel-pickupviewpanel-model';
+
+
+/**
+ * pickupviewpanel部件基类
+ *
+ * @export
+ * @class MainControlBase
+ * @extends {PickupViewpickupviewpanelPickupviewpanelBase}
+ */
+export class PickupViewpickupviewpanelPickupviewpanelBase extends MainControlBase {
+
+    /**
+     * 获取部件类型
+     *
+     * @protected
+     * @type {string}
+     * @memberof PickupViewpickupviewpanelPickupviewpanelBase
+     */
+    protected controlType: string = 'PICKUPVIEWPANEL';
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {PickupViewpickupviewpanelService}
+     * @memberof PickupViewpickupviewpanelPickupviewpanelBase
+     */
+    public service: PickupViewpickupviewpanelService = new PickupViewpickupviewpanelService({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {HROMHierarchyCatService}
+     * @memberof PickupViewpickupviewpanelPickupviewpanelBase
+     */
+    public appEntityService: HROMHierarchyCatService = new HROMHierarchyCatService({ $store: this.$store });
+
+    /**
+     * 应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof PickupViewpickupviewpanelPickupviewpanelBase
+     */
+    protected appDeName: string = 'hromhierarchycat';
+
+
+    /**
+     * 选中数据字符串
+     *
+     * @type {string}
+     * @memberof PickupViewpickupviewpanel
+     */
+    @Prop() public selectedData?: string;
+
+    /**
+     * 获取多项数据
+     *
+     * @returns {any[]}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public getDatas(): any[] {
+        return [];
+    }
+
+    /**
+     * 获取单项树
+     *
+     * @returns {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public getData(): any {
+        return {};
+    }
+
+    /**
+     * 视图名称
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public view: any = {
+        viewname: 'hromhierarchy-cat-pickup-grid-view',
+        data: {},
+    }
+
+    /**
+     * 局部上下文
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public localContext: any = null;
+
+    /**
+     * 局部视图参数
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public localViewParam: any = null;
+
+    /**
+     * 视图数据
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public viewdata: string  = JSON.stringify(this.context);
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public viewparam: string  = JSON.stringify(this.viewparams);
+
+    /**
+     * 是否显示按钮
+     *
+     * @type {boolean}
+     * @memberof PickupViewpickupviewpanel
+     */
+    @Prop({default: true}) public isShowButton!: boolean;
+
+    /**
+     * 是否单选
+     *
+     * @type {boolean}
+     * @memberof PickupViewpickupviewpanel
+     */
+    @Prop() public isSingleSelect?: boolean;
+
+    /**
+     * 初始化完成
+     *
+     * @type {boolean}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public inited: boolean = false;
+
+    /**
+     * 视图数据变化
+     *
+     * @param {*} $event
+     * @memberof PickupViewpickupviewpanel
+     */
+    public onViewDatasChange($event: any): void {
+        if($event.length>0){
+          $event.forEach((item:any,index:any) => {
+              let srfmajortext = item['omhierarchycatname'];
+              if(srfmajortext){
+                Object.assign($event[index],{srfmajortext: srfmajortext});
+              }
+          });
+        }
+        this.$emit('selectionchange', $event);
+    }
+
+    /**
+     * 视图数据被激活
+     *
+     * @param {*} $event
+     * @memberof PickupViewpickupviewpanel
+     */
+    public viewDatasActivated($event: any): void {
+        this.$emit('activated', $event);
+    }
+
+    /**
+     * 视图加载完成
+     *
+     * @param {*} $event
+     * @memberof PickupViewpickupviewpanel
+     */
+    public onViewLoad($event: any): void {
+        this.$emit('load', $event);
+    }
+
+    /**
+     * vue 生命周期
+     *
+     * @memberof PickupViewpickupviewpanel
+     */
+    public created() {
+        this.afterCreated();
+    }
+
+    /**
+     * 执行created后的逻辑
+     *
+     *  @memberof PickupViewpickupviewpanel
+     */    
+    public afterCreated(){
+        this.initNavParam();
+        if (this.viewState) {
+            this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
+                if (!Object.is(tag, this.name)) {
+                    return;
+                }
+                if (Object.is('load', action)) {
+                    this.viewdata = JSON.stringify(this.context);
+                    this.viewparam = JSON.stringify(Object.assign(data, this.viewparams));
+                    this.inited = true;
+                }
+            });
+        }
+    }
+
+    /**
+     * 初始化导航参数
+     *
+     *  @memberof PickupViewpickupviewpanel
+     */  
+    public initNavParam(){
+        if(this.localContext && Object.keys(this.localContext).length >0){
+            let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
+            Object.assign(this.context,_context);
+        }
+        if(this.localViewParam && Object.keys(this.localViewParam).length >0){
+            let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
+            Object.assign(this.viewparams,_param);
+        }
+        this.viewdata = JSON.stringify(this.context);
+        this.viewparam = JSON.stringify(this.viewparams);
+    }
+
+
+    /**
+     * vue 生命周期
+     *
+     * @memberof PickupViewpickupviewpanel
+     */
+    public destroyed() {
+        this.afterDestroy();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     *
+     * @memberof PickupViewpickupviewpanel
+     */
+    public afterDestroy() {
+        if (this.viewStateEvent) {
+            this.viewStateEvent.unsubscribe();
+        }
+    }
+
+}
\ No newline at end of file

app_PIM/src/widgets/hromhierarchy-cat/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

+/**
+ * PickupViewpickupviewpanel 部件模型
+ *
+ * @export
+ * @class PickupViewpickupviewpanelModel
+ */
+export default class PickupViewpickupviewpanelModel {
+
+  /**
+    * 获取数据项集合
+    *
+    * @returns {any[]}
+    * @memberof PickupViewpickupviewpanelModel
+    */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'hromhierarchycat',
+        prop: 'omhierarchycatid',
+      },
+      {
+        name: 'omhierarchycatname',
+      },
+      {
+        name: 'createman',
+      },
+      {
+        name: 'createdate',
+      },
+      {
+        name: 'updateman',
+      },
+      {
+        name: 'updatedate',
+      },
+      {
+        name: 'memo',
+      },
+    ]
+  }
+
+
+}
\ No newline at end of file

app_PIM/src/widgets/hromhierarchy-cat/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-service.ts

+import { Http } from '@/utils';
+import ControlService from '@/widgets/control-service';
+
+/**
+ * PickupViewpickupviewpanel 部件服务对象
+ *
+ * @export
+ * @class PickupViewpickupviewpanelService
+ */
+export default class PickupViewpickupviewpanelService extends ControlService {
+}
\ No newline at end of file

app_PIM/src/widgets/hromhierarchy-cat/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.html

+<div class='pickupviewpanel'>
+    <component 
+        v-if="inited && view.viewname && !Object.is(view.viewname, '')" 
+        :is="view.viewname"
+        class="viewcontainer3"
+        :viewdata="viewdata"
+        :viewparam="viewparam"
+        :viewDefaultUsage="false"
+        :isSingleSelect="isSingleSelect"
+        :selectedData="selectedData"
+        :isShowButton="isShowButton"
+        @viewdataschange="onViewDatasChange.apply(_self, arguments)"
+        @viewdatasactivated="viewDatasActivated.apply(_self, arguments)"
+        @viewload="onViewLoad.apply(_self, arguments)">
+    </component>
+</div>
\ No newline at end of file

app_PIM/src/widgets/hromhierarchy-cat/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.less

+.pickupviewpanel{
+  width: 100%;
+}
\ No newline at end of file

app_PIM/src/widgets/hromhierarchy-cat/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.vue

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

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

@@ -73,10 +73,12 @@ export class MainEditFormBase extends EditFormControlBase {
         srfuf: null,
         srfdeid: null,
         srfsourcekey: null,
+        hromhierarchycatname: null,
         organizationname: null,
         pomhierarchyname: null,
         showorder: null,
         pomhierarchyid: null,
+        hromhierarchycatid: null,
         organizationid: null,
         omhierarchyid: null,
         hromhierarchy:null,
@@ -127,6 +129,8 @@ export class MainEditFormBase extends EditFormControlBase {
 
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
+        hromhierarchycatname: new FormItemModel({ caption: '层次结构类别', detailType: 'FORMITEM', name: 'hromhierarchycatname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
         organizationname: new FormItemModel({ caption: '组织名称', detailType: 'FORMITEM', name: 'organizationname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         pomhierarchyname: new FormItemModel({ caption: '上级组织', detailType: 'FORMITEM', name: 'pomhierarchyname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
@@ -135,6 +139,8 @@ export class MainEditFormBase extends EditFormControlBase {
 
         pomhierarchyid: new FormItemModel({ caption: '上级层次结构标识', detailType: 'FORMITEM', name: 'pomhierarchyid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
+        hromhierarchycatid: new FormItemModel({ caption: '结构层次类别标识', detailType: 'FORMITEM', name: 'hromhierarchycatid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
         organizationid: new FormItemModel({ caption: '组织', detailType: 'FORMITEM', name: 'organizationid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         omhierarchyid: new FormItemModel({ caption: '组织层次结构标识', detailType: 'FORMITEM', name: 'omhierarchyid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),

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

@@ -55,6 +55,11 @@ export default class MainModel {
       {
         name: 'srfsourcekey',
       },
+      {
+        name: 'hromhierarchycatname',
+        prop: 'hromhierarchycatname',
+        dataType: 'PICKUPTEXT',
+      },
       {
         name: 'organizationname',
         prop: 'organizationname',
@@ -75,6 +80,11 @@ export default class MainModel {
         prop: 'pomhierarchyid',
         dataType: 'PICKUP',
       },
+      {
+        name: 'hromhierarchycatid',
+        prop: 'hromhierarchycatid',
+        dataType: 'PICKUP',
+      },
       {
         name: 'organizationid',
         prop: 'organizationid',

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

@@ -2,6 +2,7 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import HROMHierarchyService from '@/service/hromhierarchy/hromhierarchy-service';
 import MainModel from './main-form-model';
+import HROMHierarchyCatService from '@/service/hromhierarchy-cat/hromhierarchy-cat-service';
 import HROrganizationService from '@/service/hrorganization/hrorganization-service';
 
 
@@ -42,6 +43,14 @@ export default class MainService extends ControlService {
         this.model = new MainModel();
     }
 
+    /**
+     * 结构层次类别服务对象
+     *
+     * @type {HROMHierarchyCatService}
+     * @memberof MainService
+     */
+    public hromhierarchycatService: HROMHierarchyCatService = new HROMHierarchyCatService();
+
     /**
      * 组织服务对象
      *
@@ -91,6 +100,9 @@ export default class MainService extends ControlService {
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
         data.page = data.page ? data.page : 0;
         data.size = data.size ? data.size : 1000;
+        if (Object.is(serviceName, 'HROMHierarchyCatService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.hromhierarchycatService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'omhierarchycatid', 'hromhierarchycat');
+        }
         if (Object.is(serviceName, 'HROrganizationService') && Object.is(interfaceName, 'FetchDefault')) {
             return this.doItems(this.hrorganizationService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'organizationid', 'hrorganization');
         }

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

@@ -6,7 +6,33 @@
     <app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hromhierarchy.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group1" :data="data" :context="context" :viewparams="viewparams"/>
     <row>
-        <i-col class="form-layout-container" v-show="detailsModel.organizationname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+        <i-col class="form-layout-container" v-show="detailsModel.hromhierarchycatname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='hromhierarchycatname' :itemRules="this.rules.hromhierarchycatname" class='' :caption="$t('entities.hromhierarchy.main_form.details.hromhierarchycatname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.hromhierarchycatname.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-picker 
+  :formState="formState"
+  :data="data"
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.hromhierarchycatname.disabled"
+  name='hromhierarchycatname'
+  deMajorField='omhierarchycatname'
+  deKeyField='hromhierarchycat'
+  :service="service"
+  :acParams="{ serviceName: 'HROMHierarchyCatService', interfaceName: 'FetchDefault'}"
+  valueitem='hromhierarchycatid' 
+  :value="data.hromhierarchycatname"
+  :pickupView="{ viewname: 'hromhierarchy-cat-pickup-view', title: $t('entities.hromhierarchycat.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'hromhierarchycats', parameterName: 'hromhierarchycat' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+  style=""  
+  @formitemvaluechange="onFormItemValueChange($event)">
+</app-picker>
+
+</app-form-item>
+
+</i-col>
+<i-col class="form-layout-container" v-show="detailsModel.organizationname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='organizationname' :itemRules="this.rules.organizationname" class='' :caption="$t('entities.hromhierarchy.main_form.details.organizationname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.organizationname.error" :isEmptyCaption="false" labelPos="LEFT">
     
 <app-picker 

app_PIM/src/widgets/hromhierarchy/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -51,6 +51,9 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'showorder',
       },
+      {
+        name: 'hromhierarchycatname',
+      },
     ]
   }
 

app_PIM/src/widgets/hromhierarchy/tree-001-treeview/tree-001-treeview-model.ts

@@ -51,6 +51,9 @@ export default class TREE_001Model {
       {
         name: 'showorder',
       },
+      {
+        name: 'hromhierarchycatname',
+      },
     ]
   }
 

app_PIM/src/widgets/hromhierarchy/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-model.ts

@@ -51,6 +51,9 @@ export default class TreeExpViewtreeexpbarModel {
       {
         name: 'showorder',
       },
+      {
+        name: 'hromhierarchycatname',
+      },
     ]
   }
 

config.xml

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

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

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

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

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

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

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

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

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