jackwang 部署微服务应用

app_PIM/src/interface/entity/hromhierarchy-cat.ts

@@ -15,7 +15,7 @@ export interface HROMHierarchyCat {
     omhierarchycatid?: any;
 
     /**
-     * 名称
+     * 层次类别名称
      *
      * @returns {*}
      * @memberof HROMHierarchyCat

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

@@ -2,7 +2,7 @@
 export default {
   fields: {
     omhierarchycatid: "结构层次类别标识",
-    omhierarchycatname: "名称",
+    omhierarchycatname: "层次类别名称",
     createman: "建立人",
     createdate: "建立时间",
     updateman: "更新人",
@@ -42,12 +42,12 @@ export default {
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "结构层次类别标识", 
-			srfmajortext: "名称", 
+			srfmajortext: "层次类别名称", 
 			srftempmode: "", 
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			omhierarchycatname: "名称", 
+			omhierarchycatname: "层次类别名称", 
 			memo: "备注", 
 			omhierarchycatid: "结构层次类别标识", 
 		},
@@ -63,12 +63,12 @@ export default {
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "结构层次类别标识", 
-			srfmajortext: "名称", 
+			srfmajortext: "层次类别名称", 
 			srftempmode: "", 
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			omhierarchycatname: "名称", 
+			omhierarchycatname: "层次类别名称", 
 			memo: "备注", 
 			omhierarchycatid: "结构层次类别标识", 
 		},
@@ -77,7 +77,7 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			omhierarchycatname: "名称",
+			omhierarchycatname: "层次类别名称",
 			memo: "备注",
 		},
 		uiactions: {

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

 export default {
   fields: {
     omhierarchycatid: "结构层次类别标识",
-    omhierarchycatname: "名称",
+    omhierarchycatname: "层次类别名称",
     createman: "建立人",
     createdate: "建立时间",
     updateman: "更新人",
@@ -41,12 +41,12 @@ export default {
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "结构层次类别标识", 
-			srfmajortext: "名称", 
+			srfmajortext: "层次类别名称", 
 			srftempmode: "", 
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			omhierarchycatname: "名称", 
+			omhierarchycatname: "层次类别名称", 
 			memo: "备注", 
 			omhierarchycatid: "结构层次类别标识", 
 		},
@@ -62,12 +62,12 @@ export default {
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "结构层次类别标识", 
-			srfmajortext: "名称", 
+			srfmajortext: "层次类别名称", 
 			srftempmode: "", 
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			omhierarchycatname: "名称", 
+			omhierarchycatname: "层次类别名称", 
 			memo: "备注", 
 			omhierarchycatid: "结构层次类别标识", 
 		},
@@ -76,7 +76,7 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			omhierarchycatname: "名称",
+			omhierarchycatname: "层次类别名称",
 			memo: "备注",
 		},
 		uiactions: {

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

@@ -107,6 +107,10 @@ export default {
 			caption: "新建行",
 			tip: "新建行",
 		},
+		deuiaction1: {
+			caption: "保存行",
+			tip: "保存行",
+		},
 		tbitem26: {
 			caption: "-",
 			tip: "",

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

@@ -106,6 +106,10 @@ export default {
 			caption: "新建行",
 			tip: "新建行",
 		},
+		deuiaction1: {
+			caption: "保存行",
+			tip: "保存行",
+		},
 		tbitem26: {
 			caption: "-",
 			tip: "",

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

@@ -182,6 +182,9 @@ export class HROMHierarchyCatGridViewBase extends GridViewBase {
         if (Object.is($event.tag, 'tbitem25')) {
             this.toolbar_tbitem25_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem8')) {
             this.toolbar_tbitem8_click(null, '', $event2);
         }
@@ -396,6 +399,34 @@ export class HROMHierarchyCatGridViewBase extends GridViewBase {
         this.NewRow(datas, contextJO,paramJO,  $event, xData,this,"HROMHierarchyCat");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveRow(datas, contextJO,paramJO,  $event, xData,this,"HROMHierarchyCat");
+    }
+
     /**
      * 逻辑事件
      *
@@ -672,6 +703,26 @@ export class HROMHierarchyCatGridViewBase extends GridViewBase {
             _this.$Notice.error({ title: '错误', desc: 'newRow 视图处理逻辑不存在，请添加!' });
         }
     }
+    /**
+     * 保存行
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof HROMHierarchyCatGridViewBase
+     */
+    public SaveRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        // 界面行为容器对象 _this
+        const _this: any = this;
+        if (xData && xData.save instanceof Function) {
+            xData.save();
+        } else if (_this.save && _this.save instanceof Function) {
+            _this.save();
+        }
+    }
     /**
      * 删除
      *

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

 <studio-view-style2 viewName="hromhierarchycatgridview" viewTitle="组织层次结构" class='degridview hromhierarchy-cat-grid-view'>
-    <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="名称" search @on-search="onSearch($event)"/>
+    <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="层次类别名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
     <template slot="searchForm">

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

@@ -112,6 +112,8 @@ export class HROMHierarchyGridViewBase extends GridViewBase {
 
         tbitem25: { name: 'tbitem25', caption: '新建行', 'isShowCaption': false, 'isShowIcon': true, tooltip: '新建行', iconcls: 'fa fa-plus', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NewRow', target: '', class: '' } },
 
+        deuiaction1: { name: 'deuiaction1', caption: '保存行', 'isShowCaption': false, 'isShowIcon': true, tooltip: '保存行', iconcls: 'fa fa-save', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveRow', target: '', class: '' } },
+
         tbitem26: {  name: 'tbitem26', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem8: { name: 'tbitem8', caption: '删除', 'isShowCaption': true, 'isShowIcon': true, tooltip: '删除', iconcls: 'fa fa-remove', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY', class: '' } },
 
@@ -187,6 +189,9 @@ export class HROMHierarchyGridViewBase extends GridViewBase {
         if (Object.is($event.tag, 'tbitem25')) {
             this.toolbar_tbitem25_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem8')) {
             this.toolbar_tbitem8_click(null, '', $event2);
         }
@@ -401,6 +406,34 @@ export class HROMHierarchyGridViewBase extends GridViewBase {
         this.NewRow(datas, contextJO,paramJO,  $event, xData,this,"HROMHierarchy");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveRow(datas, contextJO,paramJO,  $event, xData,this,"HROMHierarchy");
+    }
+
     /**
      * 逻辑事件
      *
@@ -701,6 +734,26 @@ export class HROMHierarchyGridViewBase extends GridViewBase {
             _this.$Notice.error({ title: '错误', desc: 'newRow 视图处理逻辑不存在，请添加!' });
         }
     }
+    /**
+     * 保存行
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof HROMHierarchyGridViewBase
+     */
+    public SaveRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        // 界面行为容器对象 _this
+        const _this: any = this;
+        if (xData && xData.save instanceof Function) {
+            xData.save();
+        } else if (_this.save && _this.save instanceof Function) {
+            _this.save();
+        }
+    }
     /**
      * 删除
      *

app_PIM/src/pages/base/hrorg-address-grid-view/hrorg-address-grid-view-base.tsx

@@ -182,6 +182,9 @@ export class HROrgAddressGridViewBase extends GridViewBase {
         if (Object.is($event.tag, 'tbitem25')) {
             this.toolbar_tbitem25_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem8')) {
             this.toolbar_tbitem8_click(null, '', $event2);
         }
@@ -396,6 +399,34 @@ export class HROrgAddressGridViewBase extends GridViewBase {
         this.NewRow(datas, contextJO,paramJO,  $event, xData,this,"HROrgAddress");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveRow(datas, contextJO,paramJO,  $event, xData,this,"HROrgAddress");
+    }
+
     /**
      * 逻辑事件
      *
@@ -696,6 +727,26 @@ export class HROrgAddressGridViewBase extends GridViewBase {
             _this.$Notice.error({ title: '错误', desc: 'newRow 视图处理逻辑不存在，请添加!' });
         }
     }
+    /**
+     * 保存行
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof HROrgAddressGridViewBase
+     */
+    public SaveRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        // 界面行为容器对象 _this
+        const _this: any = this;
+        if (xData && xData.save instanceof Function) {
+            xData.save();
+        } else if (_this.save && _this.save instanceof Function) {
+            _this.save();
+        }
+    }
     /**
      * 删除
      *

app_PIM/src/pages/base/hrorg-contact-grid-view/hrorg-contact-grid-view-base.tsx

@@ -182,6 +182,9 @@ export class HROrgContactGridViewBase extends GridViewBase {
         if (Object.is($event.tag, 'tbitem25')) {
             this.toolbar_tbitem25_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem8')) {
             this.toolbar_tbitem8_click(null, '', $event2);
         }
@@ -396,6 +399,34 @@ export class HROrgContactGridViewBase extends GridViewBase {
         this.NewRow(datas, contextJO,paramJO,  $event, xData,this,"HROrgContact");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveRow(datas, contextJO,paramJO,  $event, xData,this,"HROrgContact");
+    }
+
     /**
      * 逻辑事件
      *
@@ -696,6 +727,26 @@ export class HROrgContactGridViewBase extends GridViewBase {
             _this.$Notice.error({ title: '错误', desc: 'newRow 视图处理逻辑不存在，请添加!' });
         }
     }
+    /**
+     * 保存行
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof HROrgContactGridViewBase
+     */
+    public SaveRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        // 界面行为容器对象 _this
+        const _this: any = this;
+        if (xData && xData.save instanceof Function) {
+            xData.save();
+        } else if (_this.save && _this.save instanceof Function) {
+            _this.save();
+        }
+    }
     /**
      * 删除
      *

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

@@ -182,6 +182,9 @@ export class HROrganizationGridViewBase extends GridViewBase {
         if (Object.is($event.tag, 'tbitem25')) {
             this.toolbar_tbitem25_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem8')) {
             this.toolbar_tbitem8_click(null, '', $event2);
         }
@@ -396,6 +399,34 @@ export class HROrganizationGridViewBase extends GridViewBase {
         this.NewRow(datas, contextJO,paramJO,  $event, xData,this,"HROrganization");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveRow(datas, contextJO,paramJO,  $event, xData,this,"HROrganization");
+    }
+
     /**
      * 逻辑事件
      *
@@ -662,6 +693,26 @@ export class HROrganizationGridViewBase extends GridViewBase {
             _this.$Notice.error({ title: '错误', desc: 'newRow 视图处理逻辑不存在，请添加!' });
         }
     }
+    /**
+     * 保存行
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof HROrganizationGridViewBase
+     */
+    public SaveRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        // 界面行为容器对象 _this
+        const _this: any = this;
+        if (xData && xData.save instanceof Function) {
+            xData.save();
+        } else if (_this.save && _this.save instanceof Function) {
+            _this.save();
+        }
+    }
     /**
      * 删除
      *

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

@@ -182,6 +182,9 @@ export class HREmployeeGridViewBase extends GridViewBase {
         if (Object.is($event.tag, 'tbitem25')) {
             this.toolbar_tbitem25_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem8')) {
             this.toolbar_tbitem8_click(null, '', $event2);
         }
@@ -396,6 +399,34 @@ export class HREmployeeGridViewBase extends GridViewBase {
         this.NewRow(datas, contextJO,paramJO,  $event, xData,this,"HREmployee");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveRow(datas, contextJO,paramJO,  $event, xData,this,"HREmployee");
+    }
+
     /**
      * 逻辑事件
      *
@@ -660,6 +691,26 @@ export class HREmployeeGridViewBase extends GridViewBase {
             _this.$Notice.error({ title: '错误', desc: 'newRow 视图处理逻辑不存在，请添加!' });
         }
     }
+    /**
+     * 保存行
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof HREmployeeGridViewBase
+     */
+    public SaveRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        // 界面行为容器对象 _this
+        const _this: any = this;
+        if (xData && xData.save instanceof Function) {
+            xData.save();
+        } else if (_this.save && _this.save instanceof Function) {
+            _this.save();
+        }
+    }
     /**
      * 删除
      *

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

@@ -23,8 +23,8 @@ export const PageComponents = {
         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('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-grid-view', () => import('@pages/base/hrlegal-grid-view/hrlegal-grid-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

@@ -561,27 +561,27 @@ const router = new Router({
                     component: () => import('@pages/base/hrorg-contact-edit-view/hrorg-contact-edit-view.vue'),
                 },
                 {
-                    path: 'hrlegals/:hrlegal?/gridview/:gridview?',
+                    path: 'hromhierarchycats/:hromhierarchycat?/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: 'hromhierarchycats', parameterName: 'hromhierarchycat' },
+                            { 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: 'hromhierarchycats/:hromhierarchycat?/hromhierarchies/:hromhierarchy?/treeexpview/:treeexpview?',
+                    path: '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' },
                         ],
@@ -590,18 +590,18 @@ const router = new Router({
                     component: () => import('@pages/base/hromhierarchy-tree-exp-view/hromhierarchy-tree-exp-view.vue'),
                 },
                 {
-                    path: '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: '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: 'hrlegals/:hrlegal?/v_002/:v_002?',

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

@@ -81,6 +81,7 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 '7933350eca0f8dbcb5402928a860c4ec',
+                'e7ba37699bd458dc8dd5c02abac8dadd',
                 '4a61d63445d504cab11cf5f45536b314',
             ],
         },

app_PIM/src/widgets/hromhierarchy-cat/ef-001-form/ef-001-form-base.tsx

@@ -113,7 +113,7 @@ export class EF_001EditFormBase extends EditFormControlBase {
      * @memberof EF_001EditFormBase
      */
     public detailsModel: any = {
-        group1: new FormGroupPanelModel({ caption: '结构层次类别', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hromhierarchycat.ef_001_form', extractMode: 'ITEM', details: [] } }),
+        group1: new FormGroupPanelModel({ caption: '结构层次类别', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hromhierarchycat.ef_001_form', extractMode: 'ITEM', details: [] } }),
 
         druipart1: new FormDRUIPartModel({ caption: '', detailType: 'DRUIPART', name: 'druipart1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
 
@@ -127,7 +127,7 @@ export class EF_001EditFormBase extends EditFormControlBase {
 
         srfkey: new FormItemModel({ caption: '结构层次类别标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        srfmajortext: new FormItemModel({ caption: '名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        srfmajortext: new FormItemModel({ caption: '层次类别名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
@@ -137,7 +137,7 @@ export class EF_001EditFormBase extends EditFormControlBase {
 
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        omhierarchycatname: new FormItemModel({ caption: '名称', detailType: 'FORMITEM', name: 'omhierarchycatname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        omhierarchycatname: new FormItemModel({ caption: '层次类别名称', detailType: 'FORMITEM', name: 'omhierarchycatname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         memo: new FormItemModel({ caption: '备注', detailType: 'FORMITEM', name: 'memo', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

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

@@ -3,10 +3,10 @@
     <row >
             
 <i-col class="form-layout-container" v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hromhierarchycat.ef_001_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="true" >    
+    <app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hromhierarchycat.ef_001_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="true" >    
     <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.omhierarchycatname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+        <i-col class="form-layout-container" v-show="detailsModel.omhierarchycatname.visible" :style="{}"  :sm="{ span: 6, offset: 0 }" :md="{ span: 6, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='omhierarchycatname' :itemRules="this.rules.omhierarchycatname" class='' :caption="$t('entities.hromhierarchycat.ef_001_form.details.omhierarchycatname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.omhierarchycatname.error" :isEmptyCaption="false" labelPos="LEFT">
     
 <app-span name='omhierarchycatname' :value="data.omhierarchycatname" dataType="TEXT"     :precision="0"
@@ -16,7 +16,7 @@
 </app-form-item>
 
 </i-col>
-<i-col class="form-layout-container" v-show="detailsModel.memo.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+<i-col class="form-layout-container" v-show="detailsModel.memo.visible" :style="{}"  :sm="{ span: 18, offset: 0 }" :md="{ span: 18, offset: 0 }" :lg="{ span: 18, offset: 0 }" :xl="{ span: 18, offset: 0 }">
     <app-form-item name='memo' :itemRules="this.rules.memo" class='' :caption="$t('entities.hromhierarchycat.ef_001_form.details.memo')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.memo.error" :isEmptyCaption="false" labelPos="LEFT">
     
 <app-span name='memo' :value="data.memo" dataType="LONGTEXT_1000"     :precision="0"

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

@@ -114,7 +114,7 @@ export class MainEditFormBase extends EditFormControlBase {
 
         srfkey: new FormItemModel({ caption: '结构层次类别标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        srfmajortext: new FormItemModel({ caption: '名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        srfmajortext: new FormItemModel({ caption: '层次类别名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
@@ -124,7 +124,7 @@ 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 }),
 
-        omhierarchycatname: new FormItemModel({ caption: '名称', detailType: 'FORMITEM', name: 'omhierarchycatname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        omhierarchycatname: new FormItemModel({ caption: '层次类别名称', detailType: 'FORMITEM', name: 'omhierarchycatname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         memo: new FormItemModel({ caption: '备注', detailType: 'FORMITEM', name: 'memo', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 

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

@@ -85,7 +85,7 @@ export class MainGridBase extends GridControlBase {
     public allColumns: any[] = [
         {
             name: 'omhierarchycatname',
-            label: '名称',
+            label: '层次类别名称',
             langtag: 'entities.hromhierarchycat.main_grid.columns.omhierarchycatname',
             show: true,
             util: 'PX',

app_PIM/src/widgets/hromhierarchy/grid-001-grid/grid-001-grid-base.tsx

@@ -89,7 +89,7 @@ export class GRID_001GridBase extends GridControlBase {
             langtag: 'entities.hromhierarchy.grid_001_grid.columns.organizationname',
             show: true,
             util: 'PX',
-            isEnableRowEdit: false,
+            isEnableRowEdit: true,
         },
         {
             name: 'pomhierarchyname',
@@ -118,6 +118,8 @@ export class GRID_001GridBase extends GridControlBase {
     public getGridRowModel(){
         return {
           pomhierarchyid: new FormItemModel(),
+          organizationname: new FormItemModel(),
+          organizationid: new FormItemModel(),
           pomhierarchyname: new FormItemModel(),
           showorder: new FormItemModel(),
           srfkey: new FormItemModel(),
@@ -135,6 +137,14 @@ export class GRID_001GridBase extends GridControlBase {
             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '值不能为空', trigger: 'change' },
             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '值不能为空', trigger: 'blur' },
         ],
+        organizationname: [
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '组织名称 值不能为空', trigger: 'change' },
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '组织名称 值不能为空', trigger: 'blur' },
+        ],
+        organizationid: [
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '值不能为空', trigger: 'change' },
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '值不能为空', trigger: 'blur' },
+        ],
         pomhierarchyname: [
             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '上级组织 值不能为空', trigger: 'change' },
             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '上级组织 值不能为空', trigger: 'blur' },
@@ -156,7 +166,7 @@ export class GRID_001GridBase extends GridControlBase {
      * @memberof GRID_001Base
      */
     public hasRowEdit: any = {
-        'organizationname':false,
+        'organizationname':true,
         'pomhierarchyname':true,
         'showorder':true,
     };

app_PIM/src/widgets/hromhierarchy/grid-001-grid/grid-001-grid-model.ts

@@ -41,11 +41,13 @@ export default class GRID_001Model {
           name: 'organizationname',
           prop: 'organizationname',
           dataType: 'PICKUPTEXT',
+          isEditable:true
         },
         {
           name: 'organizationid',
           prop: 'organizationid',
           dataType: 'PICKUP',
+          isEditable:true
         },
         {
           name: 'pomhierarchyname',

app_PIM/src/widgets/hromhierarchy/grid-001-grid/grid-001-grid-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 GRID_001Model from './grid-001-grid-model';
+import HROrganizationService from '@/service/hrorganization/hrorganization-service';
 
 
 /**
@@ -42,6 +43,14 @@ export default class GRID_001Service extends ControlService {
     }
 
 
+    /**
+     * 组织服务对象
+     *
+     * @type {HROrganizationService}
+     * @memberof GRID_001Service
+     */
+    public hrorganizationService: HROrganizationService = new HROrganizationService();
+
     /**
      * 处理数据
      *
@@ -83,6 +92,9 @@ export default class GRID_001Service 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, 'HROrganizationService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.hrorganizationService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'organizationid', 'hrorganization');
+        }
         if (Object.is(serviceName, 'HROMHierarchyService') && Object.is(interfaceName, 'FetchDefault')) {
             return this.doItems(this.appEntityService.FetchDefault(JSON.parse(JSON.stringify(context)), data, isloading), 'omhierarchyid', 'hromhierarchy');
         }

app_PIM/src/widgets/hromhierarchy/grid-001-grid/grid-001-grid.html

@@ -24,19 +24,47 @@
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
             <template v-if="getColumnState('organizationname')">
-                <el-table-column show-overflow-tooltip :prop="'organizationname'" :label="$t('entities.hromhierarchy.grid_001_grid.columns.organizationname')" :width="100"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'organizationname'" :label="$t('entities.hromhierarchy.grid_001_grid.columns.organizationname')" :width="250"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.hromhierarchy.grid_001_grid.columns.organizationname')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.organizationname}}</span>
+                        <template v-if="actualIsOpenEdit">
+                            <app-form-item :error="gridItemsModel[$index][column.property].error">
+                                
+            <app-picker 
+              :formState="viewState" 
+              :data="row"
+              :context="context"
+              :viewparams="viewparams"
+              :localContext ='{ }' 
+              :localParam ='{ }' 
+              :disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1" 
+              name='organizationname'
+              deMajorField='organizationname'
+              deKeyField='hrorganization'
+              :service="service"
+              :acParams="{ serviceName: 'HROrganizationService', interfaceName: 'FetchDefault'}"
+              valueitem='organizationid' 
+              :value="row[column.property]" 
+              editortype="" 
+              :pickupView="{ viewname: 'hrorganization-pickup-view', title: $t('entities.hrorganization.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'hrorganizations', parameterName: 'hrorganization' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+              style=""  
+              @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}">
+            </app-picker>
+            
+                            </app-form-item>
+                        </template>
+                        <template v-if="!actualIsOpenEdit">
+            <app-span name='organizationname' editorType="PICKER" :value="row.organizationname" dataType="PICKUPTEXT" precision="0" ></app-span>
+                        </template>
                     </template>
                 </el-table-column>
             </template>
             <template v-if="getColumnState('pomhierarchyname')">
-                <el-table-column show-overflow-tooltip :prop="'pomhierarchyname'" :label="$t('entities.hromhierarchy.grid_001_grid.columns.pomhierarchyname')" :width="100"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'pomhierarchyname'" :label="$t('entities.hromhierarchy.grid_001_grid.columns.pomhierarchyname')" :width="250"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.hromhierarchy.grid_001_grid.columns.pomhierarchyname')}}
@@ -76,7 +104,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('showorder')">
-                <el-table-column show-overflow-tooltip :prop="'showorder'" :label="$t('entities.hromhierarchy.grid_001_grid.columns.showorder')" :width="100"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'showorder'" :label="$t('entities.hromhierarchy.grid_001_grid.columns.showorder')" :width="150"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.hromhierarchy.grid_001_grid.columns.showorder')}}

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

@@ -107,8 +107,7 @@ export default class TREE_001Service extends ControlService {
 
 
         if (!srfnodeid || Object.is(srfnodeid, '#')) {
-            await this.fillRootNodes(context, filter, list);
-            return Promise.resolve({ status: 200, data: list });
+            srfnodeid = this.TREENODE_ROOT;
         }
 
         let strTreeNodeId: string = srfnodeid;

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/domain/HROMHierarchyCat.java

@@ -49,7 +49,7 @@ public class HROMHierarchyCat extends EntityMP implements Serializable {
     @JsonProperty("omhierarchycatid")
     private String omhierarchycatid;
     /**
-     * 名称
+     * 层次类别名称
      */
     @TableField(value = "omhierarchycatname")
     @JSONField(name = "omhierarchycatname")
@@ -100,7 +100,7 @@ public class HROMHierarchyCat extends EntityMP implements Serializable {
 
 
     /**
-     * 设置 [名称]
+     * 设置 [层次类别名称]
      */
     public void setOmhierarchycatname(String omhierarchycatname){
         this.omhierarchycatname = omhierarchycatname ;

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/filter/HROMHierarchyCatSearchContext.java

@@ -27,7 +27,7 @@ import cn.ibizlab.humanresource.core.base.domain.HROMHierarchyCat;
 @Data
 public class HROMHierarchyCatSearchContext extends QueryWrapperContext<HROMHierarchyCat> {
 
-	private String n_omhierarchycatname_like;//[名称]
+	private String n_omhierarchycatname_like;//[层次类别名称]
 	public void setN_omhierarchycatname_like(String n_omhierarchycatname_like) {
         this.n_omhierarchycatname_like = n_omhierarchycatname_like;
         if(!ObjectUtils.isEmpty(this.n_omhierarchycatname_like)){