成交报告修改

public/resource/js/reportList.js

@@ -1500,7 +1500,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
 		switchUrl: function(){
 			switch (Number(this.mainTabIndex)){
 				case 0:
-					return '/index/reportListOne/1';
+					return '/index/reportListAll';
 				case 1:
 					return '/index/reportListOne/1';
 				case 2:

public/resource/template/reportList_template_tpl.html

 <script id="reportList_list_tpl" type="text/template">
     [% if(it["list"] && it["list"].length && it["list"].length>0) { %]
     [% var sw=function(s){switch(Number(s)){case 10:return"出租";case 20:return"增佣";case 30:return"代理";case 40:return"好处费";default:return s}}; %]
+    [% var sw2=function(s){switch(Number(s)){case 0:return"一级";case 1:return"二级";case 2:return"三级";case 3:return"已结单";default:return s}}; %]
     [% for(var item in it["list"]){ %]
     <tr data-id="[%= it['list'][item]['id'] %]" data-orderid="[%= it['list'][item]['order_id'] %]">
     	<td class="text-center" >行号 </td>
-    	<td class="text-center" >[%= it["list"][item]['id'] %]</td>
+    	<td class="text-center" >
+    		[%= it["list"][item]['id'] %]
+    		[% if(!it["step"]) { %]
+    			&nbsp;<span class="btn1 btn-success btn-xs">[%= sw2(it["list"][item]['audit_level']) %]</span>
+			[% } %]
+    	</td>
         <td class="text-center" width="10%">[%= it["list"][item]['create_time'] %]</td>
         <td class="text-center" width="8%">[%= it["list"][item]['is_open']*1?'是':'否' %]</td>
         <td class="text-left">[%= it["list"][item]['internal_address'] %]</td>
@@ -17,7 +23,7 @@
 			[% if(check_auth('index/bargainInfo')) { %]
 				<a class="btn1 btn-success details-btn" href="#modal_detail" data-toggle="modal">详情</a>&nbsp;
 			[% } %]
-			[% if(it["step"]<3) { %]
+			[% if(it["step"] && it["step"]<3) { %]
 				[% if(check_auth('index/checkReportAttache/1')||check_auth('index/checkReportManager/2')||check_auth('index/checkReportMajordomo/3')||check_auth('index/checkReportCashier/4')) { %]
 					<a class="btn1 btn-success"  href="#modal-pass" data-toggle="modal">通过</a>&nbsp;
 				[% } %]
@@ -108,10 +114,10 @@
 					<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>
-					[% if(it['data'][i]['income_time']) { %]
-						<span class="detail-modal-maid-span-date" data-dateid="[%= it['data'][i]['income_time']['id'] %]">[%= it['data'][i]['income_time']['income_time'] %]</span>
-					[% }else{ %]
+					[% 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) ) { %]
 						<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>
 					[% } %]
 					
 					<span class="detail-modal-maid-span-time">[%= dealT(it['data'][i]['partial_commission'][j]['confirm_date']) %]</span>