jackwang 部署微服务应用

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

@@ -80,7 +80,7 @@
         "memo": ""
     },
     "pim": {
-        "title": "应用首页视图",
+        "title": "人力资源管理",
         "caption": "基础管理",
         "viewtype": "APPINDEXVIEW",
         "viewmodule": "Ungroup",

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

@@ -119,7 +119,7 @@ export default {
         views: {
             pim: {
                 caption: "基础管理",
-                title: "应用首页视图",
+                title: "人力资源管理",
             },
         },
         utilview:{

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

@@ -119,7 +119,7 @@ export default {
         views: {
             pim: {
                 caption: "基础管理",
-                title: "应用首页视图",
+                title: "人力资源管理",
             },
         },
         utilview:{

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

@@ -84,30 +84,10 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "Filter",
 			tip: "Filter",
 		},
-		tbitem18: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {

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

@@ -83,30 +83,10 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "导出数据模型",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "过滤",
 			tip: "过滤",
 		},
-		tbitem18: {
-			caption: "帮助",
-			tip: "帮助",
-		},
 	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {

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

@@ -146,29 +146,9 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "Filter",
 			tip: "Filter",
 		},
-		tbitem18: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 };
\ No newline at end of file

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

@@ -145,29 +145,9 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "导出数据模型",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "过滤",
 			tip: "过滤",
 		},
-		tbitem18: {
-			caption: "帮助",
-			tip: "帮助",
-		},
 	},
 };
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hrorg-address/hrorg-address_en_US.ts

@@ -112,29 +112,9 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "Filter",
 			tip: "Filter",
 		},
-		tbitem18: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 };
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hrorg-address/hrorg-address_zh_CN.ts

@@ -111,29 +111,9 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "导出数据模型",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "过滤",
 			tip: "过滤",
 		},
-		tbitem18: {
-			caption: "帮助",
-			tip: "帮助",
-		},
 	},
 };
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hrorg-contact/hrorg-contact_en_US.ts

@@ -110,29 +110,9 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "Filter",
 			tip: "Filter",
 		},
-		tbitem18: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 };
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hrorg-contact/hrorg-contact_zh_CN.ts

@@ -109,29 +109,9 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "导出数据模型",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "过滤",
 			tip: "过滤",
 		},
-		tbitem18: {
-			caption: "帮助",
-			tip: "帮助",
-		},
 	},
 };
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hrorganization/hrorganization_en_US.ts

@@ -101,30 +101,10 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "Filter",
 			tip: "Filter",
 		},
-		tbitem18: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {

app_PIM/src/locale/lanres/entities/hrorganization/hrorganization_zh_CN.ts

@@ -100,30 +100,10 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "导出数据模型",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "过滤",
 			tip: "过滤",
 		},
-		tbitem18: {
-			caption: "帮助",
-			tip: "帮助",
-		},
 	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {

app_PIM/src/mock/viewconfig/viewconfig.ts

@@ -72,7 +72,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "41036146909ab3f28ff59b80370514b2"
         },
         "pim": {
-            "title": "应用首页视图",
+            "title": "人力资源管理",
             "caption": "基础管理",
             "viewtype": "APPINDEXVIEW",
             "viewmodule": "Ungroup",

app_PIM/src/widgets/hrlegal/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('legalname')">
-                <el-table-column show-overflow-tooltip :prop="'legalname'" :label="$t('entities.hrlegal.main_grid.columns.legalname')" :width="100"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'legalname'" :label="$t('entities.hrlegal.main_grid.columns.legalname')" :width="300"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.hrlegal.main_grid.columns.legalname')}}
@@ -36,7 +36,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('orgcode')">
-                <el-table-column show-overflow-tooltip :prop="'orgcode'" :label="$t('entities.hrlegal.main_grid.columns.orgcode')" :width="100"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'orgcode'" :label="$t('entities.hrlegal.main_grid.columns.orgcode')" :width="150"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.hrlegal.main_grid.columns.orgcode')}}
@@ -48,7 +48,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('shortname')">
-                <el-table-column show-overflow-tooltip :prop="'shortname'" :label="$t('entities.hrlegal.main_grid.columns.shortname')" :width="100"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'shortname'" :label="$t('entities.hrlegal.main_grid.columns.shortname')" :width="150"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.hrlegal.main_grid.columns.shortname')}}
@@ -60,7 +60,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('showorder')">
-                <el-table-column show-overflow-tooltip :prop="'showorder'" :label="$t('entities.hrlegal.main_grid.columns.showorder')" :width="100"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'showorder'" :label="$t('entities.hrlegal.main_grid.columns.showorder')" :width="150"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.hrlegal.main_grid.columns.showorder')}}

app_PIM/vue.config.js

@@ -27,7 +27,7 @@ module.exports = {
             filename: 'index.html',
             // 当使用 title 选项时，
             // template 中的 title 标签需要是 <title><%= htmlWebpackPlugin.options.title %></title>
-            title: '应用首页视图',
+            title: '人力资源管理',
             // 在这个页面中包含的块，默认情况下会包含
             // 提取出来的通用 chunk 和 vendor chunk。
             // chunks: ['chunk-vendors', 'chunk-common', 'index']

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

@@ -66,7 +66,7 @@
 
 
     <!--输出实体[HRLEGAL]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrlegal-69-4">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrlegal-70-4">
         <createTable tableName="LEGAL">
                 <column name="LEGALNAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -202,7 +202,7 @@
 
 
     <!--输出实体[HRORGADDRESS]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrorgaddress-25-10">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrorgaddress-27-10">
         <createTable tableName="T_HRORGADDRESS">
                 <column name="HRORGADDRESSNAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -230,7 +230,7 @@
 
 
     <!--输出实体[HRORGCONTACT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrorgcontact-21-11">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrorgcontact-23-11">
         <createTable tableName="T_HRORGCONTACT">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>