工时管家平台和后台调整

fhKeeper/formulahousekeeper/inva_4_tivo/index.html

@@ -711,10 +711,11 @@
                 type : "GET",
                 url : "https://worktime.ttkuaiban.com/api/wxcorp/getPreAuthCode",
                 success : function(data){
+                    console.log(data, '扫码')
                     let suiteId = 'ww4e237fd6abb635af'
                     let huidiao = 'https://worktime.ttkuaiban.com/api/wxcorp/installFromWebsite'
                     let url = `https://open.work.weixin.qq.com/3rdapp/install?suite_id=${suiteId}&pre_auth_code=${data.data.code}&redirect_uri=${huidiao}&state=4`
-                    window.location.href = url
+                    window.open(url)
                 },
                 error:function(){
                     alert('请求失败');
@@ -729,8 +730,10 @@
                 url : "https://worktime.ttkuaiban.com/api/wxcorp/getRegisterCode",
                 success : function(data){
                     if(data.code == 'ok') {
-                        let url = `https://open.work.weixin.qq.com/3rdservice/wework/register?register_code=${data.data.code}`
-                        window.location.href = url
+                        setTimeout(function (){
+                            let url = 'https://open.work.weixin.qq.com/3rdservice/wework/register?register_code=' + data.data.code
+                            window.open(url)
+                        }, 700);
                     } else {
                         console.log(data)
                         alert(data.msg)
@@ -740,7 +743,6 @@
                     alert('请求失败');
                 }
             });
-
         })
     </script>
 

fhKeeper/formulahousekeeper/timesheet/src/views/Home.vue

@@ -97,8 +97,8 @@
                     <el-dropdown-menu slot="dropdown">
                         <!-- <el-dropdown-item disabled ><span style="font-size:12px;"><i class="el-icon-view" ></i>{{roleArray[user.role]}}</span></el-dropdown-item> -->
                         <el-dropdown-item disabled ><span style="font-size:12px;"><i class="el-icon-view" ></i>{{user.roleName}}</span></el-dropdown-item>
-                        <el-dropdown-item disabled ><span style="font-size:12px;"><i class="el-icon-medal" ></i>{{user.jobNumber}}</span></el-dropdown-item>
-                        <el-dropdown-item @click.native="reset">{{$t('other.changeThePassword')}}</el-dropdown-item>
+                        <el-dropdown-item disabled ><span style="font-size:12px;"><i class="el-icon-medal" v-if="user.jobNumber"></i>{{user.jobNumber}}</span></el-dropdown-item>
+                        <el-dropdown-item @click.native="reset" v-if="!isCorpWX">{{$t('other.changeThePassword')}}</el-dropdown-item>
                         <!-- <el-dropdown-item @click.native="editInfoOpen">修改信息</el-dropdown-item> -->
                         <el-dropdown-item divided @click.native="logout" v-if="!isCorpWX" >{{$t('other.launchTheLogin')}}</el-dropdown-item>
                     </el-dropdown-menu>