1

src/components/FinancialModule/accDetail/AccountNewCollectingOrPay.vue

@@ -414,13 +414,22 @@ export default {
             return;
           }
 
-          if(!(this.msg.RB_Branch_Id==1252&&(this.msg.HelpBranchId==0||this.msg.HelpBranchId==1218))){
-            this.Error('暂不支持生成结算单，请联系管理员');
-            return;
-          }
-          let TemplateId2=0;
-          if(this.msg.RB_Branch_Id==1252&&this.msg.HelpBranchId==0){TemplateId2=35;}
+          // if(!(this.msg.RB_Branch_Id==1252&&(this.msg.HelpBranchId==0||this.msg.HelpBranchId==1218))){
+          //   this.Error('暂不支持生成结算单，请联系管理员');
+          //   return;
+          // }
+          let TemplateId2=35;let FBranchId=-1;
+
+          if(this.msg.RB_Branch_Id==0&&this.msg.HelpBranchId==1218){TemplateId2=35;FBranchId=1218;}
+          if(this.msg.RB_Branch_Id==1218&&this.msg.HelpBranchId==0){TemplateId2=35;FBranchId=1218;}
+
+          if(this.msg.RB_Branch_Id==1252&&this.msg.HelpBranchId==0){TemplateId2=35;FBranchId=1252;}
           if(this.msg.RB_Branch_Id==1252&&this.msg.HelpBranchId==1218){TemplateId2=292;}
+          if(this.msg.RB_Branch_Id==0&&this.msg.HelpBranchId==1252){TemplateId2=35;FBranchId=1252;}
+          if(this.msg.RB_Branch_Id==1218&&this.msg.HelpBranchId==1252){TemplateId2=292;}
+
+          if(this.msg.RB_Branch_Id==1248||this.msg.HelpBranchId==1248){TemplateId2=289;FBranchId=1248;}
+          if(this.msg.RB_Branch_Id==1220||this.msg.HelpBranchId==1220){TemplateId2=285;FBranchId=1220;}
 
           let ids = this.DataList.filter(citem => citem.check).map(x=>{ return x.FrID})
           this.$router.push({
@@ -428,6 +437,7 @@ export default {
               query: {
                 'settlementFrIds': ids.join(','),
                 'IsAirTicketSelect': TemplateId2,
+                'settlementBranchId':FBranchId,
                 'tab': '新增资金调拨',
                 'blank': "y"
               }

src/components/FinancialModule/addCapitalAllocation.vue

@@ -506,6 +506,9 @@ export default {
         if(this.$route.query.IsAirTicketSelect){
           this.msg.IsAirTicketSelect=this.$route.query.IsAirTicketSelect;
         }
+        if(this.$route.query.settlementBranchId && this.$route.query.settlementBranchId>0){
+          this.msg.RB_Branch_Id=this.$route.query.settlementBranchId;
+        }
       }
 
       if(this.$route.query.frIds){