团队收支明细调整挂账收入支出位置

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -193,6 +193,7 @@
                   <div>应收：<span>￥{{moneyFormat(moneyAll.otheryTotalyf)}}</span></div>
                   <div>实收：<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalsf)}}</span></div>
                    <div>待收：<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalyf-moneyAll.otheryTotalsf)}}</span></div> 
+                   <div>挂账总收入：<span>￥{{moneyFormat(AllCont.Income)}}</span></div>
                   <!--<div>
                     注：应收=订单应收总额，实收=订单实收总额
                   </div>-->
@@ -210,6 +211,7 @@
                   <div>应付：<span>￥{{DataList.TeamBalance.ShouldPay}}</span></div>
                   <div>实付：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualPay}}</span></div>
                   <div>待付：<span class="Team_Coins">￥{{DataList.TeamBalance.WaitPay}}</span></div>
+                  <div>挂账总支出：<span>￥{{moneyFormat(AllCont.Expend)}}</span></div>
                   <div>
                     注：成本单据总额(包含退款)+提成-小费收入-地接收入
                   </div>
@@ -249,7 +251,7 @@
                   <div>联运成本：<span>￥{{DataList.LYCB}}</span></div>
               </div>
             </el-col>
-            <el-col :span="4">
+            <!-- <el-col :span="4">
               <div class="Team_DList">
                 <div class="Team_firstTitle">
                   <span class="Team_comCoinType Team_lirun">
@@ -262,7 +264,7 @@
                   <div>挂账总收入：<span>￥{{moneyFormat(AllCont.Income)}}</span></div>
                 </div>
               </div>
-            </el-col>
+            </el-col> -->
             <el-col :span="4">
               <div class="Team_DList">
                 <div class="Team_firstTitle">

src/components/activity/IntegralMall.vue

@@ -85,6 +85,8 @@
          </td>
       </tr>
     </table>
+    <el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
+		</el-pagination>
     <div class="noDataNotice" v-if="dataList.length<1">
       <i class="iconfont icon-kong"></i>
       <p>{{$t("active.ld_noData")}}</p>
@@ -108,8 +110,10 @@ export default {
       dataList:[],
       GoodsTypeList: [],
       GoodsSeriesList: [],
+      total:0,
     };
   },
+  
   mounted() {
     this.getList();
     this.getGoodsTypeManager(); 
@@ -119,6 +123,10 @@ export default {
   },
 
   methods: {
+    handleCurrentChange(val){
+      this.msg.pageIndex=val;
+      this.getList();
+    },
     getHotName: function (id) {
       for(let i = 0; i < this.GoodsSeriesList.length; i++ ) {
         if (this.GoodsSeriesList[i].id === id) {
@@ -168,6 +176,7 @@ export default {
         this.loading = false;
         if (res.data.resultCode === 1) {
           this.dataList = res.data.data.pageData;
+          this.total= res.data.data.count;
         } else {
           this.Error(res.data.message)
         }

src/components/activity/TravelInfoList.vue

@@ -133,7 +133,7 @@
 
 			</tr>
 		</table>
-		<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper" :page-size=form.pageSize :total=total>
+		<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper" :page-size='form.pageSize' :total='total'>
 		</el-pagination>
 		<el-dialog custom-class='w400' title="分配定制师"  :visible.sync="Visible">
 			    	<el-form :model="pwdMsg" label-width="80px">