jackwang 部署微服务应用

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

@@ -511,7 +511,7 @@
     },
     "hrdistributionv_002": {
         "title": "工作人员分配",
-        "caption": "工作人员分配",
+        "caption": "快速新建",
         "viewtype": "DEOPTVIEW",
         "viewmodule": "HumanResource",
         "viewname": "HRDistributionV_002",
@@ -540,8 +540,8 @@
         "memo": ""
     },
     "hrpostrelv_002": {
-        "title": "直接上级职位",
-        "caption": "直接上级职位",
+        "title": "快速新建",
+        "caption": "快速新建",
         "viewtype": "DEOPTVIEW",
         "viewmodule": "HumanResource",
         "viewname": "HRPostRelV_002",

app_PIM/src/locale/lanres/entities/hrdistribution/hrdistribution_en_US.ts

@@ -28,7 +28,7 @@ export default {
       		title: "工作人员分配编辑视图",
 		},
 		v_002: {
-			caption: "工作人员分配",
+			caption: "快速新建",
       		title: "工作人员分配",
 		},
 	},
@@ -55,9 +55,9 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			hrdistributionname: "工作人员分配名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			hremployeename: "员工姓名",
+			begintime: "入职时间",
+			endtime: "离职时间",
 		},
 		uiactions: {
 		},

app_PIM/src/locale/lanres/entities/hrdistribution/hrdistribution_zh_CN.ts

@@ -27,7 +27,7 @@ export default {
       		title: "工作人员分配编辑视图",
 		},
 		v_002: {
-			caption: "工作人员分配",
+			caption: "快速新建",
       		title: "工作人员分配",
 		},
 	},
@@ -54,9 +54,9 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			hrdistributionname: "工作人员分配名称",
-			updateman: "更新人",
-			updatedate: "更新时间",
+			hremployeename: "员工姓名",
+			begintime: "入职时间",
+			endtime: "离职时间",
 		},
 		uiactions: {
 		},

app_PIM/src/locale/lanres/entities/hrpost-rel/hrpost-rel_en_US.ts

@@ -28,8 +28,8 @@ export default {
       		title: "职位关系编辑视图",
 		},
 		v_002: {
-			caption: "直接上级职位",
-      		title: "直接上级职位",
+			caption: "快速新建",
+      		title: "快速新建",
 		},
 	},
 	main_form: {

app_PIM/src/locale/lanres/entities/hrpost-rel/hrpost-rel_zh_CN.ts

@@ -27,8 +27,8 @@ export default {
       		title: "职位关系编辑视图",
 		},
 		v_002: {
-			caption: "直接上级职位",
-      		title: "直接上级职位",
+			caption: "快速新建",
+      		title: "快速新建",
 		},
 	},
 	main_form: {

app_PIM/src/mock/viewconfig/viewconfig.ts

@@ -417,7 +417,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
         },
         "hrdistributionv_002": {
             "title": "工作人员分配",
-            "caption": "工作人员分配",
+            "caption": "快速新建",
             "viewtype": "DEOPTVIEW",
             "viewmodule": "HumanResource",
             "viewname": "HRDistributionV_002",
@@ -440,8 +440,8 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "d32b549b3c49b790b092eca97d1de2c1"
         },
         "hrpostrelv_002": {
-            "title": "直接上级职位",
-            "caption": "直接上级职位",
+            "title": "快速新建",
+            "caption": "快速新建",
             "viewtype": "DEOPTVIEW",
             "viewmodule": "HumanResource",
             "viewname": "HRPostRelV_002",

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>
+    </template>
     <view_form 
                     :viewState="viewState"  
                     :viewparams="viewparams" 

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

@@ -6,7 +6,7 @@ import OptionViewEngine from '@engine/view/option-view-engine';
 import HRPostRelUIService from '@/uiservice/hrpost-rel/hrpost-rel-ui-service';
 
 /**
- * 直接上级职位视图基类
+ * 快速新建视图基类
  *
  * @export
  * @class HRPostRelV_002Base

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

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

@@ -6,7 +6,7 @@ import { HRPostRelV_002Base } from './hrpost-rel-v-002-base';
 import view_form from '@widgets/hrpost-rel/main-form/main-form.vue';
 
 /**
- * 直接上级职位视图
+ * 快速新建视图
  *
  * @export
  * @class HRPostRelV_002

app_PIM/src/widgets/hrdistribution/main-grid/main-grid-base.tsx

@@ -101,25 +101,25 @@ export class MainGridBase extends GridControlBase {
      */
     public allColumns: any[] = [
         {
-            name: 'hrdistributionname',
-            label: '工作人员分配名称',
-            langtag: 'entities.hrdistribution.main_grid.columns.hrdistributionname',
+            name: 'hremployeename',
+            label: '员工姓名',
+            langtag: 'entities.hrdistribution.main_grid.columns.hremployeename',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
         },
         {
-            name: 'updateman',
-            label: '更新人',
-            langtag: 'entities.hrdistribution.main_grid.columns.updateman',
+            name: 'begintime',
+            label: '入职时间',
+            langtag: 'entities.hrdistribution.main_grid.columns.begintime',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
         },
         {
-            name: 'updatedate',
-            label: '更新时间',
-            langtag: 'entities.hrdistribution.main_grid.columns.updatedate',
+            name: 'endtime',
+            label: '离职时间',
+            langtag: 'entities.hrdistribution.main_grid.columns.endtime',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
@@ -158,9 +158,9 @@ export class MainGridBase extends GridControlBase {
      * @memberof MainBase
      */
     public hasRowEdit: any = {
-        'hrdistributionname':false,
-        'updateman':false,
-        'updatedate':false,
+        'hremployeename':false,
+        'begintime':false,
+        'endtime':false,
     };
 
     /**
@@ -186,14 +186,6 @@ export class MainGridBase extends GridControlBase {
      */
     public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
         return super.formatExcelData(filterVal, jsonData, [
-            {
-                name: 'updateman',
-                srfkey: 'SysOperator',
-                codelistType : 'DYNAMIC',
-                renderMode: 'other',
-                textSeparator: '、',
-                valueSeparator: ',',
-            },
         ]);
     }
 

app_PIM/src/widgets/hrdistribution/main-grid/main-grid-model.ts

@@ -26,6 +26,11 @@ export default class MainModel {
       ]
     }else{
 		  return [
+        {
+          name: 'endtime',
+          prop: 'endtime',
+          dataType: 'DATE',
+        },
         {
           name: 'hrpostid',
           prop: 'hrpostid',
@@ -37,19 +42,14 @@ export default class MainModel {
           dataType: 'PICKUP',
         },
         {
-          name: 'updateman',
-          prop: 'updateman',
-          dataType: 'TEXT',
-        },
-        {
-          name: 'hrdistributionname',
-          prop: 'hrdistributionname',
-          dataType: 'TEXT',
+          name: 'hremployeename',
+          prop: 'hremployeename',
+          dataType: 'PICKUPTEXT',
         },
         {
-          name: 'updatedate',
-          prop: 'updatedate',
-          dataType: 'DATETIME',
+          name: 'begintime',
+          prop: 'begintime',
+          dataType: 'DATE',
         },
         {
           name: 'srfmajortext',

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

@@ -23,41 +23,39 @@
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
-            <template v-if="getColumnState('hrdistributionname')">
-                <el-table-column show-overflow-tooltip :prop="'hrdistributionname'" :label="$t('entities.hrdistribution.main_grid.columns.hrdistributionname')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('hremployeename')">
+                <el-table-column show-overflow-tooltip :prop="'hremployeename'" :label="$t('entities.hrdistribution.main_grid.columns.hremployeename')" :width="100"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.hrdistribution.main_grid.columns.hrdistributionname')}}
+                        {{$t('entities.hrdistribution.main_grid.columns.hremployeename')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.hrdistributionname}}</span>
+                        <span>{{row.hremployeename}}</span>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updateman')">
-                <el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.hrdistribution.main_grid.columns.updateman')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('begintime')">
+                <el-table-column show-overflow-tooltip :prop="'begintime'" :label="$t('entities.hrdistribution.main_grid.columns.begintime')" :width="100"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.hrdistribution.main_grid.columns.updateman')}}
+                        {{$t('entities.hrdistribution.main_grid.columns.begintime')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <template >
-            <codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
-                        </template>
+                        <app-format-data format="YYYY-MM-DD" :data="row.begintime"></app-format-data>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('updatedate')">
-                <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.hrdistribution.main_grid.columns.updatedate')" :width="150"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('endtime')">
+                <el-table-column show-overflow-tooltip :prop="'endtime'" :label="$t('entities.hrdistribution.main_grid.columns.endtime')" :width="100"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.hrdistribution.main_grid.columns.updatedate')}}
+                        {{$t('entities.hrdistribution.main_grid.columns.endtime')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <app-format-data format="YYYY-MM-DD HH:mm:ss" :data="row.updatedate"></app-format-data>
+                        <app-format-data format="YYYY-MM-DD" :data="row.endtime"></app-format-data>
                     </template>
                 </el-table-column>
             </template>

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

@@ -24,7 +24,7 @@
 
 
     <!--输出实体[HRDISTRIBUTION]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrdistribution-29-2">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrdistribution-33-2">
         <createTable tableName="T_HRDISTRIBUTION">
                 <column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -380,7 +380,7 @@
 
 
     <!--输出实体[HRPOSTREL]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrpostrel-27-16">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrpostrel-29-16">
         <createTable tableName="T_HRPOSTREL">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -408,10 +408,10 @@
 
         <!--输出实体[HRATTENDANCE]外键关系 -->
         <!--输出实体[HRDISTRIBUTION]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrdistribution-29-17">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrdistribution-33-17">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRDISTRIBUTION" constraintName="DER1N_HRDISTRIBUTION_HREMPLOYE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrdistribution-29-18">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrdistribution-33-18">
        <addForeignKeyConstraint baseColumnNames="HRPOSTID" baseTableName="T_HRDISTRIBUTION" constraintName="DER1N_HRDISTRIBUTION_HRPOST_HR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/>
     </changeSet>
         <!--输出实体[HRDUTY]外键关系 -->
@@ -455,10 +455,10 @@
        <addForeignKeyConstraint baseColumnNames="HRORGANIZATIONID" baseTableName="T_HRPOST" constraintName="DER1N_HRPOST_HRORGANIZATION_HR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
     </changeSet>
         <!--输出实体[HRPOSTREL]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrpostrel-27-29">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrpostrel-29-29">
        <addForeignKeyConstraint baseColumnNames="HRPOSTID" baseTableName="T_HRPOSTREL" constraintName="DER1N_HRPOSTREL_HRPOST_HRPOSTI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrpostrel-27-30">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrpostrel-29-30">
        <addForeignKeyConstraint baseColumnNames="PHRPOSTID" baseTableName="T_HRPOSTREL" constraintName="DER1N_HRPOSTREL_HRPOST_PHRPOST" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/>
     </changeSet>