Skip to content

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

JunZai 发布系统代码

上级 fdd227cf
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 932 行增加 和 31 行删除
app_PIM/public/assets/json/view-config.json
浏览文件 @ 6a58657a
......@@ -540,7 +540,7 @@
"memo": "系统自动添加"
},
"hrcertificategridview": {
"title": "证书信息表格视图",
"title": "证书表格",
"caption": "证书信息",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
......
app_PIM/src/interface/entity/hrcertificate.ts
浏览文件 @ 6a58657a
......@@ -181,4 +181,12 @@ export interface HRCertificate {
* @memberof HRCertificate
*/
empstate?: any;
/**
* 是否有效
*
* @returns {*}
* @memberof HRCertificate
*/
activeflag?: any;
}
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrcertificate/hrcertificate_en_US.ts
浏览文件 @ 6a58657a
......@@ -23,6 +23,7 @@ export default {
organizationname: "单位",
organizationid: "单位ID",
empstate: "员工状态",
activeflag: "是否有效",
},
views: {
v_001: {
......@@ -35,7 +36,7 @@ export default {
},
gridview: {
caption: "证书信息",
title: "证书信息表格视图",
title: "证书表格",
},
editview: {
caption: "证书信息",
......@@ -64,6 +65,7 @@ export default {
authdate: "签发日期",
registertime: "初始注册时间",
expiredate: "失效日期",
activeflag: "是否有效",
memo: "备注",
attachment: "附件",
hremployeeid: "员工标识",
......
app_PIM/src/locale/lanres/entities/hrcertificate/hrcertificate_zh_CN.ts
浏览文件 @ 6a58657a
......@@ -22,6 +22,7 @@ export default {
organizationname: "单位",
organizationid: "单位ID",
empstate: "员工状态",
activeflag: "是否有效",
},
views: {
v_001: {
......@@ -34,7 +35,7 @@ export default {
},
gridview: {
caption: "证书信息",
title: "证书信息表格视图",
title: "证书表格",
},
editview: {
caption: "证书信息",
......@@ -63,6 +64,7 @@ export default {
authdate: "签发日期",
registertime: "初始注册时间",
expiredate: "失效日期",
activeflag: "是否有效",
memo: "备注",
attachment: "附件",
hremployeeid: "员工标识",
......
app_PIM/src/locale/lanres/entities/hrtransfer-apply/hrtransfer-apply_en_US.ts
浏览文件 @ 6a58657a
......@@ -417,14 +417,6 @@ export default {
caption: "-",
tip: "",
},
tbitem21: {
caption: "数据导航",
tip: "数据导航",
},
tbitem22: {
caption: "-",
tip: "",
},
tbitem23: {
caption: "Help",
tip: "Help",
......
app_PIM/src/locale/lanres/entities/hrtransfer-apply/hrtransfer-apply_zh_CN.ts
浏览文件 @ 6a58657a
......@@ -416,14 +416,6 @@ export default {
caption: "-",
tip: "",
},
tbitem21: {
caption: "数据导航",
tip: "数据导航",
},
tbitem22: {
caption: "-",
tip: "",
},
tbitem23: {
caption: "帮助",
tip: "帮助",
......
app_PIM/src/mock/viewconfig/viewconfig.ts
浏览文件 @ 6a58657a
......@@ -440,7 +440,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtag": "6395cba44e6d6151f19e543b55d88845"
},
"hrcertificategridview": {
"title": "证书信息表格视图",
"title": "证书表格",
"caption": "证书信息",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
......
app_PIM/src/pages/human-resource/hrcertificate-grid-view/hrcertificate-grid-view-base.tsx
浏览文件 @ 6a58657a
......@@ -9,7 +9,7 @@ import CodeListService from "@service/app/codelist-service";
/**
* 证书信息表格视图视图基类
* 证书表格视图基类
*
* @export
* @class HRCertificateGridViewBase
......
app_PIM/src/pages/human-resource/hrcertificate-grid-view/hrcertificate-grid-view.html
浏览文件 @ 6a58657a
<studio-view-style2 viewName="hrcertificategridview" viewTitle="证书信息表格视图" class='degridview hrcertificate-grid-view'>
<studio-view-style2 viewName="hrcertificategridview" viewTitle="证书表格" class='degridview hrcertificate-grid-view'>
<i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="证书名称" search @on-search="onSearch($event)"/>
<template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template>
......
app_PIM/src/pages/human-resource/hrcertificate-grid-view/hrcertificate-grid-view.vue
浏览文件 @ 6a58657a
......@@ -7,7 +7,7 @@ import view_grid from '@widgets/hrcertificate/main-grid/main-grid.vue';
import view_searchform from '@widgets/hrcertificate/default-searchform/default-searchform.vue';
/**
* 证书信息表格视图视图
* 证书表格视图
*
* @export
* @class HRCertificateGridView
......
app_PIM/src/widgets/hrcertificate/main-form/main-form-base.tsx
浏览文件 @ 6a58657a
......@@ -91,6 +91,7 @@ export class MainEditFormBase extends EditFormControlBase {
authdate: null,
registertime: null,
expiredate: null,
activeflag: null,
memo: null,
attachment: null,
hremployeeid: null,
......@@ -106,6 +107,18 @@ export class MainEditFormBase extends EditFormControlBase {
* @memberof MainEditFormBase
*/
public rules: any = {
hremployeename: [
{ required: true, type: 'string', message: '员工姓名 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '员工姓名 值不能为空', trigger: 'blur' },
],
certificatecode: [
{ required: true, type: 'string', message: '证书编号 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '证书编号 值不能为空', trigger: 'blur' },
],
hrcertificatename: [
{ required: true, type: 'string', message: '证书名称 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '证书名称 值不能为空', trigger: 'blur' },
],
}
/**
......@@ -164,6 +177,8 @@ export class MainEditFormBase extends EditFormControlBase {
expiredate: new FormItemModel({ caption: '失效日期', detailType: 'FORMITEM', name: 'expiredate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
activeflag: new FormItemModel({ caption: '是否有效', detailType: 'FORMITEM', name: 'activeflag', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
memo: new FormItemModel({ caption: '备注', detailType: 'FORMITEM', name: 'memo', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
attachment: new FormItemModel({ caption: '附件', detailType: 'FORMITEM', name: 'attachment', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
......
app_PIM/src/widgets/hrcertificate/main-form/main-form-model.ts
浏览文件 @ 6a58657a
......@@ -100,6 +100,11 @@ export default class MainModel {
prop: 'expiredate',
dataType: 'DATE',
},
{
name: 'activeflag',
prop: 'activeflag',
dataType: 'YESNO',
},
{
name: 'memo',
prop: 'memo',
......
app_PIM/src/widgets/hrcertificate/main-form/main-form.html
浏览文件 @ 6a58657a
......@@ -143,6 +143,13 @@
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.activeflag.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='activeflag' :itemRules="this.rules.activeflag" class='' :caption="$t('entities.hrcertificate.main_form.details.activeflag')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.activeflag.error" :isEmptyCaption="false" labelPos="LEFT">
<app-switch name='activeflag' :value="this.data.activeflag" @change="($event)=>{this.data.activeflag = $event} " :disabled="detailsModel.activeflag.disabled" style=""></app-switch>
</app-form-item>
</i-col>
<i-col class="form-layout-container" v-show="detailsModel.memo.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
<app-form-item name='memo' :itemRules="this.rules.memo" class='' :caption="$t('entities.hrcertificate.main_form.details.memo')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.memo.error" :isEmptyCaption="false" labelPos="LEFT">
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRCertificate.java
浏览文件 @ 6a58657a
......@@ -204,6 +204,13 @@ public class HRCertificate extends EntityMP implements Serializable {
@JSONField(name = "empstate")
@JsonProperty("empstate")
private String empstate;
/**
* 是否有效
*/
@TableField(value = "activeflag")
@JSONField(name = "activeflag")
@JsonProperty("activeflag")
private Integer activeflag;
/**
* 员工
......@@ -341,6 +348,14 @@ public class HRCertificate extends EntityMP implements Serializable {
this.modify("registerorganizationid",registerorganizationid);
}
/**
* 设置 [是否有效]
*/
public void setActiveflag(Integer activeflag){
this.activeflag = activeflag ;
this.modify("activeflag",activeflag);
}
}
......
humanresource-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 6a58657a
......@@ -103,6 +103,8 @@
</column>
<column name="REGISTERORGANIZATIONID" remarks="" type="VARCHAR(60)">
</column>
<column name="ACTIVEFLAG" remarks="" type="INT">
</column>
</createTable>
</changeSet>
......
humanresource-core/src/main/resources/mapper/humanresource/hrcertificate/HRCertificateMapper.xml
浏览文件 @ 6a58657a
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="HRCertificateResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`ATTACHMENT`, t1.`AUTHDATE`, t1.`AUTHORGANIZATION`, t1.`CERTIFICATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`EXPIREDATE`, t1.`HRCERTIFICATEID`, t1.`HRCERTIFICATENAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, t1.`REGISTERCODE`, t1.`REGISTERORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `REGISTERORGANIZATIONNAME`, t1.`REGISTERTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCERTIFICATE` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t1.REGISTERORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t11.ORGANIZATIONID = t31.ORGANIZATIONID ) t1 where hrcertificateid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`ACTIVEFLAG`, t1.`ATTACHMENT`, t1.`AUTHDATE`, t1.`AUTHORGANIZATION`, t1.`CERTIFICATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`EXPIREDATE`, t1.`HRCERTIFICATEID`, t1.`HRCERTIFICATENAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, t1.`REGISTERCODE`, t1.`REGISTERORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `REGISTERORGANIZATIONNAME`, t1.`REGISTERTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCERTIFICATE` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t1.REGISTERORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t11.ORGANIZATIONID = t31.ORGANIZATIONID ) t1 where hrcertificateid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -47,12 +47,12 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`ATTACHMENT`, t1.`AUTHDATE`, t1.`AUTHORGANIZATION`, t1.`CERTIFICATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`EXPIREDATE`, t1.`HRCERTIFICATEID`, t1.`HRCERTIFICATENAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, t1.`REGISTERCODE`, t1.`REGISTERORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `REGISTERORGANIZATIONNAME`, t1.`REGISTERTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCERTIFICATE` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t1.REGISTERORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t11.ORGANIZATIONID = t31.ORGANIZATIONID
<![CDATA[ SELECT t1.`ACTIVEFLAG`, t1.`ATTACHMENT`, t1.`AUTHDATE`, t1.`AUTHORGANIZATION`, t1.`CERTIFICATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`EXPIREDATE`, t1.`HRCERTIFICATEID`, t1.`HRCERTIFICATENAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, t1.`REGISTERCODE`, t1.`REGISTERORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `REGISTERORGANIZATIONNAME`, t1.`REGISTERTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCERTIFICATE` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t1.REGISTERORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t11.ORGANIZATIONID = t31.ORGANIZATIONID
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`ATTACHMENT`, t1.`AUTHDATE`, t1.`AUTHORGANIZATION`, t1.`CERTIFICATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`EXPIREDATE`, t1.`HRCERTIFICATEID`, t1.`HRCERTIFICATENAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, t1.`REGISTERCODE`, t1.`REGISTERORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `REGISTERORGANIZATIONNAME`, t1.`REGISTERTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCERTIFICATE` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t1.REGISTERORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t11.ORGANIZATIONID = t31.ORGANIZATIONID
<![CDATA[ SELECT t1.`ACTIVEFLAG`, t1.`ATTACHMENT`, t1.`AUTHDATE`, t1.`AUTHORGANIZATION`, t1.`CERTIFICATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`EMPLOYEECODE`, t11.`EMPSTATE`, t1.`EXPIREDATE`, t1.`HRCERTIFICATEID`, t1.`HRCERTIFICATENAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t11.`ORGANIZATIONID`, t31.`ORGANIZATIONNAME`, t1.`REGISTERCODE`, t1.`REGISTERORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `REGISTERORGANIZATIONNAME`, t1.`REGISTERTIME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCERTIFICATE` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t1.REGISTERORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t11.ORGANIZATIONID = t31.ORGANIZATIONID
]]>
</sql>
</mapper>
......
humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HRCertificateDTO.java
浏览文件 @ 6a58657a
......@@ -205,6 +205,14 @@ public class HRCertificateDTO extends DTOBase implements Serializable {
@JsonProperty("empstate")
private String empstate;
/**
* 属性 [ACTIVEFLAG]
*
*/
@JSONField(name = "activeflag")
@JsonProperty("activeflag")
private Integer activeflag;
/**
* 设置 [HRCERTIFICATENAME]
......@@ -294,6 +302,14 @@ public class HRCertificateDTO extends DTOBase implements Serializable {
this.modify("registerorganizationid",registerorganizationid);
}
/**
* 设置 [ACTIVEFLAG]
*/
public void setActiveflag(Integer activeflag){
this.activeflag = activeflag ;
this.modify("activeflag",activeflag);
}
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或