lab_qyk 部署微服务应用

app_Web/src/locale/lanres/entities/ibzdepartment/ibzdepartment_en_US.ts

@@ -49,10 +49,9 @@ export default {
       		title: "Restart workflow",
 		},
 	},
-	newform_form: {
+	main_form: {
 		details: {
-			group1: "部门基本信息", 
-			formpage1: "基本信息", 
+			formpage1: "Grid View", 
 			srfupdatedate: "The [{0}] value is not a character type", 
 			srforikey: "", 
 			srfkey: "decimal", 
@@ -61,21 +60,29 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
+			deptid: "decimal", 
 			deptcode: "Cancel", 
 			deptname: "{0}/P", 
-			orgid: "单位", 
 			orgname: "单位", 
-			pdeptid: "上级部门", 
 			pdeptname: "上级部门", 
-			enable: "After the [{0}] is executed, no subsequent nodes are specified", 
-			deptid: "decimal", 
+			orgid: "单位", 
+			pdeptid: "上级部门", 
+			shortname: "Others", 
+			bcode: "Condition", 
+			deptlevel: "部门级别", 
+			leaderid: "分管领导标识", 
+			leadername: "分管领导", 
+			showorder: "排序", 
+			createdate: "{0}[{1}] relational data [{2}] cannot be deleted!", 
+			updatedate: "The [{0}] value is not a character type", 
 		},
 		uiactions: {
 		},
 	},
-	main_form: {
+	newform_form: {
 		details: {
-			formpage1: "Grid View", 
+			group1: "部门基本信息", 
+			formpage1: "基本信息", 
 			srfupdatedate: "The [{0}] value is not a character type", 
 			srforikey: "", 
 			srfkey: "decimal", 
@@ -84,21 +91,14 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			deptid: "decimal", 
 			deptcode: "Cancel", 
 			deptname: "{0}/P", 
-			orgname: "单位", 
-			pdeptname: "上级部门", 
 			orgid: "单位", 
+			orgname: "单位", 
 			pdeptid: "上级部门", 
-			shortname: "Others", 
-			bcode: "Condition", 
-			deptlevel: "部门级别", 
-			leaderid: "分管领导标识", 
-			leadername: "分管领导", 
-			showorder: "排序", 
-			createdate: "{0}[{1}] relational data [{2}] cannot be deleted!", 
-			updatedate: "The [{0}] value is not a character type", 
+			pdeptname: "上级部门", 
+			enable: "After the [{0}] is executed, no subsequent nodes are specified", 
+			deptid: "decimal", 
 		},
 		uiactions: {
 		},
@@ -135,29 +135,7 @@ export default {
 		uiactions: {
 		},
 	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "Save",
-			tip: "Save",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-	},
 	gridviewtoolbar_toolbar: {
-		tbitem1_opennewcreateview: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem2: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem3: {
 			caption: "New",
 			tip: "New",
@@ -211,6 +189,20 @@ export default {
 			tip: "Filter",
 		},
 	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "Save",
+			tip: "Save",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+	},
 	depttree_treeview: {
 		nodes: {
 			root: "默认根节点",

app_Web/src/locale/lanres/entities/ibzdepartment/ibzdepartment_zh_CN.ts

@@ -48,9 +48,8 @@ export default {
       		title: "部门选择表格视图",
 		},
 	},
-	newform_form: {
+	main_form: {
 		details: {
-			group1: "部门基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "最后修改时间", 
 			srforikey: "", 
@@ -60,20 +59,28 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
+			deptid: "部门标识", 
 			deptcode: "部门代码", 
 			deptname: "部门名称", 
-			orgid: "单位", 
 			orgname: "单位", 
-			pdeptid: "上级部门", 
 			pdeptname: "上级部门", 
-			enable: "逻辑有效", 
-			deptid: "部门标识", 
+			orgid: "单位", 
+			pdeptid: "上级部门", 
+			shortname: "部门简称", 
+			bcode: "业务编码", 
+			deptlevel: "部门级别", 
+			leaderid: "分管领导标识", 
+			leadername: "分管领导", 
+			showorder: "排序", 
+			createdate: "创建时间", 
+			updatedate: "最后修改时间", 
 		},
 		uiactions: {
 		},
 	},
-	main_form: {
+	newform_form: {
 		details: {
+			group1: "部门基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "最后修改时间", 
 			srforikey: "", 
@@ -83,21 +90,14 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			deptid: "部门标识", 
 			deptcode: "部门代码", 
 			deptname: "部门名称", 
-			orgname: "单位", 
-			pdeptname: "上级部门", 
 			orgid: "单位", 
+			orgname: "单位", 
 			pdeptid: "上级部门", 
-			shortname: "部门简称", 
-			bcode: "业务编码", 
-			deptlevel: "部门级别", 
-			leaderid: "分管领导标识", 
-			leadername: "分管领导", 
-			showorder: "排序", 
-			createdate: "创建时间", 
-			updatedate: "最后修改时间", 
+			pdeptname: "上级部门", 
+			enable: "逻辑有效", 
+			deptid: "部门标识", 
 		},
 		uiactions: {
 		},
@@ -134,29 +134,7 @@ export default {
 		uiactions: {
 		},
 	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "保存",
-			tip: "保存",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-	},
 	gridviewtoolbar_toolbar: {
-		tbitem1_opennewcreateview: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem2: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem3: {
 			caption: "新建",
 			tip: "新建",
@@ -210,6 +188,20 @@ export default {
 			tip: "过滤",
 		},
 	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "保存",
+			tip: "保存",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+	},
 	depttree_treeview: {
 		nodes: {
 			root: "默认根节点",

app_Web/src/locale/lanres/entities/ibzemployee/ibzemployee_en_US.ts

@@ -115,9 +115,9 @@ export default {
 		uiactions: {
 		},
 	},
-	newform_form: {
+	changepw_form: {
 		details: {
-			group1: "人员基本信息", 
+			group1: "密码信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "Actor", 
 			srforikey: "", 
@@ -127,25 +127,17 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			usercode: "用户工号", 
-			personname: "姓名", 
-			loginname: "登录名", 
-			orgname: "单位", 
-			orgid: "单位", 
-			orgcode: "单位代码", 
-			mdeptname: "部门", 
-			mdeptcode: "主部门代码", 
-			mdeptid: "主部门", 
-			enable: "the workflow instance current processing step is invalid", 
-			bcode: "业务编码", 
+			oldpasswd: "原始密码", 
+			newpasswd: "新密码", 
+			cfmpasswd: "新密码确认", 
 			userid: "用户标识", 
 		},
 		uiactions: {
 		},
 	},
-	changepw_form: {
+	newform_form: {
 		details: {
-			group1: "密码信息", 
+			group1: "人员基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "Actor", 
 			srforikey: "", 
@@ -155,9 +147,17 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			oldpasswd: "原始密码", 
-			newpasswd: "新密码", 
-			cfmpasswd: "新密码确认", 
+			usercode: "用户工号", 
+			personname: "姓名", 
+			loginname: "登录名", 
+			orgname: "单位", 
+			orgid: "单位", 
+			orgcode: "单位代码", 
+			mdeptname: "部门", 
+			mdeptcode: "主部门代码", 
+			mdeptid: "主部门", 
+			enable: "the workflow instance current processing step is invalid", 
+			bcode: "业务编码", 
 			userid: "用户标识", 
 		},
 		uiactions: {
@@ -205,14 +205,6 @@ export default {
 		},
 	},
 	gridviewtoolbar_toolbar: {
-		tbitem1_opennewcreateview: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem2: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem3: {
 			caption: "New",
 			tip: "New",

app_Web/src/locale/lanres/entities/ibzemployee/ibzemployee_zh_CN.ts

@@ -114,9 +114,9 @@ export default {
 		uiactions: {
 		},
 	},
-	newform_form: {
+	changepw_form: {
 		details: {
-			group1: "人员基本信息", 
+			group1: "密码信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "最后修改时间", 
 			srforikey: "", 
@@ -126,25 +126,17 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			usercode: "用户工号", 
-			personname: "姓名", 
-			loginname: "登录名", 
-			orgname: "单位", 
-			orgid: "单位", 
-			orgcode: "单位代码", 
-			mdeptname: "部门", 
-			mdeptcode: "主部门代码", 
-			mdeptid: "主部门", 
-			enable: "逻辑有效", 
-			bcode: "业务编码", 
+			oldpasswd: "原始密码", 
+			newpasswd: "新密码", 
+			cfmpasswd: "新密码确认", 
 			userid: "用户标识", 
 		},
 		uiactions: {
 		},
 	},
-	changepw_form: {
+	newform_form: {
 		details: {
-			group1: "密码信息", 
+			group1: "人员基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "最后修改时间", 
 			srforikey: "", 
@@ -154,9 +146,17 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			oldpasswd: "原始密码", 
-			newpasswd: "新密码", 
-			cfmpasswd: "新密码确认", 
+			usercode: "用户工号", 
+			personname: "姓名", 
+			loginname: "登录名", 
+			orgname: "单位", 
+			orgid: "单位", 
+			orgcode: "单位代码", 
+			mdeptname: "部门", 
+			mdeptcode: "主部门代码", 
+			mdeptid: "主部门", 
+			enable: "逻辑有效", 
+			bcode: "业务编码", 
 			userid: "用户标识", 
 		},
 		uiactions: {
@@ -204,14 +204,6 @@ export default {
 		},
 	},
 	gridviewtoolbar_toolbar: {
-		tbitem1_opennewcreateview: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem2: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem3: {
 			caption: "新建",
 			tip: "新建",

app_Web/src/locale/lanres/entities/ibzorganization/ibzorganization_en_US.ts

@@ -129,14 +129,6 @@ export default {
 		},
 	},
 	gridviewtoolbar_toolbar: {
-		tbitem1_opennewcreateview: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem2: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem3: {
 			caption: "New",
 			tip: "New",

app_Web/src/locale/lanres/entities/ibzorganization/ibzorganization_zh_CN.ts

@@ -128,14 +128,6 @@ export default {
 		},
 	},
 	gridviewtoolbar_toolbar: {
-		tbitem1_opennewcreateview: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem2: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem3: {
 			caption: "新建",
 			tip: "新建",

app_Web/src/pages/ou/ibzdepartment-grid-view/ibzdepartment-grid-view-base.vue

@@ -10,13 +10,6 @@
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
-                                <i-button v-show="toolBarModels.tbitem1_opennewcreateview.visabled" :disabled="toolBarModels.tbitem1_opennewcreateview.disabled" class='' @click="toolbar_click({ tag: 'tbitem1_opennewcreateview' }, $event)">
-                                    <i class=''></i>
-                                    <span class='caption'>{{$t('entities.ibzdepartment.gridviewtoolbar_toolbar.tbitem1_opennewcreateview.caption')}}</span>
-                                </i-button>
-                            <div slot='content'>{{$t('entities.ibzdepartment.gridviewtoolbar_toolbar.tbitem1_opennewcreateview.tip')}}</div>
-                        </tooltip>
-                        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
                                 <i-button v-show="toolBarModels.tbitem3.visabled" :disabled="toolBarModels.tbitem3.disabled" class='' @click="toolbar_click({ tag: 'tbitem3' }, $event)">
                                     <i class='fa fa-file-text-o'></i>
                                     <span class='caption'>{{$t('entities.ibzdepartment.gridviewtoolbar_toolbar.tbitem3.caption')}}</span>
@@ -352,9 +345,6 @@ export default class IBZDepartmentGridViewBase extends Vue {
      * @memberof IBZDepartmentGridView
      */
     public toolBarModels: any = {
-        tbitem1_opennewcreateview: { name: 'tbitem1_opennewcreateview', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'OpenNewCreateView', target: 'NONE' } },
-
-        tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem3: { name: 'tbitem3', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
@@ -693,9 +683,6 @@ export default class IBZDepartmentGridViewBase extends Vue {
      * @memberof IBZDepartmentGridViewBase
      */
     public toolbar_click($event: any, $event2?: any) {
-        if (Object.is($event.tag, 'tbitem1_opennewcreateview')) {
-            this.toolbar_tbitem1_opennewcreateview_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
@@ -835,35 +822,6 @@ export default class IBZDepartmentGridViewBase extends Vue {
 
 
 
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public toolbar_tbitem1_opennewcreateview_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];
-        }
-        // 界面行为
-        const curUIService:IBZDepartmentUIService  = new IBZDepartmentUIService();
-        curUIService.IBZDepartment_OpenNewCreateView(datas,contextJO, paramJO,  $event, xData,this,"IBZDepartment");
-    }
-
     /**
      * 逻辑事件
      *

app_Web/src/pages/ou/ibzemployee-grid-view/ibzemployee-grid-view-base.vue

@@ -10,13 +10,6 @@
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
-                                <i-button v-show="toolBarModels.tbitem1_opennewcreateview.visabled" :disabled="toolBarModels.tbitem1_opennewcreateview.disabled" class='' @click="toolbar_click({ tag: 'tbitem1_opennewcreateview' }, $event)">
-                                    <i class=''></i>
-                                    <span class='caption'>{{$t('entities.ibzemployee.gridviewtoolbar_toolbar.tbitem1_opennewcreateview.caption')}}</span>
-                                </i-button>
-                            <div slot='content'>{{$t('entities.ibzemployee.gridviewtoolbar_toolbar.tbitem1_opennewcreateview.tip')}}</div>
-                        </tooltip>
-                        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
                                 <i-button v-show="toolBarModels.tbitem3.visabled" :disabled="toolBarModels.tbitem3.disabled" class='' @click="toolbar_click({ tag: 'tbitem3' }, $event)">
                                     <i class='fa fa-file-text-o'></i>
                                     <span class='caption'>{{$t('entities.ibzemployee.gridviewtoolbar_toolbar.tbitem3.caption')}}</span>
@@ -359,9 +352,6 @@ export default class IBZEmployeeGridViewBase extends Vue {
      * @memberof IBZEmployeeGridView
      */
     public toolBarModels: any = {
-        tbitem1_opennewcreateview: { name: 'tbitem1_opennewcreateview', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'OpenNewCreateView', target: 'NONE' } },
-
-        tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem3: { name: 'tbitem3', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
@@ -703,9 +693,6 @@ export default class IBZEmployeeGridViewBase extends Vue {
      * @memberof IBZEmployeeGridViewBase
      */
     public toolbar_click($event: any, $event2?: any) {
-        if (Object.is($event.tag, 'tbitem1_opennewcreateview')) {
-            this.toolbar_tbitem1_opennewcreateview_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
@@ -848,35 +835,6 @@ export default class IBZEmployeeGridViewBase extends Vue {
 
 
 
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public toolbar_tbitem1_opennewcreateview_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];
-        }
-        // 界面行为
-        const curUIService:IBZEmployeeUIService  = new IBZEmployeeUIService();
-        curUIService.IBZEmployee_OpenNewCreateView(datas,contextJO, paramJO,  $event, xData,this,"IBZEmployee");
-    }
-
     /**
      * 逻辑事件
      *

app_Web/src/pages/ou/ibzorganization-grid-view/ibzorganization-grid-view-base.vue

@@ -13,13 +13,6 @@
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
-                                <i-button v-show="toolBarModels.tbitem1_opennewcreateview.visabled" :disabled="toolBarModels.tbitem1_opennewcreateview.disabled" class='' @click="toolbar_click({ tag: 'tbitem1_opennewcreateview' }, $event)">
-                                    <i class=''></i>
-                                    <span class='caption'>{{$t('entities.ibzorganization.gridviewtoolbar_toolbar.tbitem1_opennewcreateview.caption')}}</span>
-                                </i-button>
-                            <div slot='content'>{{$t('entities.ibzorganization.gridviewtoolbar_toolbar.tbitem1_opennewcreateview.tip')}}</div>
-                        </tooltip>
-                        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
                                 <i-button v-show="toolBarModels.tbitem3.visabled" :disabled="toolBarModels.tbitem3.disabled" class='' @click="toolbar_click({ tag: 'tbitem3' }, $event)">
                                     <i class='fa fa-file-text-o'></i>
                                     <span class='caption'>{{$t('entities.ibzorganization.gridviewtoolbar_toolbar.tbitem3.caption')}}</span>
@@ -355,9 +348,6 @@ export default class IBZOrganizationGridViewBase extends Vue {
      * @memberof IBZOrganizationGridView
      */
     public toolBarModels: any = {
-        tbitem1_opennewcreateview: { name: 'tbitem1_opennewcreateview', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'OpenNewCreateView', target: 'NONE' } },
-
-        tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem3: { name: 'tbitem3', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
@@ -696,9 +686,6 @@ export default class IBZOrganizationGridViewBase extends Vue {
      * @memberof IBZOrganizationGridViewBase
      */
     public toolbar_click($event: any, $event2?: any) {
-        if (Object.is($event.tag, 'tbitem1_opennewcreateview')) {
-            this.toolbar_tbitem1_opennewcreateview_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
@@ -838,35 +825,6 @@ export default class IBZOrganizationGridViewBase extends Vue {
 
 
 
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public toolbar_tbitem1_opennewcreateview_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];
-        }
-        // 界面行为
-        const curUIService:IBZOrganizationUIService  = new IBZOrganizationUIService();
-        curUIService.IBZOrganization_OpenNewCreateView(datas,contextJO, paramJO,  $event, xData,this,"IBZOrganization");
-    }
-
     /**
      * 逻辑事件
      *

app_Web/src/pages/rt/index/page-register.ts

@@ -7,7 +7,6 @@ export const PageComponents = {
         Vue.component('ibzemployee-pickup-grid-view', () => import('@pages/ou/ibzemployee-pickup-grid-view/ibzemployee-pickup-grid-view.vue'));
         Vue.component('ibzpost-pickup-view', () => import('@pages/ou/ibzpost-pickup-view/ibzpost-pickup-view.vue'));
         Vue.component('wfuser-mpickup-view', () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'));
-        Vue.component('ibzemployee-option-view', () => import('@pages/ou/ibzemployee-option-view/ibzemployee-option-view.vue'));
         Vue.component('ibzteam-member-edit-view', () => import('@pages/ou/ibzteam-member-edit-view/ibzteam-member-edit-view.vue'));
         Vue.component('ibzemployee-grid-view', () => import('@pages/ou/ibzemployee-grid-view/ibzemployee-grid-view.vue'));
         Vue.component('sys-user-role-grid-view', () => import('@pages/uaa/sys-user-role-grid-view/sys-user-role-grid-view.vue'));
@@ -20,7 +19,6 @@ export const PageComponents = {
         Vue.component('dict-catalog-edit-view', () => import('@pages/dict/dict-catalog-edit-view/dict-catalog-edit-view.vue'));
         Vue.component('wfprocess-definition-edit-view', () => import('@pages/workflow/wfprocess-definition-edit-view/wfprocess-definition-edit-view.vue'));
         Vue.component('sys-role-edit-view', () => import('@pages/uaa/sys-role-edit-view/sys-role-edit-view.vue'));
-        Vue.component('ibzdepartment-option-view', () => import('@pages/ou/ibzdepartment-option-view/ibzdepartment-option-view.vue'));
         Vue.component('ibzdepartment-mpickup-view', () => import('@pages/ou/ibzdepartment-mpickup-view/ibzdepartment-mpickup-view.vue'));
         Vue.component('ibzpost-edit-view', () => import('@pages/ou/ibzpost-edit-view/ibzpost-edit-view.vue'));
         Vue.component('ibzdepartment-tree-exp-view', () => import('@pages/ou/ibzdepartment-tree-exp-view/ibzdepartment-tree-exp-view.vue'));
@@ -46,7 +44,6 @@ export const PageComponents = {
         Vue.component('ibzdept-member-grid-view', () => import('@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'));
         Vue.component('jobs-info-edit-view', () => import('@pages/task/jobs-info-edit-view/jobs-info-edit-view.vue'));
         Vue.component('ibzdepartment-pickup-grid-view', () => import('@pages/ou/ibzdepartment-pickup-grid-view/ibzdepartment-pickup-grid-view.vue'));
-        Vue.component('ibzorganization-option-view', () => import('@pages/ou/ibzorganization-option-view/ibzorganization-option-view.vue'));
         Vue.component('dict-option-edit-view', () => import('@pages/dict/dict-option-edit-view/dict-option-edit-view.vue'));
         Vue.component('jobs-registry-grid-view', () => import('@pages/task/jobs-registry-grid-view/jobs-registry-grid-view.vue'));
         Vue.component('wfuser-pickup-grid-view', () => import('@pages/workflow/wfuser-pickup-grid-view/wfuser-pickup-grid-view.vue'));

app_Web/src/store/modules/view-action/state.ts

@@ -128,16 +128,6 @@ export const viewstate: any = {
                 '5e88ef37a2da46d66c41c8838d31096b',
             ],
         },
-        {
-            viewtag: '2ed85bebb69b8d23388420b95163228a',
-            viewmodule: 'ou',
-            viewname: 'IBZOrganizationOptionView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                'ccff36439eacae953f85ff636c9dac74',
-            ],
-        },
         {
             viewtag: '323147bb0fc25046ab102674cb1abf21',
             viewmodule: 'ou',
@@ -194,7 +184,6 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 '119fe650e7efd26bd14bd413cae37ded',
-                '9cf7a70099bff83a10f6ae65c4d54692',
             ],
         },
         {
@@ -353,7 +342,6 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 '90c0ced2720b85d5e051e7935a93d3c5',
-                '9cdad5e2bed51cdcd90b4b7fb3104a5a',
             ],
         },
         {
@@ -482,28 +470,6 @@ export const viewstate: any = {
             refviews: [
             ],
         },
-        {
-            viewtag: '9cdad5e2bed51cdcd90b4b7fb3104a5a',
-            viewmodule: 'ou',
-            viewname: 'IBZDepartmentOptionView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                '10dd7f45f36233049c4af9ca417089f5',
-                'ccff36439eacae953f85ff636c9dac74',
-            ],
-        },
-        {
-            viewtag: '9cf7a70099bff83a10f6ae65c4d54692',
-            viewmodule: 'ou',
-            viewname: 'IBZEmployeeOptionView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                '10dd7f45f36233049c4af9ca417089f5',
-                'ccff36439eacae953f85ff636c9dac74',
-            ],
-        },
         {
             viewtag: '9ffa35efe3d70cf4b9fa4e83dd1979c6',
             viewmodule: 'ou',
@@ -636,7 +602,6 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '2ed85bebb69b8d23388420b95163228a',
                 '95e33ff2469ba40d3e0c00f5c3f61501',
                 'ccff36439eacae953f85ff636c9dac74',
             ],

app_Web/src/uiservice/ibzdepartment/ibzdepartment-ui-service-base.ts

@@ -114,136 +114,6 @@ export default class IBZDepartmentUIServiceBase extends UIService {
     public initDeMainStateOPPrivsMap(){
     }
 
-    /**
-     * 打开注视图
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} context 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @param {*} [srfParentDeName] 父实体名称
-     * @returns {Promise<any>}
-     */
-    public async IBZDepartment_OpenMainView(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-    
-        let data: any = {};
-        let parentContext:any = {};
-        let parentViewParam:any = {};
-        const _this: any = actionContext;
-        const _args: any[] = Util.deepCopy(args);
-        const actionTarget: string | null = 'SINGLEKEY';
-        Object.assign(context, { ibzdepartment: '%ibzdepartment%' });
-        Object.assign(params, { deptid: '%ibzdepartment%' });
-        Object.assign(params, { deptname: '%deptname%' });
-        if(_this.context){
-            parentContext = _this.context;
-        }
-        if(_this.viewparams){
-            parentViewParam = _this.viewparams;
-        }
-        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
-        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
-        context = Object.assign({},actionContext.context,context);
-        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
-        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' },
-        ];
-            const openDrawer = (view: any, data: any) => {
-                let container: Subject<any> = actionContext.$appdrawer.openDrawer(view, context,data);
-                container.subscribe((result: any) => {
-                    if (!result || !Object.is(result.ret, 'OK')) {
-                        return;
-                    }
-                    const _this: any = actionContext;
-                    return result.datas;
-                });
-            }
-            const view: any = {
-                viewname: 'ibzdepartment-edit-view', 
-                height: 0, 
-                width: 0,  
-                title: actionContext.$t('entities.ibzdepartment.views.editview.title'),
-                placement: 'DRAWER_RIGHT',
-            };
-            openDrawer(view, data);
-    }
-
-    /**
-     * 新建
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} context 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @param {*} [srfParentDeName] 父实体名称
-     * @returns {Promise<any>}
-     */
-    public async IBZDepartment_OpenNewCreateView(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-    
-        let data: any = {};
-        let parentContext:any = {};
-        let parentViewParam:any = {};
-        const _this: any = actionContext;
-        const _args: any[] = Util.deepCopy(args);
-        const actionTarget: string | null = 'NONE';
-        if(_this.context){
-            parentContext = _this.context;
-        }
-        if(_this.viewparams){
-            parentViewParam = _this.viewparams;
-        }
-        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
-        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
-        context = Object.assign({},actionContext.context,context);
-        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
-        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' },
-        ];
-            const openPopupModal = (view: any, data: any) => {
-                let container: Subject<any> = actionContext.$appmodal.openModal(view, context, data);
-                container.subscribe((result: any) => {
-                    if (!result || !Object.is(result.ret, 'OK')) {
-                        return;
-                    }
-                    const _this: any = actionContext;
-                    if (xData && xData.refresh && xData.refresh instanceof Function) {
-                        xData.refresh(args);
-                    }
-                    if (this.IBZDepartment_OpenMainView && this.IBZDepartment_OpenMainView instanceof Function) {
-                        this.IBZDepartment_OpenMainView(result.datas,context, params, $event, xData,actionContext);
-                    }
-                    return result.datas;
-                });
-            }
-            const view: any = {
-                viewname: 'ibzdepartment-option-view', 
-                height: 400, 
-                width: 700,  
-                title: actionContext.$t('entities.ibzdepartment.views.optionview.title'),
-            };
-            openPopupModal(view, data);
-    }
-
 
     /**
      * 获取指定数据的重定向页面

app_Web/src/uiservice/ibzemployee/ibzemployee-ui-service-base.ts

@@ -114,136 +114,6 @@ export default class IBZEmployeeUIServiceBase extends UIService {
     public initDeMainStateOPPrivsMap(){
     }
 
-    /**
-     * 新建
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} context 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @param {*} [srfParentDeName] 父实体名称
-     * @returns {Promise<any>}
-     */
-    public async IBZEmployee_OpenNewCreateView(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-    
-        let data: any = {};
-        let parentContext:any = {};
-        let parentViewParam:any = {};
-        const _this: any = actionContext;
-        const _args: any[] = Util.deepCopy(args);
-        const actionTarget: string | null = 'NONE';
-        if(_this.context){
-            parentContext = _this.context;
-        }
-        if(_this.viewparams){
-            parentViewParam = _this.viewparams;
-        }
-        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
-        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
-        context = Object.assign({},actionContext.context,context);
-        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
-        Object.assign(data,parentObj);
-        Object.assign(context,parentObj);
-        let deResParameters: any[] = [];
-        if(context.ibzdepartment && true){
-            deResParameters = [
-            { pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
-            ]
-        }
-        const parameters: any[] = [
-            { pathName: 'ibzemployees', parameterName: 'ibzemployee' },
-        ];
-            const openPopupModal = (view: any, data: any) => {
-                let container: Subject<any> = actionContext.$appmodal.openModal(view, context, data);
-                container.subscribe((result: any) => {
-                    if (!result || !Object.is(result.ret, 'OK')) {
-                        return;
-                    }
-                    const _this: any = actionContext;
-                    if (xData && xData.refresh && xData.refresh instanceof Function) {
-                        xData.refresh(args);
-                    }
-                    if (this.IBZEmployee_OpenMainView && this.IBZEmployee_OpenMainView instanceof Function) {
-                        this.IBZEmployee_OpenMainView(result.datas,context, params, $event, xData,actionContext);
-                    }
-                    return result.datas;
-                });
-            }
-            const view: any = {
-                viewname: 'ibzemployee-option-view', 
-                height: 450, 
-                width: 700,  
-                title: actionContext.$t('entities.ibzemployee.views.optionview.title'),
-            };
-            openPopupModal(view, data);
-    }
-
-    /**
-     * 打开主视图
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} context 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @param {*} [srfParentDeName] 父实体名称
-     * @returns {Promise<any>}
-     */
-    public async IBZEmployee_OpenMainView(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-    
-        let data: any = {};
-        let parentContext:any = {};
-        let parentViewParam:any = {};
-        const _this: any = actionContext;
-        const _args: any[] = Util.deepCopy(args);
-        const actionTarget: string | null = 'SINGLEKEY';
-        Object.assign(context, { ibzemployee: '%ibzemployee%' });
-        Object.assign(params, { userid: '%ibzemployee%' });
-        Object.assign(params, { personname: '%personname%' });
-        if(_this.context){
-            parentContext = _this.context;
-        }
-        if(_this.viewparams){
-            parentViewParam = _this.viewparams;
-        }
-        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
-        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
-        context = Object.assign({},actionContext.context,context);
-        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
-        Object.assign(data,parentObj);
-        Object.assign(context,parentObj);
-        let deResParameters: any[] = [];
-        if(context.ibzdepartment && true){
-            deResParameters = [
-            { pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
-            ]
-        }
-        const parameters: any[] = [
-            { pathName: 'ibzemployees', parameterName: 'ibzemployee' },
-        ];
-            const openDrawer = (view: any, data: any) => {
-                let container: Subject<any> = actionContext.$appdrawer.openDrawer(view, context,data);
-                container.subscribe((result: any) => {
-                    if (!result || !Object.is(result.ret, 'OK')) {
-                        return;
-                    }
-                    const _this: any = actionContext;
-                    return result.datas;
-                });
-            }
-            const view: any = {
-                viewname: 'ibzemployee-edit-view', 
-                height: 0, 
-                width: 0,  
-                title: actionContext.$t('entities.ibzemployee.views.editview.title'),
-                placement: 'DRAWER_RIGHT',
-            };
-            openDrawer(view, data);
-    }
-
     /**
      * 初始化密码
      *

app_Web/src/uiservice/ibzorganization/ibzorganization-ui-service-base.ts

@@ -113,126 +113,6 @@ export default class IBZOrganizationUIServiceBase extends UIService {
     public initDeMainStateOPPrivsMap(){
     }
 
-    /**
-     * 新建
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} context 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @param {*} [srfParentDeName] 父实体名称
-     * @returns {Promise<any>}
-     */
-    public async IBZOrganization_OpenNewCreateView(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-    
-        let data: any = {};
-        let parentContext:any = {};
-        let parentViewParam:any = {};
-        const _this: any = actionContext;
-        const _args: any[] = Util.deepCopy(args);
-        const actionTarget: string | null = 'NONE';
-        if(_this.context){
-            parentContext = _this.context;
-        }
-        if(_this.viewparams){
-            parentViewParam = _this.viewparams;
-        }
-        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
-        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
-        context = Object.assign({},actionContext.context,context);
-        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
-        Object.assign(data,parentObj);
-        Object.assign(context,parentObj);
-        let deResParameters: any[] = [];
-        const parameters: any[] = [
-            { pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
-        ];
-            const openPopupModal = (view: any, data: any) => {
-                let container: Subject<any> = actionContext.$appmodal.openModal(view, context, data);
-                container.subscribe((result: any) => {
-                    if (!result || !Object.is(result.ret, 'OK')) {
-                        return;
-                    }
-                    const _this: any = actionContext;
-                    if (xData && xData.refresh && xData.refresh instanceof Function) {
-                        xData.refresh(args);
-                    }
-                    if (this.IBZOrganization_OpenMainView && this.IBZOrganization_OpenMainView instanceof Function) {
-                        this.IBZOrganization_OpenMainView(result.datas,context, params, $event, xData,actionContext);
-                    }
-                    return result.datas;
-                });
-            }
-            const view: any = {
-                viewname: 'ibzorganization-option-view', 
-                height: 400, 
-                width: 700,  
-                title: actionContext.$t('entities.ibzorganization.views.optionview.title'),
-            };
-            openPopupModal(view, data);
-    }
-
-    /**
-     * 打开主页面
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} context 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @param {*} [srfParentDeName] 父实体名称
-     * @returns {Promise<any>}
-     */
-    public async IBZOrganization_OpenMainView(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-    
-        let data: any = {};
-        let parentContext:any = {};
-        let parentViewParam:any = {};
-        const _this: any = actionContext;
-        const _args: any[] = Util.deepCopy(args);
-        const actionTarget: string | null = 'SINGLEKEY';
-        Object.assign(context, { ibzorganization: '%ibzorganization%' });
-        Object.assign(params, { orgid: '%ibzorganization%' });
-        Object.assign(params, { orgname: '%orgname%' });
-        if(_this.context){
-            parentContext = _this.context;
-        }
-        if(_this.viewparams){
-            parentViewParam = _this.viewparams;
-        }
-        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
-        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
-        context = Object.assign({},actionContext.context,context);
-        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
-        Object.assign(data,parentObj);
-        Object.assign(context,parentObj);
-        let deResParameters: any[] = [];
-        const parameters: any[] = [
-            { pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
-        ];
-            const openDrawer = (view: any, data: any) => {
-                let container: Subject<any> = actionContext.$appdrawer.openDrawer(view, context,data);
-                container.subscribe((result: any) => {
-                    if (!result || !Object.is(result.ret, 'OK')) {
-                        return;
-                    }
-                    const _this: any = actionContext;
-                    return result.datas;
-                });
-            }
-            const view: any = {
-                viewname: 'ibzorganization-edit-view', 
-                height: 0, 
-                width: 0,  
-                title: actionContext.$t('entities.ibzorganization.views.editview.title'),
-                placement: 'DRAWER_RIGHT',
-            };
-            openDrawer(view, data);
-    }
-
 
     /**
      * 获取指定数据的重定向页面

ibzrt-core/src/main/resources/liquibase/h2_table.xml

@@ -12,7 +12,7 @@
 
 
     <!--输出实体[IBZEMP]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzemp-1-1">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzemp-2-1">
         <createTable tableName="IBZEMP">
                 <column name="USERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZEMP_USERID"/>
@@ -145,13 +145,13 @@
 
 
         <!--输出实体[IBZEMP]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-1-2">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-2-2">
        <addForeignKeyConstraint baseColumnNames="MDEPTID" baseTableName="IBZEMP" constraintName="DER1N_IBZEMP_IBZDEPT_MDEPTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-1-3">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-2-3">
        <addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZEMP" constraintName="DER1N_IBZEMP_IBZORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-1-4">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzemp-2-4">
        <addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZEMP" constraintName="DER1N_IBZEMP_IBZPOST_POSTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
     </changeSet>