jackwang 部署微服务应用

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

@@ -40,7 +40,7 @@
         "memo": ""
     },
     "hroperationuniteditview": {
-        "title": "运营单位编辑视图",
+        "title": "运营单位信息编辑",
         "caption": "运营单位",
         "viewtype": "DEEDITVIEW",
         "viewmodule": "Base",

app_PIM/src/locale/lanres/entities/hroperation-unit/hroperation-unit_en_US.ts

@@ -22,7 +22,7 @@ export default {
 		},
 		editview: {
 			caption: "运营单位",
-      		title: "运营单位编辑视图",
+      		title: "运营单位信息编辑",
 		},
 	},
 	main_form: {
@@ -43,6 +43,7 @@ export default {
 			orgcode: "组织编码", 
 			shortname: "组织简称", 
 			showorder: "排序号", 
+			organizationtype: "组织类型", 
 			memo: "备注", 
 			operationunitid: "运营单位标识", 
 		},
@@ -68,49 +69,17 @@ export default {
 		},
 	},
 	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "Save",
-			tip: "Save",
-		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
-		tbitem5: {
+		tbitem1: {
 			caption: "Save And Close",
 			tip: "Save And Close Window",
 		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem16: {
-			caption: "-",
+		seperator1: {
+			caption: "",
 			tip: "",
 		},
-		tbitem22: {
-			caption: "Help",
-			tip: "Help",
+		tbitem2: {
+			caption: "关闭",
+			tip: "关闭",
 		},
 	},
 	gridviewtoolbar_toolbar: {

app_PIM/src/locale/lanres/entities/hroperation-unit/hroperation-unit_zh_CN.ts

@@ -21,7 +21,7 @@ export default {
 		},
 		editview: {
 			caption: "运营单位",
-      		title: "运营单位编辑视图",
+      		title: "运营单位信息编辑",
 		},
 	},
 	main_form: {
@@ -42,6 +42,7 @@ export default {
 			orgcode: "组织编码", 
 			shortname: "组织简称", 
 			showorder: "排序号", 
+			organizationtype: "组织类型", 
 			memo: "备注", 
 			operationunitid: "运营单位标识", 
 		},
@@ -67,49 +68,17 @@ export default {
 		},
 	},
 	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "保存",
-			tip: "保存",
-		},
-		tbitem4: {
-			caption: "保存并新建",
-			tip: "保存并新建",
-		},
-		tbitem5: {
+		tbitem1: {
 			caption: "保存并关闭",
 			tip: "保存并关闭",
 		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "删除并关闭",
-			tip: "删除并关闭",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-		tbitem16: {
-			caption: "-",
+		seperator1: {
+			caption: "",
 			tip: "",
 		},
-		tbitem22: {
-			caption: "帮助",
-			tip: "帮助",
+		tbitem2: {
+			caption: "关闭",
+			tip: "关闭",
 		},
 	},
 	gridviewtoolbar_toolbar: {

app_PIM/src/mock/viewconfig/viewconfig.ts

@@ -40,7 +40,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "286e8ac9eca7b6eb8058fde93995db10"
         },
         "hroperationuniteditview": {
-            "title": "运营单位编辑视图",
+            "title": "运营单位信息编辑",
             "caption": "运营单位",
             "viewtype": "DEEDITVIEW",
             "viewmodule": "Base",

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

 <studio-view-style2 viewName="hrlegaleditview" viewTitle="法人编辑视图" class='deeditview hrlegal-edit-view'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
     <view_form 

app_PIM/src/pages/base/hroperation-unit-edit-view/hroperation-unit-edit-view.html

-<studio-view-style2 viewName="hroperationuniteditview" viewTitle="运营单位编辑视图" class='deeditview hroperation-unit-edit-view'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
+<studio-view-style2 viewName="hroperationuniteditview" viewTitle="运营单位信息编辑" class='deeditview hroperation-unit-edit-view'>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
     <view_form 

app_PIM/src/pages/base/hroperation-unit-edit-view/hroperation-unit-edit-view.vue

@@ -6,7 +6,7 @@ import { HROperationUnitEditViewBase } from './hroperation-unit-edit-view-base';
 import view_form from '@widgets/hroperation-unit/main-form/main-form.vue';
 
 /**
- * 运营单位编辑视图视图
+ * 运营单位信息编辑视图
  *
  * @export
  * @class HROperationUnitEditView

app_PIM/src/widgets/hroperation-unit/main-form/main-form-base.tsx

@@ -78,6 +78,7 @@ export class MainEditFormBase extends EditFormControlBase {
         orgcode: null,
         shortname: null,
         showorder: null,
+        organizationtype: null,
         memo: null,
         operationunitid: null,
         hroperationunit:null,
@@ -140,9 +141,31 @@ export class MainEditFormBase extends EditFormControlBase {
 
         showorder: new FormItemModel({ caption: '排序号', detailType: 'FORMITEM', name: 'showorder', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
+        organizationtype: new FormItemModel({ caption: '组织类型', detailType: 'FORMITEM', name: 'organizationtype', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
         memo: new FormItemModel({ caption: '备注', detailType: 'FORMITEM', name: 'memo', visible: true, isShowCaption: false, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         operationunitid: new FormItemModel({ caption: '运营单位标识', detailType: 'FORMITEM', name: 'operationunitid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
     };
+
+    /**
+     * 新建默认值
+     * @memberof MainEditFormBase
+     */
+    public createDefault(){                    
+        if (this.data.hasOwnProperty('organizationtype')) {
+            this.data['organizationtype'] = 'OPERATIONUNIT';
+        }
+    }
+
+    /**
+     * 更新默认值
+     * @memberof MainEditFormBase
+     */
+    public updateDefault(){                    
+        if (this.data.hasOwnProperty('organizationtype') && !this.data.organizationtype) {
+            this.data['organizationtype'] = 'OPERATIONUNIT';
+        }
+    }
 }
\ No newline at end of file

app_PIM/src/widgets/hroperation-unit/main-form/main-form-model.ts

@@ -80,6 +80,11 @@ export default class MainModel {
         prop: 'showorder',
         dataType: 'INHERIT',
       },
+      {
+        name: 'organizationtype',
+        prop: 'organizationtype',
+        dataType: 'INHERIT',
+      },
       {
         name: 'memo',
         prop: 'memo',

app_PIM/src/widgets/hroperation-unit/main-form/main-form.html

@@ -3,7 +3,7 @@
     <row >
             
 <i-col class="form-layout-container" v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hroperationunit.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hroperationunit.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="false" >    
     <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group1" :data="data" :context="context" :viewparams="viewparams"/>
     <row>
         <i-col class="form-layout-container" v-show="detailsModel.operationunitname.visible" :style="{}"  :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
@@ -88,7 +88,7 @@
 
 </i-col>
 <i-col class="form-layout-container" v-show="detailsModel.grouppanel1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group :model="detailsModel.grouppanel1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hroperationunit.main_form.details.grouppanel1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group :model="detailsModel.grouppanel1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hroperationunit.main_form.details.grouppanel1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="false" >    
     <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.grouppanel1" :data="data" :context="context" :viewparams="viewparams"/>
     <row>
         <i-col class="form-layout-container" v-show="detailsModel.memo.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">

app_PIM/src/widgets/hroperation-unit/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('operationunitname')">
-                <el-table-column show-overflow-tooltip :prop="'operationunitname'" :label="$t('entities.hroperationunit.main_grid.columns.operationunitname')" :width="200"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'operationunitname'" :label="$t('entities.hroperationunit.main_grid.columns.operationunitname')" :width="300"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.hroperationunit.main_grid.columns.operationunitname')}}

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

@@ -66,7 +66,7 @@
 
 
     <!--输出实体[HRLEGAL]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrlegal-71-4">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrlegal-72-4">
         <createTable tableName="LEGAL">
                 <column name="LEGALNAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -182,7 +182,7 @@
 
 
     <!--输出实体[HROPERATIONUNIT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hroperationunit-9-9">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hroperationunit-20-9">
         <createTable tableName="OPERATIONUNIT">
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
                 </column>