Skip to content

I
ibzou
提交 6eef5682 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码

上级 87fac3cc
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 142 行增加 和 415 行删除
app_web/src/locale/lanres/entities/ibzdepartment/ibzdepartment_en_US.ts
浏览文件 @ 6eef5682
......@@ -190,6 +190,10 @@ export default {
caption: "新建行",
tip: "新建行",
},
deuiaction1: {
caption: "保存行",
tip: "保存行",
},
tbitem26: {
caption: "-",
tip: "",
......
app_web/src/locale/lanres/entities/ibzdepartment/ibzdepartment_zh_CN.ts
浏览文件 @ 6eef5682
......@@ -189,6 +189,10 @@ export default {
caption: "新建行",
tip: "新建行",
},
deuiaction1: {
caption: "保存行",
tip: "保存行",
},
tbitem26: {
caption: "-",
tip: "",
......
app_web/src/locale/lanres/entities/ibzemployee/ibzemployee_en_US.ts
浏览文件 @ 6eef5682
......@@ -220,6 +220,10 @@ export default {
caption: "新建行",
tip: "新建行",
},
deuiaction1: {
caption: "保存行",
tip: "保存行",
},
tbitem26: {
caption: "-",
tip: "",
......
app_web/src/locale/lanres/entities/ibzemployee/ibzemployee_zh_CN.ts
浏览文件 @ 6eef5682
......@@ -219,6 +219,10 @@ export default {
caption: "新建行",
tip: "新建行",
},
deuiaction1: {
caption: "保存行",
tip: "保存行",
},
tbitem26: {
caption: "-",
tip: "",
......
app_web/src/locale/lanres/entities/ibzteam-member/ibzteam-member_en_US.ts
浏览文件 @ 6eef5682
......@@ -7,7 +7,7 @@ export default {
userid: "用户标识",
personname: "姓名",
postid: "岗位标识",
postname: "岗位标识",
postname: "岗位",
domains: "区属",
},
views: {
......@@ -32,7 +32,7 @@ export default {
srfdeid: "",
srfsourcekey: "",
personname: "姓名",
postname: "岗位标识",
postname: "岗位",
domains: "区属",
teamid: "组标识",
postid: "岗位标识",
......@@ -45,8 +45,9 @@ export default {
main_grid: {
columns: {
personname: "姓名",
postname: "岗位标识",
domains: "区属",
postname: "岗位",
postid: "岗位标识",
userid: "用户标识",
},
uiactions: {
},
......@@ -59,22 +60,6 @@ export default {
},
},
gridviewtoolbar_toolbar: {
deuiaction1: {
caption: "New",
tip: "New",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem6: {
caption: "Copy",
tip: "Copy {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
......@@ -83,14 +68,6 @@ export default {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
......
app_web/src/locale/lanres/entities/ibzteam-member/ibzteam-member_zh_CN.ts
浏览文件 @ 6eef5682
......@@ -6,7 +6,7 @@ export default {
userid: "用户标识",
personname: "姓名",
postid: "岗位标识",
postname: "岗位标识",
postname: "岗位",
domains: "区属",
},
views: {
......@@ -31,7 +31,7 @@ export default {
srfdeid: "",
srfsourcekey: "",
personname: "姓名",
postname: "岗位标识",
postname: "岗位",
domains: "区属",
teamid: "组标识",
postid: "岗位标识",
......@@ -44,8 +44,9 @@ export default {
main_grid: {
columns: {
personname: "姓名",
postname: "岗位标识",
domains: "区属",
postname: "岗位",
postid: "岗位标识",
userid: "用户标识",
},
uiactions: {
},
......@@ -58,22 +59,6 @@ export default {
},
},
gridviewtoolbar_toolbar: {
deuiaction1: {
caption: "新建",
tip: "新建",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem6: {
caption: "拷贝",
tip: "拷贝",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
......@@ -82,14 +67,6 @@ export default {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
......
app_web/src/widgets/ibzteam-member/main-form/main-form-base.vue
浏览文件 @ 6eef5682
......@@ -479,10 +479,10 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '姓名 值不能为空', trigger: 'blur' },
],
postname: [
{ type: 'string', message: '岗位标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '岗位标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '岗位标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '岗位标识 值不能为空', trigger: 'blur' },
{ type: 'string', message: '岗位 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '岗位 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '岗位 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '岗位 值不能为空', trigger: 'blur' },
],
domains: [
{ type: 'string', message: '区属 值必须为字符串类型', trigger: 'change' },
......@@ -543,7 +543,7 @@ export default class MainBase extends Vue implements ControlInterface {
,
personname: new FormItemModel({ caption: '姓名', detailType: 'FORMITEM', name: 'personname', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
postname: new FormItemModel({ caption: '岗位标识', detailType: 'FORMITEM', name: 'postname', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
postname: new FormItemModel({ caption: '岗位', detailType: 'FORMITEM', name: 'postname', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
domains: new FormItemModel({ caption: '区属', detailType: 'FORMITEM', name: 'domains', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
......
app_web/src/widgets/ibzteam-member/main-grid/main-grid-base.vue
浏览文件 @ 6eef5682
......@@ -29,7 +29,9 @@
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.personname}}</span>
<template >
<app-span name='personname' editorType="PICKER" :value="row.personname"></app-span>
</template>
</template>
</el-table-column>
</template>
......@@ -41,19 +43,37 @@
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.postname}}</span>
<template >
<app-span name='postname' editorType="PICKER" :value="row.postname"></app-span>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('postid')">
<el-table-column show-overflow-tooltip :prop="'postid'" :label="$t('entities.ibzteammember.main_grid.columns.postid')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibzteammember.main_grid.columns.postid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<app-span name='postid' editorType="HIDDEN" :value="row.postid"></app-span>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('domains')">
<el-table-column show-overflow-tooltip :prop="'domains'" :label="$t('entities.ibzteammember.main_grid.columns.domains')" :width="200" :align="'left'" :sortable="'custom'">
<template v-if="getColumnState('userid')">
<el-table-column show-overflow-tooltip :prop="'userid'" :label="$t('entities.ibzteammember.main_grid.columns.userid')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibzteammember.main_grid.columns.domains')}}
{{$t('entities.ibzteammember.main_grid.columns.userid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.domains}}</span>
<template >
<app-span name='userid' editorType="HIDDEN" :value="row.userid"></app-span>
</template>
</template>
</el-table-column>
</template>
......@@ -389,7 +409,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @type {number}
* @memberof MainBase
*/
public limit: number = 20;
public limit: number = 100;
/**
* 是否显示标题
......@@ -554,17 +574,25 @@ export default class MainBase extends Vue implements ControlInterface {
},
{
name: 'postname',
label: '岗位标识',
label: '岗位',
langtag: 'entities.ibzteammember.main_grid.columns.postname',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'domains',
label: '区属',
langtag: 'entities.ibzteammember.main_grid.columns.domains',
show: true,
name: 'postid',
label: '岗位标识',
langtag: 'entities.ibzteammember.main_grid.columns.postid',
show: false,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'userid',
label: '用户标识',
langtag: 'entities.ibzteammember.main_grid.columns.userid',
show: false,
util: 'PX',
isEnableRowEdit: false,
},
......@@ -586,6 +614,10 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public getGridRowModel(){
return {
postid: new FormItemModel(),
postname: new FormItemModel(),
userid: new FormItemModel(),
personname: new FormItemModel(),
srfkey: new FormItemModel(),
}
}
......@@ -597,6 +629,22 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public rules: any = {
postid: [
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '岗位标识 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '岗位标识 值不能为空', trigger: 'blur' },
],
postname: [
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '岗位 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '岗位 值不能为空', trigger: 'blur' },
],
userid: [
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '用户标识 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '用户标识 值不能为空', trigger: 'blur' },
],
personname: [
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '姓名 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '姓名 值不能为空', trigger: 'blur' },
],
srfkey: [
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '组成员标识 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '组成员标识 值不能为空', trigger: 'blur' },
......
app_web/src/widgets/ibzteam-member/main-grid/main-grid-model.ts
浏览文件 @ 6eef5682
......@@ -41,11 +41,6 @@ export default class MainModel {
prop: 'postname',
dataType: 'PICKUPTEXT',
},
{
name: 'domains',
prop: 'domains',
dataType: 'TEXT',
},
{
name: 'userid',
prop: 'userid',
......
app_web/src/widgets/ibzteam-member/main-grid/main-grid-service.ts
浏览文件 @ 6eef5682
......@@ -2,6 +2,8 @@ import { Http,Util,Errorlog } from '@/utils';
import ControlService from '@/widgets/control-service';
import IBZTeamMemberService from '@/service/ibzteam-member/ibzteam-member-service';
import MainModel from './main-grid-model';
import IBZPostService from '@/service/ibzpost/ibzpost-service';
import IBZEmployeeService from '@/service/ibzemployee/ibzemployee-service';
/**
......@@ -42,6 +44,22 @@ export default class MainService extends ControlService {
}
/**
* 岗位服务对象
*
* @type {IBZPostService}
* @memberof MainService
*/
public ibzpostService: IBZPostService = new IBZPostService();
/**
* 人员服务对象
*
* @type {IBZEmployeeService}
* @memberof MainService
*/
public ibzemployeeService: IBZEmployeeService = new IBZEmployeeService();
/**
* 处理数据
*
......@@ -83,6 +101,12 @@ export default class MainService extends ControlService {
public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
data.page = data.page ? data.page : 0;
data.size = data.size ? data.size : 1000;
if (Object.is(serviceName, 'IBZPostService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.ibzpostService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'postid', 'ibzpost');
}
if (Object.is(serviceName, 'IBZEmployeeService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.ibzemployeeService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'userid', 'ibzemployee');
}
return Promise.reject([])
}
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZTeamMember.java
浏览文件 @ 6eef5682
......@@ -83,7 +83,7 @@ public class IBZTeamMember extends EntityMP implements Serializable {
@JsonProperty("postid")
private String postid;
/**
* 岗位标识
* 岗位
*/
@TableField(exist = false)
@JSONField(name = "postname")
......
ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZTeamMemberSearchContext.java
浏览文件 @ 6eef5682
......@@ -83,14 +83,14 @@ public class IBZTeamMemberSearchContext extends QueryWrapperContext<IBZTeamMembe
this.getSearchCond().eq("postid", n_postid_eq);
}
}
private String n_postname_eq;//[岗位标识]
private String n_postname_eq;//[岗位]
public void setN_postname_eq(String n_postname_eq) {
this.n_postname_eq = n_postname_eq;
if(!ObjectUtils.isEmpty(this.n_postname_eq)){
this.getSearchCond().eq("postname", n_postname_eq);
}
}
private String n_postname_like;//[岗位标识]
private String n_postname_like;//[岗位]
public void setN_postname_like(String n_postname_like) {
this.n_postname_like = n_postname_like;
if(!ObjectUtils.isEmpty(this.n_postname_like)){
......
ibzou-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 6eef5682
......@@ -204,7 +204,7 @@
<!--输出实体[IBZTEAMMEMBER]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ibzteammember-55-7">
<changeSet author="a_A_5d9d78509" id="tab-ibzteammember-58-7">
<createTable tableName="IBZTEAMMEMBER">
<column name="TEAMMEMBERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_IBZTEAMMEMBER_TEAMMEMBERID"/>
......@@ -254,13 +254,13 @@
<addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZDEPT" constraintName="DER1N_IBZDEPT_IBZORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
</changeSet>
<!--输出实体[IBZTEAMMEMBER]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-ibzteammember-55-17">
<changeSet author="a_A_5d9d78509" id="fk-ibzteammember-58-17">
<addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_IBZTEAMMEMBER_IBZEMP_USE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZEMP" validate="true"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-ibzteammember-55-18">
<changeSet author="a_A_5d9d78509" id="fk-ibzteammember-58-18">
<addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_IBZTEAMMEMBER_IBZPOST_PO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-ibzteammember-55-19">
<changeSet author="a_A_5d9d78509" id="fk-ibzteammember-58-19">
<addForeignKeyConstraint baseColumnNames="TEAMID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_IBZTEAMMEMBER_IBZTEAM_TE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TEAMID" referencedTableName="IBZTEAM" validate="true"/>
</changeSet>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或