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

src/pages/financial/market/achievementPeriodsList.vue

@@ -127,6 +127,7 @@
           <el-table-column  prop="UserName" label="用户" > </el-table-column>
           <el-table-column  prop="StudentCount" label="客人数量" > </el-table-column>
           <el-table-column  prop="CurrentPeriodMoney" label="应发提成金额" > </el-table-column>
+          <el-table-column  prop="PeopleNumMoney" label="应发人头奖励" > </el-table-column>
           <el-table-column  prop="IsGiveOut" label="是否已发放" > 
             <template slot-scope="scope">
               <span v-if='scope.row.IsGiveOut==1'>已发放</span>
@@ -135,7 +136,8 @@
           </el-table-column>
           
         </el-table>
-        <div style="margin-top: 10px;">金额总额:{{totalAmount}}</div>
+        <div style="margin-top: 10px;">总提成金额：{{totalAmount}}</div>
+        <div style="margin-top: 10px;">总人头奖励：{{totalPeople}}</div>
         <div slot="footer" class="dialog-footer">
           <el-button class="hollowFixedBtn" @click="costmode=false">取消</el-button>
           <el-button class="normalBtn" type="primary" @click="preservetransaction()">确定</el-button>
@@ -187,6 +189,7 @@
           costmode:false,
           multipleSelection:[],
           totalAmount:0,//选中的金额总额
+          totalPeople:0,//选中的人头奖励
           CheckID:0,
         }
       },
@@ -343,11 +346,14 @@
         },
         handleSelectionChange(val) {
           this.multipleSelection = val;
-          let zong = 0
+          let zong = 0;
+          let people = 0;
           this.multipleSelection.forEach(x=>{
-            zong = this.accAdd(zong,x.CurrentPeriodMoney)
+            zong = this.accAdd(zong,x.CurrentPeriodMoney);
+            people = this.accAdd(people,x.PeopleNumMoney);
           })
-          this.totalAmount = zong
+          this.totalAmount = zong;
+          this.totalPeople = people;
         },
         preservetransaction(){
           let that = this