jackwang 部署微服务应用

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

@@ -609,6 +609,16 @@
         "viewtag": "8959a1a3f5b43dbc52182d6cf04f00a1",
         "memo": "系统自动添加"
     },
+    "hreducationoptionview": {
+        "title": "教育信息",
+        "caption": "教育信息",
+        "viewtype": "DEOPTVIEW",
+        "viewmodule": "HumanResource",
+        "viewname": "HREducationOptionView",
+        "viewfilename": "hreducation-option-view",
+        "viewtag": "8db1cc9344908f2f9e2fb21f3849a539",
+        "memo": ""
+    },
     "hrorgaddresseditview": {
         "title": "组织地址编辑视图",
         "caption": "组织地址",

app_PIM/src/engine/view/edit-view-engine.ts

@@ -195,12 +195,11 @@ export default class EditViewEngine extends ViewEngine {
      */
     public setTabCaption(info: string, isNew: boolean): void {
         let viewdata: any = this.view.model;
-        if (viewdata && info && !Object.is(info, '') && this.view.$tabPageExp && (viewdata.srfTitle.indexOf(" - ") === -1)) {
+        if (viewdata && info && !Object.is(info, '')) {
             if (this.view.$route) {
                 this.view.$route.meta.info = info;
             }
-            const title = this.view.model.srfTitle = `${this.view.$t(viewdata.srfTitle)} - ${viewdata.dataInfo}`;
-            this.view.$emit('viewModelChange', title);
+            this.view.$emit('viewModelChange', this.view.viewCaption);
             this.view.$appService.navHistory.setCaption({ tag: this.view.viewtag, info: viewdata.dataInfo });
         }
     }

app_PIM/src/interface/entity/hrlanguage-ability.ts

@@ -69,4 +69,36 @@ export interface HRLanguageAbility {
      * @memberof HRLanguageAbility
      */
     hremployeename?: any;
+
+    /**
+     * 附件
+     *
+     * @returns {*}
+     * @memberof HRLanguageAbility
+     */
+    attachment?: any;
+
+    /**
+     * 语种
+     *
+     * @returns {*}
+     * @memberof HRLanguageAbility
+     */
+    languagetype?: any;
+
+    /**
+     * 外语等级
+     *
+     * @returns {*}
+     * @memberof HRLanguageAbility
+     */
+    languagelevel?: any;
+
+    /**
+     * 获取时间
+     *
+     * @returns {*}
+     * @memberof HRLanguageAbility
+     */
+    languagetime?: any;
 }
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hreducation/hreducation_en_US.ts

@@ -29,6 +29,10 @@ export default {
 			caption: "教育信息",
       		title: "教育信息编辑视图",
 		},
+		optionview: {
+			caption: "教育信息",
+      		title: "教育信息",
+		},
 		gridview: {
 			caption: "教育信息",
       		title: "教育信息表格视图",

app_PIM/src/locale/lanres/entities/hreducation/hreducation_zh_CN.ts

@@ -28,6 +28,10 @@ export default {
 			caption: "教育信息",
       		title: "教育信息编辑视图",
 		},
+		optionview: {
+			caption: "教育信息",
+      		title: "教育信息",
+		},
 		gridview: {
 			caption: "教育信息",
       		title: "教育信息表格视图",

app_PIM/src/locale/lanres/entities/hrlanguage-ability/hrlanguage-ability_en_US.ts

@@ -9,6 +9,10 @@ export default {
     updatedate: "更新时间",
     hremployeeid: "员工标识",
     hremployeename: "员工姓名",
+    attachment: "附件",
+    languagetype: "语种",
+    languagelevel: "外语等级",
+    languagetime: "获取时间",
   },
 	views: {
 		gridview: {

app_PIM/src/locale/lanres/entities/hrlanguage-ability/hrlanguage-ability_zh_CN.ts

@@ -8,6 +8,10 @@ export default {
     updatedate: "更新时间",
     hremployeeid: "员工标识",
     hremployeename: "员工姓名",
+    attachment: "附件",
+    languagetype: "语种",
+    languagelevel: "外语等级",
+    languagetime: "获取时间",
   },
 	views: {
 		gridview: {

app_PIM/src/mock/viewconfig/viewconfig.ts

@@ -495,6 +495,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "HRDutySkillGridView",
             "viewtag": "8959a1a3f5b43dbc52182d6cf04f00a1"
         },
+        "hreducationoptionview": {
+            "title": "教育信息",
+            "caption": "教育信息",
+            "viewtype": "DEOPTVIEW",
+            "viewmodule": "HumanResource",
+            "viewname": "HREducationOptionView",
+            "viewtag": "8db1cc9344908f2f9e2fb21f3849a539"
+        },
         "hrorgaddresseditview": {
             "title": "组织地址编辑视图",
             "caption": "组织地址",

app_PIM/src/pages/base/hrlegal-tab-exp-view/hrlegal-tab-exp-view.html

 <studio-view-style2 viewName="hrlegaltabexpview" viewTitle="法人信息" class='detabexpview hrlegal-tab-exp-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_PIM/src/pages/base/hrlegal-v-001/hrlegal-v-001.html

 <studio-view-style2 viewName="hrlegalv_001" viewTitle="快速新建" class='deoptview hrlegal-v-001'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_form 
                     :viewState="viewState"  

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

 <studio-view-style2 viewName="hromhierarchycatpickupgridview" viewTitle="结构层次类别选择表格视图" class='depickupgridview hromhierarchy-cat-pickup-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="searchForm">
                 <view_searchform 

app_PIM/src/pages/base/hromhierarchy-cat-tab-exp-view/hromhierarchy-cat-tab-exp-view.html

 <studio-view-style2 viewName="hromhierarchycattabexpview" viewTitle="结构层次类别分页编辑" class='detabexpview hromhierarchy-cat-tab-exp-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

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

 <studio-view-style2 viewName="hromhierarchypickupgridview" viewTitle="组织层次结构选择表格视图" class='depickupgridview hromhierarchy-pickup-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="searchForm">
                 <view_searchform 

app_PIM/src/pages/base/hroperation-unit-tab-exp-view/hroperation-unit-tab-exp-view.html

 <studio-view-style2 viewName="hroperationunittabexpview" viewTitle="运营单位" class='detabexpview hroperation-unit-tab-exp-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_PIM/src/pages/base/hroperation-unit-v-001/hroperation-unit-v-001.html

 <studio-view-style2 viewName="hroperationunitv_001" viewTitle="快速新建" class='deoptview hroperation-unit-v-001'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_form 
                     :viewState="viewState"  

app_PIM/src/pages/base/hrorganization-edit-view/hrorganization-edit-view.html

 <studio-view-style2 viewName="hrorganizationeditview" viewTitle="组织编辑视图" class='deeditview hrorganization-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_PIM/src/pages/human-resource/hrarchives-edit-view/hrarchives-edit-view.html

 <studio-view-style2 viewName="hrarchiveseditview" viewTitle="档案信息编辑视图" class='deeditview hrarchives-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_PIM/src/pages/human-resource/hrcertificate-edit-view/hrcertificate-edit-view.html

 <studio-view-style2 viewName="hrcertificateeditview" viewTitle="证书信息编辑视图" class='deeditview hrcertificate-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_PIM/src/pages/human-resource/hrcontract-edit-view/hrcontract-edit-view.html

 <studio-view-style2 viewName="hrcontracteditview" viewTitle="合同信息编辑视图" class='deeditview hrcontract-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_PIM/src/pages/human-resource/hrdistribution-edit-view/hrdistribution-edit-view.html

 <studio-view-style2 viewName="hrdistributioneditview" viewTitle="工作人员分配编辑视图" class='deeditview hrdistribution-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_PIM/src/pages/human-resource/hrdistribution-v-002/hrdistribution-v-002.html

 <studio-view-style2 viewName="hrdistributionv_002" viewTitle="快速新建" class='deoptview hrdistribution-v-002'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_form 
                     :viewState="viewState"  

app_PIM/src/pages/human-resource/hrduty-cert-v-001/hrduty-cert-v-001.html

 <studio-view-style2 viewName="hrdutycertv_001" viewTitle="职务证书" class='deoptview hrduty-cert-v-001'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_form 
                     :viewState="viewState"  

app_PIM/src/pages/human-resource/hrduty-edu-v-001/hrduty-edu-v-001.html

 <studio-view-style2 viewName="hrdutyeduv_001" viewTitle="职务教育" class='deoptview hrduty-edu-v-001'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_form 
                     :viewState="viewState"  

app_PIM/src/pages/human-resource/hrduty-pickup-grid-view/hrduty-pickup-grid-view.html

 <studio-view-style2 viewName="hrdutypickupgridview" viewTitle="职务选择表格视图" class='depickupgridview hrduty-pickup-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="searchForm">
                 <view_searchform 

app_PIM/src/pages/human-resource/hrduty-skill-v-001/hrduty-skill-v-001.html

 <studio-view-style2 viewName="hrdutyskillv_001" viewTitle="职务技能" class='deoptview hrduty-skill-v-001'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_form 
                     :viewState="viewState"  

app_PIM/src/pages/human-resource/hrduty-tab-exp-view/hrduty-tab-exp-view.html

 <studio-view-style2 viewName="hrdutytabexpview" viewTitle="职务信息" class='detabexpview hrduty-tab-exp-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_PIM/src/pages/human-resource/hrduty-v-001/hrduty-v-001.html

 <studio-view-style2 viewName="hrdutyv_001" viewTitle="快速新建" class='deoptview hrduty-v-001'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_form 
                     :viewState="viewState"  

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

@@ -569,16 +569,28 @@ export class HREducationGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'hreducations', parameterName: 'hreducation' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         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: 'hreducation-option-view', 
+            height: 0, 
+            width: 600,  
+            title: this.$t('entities.hreducation.views.optionview.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
     }
 
 
@@ -608,14 +620,28 @@ export class HREducationGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'hreducations', parameterName: 'hreducation' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
-            this.$router.push(routePath);
-        }
-        openIndexViewTab(data);
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
+        }
+        const view: any = {
+            viewname: 'hreducation-option-view', 
+            height: 0, 
+            width: 600,  
+            title: this.$t('entities.hreducation.views.optionview.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
     }
 
 

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

 <studio-view-style2 viewName="hreducationgridview" viewTitle="教育信息表格视图" class='degridview hreducation-grid-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{viewCaption}}</span>
+    </template>
     <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/hreducation-option-view/hreducation-option-view-base.tsx

+import { Subject } from 'rxjs';
+import { OptionViewBase } from '@/studio-core';
+import HREducationService from '@/service/hreducation/hreducation-service';
+import HREducationAuthService from '@/authservice/hreducation/hreducation-auth-service';
+import OptionViewEngine from '@engine/view/option-view-engine';
+import HREducationUIService from '@/uiservice/hreducation/hreducation-ui-service';
+
+/**
+ * 教育信息视图基类
+ *
+ * @export
+ * @class HREducationOptionViewBase
+ * @extends {OptionViewBase}
+ */
+export class HREducationOptionViewBase extends OptionViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof HREducationOptionViewBase
+     */
+    protected appDeName: string = 'hreducation';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof HREducationOptionViewBase
+     */
+    protected appDeKey: string = 'hreducationid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof HREducationOptionViewBase
+     */
+    protected appDeMajor: string = 'hreducationname';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {HREducationService}
+     * @memberof HREducationOptionViewBase
+     */
+    protected appEntityService: HREducationService = new HREducationService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type HREducationUIService
+     * @memberof HREducationOptionViewBase
+     */
+    public appUIService: HREducationUIService = new HREducationUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof HREducationOptionViewBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof HREducationOptionViewBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.hreducation.views.optionview.caption',
+        srfTitle: 'entities.hreducation.views.optionview.title',
+        srfSubTitle: 'entities.hreducation.views.optionview.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof HREducationOptionViewBase
+     */
+    protected containerModel: any = {
+        view_form: { name: 'form', type: 'FORM' },
+        view_okbtn: { name: 'okbtn', type: 'button', text: '确定', disabled: true },
+        view_cancelbtn: { name: 'cancelbtn', type: 'button', text: '取消', disabled: false },
+        view_leftbtn: { name: 'leftbtn', type: 'button', text: '左移', disabled: true },
+        view_rightbtn: { name: 'rightbtn', type: 'button', text: '右移', disabled: true },
+        view_allleftbtn: { name: 'allleftbtn', type: 'button', text: '全部左移', disabled: true },
+        view_allrightbtn: { name: 'allrightbtn', type: 'button', text: '全部右移', disabled: true },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '8db1cc9344908f2f9e2fb21f3849a539';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof HREducationOptionViewBase
+     */
+    public engine: OptionViewEngine = new OptionViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof HREducationOptionViewBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            form: this.$refs.form,
+            p2k: '0',
+            keyPSDEField: 'hreducation',
+            majorPSDEField: 'hreducationname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * form 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HREducationOptionViewBase
+     */
+    public form_save($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'save', $event);
+    }
+
+    /**
+     * form 部件 remove 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HREducationOptionViewBase
+     */
+    public form_remove($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'remove', $event);
+    }
+
+    /**
+     * form 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HREducationOptionViewBase
+     */
+    public form_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'load', $event);
+    }
+
+
+}
\ No newline at end of file

app_PIM/src/pages/human-resource/hreducation-option-view/hreducation-option-view.html

+<studio-view-style2 viewName="hreducationoptionview" viewTitle="教育信息" class='deoptview hreducation-option-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{viewCaption}}</span>
+    </template>
+    <view_form 
+                    :viewState="viewState"  
+                    :viewparams="viewparams" 
+                    :context="context" 
+                    :autosave="false" 
+                    :viewtag="viewtag"
+                    :showBusyIndicator="true"
+                    updateAction="Update"
+                    removeAction="Remove"
+                    loaddraftAction="GetDraft"
+                    loadAction="Get"
+                    createAction="Create"
+                    WFSubmitAction=""
+                    WFStartAction=""
+                    style='' 
+                    name="form"  
+                    ref='form' 
+                    @save="form_save($event)"  
+                    @remove="form_remove($event)"  
+                    @load="form_load($event)"  
+                    @closeview="closeView($event)">
+                </view_form>
+    <template slot="footer">
+        <div class="option-view-footer-actions">
+            <i-button type='primary' @click="onClickOk.apply(_self, arguments)">{{ containerModel.view_okbtn.text }}</i-button>
+            &nbsp;&nbsp;
+            <i-button @click="onClickCancel.apply(_self, arguments)">{{ containerModel.view_cancelbtn.text }}</i-button>
+        </div>
+    </template>
+</studio-view-style2>
\ No newline at end of file

app_PIM/src/pages/human-resource/hreducation-option-view/hreducation-option-view.vue

+<template src="./hreducation-option-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { HREducationOptionViewBase } from './hreducation-option-view-base';
+import view_form from '@widgets/hreducation/main-form/main-form.vue';
+
+/**
+ * 教育信息视图
+ *
+ * @export
+ * @class HREducationOptionView
+ * @extends {HREducationOptionViewBase}
+ */
+@Component({
+    components: {
+        view_form, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class HREducationOptionView extends HREducationOptionViewBase { }
+</script>

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

 <studio-view-style2 viewName="hremployeepickupgridview" viewTitle="员工选择表格视图" class='depickupgridview hremployee-pickup-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="searchForm">
                 <view_searchform 

app_PIM/src/pages/human-resource/hremployee-tree-exp-view/hremployee-tree-exp-view.html

 <studio-view-style2 viewName="hremployeetreeexpview" viewTitle="员工信息" class='detreeexpview hremployee-tree-exp-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_PIM/src/pages/human-resource/hremployee-v-001/hremployee-v-001.html

 <studio-view-style2 viewName="hremployeev_001" viewTitle="快速新建" class='deoptview hremployee-v-001'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_form 
                     :viewState="viewState"  

app_PIM/src/pages/human-resource/hrfamily-edit-view/hrfamily-edit-view.html

 <studio-view-style2 viewName="hrfamilyeditview" viewTitle="家庭情况编辑视图" class='deeditview hrfamily-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_PIM/src/pages/human-resource/hrlanguage-ability-edit-view/hrlanguage-ability-edit-view.html

 <studio-view-style2 viewName="hrlanguageabilityeditview" viewTitle="语言能力编辑视图" class='deeditview hrlanguage-ability-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_PIM/src/pages/human-resource/hrpost-pickup-grid-view/hrpost-pickup-grid-view.html

 <studio-view-style2 viewName="hrpostpickupgridview" viewTitle="职位选择表格视图" class='depickupgridview hrpost-pickup-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="searchForm">
                 <view_searchform 

app_PIM/src/pages/human-resource/hrpost-rel-edit-view/hrpost-rel-edit-view.html

 <studio-view-style2 viewName="hrpostreleditview" viewTitle="职位关系编辑视图" class='deeditview hrpost-rel-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_PIM/src/pages/human-resource/hrpost-rel-v-002/hrpost-rel-v-002.html

 <studio-view-style2 viewName="hrpostrelv_002" viewTitle="快速新建" class='deoptview hrpost-rel-v-002'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_form 
                     :viewState="viewState"  

app_PIM/src/pages/human-resource/hrpost-v-005/hrpost-v-005.html

 <studio-view-style2 viewName="hrpostv_005" viewTitle="职位快速新建" class='deoptview hrpost-v-005'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_form 
                     :viewState="viewState"  

app_PIM/src/pages/human-resource/hrpost-v-006/hrpost-v-006.html

 <studio-view-style2 viewName="hrpostv_006" viewTitle="职位信息" class='detabexpview hrpost-v-006'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_PIM/src/pages/human-resource/hrresearch-edit-view/hrresearch-edit-view.html

 <studio-view-style2 viewName="hrresearcheditview" viewTitle="科研成果编辑视图" class='deeditview hrresearch-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_PIM/src/pages/human-resource/hrreward-edit-view/hrreward-edit-view.html

 <studio-view-style2 viewName="hrrewardeditview" viewTitle="奖励惩罚编辑视图" class='deeditview hrreward-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_PIM/src/pages/human-resource/hrtechnical-title-edit-view/hrtechnical-title-edit-view.html

 <studio-view-style2 viewName="hrtechnicaltitleeditview" viewTitle="职称信息编辑视图" class='deeditview hrtechnical-title-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_PIM/src/pages/human-resource/hrtraining-record-edit-view/hrtraining-record-edit-view.html

 <studio-view-style2 viewName="hrtrainingrecordeditview" viewTitle="培训记录编辑视图" class='deeditview hrtraining-record-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_PIM/src/pages/human-resource/hrwork-record-edit-view/hrwork-record-edit-view.html

 <studio-view-style2 viewName="hrworkrecordeditview" viewTitle="工作履历编辑视图" class='deeditview hrwork-record-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

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

@@ -67,7 +67,6 @@ export const PageComponents = {
         Vue.component('hrlanguage-ability-grid-view', () => import('@pages/human-resource/hrlanguage-ability-grid-view/hrlanguage-ability-grid-view.vue'));
         Vue.component('hroperation-unit-tab-exp-view', () => import('@pages/base/hroperation-unit-tab-exp-view/hroperation-unit-tab-exp-view.vue'));
         Vue.component('hrorg-address-grid-view', () => import('@pages/base/hrorg-address-grid-view/hrorg-address-grid-view.vue'));
-        Vue.component('hreducation-edit-view', () => import('@pages/human-resource/hreducation-edit-view/hreducation-edit-view.vue'));
         Vue.component('hrreward-edit-view', () => import('@pages/human-resource/hrreward-edit-view/hrreward-edit-view.vue'));
         Vue.component('hrduty-cert-v-001', () => import('@pages/human-resource/hrduty-cert-v-001/hrduty-cert-v-001.vue'));
         Vue.component('hrlegal-dashboard-view', () => import('@pages/base/hrlegal-dashboard-view/hrlegal-dashboard-view.vue'));
@@ -85,6 +84,7 @@ export const PageComponents = {
         Vue.component('hrpost-tab-exp-view', () => import('@pages/human-resource/hrpost-tab-exp-view/hrpost-tab-exp-view.vue'));
         Vue.component('hrlegal-tab-exp-view', () => import('@pages/base/hrlegal-tab-exp-view/hrlegal-tab-exp-view.vue'));
         Vue.component('hrtraining-record-grid-view', () => import('@pages/human-resource/hrtraining-record-grid-view/hrtraining-record-grid-view.vue'));
+        Vue.component('hreducation-option-view', () => import('@pages/human-resource/hreducation-option-view/hreducation-option-view.vue'));
         Vue.component('hroperation-unit-dashboard-view', () => import('@pages/base/hroperation-unit-dashboard-view/hroperation-unit-dashboard-view.vue'));
         Vue.component('hrtechnical-title-grid-view', () => import('@pages/human-resource/hrtechnical-title-grid-view/hrtechnical-title-grid-view.vue'));
         Vue.component('hrresearch-edit-view', () => import('@pages/human-resource/hrresearch-edit-view/hrresearch-edit-view.vue'));

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

@@ -1461,35 +1461,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/hrorg-address-grid-view/hrorg-address-grid-view.vue'),
                 },
-                {
-                    path: 'hremployees/:hremployee?/hreducations/:hreducation?/editview/:editview?',
-                    meta: {
-                        caption: 'entities.hreducation.views.editview.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hremployees', parameterName: 'hremployee' },
-                            { pathName: 'hreducations', parameterName: 'hreducation' },
-                            { pathName: 'editview', parameterName: 'editview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/human-resource/hreducation-edit-view/hreducation-edit-view.vue'),
-                },
-                {
-                    path: 'hreducations/:hreducation?/editview/:editview?',
-                    meta: {
-                        caption: 'entities.hreducation.views.editview.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hreducations', parameterName: 'hreducation' },
-                            { pathName: 'editview', parameterName: 'editview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/human-resource/hreducation-edit-view/hreducation-edit-view.vue'),
-                },
                 {
                     path: 'hremployees/:hremployee?/hrrewards/:hrreward?/editview/:editview?',
                     meta: {
@@ -1923,6 +1894,35 @@ const router = new Router({
                     },
                     component: () => import('@pages/human-resource/hrtraining-record-grid-view/hrtraining-record-grid-view.vue'),
                 },
+                {
+                    path: 'hremployees/:hremployee?/hreducations/:hreducation?/optionview/:optionview?',
+                    meta: {
+                        caption: 'entities.hreducation.views.optionview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hremployees', parameterName: 'hremployee' },
+                            { pathName: 'hreducations', parameterName: 'hreducation' },
+                            { pathName: 'optionview', parameterName: 'optionview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/human-resource/hreducation-option-view/hreducation-option-view.vue'),
+                },
+                {
+                    path: 'hreducations/:hreducation?/optionview/:optionview?',
+                    meta: {
+                        caption: 'entities.hreducation.views.optionview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hreducations', parameterName: 'hreducation' },
+                            { pathName: 'optionview', parameterName: 'optionview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/human-resource/hreducation-option-view/hreducation-option-view.vue'),
+                },
                 {
                     path: 'hroperationunits/:hroperationunit?/dashboardview/:dashboardview?',
                     meta: {

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

@@ -503,16 +503,6 @@ export const viewstate: any = {
                 'e09349c39faf8e8dbe63ac7be3aaa781',
             ],
         },
-        {
-            viewtag: '729574e98dfd7e0353945a39686136ce',
-            viewmodule: 'HumanResource',
-            viewname: 'HREducationEditView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                'ec9d9fe37bbfc3fcb623e2dc34b48dbc',
-            ],
-        },
         {
             viewtag: '73f27ddcf2a626455aa88f4a052db014',
             viewmodule: 'HumanResource',
@@ -582,6 +572,16 @@ export const viewstate: any = {
                 'd2411142d3398651fb50d214bcfc3e3d',
             ],
         },
+        {
+            viewtag: '8db1cc9344908f2f9e2fb21f3849a539',
+            viewmodule: 'HumanResource',
+            viewname: 'HREducationOptionView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                'ec9d9fe37bbfc3fcb623e2dc34b48dbc',
+            ],
+        },
         {
             viewtag: '90f2bd2f58c482b25a1e1db0f8e4ca26',
             viewmodule: 'Base',
@@ -840,7 +840,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '729574e98dfd7e0353945a39686136ce',
+                '8db1cc9344908f2f9e2fb21f3849a539',
             ],
         },
         {

app_PIM/src/studio-core/utils/studio-drawer/studio-drawer.tsx

@@ -236,7 +236,7 @@ export class StudioDrawer extends Vue {
                             }
                             this.closeByIndex(i);
                         }}>
-                            {this.$t(ref.model.srfTitle)}
+                            {this.$t(ref.viewCaption)}
                         </span>
                     </span>;
                 })}

app_PIM/src/studio-core/view/DashboardViewBase.tsx

@@ -52,7 +52,6 @@ export class DashboardViewBase extends ViewBase {
                     if (this.$route) {
                         this.$route.meta.info = this.model.dataInfo;
                     }
-                    Object.assign(this.model, { srfTitle: `${this.$t(this.model.srfCaption)} - ${this.model.dataInfo}` });
                     this.$appService.navHistory.setCaption({ tag: this.viewtag, info: this.model.dataInfo });
                     this.$emit(events.view.MODEL_LOADED, data);
                 }

app_PIM/src/studio-core/view/ExpViewBase.tsx

@@ -52,7 +52,6 @@ export class ExpViewBase extends ViewBase {
                     if (this.$route) {
                         this.$route.meta.info = this.model.dataInfo;
                     }
-                    Object.assign(this.model, { srfTitle: `${this.$t(this.model.srfCaption)} - ${this.model.dataInfo}` });
                     this.$appService.navHistory.setCaption({ tag: this.viewtag, info: this.model.dataInfo });
                     this.$emit(events.view.MODEL_LOADED, data);
                 }

app_PIM/src/studio-core/view/ViewBase.tsx

@@ -18,6 +18,20 @@ export class ViewBase extends Vue {
      */
     public viewState: Subject<ViewState> = new Subject();
 
+    /**
+     * 视图标题
+     *
+     * @readonly
+     * @type {string}
+     * @memberof ViewBase
+     */
+    get viewCaption(): string {
+        if (isExistAndNotEmpty(this.model.dataInfo)) {
+            return `${this.model.srfCaption} - ${this.model.dataInfo}`
+        }
+        return this.model.srfCaption;
+    }
+
     /**
      * 视图对应应用实体名称
      *
@@ -52,7 +66,12 @@ export class ViewBase extends Vue {
      * @type {*}
      * @memberof ViewBase
      */
-    protected model: any = {};
+    protected model: any = {
+        srfTitle: null,
+        srfCaption: null,
+        srfSubTitle: null,
+        dataInfo: null
+    };
 
     /**
      * 在消息中心订阅的本地消息实例标识
@@ -347,6 +366,17 @@ export class ViewBase extends Vue {
         if (this.viewUsage === 1) {
             this.$appService.navHistory.setViewContext(this.context, this.viewtag);
         }
+        if (this.model) {
+            if (isExistAndNotEmpty(this.model.srfTitle)) {
+                this.model.srfCaption = this.$t(this.model.srfTitle);
+            }
+            if (isExistAndNotEmpty(this.model.srfCaption)) {
+                this.model.srfCaption = this.$t(this.model.srfCaption);
+            }
+            if (isExistAndNotEmpty(this.model.srfSubTitle)) {
+                this.model.srfCaption = this.$t(this.model.srfSubTitle);
+            }
+        }
         this.viewCreated();
     }
 

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

@@ -90,6 +90,7 @@ export default class HREducationUIServiceBase extends UIService {
      */  
     public initViewMap(){
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'hreducations'});
+        this.allViewMap.set(':',{viewname:'optionview',srfappde:'hreducations'});
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'hreducations'});
     }
 

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

@@ -24,7 +24,7 @@
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
             <template v-if="getColumnState('employeecode')">
-                <el-table-column show-overflow-tooltip :prop="'employeecode'" :label="$t('entities.hremployee.main_grid.columns.employeecode')" :width="150"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'employeecode'" :label="$t('entities.hremployee.main_grid.columns.employeecode')" :width="120"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.hremployee.main_grid.columns.employeecode')}}
@@ -36,7 +36,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('employeename')">
-                <el-table-column show-overflow-tooltip :prop="'employeename'" :label="$t('entities.hremployee.main_grid.columns.employeename')" :width="150"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'employeename'" :label="$t('entities.hremployee.main_grid.columns.employeename')" :width="120"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.hremployee.main_grid.columns.employeename')}}
@@ -60,7 +60,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('hrdutyname')">
-                <el-table-column show-overflow-tooltip :prop="'hrdutyname'" :label="$t('entities.hremployee.main_grid.columns.hrdutyname')" :width="150"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'hrdutyname'" :label="$t('entities.hremployee.main_grid.columns.hrdutyname')" :width="120"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.hremployee.main_grid.columns.hrdutyname')}}
@@ -72,7 +72,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('hrpostname')">
-                <el-table-column show-overflow-tooltip :prop="'hrpostname'" :label="$t('entities.hremployee.main_grid.columns.hrpostname')" :width="150"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'hrpostname'" :label="$t('entities.hremployee.main_grid.columns.hrpostname')" :width="120"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.hremployee.main_grid.columns.hrpostname')}}
@@ -96,7 +96,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('birthday')">
-                <el-table-column show-overflow-tooltip :prop="'birthday'" :label="$t('entities.hremployee.main_grid.columns.birthday')" :width="150"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'birthday'" :label="$t('entities.hremployee.main_grid.columns.birthday')" :width="120"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.hremployee.main_grid.columns.birthday')}}
@@ -108,7 +108,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('age')">
-                <el-table-column show-overflow-tooltip :prop="'age'" :label="$t('entities.hremployee.main_grid.columns.age')" :width="150"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'age'" :label="$t('entities.hremployee.main_grid.columns.age')" :width="100"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.hremployee.main_grid.columns.age')}}
@@ -120,7 +120,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('mobile')">
-                <el-table-column show-overflow-tooltip :prop="'mobile'" :label="$t('entities.hremployee.main_grid.columns.mobile')" :width="150"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'mobile'" :label="$t('entities.hremployee.main_grid.columns.mobile')" :width="120"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.hremployee.main_grid.columns.mobile')}}
@@ -132,7 +132,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('email')">
-                <el-table-column show-overflow-tooltip :prop="'email'" :label="$t('entities.hremployee.main_grid.columns.email')" :width="200"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'email'" :label="$t('entities.hremployee.main_grid.columns.email')" :width="150"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.hremployee.main_grid.columns.email')}}
@@ -144,7 +144,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('empstate')">
-                <el-table-column show-overflow-tooltip :prop="'empstate'" :label="$t('entities.hremployee.main_grid.columns.empstate')" :width="150"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'empstate'" :label="$t('entities.hremployee.main_grid.columns.empstate')" :width="100"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.hremployee.main_grid.columns.empstate')}}

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRLanguageAbility.java

@@ -103,6 +103,35 @@ public class HRLanguageAbility extends EntityMP implements Serializable {
     @JSONField(name = "hremployeename")
     @JsonProperty("hremployeename")
     private String hremployeename;
+    /**
+     * 附件
+     */
+    @TableField(value = "attachment")
+    @JSONField(name = "attachment")
+    @JsonProperty("attachment")
+    private String attachment;
+    /**
+     * 语种
+     */
+    @TableField(value = "languagetype")
+    @JSONField(name = "languagetype")
+    @JsonProperty("languagetype")
+    private String languagetype;
+    /**
+     * 外语等级
+     */
+    @TableField(value = "languagelevel")
+    @JSONField(name = "languagelevel")
+    @JsonProperty("languagelevel")
+    private String languagelevel;
+    /**
+     * 获取时间
+     */
+    @TableField(value = "languagetime")
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "languagetime" , format="yyyy-MM-dd")
+    @JsonProperty("languagetime")
+    private Timestamp languagetime;
 
     /**
      * 员工
@@ -130,6 +159,48 @@ public class HRLanguageAbility extends EntityMP implements Serializable {
         this.modify("hremployeeid",hremployeeid);
     }
 
+    /**
+     * 设置 [附件]
+     */
+    public void setAttachment(String attachment){
+        this.attachment = attachment ;
+        this.modify("attachment",attachment);
+    }
+
+    /**
+     * 设置 [语种]
+     */
+    public void setLanguagetype(String languagetype){
+        this.languagetype = languagetype ;
+        this.modify("languagetype",languagetype);
+    }
+
+    /**
+     * 设置 [外语等级]
+     */
+    public void setLanguagelevel(String languagelevel){
+        this.languagelevel = languagelevel ;
+        this.modify("languagelevel",languagelevel);
+    }
+
+    /**
+     * 设置 [获取时间]
+     */
+    public void setLanguagetime(Timestamp languagetime){
+        this.languagetime = languagetime ;
+        this.modify("languagetime",languagetime);
+    }
+
+    /**
+     * 格式化日期 [获取时间]
+     */
+    public String formatLanguagetime(){
+        if (this.languagetime == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(languagetime);
+    }
 
 }
 

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/filter/HRLanguageAbilitySearchContext.java

@@ -55,6 +55,27 @@ public class HRLanguageAbilitySearchContext extends QueryWrapperContext<HRLangua
             this.getSearchCond().like("hremployeename", n_hremployeename_like);
         }
     }
+	private String n_attachment_eq;//[附件]
+	public void setN_attachment_eq(String n_attachment_eq) {
+        this.n_attachment_eq = n_attachment_eq;
+        if(!ObjectUtils.isEmpty(this.n_attachment_eq)){
+            this.getSearchCond().eq("attachment", n_attachment_eq);
+        }
+    }
+	private String n_languagetype_eq;//[语种]
+	public void setN_languagetype_eq(String n_languagetype_eq) {
+        this.n_languagetype_eq = n_languagetype_eq;
+        if(!ObjectUtils.isEmpty(this.n_languagetype_eq)){
+            this.getSearchCond().eq("languagetype", n_languagetype_eq);
+        }
+    }
+	private String n_languagelevel_eq;//[外语等级]
+	public void setN_languagelevel_eq(String n_languagelevel_eq) {
+        this.n_languagelevel_eq = n_languagelevel_eq;
+        if(!ObjectUtils.isEmpty(this.n_languagelevel_eq)){
+            this.getSearchCond().eq("languagelevel", n_languagelevel_eq);
+        }
+    }
 
     /**
 	 * 启用快速搜索

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

@@ -220,7 +220,7 @@
 
 
     <!--输出实体[HREDUCATION]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hreducation-30-10">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hreducation-36-10">
         <createTable tableName="T_HREDUCATION">
                 <column name="HREDUCATIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_HREDUCATION_HREDUCATIONID"/>
@@ -296,7 +296,7 @@
 
 
     <!--输出实体[HREMPLOYEE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-227-12">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-228-12">
         <createTable tableName="EMPLOYEE">
                 <column name="EMPLOYEENAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -400,7 +400,7 @@
 
 
     <!--输出实体[HRLANGUAGEABILITY]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrlanguageability-8-14">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrlanguageability-13-14">
         <createTable tableName="T_HRLANGUAGEABILITY">
                 <column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -417,6 +417,14 @@
                 </column>
                 <column name="HREMPLOYEEID" remarks="" type="VARCHAR(100)">
                 </column>
+                <column name="ATTACHMENT" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="LANGUAGETYPE" remarks="" type="VARCHAR(60)">
+                </column>
+                <column name="LANGUAGELEVEL" remarks="" type="VARCHAR(60)">
+                </column>
+                <column name="LANGUAGETIME" remarks="" type="DATETIME">
+                </column>
         </createTable>
     </changeSet>
 
@@ -868,7 +876,7 @@
 
 
     <!--输出实体[HRTRANSFERAPPLY]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrtransferapply-30-33">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrtransferapply-31-33">
         <createTable tableName="T_HRTRANSFERAPPLY">
                 <column name="HRTRANSFERAPPLYID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_HRTRANSFERAPPLY_HRTRANSFERA"/>
@@ -958,18 +966,18 @@
        <addForeignKeyConstraint baseColumnNames="HRDUTYID" baseTableName="T_HRDUTYSKILL" constraintName="DER1N_HRDUTYSKILL_HRDUTY_HRDUT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRDUTYID" referencedTableName="T_HRDUTY" validate="true"/>
     </changeSet>
         <!--输出实体[HREDUCATION]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hreducation-30-43">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hreducation-36-43">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HREDUCATION" constraintName="DER1N_HREDUCATION_HREMPLOYEE_H" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
         <!--输出实体[HREMPSTATE]外键关系 -->
         <!--输出实体[HREMPLOYEE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-227-44">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-228-44">
        <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-227-45">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-228-45">
        <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>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-227-46">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-228-46">
        <addForeignKeyConstraint baseColumnNames="HRPOSTID" baseTableName="EMPLOYEE" constraintName="DER1N_HREMPLOYEE_HRPOST_HRPOST" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/>
     </changeSet>
         <!--输出实体[HRFAMILY]外键关系 -->
@@ -977,7 +985,7 @@
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRFAMILY" constraintName="DER1N_HRFAMILY_HREMPLOYEE_HREM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
         <!--输出实体[HRLANGUAGEABILITY]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrlanguageability-8-48">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrlanguageability-13-48">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRLANGUAGEABILITY" constraintName="DER1N_HRLANGUAGEABILITY_HREMPL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
         <!--输出实体[HRLEAVE]外键关系 -->
@@ -1047,13 +1055,13 @@
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRTRAININGRECORD" constraintName="DER1N_HRTRAININGRECORD_HREMPLO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
         <!--输出实体[HRTRANSFERAPPLY]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-30-66">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-31-66">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRTRANSFERAPPLY" constraintName="DER1N_HRTRANSFERAPPLY_HREMPLOY" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-30-67">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-31-67">
        <addForeignKeyConstraint baseColumnNames="HRORGANIZATIONID2" baseTableName="T_HRTRANSFERAPPLY" constraintName="DER1N_HRTRANSFERAPPLY_HRORGANI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-30-68">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-31-68">
        <addForeignKeyConstraint baseColumnNames="HRPOSTID2" baseTableName="T_HRTRANSFERAPPLY" constraintName="DER1N_HRTRANSFERAPPLY_HRPOST_H" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/>
     </changeSet>
         <!--输出实体[HRWORKRECORD]外键关系 -->

humanresource-core/src/main/resources/mapper/humanresource/hrlanguageability/HRLanguageAbilityMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="HRLanguageAbilityResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRLANGUAGEABILITYID`, t1.`HRLANGUAGEABILITYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRLANGUAGEABILITY` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  ) t1 where hrlanguageabilityid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRLANGUAGEABILITYID`, t1.`HRLANGUAGEABILITYNAME`, t1.`LANGUAGELEVEL`, t1.`LANGUAGETIME`, t1.`LANGUAGETYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRLANGUAGEABILITY` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  ) t1 where hrlanguageabilityid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -37,12 +37,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRLANGUAGEABILITYID`, t1.`HRLANGUAGEABILITYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRLANGUAGEABILITY` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
+		<![CDATA[ SELECT t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRLANGUAGEABILITYID`, t1.`HRLANGUAGEABILITYNAME`, t1.`LANGUAGELEVEL`, t1.`LANGUAGETIME`, t1.`LANGUAGETYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRLANGUAGEABILITY` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRLANGUAGEABILITYID`, t1.`HRLANGUAGEABILITYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRLANGUAGEABILITY` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
+		<![CDATA[ SELECT t1.`ATTACHMENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`HRLANGUAGEABILITYID`, t1.`HRLANGUAGEABILITYNAME`, t1.`LANGUAGELEVEL`, t1.`LANGUAGETIME`, t1.`LANGUAGETYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRLANGUAGEABILITY` t1  LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID  
 			]]>
     </sql>
 </mapper>

humanresource-core/src/main/resources/permission/systemResource.json

     {
     "systemid":"iBizHumanResources",
-    "systemname":"iBiz人力资源",
     "unires":[
     ],
     "entities":[

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

@@ -90,6 +90,39 @@ public class HRLanguageAbilityDTO extends DTOBase implements Serializable {
     @JsonProperty("hremployeename")
     private String hremployeename;
 
+    /**
+     * 属性 [ATTACHMENT]
+     *
+     */
+    @JSONField(name = "attachment")
+    @JsonProperty("attachment")
+    private String attachment;
+
+    /**
+     * 属性 [LANGUAGETYPE]
+     *
+     */
+    @JSONField(name = "languagetype")
+    @JsonProperty("languagetype")
+    private String languagetype;
+
+    /**
+     * 属性 [LANGUAGELEVEL]
+     *
+     */
+    @JSONField(name = "languagelevel")
+    @JsonProperty("languagelevel")
+    private String languagelevel;
+
+    /**
+     * 属性 [LANGUAGETIME]
+     *
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
+    @JSONField(name = "languagetime" , format="yyyy-MM-dd")
+    @JsonProperty("languagetime")
+    private Timestamp languagetime;
+
 
     /**
      * 设置 [HRLANGUAGEABILITYNAME]
@@ -107,6 +140,38 @@ public class HRLanguageAbilityDTO extends DTOBase implements Serializable {
         this.modify("hremployeeid",hremployeeid);
     }
 
+    /**
+     * 设置 [ATTACHMENT]
+     */
+    public void setAttachment(String  attachment){
+        this.attachment = attachment ;
+        this.modify("attachment",attachment);
+    }
+
+    /**
+     * 设置 [LANGUAGETYPE]
+     */
+    public void setLanguagetype(String  languagetype){
+        this.languagetype = languagetype ;
+        this.modify("languagetype",languagetype);
+    }
+
+    /**
+     * 设置 [LANGUAGELEVEL]
+     */
+    public void setLanguagelevel(String  languagelevel){
+        this.languagelevel = languagelevel ;
+        this.modify("languagelevel",languagelevel);
+    }
+
+    /**
+     * 设置 [LANGUAGETIME]
+     */
+    public void setLanguagetime(Timestamp  languagetime){
+        this.languagetime = languagetime ;
+        this.modify("languagetime",languagetime);
+    }
+
 
 }