From 59ce81c19b75e3e6cdc6a3a65d49ec11e27b0a06 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 21 十一月 2019 11:03:45 +0800
Subject: [PATCH] 开发组件热更新问题处理

---
 WebService/src/main/resources/components/staffPackage/addStaffStep/addStaffStep.js |   80 +++++++++++++++++++++-------------------
 1 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/WebService/src/main/resources/components/staffPackage/addStaffStep/addStaffStep.js b/WebService/src/main/resources/components/staffPackage/addStaffStep/addStaffStep.js
index 163b064..3fb9636 100644
--- a/WebService/src/main/resources/components/staffPackage/addStaffStep/addStaffStep.js
+++ b/WebService/src/main/resources/components/staffPackage/addStaffStep/addStaffStep.js
@@ -8,6 +8,24 @@
                 $step:{},
                 index:0,
                 infos:[],
+                branchOrgInfo:{
+                        orgId:'',
+                         componentName:'鍒嗗叕鍙镐俊鎭�',
+                         buttonName:'閫夋嫨鍒嗗叕鍙�',
+                         orgName:'',
+                         orgLevel:'2',
+                         parentOrgId:'',
+                         description:'',
+                },
+                departmemtOrgInfo:{
+                         orgId:'',
+                         componentName:'閮ㄩ棬淇℃伅',
+                         buttonName:'閫夋嫨閮ㄩ棬',
+                         orgName:'',
+                         orgLevel:'3',
+                         parentOrgId:'',
+                         description:'',
+                },
                 staffInfo:{
                     orgId:'',
                     username:'',
@@ -15,6 +33,7 @@
                     email:'',
                     tel:'',
                     address:'',
+                    relCd:'',
                 }
             }
         },
@@ -23,15 +42,19 @@
         },
         _initEvent:function(){
             vc.on("addStaffStep", "notify", function(_info){
-                vc.component.addStaffStepInfo.infos[vc.component.addStaffStepInfo.index] = _info;
+                if(vc.component.addStaffStepInfo.index == 0){
+                    vc.copyObject(_info,vc.component.addStaffStepInfo.branchOrgInfo);
+                    vc.component.addStaffStepInfo.infos[0] = vc.component.addStaffStepInfo.branchOrgInfo;
+                }else if(vc.component.addStaffStepInfo.index == 1){
+                    vc.copyObject(_info,vc.component.addStaffStepInfo.departmemtOrgInfo);
+                    vc.component.addStaffStepInfo.staffInfo.orgId = _info.orgId
+                    vc.component.addStaffStepInfo.infos[1] = vc.component.addStaffStepInfo.departmemtOrgInfo;
 
-                if(vc.component.addStaffStepInfo.index == 1){
-                   vc.component.addStaffStepInfo.staffInfo.orgId = _info.orgId
-                }
-
-                if(vc.component.addStaffStepInfo.index == 2){
+                }else{
                     vc.copyObject(_info, vc.component.addStaffStepInfo.staffInfo);
+                    vc.component.addStaffStepInfo.infos[2] = vc.component.addStaffStepInfo.staffInfo;
                 }
+
             });
 
         },
@@ -44,6 +67,7 @@
                     title: ["閫夋嫨鍒嗗叕鍙�","閫夋嫨閮ㄩ棬","鍛樺伐淇℃伅"]
                 });
                 vc.component.addStaffStepInfo.index = vc.component.addStaffStepInfo.$step.getIndex();
+                vc.component._notifyViewOrgInfoComponentData();
             },
             _prevStep:function(){
                 vc.component.addStaffStepInfo.$step.prevStep();
@@ -72,7 +96,12 @@
             },
             _finishStep:function(){
 
-                vc.component.addStaffStepInfo.staffInfo.departmentOrgId = vc.component.addStaffStepInfo.infos[1];
+                //vc.component.addStaffStepInfo.staffInfo.departmentOrgId = vc.component.addStaffStepInfo.infos[1].orgId;
+                var _currentData = vc.component.addStaffStepInfo.infos[vc.component.addStaffStepInfo.index];
+                if( _currentData == null || _currentData == undefined){
+                    vc.message("璇烽�夋嫨鎴栧~鍐欏繀閫変俊鎭�");
+                    return ;
+                }
                vc.http.post(
                    'addStaffStepBinding',
                    'binding',
@@ -85,7 +114,7 @@
 
                            vc.message('澶勭悊鎴愬姛',true);
                            //鍏抽棴model
-                           vc.jumpToPage("/flow/staff?" + vc.objToGetParam(JSON.parse(json)));
+                           vc.jumpToPage("/flow/staff");
                            return ;
                        }
                        vc.message(json);
@@ -97,37 +126,12 @@
                     });
             },
             _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);
+                if(vc.component.addStaffStepInfo.index == 0){
+                    vc.emit('viewOrgInfo', '_initInfo',vc.component.addStaffStepInfo.branchOrgInfo);
+                }else if(vc.component.addStaffStepInfo.index == 1){
+                    vc.component.addStaffStepInfo.departmemtOrgInfo.parentOrgId = vc.component.addStaffStepInfo.branchOrgInfo.orgId;
+                    vc.emit('viewOrgInfo', '_initInfo',vc.component.addStaffStepInfo.departmemtOrgInfo);
                 }
             }
         }

--
Gitblit v1.8.0