费用详情优化

application/index/view/cost/publicCostDetails.html

 {layout name="global/frame_two_tpl" /}
 <input type="hidden" class="page-load" id="publicCostDetails" />
 <style>
+	
 	.is_hide_details{
 		display: none;
 	}
@@ -96,6 +97,7 @@
 										<h4 class="modal-title tit_con active shoukuanxiangqing" style="width:auto!important;float:left">费用详情</h4>
 										<h4 class="modal-title tit_con" style="width:auto!important;float:left;margin-left:20px;">费用图片</h4>
 									</div>
+									<!--图片显示-->
 									<div class="modal-body modal-body-height pic-con1" style="overflow: hidden;">
 										<ul class="list-group ">
 											<li class="list-group-item">
@@ -110,10 +112,11 @@
 										</ul>
 
 									</div>
-									<div class="modal-footer pic-con1">
-										<button type="button btn2" class="btn btn-primary save_cost_pic is_hide_details" id="" data-dismiss="modal">保存</button>
+									<div class="pic-con1" style="text-align-last: right; margin-right: 20px;">
+										<button type="button btn2" class="btn btn-primary save_cost_pic is_hide_details" id="" data-dismiss="modal">保  存</button>
 									</div>
-									<div class="modal-body modal-body-height pic-con2" style="overflow: hidden;">
+									<!--费用详情-->
+									<div class="modal-body modal-body-height pic-con2" style="overflow:auto;height: 530px;">
 										<form class="">
 											<div class="col-xs-12 margain-10">
 												<div class="col-xs-6 is_hide_costID">
@@ -265,7 +268,7 @@
 											<div class="col-xs-12" style="padding: 0 30px;">
 												    <p style="font-size: 16px;font-weight: 600;">成本明细</p>
 												    <div class="">
-														<table class="table">
+														<table class="table" style="margin-bottom: 6px;">
 																<tbody class="text-left" id="mingxi_list">
 									                                    
 																</tbody>
@@ -274,15 +277,15 @@
 												    <p style="font-size: 16px;font-weight: 600;">审核记录</p>
 													<!--费用报销 审核记录-->
 									            	<div class="check_jilu">
-														<table class="table">
+														<table class="table" style="margin-bottom: 6px;">
 																<tbody class="text-left" id="check_list">
 									                                    
 																</tbody>
 													    </table>
 													</div>
-													
 													<!--详情 审核记录-->
 													<div class="detail_jilu">
+														
 													</div>
 													
 													<!--转账截图-->
@@ -301,10 +304,11 @@
 
 										</form>
 									</div>
-									<div class="modal-footer pic-con2">
-										<button type="button btn2" class="btn btn-primary save_cost is_hide_details" id="" data-dismiss="modal">保存</button>
-										<button type="button" class="btn btn-primary pass_check is_hide_details" href="#modal_pass" data-toggle="modal" style="">审核通过</button>
-									</div>
+									<div class="pic-con2" style="text-align: right;">
+											<button type="button btn2" class="btn btn-primary save_cost is_hide_details" id="" data-dismiss="modal">保存</button>
+											<button type="button" class="btn btn-primary pass_check is_hide_details" href="#modal_pass" data-toggle="modal" style="">审核通过</button>
+									    </div>
+
 								</div>
 								<!-- /.modal-content -->
 							</div>

public/resource/js/costDetails.js

@@ -250,7 +250,7 @@ define(['doT', 'text!temp/cost_details_template_tpl.html', 'css!style/home.css',
 		 */
 		buildSearchParams : function(is_excel){
 			var that = cost;
-			var count_time = $('#count_time').val()+'-01';
+			var count_time = $('#count_time').val();
 			var create_time_start = $('#create_time_start').val();
 			var create_time_end = $('#create_time_end').val();
 			var cost_type = $('#cost_type').val();
@@ -264,8 +264,8 @@ define(['doT', 'text!temp/cost_details_template_tpl.html', 'css!style/home.css',
 			var params = {};
 			var paramsStr = "" ;
 			if ( count_time ) {
-				params.setting_date = count_time;
-				paramsStr += "setting_date=" + count_time +'&';
+				params.setting_date = count_time + '-01';
+				paramsStr += "setting_date=" + count_time+ '-01' +'&';
 			}
 			if ( create_time_start ) {
 				params.start_time = create_time_start;

public/resource/template/cost_check_template_tpl.html

@@ -75,14 +75,14 @@
     [% if(it && it.length) { %]
     [% for(var item in it){ %]
     <tr class="text-left">
-        <td style="border: 0;">成本明细ID：[%= it[item]['id'] %]
+        <td style="border: 0;padding: 2px;">成本明细ID：[%= it[item]['id'] %]
                              费用承担门店：[%= it[item]['store_name'] %] ([%= it[item]['store_attendance_num'] %])人
                              费用承担金额：[%= it[item]['assume_fee'] %] 元</td>
     </tr>
     [% } %]
     [% }else{ %]
     <tr>
-        <td colspan="15" style="text-align:left;border: 0;"> 暂无数据</td>
+        <td colspan="15" style="text-align:left;border: 0;padding: 0px;"> 暂无数据</td>
     </tr>
     [% } %]
 </script>
@@ -91,13 +91,12 @@
     [% if(it && it.length) { %]
     [% for(var item in it){ %]
     <tr class="text-left">
-        <td style="border: 0;">[%= it[item]['name'] %] [%= it[item]['create_time'] %] 备注：[%= it[item]['remark'] %]</td>
-        
+        <td style="border: 0;padding: 2px;">[%= it[item]['name'] %] [%= it[item]['create_time'] %] 备注：[%= it[item]['remark'] %]</td>
     </tr>
     [% } %]
     [% }else{ %]
     <tr>
-        <td colspan="15" style="text-align:left;border: 0;"> 暂无数据</td>
+        <td colspan="15" style="text-align:left;border: 0;padding: 0px;"> 暂无数据</td>
     </tr>
     [% } %]
 </script> 
@@ -105,14 +104,15 @@
 <script id="checkPic_template_tpl" type="text/template">
     [% if(it && it.length) { %]
     [% for(var item in it){ %]
+    	
+    [% if(it[item]["img_type"]== 2) { %]
     <tr class="text-left">
         <td style="border: 0;">
-    [% if(it[item]["img_type"]== 2) { %]
         	<img style="width: 100px;height: 100px;" src='[%= ServerHostImageLiu + "/static/chat_image/" + it[item]["img_name"] %]' class="diagram-image J_preview">
-    [% } %]
-    
         </td>
     </tr>
+    [% } %]
+    
     [% } %]
     [% }else{ %]
     <tr>