jackwang 部署微服务应用

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

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

app_PIM/src/interface/entity/hromhierarchy.ts

@@ -109,4 +109,12 @@ export interface HROMHierarchy {
      * @memberof HROMHierarchy
      */
     hromhierarchycatname?: any;
+
+    /**
+     * 组织简称
+     *
+     * @returns {*}
+     * @memberof HROMHierarchy
+     */
+    shortname?: any;
 }
\ No newline at end of file

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

@@ -14,6 +14,7 @@ export default {
     organizationname: "组织名称",
     showorder: "排序号",
     hromhierarchycatname: "名称",
+    shortname: "组织简称",
   },
 	views: {
 		gridview: {
@@ -65,6 +66,7 @@ export default {
 		columns: {
 			organizationname: "组织名称",
 			pomhierarchyname: "上级组织",
+			shortname: "组织简称",
 			showorder: "排序号",
 		},
 		uiactions: {
@@ -74,6 +76,7 @@ export default {
 		columns: {
 			organizationname: "组织名称",
 			pomhierarchyname: "上级组织",
+			shortname: "组织简称",
 			showorder: "排序号",
 		},
 		uiactions: {

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

@@ -13,6 +13,7 @@ export default {
     organizationname: "组织名称",
     showorder: "排序号",
     hromhierarchycatname: "名称",
+    shortname: "组织简称",
   },
 	views: {
 		gridview: {
@@ -64,6 +65,7 @@ export default {
 		columns: {
 			organizationname: "组织名称",
 			pomhierarchyname: "上级组织",
+			shortname: "组织简称",
 			showorder: "排序号",
 		},
 		uiactions: {
@@ -73,6 +75,7 @@ export default {
 		columns: {
 			organizationname: "组织名称",
 			pomhierarchyname: "上级组织",
+			shortname: "组织简称",
 			showorder: "排序号",
 		},
 		uiactions: {

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-cat-v-002/hromhierarchy-cat-v-002-base.tsx

@@ -99,10 +99,10 @@ export class HROMHierarchyCatV_002Base extends EditViewBase {
      * @memberof HROMHierarchyCatV_002
      */
     public toolBarModels: any = {
-        tbitem1_ff_001: { name: 'tbitem1_ff_001', caption: '编辑', 'isShowCaption': true, 'isShowIcon': true, tooltip: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FF_001', target: 'SINGLEKEY', class: '' } },
+        tbitem1_ff_001: { name: 'tbitem1_ff_001', caption: '编辑', 'isShowCaption': true, 'isShowIcon': true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FF_001', target: 'SINGLEKEY', class: '' } },
 
         tbitem1_remove_sep: {  name: 'tbitem1_remove_sep', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem1_remove: { name: 'tbitem1_remove', caption: '删除并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'SINGLEKEY', class: '' } },
+        tbitem1_remove: { name: 'tbitem1_remove', caption: '删除并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '删除并关闭', iconcls: 'fa fa-remove', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'SINGLEKEY', class: '' } },
 
         tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem22: { name: 'tbitem22', caption: '关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Exit', target: '', class: '' } },

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

@@ -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/main-form/main-form-base.tsx

@@ -104,7 +104,7 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public detailsModel: any = {
-        group1: new FormGroupPanelModel({ caption: '结构层次类别信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hromhierarchycat.main_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.main_form', extractMode: 'ITEM', details: [] } }),
 
         formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
 
@@ -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-form/main-form.html

@@ -3,7 +3,7 @@
     <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.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hromhierarchycat.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.omhierarchycatname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">

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

@@ -99,6 +99,14 @@ export class GRID_001GridBase extends GridControlBase {
             util: 'PX',
             isEnableRowEdit: true,
         },
+        {
+            name: 'shortname',
+            label: '组织简称',
+            langtag: 'entities.hromhierarchy.grid_001_grid.columns.shortname',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
         {
             name: 'showorder',
             label: '排序号',
@@ -168,6 +176,7 @@ export class GRID_001GridBase extends GridControlBase {
     public hasRowEdit: any = {
         'organizationname':true,
         'pomhierarchyname':true,
+        'shortname':false,
         'showorder':true,
     };
 

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

@@ -61,6 +61,11 @@ export default class GRID_001Model {
           dataType: 'BIGINT',
           isEditable:true
         },
+        {
+          name: 'shortname',
+          prop: 'shortname',
+          dataType: 'PICKUPDATA',
+        },
         {
           name: 'srfmajortext',
           prop: 'organizationname',

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

@@ -103,6 +103,18 @@
                     </template>
                 </el-table-column>
             </template>
+            <template v-if="getColumnState('shortname')">
+                <el-table-column show-overflow-tooltip :prop="'shortname'" :label="$t('entities.hromhierarchy.grid_001_grid.columns.shortname')" :width="200"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hromhierarchy.grid_001_grid.columns.shortname')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.shortname}}</span>
+                    </template>
+                </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="150"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">

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

@@ -99,6 +99,14 @@ export class MainGridBase extends GridControlBase {
             util: 'PX',
             isEnableRowEdit: false,
         },
+        {
+            name: 'shortname',
+            label: '组织简称',
+            langtag: 'entities.hromhierarchy.main_grid.columns.shortname',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
         {
             name: 'showorder',
             label: '排序号',
@@ -158,6 +166,7 @@ export class MainGridBase extends GridControlBase {
     public hasRowEdit: any = {
         'organizationname':false,
         'pomhierarchyname':false,
+        'shortname':false,
         'showorder':false,
     };
 

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

@@ -59,6 +59,11 @@ export default class MainModel {
           dataType: 'BIGINT',
           isEditable:true
         },
+        {
+          name: 'shortname',
+          prop: 'shortname',
+          dataType: 'PICKUPDATA',
+        },
         {
           name: 'srfmajortext',
           prop: 'organizationname',

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

@@ -49,6 +49,18 @@
                     </template>
                 </el-table-column>
             </template>
+            <template v-if="getColumnState('shortname')">
+                <el-table-column show-overflow-tooltip :prop="'shortname'" :label="$t('entities.hromhierarchy.main_grid.columns.shortname')" :width="200"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hromhierarchy.main_grid.columns.shortname')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.shortname}}</span>
+                    </template>
+                </el-table-column>
+            </template>
             <template v-if="getColumnState('showorder')">
                 <el-table-column show-overflow-tooltip :prop="'showorder'" :label="$t('entities.hromhierarchy.main_grid.columns.showorder')" :width="100"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">

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

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

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

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

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

@@ -212,7 +212,7 @@ export default class TREE_001Service extends ControlService {
                         let treeNode: any = {};
                         // 整理context
                         let strId: string = entity.omhierarchyid;
-                        let strText: string = entity.organizationname;
+                        let strText: string = entity.shortname;
                         Object.assign(treeNode,{srfparentdename:'HROMHierarchy',srfparentkey:entity.omhierarchyid});
                         let tempContext:any = JSON.parse(JSON.stringify(context));
                         Object.assign(tempContext,{srfparentdename:'HROMHierarchy',srfparentkey:entity.omhierarchyid,hromhierarchy:strId})
@@ -224,6 +224,7 @@ export default class TREE_001Service extends ControlService {
                         strNodeId += this.TREENODE_SEPARATOR;
                         strNodeId += strId;
                         Object.assign(treeNode, { id: strNodeId });
+                        Object.assign(treeNode, { iconcls: 'fa fa-building-o' });
                         Object.assign(treeNode, { expanded: filter.isautoexpand });
                         Object.assign(treeNode, { leaf: true });
                         Object.assign(treeNode, { curData: entity });
@@ -272,6 +273,7 @@ export default class TREE_001Service extends ControlService {
             if(context && context.srfparentkey){
                 Object.assign(searchFilter,{srfparentkey:JSON.parse(JSON.stringify(context)).srfparentkey});
             }
+            Object.assign(searchFilter,{sort: 'showorder,asc'})
             const _appEntityService: any = this.appEntityService;
             let list: any[] = [];
             if (_appEntityService['FetchDefault'] && _appEntityService['FetchDefault'] instanceof Function) {
@@ -416,7 +418,7 @@ export default class TREE_001Service extends ControlService {
                         let treeNode: any = {};
                         // 整理context
                         let strId: string = entity.omhierarchyid;
-                        let strText: string = entity.organizationname;
+                        let strText: string = entity.shortname;
                         Object.assign(treeNode,{srfparentdename:'HROMHierarchy',srfparentkey:entity.omhierarchyid});
                         let tempContext:any = JSON.parse(JSON.stringify(context));
                         Object.assign(tempContext,{srfparentdename:'HROMHierarchy',srfparentkey:entity.omhierarchyid,hromhierarchy:strId})
@@ -428,7 +430,8 @@ export default class TREE_001Service extends ControlService {
                         strNodeId += this.TREENODE_SEPARATOR;
                         strNodeId += strId;
                         Object.assign(treeNode, { id: strNodeId });
-                        Object.assign(treeNode, { expanded: filter.isautoexpand });
+                        Object.assign(treeNode, { iconcls: 'fa fa-sitemap' });
+                        Object.assign(treeNode, { expanded: true });
                         Object.assign(treeNode, { leaf: false });
                         Object.assign(treeNode, { curData: entity });
                         Object.assign(treeNode, { nodeid: treeNode.srfkey });
@@ -476,6 +479,7 @@ export default class TREE_001Service extends ControlService {
             if(context && context.srfparentkey){
                 Object.assign(searchFilter,{srfparentkey:JSON.parse(JSON.stringify(context)).srfparentkey});
             }
+            Object.assign(searchFilter,{sort: 'showorder,asc'})
             const _appEntityService: any = this.appEntityService;
             let list: any[] = [];
             if (_appEntityService['FetchDefault'] && _appEntityService['FetchDefault'] instanceof Function) {

app_PIM/src/widgets/hromhierarchy/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-base.tsx

@@ -190,14 +190,14 @@ export class TreeExpViewtreeexpbarTreeExpBarBase extends MainControlBase {
         if (Object.is(expmode, 'SECOND')) {
             return {  
                 viewname: 'hromhierarchy-grid-view', 
-                parentdata: {"srfparentdefname":"POMHIERARCHYID","srfparentdename":"HROMHIERARCHY","srfparentmode":"DER1N_OMHIERARCHY_OMHIERARCHY_POMHIERARCHYID"},
+                parentdata: {"srfparentdefname":"HROMHIERARCHYCATID","srfparentdename":"HROMHIERARCHYCAT","srfparentmode":"DER1N_HROMHIERARCHY_HROMHIERARCHYCAT_HROMHIERARCHYCATID_ABD0C1"},
                 deKeyField:'hromhierarchy'
 			};
         }
         if (Object.is(expmode, 'FIRST')) {
             return {  
                 viewname: 'hromhierarchy-grid-view', 
-                parentdata: {"srfparentdefname":"POMHIERARCHYID","srfparentdename":"HROMHIERARCHY","srfparentmode":"DER1N_OMHIERARCHY_OMHIERARCHY_POMHIERARCHYID"},
+                parentdata: {"srfparentdefname":"HROMHIERARCHYCATID","srfparentdename":"HROMHIERARCHYCAT","srfparentmode":"DER1N_HROMHIERARCHY_HROMHIERARCHYCAT_HROMHIERARCHYCATID_ABD0C1"},
                 deKeyField:'hromhierarchy'
 			};
         }

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

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

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

@@ -138,6 +138,13 @@ public class HROMHierarchy extends EntityMP implements Serializable {
     @JSONField(name = "hromhierarchycatname")
     @JsonProperty("hromhierarchycatname")
     private String hromhierarchycatname;
+    /**
+     * 组织简称
+     */
+    @TableField(exist = false)
+    @JSONField(name = "shortname")
+    @JsonProperty("shortname")
+    private String shortname;
 
     /**
      * 

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)){

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/base/service/impl/HROMHierarchyServiceImpl.java

@@ -231,6 +231,7 @@ public class HROMHierarchyServiceImpl extends ServiceImpl<HROMHierarchyMapper, H
                 hrorganization=majorEntity;
             }
             et.setOrganizationname(hrorganization.getOrganizationname());
+            et.setShortname(hrorganization.getShortname());
         }
     }
 

humanresource-core/src/main/resources/mapper/base/hromhierarchy/HROMHierarchyMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="HROMHierarchyResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t41.`OMHIERARCHYCATNAME` AS `HROMHIERARCHYCATNAME`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t21.`ORGANIZATIONNAME` AS `POMHIERARCHYNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID  LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN ORGANIZATION t31 ON t1.ORGANIZATIONID = t31.ORGANIZATIONID  LEFT JOIN OMHIERARCHYCAT t41 ON t1.HROMHIERARCHYCATID = t41.OMHIERARCHYCATID  ) t1 where omhierarchyid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t41.`OMHIERARCHYCATNAME` AS `HROMHIERARCHYCATNAME`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t21.`ORGANIZATIONNAME` AS `POMHIERARCHYNAME`, t31.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID  LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN ORGANIZATION t31 ON t1.ORGANIZATIONID = t31.ORGANIZATIONID  LEFT JOIN OMHIERARCHYCAT t41 ON t1.HROMHIERARCHYCATID = t41.OMHIERARCHYCATID  ) t1 where omhierarchyid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -57,12 +57,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t41.`OMHIERARCHYCATNAME` AS `HROMHIERARCHYCATNAME`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t21.`ORGANIZATIONNAME` AS `POMHIERARCHYNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID  LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN ORGANIZATION t31 ON t1.ORGANIZATIONID = t31.ORGANIZATIONID  LEFT JOIN OMHIERARCHYCAT t41 ON t1.HROMHIERARCHYCATID = t41.OMHIERARCHYCATID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t41.`OMHIERARCHYCATNAME` AS `HROMHIERARCHYCATNAME`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t21.`ORGANIZATIONNAME` AS `POMHIERARCHYNAME`, t31.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID  LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN ORGANIZATION t31 ON t1.ORGANIZATIONID = t31.ORGANIZATIONID  LEFT JOIN OMHIERARCHYCAT t41 ON t1.HROMHIERARCHYCATID = t41.OMHIERARCHYCATID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t41.`OMHIERARCHYCATNAME` AS `HROMHIERARCHYCATNAME`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t21.`ORGANIZATIONNAME` AS `POMHIERARCHYNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID  LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN ORGANIZATION t31 ON t1.ORGANIZATIONID = t31.ORGANIZATIONID  LEFT JOIN OMHIERARCHYCAT t41 ON t1.HROMHIERARCHYCATID = t41.OMHIERARCHYCATID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HROMHIERARCHYCATID`, t41.`OMHIERARCHYCATNAME` AS `HROMHIERARCHYCATNAME`, t1.`OMHIERARCHYID`, t1.`OMHIERARCHYNAME`, t1.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, t1.`POMHIERARCHYID`, t21.`ORGANIZATIONNAME` AS `POMHIERARCHYNAME`, t31.`SHORTNAME`, t1.`SHOWORDER`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `OMHIERARCHY` t1  LEFT JOIN OMHIERARCHY t11 ON t1.POMHIERARCHYID = t11.OMHIERARCHYID  LEFT JOIN ORGANIZATION t21 ON t11.ORGANIZATIONID = t21.ORGANIZATIONID  LEFT JOIN ORGANIZATION t31 ON t1.ORGANIZATIONID = t31.ORGANIZATIONID  LEFT JOIN OMHIERARCHYCAT t41 ON t1.HROMHIERARCHYCATID = t41.OMHIERARCHYCATID  
 			]]>
     </sql>
 </mapper>

humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HROMHierarchyDTO.java

@@ -130,6 +130,14 @@ public class HROMHierarchyDTO extends DTOBase implements Serializable {
     @JsonProperty("hromhierarchycatname")
     private String hromhierarchycatname;
 
+    /**
+     * 属性 [SHORTNAME]
+     *
+     */
+    @JSONField(name = "shortname")
+    @JsonProperty("shortname")
+    private String shortname;
+
 
     /**
      * 设置 [OMHIERARCHYNAME]