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

src/components/FinancialModule/RecPayQuery.vue

@@ -890,7 +890,7 @@ export default {
                 {field: 'StatusStr', title: '当前状态',width: 120, titleAlign: 'left',columnAlign:'left',isResize:true},
                 {field: 'custome-operation', title: '操作',width: 200, titleAlign: 'left',columnAlign:'left',componentName:'table-operation',isResize:true}
             ],
-            pageSize:6,
+            pageSize:5,
             pageIndex:1,
           heightQueryBox:false
         }
@@ -1010,7 +1010,7 @@ export default {
                 }
             },err=>{})
         },
-        getPageList(){  // 获取列表数据
+        getPageList(){  // 获取列表数据 
             if(!this.msg.ClientID)this.msg.ClientID=0;
             if(!this.msg.ClientType)this.msg.ClientType=0;
             if(!this.msg.CurrencyId)this.msg.CurrencyId=0;

src/components/FinancialModule/RecPayQueryWB.vue

@@ -895,7 +895,7 @@ export default {
                 {field: 'StatusStr', title: '当前状态',width: 120, titleAlign: 'left',columnAlign:'left',isResize:true},
                 {field: 'custome-operation', title: '操作',width: 200, titleAlign: 'left',columnAlign:'left',componentName:'table-operation',isResize:true}
             ],
-            pageSize:6,
+            pageSize:5,
             pageIndex:1,
           heightQueryBox:false
         }