Skip to content

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

jackwang 部署微服务应用

上级 f14ce3fc
显示空白字符变更
内嵌 并排
正在显示 包含 161 行增加 和 25 行删除
app_PIM/src/interface/entity/hrdistribution.ts
浏览文件 @ b4b47cf9
......@@ -101,4 +101,20 @@ export interface HRDistribution {
* @memberof HRDistribution
*/
hrpostname?: any;
/**
* 部门
*
* @returns {*}
* @memberof HRDistribution
*/
hrorganizationname?: any;
/**
* 职务
*
* @returns {*}
* @memberof HRDistribution
*/
hrdutyname?: any;
}
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrdistribution/hrdistribution_en_US.ts
浏览文件 @ b4b47cf9
......@@ -13,6 +13,8 @@ export default {
endtime: "离职时间",
hrpostid: "职位标识",
hrpostname: "职位",
hrorganizationname: "部门",
hrdutyname: "职务",
},
views: {
gridview: {
......@@ -45,8 +47,10 @@ export default {
srfdeid: "",
srfsourcekey: "",
hremployeename: "员工姓名",
hrpostname: "职位",
begintime: "入职时间",
endtime: "离职时间",
hrpostid: "职位标识",
hremployeeid: "员工标识",
hrdistributionid: "工作人员分配标识",
},
......@@ -56,6 +60,8 @@ export default {
main_grid: {
columns: {
hremployeename: "员工姓名",
hrorganizationname: "部门",
hrdutyname: "职务",
begintime: "入职时间",
endtime: "离职时间",
},
......
app_PIM/src/locale/lanres/entities/hrdistribution/hrdistribution_zh_CN.ts
浏览文件 @ b4b47cf9
......@@ -12,6 +12,8 @@ export default {
endtime: "离职时间",
hrpostid: "职位标识",
hrpostname: "职位",
hrorganizationname: "部门",
hrdutyname: "职务",
},
views: {
gridview: {
......@@ -44,8 +46,10 @@ export default {
srfdeid: "",
srfsourcekey: "",
hremployeename: "员工姓名",
hrpostname: "职位",
begintime: "入职时间",
endtime: "离职时间",
hrpostid: "职位标识",
hremployeeid: "员工标识",
hrdistributionid: "工作人员分配标识",
},
......@@ -55,6 +59,8 @@ export default {
main_grid: {
columns: {
hremployeename: "员工姓名",
hrorganizationname: "部门",
hrdutyname: "职务",
begintime: "入职时间",
endtime: "离职时间",
},
......
app_PIM/src/store/modules/view-action/state.ts
浏览文件 @ b4b47cf9
......@@ -513,6 +513,7 @@ export const viewstate: any = {
viewaction: '',
viewdatachange: false,
refviews: [
'04c02737ae62a4f4c014607441ee0401',
'ec9d9fe37bbfc3fcb623e2dc34b48dbc',
],
},
......@@ -675,6 +676,7 @@ export const viewstate: any = {
viewaction: '',
viewdatachange: false,
refviews: [
'04c02737ae62a4f4c014607441ee0401',
'ec9d9fe37bbfc3fcb623e2dc34b48dbc',
],
},
......
app_PIM/src/widgets/hrdistribution/main-form/main-form-base.tsx
浏览文件 @ b4b47cf9
......@@ -83,8 +83,10 @@ export class MainEditFormBase extends EditFormControlBase {
srfdeid: null,
srfsourcekey: null,
hremployeename: null,
hrpostname: null,
begintime: null,
endtime: null,
hrpostid: null,
hremployeeid: null,
hrdistributionid: null,
hrdistribution:null,
......@@ -145,10 +147,14 @@ export class MainEditFormBase extends EditFormControlBase {
hremployeename: new FormItemModel({ caption: '员工姓名', detailType: 'FORMITEM', name: 'hremployeename', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
hrpostname: new FormItemModel({ caption: '职位', detailType: 'FORMITEM', name: 'hrpostname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
begintime: new FormItemModel({ caption: '入职时间', detailType: 'FORMITEM', name: 'begintime', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
endtime: new FormItemModel({ caption: '离职时间', detailType: 'FORMITEM', name: 'endtime', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
hrpostid: new FormItemModel({ caption: '职位标识', detailType: 'FORMITEM', name: 'hrpostid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
hremployeeid: new FormItemModel({ caption: '员工标识', detailType: 'FORMITEM', name: 'hremployeeid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
hrdistributionid: new FormItemModel({ caption: '工作人员分配标识', detailType: 'FORMITEM', name: 'hrdistributionid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
......
app_PIM/src/widgets/hrdistribution/main-form/main-form-model.ts
浏览文件 @ b4b47cf9
......@@ -60,6 +60,11 @@ export default class MainModel {
prop: 'hremployeename',
dataType: 'PICKUPTEXT',
},
{
name: 'hrpostname',
prop: 'hrpostname',
dataType: 'PICKUPTEXT',
},
{
name: 'begintime',
prop: 'begintime',
......@@ -70,6 +75,11 @@ export default class MainModel {
prop: 'endtime',
dataType: 'DATE',
},
{
name: 'hrpostid',
prop: 'hrpostid',
dataType: 'PICKUP',
},
{
name: 'hremployeeid',
prop: 'hremployeeid',
......
app_PIM/src/widgets/hrdistribution/main-form/main-form-service.ts
浏览文件 @ b4b47cf9
......@@ -3,6 +3,7 @@ import ControlService from '@/widgets/control-service';
import HRDistributionService from '@/service/hrdistribution/hrdistribution-service';
import MainModel from './main-form-model';
import HREmployeeService from '@/service/hremployee/hremployee-service';
import HRPostService from '@/service/hrpost/hrpost-service';
/**
......@@ -50,6 +51,14 @@ export default class MainService extends ControlService {
*/
public hremployeeService: HREmployeeService = new HREmployeeService();
/**
* 职位服务对象
*
* @type {HRPostService}
* @memberof MainService
*/
public hrpostService: HRPostService = new HRPostService();
/**
* 处理数据
*
......@@ -94,6 +103,9 @@ export default class MainService extends ControlService {
if (Object.is(serviceName, 'HREmployeeService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.hremployeeService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'employeeid', 'hremployee');
}
if (Object.is(serviceName, 'HRPostService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.hrpostService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'hrpostid', 'hrpost');
}
return Promise.reject([])
}
......
app_PIM/src/widgets/hrdistribution/main-form/main-form.html
浏览文件 @ b4b47cf9
......@@ -31,6 +31,32 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.hrpostname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='hrpostname' :itemRules="this.rules.hrpostname" class='' :caption="$t('entities.hrdistribution.main_form.details.hrpostname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.hrpostname.error" :isEmptyCaption="false" labelPos="LEFT">
<app-picker
:formState="formState"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.hrpostname.disabled"
name='hrpostname'
deMajorField='hrpostname'
deKeyField='hrpost'
:service="service"
:acParams="{ serviceName: 'HRPostService', interfaceName: 'FetchDefault'}"
valueitem='hrpostid'
:value="data.hrpostname"
:pickupView="{ viewname: 'hrpost-pickup-view', title: $t('entities.hrpost.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'hrposts', parameterName: 'hrpost' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
style=""
@formitemvaluechange="onFormItemValueChange($event)">
</app-picker>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.begintime.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='begintime' :itemRules="this.rules.begintime" class='' :caption="$t('entities.hrdistribution.main_form.details.begintime')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.begintime.error" :isEmptyCaption="false" labelPos="LEFT">
......
app_PIM/src/widgets/hrdistribution/main-grid/main-grid-base.tsx
浏览文件 @ b4b47cf9
......@@ -108,6 +108,22 @@ export class MainGridBase extends GridControlBase {
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'hrorganizationname',
label: '部门',
langtag: 'entities.hrdistribution.main_grid.columns.hrorganizationname',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'hrdutyname',
label: '职务',
langtag: 'entities.hrdistribution.main_grid.columns.hrdutyname',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'begintime',
label: '入职时间',
......@@ -159,6 +175,8 @@ export class MainGridBase extends GridControlBase {
*/
public hasRowEdit: any = {
'hremployeename':false,
'hrorganizationname':false,
'hrdutyname':false,
'begintime':false,
'endtime':false,
};
......
app_PIM/src/widgets/hrdistribution/main-grid/main-grid-model.ts
浏览文件 @ b4b47cf9
......@@ -41,11 +41,21 @@ export default class MainModel {
prop: 'hremployeeid',
dataType: 'PICKUP',
},
{
name: 'hrorganizationname',
prop: 'hrorganizationname',
dataType: 'PICKUPDATA',
},
{
name: 'hremployeename',
prop: 'hremployeename',
dataType: 'PICKUPTEXT',
},
{
name: 'hrdutyname',
prop: 'hrdutyname',
dataType: 'PICKUPDATA',
},
{
name: 'begintime',
prop: 'begintime',
......
app_PIM/src/widgets/hrdistribution/main-grid/main-grid.html
浏览文件 @ b4b47cf9
......@@ -35,6 +35,30 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('hrorganizationname')">
<el-table-column show-overflow-tooltip :prop="'hrorganizationname'" :label="$t('entities.hrdistribution.main_grid.columns.hrorganizationname')" :width="300" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrdistribution.main_grid.columns.hrorganizationname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.hrorganizationname}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('hrdutyname')">
<el-table-column show-overflow-tooltip :prop="'hrdutyname'" :label="$t('entities.hrdistribution.main_grid.columns.hrdutyname')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.hrdistribution.main_grid.columns.hrdutyname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.hrdutyname}}</span>
</template>
</el-table-column>
</template>
<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}">
......
config.xml
浏览文件 @ b4b47cf9
......@@ -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
浏览文件 @ b4b47cf9
......@@ -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
浏览文件 @ b4b47cf9
......@@ -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
浏览文件 @ b4b47cf9
......@@ -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
浏览文件 @ b4b47cf9
......@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或