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

src/components/FinancialModule/domesticCommissiondetailsTW2.vue

@@ -98,7 +98,7 @@
     <div style="display: flex;align-items: center;height: 50px;justify-content: space-between;">
       <div style="display: flex;align-items: center;">
         <span>总金额：{{TotalMoney}}元</span>
-        <span style="margin-left: 15px;">总人数：{{TotalNum}}人</span>
+        <span style="margin-left: 15px;">扣除比例：{{TotalProfit}}</span>
       </div>
       <input type="button" class="normalBtn" value="导出" @click="exportExcel">
 
@@ -187,6 +187,7 @@
         searchList: [],
         departMentList: [],
         TotalMoney: 0,
+        TotalProfit: 0,
         TotalNum: 0,
         disabled: true
 
@@ -324,7 +325,8 @@
             this.loading = false;
             if (res.data.resultCode == 1) {
               this.TotalMoney = res.data.data.TotalMoney ? res.data.data.TotalMoney : 0
-              this.TotalNum = res.data.data.TotalNum ? res.data.data.TotalNum : 0
+              // this.TotalNum = res.data.data.TotalNum ? res.data.data.TotalNum : 0
+              this.TotalProfit = res.data.data.TotalProfit ? res.data.data.TotalProfit : 0
               this.dataList = res.data.data.pmodel.pageData;
               this.total = res.data.data.pmodel.count;
             } else {