ibizdev提交

app_web/public/assets/json/view-config.json

@@ -15,6 +15,14 @@
         "viewname": "IBZEmployeeEditView",
         "viewtag": "16f9ed1179f9b3cf686cbcd796512299"
     },
+    "ibzdepartmentoptionview": {
+        "title": "部门选项操作视图",
+        "caption": "部门",
+        "viewtype": "DEOPTVIEW",
+        "viewmodule": "ou",
+        "viewname": "IBZDepartmentOptionView",
+        "viewtag": "17f1f78c7a23f7546dbfef7f8fa9fcd0"
+    },
     "ibzdepartmenteditview": {
         "title": "部门编辑视图",
         "caption": "部门",
@@ -39,6 +47,14 @@
         "viewname": "IBZOrganizationPickupGridView",
         "viewtag": "4c3fc434585ac656b753c26c1f10482b"
     },
+    "ibzemployeeoptionview": {
+        "title": "人员选项操作视图",
+        "caption": "人员",
+        "viewtype": "DEOPTVIEW",
+        "viewmodule": "ou",
+        "viewname": "IBZEmployeeOptionView",
+        "viewtag": "61a772e0bde33e5e8e9b83ea0f354271"
+    },
     "ibzdepartmentpickupgridview": {
         "title": "部门选择表格视图",
         "caption": "部门",

app_web/src/locale/lanres/ibzdepartment/ibzdepartment_en_US.ts

@@ -17,6 +17,10 @@ export default {
     updatedate: '最后修改时间',
   },
 	views: {
+		optionview: {
+			caption: "部门",
+      title: '部门',
+		},
 		editview: {
 			caption: "部门",
       title: '部门',
@@ -34,6 +38,29 @@ export default {
       title: '部门',
 		},
 	},
+	newform_form: {
+		details: {
+			group1: "部门基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "最后修改时间", 
+			srforikey: "", 
+			srfkey: "部门标识", 
+			srfmajortext: "部门名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			deptcode: "部门代码", 
+			deptname: "部门名称", 
+			orgname: "单位", 
+			pdeptname: "上级部门", 
+			pdeptid: "上级部门", 
+			deptid: "部门标识", 
+			orgid: "单位", 
+		},
+		uiactions: {
+		},
+	},
 	main_form: {
 		details: {
 			formpage1: "基本信息", 
@@ -112,9 +139,13 @@ export default {
 		},
 	},
 	gridviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "New",
-			tip: "New",
+		tbitem1_opennewcreateview: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
 		},
 		tbitem4: {
 			caption: "Edit",

app_web/src/locale/lanres/ibzdepartment/ibzdepartment_zh_CN.ts

@@ -16,6 +16,10 @@ export default {
     updatedate: '最后修改时间',
   },
 	views: {
+		optionview: {
+			caption: '部门',
+      title: '部门',
+		},
 		editview: {
 			caption: '部门',
       title: '部门',
@@ -33,6 +37,29 @@ export default {
       title: '部门',
 		},
 	},
+	newform_form: {
+		details: {
+			group1: '部门基本信息', 
+			formpage1: '基本信息', 
+			srfupdatedate: '最后修改时间', 
+			srforikey: '', 
+			srfkey: '部门标识', 
+			srfmajortext: '部门名称', 
+			srftempmode: '', 
+			srfuf: '', 
+			srfdeid: '', 
+			srfsourcekey: '', 
+			deptcode: '部门代码', 
+			deptname: '部门名称', 
+			orgname: '单位', 
+			pdeptname: '上级部门', 
+			pdeptid: '上级部门', 
+			deptid: '部门标识', 
+			orgid: '单位', 
+		},
+		uiactions: {
+		},
+	},
 	main_form: {
 		details: {
 			formpage1: '基本信息', 
@@ -111,10 +138,14 @@ export default {
 		},
 	},
 	gridviewtoolbar_toolbar: {
-		tbitem3: {
+		tbitem1_opennewcreateview: {
 			caption: '新建',
 			tip: '新建',
 		},
+		tbitem2: {
+			caption: '-',
+			tip: '',
+		},
 		tbitem4: {
 			caption: '编辑',
 			tip: '编辑',

app_web/src/locale/lanres/ibzemployee/ibzemployee_en_US.ts

@@ -45,6 +45,10 @@ export default {
 		},
 		gridview: {
 			caption: "人员",
+      title: '人员',
+		},
+		optionview: {
+			caption: "人员",
       title: '人员',
 		},
 		changepwdview: {
@@ -94,6 +98,30 @@ export default {
 		uiactions: {
 		},
 	},
+	newform_form: {
+		details: {
+			group1: "人员基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "最后修改时间", 
+			srforikey: "", 
+			srfkey: "用户标示", 
+			srfmajortext: "姓名", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			usercode: "用户工号", 
+			personname: "姓名", 
+			loginname: "登录名", 
+			orgname: "单位", 
+			mdeptname: "部门", 
+			orgid: "单位", 
+			userid: "用户标示", 
+			mdeptid: "主部门", 
+		},
+		uiactions: {
+		},
+	},
 	changepw_form: {
 		details: {
 			group1: "密码信息", 
@@ -164,18 +192,14 @@ export default {
 		},
 	},
 	gridviewtoolbar_toolbar: {
-		tbitem1_initpwd: {
-			caption: "初始化密码",
-			tip: "初始化密码",
+		tbitem1_opennewcreateview: {
+			caption: "新建",
+			tip: "新建",
 		},
 		tbitem2: {
 			caption: "-",
 			tip: "",
 		},
-		tbitem3: {
-			caption: "New",
-			tip: "New",
-		},
 		tbitem4: {
 			caption: "Edit",
 			tip: "Edit {0}",
@@ -204,6 +228,14 @@ export default {
 			caption: "-",
 			tip: "",
 		},
+		tbitem14_initpwd: {
+			caption: "初始化密码",
+			tip: "初始化密码",
+		},
+		tbitem15: {
+			caption: "-",
+			tip: "",
+		},
 		tbitem19: {
 			caption: "Filter",
 			tip: "Filter",

app_web/src/locale/lanres/ibzemployee/ibzemployee_zh_CN.ts

@@ -44,6 +44,10 @@ export default {
 		},
 		gridview: {
 			caption: '人员',
+      title: '人员',
+		},
+		optionview: {
+			caption: '人员',
       title: '人员',
 		},
 		changepwdview: {
@@ -93,6 +97,30 @@ export default {
 		uiactions: {
 		},
 	},
+	newform_form: {
+		details: {
+			group1: '人员基本信息', 
+			formpage1: '基本信息', 
+			srfupdatedate: '最后修改时间', 
+			srforikey: '', 
+			srfkey: '用户标示', 
+			srfmajortext: '姓名', 
+			srftempmode: '', 
+			srfuf: '', 
+			srfdeid: '', 
+			srfsourcekey: '', 
+			usercode: '用户工号', 
+			personname: '姓名', 
+			loginname: '登录名', 
+			orgname: '单位', 
+			mdeptname: '部门', 
+			orgid: '单位', 
+			userid: '用户标示', 
+			mdeptid: '主部门', 
+		},
+		uiactions: {
+		},
+	},
 	changepw_form: {
 		details: {
 			group1: '密码信息', 
@@ -163,18 +191,14 @@ export default {
 		},
 	},
 	gridviewtoolbar_toolbar: {
-		tbitem1_initpwd: {
-			caption: '初始化密码',
-			tip: '初始化密码',
+		tbitem1_opennewcreateview: {
+			caption: '新建',
+			tip: '新建',
 		},
 		tbitem2: {
 			caption: '-',
 			tip: '',
 		},
-		tbitem3: {
-			caption: '新建',
-			tip: '新建',
-		},
 		tbitem4: {
 			caption: '编辑',
 			tip: '编辑',
@@ -203,6 +227,14 @@ export default {
 			caption: '-',
 			tip: '',
 		},
+		tbitem14_initpwd: {
+			caption: '初始化密码',
+			tip: '初始化密码',
+		},
+		tbitem15: {
+			caption: '-',
+			tip: '',
+		},
 		tbitem19: {
 			caption: '过滤',
 			tip: '过滤',

app_web/src/locale/lanres/ibzorganization/ibzorganization_en_US.ts

@@ -75,6 +75,7 @@ export default {
 			orgcode: "单位代码", 
 			orgname: "名称", 
 			porgname: "上级单位", 
+			enable: "逻辑有效", 
 			orgid: "单位标识", 
 			porgid: "上级单位", 
 		},
@@ -138,10 +139,6 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem3: {
-			caption: "New",
-			tip: "New",
-		},
 		tbitem4: {
 			caption: "Edit",
 			tip: "Edit {0}",

app_web/src/locale/lanres/ibzorganization/ibzorganization_zh_CN.ts

@@ -74,6 +74,7 @@ export default {
 			orgcode: '单位代码', 
 			orgname: '名称', 
 			porgname: '上级单位', 
+			enable: '逻辑有效', 
 			orgid: '单位标识', 
 			porgid: '上级单位', 
 		},
@@ -137,10 +138,6 @@ export default {
 			caption: '-',
 			tip: '',
 		},
-		tbitem3: {
-			caption: '新建',
-			tip: '新建',
-		},
 		tbitem4: {
 			caption: '编辑',
 			tip: '编辑',

app_web/src/mock/viewconfig/viewconfig.ts

@@ -23,6 +23,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "IBZEmployeeEditView",
             "viewtag": "16f9ed1179f9b3cf686cbcd796512299"
         },
+        "ibzdepartmentoptionview": {
+            "title": "部门选项操作视图",
+            "caption": "部门",
+            "viewtype": "DEOPTVIEW",
+            "viewmodule": "ou",
+            "viewname": "IBZDepartmentOptionView",
+            "viewtag": "17f1f78c7a23f7546dbfef7f8fa9fcd0"
+        },
         "ibzdepartmenteditview": {
             "title": "部门编辑视图",
             "caption": "部门",
@@ -47,6 +55,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "IBZOrganizationPickupGridView",
             "viewtag": "4c3fc434585ac656b753c26c1f10482b"
         },
+        "ibzemployeeoptionview": {
+            "title": "人员选项操作视图",
+            "caption": "人员",
+            "viewtype": "DEOPTVIEW",
+            "viewmodule": "ou",
+            "viewname": "IBZEmployeeOptionView",
+            "viewtag": "61a772e0bde33e5e8e9b83ea0f354271"
+        },
         "ibzdepartmentpickupgridview": {
             "title": "部门选择表格视图",
             "caption": "部门",

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

@@ -13,13 +13,13 @@
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <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>
+                                <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.tbitem3.tip')}}</div>
+                            <div slot='content'>{{$t('entities.ibzdepartment.gridviewtoolbar_toolbar.tbitem1_opennewcreateview.tip')}}</div>
                         </tooltip>
-                        <tooltip :transfer="true" :max-width="600">
+                        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
                                 <i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)">
                                     <i class='fa fa-edit'></i>
                                     <span class='caption'>{{$t('entities.ibzdepartment.gridviewtoolbar_toolbar.tbitem4.caption')}}</span>
@@ -111,6 +111,7 @@ import IBZDepartmentService from '@/service/ibzdepartment/ibzdepartment-service'
 import GridViewEngine from '@engine/view/grid-view-engine';
 
 
+import IBZDepartmentUIService from '@/uiservice/ibzdepartment/ibzdepartment-ui-service';
 
 @Component({
     components: {
@@ -289,8 +290,9 @@ export default class IBZDepartmentGridViewBase extends Vue {
      * @memberof IBZDepartmentGridView
      */
     public toolBarModels: any = {
-        tbitem3: { name: 'tbitem3', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
+        tbitem1_opennewcreateview: { name: 'tbitem1_opennewcreateview', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'OpenNewCreateView', target: 'NONE' } },
 
+        tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
 
         tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
@@ -549,8 +551,8 @@ export default class IBZDepartmentGridViewBase extends Vue {
      * @memberof IBZDepartmentGridViewBase
      */
     public toolbar_click($event: any, $event2?: any) {
-        if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click($event, '', $event2);
+        if (Object.is($event.tag, 'tbitem1_opennewcreateview')) {
+            this.toolbar_tbitem1_opennewcreateview_click($event, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem4')) {
             this.toolbar_tbitem4_click($event, '', $event2);
@@ -687,7 +689,7 @@ export default class IBZDepartmentGridViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem3_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem1_opennewcreateview_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -702,7 +704,8 @@ export default class IBZDepartmentGridViewBase extends Vue {
             datas = [...xData.getDatas()];
         }
         // 界面行为
-        this.New(datas, contextJO,paramJO,  $event, xData,this,"IBZDepartment");
+        const curUIService:IBZDepartmentUIService  = new IBZDepartmentUIService();
+        curUIService.IBZDepartment_OpenNewCreateView(datas,contextJO, paramJO,  $event, xData,this,"IBZDepartment");
     }
 
     /**
@@ -1037,26 +1040,6 @@ export default class IBZDepartmentGridViewBase extends Vue {
     }
 
 
-    /**
-     * 新建
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBZDepartmentGridViewBase
-     */
-    public New(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-         const _this: any = this;
-        if (_this.newdata && _this.newdata instanceof Function) {
-            const data: any = {};
-            _this.newdata([{ ...data }],[{ ...data }], params, $event, xData);
-        } else {
-            _this.$Notice.error({ title: '错误', desc: 'newdata 视图处理逻辑不存在，请添加!' });
-        }
-    }
     /**
      * 编辑
      *

app_web/src/pages/ou/ibzdepartment-option-view/ibzdepartment-option-view.less

+.ibzdepartment-option-view{
+    position: relative;
+}
+
+
+.view-container {
+  .view-card {
+    .ivu-card-body {
+      .content-container{
+        height: calc(100% - 64px);
+      }
+    } 
+  } 
+}
\ No newline at end of file

app_web/src/pages/ou/ibzdepartment-option-view/ibzdepartment-option-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import IBZDepartmentOptionViewBase from './ibzdepartment-option-view-base.vue';
+
+import view_form from '@widgets/ibzdepartment/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 IBZDepartmentOptionView extends IBZDepartmentOptionViewBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/pages/ou/ibzemployee-option-view/ibzemployee-option-view.less

+.ibzemployee-option-view{
+    position: relative;
+}
+
+
+.view-container {
+  .view-card {
+    .ivu-card-body {
+      .content-container{
+        height: calc(100% - 64px);
+      }
+    } 
+  } 
+}
\ No newline at end of file

app_web/src/pages/ou/ibzemployee-option-view/ibzemployee-option-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import IBZEmployeeOptionViewBase from './ibzemployee-option-view-base.vue';
+
+import view_form from '@widgets/ibzemployee/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 IBZEmployeeOptionView extends IBZEmployeeOptionViewBase {
+
+}
+</script>
\ No newline at end of file

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

@@ -20,13 +20,6 @@
                             <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>
-                                </i-button>
-                            <div slot='content'>{{$t('entities.ibzorganization.gridviewtoolbar_toolbar.tbitem3.tip')}}</div>
-                        </tooltip>
-                        <tooltip :transfer="true" :max-width="600">
                                 <i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)">
                                     <i class='fa fa-edit'></i>
                                     <span class='caption'>{{$t('entities.ibzorganization.gridviewtoolbar_toolbar.tbitem4.caption')}}</span>
@@ -300,8 +293,6 @@ export default class IBZOrganizationGridViewBase extends Vue {
         tbitem1_opennewcreateview: { name: 'tbitem1_opennewcreateview', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, 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, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
-
         tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
 
         tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
@@ -563,9 +554,6 @@ export default class IBZOrganizationGridViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem1_opennewcreateview')) {
             this.toolbar_tbitem1_opennewcreateview_click($event, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click($event, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem4')) {
             this.toolbar_tbitem4_click($event, '', $event2);
         }
@@ -720,32 +708,6 @@ export default class IBZOrganizationGridViewBase extends Vue {
         curUIService.IBZOrganization_OpenNewCreateView(datas,contextJO, paramJO,  $event, xData,this,"IBZOrganization");
     }
 
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public toolbar_tbitem3_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()];
-        }
-        // 界面行为
-        this.New(datas, contextJO,paramJO,  $event, xData,this,"IBZOrganization");
-    }
-
     /**
      * 逻辑事件
      *
@@ -1068,26 +1030,6 @@ export default class IBZOrganizationGridViewBase extends Vue {
     }
 
 
-    /**
-     * 新建
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBZOrganizationGridViewBase
-     */
-    public New(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-         const _this: any = this;
-        if (_this.newdata && _this.newdata instanceof Function) {
-            const data: any = {};
-            _this.newdata([{ ...data }],[{ ...data }], params, $event, xData);
-        } else {
-            _this.$Notice.error({ title: '错误', desc: 'newdata 视图处理逻辑不存在，请添加!' });
-        }
-    }
     /**
      * 编辑
      *

app_web/src/pages/ou/ouindex-view/page-register.ts

 export const PageComponents = {
     install(Vue: any, opt: any) {
-                Vue.component('ibzemployee-edit-view', () => import('@pages/ou/ibzemployee-edit-view/ibzemployee-edit-view.vue'));
+                Vue.component('ibzdepartment-option-view', () => import('@pages/ou/ibzdepartment-option-view/ibzdepartment-option-view.vue'));
+        Vue.component('ibzemployee-edit-view', () => import('@pages/ou/ibzemployee-edit-view/ibzemployee-edit-view.vue'));
         Vue.component('ibzdepartment-pickup-grid-view', () => import('@pages/ou/ibzdepartment-pickup-grid-view/ibzdepartment-pickup-grid-view.vue'));
-        Vue.component('ibzorganization-edit-view', () => import('@pages/ou/ibzorganization-edit-view/ibzorganization-edit-view.vue'));
-        Vue.component('ibzdepartment-edit-view', () => import('@pages/ou/ibzdepartment-edit-view/ibzdepartment-edit-view.vue'));
-        Vue.component('ibzorganization-pickup-view', () => import('@pages/ou/ibzorganization-pickup-view/ibzorganization-pickup-view.vue'));
-        Vue.component('ibzorganization-option-view', () => import('@pages/ou/ibzorganization-option-view/ibzorganization-option-view.vue'));
         Vue.component('ibzemployee-grid-view', () => import('@pages/ou/ibzemployee-grid-view/ibzemployee-grid-view.vue'));
+        Vue.component('ibzorganization-option-view', () => import('@pages/ou/ibzorganization-option-view/ibzorganization-option-view.vue'));
         Vue.component('ibzorganization-pickup-grid-view', () => import('@pages/ou/ibzorganization-pickup-grid-view/ibzorganization-pickup-grid-view.vue'));
         Vue.component('ibzdepartment-grid-view', () => import('@pages/ou/ibzdepartment-grid-view/ibzdepartment-grid-view.vue'));
-        Vue.component('ibzdepartment-pickup-view', () => import('@pages/ou/ibzdepartment-pickup-view/ibzdepartment-pickup-view.vue'));
         Vue.component('ibzorganization-grid-view', () => import('@pages/ou/ibzorganization-grid-view/ibzorganization-grid-view.vue'));
+        Vue.component('ibzorganization-edit-view', () => import('@pages/ou/ibzorganization-edit-view/ibzorganization-edit-view.vue'));
+        Vue.component('ibzdepartment-edit-view', () => import('@pages/ou/ibzdepartment-edit-view/ibzdepartment-edit-view.vue'));
+        Vue.component('ibzorganization-pickup-view', () => import('@pages/ou/ibzorganization-pickup-view/ibzorganization-pickup-view.vue'));
+        Vue.component('ibzemployee-option-view', () => import('@pages/ou/ibzemployee-option-view/ibzemployee-option-view.vue'));
+        Vue.component('ibzdepartment-pickup-view', () => import('@pages/ou/ibzdepartment-pickup-view/ibzdepartment-pickup-view.vue'));
     }
 };
\ No newline at end of file

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

@@ -24,6 +24,17 @@ export const viewstate: any = {
                 'b59db4df07430a34645566a64d59244c',
             ],
         },
+        {
+            viewtag: '17f1f78c7a23f7546dbfef7f8fa9fcd0',
+            viewmodule: 'ou',
+            viewname: 'IBZDepartmentOptionView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '9e25d15d43ff644fa008c9cf7d063ac3',
+                'b59db4df07430a34645566a64d59244c',
+            ],
+        },
         {
             viewtag: '21259e2d03645750f1d3d71839f1223b',
             viewmodule: 'ou',
@@ -43,6 +54,7 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 '16f9ed1179f9b3cf686cbcd796512299',
+                '61a772e0bde33e5e8e9b83ea0f354271',
             ],
         },
         {
@@ -54,6 +66,17 @@ export const viewstate: any = {
             refviews: [
             ],
         },
+        {
+            viewtag: '61a772e0bde33e5e8e9b83ea0f354271',
+            viewmodule: 'ou',
+            viewname: 'IBZEmployeeOptionView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '9e25d15d43ff644fa008c9cf7d063ac3',
+                'b59db4df07430a34645566a64d59244c',
+            ],
+        },
         {
             viewtag: '66fa282d24a21eec39d958e7fc6c23a8',
             viewmodule: 'ou',
@@ -132,6 +155,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '17f1f78c7a23f7546dbfef7f8fa9fcd0',
                 '21259e2d03645750f1d3d71839f1223b',
             ],
         },

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

@@ -79,6 +79,7 @@ export default class IBZDepartmentUIServiceBase extends UIService {
      * @memberof  IBZDepartmentUIServiceBase
      */  
     public initViewMap(){
+        this.allViewMap.set(':',{viewname:'optionview',srfappde:'ibzdepartments'});
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'ibzdepartments'});
         this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'ibzdepartments'});
         this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'ibzdepartments'});
@@ -93,6 +94,126 @@ export default class IBZDepartmentUIServiceBase extends UIService {
     public initDeMainStateMap(){
     }
 
+    /**
+     * 打开注视图
+     *
+     * @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 = {};
+        const _args: any[] = Util.deepCopy(args);
+        const _this: any = actionContext;
+        const actionTarget: string | null = 'SINGLEKEY';
+        Object.assign(context, { ibzdepartment: '%ibzdepartment%' });
+        Object.assign(params, { deptid: '%ibzdepartment%' });
+        Object.assign(params, { deptname: '%deptname%' });
+        context = UIActionTool.handleContextParam(actionTarget,_args,context);
+        data = UIActionTool.handleActionParam(actionTarget,_args,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;
+                    if(window.opener){
+                        window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
+                        window.close();
+                    }
+                    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 = {};
+        const _args: any[] = Util.deepCopy(args);
+        const _this: any = actionContext;
+        const actionTarget: string | null = 'NONE';
+        context = UIActionTool.handleContextParam(actionTarget,_args,context);
+        data = UIActionTool.handleActionParam(actionTarget,_args,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);
+                    }
+                    if(window.opener){
+                        window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
+                        window.close();
+                    }
+                    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

@@ -81,6 +81,7 @@ export default class IBZEmployeeUIServiceBase extends UIService {
     public initViewMap(){
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'ibzemployees'});
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'ibzemployees'});
+        this.allViewMap.set(':',{viewname:'optionview',srfappde:'ibzemployees'});
         this.allViewMap.set(':',{viewname:'changepwdview',srfappde:'ibzemployees'});
     }
 
@@ -92,6 +93,50 @@ export default class IBZEmployeeUIServiceBase extends UIService {
     public initDeMainStateMap(){
     }
 
+    /**
+     * 打开主视图
+     *
+     * @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 = {};
+        const _args: any[] = Util.deepCopy(args);
+        const _this: any = actionContext;
+        const actionTarget: string | null = 'SINGLEKEY';
+        Object.assign(context, { ibzemployee: '%ibzemployee%' });
+        Object.assign(params, { userid: '%ibzemployee%' });
+        Object.assign(params, { personname: '%personname%' });
+        context = UIActionTool.handleContextParam(actionTarget,_args,context);
+        data = UIActionTool.handleActionParam(actionTarget,_args,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' },
+            { pathName: 'editview', parameterName: 'editview' },
+        ];
+        const openIndexViewTab = (data: any) => {
+            const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
+            actionContext.$router.push(routePath);
+            return null;
+        }
+        openIndexViewTab(data);
+    }
+
     /**
      * 初始化密码
      *
@@ -148,6 +193,67 @@ export default class IBZEmployeeUIServiceBase extends UIService {
         backend();
     }
 
+    /**
+     * 新建
+     *
+     * @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 = {};
+        const _args: any[] = Util.deepCopy(args);
+        const _this: any = actionContext;
+        const actionTarget: string | null = 'NONE';
+        context = UIActionTool.handleContextParam(actionTarget,_args,context);
+        data = UIActionTool.handleActionParam(actionTarget,_args,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);
+                    }
+                    if(window.opener){
+                        window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
+                        window.close();
+                    }
+                    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);
+    }
+
 
     /**
      * 获取指定数据的重定向页面

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

@@ -143,8 +143,8 @@ export default class IBZOrganizationUIServiceBase extends UIService {
             }
             const view: any = {
                 viewname: 'ibzorganization-option-view', 
-                height: 0, 
-                width: 0,  
+                height: 400, 
+                width: 700,  
                 title: actionContext.$t('entities.ibzorganization.views.optionview.title'),
             };
             openPopupModal(view, data);

app_web/src/widgets/ibzdepartment/new-form-form/new-form-form-model.ts

+/**
+ * NewForm 部件模型
+ *
+ * @export
+ * @class NewFormModel
+ */
+export default class NewFormModel {
+
+  /**
+  * 获取数据项集合
+  *
+  * @returns {any[]}
+  * @memberof NewFormModel
+  */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'srfwfmemo',
+        prop: 'srfwfmemo',
+        dataType: 'TEXT',
+      },
+      // 前端新增修改标识，新增为"0",修改为"1"或未设值
+      {
+        name: 'srffrontuf',
+        prop: 'srffrontuf',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'srfupdatedate',
+        prop: 'updatedate',
+        dataType: 'DATETIME',
+      },
+      {
+        name: 'srforikey',
+      },
+      {
+        name: 'srfkey',
+        prop: 'deptid',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'srfmajortext',
+        prop: 'deptname',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'srftempmode',
+      },
+      {
+        name: 'srfuf',
+      },
+      {
+        name: 'srfdeid',
+      },
+      {
+        name: 'srfsourcekey',
+      },
+      {
+        name: 'deptcode',
+        prop: 'deptcode',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'deptname',
+        prop: 'deptname',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'orgname',
+        prop: 'orgname',
+        dataType: 'PICKUPTEXT',
+      },
+      {
+        name: 'pdeptname',
+        prop: 'parentdeptname',
+        dataType: 'PICKUPTEXT',
+      },
+      {
+        name: 'pdeptid',
+        prop: 'parentdeptid',
+        dataType: 'PICKUP',
+      },
+      {
+        name: 'deptid',
+        prop: 'deptid',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'orgid',
+        prop: 'orgid',
+        dataType: 'PICKUP',
+      },
+      {
+        name: 'ibzdepartment',
+        prop: 'deptid',
+        dataType: 'FONTKEY',
+      },
+    ]
+  }
+
+}
\ No newline at end of file

app_web/src/widgets/ibzdepartment/new-form-form/new-form-form.less

+.ivu-tabs-no-animation>.ivu-tabs-content{
+    padding: 0 16px;
+}
+.ivu-card-head{
+    padding: 14px 0;
+}
+.app-form {
+    overflow: auto;
+    > .ivu-row {
+        > .ivu-tabs {
+            height: 100%;
+            display: flex;
+            flex-direction: column;
+            > .ivu-tabs-content {
+                flex-grow: 1;
+                overflow: auto;
+                > .ivu-tabs-tabpane {
+                    height: 100%;
+                }
+            }
+        }
+    }
+}
+.app-tabpanel-flex {
+    height: 100%;
+    > .ivu-tabs-content {
+        height: calc(100% - 52px);
+        > .ivu-tabs-tabpane {
+            height: 100%;
+        }
+    }
+}
+
+.app-form {
+    >.ivu-row:nth-child(2) {
+        >.ivu-col:nth-child(1) {
+            >.ivu-row.app-form-group.app-group-hiddden-caption:nth-child(1) {
+                margin-top: 12px;
+            }
+        }
+    }
+}
+// 表单行间距
+.app-form{
+  .app-form-item{
+    margin-bottom: 20px;
+  }
+}
+// this is less

app_web/src/widgets/ibzdepartment/new-form-form/new-form-form.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import NewFormBase from './new-form-form-base.vue';
+
+ 
+@Component({
+    components: {
+         
+    }
+})
+export default class NewForm extends NewFormBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/widgets/ibzemployee/new-form-form/new-form-form.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import NewFormBase from './new-form-form-base.vue';
+
+ 
+@Component({
+    components: {
+         
+    }
+})
+export default class NewForm extends NewFormBase {
+
+}
+</script>
\ No newline at end of file