From 705024f79f8ebc50c24463124d5f4e9318967666 Mon Sep 17 00:00:00 2001
From: qqkj <qqkj@163.com>
Date: Thu, 25 Mar 2021 11:29:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2=E5=B2=97?=
 =?UTF-8?q?=E4=BD=8D=E4=B8=8D=E5=AE=89=E9=83=A8=E9=97=A8=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                        |  4 ++--
 src/api/login.js                       |  5 +++--
 src/store/modules/user.js              |  2 +-
 src/views/login/index.vue              | 14 ++++++++++----
 src/views/xm/core/xmTask/XmTaskMng.vue |  4 ++++
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/config/index.js b/config/index.js
index b4a435a5..b67632f3 100644
--- a/config/index.js
+++ b/config/index.js
@@ -11,7 +11,7 @@ module.exports = {
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable: { 
-      /**
+      
     	'/api/m1/xm': {
             target: 'http://localhost:7067',
             changeOrigin: true,
@@ -19,7 +19,7 @@ module.exports = {
                 '^/api/m1/xm': '/xm'
               }
           }, 
-          
+          /**
     	'/api/m1/workflow': {
             target: 'http://localhost:7080',
             changeOrigin: true,
diff --git a/src/api/login.js b/src/api/login.js
index 695083cc..94519cc9 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -7,13 +7,14 @@ import config from '@/common/config'
 let base=config.getOauth2LoginBasePath();
 
 //let base='';
-export function doLoginByUserloginid(userloginid, password,grantType,authType,deptid) {
+export function doLoginByUserloginid(userloginid, password,grantType,authType,branchId,deptid) {
   removeToken();
   const data = {
     userloginid: userloginid,
     password: password, 
     authType:authType,
-    deptid:deptid
+    deptid:deptid,
+    branchId:branchId,
   }
   return axios({
     url: base+'/login/token?grantType='+grantType,
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index be241622..7623ddcb 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -101,7 +101,7 @@ const user = {
     LoginByUserloginid({ commit }, loginParams) { 
       removeToken();
       return new Promise((resolve, reject) => {
-        doLoginByUserloginid(loginParams.userloginid, loginParams.password,loginParams.grantType,loginParams.authType,loginParams.deptid).then(res => {
+        doLoginByUserloginid(loginParams.userloginid, loginParams.password,loginParams.grantType,loginParams.authType,loginParams.branchId,loginParams.deptid).then(res => {
         	if(res.data.tips.isOk==true){
         		let data = res.data
                 let userInfo=data.userInfo;
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 76553099..865258bb 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -171,6 +171,7 @@ export default {
       showRegisterDialog: false,//显示注册窗口
 	    deptSelectVisible:false,//显示选择部门对话框
 	    userDeptid:'',//选中的部门编号 
+      userBranchId:'',//选中的部门对应的机构号
 	    addBranchFormVisible:false,  //显示添加机构对话框 
     }
   },
@@ -206,7 +207,8 @@ export default {
               deptid:this.userDeptid,
               authType:this.loginForm.authType,
               phoneno:this.loginForm.phoneno,
-              smsCode:this.loginForm.smsCode
+              smsCode:this.loginForm.smsCode,
+              branchId:this.userBranchId,
           }
           var loginParams={ }
           if(params.authType=='password_display_userid'){
@@ -214,13 +216,15 @@ export default {
             loginParams.password=params.password
             loginParams.grantType="password"
             loginParams.authType='password_display_userid' 
-            loginParams.deptid=params.deptid
+            //loginParams.deptid=params.deptid
+            loginParams.branchId=params.branchId
           }else if(params.authType=='sms'){
             loginParams.userloginid=params.phoneno
             loginParams.password=params.smsCode
             loginParams.grantType="password"
             loginParams.authType="sms"
-            loginParams.deptid=params.deptid
+            //loginParams.deptid=params.deptid
+            loginParams.branchId=params.branchId
           }
           this.$store.dispatch("LoginByUserloginid",loginParams).then(res => {
         	  this.loading = false
@@ -279,8 +283,10 @@ export default {
     		return
     	}
     	
-    	let depts=this.myDepts.filter(d=>d.deptid==this.userDeptid)   
+    	
     	if(this.$store.state.user.userInfo.deptid!=this.userDeptid){
+          let depts=this.myDepts.filter(d=>d.deptid==this.userDeptid)
+          this.userBranchId=depts[0].branchId
         	this.handleLogin();
           return;
     	}else{
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 64cc7f1a..394fbbfb 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -988,6 +988,10 @@
 				this.skillVisible = true;
 			},
 			showMenu:function(parentTask){
+				if(this.projectPhase==null){
+					this.$message.error("请先选中阶段计划"); 
+					return;
+				}
 				
 				if( !this.roles.some(i=>i.roleid=='projectAdmin') && !this.roles.some(i=>i.roleid=='teamAdmin')){
 					this.$message.error("只有项目经理、小组长可以操作");