Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/OPcommissionPeriods.vue

@@ -60,10 +60,10 @@
           <el-tooltip class="item" effect="dark" content="一键制单" placement="top">
             <el-button @click="YijianZD(item)" type="danger" class="CM_look" icon="iconfont icon-mui-icon-add" circle></el-button>
           </el-tooltip>
-          <!-- <el-tooltip class="item" effect="dark" content="手动制单" placement="top">
+          <el-tooltip class="item" effect="dark" content="手动制单" placement="top">
             <el-button type="primary" class="CM_look" @click="goUrlZD" icon="iconfont icon-danju1" circle></el-button>
           </el-tooltip>    
-           -->
+          
             <el-tooltip class="item" effect="dark" content="查看详情" placement="top">
               <el-popover
               placement="left"

src/components/FinancialModule/ReportForm/EasyReportAcrossYears.vue

@@ -1179,7 +1179,6 @@ export default {
             }
 
           })
-          console.log("this.DataList",this.DataList)
 
           this.UpdateStaus=data.Status;
           this.UpdateStartTime=data.UpdateStartTime;

src/components/index.vue

@@ -3612,7 +3612,7 @@ export default {
       if (!this.isOnline()) {
           url="http://www.test.com:8080/#/login?token="+userinfo.token+"&SecretKey="+userinfo.SecretKey;
       }else{
-          url="http://zcyx.oytour.com/#/login?ObjInfo="+ObjInfo;
+          url="http://zcyx.oytour.com/#/login?ObjInfo="+userinfo.token+"&SecretKey="+userinfo.SecretKey;
       }
       window.open(url)
     },