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

src/components/FinancialModule/addFinancialDocuments.vue

@@ -2282,7 +2282,7 @@
                   let num = 0
                   data.forEach(x => {
                     x.disabled = true;
-                    let thisId = this.getLocalStorage().RB_Branch_id
+                    let Id = this.getLocalStorage().RB_Branch_id
                     BranchList.forEach(y => {
                       if (x.Id == y) {
                         x.disabled = false;
@@ -2293,7 +2293,7 @@
                             this.msg.RB_Branch_Id = x.Id
                           }
                         }
-                        if (thisId === x.Id && !this.$route.query.edit) {
+                        if (Id === x.Id && !this.$route.query.edit) {
                           if(this.orderObj.RB_Branch_Id){
                             this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id
                           }else{