提交 e9f748d1 编写于 作者: ibizdev's avatar ibizdev

ibizdev提交

上级 9cd1ae26
......@@ -1116,7 +1116,12 @@ export default class IBZDictItemGridViewBase extends Vue {
if(args.length >0){
Object.assign(curViewParam,args[0]);
}
const deResParameters: any[] = [];
let deResParameters: any[] = [];
if(curViewParam.ibzdict && true){
deResParameters = [
{ pathName: 'ibzdicts', parameterName: 'ibzdict' },
]
}
const parameters: any[] = [
{ pathName: 'ibzdictitems', parameterName: 'ibzdictitem' },
{ pathName: 'editview', parameterName: 'editview' },
......@@ -1148,7 +1153,12 @@ export default class IBZDictItemGridViewBase extends Vue {
if(args.length >0){
Object.assign(curViewParam,args[0]);
}
const deResParameters: any[] = [];
let deResParameters: any[] = [];
if(curViewParam.ibzdict && true){
deResParameters = [
{ pathName: 'ibzdicts', parameterName: 'ibzdict' },
]
}
const parameters: any[] = [
{ pathName: 'ibzdictitems', parameterName: 'ibzdictitem' },
{ pathName: 'editview', parameterName: 'editview' },
......
......@@ -1138,7 +1138,12 @@ export default class IBZDepartmentGridViewBase extends Vue {
if(args.length >0){
Object.assign(curViewParam,args[0]);
}
const deResParameters: any[] = [];
let deResParameters: any[] = [];
if(curViewParam.ibzorganization && true){
deResParameters = [
{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
]
}
const parameters: any[] = [
{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
];
......@@ -1182,7 +1187,12 @@ export default class IBZDepartmentGridViewBase extends Vue {
if(args.length >0){
Object.assign(curViewParam,args[0]);
}
const deResParameters: any[] = [];
let deResParameters: any[] = [];
if(curViewParam.ibzorganization && true){
deResParameters = [
{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
]
}
const parameters: any[] = [
{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
];
......
......@@ -1178,7 +1178,12 @@ export default class IBZEmployeeGridViewBase extends Vue {
if(args.length >0){
Object.assign(curViewParam,args[0]);
}
const deResParameters: any[] = [];
let deResParameters: any[] = [];
if(curViewParam.ibzdepartment && true){
deResParameters = [
{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
]
}
const parameters: any[] = [
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' },
];
......@@ -1222,7 +1227,12 @@ export default class IBZEmployeeGridViewBase extends Vue {
if(args.length >0){
Object.assign(curViewParam,args[0]);
}
const deResParameters: any[] = [];
let deResParameters: any[] = [];
if(curViewParam.ibzdepartment && true){
deResParameters = [
{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
]
}
const parameters: any[] = [
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' },
];
......
.ibzorganization-option-view{
position: relative;
}
.view-container {
.view-card {
.ivu-card-body {
.content-container{
height: calc(100% - 64px);
}
}
}
}
\ No newline at end of file
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import IBZOrganizationOptionViewBase from './ibzorganization-option-view-base.vue';
import view_form from '@widgets/ibzorganization/new-form-form/new-form-form.vue';
@Component({
components: {
view_form,
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class IBZOrganizationOptionView extends IBZOrganizationOptionViewBase {
}
</script>
\ No newline at end of file
......@@ -1144,7 +1144,12 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
if(args.length >0){
Object.assign(curViewParam,args[0]);
}
const deResParameters: any[] = [];
let deResParameters: any[] = [];
if(curViewParam.sys_permission && true){
deResParameters = [
{ pathName: 'sys_permissions', parameterName: 'sys_permission' },
]
}
const parameters: any[] = [
{ pathName: 'sys_role_permissions', parameterName: 'sys_role_permission' },
{ pathName: 'editview', parameterName: 'editview' },
......
......@@ -1144,7 +1144,12 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
if(args.length >0){
Object.assign(curViewParam,args[0]);
}
const deResParameters: any[] = [];
let deResParameters: any[] = [];
if(curViewParam.sys_role && true){
deResParameters = [
{ pathName: 'sys_roles', parameterName: 'sys_role' },
]
}
const parameters: any[] = [
{ pathName: 'sys_user_roles', parameterName: 'sys_user_role' },
{ pathName: 'editview', parameterName: 'editview' },
......
......@@ -48,6 +48,9 @@ export default class IBZDepartmentServiceBase extends EntityService {
* @memberof IBZDepartmentServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && context.ibzdepartment){
return Http.getInstance().get(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/select`,isloading);
}
return Http.getInstance().get(`/ibzdepartments/${context.ibzdepartment}/select`,isloading);
}
......@@ -61,9 +64,28 @@ export default class IBZDepartmentServiceBase extends EntityService {
* @memberof IBZDepartmentServiceBase
*/
public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && context.ibzdepartment){
return Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/save`,data,isloading);
}
let masterData:any = {};
let ibzemployeesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees'),'undefined')){
ibzemployeesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees') as any);
if(ibzemployeesData && ibzemployeesData.length && ibzemployeesData.length > 0){
ibzemployeesData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.userid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzemployees = ibzemployeesData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzdepartments/${context.ibzdepartment}/save`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
return res;
}
......@@ -77,7 +99,11 @@ export default class IBZDepartmentServiceBase extends EntityService {
* @memberof IBZDepartmentServiceBase
*/
public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && context.ibzdepartment){
return Http.getInstance().get(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}`,isloading);
}
let res:any = await Http.getInstance().get(`/ibzdepartments/${context.ibzdepartment}`,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
return res;
}
......@@ -92,6 +118,9 @@ export default class IBZDepartmentServiceBase extends EntityService {
* @memberof IBZDepartmentServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && context.ibzdepartment){
return Http.getInstance().delete(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}`,isloading);
}
return Http.getInstance().delete(`/ibzdepartments/${context.ibzdepartment}`,isloading);
}
......@@ -106,6 +135,9 @@ export default class IBZDepartmentServiceBase extends EntityService {
* @memberof IBZDepartmentServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && context.ibzdepartment){
return Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}/checkkey`,data,isloading);
}
return Http.getInstance().post(`/ibzdepartments/${context.ibzdepartment}/checkkey`,data,isloading);
}
......@@ -119,9 +151,28 @@ export default class IBZDepartmentServiceBase extends EntityService {
* @memberof IBZDepartmentServiceBase
*/
public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && context.ibzdepartment){
return Http.getInstance().put(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/${context.ibzdepartment}`,data,isloading);
}
let masterData:any = {};
let ibzemployeesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees'),'undefined')){
ibzemployeesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees') as any);
if(ibzemployeesData && ibzemployeesData.length && ibzemployeesData.length > 0){
ibzemployeesData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.userid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzemployees = ibzemployeesData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/ibzdepartments/${context.ibzdepartment}`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
return res;
}
......@@ -135,7 +186,31 @@ export default class IBZDepartmentServiceBase extends EntityService {
* @memberof IBZDepartmentServiceBase
*/
public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && true){
if(!data.srffrontuf || data.srffrontuf !== "1"){
data[this.APPDEKEY] = null;
}
if(data.srffrontuf){
delete data.srffrontuf;
}
return Http.getInstance().post(`/ibzorganizations/${context.ibzorganization}/ibzdepartments`,data,isloading);
}
let masterData:any = {};
let ibzemployeesData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees'),'undefined')){
ibzemployeesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzemployees') as any);
if(ibzemployeesData && ibzemployeesData.length && ibzemployeesData.length > 0){
ibzemployeesData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.userid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzemployees = ibzemployeesData;
Object.assign(data,masterData);
if(!data.srffrontuf || data.srffrontuf !== "1"){
data[this.APPDEKEY] = null;
......@@ -145,6 +220,7 @@ export default class IBZDepartmentServiceBase extends EntityService {
}
let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/ibzdepartments`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
return res;
}
......@@ -158,8 +234,12 @@ export default class IBZDepartmentServiceBase extends EntityService {
* @memberof IBZDepartmentServiceBase
*/
public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && true){
return Http.getInstance().get(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/getdraft`,isloading);
}
let res:any = await Http.getInstance().get(`/ibzdepartments/getdraft`,isloading);
res.data.ibzdepartment = data.ibzdepartment;
this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
return res;
}
......@@ -173,6 +253,10 @@ export default class IBZDepartmentServiceBase extends EntityService {
* @memberof IBZDepartmentServiceBase
*/
public async FetchCurDept(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && true){
let tempData:any = JSON.parse(JSON.stringify(data));
return Http.getInstance().get(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/fetchcurdept`,tempData,isloading);
}
let tempData:any = JSON.parse(JSON.stringify(data));
return Http.getInstance().get(`/ibzdepartments/fetchcurdept`,tempData,isloading);
}
......@@ -187,6 +271,10 @@ export default class IBZDepartmentServiceBase extends EntityService {
* @memberof IBZDepartmentServiceBase
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzorganization && true){
let tempData:any = JSON.parse(JSON.stringify(data));
return Http.getInstance().get(`/ibzorganizations/${context.ibzorganization}/ibzdepartments/fetchdefault`,tempData,isloading);
}
let tempData:any = JSON.parse(JSON.stringify(data));
return Http.getInstance().get(`/ibzdepartments/fetchdefault`,tempData,isloading);
}
......
......@@ -48,6 +48,9 @@ export default class IBZDictItemServiceBase extends EntityService {
* @memberof IBZDictItemServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzdict && context.ibzdictitem){
return Http.getInstance().get(`/ibzdicts/${context.ibzdict}/ibzdictitems/${context.ibzdictitem}/select`,isloading);
}
return Http.getInstance().get(`/ibzdictitems/${context.ibzdictitem}/select`,isloading);
}
......@@ -61,6 +64,9 @@ export default class IBZDictItemServiceBase extends EntityService {
* @memberof IBZDictItemServiceBase
*/
public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzdict && context.ibzdictitem){
return Http.getInstance().put(`/ibzdicts/${context.ibzdict}/ibzdictitems/${context.ibzdictitem}`,data,isloading);
}
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/ibzdictitems/${context.ibzdictitem}`,data,isloading);
......@@ -77,6 +83,9 @@ export default class IBZDictItemServiceBase extends EntityService {
* @memberof IBZDictItemServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzdict && context.ibzdictitem){
return Http.getInstance().post(`/ibzdicts/${context.ibzdict}/ibzdictitems/${context.ibzdictitem}/checkkey`,data,isloading);
}
return Http.getInstance().post(`/ibzdictitems/${context.ibzdictitem}/checkkey`,data,isloading);
}
......@@ -90,6 +99,9 @@ export default class IBZDictItemServiceBase extends EntityService {
* @memberof IBZDictItemServiceBase
*/
public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzdict && context.ibzdictitem){
return Http.getInstance().post(`/ibzdicts/${context.ibzdict}/ibzdictitems/${context.ibzdictitem}/save`,data,isloading);
}
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzdictitems/${context.ibzdictitem}/save`,data,isloading);
......@@ -106,6 +118,9 @@ export default class IBZDictItemServiceBase extends EntityService {
* @memberof IBZDictItemServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzdict && context.ibzdictitem){
return Http.getInstance().delete(`/ibzdicts/${context.ibzdict}/ibzdictitems/${context.ibzdictitem}`,isloading);
}
return Http.getInstance().delete(`/ibzdictitems/${context.ibzdictitem}`,isloading);
}
......@@ -120,6 +135,9 @@ export default class IBZDictItemServiceBase extends EntityService {
* @memberof IBZDictItemServiceBase
*/
public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzdict && context.ibzdictitem){
return Http.getInstance().get(`/ibzdicts/${context.ibzdict}/ibzdictitems/${context.ibzdictitem}`,isloading);
}
let res:any = await Http.getInstance().get(`/ibzdictitems/${context.ibzdictitem}`,isloading);
return res;
......@@ -135,6 +153,15 @@ export default class IBZDictItemServiceBase extends EntityService {
* @memberof IBZDictItemServiceBase
*/
public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzdict && true){
if(!data.srffrontuf || data.srffrontuf !== "1"){
data[this.APPDEKEY] = null;
}
if(data.srffrontuf){
delete data.srffrontuf;
}
return Http.getInstance().post(`/ibzdicts/${context.ibzdict}/ibzdictitems`,data,isloading);
}
let masterData:any = {};
Object.assign(data,masterData);
if(!data.srffrontuf || data.srffrontuf !== "1"){
......@@ -158,6 +185,9 @@ export default class IBZDictItemServiceBase extends EntityService {
* @memberof IBZDictItemServiceBase
*/
public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzdict && true){
return Http.getInstance().get(`/ibzdicts/${context.ibzdict}/ibzdictitems/getdraft`,isloading);
}
let res:any = await Http.getInstance().get(`/ibzdictitems/getdraft`,isloading);
res.data.ibzdictitem = data.ibzdictitem;
return res;
......@@ -173,6 +203,10 @@ export default class IBZDictItemServiceBase extends EntityService {
* @memberof IBZDictItemServiceBase
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.ibzdict && true){
let tempData:any = JSON.parse(JSON.stringify(data));
return Http.getInstance().get(`/ibzdicts/${context.ibzdict}/ibzdictitems/fetchdefault`,tempData,isloading);
}
let tempData:any = JSON.parse(JSON.stringify(data));
return Http.getInstance().get(`/ibzdictitems/fetchdefault`,tempData,isloading);
}
......
......@@ -84,6 +84,16 @@ export const viewstate: any = {
'a93a129850b81c3c921aa1911ec9eb8c',
],
},
{
viewtag: '2ed85bebb69b8d23388420b95163228a',
viewmodule: 'ou',
viewname: 'IBZOrganizationOptionView',
viewaction: '',
viewdatachange: false,
refviews: [
'ccff36439eacae953f85ff636c9dac74',
],
},
{
viewtag: '32fe9ab4a9e1b8d62b9ee802e4746965',
viewmodule: 'uaa',
......
......@@ -121,6 +121,11 @@ export default class IBZDepartmentUIServiceBase extends UIService {
Object.assign(data,parentObj);
Object.assign(context,parentObj);
let deResParameters: any[] = [];
if(context.ibzorganization && true){
deResParameters = [
{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
]
}
const parameters: any[] = [
{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
];
......@@ -172,6 +177,11 @@ export default class IBZDepartmentUIServiceBase extends UIService {
Object.assign(data,parentObj);
Object.assign(context,parentObj);
let deResParameters: any[] = [];
if(context.ibzorganization && true){
deResParameters = [
{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
]
}
const parameters: any[] = [
{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
];
......
......@@ -32,7 +32,7 @@
valueitem='pdeptid'
:value="data.pdeptname"
editortype=""
:pickupView="{ viewname: 'ibzdepartment-pickup-view', title: $t('entities.ibzdepartment.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
:pickupView="{ viewname: 'ibzdepartment-pickup-view', title: $t('entities.ibzdepartment.views.pickupview.title'), deResParameters: [{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' }, ], parameters: [{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
style=""
@formitemvaluechange="onFormItemValueChange">
</app-picker>
......
......@@ -264,7 +264,7 @@ export default class MainService extends ControlService {
if(response.data){
Object.assign(response.data,{srfuf:'0'});
//仿真主键数据
response.data.ibzdepartment = Util.createUUID();
response.data.deptid = Util.createUUID();
}
this.handleResponse(action, response, true);
this.mergeDefaults(response);
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册