update

src/components/FinancialModule/OutstandingAccounts.vue

@@ -252,29 +252,33 @@ export default {
         }
     },
     created(){
+        this.getList();
+        this.getAccountList1();
+        this.getAccountList2();
+        this.getAccountList3();
+        this.getAccountList4();
         let userInfo = this.getLocalStorage();
         this.form.groupId=userInfo.RB_Group_id;
         this.EmployeeId=userInfo.EmployeeId;
         
-        if(this.$route.query.id){
-            this.obj.Id=Number(this.$route.query.Id);
+        
+    },
+    mounted(){
+       if(this.$route.query.BankType){
+            this.obj.Type=Number(this.$route.query.BankType);
+            setTimeout(() => {
+                this.changeAccount(this.obj.Type);
+            }, 3000);
+            
         }
-        if(this.$route.query.AccountId){
-            this.obj.AccountId=Number(this.$route.query.AccountId);
+        if(this.$route.query.BankID){
+            this.obj.AccountId=Number(this.$route.query.BankID);
         }
         if(this.$route.query.StartTime){
             this.dateList[0]=this.$route.query.StartTime;
             this.dateList[1]=this.$route.query.EndTime;
         }
        
-    },
-    mounted(){
-       this.getList();
-       this.getAccountList1();
-       this.getAccountList2();
-       this.getAccountList3();
-       this.getAccountList4();
-       
     },
     filters:{
         YMD(date){

src/components/FinancialModule/TransferReport.vue

@@ -65,6 +65,7 @@
           <th>{{$t('fnc.a_bqjffshenge')}}</th>
           <th>{{$t('fnc.a_bqdffshenge')}}</th>
           <th>本期收据</th>
+          <th>本期未付账</th>
           <th>{{$t('fnc.a_bqyue')}}</th>
           <th>{{$t('fnc.a_jfbishu')}}</th>
           <th>{{$t('fnc.a_dfbishu')}}</th>
@@ -79,6 +80,7 @@
             <th></th>
             <th></th>
             <th></th>
+            <th></th>
           </tr>
           <tr v-for="(subItem, index) in item.SubList">
             <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.BName}}</td>
@@ -86,7 +88,8 @@
             <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoMoney}}</td>
             <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.Income}}</td>
             <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutCome}}</td>
-            <td @click="goUrlNew(subItem)" style="cursor: pointer">{{subItem.ReceiptMoney}}</td>
+            <td @click="goUrlNew('Manfunds',subItem)" style="cursor: pointer">{{subItem.ReceiptMoney}}</td>
+            <td @click="goUrlNew('OutstandingAccounts',subItem)" style="cursor: pointer">{{subItem.NONPaymentMoney}}</td>
             <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.NowIncome}}</td>
             <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.IncomeCount}}</td>
             <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutComeCount}}</td>
@@ -97,6 +100,7 @@
             <td>{{item.TotalList.Income}}</td>
             <td>{{item.TotalList.OutCome}}</td>
             <td >{{item.TotalList.ReceiptMoney}}</td>
+            <td >{{item.TotalList.NONPaymentMoney}}</td>
             <td>{{item.TotalList.NowIncome}}</td>
             <td>{{item.TotalList.IncomeCount}}</td>
             <td>{{item.TotalList.OutComeCount}}</td>
@@ -108,6 +112,8 @@
           <td>{{item.Income}}</td>
           <td>{{item.OutCome}}</td>
           <td>{{item.ReceiptMoney}}</td>
+          <td>{{item.NONPaymentMoney}}</td>
+          
           <td>{{item.NowIncome}}</td>
           <td>{{item.IncomeCount}}</td>
           <td>{{item.OutComeCount}}</td>
@@ -118,6 +124,8 @@
           <td>{{dataObj.sumObj.Income}}</td>
           <td>{{dataObj.sumObj.OutCome}}</td>
           <td>{{dataObj.sumObj.ReceiptMoney}}</td>
+          <td>{{dataObj.sumObj.NONPaymentMoney}}</td>
+          
           <td>{{dataObj.sumObj.NowIncome}}</td>
           <td>{{dataObj.sumObj.IncomeCount}}</td>
           <td>{{dataObj.sumObj.OutComeCount}}</td>
@@ -173,8 +181,8 @@
       this.msg.EmployeeId= userInfo.EmployeeId;
     },
     methods: {
-      goUrlNew(obj){
-        let name = 'Manfunds';
+      goUrlNew(path,obj){
+        let name = path;
         this.$router.push({
           name: name,
           query:{

src/components/FinancialModule/addFinancialDocuments.vue

@@ -556,7 +556,8 @@
         :visible.sync="maxmoneyTips"
         width="380px">
         <div style="margin: 0px 0 15px 0;">
-            <p><span style="color: #e6a23c;font-size: 16px;" class="el-notification__icon el-icon-warning"></span>根据公司规定，每张付款单不能超过{{maxmoneyData}}元。</p>
+            <p><span style="color: #e6a23c;font-size: 16px;" class="el-notification__icon el-icon-warning"></span>
+            根据公司规定，每张付款单不能超过{{maxmoneyData}}元人民币。</p>
             <p style="padding-left: 23px;margin-top: 10px;">超过需额外制单，谢谢配合！</p>
         </div>
         <span slot="footer" class="dialog-footer">