Skip to content

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

JunZai 发布系统代码

上级 0edfd1b8
隐藏空白字符变更
内嵌 并排
正在显示 包含 459 行增加 和 42 行删除
app_PIM/public/assets/json/view-config.json
浏览文件 @ 928ef8b6
......@@ -199,6 +199,16 @@
"viewtag": "135e644817a41fccc4733e670e69be87",
"memo": ""
},
"hrcertificatetabexpview": {
"title": "证书",
"caption": "证书",
"viewtype": "DETABEXPVIEW",
"viewmodule": "HumanResource",
"viewname": "HRCertificateTabExpView",
"viewfilename": "hrcertificate-tab-exp-view",
"viewtag": "1556b6299248ca949822a15645afc066",
"memo": ""
},
"hromhierarchycattabexpview": {
"title": "结构层次类别分页编辑",
"caption": "层次结构",
......@@ -529,6 +539,16 @@
"viewtag": "62468a4082892d924fe855427a8cd0cb",
"memo": "系统自动添加"
},
"hrcertificatev_003": {
"title": "证书表格",
"caption": "证书信息",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
"viewname": "HRCertificateV_003",
"viewfilename": "hrcertificate-v-003",
"viewtag": "632257149a8a208534a693b9cb46ab05",
"memo": "系统自动添加"
},
"hrdistributiongridview": {
"title": "工作人员分配表格视图",
"caption": "工作人员分配",
......@@ -599,6 +619,16 @@
"viewtag": "6d4cab857af2830b37515c2015a40e5f",
"memo": ""
},
"hrcertificatev_006": {
"title": "证书表格",
"caption": "证书信息",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
"viewname": "HRCertificateV_006",
"viewfilename": "hrcertificate-v-006",
"viewtag": "6d7c584d45600193af8a7e54080767c8",
"memo": "系统自动添加"
},
"hrfamilygridview": {
"title": "家庭情况表格视图",
"caption": "家庭情况",
......@@ -1388,5 +1418,15 @@
"viewfilename": "hrtransfer-apply-pickup-grid-view",
"viewtag": "fe6049b3cb31f7fee28824ad83f6221f",
"memo": ""
},
"hrcertificatev_004": {
"title": "证书表格",
"caption": "证书信息",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
"viewname": "HRCertificateV_004",
"viewfilename": "hrcertificate-v-004",
"viewtag": "feb5aefc4a68523cdcd6dfcb3d658e3e",
"memo": "系统自动添加"
}
}
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrcertificate/hrcertificate_en_US.ts
浏览文件 @ 928ef8b6
......@@ -30,18 +30,34 @@ export default {
caption: "证书信息",
title: "证书信息表格视图",
},
tabexpview: {
caption: "证书",
title: "证书",
},
v_002: {
caption: "证书信息",
title: "证书信息",
},
v_003: {
caption: "证书信息",
title: "证书表格",
},
gridview: {
caption: "证书信息",
title: "证书表格",
},
v_006: {
caption: "证书信息",
title: "证书表格",
},
editview: {
caption: "证书信息",
title: "证书信息编辑视图",
},
v_004: {
caption: "证书信息",
title: "证书表格",
},
},
main_form: {
details: {
......@@ -194,6 +210,74 @@ export default {
tip: "Help",
},
},
v_004toolbar_toolbar: {
tbitem3: {
caption: "New",
tip: "New",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
v_006toolbar_toolbar: {
tbitem3: {
caption: "New",
tip: "New",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "New",
......@@ -228,4 +312,38 @@ export default {
tip: "Filter",
},
},
v_003toolbar_toolbar: {
tbitem3: {
caption: "New",
tip: "New",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
};
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrcertificate/hrcertificate_zh_CN.ts
浏览文件 @ 928ef8b6
......@@ -29,18 +29,34 @@ export default {
caption: "证书信息",
title: "证书信息表格视图",
},
tabexpview: {
caption: "证书",
title: "证书",
},
v_002: {
caption: "证书信息",
title: "证书信息",
},
v_003: {
caption: "证书信息",
title: "证书表格",
},
gridview: {
caption: "证书信息",
title: "证书表格",
},
v_006: {
caption: "证书信息",
title: "证书表格",
},
editview: {
caption: "证书信息",
title: "证书信息编辑视图",
},
v_004: {
caption: "证书信息",
title: "证书表格",
},
},
main_form: {
details: {
......@@ -193,6 +209,74 @@ export default {
tip: "帮助",
},
},
v_004toolbar_toolbar: {
tbitem3: {
caption: "新建",
tip: "新建",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
},
v_006toolbar_toolbar: {
tbitem3: {
caption: "新建",
tip: "新建",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "新建",
......@@ -227,4 +311,38 @@ export default {
tip: "过滤",
},
},
v_003toolbar_toolbar: {
tbitem3: {
caption: "新建",
tip: "新建",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
},
};
\ No newline at end of file
app_PIM/src/mock/viewconfig/viewconfig.ts
浏览文件 @ 928ef8b6
......@@ -167,6 +167,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "HRCertificateV_001",
"viewtag": "135e644817a41fccc4733e670e69be87"
},
"hrcertificatetabexpview": {
"title": "证书",
"caption": "证书",
"viewtype": "DETABEXPVIEW",
"viewmodule": "HumanResource",
"viewname": "HRCertificateTabExpView",
"viewtag": "1556b6299248ca949822a15645afc066"
},
"hromhierarchycattabexpview": {
"title": "结构层次类别分页编辑",
"caption": "层次结构",
......@@ -431,6 +439,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "HRDutyEditView",
"viewtag": "62468a4082892d924fe855427a8cd0cb"
},
"hrcertificatev_003": {
"title": "证书表格",
"caption": "证书信息",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
"viewname": "HRCertificateV_003",
"viewtag": "632257149a8a208534a693b9cb46ab05"
},
"hrdistributiongridview": {
"title": "工作人员分配表格视图",
"caption": "工作人员分配",
......@@ -487,6 +503,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "HRDutySkillV_002",
"viewtag": "6d4cab857af2830b37515c2015a40e5f"
},
"hrcertificatev_006": {
"title": "证书表格",
"caption": "证书信息",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
"viewname": "HRCertificateV_006",
"viewtag": "6d7c584d45600193af8a7e54080767c8"
},
"hrfamilygridview": {
"title": "家庭情况表格视图",
"caption": "家庭情况",
......@@ -1118,6 +1142,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewmodule": "Pcm",
"viewname": "HRTransferApplyPickupGridView",
"viewtag": "fe6049b3cb31f7fee28824ad83f6221f"
},
"hrcertificatev_004": {
"title": "证书表格",
"caption": "证书信息",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
"viewname": "HRCertificateV_004",
"viewtag": "feb5aefc4a68523cdcd6dfcb3d658e3e"
}
}];
});
\ No newline at end of file
app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-edit-view/hrtransfer-apply-wfdyna-edit-view.html
浏览文件 @ 928ef8b6
!!!!模版产生代码错误:----
FTL stack trace ("~" means nesting-related):
- Failed at: ${P.getLayoutCode("VIEW.vue").code} [in template "TEMPLCODE_en_US" at line 1, column 1]
----
无法获取指定部件[VIEWLAYOUTPANEL#APPDEWFDYNAEDITVIEW_STYLE2]发布代码[VIEW.vue]
\ No newline at end of file
<div class="view-container dewfdynaeditview hrtransfer-apply-wfdyna-edit-view">
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="hrtransferapplywfdynaeditview"></app-studioaction>
<card class='view-card ' :disHover="true" :padding="0" :bordered="false">
<template slot='title'>
<span class='caption-info'>{{viewCaption}}</span>
</template>
<div slot="extra">
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600" v-for="(linkItem, index) in linkModel" :key="index">
<i-button @click="dynamic_toolbar_click(linkItem, $event)">
<span class='caption'>{{linkItem.sequenceFlowName}}</span>
</i-button>
<div slot='content'>{{linkItem.sequenceFlowName}}</div>
</tooltip>
</div>
</div>
<div class="content-container">
<view_form
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:autosave="false"
:viewtag="viewtag"
:showBusyIndicator="true"
updateAction="Update"
removeAction="Remove"
loaddraftAction="GetDraft"
loadAction="Get"
createAction="Create"
WFSubmitAction=""
WFStartAction=""
style=''
name="form"
ref='form'
@save="form_save($event)"
@remove="form_remove($event)"
@load="form_load($event)"
@closeview="closeView($event)">
</view_form>
</div>
</card>
</div>
\ No newline at end of file
app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view-base.tsx
浏览文件 @ 928ef8b6
......@@ -1149,7 +1149,9 @@ export class HRTransferApplyWFDynaExpGridViewBase extends ViewBase {
public setTreeNodeHighLight(data: any): void {
this.$nextTick(() =>{
const tree: any = this.$refs.tree;
tree.setCurrentKey(data.userTaskId);
if(tree) {
tree.setCurrentKey(data.userTaskId);
}
})
}
......
app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view.html
浏览文件 @ 928ef8b6
!!!!模版产生代码错误:----
FTL stack trace ("~" means nesting-related):
- Failed at: ${P.getLayoutCode("VIEW.vue").code} [in template "TEMPLCODE_en_US" at line 1, column 1]
----
无法获取指定部件[VIEWLAYOUTPANEL#APPDEWFDYNAEXPGRIDVIEW_STYLE2]发布代码[VIEW.vue]
\ No newline at end of file
<div class="view-container dewfdynaexpgridview hrtransfer-apply-wfdyna-exp-grid-view">
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="hrtransferapplywfdynaexpgridview"></app-studioaction>
<card class='view-card ' :disHover="true" :padding="0" :bordered="false">
<template slot='title'>
<span class='caption-info'>{{viewCaption}}</span>
</template>
<split id="hrtransferapplywfdynaexpgridview" v-model="split" mode="horizontal">
<div slot='left'>
<el-tree ref="tree" :data="wfStepModel" node-key="userTaskId" :highlight-current="true" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
</div>
<div slot="right">
<div class="content-container">
<view_searchform
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:showBusyIndicator="true"
v-show="isExpandSearchForm"
loaddraftAction="FilterGetDraft"
loadAction="FilterGet"
name="searchform"
ref='searchform'
@save="searchform_save($event)"
@search="searchform_search($event)"
@load="searchform_load($event)"
@closeview="closeView($event)">
</view_searchform>
<view_grid
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:isSingleSelect="isGridSingleSelect"
:showBusyIndicator="true"
updateAction=""
removeAction="Remove"
loaddraftAction=""
loadAction=""
createAction=""
fetchAction="FetchDefault"
:newdata="newdata.bind(_self)"
:opendata="opendata.bind(_self)"
name="grid"
ref='grid'
@selectionchange="grid_selectionchange($event)"
@beforeload="grid_beforeload($event)"
@rowdblclick="grid_rowdblclick($event)"
@remove="grid_remove($event)"
@load="grid_load($event)"
@closeview="closeView($event)">
</view_grid>
</div>
</div>
</split>
</card>
</div>
\ No newline at end of file
app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view.less
浏览文件 @ 928ef8b6
!!!!模版产生代码错误:----
FTL stack trace ("~" means nesting-related):
- Failed at: ${P.getLayoutCode().code} [in template "TEMPLCODE_en_US" at line 1, column 1]
----
无法获取指定部件[VIEWLAYOUTPANEL#APPDEWFDYNAEXPGRIDVIEW_STYLE2]发布代码[VIEW.less]
\ No newline at end of file
.ivu-split-horizontal{
.ivu-split-pane >div{
height: 100%;
overflow-y: auto;
.content-container{
height: 100%;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
margin: 0;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
}
}
}
.dewfdynaexpgridview{
.el-tree {
padding-right: 10px;
}
.el-tree-node__content {
height: 40px;
border-left: solid transparent;
}
.el-tree-node__label {
font-size: 15px;
font-family: "Microsoft YaHei";
}
.el-tree-node {
margin-top: 10px;
}
.el-tree-node:nth-child(1) {
margin-top: 0px;
}
.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
background-color: #f0f7ff;
border-color: #1890ff6e;
}
}
\ No newline at end of file
app_PIM/src/uiservice/hrcertificate/hrcertificate-ui-service-base.ts
浏览文件 @ 928ef8b6
......@@ -90,9 +90,13 @@ export default class HRCertificateUIServiceBase extends UIService {
*/
public initViewMap(){
this.allViewMap.set(':',{viewname:'v_001',srfappde:'hrcertificates'});
this.allViewMap.set(':',{viewname:'tabexpview',srfappde:'hrcertificates'});
this.allViewMap.set(':',{viewname:'v_002',srfappde:'hrcertificates'});
this.allViewMap.set(':',{viewname:'v_003',srfappde:'hrcertificates'});
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'hrcertificates'});
this.allViewMap.set(':',{viewname:'v_006',srfappde:'hrcertificates'});
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'hrcertificates'});
this.allViewMap.set(':',{viewname:'v_004',srfappde:'hrcertificates'});
}
/**
......
config.xml
浏览文件 @ 928ef8b6
......@@ -37,11 +37,6 @@
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
</command>
</hudson.tasks.Shell>
</builders>
......
humanresource-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 928ef8b6
......@@ -68,7 +68,7 @@
<!--输出实体[HRCERTIFICATE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrcertificate-71-3">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrcertificate-78-3">
<createTable tableName="T_HRCERTIFICATE">
<column name="HRCERTIFICATEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_HRCERTIFICATE_HRCERTIFICATE"/>
......@@ -1108,10 +1108,10 @@
</changeSet>
<!--输出实体[HRATTENDANCE]外键关系 -->
<!--输出实体[HRCERTIFICATE]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hrcertificate-71-36">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrcertificate-78-36">
<addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRCERTIFICATE" constraintName="DER1N_HRCERTIFICATE_HREMPLOYEE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-hrcertificate-71-37">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrcertificate-78-37">
<addForeignKeyConstraint baseColumnNames="REGISTERORGANIZATIONID" baseTableName="T_HRCERTIFICATE" constraintName="DER1N_HRCERTIFICATE_HRORGANIZA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
</changeSet>
<!--输出实体[HRCONTRACT]外键关系 -->
......
humanresource-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile
浏览文件 @ 928ef8b6
......@@ -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
浏览文件 @ 928ef8b6
......@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或