jackwang 部署微服务应用

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

@@ -65,6 +65,8 @@ export default {
 	},
 	main_grid: {
 		columns: {
+			omhierarchycatname: "名称",
+			memo: "备注",
 		},
 		uiactions: {
 		},

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

@@ -64,6 +64,8 @@ export default {
 	},
 	main_grid: {
 		columns: {
+			omhierarchycatname: "名称",
+			memo: "备注",
 		},
 		uiactions: {
 		},

app_PIM/src/mock/entity/hromhierarchys/hromhierarchys.ts

@@ -87,6 +87,35 @@ mock.onDelete(new RegExp(/^\/hromhierarchies\/batch$/)).reply((config: any) => {
 });
 
 
+
+// Select
+mock.onGet(new RegExp(/^\/hromhierarchycats\/([a-zA-Z0-9\-\;]{1,35})\/hromhierarchies\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hromhierarchy 方法: Select");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    const paramArray:Array<any> = ['omhierarchycatid','omhierarchyid'];
+    const matchArray:any = new RegExp(/^\/hromhierarchycats\/([a-zA-Z0-9\-\;]{1,35})\/hromhierarchies\/([a-zA-Z0-9\-\;]{1,35})\/select$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    let items = mockDatas ? mockDatas : [];
+    let _items = items.find((item: any) => Object.is(item.omhierarchyid, tempValue.omhierarchyid));
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(_items);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, _items];
+});
+
 // Select
 mock.onGet(new RegExp(/^\/hromhierarchies\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
     console.groupCollapsed("实体:hromhierarchy 方法: Select");
@@ -114,6 +143,33 @@ mock.onGet(new RegExp(/^\/hromhierarchies\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).r
     console.groupEnd();
     return [status, _items];
 });
+
+    
+// Create
+mock.onPost(new RegExp(/^\/hromhierarchycats\/([a-zA-Z0-9\-\;]{1,35})\/hromhierarchies\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hromhierarchy 方法: Create");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    const paramArray:Array<any> = ['omhierarchycatid','omhierarchyid'];
+    const matchArray:any = new RegExp(/^\/hromhierarchycats\/([a-zA-Z0-9\-\;]{1,35})\/hromhierarchies\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table({});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, {}];
+});
         
 // Create
 mock.onPost(new RegExp(/^\/hromhierarchies\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
@@ -140,6 +196,33 @@ mock.onPost(new RegExp(/^\/hromhierarchies\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((
     console.groupEnd();
     return [status, mockDatas[0]];
 });
+
+    
+// Update
+mock.onPut(new RegExp(/^\/hromhierarchycats\/([a-zA-Z0-9\-\;]{1,35})\/hromhierarchies\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hromhierarchy 方法: Update");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    const paramArray:Array<any> = ['omhierarchycatid','omhierarchyid'];
+    const matchArray:any = new RegExp(/^\/hromhierarchycats\/([a-zA-Z0-9\-\;]{1,35})\/hromhierarchies\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table({});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, {}];
+});
         
 // Update
 mock.onPut(new RegExp(/^\/hromhierarchies\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
@@ -179,6 +262,25 @@ mock.onPut(new RegExp(/^\/hromhierarchies\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((c
     return [status, data];
 });
 
+
+
+
+// GetDraft
+mock.onGet(new RegExp(/^\/hromhierarchycats\/([a-zA-Z0-9\-\;]{1,35})\/hromhierarchies\/getdraft$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hromhierarchy 方法: GetDraft");
+    console.table({url:config.url, method: config.method, data:config.data});
+    // GetDraft
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table({});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, {}];
+});
+
 // GetDraft
 mock.onGet(new RegExp(/^\/hromhierarchies\/getdraft$/)).reply((config: any) => {
     console.groupCollapsed("实体:hromhierarchy 方法: GetDraft");
@@ -194,6 +296,33 @@ mock.onGet(new RegExp(/^\/hromhierarchies\/getdraft$/)).reply((config: any) => {
     console.groupEnd();
     return [status, {}];
 });
+
+    
+// CheckKey
+mock.onPost(new RegExp(/^\/hromhierarchycats\/([a-zA-Z0-9\-\;]{1,35})\/hromhierarchies\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hromhierarchy 方法: CheckKey");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    const paramArray:Array<any> = ['omhierarchycatid','omhierarchyid'];
+    const matchArray:any = new RegExp(/^\/hromhierarchycats\/([a-zA-Z0-9\-\;]{1,35})\/hromhierarchies\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table({});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, {}];
+});
         
 // CheckKey
 mock.onPost(new RegExp(/^\/hromhierarchies\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).reply((config: any) => {
@@ -232,6 +361,33 @@ mock.onPost(new RegExp(/^\/hromhierarchies\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/
     console.groupEnd();
     return [status, data];
 });
+
+    
+// Save
+mock.onPost(new RegExp(/^\/hromhierarchycats\/([a-zA-Z0-9\-\;]{1,35})\/hromhierarchies\/([a-zA-Z0-9\-\;]{1,35})\/save$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hromhierarchy 方法: Save");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    const paramArray:Array<any> = ['omhierarchycatid','omhierarchyid'];
+    const matchArray:any = new RegExp(/^\/hromhierarchycats\/([a-zA-Z0-9\-\;]{1,35})\/hromhierarchies\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table({});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, {}];
+});
         
 // Save
 mock.onPost(new RegExp(/^\/hromhierarchies\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((config: any) => {
@@ -270,6 +426,51 @@ mock.onPost(new RegExp(/^\/hromhierarchies\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).r
     console.groupEnd();
     return [status, data];
 });
+
+
+// FetchDefault
+mock.onGet(new RegExp(/^\/hromhierarchycats\/([a-zA-Z0-9\-\;]{1,35})\/hromhierarchies\/fetchdefault$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hromhierarchy 方法: FetchDefault");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    const paramArray:Array<any> = ['omhierarchycatid'];
+    let tempValue: any = {};
+    const matchArray:any = new RegExp(/^\/hromhierarchycats\/([a-zA-Z0-9\-\;]{1,35})\/hromhierarchies\/fetchdefault$/).exec(config.url);
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    let items = mockDatas ? mockDatas : [];
+    if (items.length > 0 && paramArray.length > 0) {
+        paramArray.forEach((paramkey: any) => {
+            if (tempValue[paramkey] && tempValue[paramkey].indexOf(";") > 0) {
+                let keysGrounp: Array<any> = tempValue[paramkey].split(new RegExp(/[\;]/));
+                let tempArray: Array<any> = [];
+                keysGrounp.forEach((singlekey: any) => {
+                    let _items =  items.filter((item: any) => { return item[paramkey] == singlekey });
+                   if(_items.length >0){
+                    tempArray.push(..._items);
+                   }
+                })
+                items = tempArray;
+            } else {
+                items = items.filter((item: any) => { return item[paramkey] == tempValue[paramkey] });
+            }
+        })
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(items);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, items];
+});
     
 // FetchDefault
 mock.onGet(new RegExp(/^\/hromhierarchies\/fetchdefault$/)).reply((config: any) => {
@@ -314,15 +515,57 @@ mock.onGet(new RegExp(/^\/hromhierarchies\/fetchdefault(\?[\w-./?%&=,]*)*$/)).re
     console.groupEnd();
     return [status, records ?  records : []];
 });
+
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+
 // URI参数传递情况未实现
 // URI参数传递情况未实现
+
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+
 // URI参数传递情况未实现
+// URI参数传递情况未实现
+
 // URI参数传递情况未实现
 // URI参数传递情况未实现
+
 // URI参数传递情况未实现
 // URI参数传递情况未实现
 
 
+// Remove
+mock.onDelete(new RegExp(/^\/hromhierarchycats\/([a-zA-Z0-9\-\;]{1,35})\/hromhierarchies\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hromhierarchy 方法: Remove");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['omhierarchycatid','omhierarchyid'];
+    const matchArray:any = new RegExp(/^\/hromhierarchycats\/([a-zA-Z0-9\-\;]{1,35})\/hromhierarchies\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    let items = mockDatas ? mockDatas : [];
+    let _items = items.find((item: any) => Object.is(item.omhierarchyid, tempValue.omhierarchyid));
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(_items?_items:{});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, _items?_items:{}];
+});
+
 // Remove
 mock.onDelete(new RegExp(/^\/hromhierarchies\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
     console.groupCollapsed("实体:hromhierarchy 方法: Remove");
@@ -351,6 +594,34 @@ mock.onDelete(new RegExp(/^\/hromhierarchies\/([a-zA-Z0-9\-\;]{1,35})$/)).reply(
     return [status, _items?_items:{}];
 });
 
+// Get
+mock.onGet(new RegExp(/^\/hromhierarchycats\/([a-zA-Z0-9\-\;]{1,35})\/hromhierarchies\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:hromhierarchy 方法: Get");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['omhierarchycatid','omhierarchyid'];
+    const matchArray:any = new RegExp(/^\/hromhierarchycats\/([a-zA-Z0-9\-\;]{1,35})\/hromhierarchies\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    let items = mockDatas ? mockDatas : [];
+    let _items = items.find((item: any) => Object.is(item.omhierarchyid, tempValue.omhierarchyid));
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(_items?_items:{});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, _items?_items:{}];
+});
+
 // Get
 mock.onGet(new RegExp(/^\/hromhierarchies\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
     console.groupCollapsed("实体:hromhierarchy 方法: Get");

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

 <studio-view-style2 viewName="hromhierarchycateditview" viewTitle="结构层次类别编辑视图" class='deeditview hromhierarchy-cat-edit-view'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
     <view_form 

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

@@ -579,28 +579,14 @@ export class HROMHierarchyCatGridViewBase extends GridViewBase {
         const deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'hromhierarchycats', parameterName: 'hromhierarchycat' },
+            { pathName: 'v_002', parameterName: 'v_002' },
         ];
         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: 'hromhierarchy-cat-v-002', 
-            height: 0, 
-            width: 600,  
-            title: this.$t('entities.hromhierarchycat.views.v_002.title'),
-            placement: 'DRAWER_RIGHT',
-        };
-        openDrawer(view, data);
+        const openIndexViewTab = (data: any) => {
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
+            this.$router.push(routePath);
+        }
+        openIndexViewTab(data);
     }
 
 

app_PIM/src/pages/base/hromhierarchy-cat-v-002/hromhierarchy-cat-v-002.html

 <studio-view-style2 viewName="hromhierarchycatv_002" viewTitle="结构层次类别编辑视图" class='deeditview hromhierarchy-cat-v-002'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
     <view_form 

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

@@ -584,7 +584,12 @@ export class HROMHierarchyGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hromhierarchycat && true){
+            deResParameters = [
+            { pathName: 'hromhierarchycats', parameterName: 'hromhierarchycat' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hromhierarchies', parameterName: 'hromhierarchy' },
             { pathName: 'editview', parameterName: 'editview' },

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

@@ -201,6 +201,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/hroperation-unit-grid-view/hroperation-unit-grid-view.vue'),
                 },
+                {
+                    path: 'hromhierarchycats/:hromhierarchycat?/hromhierarchies/:hromhierarchy?/pickupview/:pickupview?',
+                    meta: {
+                        caption: 'entities.hromhierarchy.views.pickupview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hromhierarchycats', parameterName: 'hromhierarchycat' },
+                            { pathName: 'hromhierarchies', parameterName: 'hromhierarchy' },
+                            { pathName: 'pickupview', parameterName: 'pickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/hromhierarchy-pickup-view/hromhierarchy-pickup-view.vue'),
+                },
                 {
                     path: 'hromhierarchies/:hromhierarchy?/pickupview/:pickupview?',
                     meta: {
@@ -345,6 +360,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/hroperation-unit-dashboard-view/hroperation-unit-dashboard-view.vue'),
                 },
+                {
+                    path: 'hromhierarchycats/:hromhierarchycat?/hromhierarchies/:hromhierarchy?/gridview/:gridview?',
+                    meta: {
+                        caption: 'entities.hromhierarchy.views.gridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hromhierarchycats', parameterName: 'hromhierarchycat' },
+                            { pathName: 'hromhierarchies', parameterName: 'hromhierarchy' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/hromhierarchy-grid-view/hromhierarchy-grid-view.vue'),
+                },
                 {
                     path: 'hromhierarchies/:hromhierarchy?/gridview/:gridview?',
                     meta: {
@@ -387,6 +417,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/hrlegal-edit-view/hrlegal-edit-view.vue'),
                 },
+                {
+                    path: 'hromhierarchycats/:hromhierarchycat?/hromhierarchies/:hromhierarchy?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.hromhierarchy.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hromhierarchycats', parameterName: 'hromhierarchycat' },
+                            { pathName: 'hromhierarchies', parameterName: 'hromhierarchy' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/hromhierarchy-edit-view/hromhierarchy-edit-view.vue'),
+                },
                 {
                     path: 'hromhierarchies/:hromhierarchy?/editview/:editview?',
                     meta: {
@@ -443,6 +488,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/hrlegal-grid-view/hrlegal-grid-view.vue'),
                 },
+                {
+                    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' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/hromhierarchy-tree-exp-view/hromhierarchy-tree-exp-view.vue'),
+                },
                 {
                     path: 'hromhierarchies/:hromhierarchy?/treeexpview/:treeexpview?',
                     meta: {
@@ -601,6 +661,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/human-resource/hremployee-edit-view/hremployee-edit-view.vue'),
                 },
+                {
+                    path: 'hromhierarchycats/:hromhierarchycat?/hromhierarchies/:hromhierarchy?/pickupgridview/:pickupgridview?',
+                    meta: {
+                        caption: 'entities.hromhierarchy.views.pickupgridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hromhierarchycats', parameterName: 'hromhierarchycat' },
+                            { pathName: 'hromhierarchies', parameterName: 'hromhierarchy' },
+                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/hromhierarchy-pickup-grid-view/hromhierarchy-pickup-grid-view.vue'),
+                },
                 {
                     path: 'hromhierarchies/:hromhierarchy?/pickupgridview/:pickupgridview?',
                     meta: {

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

@@ -73,6 +73,7 @@ export default class HROMHierarchyCatServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/hromhierarchycats`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_hromhierarchies',JSON.stringify(res.data.hromhierarchies?res.data.hromhierarchies:[]));
         
         return res;
     }

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

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

app_PIM/src/widgets/hromhierarchy-cat/ef-001-form/ef-001-form.html

@@ -43,6 +43,7 @@
     paramItem='hromhierarchycat' 
     :parentdata='{"srfparentdefname":"HROMHIERARCHYCATID","srfparentdename":"HROMHIERARCHYCAT","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_HROMHIERARCHY_HROMHIERARCHYCAT_HROMHIERARCHYCATID_ABD0C1","SRFDER1NID":"DER1N_HROMHIERARCHY_HROMHIERARCHYCAT_HROMHIERARCHYCATID_ABD0C1"}'
     :parameters="[
+        { pathName: 'hromhierarchycats', parameterName: 'hromhierarchycat' },
     ]"
     :context="context"
     :viewparams="viewparams"

app_PIM/src/widgets/hromhierarchy-cat/main-grid/main-grid-base.tsx

@@ -83,6 +83,22 @@ export class MainGridBase extends GridControlBase {
      * @memberof MainGridBase
      */
     public allColumns: any[] = [
+        {
+            name: 'omhierarchycatname',
+            label: '名称',
+            langtag: 'entities.hromhierarchycat.main_grid.columns.omhierarchycatname',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'memo',
+            label: '备注',
+            langtag: 'entities.hromhierarchycat.main_grid.columns.memo',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
     ]
 
     /**
@@ -117,6 +133,8 @@ export class MainGridBase extends GridControlBase {
      * @memberof MainBase
      */
     public hasRowEdit: any = {
+        'omhierarchycatname':false,
+        'memo':false,
     };
 
     /**
@@ -131,4 +149,18 @@ export class MainGridBase extends GridControlBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof MainGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+        ]);
+    }
+
 }
\ No newline at end of file

app_PIM/src/widgets/hromhierarchy-cat/main-grid/main-grid-model.ts

@@ -26,6 +26,16 @@ export default class MainModel {
       ]
     }else{
 		  return [
+        {
+          name: 'omhierarchycatname',
+          prop: 'omhierarchycatname',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'memo',
+          prop: 'memo',
+          dataType: 'LONGTEXT_1000',
+        },
         {
           name: 'srfmajortext',
           prop: 'omhierarchycatname',

app_PIM/src/widgets/hromhierarchy-cat/main-grid/main-grid.html

@@ -23,6 +23,30 @@
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
+            <template v-if="getColumnState('omhierarchycatname')">
+                <el-table-column show-overflow-tooltip :prop="'omhierarchycatname'" :label="$t('entities.hromhierarchycat.main_grid.columns.omhierarchycatname')" :width="200"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hromhierarchycat.main_grid.columns.omhierarchycatname')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.omhierarchycatname}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('memo')">
+                <el-table-column show-overflow-tooltip :prop="'memo'" :label="$t('entities.hromhierarchycat.main_grid.columns.memo')" :width="300"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hromhierarchycat.main_grid.columns.memo')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.memo}}</span>
+                    </template>
+                </el-table-column>
+            </template>
             <template v-if="adaptiveState">
                 <el-table-column></el-table-column>
             </template>

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: