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

src/components/FinancialModule/BankStatementReconciliation/index.vue

@@ -316,7 +316,7 @@ export default {
             TypeId: 3,
             sTradeDate: item.StartDate,
             eTradeDate: item.StartDate,
-            SubjectId: row.StartBalance,
+            SubjectId: row.SubjectId,
             blank: 'y'
           }
         })

src/components/FinancialModule/accDetail/AccountStatementDetail.vue

@@ -354,6 +354,10 @@ export default {
       this.getList();
 
     }
+    if(this.$route.query.SubjectId){
+      this.msg.BankSubjectId = parseInt(this.$route.query.SubjectId);
+    }
+    
   },
   methods:{