1业绩提成

src/components/finance/marketCommissionfrom.vue

@@ -244,20 +244,20 @@
                         </template>
                     </q-input>
                     <div>
-                        <span class="fz14 text-negative">注释：额外奖励需确认邀约咨询30分钟以上</span>
+                        <!-- <span class="fz14 text-negative">注释：额外奖励需确认邀约咨询30分钟以上</span> -->
                     </div>
                 </div>
             </div>
             <div v-if="addMsg.Type==1&&addMsg.ChildEmpList&&addMsg.ChildEmpList.length>0"
               :style="{'margin-bottom': addMsg.EnableZGAward==0?'80px':''}" >
               <q-toggle v-model="addMsg.EnableZGAward"
-              label="是否启用部门有效到访奖励"
+              label="是否启用部门人头奖励"
               left-label
               false-value="0"
               true-value="1"/>
             </div>
             <div style="margin-bottom: 80px;" v-if="addMsg.EnableZGAward==1">
-              <div>有效到访奖励阶梯列表</div>
+              <div>人头奖励阶梯列表</div>
 
               <div
                   v-for="(x,y) in addMsg.ZGAwardList"

src/pages/financial/cycleList.vue

@@ -153,6 +153,7 @@
               </template>
               
             </el-table-column>
+            <el-table-column width='85' prop="PeopleNumMoney" label="人头奖励"> </el-table-column>
             <el-table-column width='85' prop="Periods" label="期数"> </el-table-column>
             <el-table-column  prop="Remark"  width='160' label="备注"> </el-table-column>
         </el-table>

src/pages/financial/cycleOrderList.vue

@@ -108,6 +108,7 @@
           </template>
 
         </el-table-column>
+        <el-table-column width='85' prop="PeopleNumMoney" label="人头奖励"> </el-table-column>
         <el-table-column width='85' prop="Periods" label="期数"> </el-table-column>
         <el-table-column prop="Remark" width='160' label="备注"> </el-table-column>
       </el-table>

src/pages/financial/market/AchievementsForOrderList.vue

@@ -144,6 +144,7 @@
           </template>
 
         </el-table-column>
+        <el-table-column width='85' prop="PeopleNumMoney" label="人头奖励"> </el-table-column>
         <el-table-column width='85' prop="Periods" label="期数"> </el-table-column>
         <el-table-column prop="Remark" width='160' label="备注"> </el-table-column>
       </el-table>

src/pages/financial/market/AchievementsUserDetailList.vue

@@ -129,7 +129,7 @@
         border
         style="width: 100%"
       >
-        <el-table-column prop="SchoolName" width="150" label="校区"></el-table-column>
+        <el-table-column prop="SchoolName" width="140" label="校区"></el-table-column>
         <el-table-column prop="DeptName" label="部门"></el-table-column>
         <el-table-column prop="UserType" label="类型">
           <template slot-scope="scope">
@@ -145,7 +145,7 @@
             <span v-if="scope.row.IsDept == 2">个人</span>
           </template>
         </el-table-column>
-        <el-table-column width="170" prop="ClassName" label="班级信息">
+        <el-table-column width="130" prop="ClassName" label="班级信息">
           <template slot-scope="scope">
             <div>
               <span
@@ -208,7 +208,7 @@
             >{{ scope.row.IsFirstCommission == 1 ? '是' : '否' }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="TotalHours" label="课时统计" width="160">
+        <el-table-column prop="TotalHours" label="课时统计" width="120">
           <template slot-scope="scope">
             <div v-if="scope.row.TotalHours">总计课时:{{ scope.row.TotalHours }}</div>
             <div v-if="scope.row.TotalLearn">
@@ -223,7 +223,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column width="160" prop="CurrentPeriodMoney" label="当期发放信息">
+        <el-table-column width="120" prop="CurrentPeriodMoney" label="当期发放信息">
           <template slot-scope="scope">
             <div
               v-if="scope.row.CurrentPeriodMoney"
@@ -240,6 +240,7 @@
             <div style="color: rgb(233, 82, 82);">{{ scope.row.YFMoney }}</div>
           </template>
         </el-table-column>
+        <el-table-column width="90" prop="PeopleNumMoney" label="人头奖励"></el-table-column>
         <el-table-column width="90" prop="Periods" label="期数"></el-table-column>
         <el-table-column prop="Remark" width="160" label="备注"></el-table-column>
       </el-table>
@@ -330,11 +331,15 @@ export default {
       let obj = {
         SchoolName: '合计',
         YFMoney: 0,
+        PeopleNumMoney: 0
       }
       this.tableData.forEach((x) => {
         if (x.YFMoney) {
           obj.YFMoney = this.accAdd(obj.YFMoney,x.YFMoney)
         };
+        if(x.PeopleNumMoney){
+          obj.PeopleNumMoney =this.accAdd(obj.PeopleNumMoney,x.PeopleNumMoney)
+        }
       })
       this.tableData.push(obj)
 

src/pages/financial/market/commissionRule.vue

@@ -184,7 +184,7 @@
           >
 
             <tr>
-              <td rowspan="2" width="100" style="min-width: 100px;">提成比例</td>
+              <td rowspan="2" width="100" style="min-width: 100px;">提成比例/部门</td>
               <th style="min-width: 220px;"
                 v-for="( son , sIndex ) in item.RateList"
                 :key="sIndex"
@@ -222,11 +222,11 @@
           >
 
             <tr>
-              <td rowspan="2" width="100" style="min-width: 100px;">有效到访奖励</td>
+              <td rowspan="2" width="100" style="min-width: 100px;">人头奖金/部门</td>
               <th style="min-width: 220px;"
                 v-for="( son , sIndex ) in item.ZGAwardList"
                 :key="sIndex"
-              >{{ son.StartValue }} <span>{{son.EndValue && son.EndValue!=-1?'<=有效到访<':'<有效到访'}}</span><span v-if="son.EndValue && son.EndValue!=-1">{{ son.EndValue }}</span></th>
+              >{{ son.StartValue }} <span>{{son.EndValue && son.EndValue!=-1?'<=人头<=':'<=人头'}}</span><span v-if="son.EndValue && son.EndValue!=-1">{{ son.EndValue }}</span></th>
             </tr>
             <tr style="">
               <td style="min-width: 220px;" v-for="( son , sIndex ) in item.ZGAwardList" :key="sIndex">{{ son.Rate }}</td>

src/pages/financial/market/employeeCommission.vue

@@ -62,6 +62,7 @@
           <el-table-column prop="StudentCount" label="客人数量" sortable :sort-method="StudentCount"> </el-table-column>
        
           <el-table-column prop="CurrentPeriodMoney" label="提成金额" sortable :sort-method="CurrentPeriodMoney"> </el-table-column>
+          <el-table-column prop="PeopleNumMoney" label="人头奖励" sortable :sort-method="PeopleNumMoney"> </el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
               <div class="_icon_btn">

src/pages/financial/market/marketStatistics.vue

@@ -182,6 +182,7 @@
             <div style="color: rgb(233, 82, 82);">{{scope.row.YFMoney}}</div>
           </template>
         </el-table-column>
+        <el-table-column width='85' prop="PeopleNumMoney" label="人头奖励"> </el-table-column>
         <el-table-column width='85' prop="Periods" label="期数"> </el-table-column>
         <el-table-column prop="Remark" width='160' label="备注"> </el-table-column>
       </el-table>

src/pages/financial/userCommissionDetails.vue

@@ -137,6 +137,7 @@
             <div style="color: rgb(233, 82, 82);">{{scope.row.YFMoney}}</div>
           </template>
         </el-table-column>
+        <el-table-column width='90' prop="PeopleNumMoney" label="人头奖励"> </el-table-column>
         <el-table-column width='90' prop="Periods" label="期数"> </el-table-column>
         <el-table-column prop="Remark" width='160' label="备注"> </el-table-column>
       </el-table>