jackwang 部署微服务应用

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

@@ -530,8 +530,8 @@
         "memo": "系统自动添加"
     },
     "hremployeegridview": {
-        "title": "员工",
-        "caption": "员工",
+        "title": "员工清单",
+        "caption": "员工清单",
         "viewtype": "DEGRIDVIEW",
         "viewmodule": "HumanResource",
         "viewname": "HREmployeeGridView",

app_PIM/src/locale/lanres/entities/hremployee/hremployee_en_US.ts

@@ -59,8 +59,8 @@ export default {
       		title: "员工信息",
 		},
 		gridview: {
-			caption: "员工",
-      		title: "员工",
+			caption: "员工清单",
+      		title: "员工清单",
 		},
 		editview: {
 			caption: "员工信息",
@@ -158,10 +158,10 @@ export default {
 		details: {
 			grouppanel1: "分组面板", 
 			grouppanel2: "first", 
-			grouppanel4: "联系信息", 
+			group1: "基本信息", 
 			grouppanel3: "补充信息", 
+			grouppanel4: "联系信息", 
 			grouppanel5: "工作相关", 
-			group1: "基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -182,10 +182,6 @@ export default {
 			nation: "民族", 
 			organizationname: "单位", 
 			photo: "照片", 
-			mobile: "移动电话", 
-			telephone: "固定电话", 
-			email: "电子邮箱", 
-			postaladdress: "通讯地址", 
 			nativetype: "户口类型", 
 			nativeplace: "籍贯", 
 			marriage: "婚姻状况", 
@@ -196,6 +192,10 @@ export default {
 			health: "健康状况", 
 			political: "政治面貌", 
 			politicaltime: "入党时间", 
+			mobile: "移动电话", 
+			telephone: "固定电话", 
+			email: "电子邮箱", 
+			postaladdress: "通讯地址", 
 			entrytype: "入职渠道", 
 			startworktime: "参加工作时间", 
 			startorgtime: "到本单位时间", 
@@ -223,49 +223,17 @@ export default {
 		},
 	},
 	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "Save",
-			tip: "Save",
-		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
-		tbitem5: {
+		tbitem1: {
 			caption: "Save And Close",
 			tip: "Save And Close Window",
 		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem16: {
-			caption: "-",
+		seperator1: {
+			caption: "",
 			tip: "",
 		},
-		tbitem22: {
-			caption: "Help",
-			tip: "Help",
+		tbitem2: {
+			caption: "关闭",
+			tip: "关闭",
 		},
 	},
 	treeexpviewtoolbar_toolbar: {

app_PIM/src/locale/lanres/entities/hremployee/hremployee_zh_CN.ts

@@ -58,8 +58,8 @@ export default {
       		title: "员工信息",
 		},
 		gridview: {
-			caption: "员工",
-      		title: "员工",
+			caption: "员工清单",
+      		title: "员工清单",
 		},
 		editview: {
 			caption: "员工信息",
@@ -157,10 +157,10 @@ export default {
 		details: {
 			grouppanel1: "分组面板", 
 			grouppanel2: "first", 
-			grouppanel4: "联系信息", 
+			group1: "基本信息", 
 			grouppanel3: "补充信息", 
+			grouppanel4: "联系信息", 
 			grouppanel5: "工作相关", 
-			group1: "基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -181,10 +181,6 @@ export default {
 			nation: "民族", 
 			organizationname: "单位", 
 			photo: "照片", 
-			mobile: "移动电话", 
-			telephone: "固定电话", 
-			email: "电子邮箱", 
-			postaladdress: "通讯地址", 
 			nativetype: "户口类型", 
 			nativeplace: "籍贯", 
 			marriage: "婚姻状况", 
@@ -195,6 +191,10 @@ export default {
 			health: "健康状况", 
 			political: "政治面貌", 
 			politicaltime: "入党时间", 
+			mobile: "移动电话", 
+			telephone: "固定电话", 
+			email: "电子邮箱", 
+			postaladdress: "通讯地址", 
 			entrytype: "入职渠道", 
 			startworktime: "参加工作时间", 
 			startorgtime: "到本单位时间", 
@@ -222,49 +222,17 @@ export default {
 		},
 	},
 	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "保存",
-			tip: "保存",
-		},
-		tbitem4: {
-			caption: "保存并新建",
-			tip: "保存并新建",
-		},
-		tbitem5: {
+		tbitem1: {
 			caption: "保存并关闭",
 			tip: "保存并关闭",
 		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "删除并关闭",
-			tip: "删除并关闭",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-		tbitem16: {
-			caption: "-",
+		seperator1: {
+			caption: "",
 			tip: "",
 		},
-		tbitem22: {
-			caption: "帮助",
-			tip: "帮助",
+		tbitem2: {
+			caption: "关闭",
+			tip: "关闭",
 		},
 	},
 	treeexpviewtoolbar_toolbar: {

app_PIM/src/mock/viewconfig/viewconfig.ts

@@ -432,8 +432,8 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "9420eeffff765c2a6e4ac27dfae7fb2d"
         },
         "hremployeegridview": {
-            "title": "员工",
-            "caption": "员工",
+            "title": "员工清单",
+            "caption": "员工清单",
             "viewtype": "DEGRIDVIEW",
             "viewmodule": "HumanResource",
             "viewname": "HREmployeeGridView",

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

@@ -9,7 +9,7 @@ import CodeListService from "@service/app/codelist-service";
 
 
 /**
- * 员工视图基类
+ * 员工清单视图基类
  *
  * @export
  * @class HREmployeeGridViewBase
@@ -506,16 +506,28 @@ export class HREmployeeGridViewBase extends GridViewBase {
         const deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'hremployees', parameterName: 'hremployee' },
-            { pathName: 'v_001', parameterName: 'v_001' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        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);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'hremployee-v-001', 
+            height: 0, 
+            width: 600,  
+            title: this.$t('entities.hremployee.views.v_001.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
     }
 
 

app_PIM/src/pages/human-resource/hremployee-grid-view/hremployee-grid-view.html

-<studio-view-style2 viewName="hremployeegridview" viewTitle="员工" class='degridview hremployee-grid-view'>
+<studio-view-style2 viewName="hremployeegridview" viewTitle="员工清单" class='degridview hremployee-grid-view'>
     <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.apply(_self, arguments)"/>    </template>

app_PIM/src/pages/human-resource/hremployee-grid-view/hremployee-grid-view.vue

@@ -7,7 +7,7 @@ import view_grid from '@widgets/hremployee/main-grid/main-grid.vue';
 import view_searchform from '@widgets/hremployee/default-searchform/default-searchform.vue';
 
 /**
- * 员工视图
+ * 员工清单视图
  *
  * @export
  * @class HREmployeeGridView

app_PIM/src/uiservice/hremployee/hremployee-ui-service-base.ts

@@ -270,20 +270,31 @@ export default class HREmployeeUIServiceBase extends UIService {
         let deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'hremployees', parameterName: 'hremployee' },
-            { pathName: 'v_001', parameterName: 'v_001' },
         ];
-        const openIndexViewTab = (data: any) => {
-            const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
-            actionContext.$router.push(routePath);
-            if (xData && xData.refresh && xData.refresh instanceof Function) {
-                xData.refresh(args);
-            }
-            if (this.HREmployee_FF_001 && this.HREmployee_FF_001 instanceof Function) {
-                this.HREmployee_FF_001([data],context,params, $event, xData,actionContext);
+            const openDrawer = (view: any, data: any) => {
+                let container: Subject<any> = actionContext.$appdrawer.openDrawer(view, context,data);
+                container.subscribe((result: any) => {
+                    if (!result || !Object.is(result.ret, 'OK')) {
+                        return;
+                    }
+                    const _this: any = actionContext;
+                    if (xData && xData.refresh && xData.refresh instanceof Function) {
+                        xData.refresh(args);
+                    }
+                    if (this.HREmployee_FF_001 && this.HREmployee_FF_001 instanceof Function) {
+                        this.HREmployee_FF_001(result.datas[0],context,params, $event, xData,actionContext);
+                    }
+                    return result.datas;
+                });
             }
-            return null;
-        }
-        openIndexViewTab(data);
+            const view: any = {
+                viewname: 'hremployee-v-001', 
+                height: 0, 
+                width: 600,  
+                title: actionContext.$t('entities.hremployee.views.v_001.title'),
+                placement: 'DRAWER_RIGHT',
+            };
+            openDrawer(view, data);
     }
 
     /**

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

@@ -93,10 +93,6 @@ export class IF_001EditFormBase extends EditFormControlBase {
         nation: null,
         organizationname: null,
         photo: null,
-        mobile: null,
-        telephone: null,
-        email: null,
-        postaladdress: null,
         nativetype: null,
         nativeplace: null,
         marriage: null,
@@ -107,6 +103,10 @@ export class IF_001EditFormBase extends EditFormControlBase {
         health: null,
         political: null,
         politicaltime: null,
+        mobile: null,
+        telephone: null,
+        email: null,
+        postaladdress: null,
         entrytype: null,
         startworktime: null,
         startorgtime: null,
@@ -147,13 +147,13 @@ export class IF_001EditFormBase extends EditFormControlBase {
 
         grouppanel2: new FormGroupPanelModel({ caption: 'first', detailType: 'GROUPPANEL', name: 'grouppanel2', visible: true, isShowCaption: false, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hremployee.if_001_form', extractMode: 'ITEM', details: [] } }),
 
-        grouppanel4: new FormGroupPanelModel({ caption: '联系信息', detailType: 'GROUPPANEL', name: 'grouppanel4', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hremployee.if_001_form', extractMode: 'ITEM', details: [] } }),
+        group1: new FormGroupPanelModel({ caption: '基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hremployee.if_001_form', extractMode: 'ITEM', details: [] } }),
 
         grouppanel3: new FormGroupPanelModel({ caption: '补充信息', detailType: 'GROUPPANEL', name: 'grouppanel3', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hremployee.if_001_form', extractMode: 'ITEM', details: [] } }),
 
-        grouppanel5: new FormGroupPanelModel({ caption: '工作相关', detailType: 'GROUPPANEL', name: 'grouppanel5', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hremployee.if_001_form', extractMode: 'ITEM', details: [] } }),
+        grouppanel4: new FormGroupPanelModel({ caption: '联系信息', detailType: 'GROUPPANEL', name: 'grouppanel4', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hremployee.if_001_form', extractMode: 'ITEM', details: [] } }),
 
-        group1: new FormGroupPanelModel({ caption: '基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hremployee.if_001_form', extractMode: 'ITEM', details: [] } }),
+        grouppanel5: new FormGroupPanelModel({ caption: '工作相关', detailType: 'GROUPPANEL', name: 'grouppanel5', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hremployee.if_001_form', extractMode: 'ITEM', details: [] } }),
 
         formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
 
@@ -195,14 +195,6 @@ export class IF_001EditFormBase extends EditFormControlBase {
 
         photo: new FormItemModel({ caption: '照片', detailType: 'FORMITEM', name: 'photo', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        mobile: new FormItemModel({ caption: '移动电话', detailType: 'FORMITEM', name: 'mobile', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
-
-        telephone: new FormItemModel({ caption: '固定电话', detailType: 'FORMITEM', name: 'telephone', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
-
-        email: new FormItemModel({ caption: '电子邮箱', detailType: 'FORMITEM', name: 'email', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
-
-        postaladdress: new FormItemModel({ caption: '通讯地址', detailType: 'FORMITEM', name: 'postaladdress', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
-
         nativetype: new FormItemModel({ caption: '户口类型', detailType: 'FORMITEM', name: 'nativetype', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         nativeplace: new FormItemModel({ caption: '籍贯', detailType: 'FORMITEM', name: 'nativeplace', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
@@ -223,6 +215,14 @@ export class IF_001EditFormBase extends EditFormControlBase {
 
         politicaltime: new FormItemModel({ caption: '入党时间', detailType: 'FORMITEM', name: 'politicaltime', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
+        mobile: new FormItemModel({ caption: '移动电话', detailType: 'FORMITEM', name: 'mobile', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        telephone: new FormItemModel({ caption: '固定电话', detailType: 'FORMITEM', name: 'telephone', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        email: new FormItemModel({ caption: '电子邮箱', detailType: 'FORMITEM', name: 'email', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        postaladdress: new FormItemModel({ caption: '通讯地址', detailType: 'FORMITEM', name: 'postaladdress', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
         entrytype: new FormItemModel({ caption: '入职渠道', detailType: 'FORMITEM', name: 'entrytype', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         startworktime: new FormItemModel({ caption: '参加工作时间', detailType: 'FORMITEM', name: 'startworktime', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),

app_PIM/src/widgets/hremployee/if-001-form/if-001-form-model.ts

@@ -110,26 +110,6 @@ export default class IF_001Model {
         prop: 'photo',
         dataType: 'TEXT',
       },
-      {
-        name: 'mobile',
-        prop: 'mobile',
-        dataType: 'TEXT',
-      },
-      {
-        name: 'telephone',
-        prop: 'telephone',
-        dataType: 'TEXT',
-      },
-      {
-        name: 'email',
-        prop: 'email',
-        dataType: 'TEXT',
-      },
-      {
-        name: 'postaladdress',
-        prop: 'postaladdress',
-        dataType: 'TEXT',
-      },
       {
         name: 'nativetype',
         prop: 'nativetype',
@@ -180,6 +160,26 @@ export default class IF_001Model {
         prop: 'politicaltime',
         dataType: 'DATE',
       },
+      {
+        name: 'mobile',
+        prop: 'mobile',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'telephone',
+        prop: 'telephone',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'email',
+        prop: 'email',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'postaladdress',
+        prop: 'postaladdress',
+        dataType: 'TEXT',
+      },
       {
         name: 'entrytype',
         prop: 'entrytype',

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

@@ -139,50 +139,6 @@ tag='CL_HR_0008' codelistType='STATIC' :data="data" :context="context" :viewpara
     </row>
 </app-form-group>
 
-</i-col>
-<i-col class="form-layout-container" v-show="detailsModel.grouppanel4.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group :model="detailsModel.grouppanel4" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel4.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hremployee.if_001_form.details.grouppanel4')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="true" >    
-    <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.grouppanel4" :data="data" :context="context" :viewparams="viewparams"/>
-    <row>
-        <i-col class="form-layout-container" v-show="detailsModel.mobile.visible" :style="{}"  :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
-    <app-form-item name='mobile' :itemRules="this.rules.mobile" class='' :caption="$t('entities.hremployee.if_001_form.details.mobile')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.mobile.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-span name='mobile' :value="data.mobile" dataType="TEXT"     :precision="0"
-:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
-</app-span>
-
-</app-form-item>
-
-</i-col>
-<i-col class="form-layout-container" v-show="detailsModel.telephone.visible" :style="{}"  :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
-    <app-form-item name='telephone' :itemRules="this.rules.telephone" class='' :caption="$t('entities.hremployee.if_001_form.details.telephone')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.telephone.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-span name='telephone' :value="data.telephone" dataType="TEXT"     :precision="0"
-:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
-</app-span>
-
-</app-form-item>
-
-</i-col>
-<i-col class="form-layout-container" v-show="detailsModel.email.visible" :style="{}"  :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
-    <app-form-item name='email' :itemRules="this.rules.email" class='' :caption="$t('entities.hremployee.if_001_form.details.email')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.email.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-span name='email' :value="data.email" dataType="TEXT"     :precision="0"
-:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
-</app-span>
-
-</app-form-item>
-
-</i-col>
-<i-col class="form-layout-container" v-show="detailsModel.postaladdress.visible" :style="{}"  :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
-    <app-form-item name='postaladdress' :itemRules="this.rules.postaladdress" class='' :caption="$t('entities.hremployee.if_001_form.details.postaladdress')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.postaladdress.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-span name='postaladdress' :value="data.postaladdress" dataType="TEXT"     :precision="0"
-:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
-</app-span>
-
-</app-form-item>
-
 </i-col>
     
     </row>
@@ -297,6 +253,55 @@ tag='CL_HR_0013' codelistType='STATIC' :data="data" :context="context" :viewpara
     </row>
 </app-form-group>
 
+</i-col>
+<i-col class="form-layout-container" v-show="detailsModel.grouppanel4.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-group :model="detailsModel.grouppanel4" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel4.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hremployee.if_001_form.details.grouppanel4')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="true" >    
+    <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.grouppanel4" :data="data" :context="context" :viewparams="viewparams"/>
+    <row>
+        <i-col class="form-layout-container" v-show="detailsModel.mobile.visible" :style="{}"  :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='mobile' :itemRules="this.rules.mobile" class='' :caption="$t('entities.hremployee.if_001_form.details.mobile')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.mobile.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-span name='mobile' :value="data.mobile" dataType="TEXT"     :precision="0"
+:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
+</app-span>
+
+</app-form-item>
+
+</i-col>
+<i-col class="form-layout-container" v-show="detailsModel.telephone.visible" :style="{}"  :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='telephone' :itemRules="this.rules.telephone" class='' :caption="$t('entities.hremployee.if_001_form.details.telephone')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.telephone.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-span name='telephone' :value="data.telephone" dataType="TEXT"     :precision="0"
+:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
+</app-span>
+
+</app-form-item>
+
+</i-col>
+<i-col class="form-layout-container" v-show="detailsModel.email.visible" :style="{}"  :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='email' :itemRules="this.rules.email" class='' :caption="$t('entities.hremployee.if_001_form.details.email')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.email.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-span name='email' :value="data.email" dataType="TEXT"     :precision="0"
+:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
+</app-span>
+
+</app-form-item>
+
+</i-col>
+<i-col class="form-layout-container" v-show="detailsModel.postaladdress.visible" :style="{}"  :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
+    <app-form-item name='postaladdress' :itemRules="this.rules.postaladdress" class='' :caption="$t('entities.hremployee.if_001_form.details.postaladdress')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.postaladdress.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-span name='postaladdress' :value="data.postaladdress" dataType="TEXT"     :precision="0"
+:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
+</app-span>
+
+</app-form-item>
+
+</i-col>
+    
+    </row>
+</app-form-group>
+
 </i-col>
 <i-col class="form-layout-container" v-show="detailsModel.grouppanel5.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-group :model="detailsModel.grouppanel5" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel5.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hremployee.if_001_form.details.grouppanel5')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="true" >    
@@ -336,11 +341,6 @@ tag='CL_HR_0015' codelistType='STATIC' :data="data" :context="context" :viewpara
     </row>
 </app-form-group>
 
-</i-col>
-    
-    </row>
-</app-form-group>
-
 </i-col>
 
 

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

@@ -366,6 +366,8 @@ export default class TREE_001Service extends ControlService {
 
             Object.assign(treeNode, { id: strNodeId });
 
+            Object.assign(treeNode, { iconcls: 'fa fa-keyboard-o' });
+
             Object.assign(treeNode, { expanded: filter.isAutoexpand });
             Object.assign(treeNode, { leaf: true });
             Object.assign(treeNode, { nodeid: treeNode.srfkey });
@@ -424,6 +426,8 @@ export default class TREE_001Service extends ControlService {
 
             Object.assign(treeNode, { id: strNodeId });
 
+            Object.assign(treeNode, { iconcls: 'fa fa-certificate' });
+
             Object.assign(treeNode, { expanded: filter.isAutoexpand });
             Object.assign(treeNode, { leaf: true });
             Object.assign(treeNode, { nodeid: treeNode.srfkey });
@@ -482,6 +486,8 @@ export default class TREE_001Service extends ControlService {
 
             Object.assign(treeNode, { id: strNodeId });
 
+            Object.assign(treeNode, { iconcls: 'fa fa-life-saver' });
+
             Object.assign(treeNode, { expanded: filter.isAutoexpand });
             Object.assign(treeNode, { leaf: true });
             Object.assign(treeNode, { nodeid: treeNode.srfkey });
@@ -737,6 +743,8 @@ export default class TREE_001Service extends ControlService {
 
             Object.assign(treeNode, { id: strNodeId });
 
+            Object.assign(treeNode, { iconcls: 'fa fa-newspaper-o' });
+
             Object.assign(treeNode, { expanded: filter.isAutoexpand });
             Object.assign(treeNode, { leaf: true });
             Object.assign(treeNode, { nodeid: treeNode.srfkey });
@@ -795,6 +803,8 @@ export default class TREE_001Service extends ControlService {
 
             Object.assign(treeNode, { id: strNodeId });
 
+            Object.assign(treeNode, { iconcls: 'fa fa-language' });
+
             Object.assign(treeNode, { expanded: filter.isAutoexpand });
             Object.assign(treeNode, { leaf: true });
             Object.assign(treeNode, { nodeid: treeNode.srfkey });
@@ -913,6 +923,8 @@ export default class TREE_001Service extends ControlService {
 
             Object.assign(treeNode, { id: strNodeId });
 
+            Object.assign(treeNode, { iconcls: 'fa fa-male' });
+
             Object.assign(treeNode, { expanded: filter.isAutoexpand });
             Object.assign(treeNode, { leaf: true });
             Object.assign(treeNode, { nodeid: treeNode.srfkey });
@@ -1031,6 +1043,8 @@ export default class TREE_001Service extends ControlService {
 
             Object.assign(treeNode, { id: strNodeId });
 
+            Object.assign(treeNode, { iconcls: 'fa fa-trophy' });
+
             Object.assign(treeNode, { expanded: filter.isAutoexpand });
             Object.assign(treeNode, { leaf: true });
             Object.assign(treeNode, { nodeid: treeNode.srfkey });
@@ -1089,6 +1103,8 @@ export default class TREE_001Service extends ControlService {
 
             Object.assign(treeNode, { id: strNodeId });
 
+            Object.assign(treeNode, { iconcls: 'fa fa-leanpub' });
+
             Object.assign(treeNode, { expanded: filter.isAutoexpand });
             Object.assign(treeNode, { leaf: true });
             Object.assign(treeNode, { nodeid: treeNode.srfkey });
@@ -1207,6 +1223,8 @@ export default class TREE_001Service extends ControlService {
 
             Object.assign(treeNode, { id: strNodeId });
 
+            Object.assign(treeNode, { iconcls: 'fa fa-reorder' });
+
             Object.assign(treeNode, { expanded: filter.isAutoexpand });
             Object.assign(treeNode, { leaf: true });
             Object.assign(treeNode, { nodeid: treeNode.srfkey });
@@ -1265,6 +1283,8 @@ export default class TREE_001Service extends ControlService {
 
             Object.assign(treeNode, { id: strNodeId });
 
+            Object.assign(treeNode, { iconcls: 'fa fa-book' });
+
             Object.assign(treeNode, { expanded: filter.isAutoexpand });
             Object.assign(treeNode, { leaf: true });
             Object.assign(treeNode, { nodeid: treeNode.srfkey });
@@ -1323,6 +1343,8 @@ export default class TREE_001Service extends ControlService {
 
             Object.assign(treeNode, { id: strNodeId });
 
+            Object.assign(treeNode, { iconcls: 'fa fa-wordpress' });
+
             Object.assign(treeNode, { expanded: filter.isAutoexpand });
             Object.assign(treeNode, { leaf: true });
             Object.assign(treeNode, { nodeid: treeNode.srfkey });

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

@@ -178,7 +178,7 @@
 
 
     <!--输出实体[HREMPLOYEE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-162-8">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-177-8">
         <createTable tableName="EMPLOYEE">
                 <column name="EMPLOYEENAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -593,10 +593,10 @@
     </changeSet>
         <!--输出实体[HREMPSTATE]外键关系 -->
         <!--输出实体[HREMPLOYEE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-162-26">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-177-26">
        <addForeignKeyConstraint baseColumnNames="ORGANIZATIONID" baseTableName="EMPLOYEE" constraintName="DER1N_EMPLOYEE_ORGANIZATION_OR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-162-27">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-177-27">
        <addForeignKeyConstraint baseColumnNames="EMPSTATE" baseTableName="EMPLOYEE" constraintName="DER1N_HREMPLOYEE_HREMPSTATE_EM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HREMPSTATEID" referencedTableName="T_HREMPSTATE" validate="true"/>
     </changeSet>
         <!--输出实体[HRLEAVE]外键关系 -->