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/ibzdept-member-grid-view/ibzdept-member-grid-view-base.vue
浏览文件 @ de319d14
......@@ -9,25 +9,25 @@
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
<i class='fa fa-file-text-o'></i>
<span class='caption'>{{$t('entities.ibzdeptmember.gridviewtoolbar_toolbar.deuiaction1.caption')}}</span>
<i-button v-show="toolBarModels.tbitem24.visabled" :disabled="toolBarModels.tbitem24.disabled" class='' @click="toolbar_click({ tag: 'tbitem24' }, $event)">
<i class='fa fa-table'></i>
<span class='caption'>{{$t('entities.ibzdeptmember.gridviewtoolbar_toolbar.tbitem24.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.ibzdeptmember.gridviewtoolbar_toolbar.deuiaction1.tip')}}</div>
<div slot='content'>{{$t('entities.ibzdeptmember.gridviewtoolbar_toolbar.tbitem24.tip')}}</div>
</tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)">
<i class='fa fa-edit'></i>
<span class='caption'>{{$t('entities.ibzdeptmember.gridviewtoolbar_toolbar.tbitem4.caption')}}</span>
<i-button v-show="toolBarModels.tbitem25.visabled" :disabled="toolBarModels.tbitem25.disabled" class='' @click="toolbar_click({ tag: 'tbitem25' }, $event)">
<i class='fa fa-plus'></i>
</i-button>
<div slot='content'>{{$t('entities.ibzdeptmember.gridviewtoolbar_toolbar.tbitem4.tip')}}</div>
<div slot='content'>{{$t('entities.ibzdeptmember.gridviewtoolbar_toolbar.tbitem25.tip')}}</div>
</tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem6.visabled" :disabled="toolBarModels.tbitem6.disabled" class='' @click="toolbar_click({ tag: 'tbitem6' }, $event)">
<i class='fa fa-copy'></i>
<span class='caption'>{{$t('entities.ibzdeptmember.gridviewtoolbar_toolbar.tbitem6.caption')}}</span>
<i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
<i class='fa fa-save'></i>
<span class='caption'>{{$t('entities.ibzdeptmember.gridviewtoolbar_toolbar.deuiaction1.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.ibzdeptmember.gridviewtoolbar_toolbar.tbitem6.tip')}}</div>
<div slot='content'>{{$t('entities.ibzdeptmember.gridviewtoolbar_toolbar.deuiaction1.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem8.visabled" :disabled="toolBarModels.tbitem8.disabled" class='' @click="toolbar_click({ tag: 'tbitem8' }, $event)">
......@@ -36,10 +36,6 @@
</i-button>
<div slot='content'>{{$t('entities.ibzdeptmember.gridviewtoolbar_toolbar.tbitem8.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<app-export-excel :item="toolBarModels.tbitem13" :caption="$t('entities.ibzdeptmember.gridviewtoolbar_toolbar.tbitem13.caption')" @exportexcel="toolbar_click({ tag: 'tbitem13' }, $event)"></app-export-excel>
<div slot='content'>{{$t('entities.ibzdeptmember.gridviewtoolbar_toolbar.tbitem13.tip')}}</div>
</tooltip>
</div>
</div>
</div>
......@@ -49,14 +45,14 @@
:context="context"
:isSingleSelect="isSingleSelect"
:showBusyIndicator="true"
:isOpenEdit="false"
:isOpenEdit="true"
:gridRowActiveMode="gridRowActiveMode"
@save="onSave"
updateAction=""
updateAction="Update"
removeAction="Remove"
loaddraftAction=""
loadAction=""
createAction=""
loaddraftAction="GetDraft"
loadAction="Get"
createAction="Create"
fetchAction="FetchDefault"
:newdata="newdata"
:opendata="opendata"
......@@ -276,18 +272,15 @@ export default class IBZDeptMemberGridViewBase extends Vue {
* @memberof IBZDeptMemberGridView
*/
public toolBarModels: any = {
deuiaction1: { name: 'deuiaction1', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
tbitem24: { name: 'tbitem24', caption: '行编辑', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ToggleRowEdit', target: '' } },
tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
tbitem25: { name: 'tbitem25', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'NewRow', target: '' } },
tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
deuiaction1: { name: 'deuiaction1', caption: '保存行', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveRow', target: '' } },
tbitem7: { name: 'tbitem7', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem26: { name: 'tbitem26', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem8: { name: 'tbitem8', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
tbitem9: { name: 'tbitem9', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem13: { name: 'tbitem13', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000 },
};
......@@ -603,33 +596,18 @@ export default class IBZDeptMemberGridViewBase extends Vue {
* @memberof IBZDeptMemberGridViewBase
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'deuiaction1')) {
this.toolbar_deuiaction1_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem4')) {
this.toolbar_tbitem4_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem6')) {
this.toolbar_tbitem6_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem24')) {
this.toolbar_tbitem24_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem25')) {
this.toolbar_tbitem25_click(null, '', $event2);
}
if (Object.is($event.tag, 'deuiaction1')) {
this.toolbar_deuiaction1_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem8')) {
this.toolbar_tbitem8_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem13')) {
this.toolbar_tbitem13_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem11')) {
this.toolbar_tbitem11_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem19')) {
this.toolbar_tbitem19_click(null, '', $event2);
}
......@@ -697,118 +675,6 @@ export default class IBZDeptMemberGridViewBase extends Vue {
/**
* 逻辑事件
*
* @param {*} [params={}]
* @param {*} [tag]
* @param {*} [$event]
* @memberof
*/
public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
let xData: any = null;
// _this 指向容器对象
const _this: any = this;
let paramJO:any = {};
let contextJO:any = {};
xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
/**
* 逻辑事件
*
* @param {*} [params={}]
* @param {*} [tag]
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem4_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
let xData: any = null;
// _this 指向容器对象
const _this: any = this;
let paramJO:any = {};
let contextJO:any = {};
xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Edit(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
/**
* 逻辑事件
*
* @param {*} [params={}]
* @param {*} [tag]
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
let xData: any = null;
// _this 指向容器对象
const _this: any = this;
let paramJO:any = {};
let contextJO:any = {};
xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.View(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
/**
* 逻辑事件
*
* @param {*} [params={}]
* @param {*} [tag]
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem6_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
let xData: any = null;
// _this 指向容器对象
const _this: any = this;
let paramJO:any = {};
let contextJO:any = {};
xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
/**
* 逻辑事件
*
......@@ -873,35 +739,7 @@ export default class IBZDeptMemberGridViewBase extends Vue {
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem8_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
let xData: any = null;
// _this 指向容器对象
const _this: any = this;
let paramJO:any = {};
let contextJO:any = {};
xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Remove(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
/**
* 逻辑事件
*
* @param {*} [params={}]
* @param {*} [tag]
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem13_click(params: any = {}, tag?: any, $event?: any) {
public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
......@@ -918,7 +756,7 @@ export default class IBZDeptMemberGridViewBase extends Vue {
datas = [params];
}
// 界面行为
this.ExportExcel(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
this.SaveRow(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
/**
......@@ -929,7 +767,7 @@ export default class IBZDeptMemberGridViewBase extends Vue {
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem11_click(params: any = {}, tag?: any, $event?: any) {
public toolbar_tbitem8_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
......@@ -946,7 +784,7 @@ export default class IBZDeptMemberGridViewBase extends Vue {
datas = [params];
}
// 界面行为
this.Print(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
this.Remove(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
/**
......@@ -1095,110 +933,6 @@ export default class IBZDeptMemberGridViewBase extends Vue {
}
/**
* 新建
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof IBZDeptMemberGridViewBase
*/
public New(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (_this.newdata && _this.newdata instanceof Function) {
const data: any = {};
_this.newdata([{ ...data }],[{ ...data }], params, $event, xData);
} else {
_this.$Notice.error({ title: '错误', desc: 'newdata 视图处理逻辑不存在，请添加!' });
}
}
/**
* 编辑
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof IBZDeptMemberGridViewBase
*/
public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
if (args.length === 0) {
return;
}
const _this: any = this;
if (_this.opendata && _this.opendata instanceof Function) {
const data: any = { };
if (args.length > 0) {
Object.assign(data, { ibzdeptmember: args[0].ibzdeptmember })
}
_this.opendata([{ ...data }], params, $event, xData);
} else {
_this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
}
}
/**
* 查看
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof IBZDeptMemberGridViewBase
*/
public View(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
if (args.length === 0) {
return;
}
const _this: any = this;
if (_this.opendata && _this.opendata instanceof Function) {
const data: any = { };
if (args.length > 0) {
Object.assign(data, { ibzdeptmember: args[0].ibzdeptmember })
}
_this.opendata([{ ...data }], params, $event, xData);
} else {
_this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
}
}
/**
* 拷贝
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof IBZDeptMemberGridViewBase
*/
public Copy(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
if (args.length === 0) {
return;
}
const _this: any = this;
if (_this.newdata && _this.newdata instanceof Function) {
const data: any = {};
if (args.length > 0) {
Object.assign(data, { srfsourcekey: args[0].srfkey })
actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
}
_this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
} else if (xData && xData.copy instanceof Function) {
if (args.length > 0) {
actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
}
xData.copy(args[0].srfkey);
} else {
_this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
}
}
/**
* 行编辑
*
......@@ -1236,7 +970,7 @@ export default class IBZDeptMemberGridViewBase extends Vue {
}
}
/**
* 删除
* 保存行
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
......@@ -1246,16 +980,17 @@ export default class IBZDeptMemberGridViewBase extends Vue {
* @param {*} [actionContext] 执行行为上下文
* @memberof IBZDeptMemberGridViewBase
*/
public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public SaveRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
// 界面行为容器对象 _this
const _this: any = this;
if (!xData || !(xData.remove instanceof Function)) {
return ;
if (xData && xData.save instanceof Function) {
xData.save();
} else if (_this.save && _this.save instanceof Function) {
_this.save();
}
xData.remove(args);
}
/**
* 导出
* 删除
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
......@@ -1265,31 +1000,14 @@ export default class IBZDeptMemberGridViewBase extends Vue {
* @param {*} [actionContext] 执行行为上下文
* @memberof IBZDeptMemberGridViewBase
*/
public ExportExcel(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (!xData || !(xData.exportExcel instanceof Function) || !$event) {
return ;
}
xData.exportExcel($event.exportparms);
}
/**
* 打印
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof IBZDeptMemberGridViewBase
*/
public Print(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
let _this:any = this;
if (!xData || !(xData.print instanceof Function) || !$event) {
if (!xData || !(xData.remove instanceof Function)) {
return ;
}
xData.print();
xData.remove(args);
}
/**
* 过滤
*
......
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-base.vue
浏览文件 @ de319d14
......@@ -29,7 +29,67 @@
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.deptname}}</span>
<template v-if="actualIsOpenEdit">
<app-form-item :error="gridItemsModel[$index][column.property].error">
<dropdown-list
v-model="row[column.property]"
:disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1"
:data="row"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
placeholder='请选择...'
style=""
@change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
</dropdown-list>
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='deptname' editorType="DROPDOWNLIST" :value="row.deptname"></app-span>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('postname')">
<el-table-column show-overflow-tooltip :prop="'postname'" :label="$t('entities.ibzdeptmember.main_grid.columns.postname')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibzdeptmember.main_grid.columns.postname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template v-if="actualIsOpenEdit">
<app-form-item :error="gridItemsModel[$index][column.property].error">
<app-picker
:formState="viewState"
:data="row"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1"
name='postname'
deMajorField='postname'
deKeyField='ibzpost'
:service="service"
:acParams="{ serviceName: 'IBZPostService', interfaceName: 'FetchDefault'}"
valueitem='postid'
:value="row[column.property]"
editortype=""
:pickupView="{ viewname: 'ibzpost-pickup-view', title: $t('entities.ibzpost.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'ibzposts', parameterName: 'ibzpost' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
style=""
@formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}">
</app-picker>
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='postname' editorType="PICKER" :value="row.postname"></app-span>
</template>
</template>
</el-table-column>
</template>
......@@ -41,7 +101,35 @@
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.personname}}</span>
<template v-if="actualIsOpenEdit">
<app-form-item :error="gridItemsModel[$index][column.property].error">
<app-picker
:formState="viewState"
:data="row"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1"
name='personname'
deMajorField='personname'
deKeyField='ibzemployee'
:service="service"
:acParams="{ serviceName: 'IBZEmployeeService', interfaceName: 'FetchDefault'}"
valueitem='userid'
:value="row[column.property]"
editortype=""
:pickupView="{ viewname: 'ibzemployee-pickup-view', title: $t('entities.ibzemployee.views.pickupview.title'), deResParameters: [{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' }, ], parameters: [{ pathName: 'ibzemployees', parameterName: 'ibzemployee' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
style=""
@formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}">
</app-picker>
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='personname' editorType="PICKER" :value="row.personname"></app-span>
</template>
</template>
</el-table-column>
</template>
......@@ -53,7 +141,76 @@
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.deptid}}</span>
<template v-if="actualIsOpenEdit">
<app-form-item :error="gridItemsModel[$index][column.property].error">
<input-box
:disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1"
v-model="row[column.property]"
style=""
type="text"
@change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
</input-box>
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='deptid' editorType="HIDDEN" :value="row.deptid"></app-span>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('postid')">
<el-table-column show-overflow-tooltip :prop="'postid'" :label="$t('entities.ibzdeptmember.main_grid.columns.postid')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibzdeptmember.main_grid.columns.postid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template v-if="actualIsOpenEdit">
<app-form-item :error="gridItemsModel[$index][column.property].error">
<input-box
:disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1"
v-model="row[column.property]"
style=""
type="text"
@change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
</input-box>
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='postid' editorType="HIDDEN" :value="row.postid"></app-span>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('userid')">
<el-table-column show-overflow-tooltip :prop="'userid'" :label="$t('entities.ibzdeptmember.main_grid.columns.userid')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibzdeptmember.main_grid.columns.userid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template v-if="actualIsOpenEdit">
<app-form-item :error="gridItemsModel[$index][column.property].error">
<input-box
:disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1"
v-model="row[column.property]"
style=""
type="text"
@change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
</input-box>
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='userid' editorType="HIDDEN" :value="row.userid"></app-span>
</template>
</template>
</el-table-column>
</template>
......@@ -550,7 +707,15 @@ export default class MainBase extends Vue implements ControlInterface {
langtag: 'entities.ibzdeptmember.main_grid.columns.deptname',
show: true,
util: 'PX',
isEnableRowEdit: false,
isEnableRowEdit: true,
},
{
name: 'postname',
label: '岗位名称',
langtag: 'entities.ibzdeptmember.main_grid.columns.postname',
show: true,
util: 'PX',
isEnableRowEdit: true,
},
{
name: 'personname',
......@@ -558,7 +723,7 @@ export default class MainBase extends Vue implements ControlInterface {
langtag: 'entities.ibzdeptmember.main_grid.columns.personname',
show: true,
util: 'PX',
isEnableRowEdit: false,
isEnableRowEdit: true,
},
{
name: 'deptid',
......@@ -566,7 +731,23 @@ export default class MainBase extends Vue implements ControlInterface {
langtag: 'entities.ibzdeptmember.main_grid.columns.deptid',
show: false,
util: 'PX',
isEnableRowEdit: false,
isEnableRowEdit: true,
},
{
name: 'postid',
label: '岗位标识',
langtag: 'entities.ibzdeptmember.main_grid.columns.postid',
show: false,
util: 'PX',
isEnableRowEdit: true,
},
{
name: 'userid',
label: '用户标识',
langtag: 'entities.ibzdeptmember.main_grid.columns.userid',
show: false,
util: 'PX',
isEnableRowEdit: true,
},
]
......@@ -586,6 +767,12 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public getGridRowModel(){
return {
postid: new FormItemModel(),
deptid: new FormItemModel(),
postname: new FormItemModel(),
userid: new FormItemModel(),
personname: new FormItemModel(),
deptname: new FormItemModel(),
srfkey: new FormItemModel(),
}
}
......@@ -597,6 +784,30 @@ 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' },
],
deptid: [
{ 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' },
],
deptname: [
{ 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/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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或