1

src/components/FinancialModule/accDetail/PlatformAccDetail.vue

@@ -173,6 +173,11 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
+                    <el-col :span="4" :gutter="35">
+                        <el-form-item label="抵扣合并">
+                          <el-checkbox v-model="msg.IsPlatformMergeBank" :true-label="1" :false-label="0" ></el-checkbox>
+                        </el-form-item>
+                    </el-col>
                 </el-row>
             </el-form>
 			<ul>
@@ -500,8 +505,8 @@ export default {
                 BankList:[],
                 Is_Cashier:-1,
                 Status:-1,
-                AccountNumber:''
-
+                AccountNumber:'',
+                IsDiJieSelect:-1
             },
             Type:2,
             AccountId:"",
@@ -966,6 +971,7 @@ export default {
       this.addMsg.FrIDs = str.substring(0,str.length-1);
       this.addMsg.BankList = this.payMsgList;
       this.addMsg.Money = this.listAllMoney;
+      this.addMsg.IsPlatformMergeBank = this.msg.IsPlatformMergeBank;
       this.allLoading = true
       this.apipost('Financial_post_MergeFinance',this.addMsg,r=>{
         if(r.data.resultCode === 1) {
@@ -991,9 +997,13 @@ export default {
           x.disabled=false
         }else if(x.Type===obj.Type&&x.ClientID===obj.ClientID&&x.ClientType===obj.ClientType){
           x.disabled=false
+        }else{
+          if(this.msg.IsPlatformMergeBank==1){
+            x.disabled=false  
           }else{
           x.disabled=true
           }
+        }
       });
       if(obj.check){
         this.checkList[index] = {
@@ -1034,8 +1044,18 @@ export default {
       this.checkList.forEach(x=>{
         if(x.FinanceId){
           count++;
+          if(this.msg.IsPlatformMergeBank == 1){
+            if(x.Type==1){
               allBPrice = allBPrice + x.Money;
               allWPrice = allWPrice + x.OriginalMoney;
+            }else{
+              allBPrice = allBPrice - x.Money;
+              allWPrice = allWPrice - x.OriginalMoney;
+            }
+          }else{
+          allBPrice = allBPrice + x.Money;
+          allWPrice = allWPrice + x.OriginalMoney;
+          }
           this.addMsg.FrIDs = this.addMsg.FrIDs + x.FinanceId;
         }
       });