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

src/pages/financial/financalDocument/CapitalAllocation.vue

@@ -282,8 +282,8 @@
     created(){
       this.getList()
       let userInfo = this.getLocalStorage();    // 读取缓存数据
-      this.getCompanyMsg.RB_Group_Id = this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id;    // 集团ID
-      this.EmId=userInfo.EmployeeId;
+      this.getCompanyMsg.RB_Group_Id = this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.Group_Id;    // 集团ID
+      this.EmId=userInfo.Id;
       let ActionMenuCode=userInfo.ActionMenuCode;
       // if(ActionMenuCode.indexOf('F_CreateBranchMoneyAllot')!=-1){
       //   this.btnShow=true;
@@ -324,6 +324,7 @@
         if(!this.msg.Status)this.msg.Status=0;
         if(!this.msg.FrID)this.msg.FrID=0;
         this.msg.EmployeeId=this.EmId;
+        
         this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,this.$t('fnc.zjdbbiao')+".xls");} ,
       getCompanyList: function () { //获取公司列表
         getSchoolPage(this.schoolMsg).then(res => {

src/pages/financial/financalDocument/ChoiceAddFinancialDocuments.vue

@@ -308,7 +308,6 @@
 
       this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;
       this.orderObj = this.$route.query.orderObj;
-      console.log(this.orderObj ,'this.orderObj ')
       this.Handmsg = this.$route.query.Handmsg?this.$route.query.Handmsg:this.Handmsg;
       this.czmsg = this.$route.query.czmsg?this.$route.query.czmsg:this.czmsg;