Skip to content

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

jackwang 部署微服务应用

上级 6f38b5f1
隐藏空白字符变更
内嵌 并排
正在显示 包含 96 行增加 和 96 行删除
app_PIM/src/locale/lanres/entities/hremployee/hremployee_en_US.ts
浏览文件 @ e681e981
......@@ -159,8 +159,8 @@ export default {
grouppanel1: "分组面板",
grouppanel2: "first",
group1: "基本信息",
grouppanel3: "补充信息",
grouppanel4: "联系信息",
grouppanel3: "补充信息",
grouppanel5: "工作相关",
formpage1: "基本信息",
srfupdatedate: "更新时间",
......@@ -182,6 +182,10 @@ export default {
nation: "民族",
organizationname: "单位",
photo: "照片",
mobile: "移动电话",
telephone: "固定电话",
email: "电子邮箱",
postaladdress: "通讯地址",
nativetype: "户口类型",
nativeplace: "籍贯",
marriage: "婚姻状况",
......@@ -192,10 +196,6 @@ export default {
health: "健康状况",
political: "政治面貌",
politicaltime: "入党时间",
mobile: "移动电话",
telephone: "固定电话",
email: "电子邮箱",
postaladdress: "通讯地址",
entrytype: "入职渠道",
startworktime: "参加工作时间",
startorgtime: "到本单位时间",
......
app_PIM/src/locale/lanres/entities/hremployee/hremployee_zh_CN.ts
浏览文件 @ e681e981
......@@ -158,8 +158,8 @@ export default {
grouppanel1: "分组面板",
grouppanel2: "first",
group1: "基本信息",
grouppanel3: "补充信息",
grouppanel4: "联系信息",
grouppanel3: "补充信息",
grouppanel5: "工作相关",
formpage1: "基本信息",
srfupdatedate: "更新时间",
......@@ -181,6 +181,10 @@ export default {
nation: "民族",
organizationname: "单位",
photo: "照片",
mobile: "移动电话",
telephone: "固定电话",
email: "电子邮箱",
postaladdress: "通讯地址",
nativetype: "户口类型",
nativeplace: "籍贯",
marriage: "婚姻状况",
......@@ -191,10 +195,6 @@ export default {
health: "健康状况",
political: "政治面貌",
politicaltime: "入党时间",
mobile: "移动电话",
telephone: "固定电话",
email: "电子邮箱",
postaladdress: "通讯地址",
entrytype: "入职渠道",
startworktime: "参加工作时间",
startorgtime: "到本单位时间",
......
app_PIM/src/widgets/hremployee/if-001-form/if-001-form-base.tsx
浏览文件 @ e681e981
......@@ -93,6 +93,10 @@ export class IF_001EditFormBase extends EditFormControlBase {
nation: null,
organizationname: null,
photo: null,
mobile: null,
telephone: null,
email: null,
postaladdress: null,
nativetype: null,
nativeplace: null,
marriage: null,
......@@ -103,10 +107,6 @@ export class IF_001EditFormBase extends EditFormControlBase {
health: null,
political: null,
politicaltime: null,
mobile: null,
telephone: null,
email: null,
postaladdress: null,
entrytype: null,
startworktime: null,
startorgtime: null,
......@@ -149,10 +149,10 @@ export class IF_001EditFormBase extends EditFormControlBase {
group1: new FormGroupPanelModel({ caption: '基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hremployee.if_001_form', extractMode: 'ITEM', details: [] } }),
grouppanel3: new FormGroupPanelModel({ caption: '补充信息', detailType: 'GROUPPANEL', name: 'grouppanel3', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hremployee.if_001_form', extractMode: 'ITEM', details: [] } }),
grouppanel4: new FormGroupPanelModel({ caption: '联系信息', detailType: 'GROUPPANEL', name: 'grouppanel4', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hremployee.if_001_form', extractMode: 'ITEM', details: [] } }),
grouppanel3: new FormGroupPanelModel({ caption: '补充信息', detailType: 'GROUPPANEL', name: 'grouppanel3', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hremployee.if_001_form', extractMode: 'ITEM', details: [] } }),
grouppanel5: new FormGroupPanelModel({ caption: '工作相关', detailType: 'GROUPPANEL', name: 'grouppanel5', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.hremployee.if_001_form', extractMode: 'ITEM', details: [] } }),
formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
......@@ -195,6 +195,14 @@ export class IF_001EditFormBase extends EditFormControlBase {
photo: new FormItemModel({ caption: '照片', detailType: 'FORMITEM', name: 'photo', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
mobile: new FormItemModel({ caption: '移动电话', detailType: 'FORMITEM', name: 'mobile', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
telephone: new FormItemModel({ caption: '固定电话', detailType: 'FORMITEM', name: 'telephone', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
email: new FormItemModel({ caption: '电子邮箱', detailType: 'FORMITEM', name: 'email', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
postaladdress: new FormItemModel({ caption: '通讯地址', detailType: 'FORMITEM', name: 'postaladdress', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
nativetype: new FormItemModel({ caption: '户口类型', detailType: 'FORMITEM', name: 'nativetype', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
nativeplace: new FormItemModel({ caption: '籍贯', detailType: 'FORMITEM', name: 'nativeplace', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
......@@ -215,14 +223,6 @@ export class IF_001EditFormBase extends EditFormControlBase {
politicaltime: new FormItemModel({ caption: '入党时间', detailType: 'FORMITEM', name: 'politicaltime', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
mobile: new FormItemModel({ caption: '移动电话', detailType: 'FORMITEM', name: 'mobile', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
telephone: new FormItemModel({ caption: '固定电话', detailType: 'FORMITEM', name: 'telephone', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
email: new FormItemModel({ caption: '电子邮箱', detailType: 'FORMITEM', name: 'email', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
postaladdress: new FormItemModel({ caption: '通讯地址', detailType: 'FORMITEM', name: 'postaladdress', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
entrytype: new FormItemModel({ caption: '入职渠道', detailType: 'FORMITEM', name: 'entrytype', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
startworktime: new FormItemModel({ caption: '参加工作时间', detailType: 'FORMITEM', name: 'startworktime', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
......
app_PIM/src/widgets/hremployee/if-001-form/if-001-form-model.ts
浏览文件 @ e681e981
......@@ -110,6 +110,26 @@ export default class IF_001Model {
prop: 'photo',
dataType: 'TEXT',
},
{
name: 'mobile',
prop: 'mobile',
dataType: 'TEXT',
},
{
name: 'telephone',
prop: 'telephone',
dataType: 'TEXT',
},
{
name: 'email',
prop: 'email',
dataType: 'TEXT',
},
{
name: 'postaladdress',
prop: 'postaladdress',
dataType: 'TEXT',
},
{
name: 'nativetype',
prop: 'nativetype',
......@@ -160,26 +180,6 @@ export default class IF_001Model {
prop: 'politicaltime',
dataType: 'DATE',
},
{
name: 'mobile',
prop: 'mobile',
dataType: 'TEXT',
},
{
name: 'telephone',
prop: 'telephone',
dataType: 'TEXT',
},
{
name: 'email',
prop: 'email',
dataType: 'TEXT',
},
{
name: 'postaladdress',
prop: 'postaladdress',
dataType: 'TEXT',
},
{
name: 'entrytype',
prop: 'entrytype',
......
app_PIM/src/widgets/hremployee/if-001-form/if-001-form.html
浏览文件 @ e681e981
......@@ -124,6 +124,55 @@ tag='CL_HR_0008' codelistType='STATIC' :data="data" :context="context" :viewpara
</row>
</app-form-group>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.grouppanel4.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group :model="detailsModel.grouppanel4" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel4.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hremployee.if_001_form.details.grouppanel4')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="true" >
<app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.grouppanel4" :data="data" :context="context" :viewparams="viewparams"/>
<row>
<i-col class="form-layout-container" v-show="detailsModel.mobile.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='mobile' :itemRules="this.rules.mobile" class='' :caption="$t('entities.hremployee.if_001_form.details.mobile')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.mobile.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='mobile' :value="data.mobile" dataType="TEXT" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.telephone.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='telephone' :itemRules="this.rules.telephone" class='' :caption="$t('entities.hremployee.if_001_form.details.telephone')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.telephone.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='telephone' :value="data.telephone" dataType="TEXT" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.email.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='email' :itemRules="this.rules.email" class='' :caption="$t('entities.hremployee.if_001_form.details.email')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.email.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='email' :value="data.email" dataType="TEXT" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.postaladdress.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item name='postaladdress' :itemRules="this.rules.postaladdress" class='' :caption="$t('entities.hremployee.if_001_form.details.postaladdress')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.postaladdress.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='postaladdress' :value="data.postaladdress" dataType="TEXT" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
</row>
</app-form-group>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.grouppanel3.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group :model="detailsModel.grouppanel3" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel3.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hremployee.if_001_form.details.grouppanel3')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="true" >
......@@ -233,55 +282,6 @@ tag='CL_HR_0013' codelistType='STATIC' :data="data" :context="context" :viewpara
</row>
</app-form-group>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.grouppanel4.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group :model="detailsModel.grouppanel4" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel4.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hremployee.if_001_form.details.grouppanel4')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="true" >
<app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.grouppanel4" :data="data" :context="context" :viewparams="viewparams"/>
<row>
<i-col class="form-layout-container" v-show="detailsModel.mobile.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='mobile' :itemRules="this.rules.mobile" class='' :caption="$t('entities.hremployee.if_001_form.details.mobile')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.mobile.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='mobile' :value="data.mobile" dataType="TEXT" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.telephone.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='telephone' :itemRules="this.rules.telephone" class='' :caption="$t('entities.hremployee.if_001_form.details.telephone')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.telephone.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='telephone' :value="data.telephone" dataType="TEXT" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.email.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='email' :itemRules="this.rules.email" class='' :caption="$t('entities.hremployee.if_001_form.details.email')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.email.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='email' :value="data.email" dataType="TEXT" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.postaladdress.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item name='postaladdress' :itemRules="this.rules.postaladdress" class='' :caption="$t('entities.hremployee.if_001_form.details.postaladdress')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.postaladdress.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='postaladdress' :value="data.postaladdress" dataType="TEXT" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
</row>
</app-form-group>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.grouppanel5.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group :model="detailsModel.grouppanel5" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel5.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hremployee.if_001_form.details.grouppanel5')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="true" >
......
humanresource-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ e681e981
......@@ -178,7 +178,7 @@
<!--输出实体[HREMPLOYEE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-177-8">
<changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-182-8">
<createTable tableName="EMPLOYEE">
<column name="EMPLOYEENAME" remarks="" type="VARCHAR(200)">
</column>
......@@ -593,10 +593,10 @@
</changeSet>
<!--输出实体[HREMPSTATE]外键关系 -->
<!--输出实体[HREMPLOYEE]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-177-26">
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-182-26">
<addForeignKeyConstraint baseColumnNames="ORGANIZATIONID" baseTableName="EMPLOYEE" constraintName="DER1N_EMPLOYEE_ORGANIZATION_OR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-177-27">
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-182-27">
<addForeignKeyConstraint baseColumnNames="EMPSTATE" baseTableName="EMPLOYEE" constraintName="DER1N_HREMPLOYEE_HREMPSTATE_EM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HREMPSTATEID" referencedTableName="T_HREMPSTATE" validate="true"/>
</changeSet>
<!--输出实体[HRLEAVE]外键关系 -->
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或