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

src/components/FinancialModule/FinancialDocuments.vue

@@ -485,12 +485,12 @@ input[type="number"] {
     <div class="page_fnDm" @keyup.enter="resetPageIndex(),getPageList()">
         <ul class="_nav clearfix">
             <!-- <li :class="active==5?'_active':''" @click="active=5,msg.Conditon=5,getPageList()">全部</li> -->
-            <li :class="active==1?'_active':''" @click="active=1, msg.Conditon=1, BOSSBtn = false, getPageList()">{{$t('ios.wfqide')}}</li>
+            <li :class="active==1?'_active':''" @click="active=1, msg.Conditon=1, BOSSBtn = false, getPageList(0,1)">{{$t('ios.wfqide')}}</li>
             <li :class="active==3?'_active':''" @click="active=3, msg.Conditon=3, getPageList()">{{$t('ios.dwspide')}}</li>
-            <li :class="active==2?'_active':''" @click="active=2, msg.Conditon=2, BOSSBtn = false, getPageList()" >{{$t('ios.wspide')}}</li>
-            <li :class="active==6?'_active':''" @click="active=6, msg.Conditon=6, BOSSBtn = false, getPageList()">{{$t('ios.wzfeide')}}</li>
-            <li :class="active==7?'_active':''" @click="active=7, msg.Conditon=7, BOSSBtn = false, getPageList()">{{$t('ios.bbhuide')}} <span v-if="rejectNum !=='' && rejectNum>=0" style="color:red">({{rejectNum}})</span></li>
-            <li :class="active==4?'_active':''" @click="active=4, msg.Conditon=4, BOSSBtn = false, getPageList()">{{$t('ios.csgwode')}}</li>
+            <li :class="active==2?'_active':''" @click="active=2, msg.Conditon=2, BOSSBtn = false, getPageList(0,1)" >{{$t('ios.wspide')}}</li>
+            <li :class="active==6?'_active':''" @click="active=6, msg.Conditon=6, BOSSBtn = false, getPageList(0,1)">{{$t('ios.wzfeide')}}</li>
+            <li :class="active==7?'_active':''" @click="active=7, msg.Conditon=7, BOSSBtn = false, getPageList(0,1)">{{$t('ios.bbhuide')}} <span v-if="rejectNum !=='' && rejectNum>=0" style="color:red">({{rejectNum}})</span></li>
+            <li :class="active==4?'_active':''" @click="active=4, msg.Conditon=4, BOSSBtn = false, getPageList(0,1)">{{$t('ios.csgwode')}}</li>
 
             <li class="hight_query" style="float:right;">
                 <span>
@@ -2102,7 +2102,7 @@ export default {
         err => {}
       );
     },
-    getPageList(t) {
+    getPageList(t,active) {
       // 获取列表数据
       this.loading = true;
       this.checkAllList = [];
@@ -2119,6 +2119,11 @@ export default {
       } else {
         this.checkboxShow = false;
       }
+      if(active){
+        this.total = 0
+        this.DataList = [];
+        this.msg.pageIndex = 1
+      }
       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/OpCommission/OPcommissionPeriods.vue

@@ -250,7 +250,7 @@
                       CurrencyId: 1,
                       XSTC: 1,
                       OtherType:73,
-                      ReFinanceId:item.Id,
+                      ReFinanceId:item.ID,
                       isRB_Branch_Id: true
                   }
                   let query = {