Merge branch 'test'

application/index/view/finance/commission_total.html

@@ -133,7 +133,8 @@
 										<th class="text-center">成交日期/开票日期</th>
 										<th class="text-center">所属部门/门店</th>
 										<th class="text-center">业务员</th>
-										<th class="text-center">应分佣金（元）</th>
+										<th class="text-center">手续费（元）</th>
+										<th class="text-center">慈善基金（元）</th>
 										<th class="text-center">现金奖（元）</th>
 										<th class="text-center">实收佣金（元）</th>
 										<th class="text-center">税费（元）</th>

public/resource/template/commissionTotal_template_tpl.html

@@ -6,12 +6,13 @@
         <td>[%= it[item]['operation_date'] %]</td>
         <td>[%= it[item]['district_store'] %]</td>
         <td>[%= it[item]['name'] %]</td>
-        <td>[%= it[item]['should_commission'] %]</td>
+        <td>[%= it[item]['service_charge'] %]</td>
+        <td>[%= it[item]['charity_fund'] %]</td>
         <td>
         	[% if (it[item]['cash'] ){ %]
                 [%= it[item]['cash'] %]
             [% } else{%]
-                [%= 0 %]
+                <div %="" 0=""></div>
             [% } %]
         </td>
         <td>

public/resource/template/reportList_template_tpl.html

@@ -116,11 +116,7 @@
 					<span contenteditable class="detail-modal-maid-span-cash">[%= it['data'][i]['partial_commission'][j]['cash'] %]</span>
 					<span contenteditable class="detail-modal-maid-span-practical-fee">[%= it['data'][i]['partial_commission'][j]['practical_fee'] %]</span>
 					[% if(!it['data'][i]['partial_commission'][j]['income_time'] || (Array.isArray(it['data'][i]['partial_commission'][j]['income_time']) && it['data'][i]['partial_commission'][j]['income_time'].length<1) ) { %]
-						[% if(it['data'][i]['partial_commission'][j]['income_time_add']) { %]
-							<span class="detail-modal-maid-span-date" data-dateid="[%= it['data'][i]['partial_commission'][j]['income_time_add']['id'] %]">[%= it['data'][i]['partial_commission'][j]['income_time_add']['income_time'] %]</span>
-						[% }else{ %]
-							<span class="detail-modal-maid-span-date" data-dateid="">请点击选择</span>
-						[% } %]
+						<span class="detail-modal-maid-span-date" data-dateid="">请点击选择</span>
 					[% }else{ %]
 						<span class="detail-modal-maid-span-date" data-dateid="[%= it['data'][i]['partial_commission'][j]['income_time']['id'] %]">[%= it['data'][i]['partial_commission'][j]['income_time']['income_time'] %]</span>
 					[% } %]