From 0332b591e8726ada3283a44b08b395df431a86c7 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 17 Mar 2021 14:24:29 +0800
Subject: [PATCH] =?UTF-8?q?3.22=E5=8A=9F=E8=83=BD=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MarketPercentageController.class.php      | 10 ++++---
 .../MarketPercentage/marketstaffsettle.html   | 26 ++++++++++++-------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php
index 64644ff6d..fdd4be162 100644
--- a/Application/Admin/Controller/MarketPercentageController.class.php
+++ b/Application/Admin/Controller/MarketPercentageController.class.php
@@ -854,8 +854,8 @@ class MarketPercentageController extends ThinkController
             $sum['should_performance_commission'] += $data[$key]['should_performance_commission'];
             $sum['should_month_bonus_ratio'] += $data[$key]['should_month_bonus_ratio'];
 
-            $sum['wait_performance_commission'] += $data[$key]['wait_performance_commission'];
-            $sum['wait_achievement_commission'] += $data[$key]['wait_achievement_commission'];
+//            $sum['wait_performance_commission'] += $data[$key]['wait_performance_commission'];
+//            $sum['wait_achievement_commission'] += $data[$key]['wait_achievement_commission'];
 
         }
 //        die();
@@ -883,8 +883,10 @@ class MarketPercentageController extends ThinkController
 //                'wait_commission' => '待发金额',
                 'should_performance_commission'=>'本月应发业绩提成',
                 'should_month_bonus_ratio'=>'本月应发绩效考核奖金',
-                'wait_performance_commission'=>'待发业绩提成',
-                'wait_achievement_commission'=>'待发绩效考核奖金',
+                'extend_commission' => '本月应发金额合计',
+                'wait_performance_commission'=>'本月待发业绩提成',
+                'wait_achievement_commission'=>'本月待发绩效考核奖金',
+                'wait_commission' => '本月待发金额合计',
                 'coefficient_check_detail' => '绩效确认',
                 'market_check_detail' => '市场部确认',
                 'finance_check_detail' => '财务部审批'];
diff --git a/Application/Admin/View/MarketPercentage/marketstaffsettle.html b/Application/Admin/View/MarketPercentage/marketstaffsettle.html
index 496bb2cc0..2c575d913 100644
--- a/Application/Admin/View/MarketPercentage/marketstaffsettle.html
+++ b/Application/Admin/View/MarketPercentage/marketstaffsettle.html
@@ -205,9 +205,11 @@
 <!--                        <th>本月应发金额</th>-->
                         <th>本月应发业绩提成</th>
                         <th>本月应发绩效考核奖金</th>
+                        <th>本月应发金额合计</th>
 <!--                        <th>待发金额</th>-->
-                        <th>待发业绩提成</th>
-                        <th>待发绩效考核奖金</th>
+                        <th>本月待发业绩提成</th>
+                        <th>本月待发绩效考核奖金</th>
+                        <th>本月待发金额合计</th>
                         <th>绩效确认</th>
                         <th>市场部确认</th>
                         <th>财务部审批</th>
@@ -238,14 +240,14 @@
                                 <td>{$data['commission']|default='0.00'}</td>
 <!--                                <td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'admin_id'=>$data['admin_id']))}" >{$data['extend_commission']|default='0.00'}</a></td>-->
 
-                                <td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'admin_id'=>$data['admin_id']))}" >{$data['should_performance_commission']|default='0.00'}</a></td>
-                                <td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'admin_id'=>$data['admin_id']))}" >{$data['should_month_bonus_ratio']|default='0.00'}</a></td>
-
+                                <td>{$data['should_performance_commission']|default='0.00'}</td>
+                                <td>{$data['should_month_bonus_ratio']|default='0.00'}</td>
+                                <td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'admin_id'=>$data['admin_id']))}" >{$data['extend_commission']|default='0.00'}</a></td>
 <!--                                <td><a href="{:U('MarketPercentage/showBonusList',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'real_name'=>$data['real_name'],'level'=>$data['group_id']))}" >{$data['wait_commission']|default='0.00'}</a></td>-->
 
-                                <td><a href="{:U('MarketPercentage/showBonusList',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'real_name'=>$data['real_name'],'level'=>$data['group_id']))}" >{$data['wait_performance_commission']|default='0.00'}</a></td>
-                                <td><a href="{:U('MarketPercentage/showBonusList',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'real_name'=>$data['real_name'],'level'=>$data['group_id']))}" >{$data['wait_achievement_commission']|default='0.00'}</a></td>
-
+                                <td>{$data['wait_performance_commission']|default='0.00'}</td>
+                                <td>{$data['wait_achievement_commission']|default='0.00'}</td>
+                                <td><a href="{:U('MarketPercentage/showBonusList',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'real_name'=>$data['real_name'],'level'=>$data['group_id']))}" >{$data['wait_commission']|default='0.00'}</a></td>
                                 <td><if condition="$data.coefficient_check eq 0"><span ></if>{$data['coefficient_check_detail']|default=''}<if condition="$data.market_check eq 1"></span></if></td>
                                 <td><if condition="$data.market_check eq 0"><span ></if>{$data['market_check_detail']|default=''}<if condition="$data.market_check eq 1"></span></if></td>
                                 <td><if condition="$data.finance_check eq 0"><span ></if>{$data['finance_check_detail']|default=''}<if condition="$data.market_check eq 1"></span></if></td>
@@ -266,8 +268,12 @@
                         <td>{$sum['achievement_bonus']|default='0.00'}</td>
                         <td></td>
                         <td>{$sum['commission']|default='0.00'}</td>
-                        <td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$start_time,'time_end'=>$end_time))}" >{$sum['should_performance_commission']|default='0.00'}</a></td>
-                        <td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$start_time,'time_end'=>$end_time))}" >{$sum['should_month_bonus_ratio']|default='0.00'}</a></td>
+                        <td>{$sum['should_performance_commission']|default='0.00'}</td>
+                        <td>{$sum['should_month_bonus_ratio']|default='0.00'}</td>
+                        <td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$start_time,'time_end'=>$end_time))}" >{$sum['extend_commission']|default='0.00'}</a></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
                         <td></td>
                         <td></td>
                         <td></td>