jackwang 部署微服务应用

app_PIM/src/locale/lang/en-US.ts

@@ -157,8 +157,8 @@ export default {
                 menuitem1: "-",
                 left_exp: "左侧菜单",
                 menuitem5: "人员",
-                menuitem15: "员工信息",
-                menuitem8: "合同信息",
+                menuitem15: "员工",
+                menuitem8: "合同",
                 menuitem2: "组织",
                 menuitem4: "法人",
                 menuitem6: "运营单位",

app_PIM/src/locale/lang/zh-CN.ts

@@ -157,8 +157,8 @@ export default {
                 menuitem1: "-",
                 left_exp: "左侧菜单",
                 menuitem5: "人员",
-                menuitem15: "员工信息",
-                menuitem8: "合同信息",
+                menuitem15: "员工",
+                menuitem8: "合同",
                 menuitem2: "组织",
                 menuitem4: "法人",
                 menuitem6: "运营单位",

app_PIM/src/locale/lanres/entities/hrcontract/hrcontract_en_US.ts

@@ -113,40 +113,6 @@ export default {
 		uiactions: {
 		},
 	},
-	v_001toolbar_toolbar: {
-		tbitem3: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem4: {
-			caption: "Edit",
-			tip: "Edit {0}",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "Remove",
-			tip: "Remove {0}",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "Export",
-			tip: "Export {0} Data To Excel",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "Filter",
-			tip: "Filter",
-		},
-	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "Save",
@@ -193,6 +159,40 @@ export default {
 			tip: "Help",
 		},
 	},
+	v_001toolbar_toolbar: {
+		tbitem3: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
 	gridviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "New",
@@ -227,7 +227,7 @@ export default {
 			tip: "Filter",
 		},
 	},
-	v_003toolbar_toolbar: {
+	v_002toolbar_toolbar: {
 		tbitem3: {
 			caption: "New",
 			tip: "New",
@@ -261,7 +261,7 @@ export default {
 			tip: "Filter",
 		},
 	},
-	v_004toolbar_toolbar: {
+	v_003toolbar_toolbar: {
 		tbitem3: {
 			caption: "New",
 			tip: "New",
@@ -295,7 +295,7 @@ export default {
 			tip: "Filter",
 		},
 	},
-	v_002toolbar_toolbar: {
+	v_004toolbar_toolbar: {
 		tbitem3: {
 			caption: "New",
 			tip: "New",

app_PIM/src/locale/lanres/entities/hrcontract/hrcontract_zh_CN.ts

@@ -112,40 +112,6 @@ export default {
 		uiactions: {
 		},
 	},
-	v_001toolbar_toolbar: {
-		tbitem3: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem4: {
-			caption: "编辑",
-			tip: "编辑",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "删除",
-			tip: "删除",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "导出",
-			tip: "导出",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "过滤",
-			tip: "过滤",
-		},
-	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "保存",
@@ -192,6 +158,40 @@ export default {
 			tip: "帮助",
 		},
 	},
+	v_001toolbar_toolbar: {
+		tbitem3: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "导出",
+			tip: "导出",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
 	gridviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "新建",
@@ -226,7 +226,7 @@ export default {
 			tip: "过滤",
 		},
 	},
-	v_003toolbar_toolbar: {
+	v_002toolbar_toolbar: {
 		tbitem3: {
 			caption: "新建",
 			tip: "新建",
@@ -260,7 +260,7 @@ export default {
 			tip: "过滤",
 		},
 	},
-	v_004toolbar_toolbar: {
+	v_003toolbar_toolbar: {
 		tbitem3: {
 			caption: "新建",
 			tip: "新建",
@@ -294,7 +294,7 @@ export default {
 			tip: "过滤",
 		},
 	},
-	v_002toolbar_toolbar: {
+	v_004toolbar_toolbar: {
 		tbitem3: {
 			caption: "新建",
 			tip: "新建",

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

@@ -234,6 +234,25 @@ export default {
 		uiactions: {
 		},
 	},
+	grid_001_grid: {
+		columns: {
+			employeecode: "员工编号",
+			employeename: "员工姓名",
+			organizationname: "单位",
+			hrdutyname: "职务",
+			hrpostname: "职位",
+			certnum: "证件号码",
+			birthday: "出生日期",
+			age: "年龄",
+			mobile: "移动电话",
+			email: "电子邮箱",
+			empstate: "员工状态",
+			uagridcolumn1: "操作",
+		},
+		uiactions: {
+        hremployee_signcontract: "新签",
+		},
+	},
 	main_grid: {
 		columns: {
 			employeecode: "员工编号",
@@ -294,48 +313,6 @@ export default {
 			tip: "关闭",
 		},
 	},
-	v_007toolbar_toolbar: {
-		tbitem1_ff_002: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem2: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem4: {
-			caption: "Edit",
-			tip: "Edit {0}",
-		},
-		tbitem6: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "Remove",
-			tip: "Remove {0}",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "Export",
-			tip: "Export {0} Data To Excel",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "Filter",
-			tip: "Filter",
-		},
-	},
 	v_006toolbar_toolbar: {
 		tbitem1_ff_002: {
 			caption: "新建",

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

@@ -233,6 +233,25 @@ export default {
 		uiactions: {
 		},
 	},
+	grid_001_grid: {
+		columns: {
+			employeecode: "员工编号",
+			employeename: "员工姓名",
+			organizationname: "单位",
+			hrdutyname: "职务",
+			hrpostname: "职位",
+			certnum: "证件号码",
+			birthday: "出生日期",
+			age: "年龄",
+			mobile: "移动电话",
+			email: "电子邮箱",
+			empstate: "员工状态",
+			uagridcolumn1: "操作",
+		},
+		uiactions: {
+			hremployee_signcontract: "新签",
+		},
+	},
 	main_grid: {
 		columns: {
 			employeecode: "员工编号",
@@ -293,48 +312,6 @@ export default {
 			tip: "关闭",
 		},
 	},
-	v_007toolbar_toolbar: {
-		tbitem1_ff_002: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem2: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem4: {
-			caption: "编辑",
-			tip: "编辑",
-		},
-		tbitem6: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "删除",
-			tip: "删除",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "导出",
-			tip: "导出",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "过滤",
-			tip: "过滤",
-		},
-	},
 	v_006toolbar_toolbar: {
 		tbitem1_ff_002: {
 			caption: "新建",

app_PIM/src/mock/app/pim-appmenu/pim-appmenu.ts

@@ -125,10 +125,10 @@ mock.onGet('v7/pimappmenu').reply((config: any) => {
 		{
 	id: '4b24bf3dc681c591cb1663ce8853cc32',
 	name: 'menuitem15',
-	text: '员工信息',
+	text: '员工',
 	type: 'MENUITEM',
 	counterid: '',
-	tooltip: '员工信息',
+	tooltip: '员工',
 	expanded: false,
 	separator: false,
 	hidden: false,
@@ -143,10 +143,10 @@ mock.onGet('v7/pimappmenu').reply((config: any) => {
 		{
 	id: '9EAF638F-4BD3-41E5-95D9-D0BB5A0F8375',
 	name: 'menuitem8',
-	text: '合同信息',
+	text: '合同',
 	type: 'MENUITEM',
 	counterid: '',
-	tooltip: '合同信息',
+	tooltip: '合同',
 	expanded: false,
 	separator: false,
 	hidden: false,

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

 <studio-view-style2 viewName="hremployeev_007" viewTitle="员工" class='degridview hremployee-v-007'>
     <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>
     <template slot="searchForm">
                 <view_searchform 
             :viewState="viewState"  

app_PIM/src/pages/human-resource/hremployee-v-007/hremployee-v-007.vue

@@ -3,7 +3,7 @@
 import { Component } from 'vue-property-decorator';
 import { VueLifeCycleProcessing } from '@/studio-core';
 import { HREmployeeV_007Base } from './hremployee-v-007-base';
-import view_grid from '@widgets/hremployee/main-grid/main-grid.vue';
+import view_grid from '@widgets/hremployee/grid-001-grid/grid-001-grid.vue';
 import view_searchform from '@widgets/hremployee/default-searchform/default-searchform.vue';
 
 /**

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

@@ -11,6 +11,7 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 'ba512ad6a392dc170b1959cebd038fb8',
+                'a03a955d89ac96b26f80ca2caf2cc023',
                 '1fda62030d6149cb5ee6f088bc4f0aa7',
             ],
         },

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

@@ -122,6 +122,59 @@ export default class HREmployeeUIServiceBase extends UIService {
     public initDeMainStateOPPrivsMap(){
     }
 
+    /**
+     * 新签
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} context 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @param {*} [srfParentDeName] 父实体名称
+     * @returns {Promise<any>}
+     */
+    public async HREmployee_SignContract(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+    
+        let data: any = {};
+        let parentContext:any = {};
+        let parentViewParam:any = {};
+        const _this: any = actionContext;
+        const _args: any[] = Util.deepCopy(args);
+        const actionTarget: string | null = 'SINGLEKEY';
+        Object.assign(context, { hremployee: '%hremployee%' });
+        Object.assign(params, { employeeid: '%hremployee%' });
+        Object.assign(params, { employeename: '%employeename%' });
+        if(_this.context){
+            parentContext = _this.context;
+        }
+        if(_this.viewparams){
+            parentViewParam = _this.viewparams;
+        }
+        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
+        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
+        context = Object.assign({},actionContext.context,context);
+        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
+        Object.assign(data,parentObj);
+        Object.assign(context,parentObj);
+        let deResParameters: any[] = [];
+        if(context.hremployee && true){
+            deResParameters = [
+            { pathName: 'hremployees', parameterName: 'hremployee' },
+            ]
+        }
+        const parameters: any[] = [
+            { pathName: 'hrcontracts', parameterName: 'hrcontract' },
+            { pathName: 'editview', parameterName: 'editview' },
+        ];
+        const openIndexViewTab = (data: any) => {
+            const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
+            actionContext.$router.push(routePath);
+            return null;
+        }
+        openIndexViewTab(data);
+    }
+
     /**
      * 删除并关闭
      *

app_PIM/src/widgets/app/pim-appmenu/pim-appmenu-model.ts

@@ -135,10 +135,10 @@ export default class PIMModel {
                         		        {
                         	id: '4b24bf3dc681c591cb1663ce8853cc32',
                         	name: 'menuitem15',
-                        	text: '员工信息',
+                        	text: '员工',
                         	type: 'MENUITEM',
                         	counterid: '',
-                        	tooltip: '员工信息',
+                        	tooltip: '员工',
                         	expanded: false,
                         	separator: false,
                         	hidden: false,
@@ -156,10 +156,10 @@ export default class PIMModel {
                         		        {
                         	id: '9EAF638F-4BD3-41E5-95D9-D0BB5A0F8375',
                         	name: 'menuitem8',
-                        	text: '合同信息',
+                        	text: '合同',
                         	type: 'MENUITEM',
                         	counterid: '',
-                        	tooltip: '合同信息',
+                        	tooltip: '合同',
                         	expanded: false,
                         	separator: false,
                         	hidden: false,

app_PIM/src/widgets/hrcontract/tab-exp-viewtabexppanel-tabexppanel/tab-exp-viewtabexppanel-tabexppanel-base.tsx

@@ -65,11 +65,11 @@ export class TabExpViewtabexppanelTabexppanelBase extends TabExpPanelControlBase
      * @memberof TabExpViewtabexppanel
      */
     protected isInit: any = {
-        tabviewpanel5:  true ,
-        tabviewpanel4:  false ,
-        tabviewpanel3:  false ,
-        tabviewpanel:  false ,
+        tabviewpanel:  true ,
         tabviewpanel2:  false ,
+        tabviewpanel3:  false ,
+        tabviewpanel4:  false ,
+        tabviewpanel5:  false ,
     }
 
     /**
@@ -79,7 +79,7 @@ export class TabExpViewtabexppanelTabexppanelBase extends TabExpPanelControlBase
      * @type {string}
      * @memberof TabExpViewtabexppanel
      */
-    protected activatedTabViewPanel: string = 'tabviewpanel5';
+    protected activatedTabViewPanel: string = 'tabviewpanel';
 
     /**
      * 组件创建完毕

app_PIM/src/widgets/hrcontract/tab-exp-viewtabexppanel-tabexppanel/tab-exp-viewtabexppanel-tabexppanel.html

 <div class='tabviewpanel'>
     <tabs :value="activatedTabViewPanel" :animated="false" class='tabexppanel' name='tabexpviewtabexppanel' @on-click="tabPanelClick($event)">
-        <tab-pane :index="0" name='tabviewpanel5' tab='tabexpviewtabexppanel' class=''  
+        <tab-pane :index="0" name='tabviewpanel' tab='tabexpviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
                     h('i',{
-                        class:'fa fa-list',
+                        class:'fa fa-edit',
                         style:{
                             'margin-right' : '2px'
                         }
                     }),
-                    h('span', '全部合同'),
+                    h('span', '待新签'),
                     h('Badge', {
                         props: {
                             count: undefined,
@@ -18,28 +18,28 @@
                     })
                 ])
             }" >
-            <view_tabviewpanel5 
+            <view_tabviewpanel 
     :viewState="viewState"  
     :viewparams="JSON.parse(JSON.stringify(viewparams))" 
     :context="JSON.parse(JSON.stringify(context))" 
-    v-if="isInit.tabviewpanel5"
-    name="tabviewpanel5"  
-    ref='tabviewpanel5'
-    :expActive="activatedTabViewPanel === 'tabviewpanel5'"
+    v-if="isInit.tabviewpanel"
+    name="tabviewpanel"  
+    ref='tabviewpanel'
+    :expActive="activatedTabViewPanel === 'tabviewpanel'"
     @viewpanelDatasChange = "tabViewPanelDatasChange"
     @closeview="closeView($event)">
-</view_tabviewpanel5>
+</view_tabviewpanel>
         </tab-pane>
-        <tab-pane :index="1" name='tabviewpanel4' tab='tabexpviewtabexppanel' class=''  
+        <tab-pane :index="1" name='tabviewpanel2' tab='tabexpviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
                     h('i',{
-                        class:'fa fa-check-square-o',
+                        class:'fa fa-pencil',
                         style:{
                             'margin-right' : '2px'
                         }
                     }),
-                    h('span', '执行中'),
+                    h('span', '待续签'),
                     h('Badge', {
                         props: {
                             count: undefined,
@@ -48,17 +48,17 @@
                     })
                 ])
             }" >
-            <view_tabviewpanel4 
+            <view_tabviewpanel2 
     :viewState="viewState"  
     :viewparams="JSON.parse(JSON.stringify(viewparams))" 
     :context="JSON.parse(JSON.stringify(context))" 
-    v-if="isInit.tabviewpanel4"
-    name="tabviewpanel4"  
-    ref='tabviewpanel4'
-    :expActive="activatedTabViewPanel === 'tabviewpanel4'"
+    v-if="isInit.tabviewpanel2"
+    name="tabviewpanel2"  
+    ref='tabviewpanel2'
+    :expActive="activatedTabViewPanel === 'tabviewpanel2'"
     @viewpanelDatasChange = "tabViewPanelDatasChange"
     @closeview="closeView($event)">
-</view_tabviewpanel4>
+</view_tabviewpanel2>
         </tab-pane>
         <tab-pane :index="2" name='tabviewpanel3' tab='tabexpviewtabexppanel' class=''  
             :label="(h) =>{
@@ -90,16 +90,16 @@
     @closeview="closeView($event)">
 </view_tabviewpanel3>
         </tab-pane>
-        <tab-pane :index="3" name='tabviewpanel' tab='tabexpviewtabexppanel' class=''  
+        <tab-pane :index="3" name='tabviewpanel4' tab='tabexpviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
                     h('i',{
-                        class:'fa fa-edit',
+                        class:'fa fa-check-square-o',
                         style:{
                             'margin-right' : '2px'
                         }
                     }),
-                    h('span', '待新签'),
+                    h('span', '执行中'),
                     h('Badge', {
                         props: {
                             count: undefined,
@@ -108,28 +108,28 @@
                     })
                 ])
             }" >
-            <view_tabviewpanel 
+            <view_tabviewpanel4 
     :viewState="viewState"  
     :viewparams="JSON.parse(JSON.stringify(viewparams))" 
     :context="JSON.parse(JSON.stringify(context))" 
-    v-if="isInit.tabviewpanel"
-    name="tabviewpanel"  
-    ref='tabviewpanel'
-    :expActive="activatedTabViewPanel === 'tabviewpanel'"
+    v-if="isInit.tabviewpanel4"
+    name="tabviewpanel4"  
+    ref='tabviewpanel4'
+    :expActive="activatedTabViewPanel === 'tabviewpanel4'"
     @viewpanelDatasChange = "tabViewPanelDatasChange"
     @closeview="closeView($event)">
-</view_tabviewpanel>
+</view_tabviewpanel4>
         </tab-pane>
-        <tab-pane :index="4" name='tabviewpanel2' tab='tabexpviewtabexppanel' class=''  
+        <tab-pane :index="4" name='tabviewpanel5' tab='tabexpviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
                     h('i',{
-                        class:'fa fa-pencil',
+                        class:'fa fa-list',
                         style:{
                             'margin-right' : '2px'
                         }
                     }),
-                    h('span', '待续签'),
+                    h('span', '全部合同'),
                     h('Badge', {
                         props: {
                             count: undefined,
@@ -138,17 +138,17 @@
                     })
                 ])
             }" >
-            <view_tabviewpanel2 
+            <view_tabviewpanel5 
     :viewState="viewState"  
     :viewparams="JSON.parse(JSON.stringify(viewparams))" 
     :context="JSON.parse(JSON.stringify(context))" 
-    v-if="isInit.tabviewpanel2"
-    name="tabviewpanel2"  
-    ref='tabviewpanel2'
-    :expActive="activatedTabViewPanel === 'tabviewpanel2'"
+    v-if="isInit.tabviewpanel5"
+    name="tabviewpanel5"  
+    ref='tabviewpanel5'
+    :expActive="activatedTabViewPanel === 'tabviewpanel5'"
     @viewpanelDatasChange = "tabViewPanelDatasChange"
     @closeview="closeView($event)">
-</view_tabviewpanel2>
+</view_tabviewpanel5>
         </tab-pane>
     </tabs>
 </div>
\ No newline at end of file

app_PIM/src/widgets/hrcontract/tab-exp-viewtabexppanel-tabexppanel/tab-exp-viewtabexppanel-tabexppanel.vue

@@ -3,11 +3,11 @@
 import { Component } from 'vue-property-decorator';
 import { VueLifeCycleProcessing } from '@/studio-core';
 import { TabExpViewtabexppanelTabexppanelBase } from './tab-exp-viewtabexppanel-tabexppanel-base';
-import view_tabviewpanel5 from '@widgets/hrcontract/tab-exp-viewtabviewpanel5-tabviewpanel/tab-exp-viewtabviewpanel5-tabviewpanel.vue';
-import view_tabviewpanel4 from '@widgets/hrcontract/tab-exp-viewtabviewpanel4-tabviewpanel/tab-exp-viewtabviewpanel4-tabviewpanel.vue';
-import view_tabviewpanel3 from '@widgets/hrcontract/tab-exp-viewtabviewpanel3-tabviewpanel/tab-exp-viewtabviewpanel3-tabviewpanel.vue';
 import view_tabviewpanel from '@widgets/hrcontract/tab-exp-viewtabviewpanel-tabviewpanel/tab-exp-viewtabviewpanel-tabviewpanel.vue';
 import view_tabviewpanel2 from '@widgets/hrcontract/tab-exp-viewtabviewpanel2-tabviewpanel/tab-exp-viewtabviewpanel2-tabviewpanel.vue';
+import view_tabviewpanel3 from '@widgets/hrcontract/tab-exp-viewtabviewpanel3-tabviewpanel/tab-exp-viewtabviewpanel3-tabviewpanel.vue';
+import view_tabviewpanel4 from '@widgets/hrcontract/tab-exp-viewtabviewpanel4-tabviewpanel/tab-exp-viewtabviewpanel4-tabviewpanel.vue';
+import view_tabviewpanel5 from '@widgets/hrcontract/tab-exp-viewtabviewpanel5-tabviewpanel/tab-exp-viewtabviewpanel5-tabviewpanel.vue';
  
 
 /**
@@ -19,11 +19,11 @@ import view_tabviewpanel2 from '@widgets/hrcontract/tab-exp-viewtabviewpanel2-ta
  */
 @Component({
     components: {
-        view_tabviewpanel5, 
-        view_tabviewpanel4, 
-        view_tabviewpanel3, 
         view_tabviewpanel, 
         view_tabviewpanel2, 
+        view_tabviewpanel3, 
+        view_tabviewpanel4, 
+        view_tabviewpanel5, 
          
     }
 })

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

+import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
+import { Subject, Subscription } from 'rxjs';
+import { Watch, GridControlBase } from '@/studio-core';
+import HREmployeeService from '@/service/hremployee/hremployee-service';
+import GRID_001Service from './grid-001-grid-service';
+import HREmployeeUIService from '@/uiservice/hremployee/hremployee-ui-service';
+import { FormItemModel } from '@/model/form-detail';
+
+
+/**
+ * grid部件基类
+ *
+ * @export
+ * @class GridControlBase
+ * @extends {GRID_001GridBase}
+ */
+export class GRID_001GridBase extends GridControlBase {
+
+    /**
+     * 获取部件类型
+     *
+     * @protected
+     * @type {string}
+     * @memberof GRID_001GridBase
+     */
+    protected controlType: string = 'GRID';
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {GRID_001Service}
+     * @memberof GRID_001GridBase
+     */
+    public service: GRID_001Service = new GRID_001Service({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {HREmployeeService}
+     * @memberof GRID_001GridBase
+     */
+    public appEntityService: HREmployeeService = new HREmployeeService({ $store: this.$store });
+
+    /**
+     * 应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof GRID_001GridBase
+     */
+    protected appDeName: string = 'hremployee';
+
+    /**
+     * 应用实体中文名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof GRID_001GridBase
+     */
+    protected appDeLogicName: string = '员工';
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public grid_uagridcolumn1_u2abac3f_click(params: any = {}, tag?: any, $event?: any) {
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this;
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        const curUIService:HREmployeeUIService  = new HREmployeeUIService();
+        curUIService.HREmployee_SignContract(datas,contextJO, paramJO,  $event, xData,this,"HREmployee");
+    }
+
+    /**
+     * 界面UI服务对象
+     *
+     * @type {HREmployeeUIService}
+     * @memberof GRID_001Base
+     */  
+    public appUIService:HREmployeeUIService = new HREmployeeUIService(this.$store);
+
+    /**
+     * 界面行为模型
+     *
+     * @type {*}
+     * @memberof GRID_001Base
+     */  
+    public ActionModel: any = {
+        SignContract: { name: 'SignContract',disabled: false, visabled: true,noprivdisplaymode:2,dataaccaction: '', target: 'SINGLEKEY'}
+    };
+
+    /**
+     * 本地缓存标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof GRID_001Base
+     */
+    protected localStorageTag: string = 'hremployee_grid_001_grid';
+
+    /**
+     * 所有列成员
+     *
+     * @type {any[]}
+     * @memberof GRID_001GridBase
+     */
+    public allColumns: any[] = [
+        {
+            name: 'employeecode',
+            label: '员工编号',
+            langtag: 'entities.hremployee.grid_001_grid.columns.employeecode',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'employeename',
+            label: '员工姓名',
+            langtag: 'entities.hremployee.grid_001_grid.columns.employeename',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'organizationname',
+            label: '单位',
+            langtag: 'entities.hremployee.grid_001_grid.columns.organizationname',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'hrdutyname',
+            label: '职务',
+            langtag: 'entities.hremployee.grid_001_grid.columns.hrdutyname',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'hrpostname',
+            label: '职位',
+            langtag: 'entities.hremployee.grid_001_grid.columns.hrpostname',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'certnum',
+            label: '证件号码',
+            langtag: 'entities.hremployee.grid_001_grid.columns.certnum',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'birthday',
+            label: '出生日期',
+            langtag: 'entities.hremployee.grid_001_grid.columns.birthday',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'age',
+            label: '年龄',
+            langtag: 'entities.hremployee.grid_001_grid.columns.age',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'mobile',
+            label: '移动电话',
+            langtag: 'entities.hremployee.grid_001_grid.columns.mobile',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'email',
+            label: '电子邮箱',
+            langtag: 'entities.hremployee.grid_001_grid.columns.email',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'empstate',
+            label: '员工状态',
+            langtag: 'entities.hremployee.grid_001_grid.columns.empstate',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'uagridcolumn1',
+            label: '操作',
+            langtag: 'entities.hremployee.grid_001_grid.columns.uagridcolumn1',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+    ]
+
+    /**
+     * 获取表格行模型
+     *
+     * @type {*}
+     * @memberof GRID_001GridBase
+     */
+    public getGridRowModel(){
+        return {
+          srfkey: new FormItemModel(),
+        }
+    }
+
+    /**
+     * 属性值规则
+     *
+     * @type {*}
+     * @memberof GRID_001GridBase
+     */
+    public rules: any = {
+        srfkey: [
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '员工标识 值不能为空', trigger: 'change' },
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '员工标识 值不能为空', trigger: 'blur' },
+        ],
+    }
+
+    /**
+     * 获取对应列class
+     *
+     * @type {*}
+     * @memberof GRID_001Base
+     */
+    public hasRowEdit: any = {
+        'employeecode':false,
+        'employeename':false,
+        'organizationname':false,
+        'hrdutyname':false,
+        'hrpostname':false,
+        'certnum':false,
+        'birthday':false,
+        'age':false,
+        'mobile':false,
+        'email':false,
+        'empstate':false,
+        'uagridcolumn1':false,
+    };
+
+    /**
+     * 获取对应列class
+     *
+     * @param {*} $args row 行数据，column 列数据，rowIndex 行索引，列索引
+     * @returns {void}
+     * @memberof GRID_001Base
+     */
+    public getCellClassName(args: {row: any, column: any, rowIndex: number, columnIndex: number}): any {
+        return ( this.hasRowEdit[args.column.property] && this.actualIsOpenEdit ) ? "edit-cell" : "info-cell";
+    }
+
+
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof GRID_001GridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+            {
+                name: 'empstate',
+                srfkey: 'CL_HR_0016',
+                codelistType : 'DYNAMIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+        ]);
+    }
+
+
+    /**
+     * 界面行为
+     *
+     * @param {*} row
+     * @param {*} tag
+     * @param {*} $event
+     * @memberof GRID_001GridBase
+     */
+	public uiAction(row: any, tag: any, $event: any): void {
+        $event.stopPropagation();
+        if(Object.is('SignContract', tag)) {
+            this.grid_uagridcolumn1_u2abac3f_click(row, tag, $event);
+        }
+    }
+}
\ No newline at end of file

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

+/**
+ * GRID_001 部件模型
+ *
+ * @export
+ * @class GRID_001Model
+ */
+export default class GRID_001Model {
+
+	/**
+	 * 是否是实体数据导出
+	 *
+	 * @returns {any[]}
+	 * @memberof GRID_001GridMode
+	 */
+	public isDEExport: boolean = false;
+
+	/**
+	 * 获取数据项集合
+	 *
+	 * @returns {any[]}
+	 * @memberof GRID_001GridMode
+	 */
+	public getDataItems(): any[] {
+    if(this.isDEExport){
+		  return [
+      ]
+    }else{
+		  return [
+        {
+          name: 'organizationname',
+          prop: 'organizationname',
+          dataType: 'PICKUPTEXT',
+        },
+        {
+          name: 'hrpostid',
+          prop: 'hrpostid',
+          dataType: 'PICKUP',
+        },
+        {
+          name: 'birthday',
+          prop: 'birthday',
+          dataType: 'DATE',
+        },
+        {
+          name: 'empstate',
+          prop: 'empstate',
+          dataType: 'PICKUP',
+        },
+        {
+          name: 'hrdutyname',
+          prop: 'hrdutyname',
+          dataType: 'PICKUPDATA',
+        },
+        {
+          name: 'hrpostname',
+          prop: 'hrpostname',
+          dataType: 'PICKUPTEXT',
+        },
+        {
+          name: 'employeename',
+          prop: 'employeename',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'employeecode',
+          prop: 'employeecode',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'srfmajortext',
+          prop: 'employeename',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'srfdataaccaction',
+          prop: 'employeeid',
+          dataType: 'GUID',
+        },
+        {
+          name: 'srfkey',
+          prop: 'employeeid',
+          dataType: 'GUID',
+          isEditable:true
+        },
+        {
+          name: 'organizationid',
+          prop: 'organizationid',
+          dataType: 'PICKUP',
+        },
+        {
+          name: 'email',
+          prop: 'email',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'age',
+          prop: 'age',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'certnum',
+          prop: 'certnum',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'mobile',
+          prop: 'mobile',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'hremployee',
+          prop: 'employeeid',
+        },
+
+        {
+          name:'size',
+          prop:'size'
+        },
+        {
+          name:'query',
+          prop:'query'
+        },
+        {
+          name:'filter',
+          prop:'filter'
+        },
+        {
+          name:'page',
+          prop:'page'
+        },
+        {
+          name:'sort',
+          prop:'sort'
+        },
+        {
+          name:'srfparentdata',
+          prop:'srfparentdata'
+        },
+        // 前端新增修改标识，新增为"0",修改为"1"或未设值
+        {
+          name: 'srffrontuf',
+          prop: 'srffrontuf',
+          dataType: 'TEXT',
+        },
+      ]
+    }
+  }
+
+}
\ No newline at end of file

app_PIM/src/widgets/hremployee/grid-001-grid/grid-001-grid.vue

+<template src="./grid-001-grid.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { GRID_001GridBase } from './grid-001-grid-base';
+ 
+
+/**
+ * grid部件
+ *
+ * @export
+ * @class GRID_001Grid
+ * @extends {GRID_001GridBase}
+ */
+@Component({
+    components: {
+         
+    }
+})
+@VueLifeCycleProcessing()
+export default class GRID_001Grid extends GRID_001GridBase { }
+</script>

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

@@ -86,7 +86,7 @@
 
 
     <!--输出实体[HRCONTRACT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrcontract-60-4">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrcontract-61-4">
         <createTable tableName="T_HRCONTRACT">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -338,7 +338,7 @@
 
 
     <!--输出实体[HREMPLOYEE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-274-12">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-280-12">
         <createTable tableName="EMPLOYEE">
                 <column name="EMPLOYEENAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -1087,10 +1087,10 @@
        <addForeignKeyConstraint baseColumnNames="REGISTERORGANIZATIONID" baseTableName="T_HRCERTIFICATE" constraintName="DER1N_HRCERTIFICATE_HRORGANIZA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
     </changeSet>
         <!--输出实体[HRCONTRACT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-60-38">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-61-38">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRCONTRACT" constraintName="DER1N_HRCONTRACT_HREMPLOYEE_HR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-60-39">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-61-39">
        <addForeignKeyConstraint baseColumnNames="MGRORGANIZATIONID" baseTableName="T_HRCONTRACT" constraintName="DER1N_HRCONTRACT_HRORGANIZATIO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
     </changeSet>
         <!--输出实体[HRDISTRIBUTION]外键关系 -->
@@ -1119,13 +1119,13 @@
     </changeSet>
         <!--输出实体[HREMPSTATE]外键关系 -->
         <!--输出实体[HREMPLOYEE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-274-47">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-280-47">
        <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-274-48">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-280-48">
        <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-274-49">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-280-49">
        <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]外键关系 -->

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

@@ -265,7 +265,7 @@
             {
                "appid":"PIM",
                "appname":"基础管理",
-               "appmenu":[{"menuid":"PIM", "menuname":"PIM", "menuitem":[{ "id":"user_menus" , "name":"用户菜单" , "items":[{ "id":"menuitem3" , "name":"设置" }]},{ "id":"top_menus" , "name":"顶部菜单" , "items":[{ "id":"menuitem1" , "name":"-" }]},{ "id":"left_exp" , "name":"左侧菜单" , "items":[{ "id":"menuitem5" , "name":"人员" , "items":[{ "id":"menuitem15" , "name":"员工信息" },{ "id":"menuitem8" , "name":"合同信息" }]},{ "id":"menuitem2" , "name":"组织" , "items":[{ "id":"menuitem4" , "name":"法人" },{ "id":"menuitem6" , "name":"运营单位" },{ "id":"menuitem7" , "name":"组织层次结构" },{ "id":"menuitem9" , "name":"所有组织" }]},{ "id":"menuitem10" , "name":"职位" , "items":[{ "id":"menuitem11" , "name":"职位" },{ "id":"menuitem12" , "name":"职务" }]}]},{ "id":"bottom_exp" , "name":"底部内容" },{ "id":"footer_left" , "name":"底部左侧" },{ "id":"footer_center" , "name":"底部中间" },{ "id":"footer_right" , "name":"底部右侧" }] }]
+               "appmenu":[{"menuid":"PIM", "menuname":"PIM", "menuitem":[{ "id":"user_menus" , "name":"用户菜单" , "items":[{ "id":"menuitem3" , "name":"设置" }]},{ "id":"top_menus" , "name":"顶部菜单" , "items":[{ "id":"menuitem1" , "name":"-" }]},{ "id":"left_exp" , "name":"左侧菜单" , "items":[{ "id":"menuitem5" , "name":"人员" , "items":[{ "id":"menuitem15" , "name":"员工" },{ "id":"menuitem8" , "name":"合同" }]},{ "id":"menuitem2" , "name":"组织" , "items":[{ "id":"menuitem4" , "name":"法人" },{ "id":"menuitem6" , "name":"运营单位" },{ "id":"menuitem7" , "name":"组织层次结构" },{ "id":"menuitem9" , "name":"所有组织" }]},{ "id":"menuitem10" , "name":"职位" , "items":[{ "id":"menuitem11" , "name":"职位" },{ "id":"menuitem12" , "name":"职务" }]}]},{ "id":"bottom_exp" , "name":"底部内容" },{ "id":"footer_left" , "name":"底部左侧" },{ "id":"footer_center" , "name":"底部中间" },{ "id":"footer_right" , "name":"底部右侧" }] }]
             }
             ]
     }