优化 添加员工流程页面

WebService/src/main/resources/components/orgPackage/view-org-info/viewOrgInfo.html

@@ -6,7 +6,7 @@
                 <div class="ibox-tools" style="top:10px;">
                     <button type="button" v-if="viewOrgInfo.index != 2" class="btn btn-primary btn-sm"
                             style="margin-right:10px;" v-on:click="_openSelectOrgInfoModel()">
-                        <i class="glyphicon glyphicon-search"></i> 选择组织管理
+                        <i class="glyphicon glyphicon-search"></i> {{viewOrgInfo.buttonName}}
                     </button>
                 </div>
             </div>

WebService/src/main/resources/components/orgPackage/view-org-info/viewOrgInfo.js

@@ -11,6 +11,7 @@
         data:{
             viewOrgInfo:{
                 componentName:'组织管理信息',
+                buttonName:'选择组织',
                 index:0,
                 flowComponent:'viewOrgInfo',
                 orgName:'',

WebService/src/main/resources/components/staffPackage/addStaffStep/addStaffStep.html

@@ -12,7 +12,7 @@
         ></vc:create>
     </div>
     <div v-if="addStaffStepInfo.index == 2">
-        <vc:create name="addStaff"
+        <vc:create name="addStaffView"
                    callBackListener="addStaffStep"
                    callBackFunction="notify"
         ></vc:create>

WebService/src/main/resources/components/staffPackage/addStaffStep/addStaffStep.js

@@ -50,7 +50,9 @@
                 vc.component.addStaffStepInfo.index = vc.component.addStaffStepInfo.$step.getIndex();
 
                 vc.emit('viewOrgInfo', 'onIndex', vc.component.addStaffStepInfo.index);
-                vc.emit('addStaff', 'onIndex', vc.component.addStaffStepInfo.index);
+                vc.emit('addStaffView', 'onIndex', vc.component.addStaffStepInfo.index);
+
+                vc.component._notifyViewOrgInfoComponentData();
 
             },
             _nextStep:function(){
@@ -63,10 +65,14 @@
                 vc.component.addStaffStepInfo.index = vc.component.addStaffStepInfo.$step.getIndex();
 
                  vc.emit('viewOrgInfo', 'onIndex', vc.component.addStaffStepInfo.index);
-                vc.emit('addStaff', 'onIndex', vc.component.addStaffStepInfo.index);
+                vc.emit('addStaffView', 'onIndex', vc.component.addStaffStepInfo.index);
+                vc.component._notifyViewOrgInfoComponentData();
+
 
             },
             _finishStep:function(){
+
+                vc.component.addStaffStepInfo.staffInfo.departmentOrgId = vc.component.addStaffStepInfo.infos[1];
                vc.http.post(
                    'addStaffStepBinding',
                    'binding',
@@ -89,6 +95,40 @@
 
                        vc.message(errInfo);
                     });
+            },
+            _notifyViewOrgInfoComponentData:function(){
+                var _tmpCurrentIndex = vc.component.addStaffStepInfo.index;
+
+                if(_tmpCurrentIndex == 0){
+
+                    var _tmpBranchOrgInfo = {
+                             componentName:'分公司信息',
+                             buttonName:'选择分公司',
+                             orgName:'',
+                             orgLevel:'',
+                             parentOrgId:'',
+                             description:'',
+                    };
+
+                    if(vc.component.addStaffStepInfo.infos.length >0){
+                        _tmpBranchOrgInfo = vc.component.addStaffStepInfo.infos[0];
+                    }
+                    vc.emit('viewOrgInfo', '_initInfo',_tmpBranchOrgInfo);
+                }else if(_tmpCurrentIndex == 1){
+                    var _tmpBranchOrgInfo = {
+                             componentName:'部门信息',
+                             buttonName:'选择部门',
+                             orgName:'',
+                             orgLevel:'',
+                             parentOrgId:'',
+                             description:'',
+                    };
+
+                    if(vc.component.addStaffStepInfo.infos.length >1){
+                        _tmpBranchOrgInfo = vc.component.addStaffStepInfo.infos[1];
+                    }
+                    vc.emit('viewOrgInfo', '_initInfo',_tmpBranchOrgInfo);
+                }
             }
         }
     });