jackwang 部署微服务应用

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

@@ -770,7 +770,7 @@
         "memo": "系统自动添加"
     },
     "hremployeetabexpview": {
-        "title": "员工分页表格",
+        "title": "员工",
         "caption": "员工",
         "viewtype": "DETABEXPVIEW",
         "viewmodule": "HumanResource",

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

@@ -116,7 +116,6 @@ export default {
 			hremployeename: "员工姓名",
 			organizationname: "单位",
 			empstate: "员工状态",
-			startorgtime: "到本单位时间",
 			contractcode: "合同编号",
 			contractmode: "合同类别",
 			contracttype: "合同类型",
@@ -135,14 +134,11 @@ export default {
 			hremployeename: "员工姓名",
 			organizationname: "单位",
 			empstate: "员工状态",
-			startorgtime: "到本单位时间",
 			contractcode: "合同编号",
 			contractmode: "合同类别",
 			contracttype: "合同类型",
 			begintime: "开始日期",
 			endtime: "结束日期",
-			mgrorganizationname: "合同管理单位",
-			signorganizationname: "合同签约单位",
 			contractstate: "合同状态",
 			uagridcolumn1: "操作",
 		},
@@ -157,14 +153,11 @@ export default {
 			hremployeename: "员工姓名",
 			organizationname: "单位",
 			empstate: "员工状态",
-			startorgtime: "到本单位时间",
 			contractcode: "合同编号",
 			contractmode: "合同类别",
 			contracttype: "合同类型",
 			begintime: "开始日期",
 			endtime: "结束日期",
-			mgrorganizationname: "合同管理单位",
-			signorganizationname: "合同签约单位",
 			contractstate: "合同状态",
 			uagridcolumn1: "操作",
 		},
@@ -178,14 +171,11 @@ export default {
 			hremployeename: "员工姓名",
 			organizationname: "单位",
 			empstate: "员工状态",
-			startorgtime: "到本单位时间",
 			contractcode: "合同编号",
 			contractmode: "合同类别",
 			contracttype: "合同类型",
 			begintime: "开始日期",
 			endtime: "结束日期",
-			mgrorganizationname: "合同管理单位",
-			signorganizationname: "合同签约单位",
 			contractstate: "合同状态",
 			uagridcolumn1: "操作",
 		},

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

@@ -115,7 +115,6 @@ export default {
 			hremployeename: "员工姓名",
 			organizationname: "单位",
 			empstate: "员工状态",
-			startorgtime: "到本单位时间",
 			contractcode: "合同编号",
 			contractmode: "合同类别",
 			contracttype: "合同类型",
@@ -134,14 +133,11 @@ export default {
 			hremployeename: "员工姓名",
 			organizationname: "单位",
 			empstate: "员工状态",
-			startorgtime: "到本单位时间",
 			contractcode: "合同编号",
 			contractmode: "合同类别",
 			contracttype: "合同类型",
 			begintime: "开始日期",
 			endtime: "结束日期",
-			mgrorganizationname: "合同管理单位",
-			signorganizationname: "合同签约单位",
 			contractstate: "合同状态",
 			uagridcolumn1: "操作",
 		},
@@ -156,14 +152,11 @@ export default {
 			hremployeename: "员工姓名",
 			organizationname: "单位",
 			empstate: "员工状态",
-			startorgtime: "到本单位时间",
 			contractcode: "合同编号",
 			contractmode: "合同类别",
 			contracttype: "合同类型",
 			begintime: "开始日期",
 			endtime: "结束日期",
-			mgrorganizationname: "合同管理单位",
-			signorganizationname: "合同签约单位",
 			contractstate: "合同状态",
 			uagridcolumn1: "操作",
 		},
@@ -177,14 +170,11 @@ export default {
 			hremployeename: "员工姓名",
 			organizationname: "单位",
 			empstate: "员工状态",
-			startorgtime: "到本单位时间",
 			contractcode: "合同编号",
 			contractmode: "合同类别",
 			contracttype: "合同类型",
 			begintime: "开始日期",
 			endtime: "结束日期",
-			mgrorganizationname: "合同管理单位",
-			signorganizationname: "合同签约单位",
 			contractstate: "合同状态",
 			uagridcolumn1: "操作",
 		},

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

@@ -80,7 +80,7 @@ export default {
 		},
 		tabexpview: {
 			caption: "员工",
-      		title: "员工分页表格",
+      		title: "员工",
 		},
 		v_003: {
 			caption: "员工",

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

@@ -79,7 +79,7 @@ export default {
 		},
 		tabexpview: {
 			caption: "员工",
-      		title: "员工分页表格",
+      		title: "员工",
 		},
 		v_003: {
 			caption: "员工",

app_PIM/src/mock/viewconfig/viewconfig.ts

@@ -624,7 +624,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "9974f3026a0417dd6dd09a03b3303503"
         },
         "hremployeetabexpview": {
-            "title": "员工分页表格",
+            "title": "员工",
             "caption": "员工",
             "viewtype": "DETABEXPVIEW",
             "viewmodule": "HumanResource",

app_PIM/src/pages/human-resource/hremployee-tab-exp-view/hremployee-tab-exp-view-base.tsx

@@ -6,7 +6,7 @@ import TabExpViewEngine from '@engine/view/tab-exp-view-engine';
 import HREmployeeUIService from '@/uiservice/hremployee/hremployee-ui-service';
 
 /**
- * 员工分页表格视图基类
+ * 员工视图基类
  *
  * @export
  * @class HREmployeeTabExpViewBase

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

-<studio-view-style2 viewName="hremployeetabexpview" viewTitle="员工分页表格" class='detabexpview hremployee-tab-exp-view'>
+<studio-view-style2 viewName="hremployeetabexpview" viewTitle="员工" class='detabexpview hremployee-tab-exp-view'>
     <view_tabexppanel 
         :viewState="viewState"  
         :viewparams="viewparams" 

app_PIM/src/pages/human-resource/hremployee-tab-exp-view/hremployee-tab-exp-view.vue

@@ -6,7 +6,7 @@ import { HREmployeeTabExpViewBase } from './hremployee-tab-exp-view-base';
 import view_tabexppanel from '@widgets/hremployee/tab-exp-viewtabexppanel-tabexppanel/tab-exp-viewtabexppanel-tabexppanel.vue';
 
 /**
- * 员工分页表格视图
+ * 员工视图
  *
  * @export
  * @class HREmployeeTabExpView

app_PIM/src/widgets/hrcontract/active-grid/active-grid-base.tsx

@@ -153,14 +153,6 @@ export class ActiveGridBase extends GridControlBase {
             util: 'PX',
             isEnableRowEdit: false,
         },
-        {
-            name: 'startorgtime',
-            label: '到本单位时间',
-            langtag: 'entities.hrcontract.active_grid.columns.startorgtime',
-            show: true,
-            util: 'PX',
-            isEnableRowEdit: false,
-        },
         {
             name: 'contractcode',
             label: '合同编号',
@@ -201,22 +193,6 @@ export class ActiveGridBase extends GridControlBase {
             util: 'PX',
             isEnableRowEdit: false,
         },
-        {
-            name: 'mgrorganizationname',
-            label: '合同管理单位',
-            langtag: 'entities.hrcontract.active_grid.columns.mgrorganizationname',
-            show: true,
-            util: 'PX',
-            isEnableRowEdit: false,
-        },
-        {
-            name: 'signorganizationname',
-            label: '合同签约单位',
-            langtag: 'entities.hrcontract.active_grid.columns.signorganizationname',
-            show: true,
-            util: 'PX',
-            isEnableRowEdit: false,
-        },
         {
             name: 'contractstate',
             label: '合同状态',
@@ -271,14 +247,11 @@ export class ActiveGridBase extends GridControlBase {
         'hremployeename':false,
         'organizationname':false,
         'empstate':false,
-        'startorgtime':false,
         'contractcode':false,
         'contractmode':false,
         'contracttype':false,
         'begintime':false,
         'endtime':false,
-        'mgrorganizationname':false,
-        'signorganizationname':false,
         'contractstate':false,
         'uagridcolumn1':false,
     };
@@ -306,6 +279,14 @@ export class ActiveGridBase extends GridControlBase {
      */
     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: ',',
+            },
             {
                 name: 'contractmode',
                 srfkey: 'CL_HR_0021',

app_PIM/src/widgets/hrcontract/active-grid/active-grid-model.ts

@@ -36,21 +36,11 @@ export default class ActiveModel {
           prop: 'endtime',
           dataType: 'DATE',
         },
-        {
-          name: 'mgrorganizationname',
-          prop: 'mgrorganizationname',
-          dataType: 'PICKUPTEXT',
-        },
         {
           name: 'empstate',
           prop: 'empstate',
           dataType: 'PICKUPDATA',
         },
-        {
-          name: 'startorgtime',
-          prop: 'startorgtime',
-          dataType: 'PICKUPDATA',
-        },
         {
           name: 'contractcode',
           prop: 'contractcode',
@@ -77,15 +67,15 @@ export default class ActiveModel {
           dataType: 'TEXT',
         },
         {
-          name: 'srfdataaccaction',
+          name: 'srfkey',
           prop: 'hrcontractid',
           dataType: 'GUID',
+          isEditable:true
         },
         {
-          name: 'srfkey',
+          name: 'srfdataaccaction',
           prop: 'hrcontractid',
           dataType: 'GUID',
-          isEditable:true
         },
         {
           name: 'signorganizationid',
@@ -112,11 +102,6 @@ export default class ActiveModel {
           prop: 'contractstate',
           dataType: 'SSCODELIST',
         },
-        {
-          name: 'signorganizationname',
-          prop: 'signorganizationname',
-          dataType: 'PICKUPTEXT',
-        },
         {
           name: 'contractmode',
           prop: 'contractmode',

app_PIM/src/widgets/hrcontract/active-grid/active-grid.html

@@ -48,7 +48,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('organizationname')">
-                <el-table-column show-overflow-tooltip :prop="'organizationname'" :label="$t('entities.hrcontract.active_grid.columns.organizationname')" :width="150"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'organizationname'" :label="$t('entities.hrcontract.active_grid.columns.organizationname')" :width="200"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.hrcontract.active_grid.columns.organizationname')}}
@@ -67,19 +67,9 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.empstate}}</span>
-                    </template>
-                </el-table-column>
-            </template>
-            <template v-if="getColumnState('startorgtime')">
-                <el-table-column show-overflow-tooltip :prop="'startorgtime'" :label="$t('entities.hrcontract.active_grid.columns.startorgtime')" :width="120"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.hrcontract.active_grid.columns.startorgtime')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.startorgtime}}</span>
+                        <template >
+            <codelist :value="row.empstate" tag='CL_HR_0016' codelistType='DYNAMIC' ></codelist>
+                        </template>
                     </template>
                 </el-table-column>
             </template>
@@ -147,30 +137,6 @@
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('mgrorganizationname')">
-                <el-table-column show-overflow-tooltip :prop="'mgrorganizationname'" :label="$t('entities.hrcontract.active_grid.columns.mgrorganizationname')" :width="200"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.hrcontract.active_grid.columns.mgrorganizationname')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.mgrorganizationname}}</span>
-                    </template>
-                </el-table-column>
-            </template>
-            <template v-if="getColumnState('signorganizationname')">
-                <el-table-column show-overflow-tooltip :prop="'signorganizationname'" :label="$t('entities.hrcontract.active_grid.columns.signorganizationname')" :width="200"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.hrcontract.active_grid.columns.signorganizationname')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.signorganizationname}}</span>
-                    </template>
-                </el-table-column>
-            </template>
             <template v-if="getColumnState('contractstate')">
                 <el-table-column show-overflow-tooltip :prop="'contractstate'" :label="$t('entities.hrcontract.active_grid.columns.contractstate')" :width="120"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">

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

@@ -124,14 +124,6 @@ export class MainGridBase extends GridControlBase {
             util: 'PX',
             isEnableRowEdit: false,
         },
-        {
-            name: 'startorgtime',
-            label: '到本单位时间',
-            langtag: 'entities.hrcontract.main_grid.columns.startorgtime',
-            show: true,
-            util: 'PX',
-            isEnableRowEdit: false,
-        },
         {
             name: 'contractcode',
             label: '合同编号',
@@ -234,7 +226,6 @@ export class MainGridBase extends GridControlBase {
         'hremployeename':false,
         'organizationname':false,
         'empstate':false,
-        'startorgtime':false,
         'contractcode':false,
         'contractmode':false,
         'contracttype':false,
@@ -268,6 +259,14 @@ export class MainGridBase extends GridControlBase {
      */
     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: ',',
+            },
             {
                 name: 'contractmode',
                 srfkey: 'CL_HR_0021',

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

@@ -46,11 +46,6 @@ export default class MainModel {
           prop: 'empstate',
           dataType: 'PICKUPDATA',
         },
-        {
-          name: 'startorgtime',
-          prop: 'startorgtime',
-          dataType: 'PICKUPDATA',
-        },
         {
           name: 'contractcode',
           prop: 'contractcode',

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

@@ -67,19 +67,9 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.empstate}}</span>
-                    </template>
-                </el-table-column>
-            </template>
-            <template v-if="getColumnState('startorgtime')">
-                <el-table-column show-overflow-tooltip :prop="'startorgtime'" :label="$t('entities.hrcontract.main_grid.columns.startorgtime')" :width="120"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.hrcontract.main_grid.columns.startorgtime')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.startorgtime}}</span>
+                        <template >
+            <codelist :value="row.empstate" tag='CL_HR_0016' codelistType='DYNAMIC' ></codelist>
+                        </template>
                     </template>
                 </el-table-column>
             </template>

app_PIM/src/widgets/hrcontract/wait-sign-grid/wait-sign-grid-base.tsx

@@ -182,14 +182,6 @@ export class WaitSignGridBase extends GridControlBase {
             util: 'PX',
             isEnableRowEdit: false,
         },
-        {
-            name: 'startorgtime',
-            label: '到本单位时间',
-            langtag: 'entities.hrcontract.waitsign_grid.columns.startorgtime',
-            show: true,
-            util: 'PX',
-            isEnableRowEdit: false,
-        },
         {
             name: 'contractcode',
             label: '合同编号',
@@ -230,22 +222,6 @@ export class WaitSignGridBase extends GridControlBase {
             util: 'PX',
             isEnableRowEdit: false,
         },
-        {
-            name: 'mgrorganizationname',
-            label: '合同管理单位',
-            langtag: 'entities.hrcontract.waitsign_grid.columns.mgrorganizationname',
-            show: true,
-            util: 'PX',
-            isEnableRowEdit: false,
-        },
-        {
-            name: 'signorganizationname',
-            label: '合同签约单位',
-            langtag: 'entities.hrcontract.waitsign_grid.columns.signorganizationname',
-            show: true,
-            util: 'PX',
-            isEnableRowEdit: false,
-        },
         {
             name: 'contractstate',
             label: '合同状态',
@@ -300,14 +276,11 @@ export class WaitSignGridBase extends GridControlBase {
         'hremployeename':false,
         'organizationname':false,
         'empstate':false,
-        'startorgtime':false,
         'contractcode':false,
         'contractmode':false,
         'contracttype':false,
         'begintime':false,
         'endtime':false,
-        'mgrorganizationname':false,
-        'signorganizationname':false,
         'contractstate':false,
         'uagridcolumn1':false,
     };
@@ -335,6 +308,14 @@ export class WaitSignGridBase extends GridControlBase {
      */
     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: ',',
+            },
             {
                 name: 'contractmode',
                 srfkey: 'CL_HR_0021',

app_PIM/src/widgets/hrcontract/wait-sign-grid/wait-sign-grid-model.ts

@@ -36,21 +36,11 @@ export default class WaitSignModel {
           prop: 'endtime',
           dataType: 'DATE',
         },
-        {
-          name: 'mgrorganizationname',
-          prop: 'mgrorganizationname',
-          dataType: 'PICKUPTEXT',
-        },
         {
           name: 'empstate',
           prop: 'empstate',
           dataType: 'PICKUPDATA',
         },
-        {
-          name: 'startorgtime',
-          prop: 'startorgtime',
-          dataType: 'PICKUPDATA',
-        },
         {
           name: 'contractcode',
           prop: 'contractcode',
@@ -77,15 +67,15 @@ export default class WaitSignModel {
           dataType: 'TEXT',
         },
         {
-          name: 'srfdataaccaction',
+          name: 'srfkey',
           prop: 'hrcontractid',
           dataType: 'GUID',
+          isEditable:true
         },
         {
-          name: 'srfkey',
+          name: 'srfdataaccaction',
           prop: 'hrcontractid',
           dataType: 'GUID',
-          isEditable:true
         },
         {
           name: 'signorganizationid',
@@ -112,11 +102,6 @@ export default class WaitSignModel {
           prop: 'contractstate',
           dataType: 'SSCODELIST',
         },
-        {
-          name: 'signorganizationname',
-          prop: 'signorganizationname',
-          dataType: 'PICKUPTEXT',
-        },
         {
           name: 'contractmode',
           prop: 'contractmode',

app_PIM/src/widgets/hrcontract/wait-sign-grid/wait-sign-grid.html

@@ -48,7 +48,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('organizationname')">
-                <el-table-column show-overflow-tooltip :prop="'organizationname'" :label="$t('entities.hrcontract.waitsign_grid.columns.organizationname')" :width="150"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'organizationname'" :label="$t('entities.hrcontract.waitsign_grid.columns.organizationname')" :width="200"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.hrcontract.waitsign_grid.columns.organizationname')}}
@@ -67,19 +67,9 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.empstate}}</span>
-                    </template>
-                </el-table-column>
-            </template>
-            <template v-if="getColumnState('startorgtime')">
-                <el-table-column show-overflow-tooltip :prop="'startorgtime'" :label="$t('entities.hrcontract.waitsign_grid.columns.startorgtime')" :width="120"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.hrcontract.waitsign_grid.columns.startorgtime')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.startorgtime}}</span>
+                        <template >
+            <codelist :value="row.empstate" tag='CL_HR_0016' codelistType='DYNAMIC' ></codelist>
+                        </template>
                     </template>
                 </el-table-column>
             </template>
@@ -147,30 +137,6 @@
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('mgrorganizationname')">
-                <el-table-column show-overflow-tooltip :prop="'mgrorganizationname'" :label="$t('entities.hrcontract.waitsign_grid.columns.mgrorganizationname')" :width="200"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.hrcontract.waitsign_grid.columns.mgrorganizationname')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.mgrorganizationname}}</span>
-                    </template>
-                </el-table-column>
-            </template>
-            <template v-if="getColumnState('signorganizationname')">
-                <el-table-column show-overflow-tooltip :prop="'signorganizationname'" :label="$t('entities.hrcontract.waitsign_grid.columns.signorganizationname')" :width="200"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.hrcontract.waitsign_grid.columns.signorganizationname')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.signorganizationname}}</span>
-                    </template>
-                </el-table-column>
-            </template>
             <template v-if="getColumnState('contractstate')">
                 <el-table-column show-overflow-tooltip :prop="'contractstate'" :label="$t('entities.hrcontract.waitsign_grid.columns.contractstate')" :width="120"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">

app_PIM/src/widgets/hrcontract/wait-stop-grid/wait-stop-grid-base.tsx

@@ -153,14 +153,6 @@ export class WaitStopGridBase extends GridControlBase {
             util: 'PX',
             isEnableRowEdit: false,
         },
-        {
-            name: 'startorgtime',
-            label: '到本单位时间',
-            langtag: 'entities.hrcontract.waitstop_grid.columns.startorgtime',
-            show: true,
-            util: 'PX',
-            isEnableRowEdit: false,
-        },
         {
             name: 'contractcode',
             label: '合同编号',
@@ -201,22 +193,6 @@ export class WaitStopGridBase extends GridControlBase {
             util: 'PX',
             isEnableRowEdit: false,
         },
-        {
-            name: 'mgrorganizationname',
-            label: '合同管理单位',
-            langtag: 'entities.hrcontract.waitstop_grid.columns.mgrorganizationname',
-            show: true,
-            util: 'PX',
-            isEnableRowEdit: false,
-        },
-        {
-            name: 'signorganizationname',
-            label: '合同签约单位',
-            langtag: 'entities.hrcontract.waitstop_grid.columns.signorganizationname',
-            show: true,
-            util: 'PX',
-            isEnableRowEdit: false,
-        },
         {
             name: 'contractstate',
             label: '合同状态',
@@ -271,14 +247,11 @@ export class WaitStopGridBase extends GridControlBase {
         'hremployeename':false,
         'organizationname':false,
         'empstate':false,
-        'startorgtime':false,
         'contractcode':false,
         'contractmode':false,
         'contracttype':false,
         'begintime':false,
         'endtime':false,
-        'mgrorganizationname':false,
-        'signorganizationname':false,
         'contractstate':false,
         'uagridcolumn1':false,
     };
@@ -306,6 +279,14 @@ export class WaitStopGridBase extends GridControlBase {
      */
     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: ',',
+            },
             {
                 name: 'contractmode',
                 srfkey: 'CL_HR_0021',

app_PIM/src/widgets/hrcontract/wait-stop-grid/wait-stop-grid-model.ts

@@ -36,21 +36,11 @@ export default class WaitStopModel {
           prop: 'endtime',
           dataType: 'DATE',
         },
-        {
-          name: 'mgrorganizationname',
-          prop: 'mgrorganizationname',
-          dataType: 'PICKUPTEXT',
-        },
         {
           name: 'empstate',
           prop: 'empstate',
           dataType: 'PICKUPDATA',
         },
-        {
-          name: 'startorgtime',
-          prop: 'startorgtime',
-          dataType: 'PICKUPDATA',
-        },
         {
           name: 'contractcode',
           prop: 'contractcode',
@@ -77,15 +67,15 @@ export default class WaitStopModel {
           dataType: 'TEXT',
         },
         {
-          name: 'srfdataaccaction',
+          name: 'srfkey',
           prop: 'hrcontractid',
           dataType: 'GUID',
+          isEditable:true
         },
         {
-          name: 'srfkey',
+          name: 'srfdataaccaction',
           prop: 'hrcontractid',
           dataType: 'GUID',
-          isEditable:true
         },
         {
           name: 'signorganizationid',
@@ -112,11 +102,6 @@ export default class WaitStopModel {
           prop: 'contractstate',
           dataType: 'SSCODELIST',
         },
-        {
-          name: 'signorganizationname',
-          prop: 'signorganizationname',
-          dataType: 'PICKUPTEXT',
-        },
         {
           name: 'contractmode',
           prop: 'contractmode',

app_PIM/src/widgets/hrcontract/wait-stop-grid/wait-stop-grid.html

@@ -48,7 +48,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('organizationname')">
-                <el-table-column show-overflow-tooltip :prop="'organizationname'" :label="$t('entities.hrcontract.waitstop_grid.columns.organizationname')" :width="150"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'organizationname'" :label="$t('entities.hrcontract.waitstop_grid.columns.organizationname')" :width="200"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.hrcontract.waitstop_grid.columns.organizationname')}}
@@ -67,19 +67,9 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.empstate}}</span>
-                    </template>
-                </el-table-column>
-            </template>
-            <template v-if="getColumnState('startorgtime')">
-                <el-table-column show-overflow-tooltip :prop="'startorgtime'" :label="$t('entities.hrcontract.waitstop_grid.columns.startorgtime')" :width="120"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.hrcontract.waitstop_grid.columns.startorgtime')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.startorgtime}}</span>
+                        <template >
+            <codelist :value="row.empstate" tag='CL_HR_0016' codelistType='DYNAMIC' ></codelist>
+                        </template>
                     </template>
                 </el-table-column>
             </template>
@@ -147,30 +137,6 @@
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('mgrorganizationname')">
-                <el-table-column show-overflow-tooltip :prop="'mgrorganizationname'" :label="$t('entities.hrcontract.waitstop_grid.columns.mgrorganizationname')" :width="200"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.hrcontract.waitstop_grid.columns.mgrorganizationname')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.mgrorganizationname}}</span>
-                    </template>
-                </el-table-column>
-            </template>
-            <template v-if="getColumnState('signorganizationname')">
-                <el-table-column show-overflow-tooltip :prop="'signorganizationname'" :label="$t('entities.hrcontract.waitstop_grid.columns.signorganizationname')" :width="200"  :align="'left'" :sortable="'custom'">
-                    <template v-slot:header="{column}">
-                      <span class="column-header ">
-                        {{$t('entities.hrcontract.waitstop_grid.columns.signorganizationname')}}
-                      </span>
-                    </template>
-                    <template v-slot="{row,column,$index}">
-                        <span>{{row.signorganizationname}}</span>
-                    </template>
-                </el-table-column>
-            </template>
             <template v-if="getColumnState('contractstate')">
                 <el-table-column show-overflow-tooltip :prop="'contractstate'" :label="$t('entities.hrcontract.waitstop_grid.columns.contractstate')" :width="120"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibizhumanresources/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizhumanresources/
-      mvn clean package -Phrapi
-      cd humanresource-provider/humanresource-provider-hrapi
-      mvn -Phrapi docker:build
-      mvn -Phrapi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-provider-hrapi.yaml iBizEE --with-registry-auth      
+      mvn clean package -Ppim
+      cd humanresource-app/humanresource-app-pim
+      mvn -Ppim docker:build
+      mvn -Ppim docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-app-pim.yaml iBizEE --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

humanresource-app/humanresource-app-pim/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar
 
-EXPOSE 8080
+EXPOSE 10327
 
 ADD humanresource-app-pim.jar /humanresource-app-pim.jar

humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml

@@ -3,9 +3,25 @@ services:
   humanresource-app-pim:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
     ports:
-      - "8080:8080"
+      - "10327:10327"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=10327
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
+      - SPRING_REDIS_HOST=172.16.240.110
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
+      - SPRING_DATASOURCE_PASSWORD=b1@@@772
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
+      - CAS=https://passport.ibizlab.cn
+      - NACOS=172.16.240.110:8848
+      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
+      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

humanresource-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-provider-hrapi.jar
 
-EXPOSE 10317
+EXPOSE 8081
 
 ADD humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar

humanresource-provider/humanresource-provider-hrapi/src/main/docker/humanresource-provider-hrapi.yaml

@@ -3,25 +3,9 @@ services:
   humanresource-provider-hrapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
     ports:
-      - "10317:10317"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10317
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-      - SPRING_DATASOURCE_PASSWORD=b1@@@772
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
     deploy:
       resources:
            limits: