Skip to content

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

ibiz4j 发布系统代码

上级 3a310926
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 361 行增加 和 385 行删除
app_web/src/locale/lanres/entities/ibzdept-member/ibzdept-member_en_US.ts
浏览文件 @ de319d14
......@@ -43,26 +43,29 @@ export default {
main_grid: {
columns: {
deptname: "部门",
postname: "岗位名称",
personname: "成员",
deptid: "部门标识",
postid: "岗位标识",
userid: "用户标识",
},
uiactions: {
},
},
gridviewtoolbar_toolbar: {
deuiaction1: {
caption: "New",
tip: "New",
tbitem24: {
caption: "行编辑",
tip: "行编辑",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
tbitem25: {
caption: "新建行",
tip: "新建行",
},
tbitem6: {
caption: "Copy",
tip: "Copy {0}",
deuiaction1: {
caption: "保存行",
tip: "保存行",
},
tbitem7: {
tbitem26: {
caption: "-",
tip: "",
},
......@@ -70,14 +73,6 @@ export default {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
},
editviewtoolbar_toolbar: {
tbitem3: {
......
app_web/src/locale/lanres/entities/ibzdept-member/ibzdept-member_zh_CN.ts
浏览文件 @ de319d14
......@@ -42,26 +42,29 @@ export default {
main_grid: {
columns: {
deptname: "部门",
postname: "岗位名称",
personname: "成员",
deptid: "部门标识",
postid: "岗位标识",
userid: "用户标识",
},
uiactions: {
},
},
gridviewtoolbar_toolbar: {
deuiaction1: {
caption: "新建",
tip: "新建",
tbitem24: {
caption: "行编辑",
tip: "行编辑",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
tbitem25: {
caption: "新建行",
tip: "新建行",
},
tbitem6: {
caption: "拷贝",
tip: "拷贝",
deuiaction1: {
caption: "保存行",
tip: "保存行",
},
tbitem7: {
tbitem26: {
caption: "-",
tip: "",
},
......@@ -69,14 +72,6 @@ export default {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
},
editviewtoolbar_toolbar: {
tbitem3: {
......
app_web/src/pages/ou/ibzpost-grid-view/ibzpost-grid-view-base.vue
浏览文件 @ de319d14
......@@ -1070,16 +1070,28 @@ export default class IBZPostGridViewBase extends Vue {
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'ibzposts', parameterName: 'ibzpost' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
openIndexViewTab(data);
const view: any = {
viewname: 'ibzpost-edit-view',
height: 0,
width: 0,
title: this.$t('entities.ibzpost.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......@@ -1111,14 +1123,28 @@ export default class IBZPostGridViewBase extends Vue {
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'ibzposts', parameterName: 'ibzpost' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
openIndexViewTab(data);
const view: any = {
viewname: 'ibzpost-edit-view',
height: 0,
width: 0,
title: this.$t('entities.ibzpost.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......
app_web/src/store/modules/view-action/state.ts
浏览文件 @ de319d14
......@@ -255,8 +255,10 @@ export const viewstate: any = {
viewdatachange: false,
refviews: [
'5ef90c56e30ba698e1ba1fc05f426725',
'0581848a24a829f706252c15c641e154',
'95a44e1851d28a16a90965f60d6ff4ae',
'bf9108c85aaa6f3d2498f87b2439b9df',
'd1ec542e553e00c6455ca776efc61882',
],
},
{
......
app_web/src/widgets/ibzdept-member/main-grid/main-grid-model.ts
浏览文件 @ de319d14
......@@ -36,6 +36,11 @@ export default class MainModel {
prop: 'deptid',
dataType: 'PICKUP',
},
{
name: 'postname',
prop: 'postname',
dataType: 'PICKUPTEXT',
},
{
name: 'userid',
prop: 'userid',
......
app_web/src/widgets/ibzdept-member/main-grid/main-grid-service.ts
浏览文件 @ de319d14
......@@ -2,6 +2,8 @@ import { Http,Util,Errorlog } from '@/utils';
import ControlService from '@/widgets/control-service';
import IBZDeptMemberService from '@/service/ibzdept-member/ibzdept-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/resources/liquibase/h2_table.xml
浏览文件 @ de319d14
......@@ -130,7 +130,7 @@
<!--输出实体[IBZPOST]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ibzpost-31-4">
<changeSet author="a_A_5d9d78509" id="tab-ibzpost-32-4">
<createTable tableName="IBZPOST">
<column name="POSTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_IBZPOST_POSTID"/>
......@@ -148,7 +148,7 @@
<!--输出实体[IBZDEPTMEMBER]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ibzdeptmember-36-5">
<changeSet author="a_A_5d9d78509" id="tab-ibzdeptmember-39-5">
<createTable tableName="IBZDEPTMEMBER">
<column name="MEMBERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_IBZDEPTMEMBER_MEMBERID"/>
......@@ -204,7 +204,7 @@
<!--输出实体[IBZTEAMMEMBER]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ibzteammember-58-7">
<changeSet author="a_A_5d9d78509" id="tab-ibzteammember-59-7">
<createTable tableName="IBZTEAMMEMBER">
<column name="TEAMMEMBERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_IBZTEAMMEMBER_TEAMMEMBERID"/>
......@@ -237,13 +237,13 @@
</changeSet>
<!--输出实体[IBZPOST]外键关系 -->
<!--输出实体[IBZDEPTMEMBER]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-36-12">
<changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-39-12">
<addForeignKeyConstraint baseColumnNames="DEPTID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_IBZDEPTMEMBER_IBZDEPT_DE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-36-13">
<changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-39-13">
<addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_IBZDEPTMEMBER_IBZEMP_USE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZEMP" validate="true"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-36-14">
<changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-39-14">
<addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_IBZDEPTMEMBER_IBZPOST_PO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
</changeSet>
<!--输出实体[IBZDEPT]外键关系 -->
......@@ -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-58-17">
<changeSet author="a_A_5d9d78509" id="fk-ibzteammember-59-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-58-18">
<changeSet author="a_A_5d9d78509" id="fk-ibzteammember-59-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-58-19">
<changeSet author="a_A_5d9d78509" id="fk-ibzteammember-59-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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或