ibiz4j 发布系统代码

app_web/src/components/app-form-druipart/app-form-druipart.vue

@@ -240,7 +240,7 @@ export default class AppFormDRUIPart extends Vue {
         }
         const formData: any = data?data:JSON.parse(this.data);
         const _paramitem = formData[this.paramItem];
-        let viewdata = {srfparentdename:this.parentName,srfparentkey:_paramitem};
+        let viewdata = {};
         Object.assign(viewdata, this.$viewTool.getIndexViewParam());
         const _parameters: any[] = [...this.$viewTool.getIndexParameters(), ...this.parameters];
         _parameters.forEach((parameter: any) => {
@@ -252,6 +252,7 @@ export default class AppFormDRUIPart extends Vue {
         Object.assign(viewdata, { [this.paramItem]: _paramitem });
         //设置顶层视图唯一标识
         Object.assign(viewdata,this.context);
+        Object.assign(viewdata,{srfparentdename:this.parentName,srfparentkey:_paramitem});
         this.viewdata = JSON.stringify(viewdata);
         this.viewparam = JSON.stringify(this.viewparams);
         if (this.isRelationalData) {

app_web/src/mock/app/ouindex-view-appmenu/ouindex-view-appmenu.ts

@@ -43,7 +43,7 @@ mock.onGet('v7/ouindex-viewappmenu').reply((config: any) => {
 	iconcls: 'fa fa-sitemap',
 	icon: '',
 	textcls: '',
-	appfunctag: '_3',
+	appfunctag: 'Auto5',
 	resourcetag: '',
 },
             {
@@ -61,7 +61,7 @@ mock.onGet('v7/ouindex-viewappmenu').reply((config: any) => {
 	iconcls: 'fa fa-user',
 	icon: '',
 	textcls: '',
-	appfunctag: '_2',
+	appfunctag: 'Auto4',
 	resourcetag: '',
 },
         ],

app_web/src/pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view-base.vue

@@ -882,7 +882,7 @@ export default class IBZDeptMemberGridViewBase extends Vue {
             'resAppKey':'userid'},
             {view:{viewname:'ibzdepartment-mpickup-view',height: 0,width: 0,title: '部门数据多项选择视图'},
             res:['IBZDepartment'],
-            'resAppKey':''}
+            'resAppKey':'userid'}
         ];
         if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
             this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });
@@ -940,9 +940,9 @@ export default class IBZDeptMemberGridViewBase extends Vue {
             Object.assign(curViewParam,args[0]);
         }
         let deResParameters: any[] = [];
-        if(curViewParam.ibzemployee && true){
+        if(curViewParam.ibzdepartment && true){
             deResParameters = [
-            { pathName: 'ibzemployees', parameterName: 'ibzemployee' },
+            { pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
             ]
         }
         const parameters: any[] = [

app_web/src/pages/ou/ouindex-view/router.ts

@@ -366,6 +366,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'),
                 },
+                {
+                    path: 'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/ibzdeptmembers/:ibzdeptmember?/gridview/:gridview?',
+                    meta: {
+                        caption: 'entities.ibzdeptmember.views.gridview.caption',
+                        parameters: [
+                            { pathName: 'ouindexview', parameterName: 'ouindexview' },
+                            { pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
+                            { pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
+                            { pathName: 'ibzdeptmembers', parameterName: 'ibzdeptmember' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'),
+                },
                 {
                     path: 'ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/ibzdeptmembers/:ibzdeptmember?/gridview/:gridview?',
                     meta: {
@@ -395,6 +410,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'),
                 },
+                {
+                    path: 'ibzdepartments/:ibzdepartment?/ibzdeptmembers/:ibzdeptmember?/gridview/:gridview?',
+                    meta: {
+                        caption: 'entities.ibzdeptmember.views.gridview.caption',
+                        parameters: [
+                            { pathName: 'ouindexview', parameterName: 'ouindexview' },
+                            { pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
+                            { pathName: 'ibzdeptmembers', parameterName: 'ibzdeptmember' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'),
+                },
                 {
                     path: 'ibzdeptmembers/:ibzdeptmember?/gridview/:gridview?',
                     meta: {
@@ -618,6 +647,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'),
                 },
+                {
+                    path: 'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/ibzdeptmembers/:ibzdeptmember?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.ibzdeptmember.views.editview.caption',
+                        parameters: [
+                            { pathName: 'ouindexview', parameterName: 'ouindexview' },
+                            { pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
+                            { pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
+                            { pathName: 'ibzdeptmembers', parameterName: 'ibzdeptmember' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'),
+                },
                 {
                     path: 'ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/ibzdeptmembers/:ibzdeptmember?/editview/:editview?',
                     meta: {
@@ -647,6 +691,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'),
                 },
+                {
+                    path: 'ibzdepartments/:ibzdepartment?/ibzdeptmembers/:ibzdeptmember?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.ibzdeptmember.views.editview.caption',
+                        parameters: [
+                            { pathName: 'ouindexview', parameterName: 'ouindexview' },
+                            { pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
+                            { pathName: 'ibzdeptmembers', parameterName: 'ibzdeptmember' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'),
+                },
                 {
                     path: 'ibzdeptmembers/:ibzdeptmember?/editview/:editview?',
                     meta: {
@@ -1220,6 +1278,20 @@ const router = new Router({
         },
         component: () => import('@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'),
     },
+    {
+        path: '/ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/ibzdeptmembers/:ibzdeptmember?/editview/:editview?',
+        meta: {
+            caption: 'entities.ibzdeptmember.views.editview.caption',
+            parameters: [
+                { pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
+                { pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
+                { pathName: 'ibzdeptmembers', parameterName: 'ibzdeptmember' },
+                { pathName: 'editview', parameterName: 'editview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'),
+    },
     {
         path: '/ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/ibzdeptmembers/:ibzdeptmember?/editview/:editview?',
         meta: {
@@ -1247,6 +1319,19 @@ const router = new Router({
         },
         component: () => import('@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'),
     },
+    {
+        path: '/ibzdepartments/:ibzdepartment?/ibzdeptmembers/:ibzdeptmember?/editview/:editview?',
+        meta: {
+            caption: 'entities.ibzdeptmember.views.editview.caption',
+            parameters: [
+                { pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
+                { pathName: 'ibzdeptmembers', parameterName: 'ibzdeptmember' },
+                { pathName: 'editview', parameterName: 'editview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'),
+    },
     {
         path: '/ibzdeptmembers/:ibzdeptmember?/editview/:editview?',
         meta: {
@@ -1288,6 +1373,20 @@ const router = new Router({
         },
         component: () => import('@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'),
     },
+    {
+        path: '/ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/ibzdeptmembers/:ibzdeptmember?/gridview/:gridview?',
+        meta: {
+            caption: 'entities.ibzdeptmember.views.gridview.caption',
+            parameters: [
+                { pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
+                { pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
+                { pathName: 'ibzdeptmembers', parameterName: 'ibzdeptmember' },
+                { pathName: 'gridview', parameterName: 'gridview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'),
+    },
     {
         path: '/ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/ibzdeptmembers/:ibzdeptmember?/gridview/:gridview?',
         meta: {
@@ -1315,6 +1414,19 @@ const router = new Router({
         },
         component: () => import('@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'),
     },
+    {
+        path: '/ibzdepartments/:ibzdepartment?/ibzdeptmembers/:ibzdeptmember?/gridview/:gridview?',
+        meta: {
+            caption: 'entities.ibzdeptmember.views.gridview.caption',
+            parameters: [
+                { pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
+                { pathName: 'ibzdeptmembers', parameterName: 'ibzdeptmember' },
+                { pathName: 'gridview', parameterName: 'gridview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'),
+    },
     {
         path: '/ibzdeptmembers/:ibzdeptmember?/gridview/:gridview?',
         meta: {

app_web/src/service/ibzdepartment/ibzdepartment-service-base.ts

@@ -89,6 +89,21 @@ export default class IBZDepartmentServiceBase extends EntityService {
             }
         }
         masterData.ibzemployees = ibzemployeesData;
+        let ibzdeptmembersData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
+            ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
+            if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
+                ibzdeptmembersData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.memberid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.ibzdeptmembers = ibzdeptmembersData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -99,6 +114,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));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
         return res;
     }
 
@@ -117,6 +133,7 @@ export default class IBZDepartmentServiceBase extends EntityService {
         }
             let res:any = await Http.getInstance().get(`/ibzdepartments/${context.ibzdepartment}`,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_ibzemployees',JSON.stringify(res.data.ibzemployees));
+            this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
             return res;
 
     }
@@ -150,9 +167,25 @@ export default class IBZDepartmentServiceBase extends EntityService {
             }
         }
         masterData.ibzemployees = ibzemployeesData;
+        let ibzdeptmembersData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
+            ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
+            if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
+                ibzdeptmembersData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.memberid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.ibzdeptmembers = ibzdeptmembersData;
         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));
+            this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
             return res;
     }
 
@@ -188,6 +221,7 @@ export default class IBZDepartmentServiceBase extends EntityService {
         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));
+            this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
         return res;
     }
 
@@ -237,9 +271,25 @@ export default class IBZDepartmentServiceBase extends EntityService {
             }
         }
         masterData.ibzemployees = ibzemployeesData;
+        let ibzdeptmembersData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers'),'undefined')){
+            ibzdeptmembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzdeptmembers') as any);
+            if(ibzdeptmembersData && ibzdeptmembersData.length && ibzdeptmembersData.length > 0){
+                ibzdeptmembersData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.memberid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.ibzdeptmembers = ibzdeptmembersData;
         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));
+            this.tempStorage.setItem(context.srfsessionkey+'_ibzdeptmembers',JSON.stringify(res.data.ibzdeptmembers));
             return res;
     }
 

app_web/src/widgets/app/ouindex-view-appmenu/ouindex-view-appmenu-base.vue

@@ -558,14 +558,14 @@ export default class OUIndexViewBase extends Vue implements ControlInterface {
     public click(item: any) {
         if (item) {
             switch (item.appfunctag) {
-                case '_3': 
-                    this.click_3(item);
+                case 'Auto5': 
+                    this.clickAuto5(item);
                     return;
                 case 'Auto3': 
                     this.clickAuto3(item);
                     return;
-                case '_2': 
-                    this.click_2(item);
+                case 'Auto4': 
+                    this.clickAuto4(item);
                     return;
                 default:
                     console.warn('未指定应用功能');
@@ -580,7 +580,7 @@ export default class OUIndexViewBase extends Vue implements ControlInterface {
      * @param {*} [item={}]
      * @memberof OUIndexView
      */
-    public click_3(item: any = {}) {
+    public clickAuto5(item: any = {}) {
         const viewparam: any = {};
         Object.assign(viewparam, {});
         const deResParameters: any[] = [];
@@ -616,7 +616,7 @@ export default class OUIndexViewBase extends Vue implements ControlInterface {
      * @param {*} [item={}]
      * @memberof OUIndexView
      */
-    public click_2(item: any = {}) {
+    public clickAuto4(item: any = {}) {
         const viewparam: any = {};
         Object.assign(viewparam, {});
         const deResParameters: any[] = [];

app_web/src/widgets/app/ouindex-view-appmenu/ouindex-view-appmenu-model.ts

@@ -47,7 +47,7 @@ export default class OUIndexViewModel {
 	iconcls: 'fa fa-sitemap',
 	icon: '',
 	textcls: '',
-	appfunctag: '_3',
+	appfunctag: 'Auto5',
 	resourcetag: '',
 },
         {
@@ -65,7 +65,7 @@ export default class OUIndexViewModel {
 	iconcls: 'fa fa-user',
 	icon: '',
 	textcls: '',
-	appfunctag: '_2',
+	appfunctag: 'Auto4',
 	resourcetag: '',
 },
     ];
@@ -79,7 +79,7 @@ export default class OUIndexViewModel {
 	 */
 	public funcs: any[] = [
         {
-            appfunctag: '_3',
+            appfunctag: 'Auto5',
             appfuncyype: 'APPVIEW',
             openmode: '',
             codename: 'ibzorganizationtreeexpview',
@@ -103,7 +103,7 @@ export default class OUIndexViewModel {
             ],
         },
         {
-            appfunctag: '_2',
+            appfunctag: 'Auto4',
             appfuncyype: 'APPVIEW',
             openmode: '',
             codename: 'ibzdepartmenttreeexpview',

app_web/src/widgets/ibzdepartment/edit-grid-grid/edit-grid-grid-base.vue

 <template>
 <div class='grid' style="height:100%;">
-      <i-form>
+      <i-form style="height:100%">
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  
@@ -325,7 +325,7 @@
                 <el-table-column></el-table-column>
             </template>
     </el-table>
-  </i-form>
+  
     <row class='grid-pagination' v-show="items.length > 0">
         <page class='pull-right' @on-change="pageOnChange($event)" 
             @on-page-size-change="onPageSizeChange($event)"
@@ -361,6 +361,7 @@
             </span>
         </page>
     </row>
+  </i-form>
 </div>
 </template>
 <script lang='tsx'>

app_web/src/widgets/ibzdepartment/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%;">
-      <i-form>
+      <i-form style="height:100%">
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  
@@ -194,7 +194,7 @@
                 <el-table-column></el-table-column>
             </template>
     </el-table>
-  </i-form>
+  
     <row class='grid-pagination' v-show="items.length > 0">
         <page class='pull-right' @on-change="pageOnChange($event)" 
             @on-page-size-change="onPageSizeChange($event)"
@@ -230,6 +230,7 @@
             </span>
         </page>
     </row>
+  </i-form>
 </div>
 </template>
 <script lang='tsx'>

app_web/src/widgets/ibzdept-member/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%;">
-      <i-form>
+      <i-form style="height:100%">
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  
@@ -62,7 +62,7 @@
                 <el-table-column></el-table-column>
             </template>
     </el-table>
-  </i-form>
+  
     <row class='grid-pagination' v-show="items.length > 0">
         <page class='pull-right' @on-change="pageOnChange($event)" 
             @on-page-size-change="onPageSizeChange($event)"
@@ -98,6 +98,7 @@
             </span>
         </page>
     </row>
+  </i-form>
 </div>
 </template>
 <script lang='tsx'>

app_web/src/widgets/ibzemployee/edit-grid-grid/edit-grid-grid-base.vue

 <template>
 <div class='grid' style="height:100%;">
-      <i-form>
+      <i-form style="height:100%">
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  
@@ -307,7 +307,7 @@
                 <el-table-column></el-table-column>
             </template>
     </el-table>
-  </i-form>
+  
     <row class='grid-pagination' v-show="items.length > 0">
         <page class='pull-right' @on-change="pageOnChange($event)" 
             @on-page-size-change="onPageSizeChange($event)"
@@ -343,6 +343,7 @@
             </span>
         </page>
     </row>
+  </i-form>
 </div>
 </template>
 <script lang='tsx'>

app_web/src/widgets/ibzemployee/main-form/main-form-base.vue

@@ -162,7 +162,7 @@
     paramItem='ibzemployee' 
     :parentdata='{"srfparentdefname":"USERID","srfparentdename":"IBZEMP","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_IBZDEPTMEMBER_IBZEMP_USERID","SRFDER1NID":"DER1N_IBZDEPTMEMBER_IBZEMP_USERID"}'
     :parameters="[
-        { pathName: 'ibzemployees', parameterName: 'ibzemployee' },
+        { pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
     ]"
     :context="context"
     :viewparams="viewparams"

app_web/src/widgets/ibzemployee/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%;">
-      <i-form>
+      <i-form style="height:100%">
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  
@@ -160,7 +160,7 @@
                 <el-table-column></el-table-column>
             </template>
     </el-table>
-  </i-form>
+  
     <row class='grid-pagination' v-show="items.length > 0">
         <page class='pull-right' @on-change="pageOnChange($event)" 
             @on-page-size-change="onPageSizeChange($event)"
@@ -196,6 +196,7 @@
             </span>
         </page>
     </row>
+  </i-form>
 </div>
 </template>
 <script lang='tsx'>

app_web/src/widgets/ibzorganization/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%;">
-      <i-form>
+      <i-form style="height:100%">
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  
@@ -146,7 +146,7 @@
                 <el-table-column></el-table-column>
             </template>
     </el-table>
-  </i-form>
+  
     <row class='grid-pagination' v-show="items.length > 0">
         <page class='pull-right' @on-change="pageOnChange($event)" 
             @on-page-size-change="onPageSizeChange($event)"
@@ -182,6 +182,7 @@
             </span>
         </page>
     </row>
+  </i-form>
 </div>
 </template>
 <script lang='tsx'>

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 ibzou/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzou/
-      mvn clean package -Pweb
-      cd ibzou-app/ibzou-app-web
-      mvn -Pweb docker:build
-      mvn -Pweb docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzou-app/ibzou-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-app-web.jar
 
-EXPOSE 30001
+EXPOSE 8080
 
 ADD ibzou-app-web.jar /ibzou-app-web.jar

ibzou-app/ibzou-app-web/src/main/docker/ibzou-app-web.yaml

@@ -3,21 +3,9 @@ services:
   ibzou-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-app-web:latest
     ports:
-      - "30001:30001"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30001
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
     deploy:
       mode: replicated
       replicas: 1

ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZDepartment.java

@@ -18,7 +18,7 @@ import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
 import cn.ibizlab.util.enums.DEFieldDefaultValueType;
 import java.io.Serializable;
-import lombok.Data;
+import lombok.*;
 import org.springframework.data.annotation.Transient;
 
 
@@ -29,7 +29,11 @@ import cn.ibizlab.util.domain.EntityMP;
 /**
  * 实体[部门]
  */
-@Data
+@Builder
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 @TableName(value = "IBZDEPT",resultMap = "IBZDepartmentResultMap")
 public class IBZDepartment extends EntityMP implements Serializable {
 

ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZDeptMember.java

@@ -18,7 +18,7 @@ import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
 import cn.ibizlab.util.enums.DEFieldDefaultValueType;
 import java.io.Serializable;
-import lombok.Data;
+import lombok.*;
 import org.springframework.data.annotation.Transient;
 
 
@@ -29,7 +29,11 @@ import cn.ibizlab.util.domain.EntityMP;
 /**
  * 实体[部门成员]
  */
-@Data
+@Builder
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 @TableName(value = "IBZDEPTMEMBER",resultMap = "IBZDeptMemberResultMap")
 public class IBZDeptMember extends EntityMP implements Serializable {
 

ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZEmployee.java

@@ -18,7 +18,7 @@ import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
 import cn.ibizlab.util.enums.DEFieldDefaultValueType;
 import java.io.Serializable;
-import lombok.Data;
+import lombok.*;
 import org.springframework.data.annotation.Transient;
 
 
@@ -29,7 +29,11 @@ import cn.ibizlab.util.domain.EntityMP;
 /**
  * 实体[人员]
  */
-@Data
+@Builder
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 @TableName(value = "IBZEMP",resultMap = "IBZEmployeeResultMap")
 public class IBZEmployee extends EntityMP implements Serializable {
 

ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZOrganization.java

@@ -18,7 +18,7 @@ import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
 import cn.ibizlab.util.enums.DEFieldDefaultValueType;
 import java.io.Serializable;
-import lombok.Data;
+import lombok.*;
 import org.springframework.data.annotation.Transient;
 
 
@@ -29,7 +29,11 @@ import cn.ibizlab.util.domain.EntityMP;
 /**
  * 实体[单位机构]
  */
-@Data
+@Builder
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 @TableName(value = "IBZORG",resultMap = "IBZOrganizationResultMap")
 public class IBZOrganization extends EntityMP implements Serializable {
 

ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZDepartmentSearchContext.java

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
-import lombok.Data;
+import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;

ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZDeptMemberSearchContext.java

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
-import lombok.Data;
+import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;

ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZEmployeeSearchContext.java

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
-import lombok.Data;
+import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;

ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZOrganizationSearchContext.java

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
-import lombok.Data;
+import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.fastjson.annotation.JSONField;

ibzou-util/src/main/java/cn/ibizlab/util/filter/QueryBuildContext.java

@@ -3,11 +3,14 @@ package cn.ibizlab.util.filter;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.mongodb.QueryBuilder;
-import lombok.Data;
+import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@Data
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class QueryBuildContext extends SearchContextBase implements ISearchContext{
 
     @JsonIgnore

ibzou-util/src/main/java/cn/ibizlab/util/filter/QueryWrapperContext.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
+import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Sort;
 import org.springframework.util.ObjectUtils;
@@ -17,7 +17,10 @@ import java.util.Iterator;
 import java.util.List;
 
 @Slf4j
-@Data
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class QueryWrapperContext<T> extends SearchContextBase implements ISearchContext{
 
     @JsonIgnore

ibzou-util/src/main/java/cn/ibizlab/util/filter/SearchContextBase.java

@@ -4,7 +4,7 @@ import cn.ibizlab.util.security.AuthenticationUser;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
+import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.PageRequest;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -17,7 +17,10 @@ import java.util.List;
 import java.util.Map;
 
 @Slf4j
-@Data
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class SearchContextBase implements ISearchContext{
 
     /**