Merge branch 'test'

application/index/view/agent/agent.html

@@ -39,7 +39,7 @@
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="industry_type" placeholder="角色" type="text" value="" name="groupname">
 												<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish" placeholder="门店"
                                                     type="text" value="" name="store_name">-->
-												<select class="form-control btn2  input ld-Marheight" name="" id="district_id">
+												<select class="form-control btn2  input ld-Marheight" name="" id="district_id2">
 													<option value="">部门</option>
 												</select>
 

application/model/OPartialCommission.php

@@ -256,6 +256,15 @@ class OPartialCommission extends BaseModel
                 //税费
                 $data[$k]['fee']  = $m_tax->where('operation_date', 'between time', [$operation_start_data, $operation_end_data])
                     ->where('agent_id', $v['agent_id'])->sum('fee');
+
+                //去除多次应分佣金
+                $should_commission = $this->where('confirm_date', 'between time', [$operation_start_data, $operation_end_data])
+                    ->where('agent_id', $v['agent_id'])->group('bargain_id')->column('should_commission');
+
+                $data[$k]['should_commission'] = 0;
+                foreach ($should_commission as $kk => $vv) {
+                    $data[$k]['should_commission'] += $vv;
+                }
             }
         }
 

public/resource/template/commissionTotal_template_tpl.html

@@ -6,7 +6,7 @@
         <td>[%= it[item]['operation_date'] %]</td>
         <td>[%= it[item]['district_store'] %]</td>
         <td>[%= it[item]['name'] %]</td>
-        <td>[%= it[item]['practical_fee'] %]</td>
+        <td>[%= it[item]['should_commission'] %]</td>
         <td>[%= it[item]['cash'] %]</td>
         <td>[%= it[item]['practical_fee'] %]</td>
         <td>