ibiz4j 发布系统代码

app_web/public/assets/json/data-dictionary.json

@@ -8,6 +8,7 @@
                 "id": "男",
                 "label": "男性",
                 "text": "男性",
+                "class":"",
                 "data":"",
                 "codename":"Item_1",
                 "value": "男",
@@ -18,6 +19,7 @@
                 "id": "女",
                 "label": "女性",
                 "text": "女性",
+                "class":"",
                 "data":"",
                 "codename":"Item_2",
                 "value": "女",
@@ -28,6 +30,7 @@
                 "id": "性别不详",
                 "label": "性别不详",
                 "text": "性别不详",
+                "class":"",
                 "data":"",
                 "codename":"Item_3",
                 "value": "性别不详",

app_web/public/environments/environment.js

+window.Environment = {
+    // 应用基础路径
+    BaseUrl: '',
+    // 是否为开发模式
+    devMode: true,
+    // 是否为pc端应用
+    isAppMode:true,
+    // 是否开启权限认证
+    enablePermissionValid:false,
+    // 打开目标工具，可选参数：sln、mos
+    debugOpenMode:'mos',
+    // 配置平台地址
+    StudioUrl: "http://172.16.170.145/mos/",
+    // 中心标识
+    SlnId: "B4BF5C84-D020-4D9A-A986-8FA4FD72816C",
+    // 系统标识
+    SysId: "B428B5BE-EA90-4101-A493-BA7085D89F0A",
+    // 前端应用标识
+    AppId: "6e0b7357169ef4eba84e1347ed94bd84",
+}
\ No newline at end of file

app_web/src/authservice/auth-service-register.ts

@@ -39,13 +39,13 @@ export class AuthServiceRegister {
      * @memberof AuthServiceRegister
      */
     protected init(): void {
-                this.allAuthService.set('ibzdeptmember', () => import('@/authservice/ibzdept-member/ibzdept-member-auth-service'));
-        this.allAuthService.set('ibzteammember', () => import('@/authservice/ibzteam-member/ibzteam-member-auth-service'));
-        this.allAuthService.set('ibzdepartment', () => import('@/authservice/ibzdepartment/ibzdepartment-auth-service'));
-        this.allAuthService.set('ibzemployee', () => import('@/authservice/ibzemployee/ibzemployee-auth-service'));
+                this.allAuthService.set('ibzpost', () => import('@/authservice/ibzpost/ibzpost-auth-service'));
         this.allAuthService.set('ibzorganization', () => import('@/authservice/ibzorganization/ibzorganization-auth-service'));
-        this.allAuthService.set('ibzpost', () => import('@/authservice/ibzpost/ibzpost-auth-service'));
         this.allAuthService.set('ibzteam', () => import('@/authservice/ibzteam/ibzteam-auth-service'));
+        this.allAuthService.set('ibzdeptmember', () => import('@/authservice/ibzdept-member/ibzdept-member-auth-service'));
+        this.allAuthService.set('ibzdepartment', () => import('@/authservice/ibzdepartment/ibzdepartment-auth-service'));
+        this.allAuthService.set('ibzteammember', () => import('@/authservice/ibzteam-member/ibzteam-member-auth-service'));
+        this.allAuthService.set('ibzemployee', () => import('@/authservice/ibzemployee/ibzemployee-auth-service'));
     }
 
     /**

app_web/src/components/app-actionbar/app-actionbar.vue

@@ -12,6 +12,7 @@
 <script lang="ts">
 import { Vue, Component, Prop, Model, Emit,Inject, Watch } from "vue-property-decorator";
 import { Subject,Subscription } from "rxjs";
+import { Environment } from '@/environments/environment';
 
 @Component({})
 export default class AppActionBar extends Vue {
@@ -99,37 +100,39 @@ export default class AppActionBar extends Vue {
    * @memberof AppActionBar
    */
   public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
-    for (const key in ActionModel) {
-        if (!ActionModel.hasOwnProperty(key)) {
-            return;
-        }
-        const _item = ActionModel[key];
-        if(_item && _item['dataaccaction'] && UIService){
-            let dataActionResult:any;
-            if(Object.is(_item['actiontarget'],"NONE")){
-                dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
-            }else{
-                if(data && Object.keys(data).length >0){
-                    dataActionResult = UIService.getAllOPPrivs(data)[_item['dataaccaction']];
-                }
-            }
-            // 无权限:0;有权限:1
-            if(dataActionResult === 0){
-                // 禁用:1;隐藏:2;隐藏且默认隐藏:6
-                if(_item.noprivdisplaymode === 1){
-                    _item.disabled = true;
-                }
-                if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
-                    _item.visabled = false;
-                }else{
-                    _item.visabled = true;
-                }
-            }
-            if(dataActionResult === 1){
-                _item.visabled = true;
-                _item.disabled = false;
-            }
-        }
+    if(Environment.enablePermissionValid){
+      for (const key in ActionModel) {
+          if (!ActionModel.hasOwnProperty(key)) {
+              return;
+          }
+          const _item = ActionModel[key];
+          if(_item && _item['dataaccaction'] && UIService){
+              let dataActionResult:any;
+              if(Object.is(_item['actiontarget'],"NONE")){
+                  dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
+              }else{
+                  if(data && Object.keys(data).length >0){
+                      dataActionResult = UIService.getAllOPPrivs(data)[_item['dataaccaction']];
+                  }
+              }
+              // 无权限:0;有权限:1
+              if(dataActionResult === 0){
+                  // 禁用:1;隐藏:2;隐藏且默认隐藏:6
+                  if(_item.noprivdisplaymode === 1){
+                      _item.disabled = true;
+                  }
+                  if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
+                      _item.visabled = false;
+                  }else{
+                      _item.visabled = true;
+                  }
+              }
+              if(dataActionResult === 1){
+                  _item.visabled = true;
+                  _item.disabled = false;
+              }
+          }
+      }
     }
   } 
 

app_web/src/components/app-embed-picker/app-embed-picker.vue

@@ -222,7 +222,12 @@ export default class AppEmbedPicker extends Vue {
         if(Object.is(newFormData[this.refreshitems], oldDormData[this.refreshitems])) {
             return;
         }
-        this.setValue([{srfmajortext: null, srfkey: null}]);
+        if (this.valueItem) {
+            this.$emit('formitemvaluechange', { name: this.valueItem, value: null });
+        }
+        if (this.name) {
+            this.$emit('formitemvaluechange', { name: this.name, value: null });
+        }
     }
 
     /**
@@ -231,6 +236,7 @@ export default class AppEmbedPicker extends Vue {
      * @memberof AppEmbedPicker
      */
     public created() {
+        this.setViewParam();
         if(this.formState) {
             this.formStateEvent = this.formState.subscribe(({ tag, action, data }) => {
                 if (Object.is('load', action)) {

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

@@ -108,6 +108,7 @@
 
 <script lang="ts">
 import { Vue, Component, Prop, Watch } from 'vue-property-decorator';
+import { Environment } from '@/environments/environment';
 
 @Component({})
 export default class AppFormGroup extends Vue {
@@ -157,36 +158,38 @@ export default class AppFormGroup extends Vue {
      * @memberof AppFormGroup
      */
     public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
-        for (const key in ActionModel) {
-            if (!ActionModel.hasOwnProperty(key)) {
-                return;
-            }
-            const _item = ActionModel[key];
-            if(_item && _item['dataaccaction'] && UIService){
-                let dataActionResult:any;
-                if(Object.is(_item['actiontarget'],"NONE")){
-                    dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
-                }else{
-                    if(data && Object.keys(data).length >0){
-                        dataActionResult = UIService.getAllOPPrivs(data)[_item['dataaccaction']];
-                    }
+        if(Environment.enablePermissionValid){
+            for (const key in ActionModel) {
+                if (!ActionModel.hasOwnProperty(key)) {
+                    return;
                 }
-                // 无权限:0;有权限:1
-                if(dataActionResult === 0){
-                    // 禁用:1;隐藏:2;隐藏且默认隐藏:6
-                    if(_item.noprivdisplaymode === 1){
-                        _item.disabled = true;
-                    }
-                    if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
-                        _item.visabled = false;
+                const _item = ActionModel[key];
+                if(_item && _item['dataaccaction'] && UIService){
+                    let dataActionResult:any;
+                    if(Object.is(_item['actiontarget'],"NONE")){
+                        dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);
                     }else{
+                        if(data && Object.keys(data).length >0){
+                            dataActionResult = UIService.getAllOPPrivs(data)[_item['dataaccaction']];
+                        }
+                    }
+                    // 无权限:0;有权限:1
+                    if(dataActionResult === 0){
+                        // 禁用:1;隐藏:2;隐藏且默认隐藏:6
+                        if(_item.noprivdisplaymode === 1){
+                            _item.disabled = true;
+                        }
+                        if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
+                            _item.visabled = false;
+                        }else{
+                            _item.visabled = true;
+                        }
+                    }
+                    if(dataActionResult === 1){
                         _item.visabled = true;
+                        _item.disabled = false;
                     }
                 }
-                if(dataActionResult === 1){
-                    _item.visabled = true;
-                    _item.disabled = false;
-                }
             }
         }
     } 

app_web/src/components/app-message-popover/app-message-popover.less

@@ -19,10 +19,12 @@
   padding-top: 2px;
   padding-right: 2px;
   color: #aaa;
+  cursor: pointer;
 }
 
 .Row {
-  height: 70px;
+  min-height: 70px;
+  height: auto;
   border-bottom: 1px solid lightgray;
   display: flex;
   align-items: center;
@@ -34,20 +36,24 @@
 
   .column2 {
     border: 0px red solid;
-
     .process-definition-name {
       font-size: 14px;
+      padding-top: 5px; 
+    }
+    .description {
+      margin-top: 6px;
+      margin-bottom: 6px;
+      max-width: 95%;
+    }
+    .createtime {
+      padding-bottom: 5px;
     }
 
     .el-row {
       display: flex;
-
       .el-col {
         flex-grow: 1;
 
-        div {
-          margin-bottom: 5px;
-        }
         div:first-child {
           font-weight: 500;
           overflow: hidden;

app_web/src/components/app-message-popover/app-message-popover.vue

@@ -20,8 +20,8 @@
                                     <el-row :draggable="false">
                                         <el-col :span="16" :draggable="false">
                                             <div class="process-definition-name" :draggable="false"><strong>{{myTask.processDefinitionName}}</strong></div>
-                                            <div :draggable="false">{{myTask.description}}</div>
-                                            <div :draggable="false">{{ formatDate(myTask.createTime, 'MM-DD hh:mm') }}</div>
+                                            <div class="description" :draggable="false">{{myTask.description}}</div>
+                                            <div class="createtime" :draggable="false">{{ formatDate(myTask.createTime, 'MM-DD hh:mm') }}</div>
                                         </el-col>
                                         <el-col :span="5" :draggable="false" style='display: flex; align-items: center'>
                                             <el-tag :type="myTask.name.indexOf('驳回')!=-1?'danger':(myTask.name.indexOf('成功')!=-1?'success':(myTask.name.indexOf('取消')!=-1?'info':'-'))"
@@ -54,8 +54,8 @@
                                     <el-row :draggable="false">
                                         <el-col :span="16" :draggable="false">
                                             <div class="process-definition-name" :draggable="false"><strong>{{myMsg.processDefinitionName}}</strong></div>
-                                            <div :draggable="false">{{myMsg.description}}</div>
-                                            <div :draggable="false">{{ formatDate(myMsg.createTime, 'MM-DD hh:mm') }}</div>
+                                            <div class="description" :draggable="false">{{myMsg.description}}</div>
+                                            <div class="createtime" :draggable="false">{{ formatDate(myMsg.createTime, 'MM-DD hh:mm') }}</div>
                                         </el-col>
                                         <el-col :span="5" :draggable="false" style='display: flex; align-items: center'>
                                             <el-tag :type="myMsg.name.indexOf('驳回')!=-1?'danger':(myMsg.name.indexOf('成功')!=-1?'success':(myMsg.name.indexOf('取消')!=-1?'info':'-'))"

app_web/src/components/app-transfer/app-transfer.less

@@ -5,11 +5,21 @@
           display: none;
       }
       .el-transfer{
+          max-height: 200px;
           min-width: 100% !important;
           display: flex;
           justify-content: space-between;
           .el-transfer-panel{
               min-width: 25%;
+              .el-transfer-panel__body{
+                max-height: 160px;
+                .el-checkbox-group{
+                    max-height: 160px;
+                    .el-checkbox+.el-checkbox {
+                        margin-left: 0px; 
+                    }
+                }
+            }
           }
           .el-transfer__buttons{
               align-self: center;

app_web/src/components/app-wf-approval/app-wf-approval.vue

@@ -5,30 +5,35 @@
             <span>{{data.startUserName}}{{$t('components.appWFApproval.commit')}}</span>
         </div>
         <div class="app-wf-approval-content" v-if="data.usertasks && data.usertasks.length >0">
-            <div class="approval-content-item" v-for="(usertask,index) in data.usertasks" :key="index">
-                <div class="approval-content-item-left">
-                    {{usertask.userTaskName}}
-                </div>
-                <div class="approval-content-item-right">
-                    <div class="approval-content-item-wait" v-if="usertask.identitylinks.length >0">
-                        {{$t('components.appWFApproval.wait')}}<span v-for="(identitylink,inx) in usertask.identitylinks" :key="inx">{{identitylink.displayname}}<span v-if="inx >0">、</span></span>{{$t('components.appWFApproval.handle')}}
-                    </div>
-                    <div class="approval-content-item-info" v-if="usertask.comments.length >0">
-                        <div v-for="(comment,commentInx) in usertask.comments" :key="commentInx">
-                            <div class="approval-content-item-info-item approval-content-item-info-top">
-                                {{`【${comment.type}】${comment.fullMessage}`}}
+            <template v-for="(usertask,index) in data.usertasks" >
+                <template v-if="usertask.identitylinks.length >0">
+                    <div class="approval-content-item" :key="index">
+                        <div class="approval-content-item-left">
+                            {{usertask.userTaskName}}
+                        </div>
+                        <div class="approval-content-item-right">
+                            <div class="approval-content-item-wait" v-if="usertask.identitylinks.length >0">
+                                {{$t('components.appWFApproval.wait')}}<span v-for="(identitylink,inx) in usertask.identitylinks" :key="inx">{{identitylink.displayname}}<span v-if="inx >0">、</span></span>{{$t('components.appWFApproval.handle')}}
                             </div>
-                             <div class="approval-content-item-info-item approval-content-item-info-bottom">
-                                <span class="info-bottom-name">{{comment.authorName}}</span>
-                                <span>{{comment.time}}</span>
+                            <div class="approval-content-item-info" v-if="usertask.comments.length >0">
+                                <div v-for="(comment,commentInx) in usertask.comments" :key="commentInx">
+                                    <div class="approval-content-item-info-item approval-content-item-info-top">
+                                        {{`【${comment.type}】${comment.fullMessage}`}}
+                                    </div>
+                                    <div class="approval-content-item-info-item approval-content-item-info-bottom">
+                                        <span class="info-bottom-name">{{comment.authorName}}</span>
+                                        <span>{{comment.time}}</span>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="approval-content-item-memo" v-if="usertask.userTaskId === viewparams.userTaskId">
+                                <el-input type="textarea"  v-model="initmemo" :rows="2" @blur="handleBlur" :placeholder="$t('components.appWFApproval.placeholder')"></el-input>
                             </div>
                         </div>
                     </div>
-                    <div class="approval-content-item-memo" v-if="usertask.userTaskId === viewparams.userTaskId">
-                        <el-input type="textarea"  v-model="initmemo" :rows="2" @blur="handleBlur" :placeholder="$t('components.appWFApproval.placeholder')"></el-input>
-                    </div>
-                </div>
-            </div>
+                </template>
+            </template>
+            
         </div>
          <div class="app-wf-approval-bottom">
             <span v-if="data.endTime">{{data.endTime}}{{$t('components.appWFApproval.end')}}</span>

app_web/src/components/dropdown-list-dynamic/dropdown-list-dynamic.vue

@@ -8,7 +8,7 @@
         :filterable="filterable"
         @on-open-change="onClick"
         :placeholder="$t('components.dropDownListDynamic.placeholder')">
-        <i-option v-for="(item, index) in items" :key="index" :value="item.value">{{($t('userCustom.'+tag+'.'+item.value)!== ('userCustom.'+tag+'.'+item.value))?$t('userCustom.'+tag+'.'+item.value) : item.text}}</i-option>
+        <i-option v-for="(item, index) in items" :key="index" :class="item.class" :value="item.value">{{($t('userCustom.'+tag+'.'+item.value)!== ('userCustom.'+tag+'.'+item.value))?$t('userCustom.'+tag+'.'+item.value) : item.text}}</i-option>
     </i-select>
 </template>
 

app_web/src/components/dropdown-list-mpicker/dropdown-list-mpicker.vue

@@ -12,7 +12,7 @@
             :filterable="filterable"
             @on-open-change="onClick"
             :placeholder="$t('components.dropDownListMpicker.placeholder')">
-            <i-option v-for="(item, index) in items" :key="index" :value="item.value.toString()" :label="item.text">
+            <i-option v-for="(item, index) in items" :key="index" :class="item.class" :value="item.value.toString()" :label="item.text">
             <Checkbox :value = "(currentVal.indexOf(item.value.toString()))==-1?false:true">
                 {{Object.is(codelistType,'STATIC') ? $t('codelist.'+tag+'.'+item.value) : item.text}}
             </Checkbox>

app_web/src/components/dropdown-list/dropdown-list.vue

@@ -9,7 +9,7 @@
         :filterable="filterable"
         @on-open-change="onClick"
         :placeholder="$t('components.dropDownList.placeholder')">
-        <i-option v-for="(item, index) in items" :key="index" :value="item.value">{{($t('codelist.'+tag+'.'+item.value)!== ('codelist.'+tag+'.'+item.value))?$t('codelist.'+tag+'.'+item.value) : item.text}}</i-option>
+        <i-option v-for="(item, index) in items" :key="index" :class="item.class" :value="item.value">{{($t('codelist.'+tag+'.'+item.value)!== ('codelist.'+tag+'.'+item.value))?$t('codelist.'+tag+'.'+item.value) : item.text}}</i-option>
         </i-select>
         <ibiz-select-tree v-if="hasChildren" class="tree-dropdown-list" :disabled="disabled" :NodesData="items" v-model="currentVal" :multiple="false"></ibiz-select-tree>
     </div>

app_web/src/engine/view/view-engine.ts

+import { Environment } from '@/environments/environment';
+
 /**
  * 
  *
@@ -184,37 +186,39 @@ export default class ViewEngine {
      * @memberof ViewEngine
      */
     public calcToolbarItemAuthState(data:any){
-        const _this: any = this;
-        for (const key in _this.view.toolBarModels) {
-            if (!_this.view.toolBarModels.hasOwnProperty(key)) {
-                return;
-            }
-            const _item = _this.view.toolBarModels[key];
-            if(_item && _item['dataaccaction'] && _this.view.appUIService){
-                let dataActionResult:any;
-                if (_item.uiaction && (Object.is(_item.uiaction.target, 'NONE'))){
-                    dataActionResult = _this.view.appUIService.getResourceOPPrivs(_item['dataaccaction']);
-                }else{
-                    if(data && Object.keys(data).length >0){
-                        dataActionResult= _this.view.appUIService.getAllOPPrivs(data)[_item['dataaccaction']];       
-                    }
+        if(Environment.enablePermissionValid){
+            const _this: any = this;
+            for (const key in _this.view.toolBarModels) {
+                if (!_this.view.toolBarModels.hasOwnProperty(key)) {
+                    return;
                 }
-                // 无权限:0;有权限:1
-                if(dataActionResult === 0){
-                    // 禁用:1;隐藏:2;隐藏且默认隐藏:6
-                    if(_item.noprivdisplaymode === 1){
-                        _this.view.toolBarModels[key].disabled = true;
-                    }
-                    if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
-                        _this.view.toolBarModels[key].visabled = false;
+                const _item = _this.view.toolBarModels[key];
+                if(_item && _item['dataaccaction'] && _this.view.appUIService){
+                    let dataActionResult:any;
+                    if (_item.uiaction && (Object.is(_item.uiaction.target, 'NONE'))){
+                        dataActionResult = _this.view.appUIService.getResourceOPPrivs(_item['dataaccaction']);
                     }else{
+                        if(data && Object.keys(data).length >0){
+                            dataActionResult= _this.view.appUIService.getAllOPPrivs(data)[_item['dataaccaction']];       
+                        }
+                    }
+                    // 无权限:0;有权限:1
+                    if(dataActionResult === 0){
+                        // 禁用:1;隐藏:2;隐藏且默认隐藏:6
+                        if(_item.noprivdisplaymode === 1){
+                            _this.view.toolBarModels[key].disabled = true;
+                        }
+                        if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
+                            _this.view.toolBarModels[key].visabled = false;
+                        }else{
+                            _this.view.toolBarModels[key].visabled = true;
+                        }
+                    }
+                    if(dataActionResult === 1){
                         _this.view.toolBarModels[key].visabled = true;
+                        _this.view.toolBarModels[key].disabled = false;
                     }
                 }
-                if(dataActionResult === 1){
-                    _this.view.toolBarModels[key].visabled = true;
-                    _this.view.toolBarModels[key].disabled = false;
-                }
             }
         }
     }   

app_web/src/environments/environment.ts

@@ -25,8 +25,10 @@ export const Environment = {
     enablePermissionValid:false,
     // 项目模板地址
     ProjectUrl: "http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7",
+    // 打开目标工具，可选参数：sln、mos
+    debugOpenMode:'mos',
     // 配置平台地址
-    StudioUrl: "http://172.16.170.145/slnstudio/",
+    StudioUrl: "http://172.16.170.145/mos/",
     // 中心标识
     SlnId: "B4BF5C84-D020-4D9A-A986-8FA4FD72816C",
     // 系统标识
@@ -34,9 +36,13 @@ export const Environment = {
     // 前端应用标识
     AppId: "6e0b7357169ef4eba84e1347ed94bd84",
     // 项目发布文件地址
-    PublishProjectUrl: 'http://oauth2:ymrzrgzh97axsgq_TjR3@labcs.ibizee.cn/ibiz4jteam/ibzou.git',
+    PublishProjectUrl: 'http://oauth2:cTux_e7Aoz1PrasP5dDq@demo.ibizlab.cn/ibiz4jteam/ibzou.git',
     // ibiz开放平台地址
     ibizlabtUrl: 'https://www.ibizlab.cn',
     // ibiz论坛地址
     ibizbbstUrl: 'https://bbs.ibizlab.cn',
-};
\ No newline at end of file
+};
+// 挂载外部配置文件
+if ((window as any).Environment) {
+    Object.assign(Environment, (window as any).Environment);
+}
\ No newline at end of file

app_web/src/locale/lang/en-US.ts

+import ibzpost_en_US from '@locale/lanres/entities/ibzpost/ibzpost_en_US';
+import ibzorganization_en_US from '@locale/lanres/entities/ibzorganization/ibzorganization_en_US';
+import ibzteam_en_US from '@locale/lanres/entities/ibzteam/ibzteam_en_US';
 import ibzdeptmember_en_US from '@locale/lanres/entities/ibzdept-member/ibzdept-member_en_US';
-import ibzteammember_en_US from '@locale/lanres/entities/ibzteam-member/ibzteam-member_en_US';
 import ibzdepartment_en_US from '@locale/lanres/entities/ibzdepartment/ibzdepartment_en_US';
+import ibzteammember_en_US from '@locale/lanres/entities/ibzteam-member/ibzteam-member_en_US';
 import ibzemployee_en_US from '@locale/lanres/entities/ibzemployee/ibzemployee_en_US';
-import ibzorganization_en_US from '@locale/lanres/entities/ibzorganization/ibzorganization_en_US';
-import ibzpost_en_US from '@locale/lanres/entities/ibzpost/ibzpost_en_US';
-import ibzteam_en_US from '@locale/lanres/entities/ibzteam/ibzteam_en_US';
 import components_en_US from '@locale/lanres/components/components_en_US';
 import codelist_en_US from '@locale/lanres/codelist/codelist_en_US';
 import userCustom_en_US from '@locale/lanres/userCustom/userCustom_en_US';
@@ -224,13 +224,13 @@ export default {
         },
     },
     entities: {
+        ibzpost: ibzpost_en_US,
+        ibzorganization: ibzorganization_en_US,
+        ibzteam: ibzteam_en_US,
         ibzdeptmember: ibzdeptmember_en_US,
-        ibzteammember: ibzteammember_en_US,
         ibzdepartment: ibzdepartment_en_US,
+        ibzteammember: ibzteammember_en_US,
         ibzemployee: ibzemployee_en_US,
-        ibzorganization: ibzorganization_en_US,
-        ibzpost: ibzpost_en_US,
-        ibzteam: ibzteam_en_US,
     },
     components: components_en_US,
     codelist: codelist_en_US,

app_web/src/locale/lang/zh-CN.ts

+import ibzpost_zh_CN from '@locale/lanres/entities/ibzpost/ibzpost_zh_CN';
+import ibzorganization_zh_CN from '@locale/lanres/entities/ibzorganization/ibzorganization_zh_CN';
+import ibzteam_zh_CN from '@locale/lanres/entities/ibzteam/ibzteam_zh_CN';
 import ibzdeptmember_zh_CN from '@locale/lanres/entities/ibzdept-member/ibzdept-member_zh_CN';
-import ibzteammember_zh_CN from '@locale/lanres/entities/ibzteam-member/ibzteam-member_zh_CN';
 import ibzdepartment_zh_CN from '@locale/lanres/entities/ibzdepartment/ibzdepartment_zh_CN';
+import ibzteammember_zh_CN from '@locale/lanres/entities/ibzteam-member/ibzteam-member_zh_CN';
 import ibzemployee_zh_CN from '@locale/lanres/entities/ibzemployee/ibzemployee_zh_CN';
-import ibzorganization_zh_CN from '@locale/lanres/entities/ibzorganization/ibzorganization_zh_CN';
-import ibzpost_zh_CN from '@locale/lanres/entities/ibzpost/ibzpost_zh_CN';
-import ibzteam_zh_CN from '@locale/lanres/entities/ibzteam/ibzteam_zh_CN';
 import components_zh_CN from '@locale/lanres/components/components_zh_CN';
 import codelist_zh_CN from '@locale/lanres/codelist/codelist_zh_CN';
 import userCustom_zh_CN from '@locale/lanres/userCustom/userCustom_zh_CN';
@@ -223,13 +223,13 @@ export default {
         },
     },
     entities: {
+        ibzpost: ibzpost_zh_CN,
+        ibzorganization: ibzorganization_zh_CN,
+        ibzteam: ibzteam_zh_CN,
         ibzdeptmember: ibzdeptmember_zh_CN,
-        ibzteammember: ibzteammember_zh_CN,
         ibzdepartment: ibzdepartment_zh_CN,
+        ibzteammember: ibzteammember_zh_CN,
         ibzemployee: ibzemployee_zh_CN,
-        ibzorganization: ibzorganization_zh_CN,
-        ibzpost: ibzpost_zh_CN,
-        ibzteam: ibzteam_zh_CN,
     },
     components: components_zh_CN,
     codelist: codelist_zh_CN,

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

@@ -20,38 +20,38 @@ export default {
     updatedate: "最后修改时间",
   },
 	views: {
-		optionview: {
-			caption: "部门快速新建",
-      		title: "部门快速新建",
-		},
-		editview: {
-			caption: "部门管理",
-      		title: "部门管理",
+		pickupview: {
+			caption: "部门",
+      		title: "部门选择视图",
 		},
-		editgridview: {
+		gridview: {
 			caption: "部门",
       		title: "部门表格视图",
 		},
-		pickupgridview: {
-			caption: "部门",
-      		title: "部门选择表格视图",
+		editview: {
+			caption: "部门管理",
+      		title: "部门管理",
 		},
 		mpickupview: {
 			caption: "部门",
       		title: "部门数据多项选择视图",
 		},
-		pickupview: {
-			caption: "部门",
-      		title: "部门选择视图",
+		optionview: {
+			caption: "部门快速新建",
+      		title: "部门快速新建",
 		},
 		treeexpview: {
 			caption: "人员管理",
       		title: "人员管理",
 		},
-		gridview: {
+		editgridview: {
 			caption: "部门",
       		title: "部门表格视图",
 		},
+		pickupgridview: {
+			caption: "部门",
+      		title: "部门选择表格视图",
+		},
 	},
 	newform_form: {
 		details: {
@@ -181,36 +181,6 @@ export default {
 			tip: "Copy {0}",
 		},
 	},
-	editgridviewtoolbar_toolbar: {
-		tbitem24: {
-			caption: "行编辑",
-			tip: "行编辑",
-		},
-		tbitem25: {
-			caption: "新建行",
-			tip: "新建行",
-		},
-		deuiaction1: {
-			caption: "保存行",
-			tip: "保存行",
-		},
-		tbitem26: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "Remove",
-			tip: "Remove {0}",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "Filter",
-			tip: "Filter",
-		},
-	},
 	gridviewtoolbar_toolbar: {
 		tbitem1_opennewcreateview: {
 			caption: "快速新建",
@@ -257,6 +227,36 @@ export default {
 			tip: "Filter",
 		},
 	},
+	editgridviewtoolbar_toolbar: {
+		tbitem24: {
+			caption: "行编辑",
+			tip: "行编辑",
+		},
+		tbitem25: {
+			caption: "新建行",
+			tip: "新建行",
+		},
+		deuiaction1: {
+			caption: "保存行",
+			tip: "保存行",
+		},
+		tbitem26: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
 	depttree_treeview: {
 		nodes: {
 			root: "默认根节点",

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

@@ -19,38 +19,38 @@ export default {
     updatedate: "最后修改时间",
   },
 	views: {
-		optionview: {
-			caption: "部门快速新建",
-      		title: "部门快速新建",
-		},
-		editview: {
-			caption: "部门管理",
-      		title: "部门管理",
+		pickupview: {
+			caption: "部门",
+      		title: "部门选择视图",
 		},
-		editgridview: {
+		gridview: {
 			caption: "部门",
       		title: "部门表格视图",
 		},
-		pickupgridview: {
-			caption: "部门",
-      		title: "部门选择表格视图",
+		editview: {
+			caption: "部门管理",
+      		title: "部门管理",
 		},
 		mpickupview: {
 			caption: "部门",
       		title: "部门数据多项选择视图",
 		},
-		pickupview: {
-			caption: "部门",
-      		title: "部门选择视图",
+		optionview: {
+			caption: "部门快速新建",
+      		title: "部门快速新建",
 		},
 		treeexpview: {
 			caption: "人员管理",
       		title: "人员管理",
 		},
-		gridview: {
+		editgridview: {
 			caption: "部门",
       		title: "部门表格视图",
 		},
+		pickupgridview: {
+			caption: "部门",
+      		title: "部门选择表格视图",
+		},
 	},
 	newform_form: {
 		details: {
@@ -180,36 +180,6 @@ export default {
 			tip: "拷贝",
 		},
 	},
-	editgridviewtoolbar_toolbar: {
-		tbitem24: {
-			caption: "行编辑",
-			tip: "行编辑",
-		},
-		tbitem25: {
-			caption: "新建行",
-			tip: "新建行",
-		},
-		deuiaction1: {
-			caption: "保存行",
-			tip: "保存行",
-		},
-		tbitem26: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "删除",
-			tip: "删除",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "过滤",
-			tip: "过滤",
-		},
-	},
 	gridviewtoolbar_toolbar: {
 		tbitem1_opennewcreateview: {
 			caption: "快速新建",
@@ -256,6 +226,36 @@ export default {
 			tip: "过滤",
 		},
 	},
+	editgridviewtoolbar_toolbar: {
+		tbitem24: {
+			caption: "行编辑",
+			tip: "行编辑",
+		},
+		tbitem25: {
+			caption: "新建行",
+			tip: "新建行",
+		},
+		deuiaction1: {
+			caption: "保存行",
+			tip: "保存行",
+		},
+		tbitem26: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
 	depttree_treeview: {
 		nodes: {
 			root: "默认根节点",

app_web/src/locale/lanres/entities/ibzdept-member/ibzdept-member_en_US.ts

@@ -12,14 +12,14 @@ export default {
     domains: "区属",
   },
 	views: {
-		editview: {
-			caption: "部门成员",
-      		title: "部门成员编辑视图",
-		},
 		gridview: {
 			caption: "部门成员",
       		title: "部门成员表格视图",
 		},
+		editview: {
+			caption: "部门成员",
+      		title: "部门成员编辑视图",
+		},
 	},
 	main_form: {
 		details: {

app_web/src/locale/lanres/entities/ibzdept-member/ibzdept-member_zh_CN.ts

@@ -11,14 +11,14 @@ export default {
     domains: "区属",
   },
 	views: {
-		editview: {
-			caption: "部门成员",
-      		title: "部门成员编辑视图",
-		},
 		gridview: {
 			caption: "部门成员",
       		title: "部门成员表格视图",
 		},
+		editview: {
+			caption: "部门成员",
+      		title: "部门成员编辑视图",
+		},
 	},
 	main_form: {
 		details: {

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

@@ -39,10 +39,6 @@ export default {
     updatedate: "最后修改时间",
   },
 	views: {
-		editgridview: {
-			caption: "人员",
-      		title: "人员表格视图",
-		},
 		editview: {
 			caption: "人员管理",
       		title: "人员管理",
@@ -51,18 +47,18 @@ export default {
 			caption: "人员",
       		title: "人员表格视图",
 		},
-		mpickupview: {
+		changepwdview: {
 			caption: "人员",
-      		title: "人员数据多项选择视图",
+      		title: "人员编辑视图",
+		},
+		editgridview: {
+			caption: "人员",
+      		title: "人员表格视图",
 		},
 		optionview: {
 			caption: "人员快速新建",
       		title: "人员快速新建",
 		},
-		changepwdview: {
-			caption: "人员",
-      		title: "人员编辑视图",
-		},
 		pickupview: {
 			caption: "人员",
       		title: "人员数据选择视图",
@@ -71,6 +67,10 @@ export default {
 			caption: "人员",
       		title: "人员选择表格视图",
 		},
+		mpickupview: {
+			caption: "人员",
+      		title: "人员数据多项选择视图",
+		},
 	},
 	main_form: {
 		details: {
@@ -167,7 +167,7 @@ export default {
 		uiactions: {
 		},
 	},
-	editgrid_grid: {
+	main_grid: {
 		columns: {
 			usercode: "用户工号",
 			personname: "姓名",
@@ -184,7 +184,7 @@ export default {
 		uiactions: {
 		},
 	},
-	main_grid: {
+	editgrid_grid: {
 		columns: {
 			usercode: "用户工号",
 			personname: "姓名",
@@ -211,36 +211,6 @@ export default {
 		uiactions: {
 		},
 	},
-	editgridviewtoolbar_toolbar: {
-		tbitem24: {
-			caption: "行编辑",
-			tip: "行编辑",
-		},
-		tbitem25: {
-			caption: "新建行",
-			tip: "新建行",
-		},
-		deuiaction1: {
-			caption: "保存行",
-			tip: "保存行",
-		},
-		tbitem26: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "Remove",
-			tip: "Remove {0}",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "Filter",
-			tip: "Filter",
-		},
-	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "Save",
@@ -323,4 +293,34 @@ export default {
 			tip: "Save",
 		},
 	},
+	editgridviewtoolbar_toolbar: {
+		tbitem24: {
+			caption: "行编辑",
+			tip: "行编辑",
+		},
+		tbitem25: {
+			caption: "新建行",
+			tip: "新建行",
+		},
+		deuiaction1: {
+			caption: "保存行",
+			tip: "保存行",
+		},
+		tbitem26: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
 };
\ No newline at end of file

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

@@ -38,10 +38,6 @@ export default {
     updatedate: "最后修改时间",
   },
 	views: {
-		editgridview: {
-			caption: "人员",
-      		title: "人员表格视图",
-		},
 		editview: {
 			caption: "人员管理",
       		title: "人员管理",
@@ -50,18 +46,18 @@ export default {
 			caption: "人员",
       		title: "人员表格视图",
 		},
-		mpickupview: {
+		changepwdview: {
 			caption: "人员",
-      		title: "人员数据多项选择视图",
+      		title: "人员编辑视图",
+		},
+		editgridview: {
+			caption: "人员",
+      		title: "人员表格视图",
 		},
 		optionview: {
 			caption: "人员快速新建",
       		title: "人员快速新建",
 		},
-		changepwdview: {
-			caption: "人员",
-      		title: "人员编辑视图",
-		},
 		pickupview: {
 			caption: "人员",
       		title: "人员数据选择视图",
@@ -70,6 +66,10 @@ export default {
 			caption: "人员",
       		title: "人员选择表格视图",
 		},
+		mpickupview: {
+			caption: "人员",
+      		title: "人员数据多项选择视图",
+		},
 	},
 	main_form: {
 		details: {
@@ -166,7 +166,7 @@ export default {
 		uiactions: {
 		},
 	},
-	editgrid_grid: {
+	main_grid: {
 		columns: {
 			usercode: "用户工号",
 			personname: "姓名",
@@ -183,7 +183,7 @@ export default {
 		uiactions: {
 		},
 	},
-	main_grid: {
+	editgrid_grid: {
 		columns: {
 			usercode: "用户工号",
 			personname: "姓名",
@@ -210,36 +210,6 @@ export default {
 		uiactions: {
 		},
 	},
-	editgridviewtoolbar_toolbar: {
-		tbitem24: {
-			caption: "行编辑",
-			tip: "行编辑",
-		},
-		tbitem25: {
-			caption: "新建行",
-			tip: "新建行",
-		},
-		deuiaction1: {
-			caption: "保存行",
-			tip: "保存行",
-		},
-		tbitem26: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "删除",
-			tip: "删除",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "过滤",
-			tip: "过滤",
-		},
-	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "保存",
@@ -322,4 +292,34 @@ export default {
 			tip: "保存",
 		},
 	},
+	editgridviewtoolbar_toolbar: {
+		tbitem24: {
+			caption: "行编辑",
+			tip: "行编辑",
+		},
+		tbitem25: {
+			caption: "新建行",
+			tip: "新建行",
+		},
+		deuiaction1: {
+			caption: "保存行",
+			tip: "保存行",
+		},
+		tbitem26: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
 };
\ No newline at end of file

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

@@ -15,33 +15,34 @@ export default {
     updatedate: "最后修改时间",
   },
 	views: {
-		editview: {
-			caption: "单位管理",
-      		title: "单位管理",
+		optionview: {
+			caption: "单位快速新建",
+      		title: "单位快速新建",
 		},
 		treeexpview: {
 			caption: "部门管理",
       		title: "部门管理",
 		},
-		pickupgridview: {
-			caption: "单位机构",
-      		title: "单位机构选择表格视图",
+		editview: {
+			caption: "单位管理",
+      		title: "单位管理",
 		},
-		optionview: {
-			caption: "单位快速新建",
-      		title: "单位快速新建",
+		gridview: {
+			caption: "单位管理",
+      		title: "单位管理",
 		},
 		pickupview: {
 			caption: "单位机构",
       		title: "单位机构数据选择视图",
 		},
-		gridview: {
-			caption: "单位管理",
-      		title: "单位管理",
+		pickupgridview: {
+			caption: "单位机构",
+      		title: "单位机构选择表格视图",
 		},
 	},
-	main_form: {
+	newform_form: {
 		details: {
+			group1: "单位机构基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "最后修改时间", 
 			srforikey: "", 
@@ -51,23 +52,18 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			orgid: "单位标识", 
 			orgcode: "单位代码", 
 			orgname: "名称", 
 			porgname: "上级单位", 
-			orglevel: "单位级别", 
-			shortname: "单位简称", 
-			showorder: "排序", 
 			porgid: "上级单位", 
-			createdate: "创建时间", 
-			updatedate: "最后修改时间", 
+			enable: "逻辑有效", 
+			orgid: "单位标识", 
 		},
 		uiactions: {
 		},
 	},
-	newform_form: {
+	main_form: {
 		details: {
-			group1: "单位机构基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "最后修改时间", 
 			srforikey: "", 
@@ -77,12 +73,16 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
+			orgid: "单位标识", 
 			orgcode: "单位代码", 
 			orgname: "名称", 
 			porgname: "上级单位", 
+			orglevel: "单位级别", 
+			shortname: "单位简称", 
+			showorder: "排序", 
 			porgid: "上级单位", 
-			enable: "逻辑有效", 
-			orgid: "单位标识", 
+			createdate: "创建时间", 
+			updatedate: "最后修改时间", 
 		},
 		uiactions: {
 		},

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

@@ -14,33 +14,34 @@ export default {
     updatedate: "最后修改时间",
   },
 	views: {
-		editview: {
-			caption: "单位管理",
-      		title: "单位管理",
+		optionview: {
+			caption: "单位快速新建",
+      		title: "单位快速新建",
 		},
 		treeexpview: {
 			caption: "部门管理",
       		title: "部门管理",
 		},
-		pickupgridview: {
-			caption: "单位机构",
-      		title: "单位机构选择表格视图",
+		editview: {
+			caption: "单位管理",
+      		title: "单位管理",
 		},
-		optionview: {
-			caption: "单位快速新建",
-      		title: "单位快速新建",
+		gridview: {
+			caption: "单位管理",
+      		title: "单位管理",
 		},
 		pickupview: {
 			caption: "单位机构",
       		title: "单位机构数据选择视图",
 		},
-		gridview: {
-			caption: "单位管理",
-      		title: "单位管理",
+		pickupgridview: {
+			caption: "单位机构",
+      		title: "单位机构选择表格视图",
 		},
 	},
-	main_form: {
+	newform_form: {
 		details: {
+			group1: "单位机构基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "最后修改时间", 
 			srforikey: "", 
@@ -50,23 +51,18 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			orgid: "单位标识", 
 			orgcode: "单位代码", 
 			orgname: "名称", 
 			porgname: "上级单位", 
-			orglevel: "单位级别", 
-			shortname: "单位简称", 
-			showorder: "排序", 
 			porgid: "上级单位", 
-			createdate: "创建时间", 
-			updatedate: "最后修改时间", 
+			enable: "逻辑有效", 
+			orgid: "单位标识", 
 		},
 		uiactions: {
 		},
 	},
-	newform_form: {
+	main_form: {
 		details: {
-			group1: "单位机构基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "最后修改时间", 
 			srforikey: "", 
@@ -76,12 +72,16 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
+			orgid: "单位标识", 
 			orgcode: "单位代码", 
 			orgname: "名称", 
 			porgname: "上级单位", 
+			orglevel: "单位级别", 
+			shortname: "单位简称", 
+			showorder: "排序", 
 			porgid: "上级单位", 
-			enable: "逻辑有效", 
-			orgid: "单位标识", 
+			createdate: "创建时间", 
+			updatedate: "最后修改时间", 
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/entities/ibzpost/ibzpost_en_US.ts

@@ -12,6 +12,10 @@ export default {
 			caption: "岗位",
       		title: "岗位数据选择视图",
 		},
+		editview: {
+			caption: "岗位管理",
+      		title: "岗位管理",
+		},
 		pickupgridview: {
 			caption: "岗位",
       		title: "岗位选择表格视图",
@@ -20,10 +24,6 @@ export default {
 			caption: "岗位管理",
       		title: "岗位管理",
 		},
-		editview: {
-			caption: "岗位管理",
-      		title: "岗位管理",
-		},
 	},
 	main_form: {
 		details: {
@@ -61,6 +61,28 @@ export default {
 		uiactions: {
 		},
 	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "Save",
+			tip: "Save",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "Remove And Close",
+			tip: "Remove And Close Window",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+	},
 	gridviewtoolbar_toolbar: {
 		deuiaction1: {
 			caption: "New",
@@ -99,26 +121,4 @@ export default {
 			tip: "Filter",
 		},
 	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "Save",
-			tip: "Save",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-	},
 };
\ No newline at end of file

app_web/src/locale/lanres/entities/ibzpost/ibzpost_zh_CN.ts

@@ -11,6 +11,10 @@ export default {
 			caption: "岗位",
       		title: "岗位数据选择视图",
 		},
+		editview: {
+			caption: "岗位管理",
+      		title: "岗位管理",
+		},
 		pickupgridview: {
 			caption: "岗位",
       		title: "岗位选择表格视图",
@@ -19,10 +23,6 @@ export default {
 			caption: "岗位管理",
       		title: "岗位管理",
 		},
-		editview: {
-			caption: "岗位管理",
-      		title: "岗位管理",
-		},
 	},
 	main_form: {
 		details: {
@@ -60,6 +60,28 @@ export default {
 		uiactions: {
 		},
 	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "保存",
+			tip: "保存",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+	},
 	gridviewtoolbar_toolbar: {
 		deuiaction1: {
 			caption: "新建",
@@ -98,26 +120,4 @@ export default {
 			tip: "过滤",
 		},
 	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "保存",
-			tip: "保存",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "删除",
-			tip: "删除",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-	},
 };
\ No newline at end of file

app_web/src/locale/lanres/entities/ibzteam/ibzteam_en_US.ts

@@ -7,11 +7,11 @@ export default {
     domains: "区属",
   },
 	views: {
-		gridview: {
+		editview: {
 			caption: "组管理",
       		title: "组管理",
 		},
-		editview: {
+		gridview: {
 			caption: "组管理",
       		title: "组管理",
 		},
@@ -52,6 +52,28 @@ export default {
 		uiactions: {
 		},
 	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "Save",
+			tip: "Save",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "Remove And Close",
+			tip: "Remove And Close Window",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+	},
 	gridviewtoolbar_toolbar: {
 		deuiaction1: {
 			caption: "New",
@@ -90,26 +112,4 @@ export default {
 			tip: "Filter",
 		},
 	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "Save",
-			tip: "Save",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-	},
 };
\ No newline at end of file

app_web/src/locale/lanres/entities/ibzteam/ibzteam_zh_CN.ts

@@ -6,11 +6,11 @@ export default {
     domains: "区属",
   },
 	views: {
-		gridview: {
+		editview: {
 			caption: "组管理",
       		title: "组管理",
 		},
-		editview: {
+		gridview: {
 			caption: "组管理",
       		title: "组管理",
 		},
@@ -51,6 +51,28 @@ export default {
 		uiactions: {
 		},
 	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "保存",
+			tip: "保存",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+	},
 	gridviewtoolbar_toolbar: {
 		deuiaction1: {
 			caption: "新建",
@@ -89,26 +111,4 @@ export default {
 			tip: "过滤",
 		},
 	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "保存",
-			tip: "保存",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "删除",
-			tip: "删除",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-	},
 };
\ No newline at end of file

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

@@ -11,7 +11,7 @@ mock.onGet('v7/ouindex-viewappmenu').reply((config: any) => {
         name: 'appmenu',
         items:  [
             {
-	id: 'CC24ABE9-84D6-4F04-8770-E9739A62AC34',
+	id: 'da40118e7372d3073b986ea6fb93df59',
 	name: 'menuitem1',
 	text: '单位管理',
 	type: 'MENUITEM',
@@ -29,7 +29,7 @@ mock.onGet('v7/ouindex-viewappmenu').reply((config: any) => {
 	resourcetag: '',
 },
             {
-	id: '26353959-9246-4DDF-8ADA-E8A229572BC7',
+	id: '6570af5ada0a428b98d5ba1ca5073298',
 	name: 'menuitem2',
 	text: '部门管理',
 	type: 'MENUITEM',
@@ -47,7 +47,7 @@ mock.onGet('v7/ouindex-viewappmenu').reply((config: any) => {
 	resourcetag: '',
 },
             {
-	id: '18F0AA9B-5281-46B7-AC6E-1A40E088AEE8',
+	id: '6cfdcaea521dd35aaa969ce9331fc24e',
 	name: 'menuitem3',
 	text: '人员管理',
 	type: 'MENUITEM',
@@ -65,7 +65,7 @@ mock.onGet('v7/ouindex-viewappmenu').reply((config: any) => {
 	resourcetag: '',
 },
             {
-	id: 'BF61871D-B5F5-4633-B6BA-30A66DE710BB',
+	id: 'd2a12485fdd3bf8ad7f18f689422b006',
 	name: 'menuitem4',
 	text: '岗位管理',
 	type: 'MENUITEM',
@@ -83,7 +83,7 @@ mock.onGet('v7/ouindex-viewappmenu').reply((config: any) => {
 	resourcetag: '',
 },
             {
-	id: '3EE7101C-7039-4836-8AB7-81C0CAD3C288',
+	id: '4a64b39273ba2fb82beadff8315e4d02',
 	name: 'menuitem5',
 	text: '组管理',
 	type: 'MENUITEM',

app_web/src/mock/codelist/codelist.ts

@@ -16,6 +16,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 id: "男",
                 label: "男性",
                 text: "男性",
+                "class":"",
                 "data":"",
                 "codename":"Item_1",
                 value: "男",
@@ -26,6 +27,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 id: "女",
                 label: "女性",
                 text: "女性",
+                "class":"",
                 "data":"",
                 "codename":"Item_2",
                 value: "女",
@@ -36,6 +38,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 id: "性别不详",
                 label: "性别不详",
                 text: "性别不详",
+                "class":"",
                 "data":"",
                 "codename":"Item_3",
                 value: "性别不详",

app_web/src/mock/index.ts

@@ -7,10 +7,10 @@ import './login/login';
 import './upload/upload';
 
 // 实体级接口对象
+import './entity/ibzposts/ibzposts';
+import './entity/ibzorganizations/ibzorganizations';
+import './entity/ibzteams/ibzteams';
 import './entity/ibzdept-members/ibzdept-members';
-import './entity/ibzteam-members/ibzteam-members';
 import './entity/ibzdepartments/ibzdepartments';
+import './entity/ibzteam-members/ibzteam-members';
 import './entity/ibzemployees/ibzemployees';
-import './entity/ibzorganizations/ibzorganizations';
-import './entity/ibzposts/ibzposts';
-import './entity/ibzteams/ibzteams';

app_web/src/model/form-detail/form-button.ts

@@ -11,7 +11,7 @@ export class FormButtonModel extends FormDetailModel {
 
     constructor(opts: any = {}) {
         super(opts);
-        this.disabled = opts.disabled;
+        this.$disabled = opts.disabled;
         this.uiaction = opts.uiaction;
     }
 
@@ -21,7 +21,7 @@ export class FormButtonModel extends FormDetailModel {
      * @type {boolean}
      * @memberof FormButtonModel
      */
-    public disabled:boolean = false;
+    private $disabled:boolean = false;
 
     /**
      * 按钮对应的界面行为
@@ -31,4 +31,26 @@ export class FormButtonModel extends FormDetailModel {
      */
     public uiaction:any;
 
+    /**
+     * 是否启用
+     *
+     * @type {boolean}
+     * @memberof FormButtonModel
+     */
+    public get disabled(): boolean {
+        return this.$disabled;
+    }
+
+    /**
+     * 设置是否启用
+     *
+     * @memberof FormButtonModel
+     */
+    public set disabled(val: boolean) {
+        if(this.isPower) {
+            this.$disabled = val;
+        }
+    }
+
+
 }
\ No newline at end of file

app_web/src/model/form-detail/form-detail.ts

@@ -6,6 +6,14 @@
  */
 export class FormDetailModel {
 
+    /**
+     * 是否有权限
+     *
+     * @type {boolean}
+     * @memberof FormDetailModel
+     */
+    public isPower: boolean = true;
+
     /**
      * 成员标题
      *
@@ -44,7 +52,7 @@ export class FormDetailModel {
      * @type {boolean}
      * @memberof FormDetailModel
      */
-    public visible: boolean = true;
+    public $visible: boolean = true;
 
     /**
      * 成员是否显示(旧)
@@ -83,12 +91,33 @@ export class FormDetailModel {
         this.detailType = !Object.is(opts.detailType, '') ? opts.detailType : '';
         this.form = opts.form ? opts.form : {};
         this.name = !Object.is(opts.name, '') ? opts.name : '';
-        this.visible = opts.visible ? true : false;
+        this.$visible = opts.visible ? true : false;
         this.oldVisible = opts.visible ? true : false;
         this.isShowCaption = opts.isShowCaption ? true : false;
         this.isControlledContent = opts.isControlledContent ? true : false;
     }
 
+    /**
+     * 设置成员是否隐藏
+     *
+     * @memberof FormDetailModel
+     */
+    public set visible(val: boolean) {
+        if(this.isPower) {
+            this.$visible = val;
+        }
+    }
+
+    /**
+     * 获取成员是否隐藏
+     *
+     * @memberof FormDetailModel
+     */
+    public get visible() {
+        return  this.$visible;
+    }
+
+
     /**
      * 设置显示与隐藏
      *
@@ -96,7 +125,9 @@ export class FormDetailModel {
      * @memberof FormDetailModel
      */
     public setVisible(state: boolean): void {
-        this.visible = state;
+        if(this.isPower) {
+            this.visible = state;
+        }
     }
 
     /**

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

@@ -5,58 +5,58 @@
 
 <div slot='title' class="header-container">
     <span class='caption-info'>{{$t(model.srfCaption)}}</span>
-    <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-save'></i>
-                    <span class='caption'>{{$t('entities.ibzdepartment.editviewtoolbar_toolbar.tbitem3.caption')}}</span>
-                </i-button>
-            <div slot='content'>{{$t('entities.ibzdepartment.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
-        </tooltip>
-        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
-                    <i class='fa fa-remove'></i>
-                    <span class='caption'>{{$t('entities.ibzdepartment.editviewtoolbar_toolbar.tbitem7.caption')}}</span>
-                </i-button>
-            <div slot='content'>{{$t('entities.ibzdepartment.editviewtoolbar_toolbar.tbitem7.tip')}}</div>
-        </tooltip>
-        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem14.visabled" :disabled="toolBarModels.tbitem14.disabled" class='' @click="toolbar_click({ tag: 'tbitem14' }, $event)">
-                    <i class='fa fa-copy'></i>
-                    <span class='caption'>{{$t('entities.ibzdepartment.editviewtoolbar_toolbar.tbitem14.caption')}}</span>
-                </i-button>
-            <div slot='content'>{{$t('entities.ibzdepartment.editviewtoolbar_toolbar.tbitem14.tip')}}</div>
-        </tooltip>
-    </div>
+    <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-save'></i>
+                    <span class='caption'>{{$t('entities.ibzdepartment.editviewtoolbar_toolbar.tbitem3.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.ibzdepartment.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
+        </tooltip>
+        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
+                    <i class='fa fa-remove'></i>
+                    <span class='caption'>{{$t('entities.ibzdepartment.editviewtoolbar_toolbar.tbitem7.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.ibzdepartment.editviewtoolbar_toolbar.tbitem7.tip')}}</div>
+        </tooltip>
+        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.tbitem14.visabled" :disabled="toolBarModels.tbitem14.disabled" class='' @click="toolbar_click({ tag: 'tbitem14' }, $event)">
+                    <i class='fa fa-copy'></i>
+                    <span class='caption'>{{$t('entities.ibzdepartment.editviewtoolbar_toolbar.tbitem14.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.ibzdepartment.editviewtoolbar_toolbar.tbitem14.tip')}}</div>
+        </tooltip>
+    </div>
 </div>
 
         <div class="content-container">
-        <div class='view-top-messages'>
-        </div>
-        <view_form 
-            :viewState="viewState"  
-            :viewparams="viewparams" 
-            :context="context" 
-            :autosave="false" 
-            :viewtag="viewtag"
-            :showBusyIndicator="true"
-            updateAction="Update"
-            removeAction="Remove"
-            loaddraftAction="GetDraft"
-            loadAction="Get"
-            createAction="Create"
-            WFSubmitAction=""
-            WFStartAction=""
-            style='' 
-            name="form"  
-            ref='form' 
-            @save="form_save($event)"  
-            @remove="form_remove($event)"  
-            @load="form_load($event)"  
-            @closeview="closeView($event)">
-        </view_form>
-        <div class='view-bottom-messages'>
-        </div>
+        <div class='view-top-messages'>
+        </div>
+        <view_form 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :autosave="false" 
+            :viewtag="viewtag"
+            :showBusyIndicator="true"
+            updateAction="Update"
+            removeAction="Remove"
+            loaddraftAction="GetDraft"
+            loadAction="Get"
+            createAction="Create"
+            WFSubmitAction=""
+            WFStartAction=""
+            style='' 
+            name="form"  
+            ref='form' 
+            @save="form_save($event)"  
+            @remove="form_remove($event)"  
+            @load="form_load($event)"  
+            @closeview="closeView($event)">
+        </view_form>
+        <div class='view-bottom-messages'>
+        </div>
         </div>
     </card>
 </div>
@@ -157,7 +157,7 @@ export default class IBZDepartmentEditViewBase extends Vue {
 	 * @type {string}
 	 * @memberof IBZDepartmentEditViewBase
 	 */
-	public viewtag: string = '21259e2d03645750f1d3d71839f1223b';
+	public viewtag: string = '90c0ced2720b85d5e051e7935a93d3c5';
 
 	/**
 	 * 自定义视图导航上下文集合

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

@@ -8,19 +8,19 @@
 .ibzdepartment-edit-view{
     position: relative;
 }
-        .toolbar-container {
-            button {
-                margin: 6px 0px 4px 4px;
-                .caption {
-                    margin-left: 4px;
-                }
-            }
-            .seperator {
-                color: #dcdee2;
-                margin: 0 0px 0 4px;
-            }
-        }
-        
-        // this is less
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
 
 

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

 .ibzdepartment-grid-view{
     position: relative;
 }
-        .toolbar-container {
-            button {
-                margin: 6px 0px 4px 4px;
-                .caption {
-                    margin-left: 4px;
-                }
-            }
-            .seperator {
-                color: #dcdee2;
-                margin: 0 0px 0 4px;
-            }
-        }
-        
-        // this is less
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
 
 

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

@@ -5,20 +5,20 @@
         <div class="content-container pickup-view">
             <div class="translate-contant">
                 <div class="center" :style="{width : !isShowButton ? '100%' : ''}">
-    <view_pickupviewpanel 
-        :viewState="viewState"  
-        :viewparams="JSON.parse(JSON.stringify(viewparams))" 
-        :context="JSON.parse(JSON.stringify(context))" 
-        :isSingleSelect="isSingleSelect"
-        :selectedData="selectedData"
-        :isShowButton="isShowButton"
-        name="pickupviewpanel"  
-        ref='pickupviewpanel' 
-        @selectionchange="pickupviewpanel_selectionchange($event)"  
-        @activated="pickupviewpanel_activated($event)"  
-        @load="pickupviewpanel_load($event)"  
-        @closeview="closeView($event)">
-    </view_pickupviewpanel>
+    <view_pickupviewpanel 
+        :viewState="viewState"  
+        :viewparams="JSON.parse(JSON.stringify(viewparams))" 
+        :context="JSON.parse(JSON.stringify(context))" 
+        :isSingleSelect="isSingleSelect"
+        :selectedData="selectedData"
+        :isShowButton="isShowButton"
+        name="pickupviewpanel"  
+        ref='pickupviewpanel' 
+        @selectionchange="pickupviewpanel_selectionchange($event)"  
+        @activated="pickupviewpanel_activated($event)"  
+        @load="pickupviewpanel_load($event)"  
+        @closeview="closeView($event)">
+    </view_pickupviewpanel>
                 </div>
                 <div v-if="isShowButton" class="translate-buttons">
                     <div class="buttons">
@@ -158,7 +158,7 @@ export default class IBZDepartmentMPickupViewBase extends Vue {
 	 * @type {string}
 	 * @memberof IBZDepartmentMPickupViewBase
 	 */
-	public viewtag: string = '95a44e1851d28a16a90965f60d6ff4ae';
+	public viewtag: string = '97224ac0397dbe38b4679b4060ee29e5';
 
 	/**
 	 * 自定义视图导航上下文集合

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

@@ -3,28 +3,28 @@
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibzdepartmentoptionview"></app-studioaction>
     <card class='view-card  view-no-caption  view-no-toolbar' dis-hover :padding="0" :bordered="false">
         <div class="content-container">
-            <view_form 
-                :viewState="viewState"  
-                :viewparams="viewparams" 
-                :context="context" 
-                :autosave="false" 
-                :viewtag="viewtag"
-                :showBusyIndicator="true"
-                updateAction="Update"
-                removeAction="Remove"
-                loaddraftAction="GetDraft"
-                loadAction="Get"
-                createAction="Create"
-                WFSubmitAction=""
-                WFStartAction=""
-                style='' 
-                name="form"  
-                ref='form' 
-                @save="form_save($event)"  
-                @remove="form_remove($event)"  
-                @load="form_load($event)"  
-                @closeview="closeView($event)">
-            </view_form>
+            <view_form 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :autosave="false" 
+                :viewtag="viewtag"
+                :showBusyIndicator="true"
+                updateAction="Update"
+                removeAction="Remove"
+                loaddraftAction="GetDraft"
+                loadAction="Get"
+                createAction="Create"
+                WFSubmitAction=""
+                WFStartAction=""
+                style='' 
+                name="form"  
+                ref='form' 
+                @save="form_save($event)"  
+                @remove="form_remove($event)"  
+                @load="form_load($event)"  
+                @closeview="closeView($event)">
+            </view_form>
         </div>
         <card dis-hover :bordered="false" class='footer'>
           <row style=" text-align: right ">
@@ -132,7 +132,7 @@ export default class IBZDepartmentOptionViewBase extends Vue {
 	 * @type {string}
 	 * @memberof IBZDepartmentOptionViewBase
 	 */
-	public viewtag: string = '17f1f78c7a23f7546dbfef7f8fa9fcd0';
+	public viewtag: string = '9cdad5e2bed51cdcd90b4b7fb3104a5a';
 
 	/**
 	 * 自定义视图导航上下文集合

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

@@ -3,43 +3,43 @@
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibzdepartmentpickupgridview"></app-studioaction>
     <card class='view-card view-no-caption  view-no-toolbar' :dis-hover="true" :bordered="false">
         <div class='content-container pickup-grid-view'>
-            <view_searchform 
-                :viewState="viewState"  
-                :viewparams="viewparams" 
-                :context="context" 
-                :showBusyIndicator="true"
-                v-show="isExpandSearchForm"
-                loaddraftAction="FilterGetDraft"
-                loadAction="FilterGet"
-            
-                name="searchform"  
-                ref='searchform' 
-                @save="searchform_save($event)"  
-                @search="searchform_search($event)"  
-                @load="searchform_load($event)"  
-                @closeview="closeView($event)">
-            </view_searchform>
-            <view_grid 
-                :viewState="viewState"  
-                :viewparams="viewparams" 
-                :context="context" 
-                :isSingleSelect="isSingleSelect"
-                :selectedData="selectedData"
-                :showBusyIndicator="true"
-                updateAction=""
-                removeAction="Remove"
-                loaddraftAction=""
-                loadAction=""
-                createAction=""
-                fetchAction="FetchDefault"
-                name="grid"  
-                ref='grid' 
-                @selectionchange="grid_selectionchange($event)"  
-                @beforeload="grid_beforeload($event)"  
-                @rowdblclick="grid_rowdblclick($event)"  
-                @load="grid_load($event)"  
-                @closeview="closeView($event)">
-            </view_grid>
+            <view_searchform 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :showBusyIndicator="true"
+                v-show="isExpandSearchForm"
+                loaddraftAction="FilterGetDraft"
+                loadAction="FilterGet"
+            
+                name="searchform"  
+                ref='searchform' 
+                @save="searchform_save($event)"  
+                @search="searchform_search($event)"  
+                @load="searchform_load($event)"  
+                @closeview="closeView($event)">
+            </view_searchform>
+            <view_grid 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :isSingleSelect="isSingleSelect"
+                :selectedData="selectedData"
+                :showBusyIndicator="true"
+                updateAction=""
+                removeAction="Remove"
+                loaddraftAction=""
+                loadAction=""
+                createAction=""
+                fetchAction="FetchDefault"
+                name="grid"  
+                ref='grid' 
+                @selectionchange="grid_selectionchange($event)"  
+                @beforeload="grid_beforeload($event)"  
+                @rowdblclick="grid_rowdblclick($event)"  
+                @load="grid_load($event)"  
+                @closeview="closeView($event)">
+            </view_grid>
         </div>
     </card>
 </div>
@@ -140,7 +140,7 @@ export default class IBZDepartmentPickupGridViewBase extends Vue {
 	 * @type {string}
 	 * @memberof IBZDepartmentPickupGridViewBase
 	 */
-	public viewtag: string = '66fa282d24a21eec39d958e7fc6c23a8';
+	public viewtag: string = 'e3284e895913f7d38d1bcbe898bda0b7';
 
 	/**
 	 * 自定义视图导航上下文集合

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

@@ -3,20 +3,20 @@
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibzdepartmentpickupview"></app-studioaction>
     <card class='view-card view-no-caption  view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">
-            <view_pickupviewpanel 
-                :viewState="viewState"  
-                :viewparams="JSON.parse(JSON.stringify(viewparams))" 
-                :context="JSON.parse(JSON.stringify(context))" 
-                :isSingleSelect="isSingleSelect"
-                :selectedData="selectedData"
-                :isShowButton="isShowButton"
-                name="pickupviewpanel"  
-                ref='pickupviewpanel' 
-                @selectionchange="pickupviewpanel_selectionchange($event)"  
-                @activated="pickupviewpanel_activated($event)"  
-                @load="pickupviewpanel_load($event)"  
-                @closeview="closeView($event)">
-            </view_pickupviewpanel>
+            <view_pickupviewpanel 
+                :viewState="viewState"  
+                :viewparams="JSON.parse(JSON.stringify(viewparams))" 
+                :context="JSON.parse(JSON.stringify(context))" 
+                :isSingleSelect="isSingleSelect"
+                :selectedData="selectedData"
+                :isShowButton="isShowButton"
+                name="pickupviewpanel"  
+                ref='pickupviewpanel' 
+                @selectionchange="pickupviewpanel_selectionchange($event)"  
+                @activated="pickupviewpanel_activated($event)"  
+                @load="pickupviewpanel_load($event)"  
+                @closeview="closeView($event)">
+            </view_pickupviewpanel>
             <card v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer">
                 <row :style="{ textAlign: 'right' }">
                     <i-button type="primary" :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk">{{this.containerModel.view_okbtn.text}}</i-button>
@@ -125,7 +125,7 @@ export default class IBZDepartmentPickupViewBase extends Vue {
 	 * @type {string}
 	 * @memberof IBZDepartmentPickupViewBase
 	 */
-	public viewtag: string = 'b59db4df07430a34645566a64d59244c';
+	public viewtag: string = '10dd7f45f36233049c4af9ca417089f5';
 
 	/**
 	 * 自定义视图导航上下文集合

app_web/src/pages/ou/ibzdepartment-tree-exp-view/ibzdepartment-tree-exp-view-base.vue

@@ -2,29 +2,29 @@
 <div class='view-container detreeexpview ibzdepartment-tree-exp-view'>
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibzdepartmenttreeexpview"></app-studioaction>
     <card class='view-card   view-no-toolbar'  :dis-hover="true" :bordered="false">
-        <div slot='title' class="header-container">
-        <span class='caption-info'>{{$t(model.srfCaption)}}</span>
-        </div>
+        <div slot='title' class="header-container">
+        <span class='caption-info'>{{$t(model.srfCaption)}}</span>
+        </div>
 
         <div class='content-container'>
-            <div class='view-top-messages'>
-            </div>
-            <view_treeexpbar 
-                :viewState="viewState"  
-                :viewparams="viewparams" 
-                :context="context" 
-                :viewUID="viewUID"
-                :newdata="newdata"
-                :opendata="opendata"
-                name="treeexpbar"  
-                ref='treeexpbar' 
-                @selectionchange="treeexpbar_selectionchange($event)"  
-                @activated="treeexpbar_activated($event)"  
-                @load="treeexpbar_load($event)"  
-                @closeview="closeView($event)">
-            </view_treeexpbar>
-            <div class='view-bottom-messages'>
-            </div>
+            <div class='view-top-messages'>
+            </div>
+            <view_treeexpbar 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :viewUID="viewUID"
+                :newdata="newdata"
+                :opendata="opendata"
+                name="treeexpbar"  
+                ref='treeexpbar' 
+                @selectionchange="treeexpbar_selectionchange($event)"  
+                @activated="treeexpbar_activated($event)"  
+                @load="treeexpbar_load($event)"  
+                @closeview="closeView($event)">
+            </view_treeexpbar>
+            <div class='view-bottom-messages'>
+            </div>
         </div>
     </card>
 </div>
@@ -125,7 +125,7 @@ export default class IBZDepartmentTreeExpViewBase extends Vue {
 	 * @type {string}
 	 * @memberof IBZDepartmentTreeExpViewBase
 	 */
-	public viewtag: string = 'cace6f75674cff323d90d670e609aa21';
+	public viewtag: string = 'c0cdac5d5b5691ae8a326f5972aec67f';
 
 	/**
 	 * 自定义视图导航上下文集合
@@ -548,21 +548,21 @@ export default class IBZDepartmentTreeExpViewBase extends Vue {
 
 
 
-    /**
-     * 打开新建数据视图
-     *
-     * @param {any[]} args
-     * @param {*} [params]
-     * @param {*} [fullargs]
-     * @param {*} [$event]
-     * @param {*} [xData]
-     * @memberof IBZDepartmentTreeExpView
-     */
-    public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
-        let localContext:any = null;
-        let localViewParam:any =null;
-    this.$Notice.warning({ title: '错误', desc: '未指定关系视图' });
-    }
+    /**
+     * 打开新建数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof IBZDepartmentTreeExpView
+     */
+    public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
+    this.$Notice.warning({ title: '错误', desc: '未指定关系视图' });
+    }
 
 
     /**

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

@@ -5,58 +5,58 @@
 
 <div slot='title' class="header-container">
     <span class='caption-info'>{{$t(model.srfCaption)}}</span>
-    <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-save'></i>
-                    <span class='caption'>{{$t('entities.ibzdeptmember.editviewtoolbar_toolbar.tbitem3.caption')}}</span>
-                </i-button>
-            <div slot='content'>{{$t('entities.ibzdeptmember.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
-        </tooltip>
-        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
-                    <i class='fa fa-remove'></i>
-                    <span class='caption'>{{$t('entities.ibzdeptmember.editviewtoolbar_toolbar.tbitem7.caption')}}</span>
-                </i-button>
-            <div slot='content'>{{$t('entities.ibzdeptmember.editviewtoolbar_toolbar.tbitem7.tip')}}</div>
-        </tooltip>
-        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem14.visabled" :disabled="toolBarModels.tbitem14.disabled" class='' @click="toolbar_click({ tag: 'tbitem14' }, $event)">
-                    <i class='fa fa-copy'></i>
-                    <span class='caption'>{{$t('entities.ibzdeptmember.editviewtoolbar_toolbar.tbitem14.caption')}}</span>
-                </i-button>
-            <div slot='content'>{{$t('entities.ibzdeptmember.editviewtoolbar_toolbar.tbitem14.tip')}}</div>
-        </tooltip>
-    </div>
+    <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-save'></i>
+                    <span class='caption'>{{$t('entities.ibzdeptmember.editviewtoolbar_toolbar.tbitem3.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.ibzdeptmember.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
+        </tooltip>
+        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
+                    <i class='fa fa-remove'></i>
+                    <span class='caption'>{{$t('entities.ibzdeptmember.editviewtoolbar_toolbar.tbitem7.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.ibzdeptmember.editviewtoolbar_toolbar.tbitem7.tip')}}</div>
+        </tooltip>
+        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.tbitem14.visabled" :disabled="toolBarModels.tbitem14.disabled" class='' @click="toolbar_click({ tag: 'tbitem14' }, $event)">
+                    <i class='fa fa-copy'></i>
+                    <span class='caption'>{{$t('entities.ibzdeptmember.editviewtoolbar_toolbar.tbitem14.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.ibzdeptmember.editviewtoolbar_toolbar.tbitem14.tip')}}</div>
+        </tooltip>
+    </div>
 </div>
 
         <div class="content-container">
-        <div class='view-top-messages'>
-        </div>
-        <view_form 
-            :viewState="viewState"  
-            :viewparams="viewparams" 
-            :context="context" 
-            :autosave="false" 
-            :viewtag="viewtag"
-            :showBusyIndicator="true"
-            updateAction="Update"
-            removeAction="Remove"
-            loaddraftAction="GetDraft"
-            loadAction="Get"
-            createAction="Create"
-            WFSubmitAction=""
-            WFStartAction=""
-            style='' 
-            name="form"  
-            ref='form' 
-            @save="form_save($event)"  
-            @remove="form_remove($event)"  
-            @load="form_load($event)"  
-            @closeview="closeView($event)">
-        </view_form>
-        <div class='view-bottom-messages'>
-        </div>
+        <div class='view-top-messages'>
+        </div>
+        <view_form 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :autosave="false" 
+            :viewtag="viewtag"
+            :showBusyIndicator="true"
+            updateAction="Update"
+            removeAction="Remove"
+            loaddraftAction="GetDraft"
+            loadAction="Get"
+            createAction="Create"
+            WFSubmitAction=""
+            WFStartAction=""
+            style='' 
+            name="form"  
+            ref='form' 
+            @save="form_save($event)"  
+            @remove="form_remove($event)"  
+            @load="form_load($event)"  
+            @closeview="closeView($event)">
+        </view_form>
+        <div class='view-bottom-messages'>
+        </div>
         </div>
     </card>
 </div>
@@ -157,7 +157,7 @@ export default class IBZDeptMemberEditViewBase extends Vue {
 	 * @type {string}
 	 * @memberof IBZDeptMemberEditViewBase
 	 */
-	public viewtag: string = 'bf9108c85aaa6f3d2498f87b2439b9df';
+	public viewtag: string = 'bf5e850471bab461fbb6739578e510c5';
 
 	/**
 	 * 自定义视图导航上下文集合

app_web/src/pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.less

@@ -8,19 +8,19 @@
 .ibzdept-member-edit-view{
     position: relative;
 }
-        .toolbar-container {
-            button {
-                margin: 6px 0px 4px 4px;
-                .caption {
-                    margin-left: 4px;
-                }
-            }
-            .seperator {
-                color: #dcdee2;
-                margin: 0 0px 0 4px;
-            }
-        }
-        
-        // this is less
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
 
 

app_web/src/pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.less

 .ibzdept-member-grid-view{
     position: relative;
 }
-        .toolbar-container {
-            button {
-                margin: 6px 0px 4px 4px;
-                .caption {
-                    margin-left: 4px;
-                }
-            }
-            .seperator {
-                color: #dcdee2;
-                margin: 0 0px 0 4px;
-            }
-        }
-        
-        // this is less
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
 
 

app_web/src/pages/ou/ibzemployee-edit-view/ibzemployee-edit-view-base.vue

@@ -5,58 +5,58 @@
 
 <div slot='title' class="header-container">
     <span class='caption-info'>{{$t(model.srfCaption)}}</span>
-    <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-save'></i>
-                    <span class='caption'>{{$t('entities.ibzemployee.editviewtoolbar_toolbar.tbitem3.caption')}}</span>
-                </i-button>
-            <div slot='content'>{{$t('entities.ibzemployee.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
-        </tooltip>
-        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
-                    <i class='fa fa-remove'></i>
-                    <span class='caption'>{{$t('entities.ibzemployee.editviewtoolbar_toolbar.tbitem7.caption')}}</span>
-                </i-button>
-            <div slot='content'>{{$t('entities.ibzemployee.editviewtoolbar_toolbar.tbitem7.tip')}}</div>
-        </tooltip>
-        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem14.visabled" :disabled="toolBarModels.tbitem14.disabled" class='' @click="toolbar_click({ tag: 'tbitem14' }, $event)">
-                    <i class='fa fa-copy'></i>
-                    <span class='caption'>{{$t('entities.ibzemployee.editviewtoolbar_toolbar.tbitem14.caption')}}</span>
-                </i-button>
-            <div slot='content'>{{$t('entities.ibzemployee.editviewtoolbar_toolbar.tbitem14.tip')}}</div>
-        </tooltip>
-    </div>
+    <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-save'></i>
+                    <span class='caption'>{{$t('entities.ibzemployee.editviewtoolbar_toolbar.tbitem3.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.ibzemployee.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
+        </tooltip>
+        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
+                    <i class='fa fa-remove'></i>
+                    <span class='caption'>{{$t('entities.ibzemployee.editviewtoolbar_toolbar.tbitem7.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.ibzemployee.editviewtoolbar_toolbar.tbitem7.tip')}}</div>
+        </tooltip>
+        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.tbitem14.visabled" :disabled="toolBarModels.tbitem14.disabled" class='' @click="toolbar_click({ tag: 'tbitem14' }, $event)">
+                    <i class='fa fa-copy'></i>
+                    <span class='caption'>{{$t('entities.ibzemployee.editviewtoolbar_toolbar.tbitem14.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.ibzemployee.editviewtoolbar_toolbar.tbitem14.tip')}}</div>
+        </tooltip>
+    </div>
 </div>
 
         <div class="content-container">
-        <div class='view-top-messages'>
-        </div>
-        <view_form 
-            :viewState="viewState"  
-            :viewparams="viewparams" 
-            :context="context" 
-            :autosave="false" 
-            :viewtag="viewtag"
-            :showBusyIndicator="true"
-            updateAction="Update"
-            removeAction="Remove"
-            loaddraftAction="GetDraft"
-            loadAction="Get"
-            createAction="Create"
-            WFSubmitAction=""
-            WFStartAction=""
-            style='' 
-            name="form"  
-            ref='form' 
-            @save="form_save($event)"  
-            @remove="form_remove($event)"  
-            @load="form_load($event)"  
-            @closeview="closeView($event)">
-        </view_form>
-        <div class='view-bottom-messages'>
-        </div>
+        <div class='view-top-messages'>
+        </div>
+        <view_form 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :autosave="false" 
+            :viewtag="viewtag"
+            :showBusyIndicator="true"
+            updateAction="Update"
+            removeAction="Remove"
+            loaddraftAction="GetDraft"
+            loadAction="Get"
+            createAction="Create"
+            WFSubmitAction=""
+            WFStartAction=""
+            style='' 
+            name="form"  
+            ref='form' 
+            @save="form_save($event)"  
+            @remove="form_remove($event)"  
+            @load="form_load($event)"  
+            @closeview="closeView($event)">
+        </view_form>
+        <div class='view-bottom-messages'>
+        </div>
         </div>
     </card>
 </div>
@@ -157,7 +157,7 @@ export default class IBZEmployeeEditViewBase extends Vue {
 	 * @type {string}
 	 * @memberof IBZEmployeeEditViewBase
 	 */
-	public viewtag: string = '16f9ed1179f9b3cf686cbcd796512299';
+	public viewtag: string = '119fe650e7efd26bd14bd413cae37ded';
 
 	/**
 	 * 自定义视图导航上下文集合

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

@@ -8,19 +8,19 @@
 .ibzemployee-edit-view{
     position: relative;
 }
-        .toolbar-container {
-            button {
-                margin: 6px 0px 4px 4px;
-                .caption {
-                    margin-left: 4px;
-                }
-            }
-            .seperator {
-                color: #dcdee2;
-                margin: 0 0px 0 4px;
-            }
-        }
-        
-        // this is less
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
 
 

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

 .ibzemployee-grid-view{
     position: relative;
 }
-        .toolbar-container {
-            button {
-                margin: 6px 0px 4px 4px;
-                .caption {
-                    margin-left: 4px;
-                }
-            }
-            .seperator {
-                color: #dcdee2;
-                margin: 0 0px 0 4px;
-            }
-        }
-        
-        // this is less
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
 
 

app_web/src/pages/ou/ibzemployee-mpickup-view/ibzemployee-mpickup-view-base.vue

@@ -5,20 +5,20 @@
         <div class="content-container pickup-view">
             <div class="translate-contant">
                 <div class="center" :style="{width : !isShowButton ? '100%' : ''}">
-    <view_pickupviewpanel 
-        :viewState="viewState"  
-        :viewparams="JSON.parse(JSON.stringify(viewparams))" 
-        :context="JSON.parse(JSON.stringify(context))" 
-        :isSingleSelect="isSingleSelect"
-        :selectedData="selectedData"
-        :isShowButton="isShowButton"
-        name="pickupviewpanel"  
-        ref='pickupviewpanel' 
-        @selectionchange="pickupviewpanel_selectionchange($event)"  
-        @activated="pickupviewpanel_activated($event)"  
-        @load="pickupviewpanel_load($event)"  
-        @closeview="closeView($event)">
-    </view_pickupviewpanel>
+    <view_pickupviewpanel 
+        :viewState="viewState"  
+        :viewparams="JSON.parse(JSON.stringify(viewparams))" 
+        :context="JSON.parse(JSON.stringify(context))" 
+        :isSingleSelect="isSingleSelect"
+        :selectedData="selectedData"
+        :isShowButton="isShowButton"
+        name="pickupviewpanel"  
+        ref='pickupviewpanel' 
+        @selectionchange="pickupviewpanel_selectionchange($event)"  
+        @activated="pickupviewpanel_activated($event)"  
+        @load="pickupviewpanel_load($event)"  
+        @closeview="closeView($event)">
+    </view_pickupviewpanel>
                 </div>
                 <div v-if="isShowButton" class="translate-buttons">
                     <div class="buttons">
@@ -158,7 +158,7 @@ export default class IBZEmployeeMPickupViewBase extends Vue {
 	 * @type {string}
 	 * @memberof IBZEmployeeMPickupViewBase
 	 */
-	public viewtag: string = '5ef90c56e30ba698e1ba1fc05f426725';
+	public viewtag: string = 'd946240b09028ae684e1eb31281a4caf';
 
 	/**
 	 * 自定义视图导航上下文集合

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

@@ -3,28 +3,28 @@
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibzemployeeoptionview"></app-studioaction>
     <card class='view-card  view-no-caption  view-no-toolbar' dis-hover :padding="0" :bordered="false">
         <div class="content-container">
-            <view_form 
-                :viewState="viewState"  
-                :viewparams="viewparams" 
-                :context="context" 
-                :autosave="false" 
-                :viewtag="viewtag"
-                :showBusyIndicator="true"
-                updateAction="Update"
-                removeAction="Remove"
-                loaddraftAction="GetDraft"
-                loadAction="Get"
-                createAction="Create"
-                WFSubmitAction=""
-                WFStartAction=""
-                style='' 
-                name="form"  
-                ref='form' 
-                @save="form_save($event)"  
-                @remove="form_remove($event)"  
-                @load="form_load($event)"  
-                @closeview="closeView($event)">
-            </view_form>
+            <view_form 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :autosave="false" 
+                :viewtag="viewtag"
+                :showBusyIndicator="true"
+                updateAction="Update"
+                removeAction="Remove"
+                loaddraftAction="GetDraft"
+                loadAction="Get"
+                createAction="Create"
+                WFSubmitAction=""
+                WFStartAction=""
+                style='' 
+                name="form"  
+                ref='form' 
+                @save="form_save($event)"  
+                @remove="form_remove($event)"  
+                @load="form_load($event)"  
+                @closeview="closeView($event)">
+            </view_form>
         </div>
         <card dis-hover :bordered="false" class='footer'>
           <row style=" text-align: right ">
@@ -132,7 +132,7 @@ export default class IBZEmployeeOptionViewBase extends Vue {
 	 * @type {string}
 	 * @memberof IBZEmployeeOptionViewBase
 	 */
-	public viewtag: string = '61a772e0bde33e5e8e9b83ea0f354271';
+	public viewtag: string = '9cf7a70099bff83a10f6ae65c4d54692';
 
 	/**
 	 * 自定义视图导航上下文集合

app_web/src/pages/ou/ibzemployee-pickup-grid-view/ibzemployee-pickup-grid-view-base.vue

@@ -3,43 +3,43 @@
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibzemployeepickupgridview"></app-studioaction>
     <card class='view-card view-no-caption  view-no-toolbar' :dis-hover="true" :bordered="false">
         <div class='content-container pickup-grid-view'>
-            <view_searchform 
-                :viewState="viewState"  
-                :viewparams="viewparams" 
-                :context="context" 
-                :showBusyIndicator="true"
-                v-show="isExpandSearchForm"
-                loaddraftAction="FilterGetDraft"
-                loadAction="FilterGet"
-            
-                name="searchform"  
-                ref='searchform' 
-                @save="searchform_save($event)"  
-                @search="searchform_search($event)"  
-                @load="searchform_load($event)"  
-                @closeview="closeView($event)">
-            </view_searchform>
-            <view_grid 
-                :viewState="viewState"  
-                :viewparams="viewparams" 
-                :context="context" 
-                :isSingleSelect="isSingleSelect"
-                :selectedData="selectedData"
-                :showBusyIndicator="true"
-                updateAction=""
-                removeAction="Remove"
-                loaddraftAction=""
-                loadAction=""
-                createAction=""
-                fetchAction="FetchDefault"
-                name="grid"  
-                ref='grid' 
-                @selectionchange="grid_selectionchange($event)"  
-                @beforeload="grid_beforeload($event)"  
-                @rowdblclick="grid_rowdblclick($event)"  
-                @load="grid_load($event)"  
-                @closeview="closeView($event)">
-            </view_grid>
+            <view_searchform 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :showBusyIndicator="true"
+                v-show="isExpandSearchForm"
+                loaddraftAction="FilterGetDraft"
+                loadAction="FilterGet"
+            
+                name="searchform"  
+                ref='searchform' 
+                @save="searchform_save($event)"  
+                @search="searchform_search($event)"  
+                @load="searchform_load($event)"  
+                @closeview="closeView($event)">
+            </view_searchform>
+            <view_grid 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :isSingleSelect="isSingleSelect"
+                :selectedData="selectedData"
+                :showBusyIndicator="true"
+                updateAction=""
+                removeAction="Remove"
+                loaddraftAction=""
+                loadAction=""
+                createAction=""
+                fetchAction="FetchDefault"
+                name="grid"  
+                ref='grid' 
+                @selectionchange="grid_selectionchange($event)"  
+                @beforeload="grid_beforeload($event)"  
+                @rowdblclick="grid_rowdblclick($event)"  
+                @load="grid_load($event)"  
+                @closeview="closeView($event)">
+            </view_grid>
         </div>
     </card>
 </div>
@@ -140,7 +140,7 @@ export default class IBZEmployeePickupGridViewBase extends Vue {
 	 * @type {string}
 	 * @memberof IBZEmployeePickupGridViewBase
 	 */
-	public viewtag: string = 'f1bebdb9438783db0010d34aa03092c8';
+	public viewtag: string = 'c84df2684f29705ac6c5dec67df9f217';
 
 	/**
 	 * 自定义视图导航上下文集合

app_web/src/pages/ou/ibzemployee-pickup-view/ibzemployee-pickup-view-base.vue

@@ -3,20 +3,20 @@
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibzemployeepickupview"></app-studioaction>
     <card class='view-card view-no-caption  view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">
-            <view_pickupviewpanel 
-                :viewState="viewState"  
-                :viewparams="JSON.parse(JSON.stringify(viewparams))" 
-                :context="JSON.parse(JSON.stringify(context))" 
-                :isSingleSelect="isSingleSelect"
-                :selectedData="selectedData"
-                :isShowButton="isShowButton"
-                name="pickupviewpanel"  
-                ref='pickupviewpanel' 
-                @selectionchange="pickupviewpanel_selectionchange($event)"  
-                @activated="pickupviewpanel_activated($event)"  
-                @load="pickupviewpanel_load($event)"  
-                @closeview="closeView($event)">
-            </view_pickupviewpanel>
+            <view_pickupviewpanel 
+                :viewState="viewState"  
+                :viewparams="JSON.parse(JSON.stringify(viewparams))" 
+                :context="JSON.parse(JSON.stringify(context))" 
+                :isSingleSelect="isSingleSelect"
+                :selectedData="selectedData"
+                :isShowButton="isShowButton"
+                name="pickupviewpanel"  
+                ref='pickupviewpanel' 
+                @selectionchange="pickupviewpanel_selectionchange($event)"  
+                @activated="pickupviewpanel_activated($event)"  
+                @load="pickupviewpanel_load($event)"  
+                @closeview="closeView($event)">
+            </view_pickupviewpanel>
             <card v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer">
                 <row :style="{ textAlign: 'right' }">
                     <i-button type="primary" :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk">{{this.containerModel.view_okbtn.text}}</i-button>
@@ -125,7 +125,7 @@ export default class IBZEmployeePickupViewBase extends Vue {
 	 * @type {string}
 	 * @memberof IBZEmployeePickupViewBase
 	 */
-	public viewtag: string = 'd1ec542e553e00c6455ca776efc61882';
+	public viewtag: string = '9ffa35efe3d70cf4b9fa4e83dd1979c6';
 
 	/**
 	 * 自定义视图导航上下文集合

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

@@ -5,58 +5,58 @@
 
 <div slot='title' class="header-container">
     <span class='caption-info'>{{$t(model.srfCaption)}}</span>
-    <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-save'></i>
-                    <span class='caption'>{{$t('entities.ibzorganization.editviewtoolbar_toolbar.tbitem3.caption')}}</span>
-                </i-button>
-            <div slot='content'>{{$t('entities.ibzorganization.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
-        </tooltip>
-        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
-                    <i class='fa fa-remove'></i>
-                    <span class='caption'>{{$t('entities.ibzorganization.editviewtoolbar_toolbar.tbitem7.caption')}}</span>
-                </i-button>
-            <div slot='content'>{{$t('entities.ibzorganization.editviewtoolbar_toolbar.tbitem7.tip')}}</div>
-        </tooltip>
-        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem14.visabled" :disabled="toolBarModels.tbitem14.disabled" class='' @click="toolbar_click({ tag: 'tbitem14' }, $event)">
-                    <i class='fa fa-copy'></i>
-                    <span class='caption'>{{$t('entities.ibzorganization.editviewtoolbar_toolbar.tbitem14.caption')}}</span>
-                </i-button>
-            <div slot='content'>{{$t('entities.ibzorganization.editviewtoolbar_toolbar.tbitem14.tip')}}</div>
-        </tooltip>
-    </div>
+    <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-save'></i>
+                    <span class='caption'>{{$t('entities.ibzorganization.editviewtoolbar_toolbar.tbitem3.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.ibzorganization.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
+        </tooltip>
+        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
+                    <i class='fa fa-remove'></i>
+                    <span class='caption'>{{$t('entities.ibzorganization.editviewtoolbar_toolbar.tbitem7.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.ibzorganization.editviewtoolbar_toolbar.tbitem7.tip')}}</div>
+        </tooltip>
+        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.tbitem14.visabled" :disabled="toolBarModels.tbitem14.disabled" class='' @click="toolbar_click({ tag: 'tbitem14' }, $event)">
+                    <i class='fa fa-copy'></i>
+                    <span class='caption'>{{$t('entities.ibzorganization.editviewtoolbar_toolbar.tbitem14.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.ibzorganization.editviewtoolbar_toolbar.tbitem14.tip')}}</div>
+        </tooltip>
+    </div>
 </div>
 
         <div class="content-container">
-        <div class='view-top-messages'>
-        </div>
-        <view_form 
-            :viewState="viewState"  
-            :viewparams="viewparams" 
-            :context="context" 
-            :autosave="false" 
-            :viewtag="viewtag"
-            :showBusyIndicator="true"
-            updateAction="Update"
-            removeAction="Remove"
-            loaddraftAction="GetDraft"
-            loadAction="Get"
-            createAction="Create"
-            WFSubmitAction=""
-            WFStartAction=""
-            style='' 
-            name="form"  
-            ref='form' 
-            @save="form_save($event)"  
-            @remove="form_remove($event)"  
-            @load="form_load($event)"  
-            @closeview="closeView($event)">
-        </view_form>
-        <div class='view-bottom-messages'>
-        </div>
+        <div class='view-top-messages'>
+        </div>
+        <view_form 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :autosave="false" 
+            :viewtag="viewtag"
+            :showBusyIndicator="true"
+            updateAction="Update"
+            removeAction="Remove"
+            loaddraftAction="GetDraft"
+            loadAction="Get"
+            createAction="Create"
+            WFSubmitAction=""
+            WFStartAction=""
+            style='' 
+            name="form"  
+            ref='form' 
+            @save="form_save($event)"  
+            @remove="form_remove($event)"  
+            @load="form_load($event)"  
+            @closeview="closeView($event)">
+        </view_form>
+        <div class='view-bottom-messages'>
+        </div>
         </div>
     </card>
 </div>
@@ -157,7 +157,7 @@ export default class IBZOrganizationEditViewBase extends Vue {
 	 * @type {string}
 	 * @memberof IBZOrganizationEditViewBase
 	 */
-	public viewtag: string = '12cffa053a1d3e22ab397b1164338cfb';
+	public viewtag: string = '95e33ff2469ba40d3e0c00f5c3f61501';
 
 	/**
 	 * 自定义视图导航上下文集合

app_web/src/pages/ou/ibzorganization-edit-view/ibzorganization-edit-view.less

@@ -8,19 +8,19 @@
 .ibzorganization-edit-view{
     position: relative;
 }
-        .toolbar-container {
-            button {
-                margin: 6px 0px 4px 4px;
-                .caption {
-                    margin-left: 4px;
-                }
-            }
-            .seperator {
-                color: #dcdee2;
-                margin: 0 0px 0 4px;
-            }
-        }
-        
-        // this is less
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
 
 

app_web/src/pages/ou/ibzorganization-grid-view/ibzorganization-grid-view.less

 .ibzorganization-grid-view{
     position: relative;
 }
-        .toolbar-container {
-            button {
-                margin: 6px 0px 4px 4px;
-                .caption {
-                    margin-left: 4px;
-                }
-            }
-            .seperator {
-                color: #dcdee2;
-                margin: 0 0px 0 4px;
-            }
-        }
-        
-        // this is less
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
 
 

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

@@ -3,28 +3,28 @@
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibzorganizationoptionview"></app-studioaction>
     <card class='view-card  view-no-caption  view-no-toolbar' dis-hover :padding="0" :bordered="false">
         <div class="content-container">
-            <view_form 
-                :viewState="viewState"  
-                :viewparams="viewparams" 
-                :context="context" 
-                :autosave="false" 
-                :viewtag="viewtag"
-                :showBusyIndicator="true"
-                updateAction="Update"
-                removeAction="Remove"
-                loaddraftAction="GetDraft"
-                loadAction="Get"
-                createAction="Create"
-                WFSubmitAction=""
-                WFStartAction=""
-                style='' 
-                name="form"  
-                ref='form' 
-                @save="form_save($event)"  
-                @remove="form_remove($event)"  
-                @load="form_load($event)"  
-                @closeview="closeView($event)">
-            </view_form>
+            <view_form 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :autosave="false" 
+                :viewtag="viewtag"
+                :showBusyIndicator="true"
+                updateAction="Update"
+                removeAction="Remove"
+                loaddraftAction="GetDraft"
+                loadAction="Get"
+                createAction="Create"
+                WFSubmitAction=""
+                WFStartAction=""
+                style='' 
+                name="form"  
+                ref='form' 
+                @save="form_save($event)"  
+                @remove="form_remove($event)"  
+                @load="form_load($event)"  
+                @closeview="closeView($event)">
+            </view_form>
         </div>
         <card dis-hover :bordered="false" class='footer'>
           <row style=" text-align: right ">
@@ -132,7 +132,7 @@ export default class IBZOrganizationOptionViewBase extends Vue {
 	 * @type {string}
 	 * @memberof IBZOrganizationOptionViewBase
 	 */
-	public viewtag: string = '995d26f289a30e31573d557a5f5ba254';
+	public viewtag: string = '2ed85bebb69b8d23388420b95163228a';
 
 	/**
 	 * 自定义视图导航上下文集合

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

@@ -3,43 +3,43 @@
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibzorganizationpickupgridview"></app-studioaction>
     <card class='view-card view-no-caption  view-no-toolbar' :dis-hover="true" :bordered="false">
         <div class='content-container pickup-grid-view'>
-            <view_searchform 
-                :viewState="viewState"  
-                :viewparams="viewparams" 
-                :context="context" 
-                :showBusyIndicator="true"
-                v-show="isExpandSearchForm"
-                loaddraftAction="FilterGetDraft"
-                loadAction="FilterGet"
-            
-                name="searchform"  
-                ref='searchform' 
-                @save="searchform_save($event)"  
-                @search="searchform_search($event)"  
-                @load="searchform_load($event)"  
-                @closeview="closeView($event)">
-            </view_searchform>
-            <view_grid 
-                :viewState="viewState"  
-                :viewparams="viewparams" 
-                :context="context" 
-                :isSingleSelect="isSingleSelect"
-                :selectedData="selectedData"
-                :showBusyIndicator="true"
-                updateAction=""
-                removeAction="Remove"
-                loaddraftAction=""
-                loadAction=""
-                createAction=""
-                fetchAction="FetchDefault"
-                name="grid"  
-                ref='grid' 
-                @selectionchange="grid_selectionchange($event)"  
-                @beforeload="grid_beforeload($event)"  
-                @rowdblclick="grid_rowdblclick($event)"  
-                @load="grid_load($event)"  
-                @closeview="closeView($event)">
-            </view_grid>
+            <view_searchform 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :showBusyIndicator="true"
+                v-show="isExpandSearchForm"
+                loaddraftAction="FilterGetDraft"
+                loadAction="FilterGet"
+            
+                name="searchform"  
+                ref='searchform' 
+                @save="searchform_save($event)"  
+                @search="searchform_search($event)"  
+                @load="searchform_load($event)"  
+                @closeview="closeView($event)">
+            </view_searchform>
+            <view_grid 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :isSingleSelect="isSingleSelect"
+                :selectedData="selectedData"
+                :showBusyIndicator="true"
+                updateAction=""
+                removeAction="Remove"
+                loaddraftAction=""
+                loadAction=""
+                createAction=""
+                fetchAction="FetchDefault"
+                name="grid"  
+                ref='grid' 
+                @selectionchange="grid_selectionchange($event)"  
+                @beforeload="grid_beforeload($event)"  
+                @rowdblclick="grid_rowdblclick($event)"  
+                @load="grid_load($event)"  
+                @closeview="closeView($event)">
+            </view_grid>
         </div>
     </card>
 </div>
@@ -140,7 +140,7 @@ export default class IBZOrganizationPickupGridViewBase extends Vue {
 	 * @type {string}
 	 * @memberof IBZOrganizationPickupGridViewBase
 	 */
-	public viewtag: string = '4c3fc434585ac656b753c26c1f10482b';
+	public viewtag: string = 'cf8e6d455f8e88e66bbbe1bdb4c84274';
 
 	/**
 	 * 自定义视图导航上下文集合

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

@@ -3,20 +3,20 @@
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="ibzorganizationpickupview"></app-studioaction>
     <card class='view-card view-no-caption  view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">
-            <view_pickupviewpanel 
-                :viewState="viewState"  
-                :viewparams="JSON.parse(JSON.stringify(viewparams))" 
-                :context="JSON.parse(JSON.stringify(context))" 
-                :isSingleSelect="isSingleSelect"
-                :selectedData="selectedData"
-                :isShowButton="isShowButton"
-                name="pickupviewpanel"  
-                ref='pickupviewpanel' 
-                @selectionchange="pickupviewpanel_selectionchange($event)"  
-                @activated="pickupviewpanel_activated($event)"  
-                @load="pickupviewpanel_load($event)"  
-                @closeview="closeView($event)">
-            </view_pickupviewpanel>
+            <view_pickupviewpanel 
+                :viewState="viewState"  
+                :viewparams="JSON.parse(JSON.stringify(viewparams))" 
+                :context="JSON.parse(JSON.stringify(context))" 
+                :isSingleSelect="isSingleSelect"
+                :selectedData="selectedData"
+                :isShowButton="isShowButton"
+                name="pickupviewpanel"  
+                ref='pickupviewpanel' 
+                @selectionchange="pickupviewpanel_selectionchange($event)"  
+                @activated="pickupviewpanel_activated($event)"  
+                @load="pickupviewpanel_load($event)"  
+                @closeview="closeView($event)">
+            </view_pickupviewpanel>
             <card v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer">
                 <row :style="{ textAlign: 'right' }">
                     <i-button type="primary" :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk">{{this.containerModel.view_okbtn.text}}</i-button>
@@ -125,7 +125,7 @@ export default class IBZOrganizationPickupViewBase extends Vue {
 	 * @type {string}
 	 * @memberof IBZOrganizationPickupViewBase
 	 */
-	public viewtag: string = '9e25d15d43ff644fa008c9cf7d063ac3';
+	public viewtag: string = 'ccff36439eacae953f85ff636c9dac74';
 
 	/**
 	 * 自定义视图导航上下文集合

app_web/src/styles/app-code-list.less

+#app{
+    display: block;
+}