修改bug

application/index/view/finance/refundList.html

@@ -323,7 +323,7 @@
 													<option value="5">案场费</option>
 												</select>
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="changed_id" placeholder="订单ID" type="text" value="">
-												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="back_id" placeholder="退款ID" type="text" value="">
+												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="back_id_money" placeholder="退款ID" type="text" value="">
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="get_id" placeholder="收款ID" type="text" value="">
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="shoped_id" placeholder="商铺ID" type="text" value="">
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="shoped_addr" placeholder="商铺地址" type="text" value="">
@@ -333,10 +333,10 @@
 												<select class="form-control btn2 ld-Marheight" id="commit_shop">
 													<option value="">提交人所在门店</option>
 												</select>
-												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="comit_name" placeholder="提交人姓名" type="text" value="">
+												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="comit_name" placeholder="提交人姓名/手机号" type="text" value="">
 												<ul class="user-ul" style="display:none"></ul>
 												<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="comit_name" placeholder="提交人姓名" type="text" value="">-->
-												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="comit_phone" placeholder="提交人手机号" type="text" value="">
+												<input type="hidden" class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="comit_phone" placeholder="提交人手机号" type="text" value="">
 												<select class="form-control btn2 ld-Marheight"  id="is_type">
 													<option value="">我是否审核过</option>
 													<option value="1">是</option>
@@ -352,7 +352,7 @@
 												<!--<span class="money_total_two  ld-Marheight " style="float:left">保管进转定：</span><span style="float:left" id="back_baoguan_ding" class="money_total_two_shifu  fore-span ld-Marheight">0元</span>-->
 												<!--<span class="money_total_two  ld-Marheight " style="float:left">退中介费：</span><span style="float:left" id="back_zhongjie" class="money_total_two_shifu  fore-span ld-Marheight">0元</span>-->
 												<!--<span class="money_total_two  ld-Marheight " style="float:left">退案场费：</span><span style="float:left" id="back_anchang" class="money_total_two_shifu  fore-span ld-Marheight">0元</span>-->
-												<span class="money_total_two  ld-Marheight " style="float:left">退款总计：</span><span style="float:left" id="back_total" class="money_total_two_shifu  fore-span ld-Marheight">0元</span>
+												<span class="money_total_two  ld-Marheight " style="float:left">退款总计：</span><span style="float:left" id="money_total" class="money_total_two_shifu  fore-span ld-Marheight">0元</span>
 												
 											</form>
 										</td><br />

public/resource/js/getCollection.js

@@ -1363,6 +1363,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 			
 			if ( back_type ){
 				params.type = back_type ; 
+			} else {
+				alert("请输入退款类型");
+				return false ; 
 			};
 			if ( back_price ){
 				params.refund_money = back_price ; 

public/resource/js/refundList.js

@@ -456,7 +456,7 @@ define(['doT', 'text!temp/refund_template_tpl.html', 'css!style/home.css', 'ckfi
 						var doTtmpl = doT.template(temp);
 						$("#order_list").html(doTtmpl(data.data.list));
 //						that.moneyTotal = data.data.money_total;
-						$('#money_total').text((data.data.money_total-0 > 0) ? (data.data.money_total+"元"): "0元" )
+						$('#money_total').text((data.data.total_money-0 > 0) ? (data.data.total_money+"元"): "0元" )
 						
 						/*分页代码*/
 						add_page(data.data.total, no, that.pageSize, that.getList);
@@ -474,19 +474,21 @@ define(['doT', 'text!temp/refund_template_tpl.html', 'css!style/home.css', 'ckfi
 		 */
 		resetAll : function(){
 			var that = refund;
-			var commite_time_start = $('#comit_time_start').val("");
-			var commite_time_end = $('#comit_time_end').val("");
-			var into_time_start = $('#into_time_start').val("");
-			var into_time_end = $('#into_time_end').val("");
-			var changed_type = $('#changed_type').val("");
-			var changed_id = $('#changed_id').val("");
-			var looked_id = $('#looked_id').val("");
-			var shoped_id = $('#shoped_id').val("");
-			var shoped_addr = $('#shoped_addr').val("");
-			var commit_home = $('#commit_home').val("");
-			var commit_shop = $('#commit_shop').val("");
-			var comit_name = $('#comit_name').val("");
-			var comit_phone = $('#comit_phone').val("");
+			$('#comit_time_start').val("");
+			$('#comit_time_end').val("");
+			$('#into_time_start').val("");
+			$('#into_time_end').val("");
+			$('#changed_type').val("");
+			$('#changed_id').val("");
+			$('#back_id').val("");
+			$('#get_id').val("");
+			$('#shoped_id').val("");
+			$('#shoped_addr').val("");
+			$('#commit_home').val("");
+			$('#commit_shop').val("");
+			$('#comit_name').val("");
+			$('#comit_phone').val("");
+			$('#is_type').val("");
 			that.agent_id_phone="";
 		},
 		
@@ -515,7 +517,7 @@ define(['doT', 'text!temp/refund_template_tpl.html', 'css!style/home.css', 'ckfi
 			var into_time_end = $('#into_time_end').val();
 			var changed_type = $('#changed_type').val();
 			var changed_id = $('#changed_id').val();
-			var back_id = $('#back_id').val();
+			var back_id_money = $('#back_id_money').val();
 			var shoped_id = $('#shoped_id').val();
 			var shoped_addr = $('#shoped_addr').val();
 			var commit_home = $('#commit_home').val();
@@ -524,7 +526,11 @@ define(['doT', 'text!temp/refund_template_tpl.html', 'css!style/home.css', 'ckfi
 			var comit_phone = $('#comit_phone').val();
 			var choose_type = $('.btn-group').find('.btn-info').html();
 			var is_selt = $('#is_type').val();
+			var get_id = $('#get_id').val();
 			var params = {};
+			if ( get_id) {
+				params.pay_log_id = get_id ;
+			}
 			if ( choose_type ) {
 				params.choose_type = choose_type;
 			}
@@ -546,8 +552,8 @@ define(['doT', 'text!temp/refund_template_tpl.html', 'css!style/home.css', 'ckfi
 			if ( changed_id ) {
 				params.order_id = changed_id;
 			}
-			if ( back_id ) {
-				params.id = back_id;
+			if ( back_id_money ) {
+				params.id = back_id_money;
 			}
 			if ( shoped_id ) {
 				params.house_id = shoped_id;

public/resource/template/refund_template_tpl.html

@@ -40,7 +40,7 @@
         <td>[%= it[item]['house_id'] %]</td>
         <td>[%= it[item]['address'] %]</td>
         <td>
-        	<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" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
             <a class="btn1 btn-success rejected" href="#modal-check" data-toggle="modal" data-id='[%= it[item]["id"] %]'>审核</a>
             <!--<a class="btn1 btn-success is_pass"  href="#modal-pass" data-toggle="modal" data-id='[%= it[item]["id"] %]'>打印</a>-->
         </td>