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

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1214,7 +1214,7 @@
             disabled: false
           },
           {
-            Name: '门票',
+            Name: this.$t('scen.sc_piao'),
             Id: 4,
             disabled: false
           },
@@ -2447,8 +2447,10 @@
               // }
               if (!this.orderObj && id > 0) {
                 this.msg.RB_Branch_Id = this.msg.RB_Branch_Id
+                //console.log(this.msg.RB_Branch_Id,'-----')
               } else {
                 this.msg.RB_Branch_Id = this.getLocalStorage().RB_Branch_id
+                //console.log(this.msg.RB_Branch_Id,'-----')
                 if ((this.$route.query.id == 245 ||
                     this.$route.query.id == 246 ||
                     this.$route.query.id == 247 ||
@@ -2464,19 +2466,23 @@
             } else {
               this.msg.RB_Branch_Id = this.msg.RB_Branch_Id == 0 ? this.getLocalStorage().RB_Branch_id : this.msg
                 .RB_Branch_Id;
+                //console.log(this.msg.RB_Branch_Id,'-----')
             }
 
 
             if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length > 0) {
               this.msg.RB_Branch_Id = this.orderObj.companyIDList[0];
+              //console.log(this.msg.RB_Branch_Id,'-----')
             } else if ((this.orderObj && (this.orderObj.RB_Branch_Id != '' && this.orderObj.RB_Branch_Id != null &&
                 this.orderObj.RB_Branch_Id != undefined)) || (this.crmOrderObj && (this.crmOrderObj.RB_Branch_Id !=
                 '' && this.crmOrderObj.RB_Branch_Id != null &&
                 this.crmOrderObj.RB_Branch_Id != undefined))) {
               this.msg.RB_Branch_Id = this.orderObj && this.orderObj.RB_Branch_Id >= 0 ? this.orderObj
                 .RB_Branch_Id : this.crmOrderObj.RB_Branch_Id
+                //console.log(this.msg.RB_Branch_Id,'-----')
             } else if (this.$route.query.companyID) {
               this.msg.RB_Branch_Id = parseInt(this.$route.query.companyID);
+              //console.log(this.msg.RB_Branch_Id,'-----')
             }
             this.admin_get_DepartmentGetList(this.msg.RB_Branch_Id);
             this.msg.PayDate = this.msg.PayDate;
@@ -2771,8 +2777,10 @@
                               .crmOrderObj.RB_Branch_Id)) {
                             this.msg.RB_Branch_Id = this.orderObj && this.orderObj.RB_Branch_Id >= 0 ?
                               this.orderObj.RB_Branch_Id : this.crmOrderObj.RB_Branch_Id
+                              //console.log(this.msg.RB_Branch_Id,'-----')
                           } else {
-                            this.msg.RB_Branch_Id = x.Id
+                            this.msg.RB_Branch_Id = Id>0?Id:x.Id
+                            //console.log(this.msg.RB_Branch_Id,'-----')
                           }
 
                         }
@@ -2781,8 +2789,10 @@
                               .crmOrderObj.RB_Branch_Id)) {
                             this.msg.RB_Branch_Id = this.orderObj && this.orderObj.RB_Branch_Id >= 0 ?
                               this.orderObj.RB_Branch_Id : this.crmOrderObj.RB_Branch_Id
+                              //console.log(this.msg.RB_Branch_Id,'-----')
                           } else {
                             this.msg.RB_Branch_Id = x.Id
+                            //console.log(this.msg.RB_Branch_Id,'-----')
                           }
                         }
                         num = num + 1
@@ -3015,8 +3025,10 @@
           .RB_Branch_Id != undefined)) {
         this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = this.orderObj && this.orderObj
           .RB_Branch_Id >= 0 ? this.orderObj.RB_Branch_Id : this.crmOrderObj.RB_Branch_Id;
+          //console.log(this.msg.RB_Branch_Id,'-----')
       } else {
         this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
+        //console.log(this.msg.RB_Branch_Id,'-----')
       }
       this.companyMsg.RB_Group_Id = this.departmentMsg.RB_Group_Id = userInfo.RB_Group_id;
       this.IsUploadPic = this.$route.query.IsUploadPic;
@@ -3056,7 +3068,7 @@
         this.returnCode = this.$route.query.Conditon;
       }
 
-      this.getCompany();
+      // this.getCompany();
       // this.admin_get_DepartmentGetList();
 
     },