暂存2

application/index/view/finance/account_statement.html

@@ -16,7 +16,7 @@
 							<table class="table table-striped table-bordered table-hover table-condensed">
 								<thead>
 									<tr>
-										<td colspan="9">
+										<td colspan="9" class="maintable-top-sub-tr">
 											<a class="btn btn-info liudan_pic_btn" id="commissioner">第一级审核</a>
 											<a class="btn btn-default liudan_pic_btn" id="manager">第二级审核</a>
 											<a class="btn btn-default liudan_pic_btn" id="director">第三级审核</a>
@@ -33,13 +33,13 @@
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_address" placeholder="商铺地址" type="text" value="">
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_num" placeholder="商铺号" type="text" value="">
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" placeholder="客户电话" type="text" value="">
-												<span class="btn btn-info btn3 search" id="search0">搜索</span>
+												<span class="btn btn-info btn3 search" id="search">搜索</span>
 												<span class="btn btn-info btn3" id="reset">重置</span>
 												<span class="btn btn-info btn3" id="export">导出excel</span>
 											</form>
 										</td>
 									</tr>
-									<tr>
+									<tr class="maintable-tr-bar">
 										<th class="text-center">提交时间</th>
 										<th class="text-center">商铺地址</th>
 										<th class="text-center">商铺号</th>
@@ -74,10 +74,10 @@
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
                     ×
                 </button>
-				<h4 class="modal-title">
-                    <span class="btn btn-info" id="information">成交信息</span>
-                    <span class="btn btn-default caozuo" id="fees">分佣提成</span>
-                    <span class="btn btn-default" id="records">开票税费</span>
+				<h4 class="modal-title detail-modal-header-tab">
+                    <a href="javascript:;" class="btn btn-info" id="information">成交信息</a>
+                    <a href="javascript:;" class="btn btn-default caozuo" id="fees">分佣提成</span>
+                    <a href="javascript:;" class="btn btn-default" id="records">开票税费</span>
                 </h4>
 			</div>
 			<div class="modal-body modal-body-two">
@@ -111,7 +111,6 @@
 							<div class="right">
 								<span class="left-deal">是否开业：</span>
 								<select class="form-control" id="is_open">
-									<option value="-1">是否开业</option>
 									<option value="0">否</option>
 									<option value="1">是</option>
 								</select> <br />
@@ -141,7 +140,7 @@
 								<input type="hidden" class="page-pass" />
 							</div>
 							<div>
-								<span>备注：</span>
+								<span class="bargain-info-span-beizhu">备注：</span>
 								<textarea name="" rows="" cols="" id="note_content"></textarea>
 							</div>
 						</form>

public/resource/css/report_list.css

@@ -143,9 +143,23 @@
 	width: 1030px;
 }
 
+/*成交信息tab*/
+.bargain-info-span-beizhu{
+	/*display: inline-block;
+	height: 150px;
+	line-height: 150px;*/
+}
+#note_content{
+	width: 480px;
+	height: 150px;
+}
 
+/*main-table部分,待补充*/
+.maintable-tr-bar{}
+.maintable-tr-bar>th:nth-of-type(1){}
 
 
+/*开票税费tab相关的内容*/
 .shuifee-table{
 	width:600px;
 }

public/resource/template/reportList_template_tpl.html

 <script id="reportList_list_tpl" type="text/template">
-    [% if(it && it.length && it.length>0) { %]
-    [% for(var item in it){ %]
-    <tr class="text-center">
-        <td>[%= it[item]['create_time'] %]</td>
-        <td>[%= it[item]['internal_address'] %]</td>
-        <td>[%= it[item]['internal_title'] %]</td>
-        <td>[%= it[item]['user_name'] %]</td>
-        <td>[%= it[item]['user_phone'] %]</td>
-        <td>[%= it[item]['commission'] %]</td>
-        <td>[%= it[item]['practical_fee'] %]</td>
+    [% if(it["list"] && it["list"].length && it["list"].length>0) { %]
+    [% for(var item in it["list"]){ %]
+    <tr class="text-center" data-id='[%= it["list"][item]["id"] %]'>
+        <td>[%= it["list"][item]['create_time'] %]</td>
+        <td>[%= it["list"][item]['internal_address'] %]</td>
+        <td>[%= it["list"][item]['internal_title'] %]</td>
+        <td>[%= it["list"][item]['user_name'] %]</td>
+        <td>[%= it["list"][item]['user_phone'] %]</td>
+        <td>[%= it["list"][item]['commission'] %]</td>
+        <td>[%= it["list"][item]['practical_fee'] %]</td>
         <td>
         [% if(check_auth('index/bargainInfo')) { %]
-            <a class="btn1 btn-success details-btn" href="#modal-edit" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
+            <a class="btn1 btn-success details-btn" href="#modal-edit" data-toggle="modal">详情</a>
         [% } %] 
-        [% if(check_auth('index/checkReportAttache/0')||check_auth('index/checkReportManager/1')||check_auth('index/checkReportMajordomo/2')||check_auth('index/checkReportCashier/3')) { %]
-            <a class="btn1 btn-success is_pass"  href="#modal-pass" data-toggle="modal" data-id='[%= it[item]["id"] %]'>通过</a>
+        [% if(it["step"]<3) { %]
+	        [% if(check_auth('index/checkReportAttache/0')||check_auth('index/checkReportManager/1')||check_auth('index/checkReportMajordomo/2')||check_auth('index/checkReportCashier/3')) { %]
+	            <a class="btn1 btn-success is_pass"  href="#modal-pass" data-toggle="modal">通过</a>
+	        [% } %]
+        [% }else if(it["step"]==3) { %]
+        	[% if(check_auth('index/toReportListOne')) { %]
+	            <a class="btn1 btn-success btn-trans-one">转到一级审核</a>
+	        [% } %]
+	        [% if(check_auth('index/checkOver')) { %]
+	            <a class="btn1 btn-success btn-jiedan">结单</a>
+	        [% } %]
         [% } %]
-            <a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["id"] %]'>时间轴</a>
+            <a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal">时间轴</a>
         </td>
     </tr>
     [% } %]