修改

application/index/view/finance/commission.html

@@ -208,6 +208,7 @@
 									<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>
 									

application/index/view/finance/tax.html

@@ -221,6 +221,7 @@
 									<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>
 									
 								</tr>

application/index/view/finance/wait_back_out.html

@@ -192,6 +192,7 @@
 									<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>
 								</tr>
@@ -246,6 +247,7 @@
 									<td class="text-center" id="maid_count_total_shishou"></td>
 									<td class="text-center"></td>
 									<td class="text-center"></td>
+									<td class="text-center"></td>
 								</tr>
 							</tfoot>
 

application/index/view/mulu_jilu.txt

@@ -69,22 +69,16 @@
 		view-->Finance-->account_statement.html
 
 		审核撤销成交报告-第一级审核
-		view-->Collection-->getCollection.html
-
-		审核撤销成交报告-第二级审核
-		view-->Collection-->getCollection.html
-
-		审核撤销成交报告-第三级审核
-		view-->Collection-->getCollection.html
+		view-->Finance-->wait_back_out.html
 
 		业绩明细
 		view-->PerformanceSubsidiary-->performancesubsidiaryList.html
 
-		实收明细
-		view-->Finance-->partialCommissionList.html
+		实收明细(分佣提成明细)
+		view-->Finance-->commission.html
 
 		税费明细
-		view-->Finance-->getTallAgeList.html
+		view-->Finance-->tax.html
 
 		实收汇总
 		view-->Finance-->getCommissionTotalList.html

application/index/view/performancesubsidiary/performancesubsidiaryList.html

@@ -233,6 +233,7 @@
 									<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>
 								</tr>
@@ -287,6 +288,7 @@
 									<td class="text-center" id="maid_count_total_shishou"></td>
 									<td class="text-center"></td>
 									<td class="text-center"></td>
+									<td class="text-center"></td>
 								</tr>
 							</tfoot>
 

public/resource/template/reportList_no_edit_template_tpl.html

@@ -93,7 +93,7 @@
         <td>[%= it['data'][i]['district_store'] %]</td>
         <td><span contenteditable class="detail-modal-maid-span-scale">[%= it['data'][i]['scale'] %]</span><span>%</span></td>
         <td contenteditable class="detail-modal-maid-td-should-commission">[%= it['data'][i]['scale_fee'] %]</td>
-        <td colspan="6" class="detail-modal-maid-mix-td oh">
+        <td colspan="7" class="detail-modal-maid-mix-td oh">
         	[% if(it['data'][i]['partial_commission'] && it['data'][i]['partial_commission'].length && it['data'][i]['partial_commission'].length>0) { %]
         		[% for(var j in it['data'][i]['partial_commission']){ %]
 				<div class="oh" data-id="[%= it['data'][i]['partial_commission'][j]['id'] %]">
@@ -102,6 +102,7 @@
 					<span contenteditable class="detail-modal-maid-span-charity-fund">[%= it['data'][i]['partial_commission'][j]['charity_fund'] %]</span>
 					<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>
+					<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>
 					<span class="detail-modal-maid-span-time">[%= dealT(it['data'][i]['partial_commission'][j]['confirm_date']) %]</span>
 				</div>
 				[% } %]
@@ -112,6 +113,7 @@
 					<span contenteditable class="detail-modal-maid-span-charity-fund">0</span>
 					<span contenteditable class="detail-modal-maid-span-cash">0</span>
 					<span contenteditable class="detail-modal-maid-span-practical-fee"></span>
+					<span class="detail-modal-maid-span-date" data-dateid=""></span>
 					<span class="detail-modal-maid-span-time"></span>
 				</div>	
     		[% } %]

public/resource/template/wait_backout_template_tpl.html

@@ -86,7 +86,7 @@
         <td>[%= it['data'][i]['district_store'] %]</td>
         <td><span contenteditable class="detail-modal-maid-span-scale">[%= it['data'][i]['scale'] %]</span><span>%</span></td>
         <td contenteditable class="detail-modal-maid-td-should-commission">[%= it['data'][i]['scale_fee'] %]</td>
-        <td colspan="6" class="detail-modal-maid-mix-td oh">
+        <td colspan="7" class="detail-modal-maid-mix-td oh">
         	[% if(it['data'][i]['partial_commission'] && it['data'][i]['partial_commission'].length && it['data'][i]['partial_commission'].length>0) { %]
         		[% for(var j in it['data'][i]['partial_commission']){ %]
 				<div class="oh" data-id="[%= it['data'][i]['partial_commission'][j]['id'] %]">
@@ -95,6 +95,7 @@
 					<span contenteditable class="detail-modal-maid-span-charity-fund">[%= it['data'][i]['partial_commission'][j]['charity_fund'] %]</span>
 					<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>
+					<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>
 					<span class="detail-modal-maid-span-time">[%= dealT(it['data'][i]['partial_commission'][j]['confirm_date']) %]</span>
 				</div>
 				[% } %]
@@ -105,6 +106,7 @@
 					<span contenteditable class="detail-modal-maid-span-charity-fund">0</span>
 					<span contenteditable class="detail-modal-maid-span-cash">0</span>
 					<span contenteditable class="detail-modal-maid-span-practical-fee"></span>
+					<span class="detail-modal-maid-span-date" data-dateid=""></span>
 					<span class="detail-modal-maid-span-time"></span>
 				</div>	
     		[% } %]