Skip to content

I
iBiz人力资源
提交 6d227828 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

jackwang 部署微服务应用

上级 b705f799
隐藏空白字符变更
内嵌 并排
正在显示 包含 232 行增加 和 26 行删除
app_PIM/src/interface/entity/hremployee.ts
浏览文件 @ 6d227828
......@@ -69,4 +69,36 @@ export interface HREmployee {
* @memberof HREmployee
*/
employeecode?: any;
/**
* 证件类型
*
* @returns {*}
* @memberof HREmployee
*/
certtype?: any;
/**
* 证件号码
*
* @returns {*}
* @memberof HREmployee
*/
certnum?: any;
/**
* 出生日期
*
* @returns {*}
* @memberof HREmployee
*/
birthday?: any;
/**
* 年龄
*
* @returns {*}
* @memberof HREmployee
*/
age?: any;
}
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hremployee/hremployee_en_US.ts
浏览文件 @ 6d227828
......@@ -9,6 +9,10 @@ export default {
createdate: "建立时间",
organizationid: "组织",
employeecode: "员工编号",
certtype: "证件类型",
certnum: "证件号码",
birthday: "出生日期",
age: "年龄",
},
views: {
pickupgridview: {
......@@ -49,6 +53,11 @@ export default {
},
main_grid: {
columns: {
employeecode: "员工编号",
employeename: "员工姓名",
certnum: "证件号码",
birthday: "出生日期",
age: "年龄",
},
uiactions: {
},
......
app_PIM/src/locale/lanres/entities/hremployee/hremployee_zh_CN.ts
浏览文件 @ 6d227828
......@@ -8,6 +8,10 @@ export default {
createdate: "建立时间",
organizationid: "组织",
employeecode: "员工编号",
certtype: "证件类型",
certnum: "证件号码",
birthday: "出生日期",
age: "年龄",
},
views: {
pickupgridview: {
......@@ -48,6 +52,11 @@ export default {
},
main_grid: {
columns: {
employeecode: "员工编号",
employeename: "员工姓名",
certnum: "证件号码",
birthday: "出生日期",
age: "年龄",
},
uiactions: {
},
......
app_PIM/src/widgets/hremployee/main-grid/main-grid-base.tsx
浏览文件 @ 6d227828
......@@ -92,6 +92,46 @@ export class MainGridBase extends GridControlBase {
* @memberof MainGridBase
*/
public allColumns: any[] = [
{
name: 'employeecode',
label: '员工编号',
langtag: 'entities.hremployee.main_grid.columns.employeecode',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'employeename',
label: '员工姓名',
langtag: 'entities.hremployee.main_grid.columns.employeename',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'certnum',
label: '证件号码',
langtag: 'entities.hremployee.main_grid.columns.certnum',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'birthday',
label: '出生日期',
langtag: 'entities.hremployee.main_grid.columns.birthday',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'age',
label: '年龄',
langtag: 'entities.hremployee.main_grid.columns.age',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
]
/**
......@@ -126,6 +166,11 @@ export class MainGridBase extends GridControlBase {
* @memberof MainBase
*/
public hasRowEdit: any = {
'employeecode':false,
'employeename':false,
'certnum':false,
'birthday':false,
'age':false,
};
/**
......@@ -140,4 +185,18 @@ export class MainGridBase extends GridControlBase {
}
/**
* 导出数据格式化
*
* @param {*} filterVal
* @param {*} jsonData
* @param {any[]} [codelistColumns=[]]
* @returns {Promise<any>}
* @memberof MainGridBase
*/
public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
return super.formatExcelData(filterVal, jsonData, [
]);
}
}
\ No newline at end of file
app_PIM/src/widgets/hremployee/main-grid/main-grid-model.ts
浏览文件 @ 6d227828
......@@ -31,6 +31,31 @@ export default class MainModel {
prop: 'organizationid',
dataType: 'PICKUP',
},
{
name: 'birthday',
prop: 'birthday',
dataType: 'DATE',
},
{
name: 'employeename',
prop: 'employeename',
dataType: 'TEXT',
},
{
name: 'age',
prop: 'age',
dataType: 'TEXT',
},
{
name: 'certnum',
prop: 'certnum',
dataType: 'TEXT',
},
{
name: 'employeecode',
prop: 'employeecode',
dataType: 'TEXT',
},
{
name: 'srfmajortext',
prop: 'employeename',
......
app_PIM/src/widgets/hremployee/main-grid/main-grid.html
浏览文件 @ 6d227828
......@@ -23,6 +23,66 @@
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('employeecode')">
<el-table-column show-overflow-tooltip :prop="'employeecode'" :label="$t('entities.hremployee.main_grid.columns.employeecode')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hremployee.main_grid.columns.employeecode')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.employeecode}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('employeename')">
<el-table-column show-overflow-tooltip :prop="'employeename'" :label="$t('entities.hremployee.main_grid.columns.employeename')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hremployee.main_grid.columns.employeename')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.employeename}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('certnum')">
<el-table-column show-overflow-tooltip :prop="'certnum'" :label="$t('entities.hremployee.main_grid.columns.certnum')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hremployee.main_grid.columns.certnum')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.certnum}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('birthday')">
<el-table-column show-overflow-tooltip :prop="'birthday'" :label="$t('entities.hremployee.main_grid.columns.birthday')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hremployee.main_grid.columns.birthday')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<app-format-data format="YYYY-MM-DD" :data="row.birthday"></app-format-data>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('age')">
<el-table-column show-overflow-tooltip :prop="'age'" :label="$t('entities.hremployee.main_grid.columns.age')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hremployee.main_grid.columns.age')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.age}}</span>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState">
<el-table-column></el-table-column>
</template>
......
app_PIM/src/widgets/hremployee/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ 6d227828
......@@ -39,6 +39,18 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'employeecode',
},
{
name: 'certtype',
},
{
name: 'certnum',
},
{
name: 'birthday',
},
{
name: 'age',
},
]
}
......
app_PIM/src/widgets/hromhierarchy-cat/ef-001-form/ef-001-form.html
浏览文件 @ 6d227828
......@@ -31,7 +31,7 @@
</app-form-group>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.grouppanel1.visible" :style="{'height': '600px !important',}" :lg="{ span: 24, offset: 0 }">
<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.hromhierarchycat.ef_001_form.details.grouppanel1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="true" >
<app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.grouppanel1" :data="data" :context="context" :viewparams="viewparams"/>
<row>
......
config.xml
浏览文件 @ 6d227828
......@@ -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
浏览文件 @ 6d227828
......@@ -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
浏览文件 @ 6d227828
......@@ -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
浏览文件 @ 6d227828
......@@ -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
浏览文件 @ 6d227828
......@@ -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:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或