意向金预警

application/index/view/pay_log/intentions_warning.html

@@ -358,9 +358,14 @@
 									<tr>
 										<td colspan="15">
 											<form id="form_search">
+												<span class="fore-span ld-Marheight">转定时间:</span>	
+												<input id="pass_time_start" class="form-control btn4 ld-Marheight" type="text" placeholder="开始时间" 
+													onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd',maxDate:'#F{ $dp.$D(\'pass_time_end\')||\'%y-%M-%d\'}',readOnly:'readonly'})"> 
+												<span class="fore-span ld-Marheight">-</span>
+												<input id="pass_time_end" class="form-control btn4 ld-Marheight" type="text" placeholder="结束时间"
+													onClick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd',minDate:'#F{ $dp.$D(\'pass_time_start\' )}',maxDate:'%y-%M-%d',readOnly:'readonly'})">
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="order_id" 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="report_id" placeholder="成交报告ID" type="text" value="">-->
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="shop_id" placeholder="房源ID" type="text" value="">
 												<select class="form-control btn2 ld-Marheight" id="commit_home">
 													<option value="">提交人所在部门</option>
@@ -637,7 +642,7 @@
 							<div class="form-group" style="margin-top: 3px;">
 								<strong><span>成交报告ID:</span></strong>
 								<span id="chengjiaobaogaoId">45122</span>
-								<a  class="btn btn-info btn-small modifyReport" href="#modifyReport_modal" data-toggle="modal">修改</a> 
+								<!--<a  class="btn btn-info btn-small modifyReport" href="#modifyReport_modal" data-toggle="modal">修改</a> -->
 							</div>
 						</div>
 						
@@ -917,9 +922,9 @@
 					</div>
 			</div>
 			<div class="modal-footer pic-con2">
-				<button type="button btn2" class="btn btn-primary" id="savePayBtn">
+				<!--<button type="button btn2" class="btn btn-primary" id="savePayBtn">
                     保存
-                </button>
+                </button>-->
 			</div>
 		</div>
 		<!-- /.modal-content -->
@@ -1290,9 +1295,9 @@
 
 			</div>
 			<div class="modal-footer">
-				<button type="button btn2" class="btn btn-primary" id="saveBtnOpen">
+				<!--<button type="button btn2" class="btn btn-primary" id="saveBtnOpen">
                     保存
-                </button>
+                </button>-->
 			</div>
 		</div>
 		<!-- /.modal-content -->

public/resource/js/noRansferEarnest.js

@@ -41,7 +41,12 @@ define(['doT', 'text!temp/noRansferEarnest_template_tpl.html', 'css!style/home.c
 		order_id_open:'',
 		house_id_open:'',
 		house_address_open:'',
-		listUrl:'/index/getCollection',
+		listUrl:'/index/intentionsWarning',
+		listUrlTime:'/app_broker/timeline_pc?order_id=',//商铺时间轴
+		listUrlCollection:'/index/getCollectionDetail',//商铺收款详情
+		listUrlCollectionImg:'/index/receiptImgList',//商铺收款详情图片
+		
+		
 		init: function() {
 			//初始化dot
 			$(document.body).append(template);
@@ -58,13 +63,23 @@ define(['doT', 'text!temp/noRansferEarnest_template_tpl.html', 'css!style/home.c
 				_this.removeClass('btn-default').addClass('btn-info').siblings().removeClass('btn-info').addClass('btn-default');
 				receiv.mainTabIndex = $(this).index();//下标值
 				if($(this).index() == 0){
-					receiv.listUrl = '/index/getCollection';//商铺
+					receiv.listUrl = '/index/intentionsWarning';//商铺
+					receiv.listUrlTime = '/app_broker/timeline_pc?order_id=';//商铺时间轴
+					receiv.listUrlCollection = '/index/getCollectionDetail';//商铺收款详情
+					receiv.listUrlCollectionImg = '/index/receiptImgList';//商铺收款详情图片
+					
+					
 					
 				}else if($(this).index() == 1){
-					receiv.listUrl = '/office_index/getCollection';//办公楼
+					receiv.listUrl = '/office_index/intentionsWarning';//办公楼
+					receiv.listUrlTime = '/app_broker/timeline_pc_financial?order_id=';//办公楼时间轴
+					receiv.listUrlCollection = '/office_index/getCollectionDetail';//办公楼收款详情
+					receiv.listUrlCollectionImg = '/office_index/receiptImgList';//办公楼收款详情图片
+					
 				}
 			    receiv.getList(1);
 				
+				
 			});
 			//绑定全部点击事件,判断当前点击的位置是否为制定模块 ,作用为调整功能
 			$(document).bind("click",function(e){
@@ -473,7 +488,9 @@ define(['doT', 'text!temp/noRansferEarnest_template_tpl.html', 'css!style/home.c
 				var house_id = e.target.dataset.id;;
 				e.preventDefault();
 				e.stopPropagation();
-				$('.iframe-time-line').attr('src', '/app_broker/timeline_pc?order_id=' + house_id);
+//					$('.iframe-time-line').attr('src', '/app_broker/timeline_pc_financial?order_id='+_id);
+				
+				$('.iframe-time-line').attr('src', receiv.listUrlTime + house_id);
 			});
 			
 			//操作----退款
@@ -911,7 +928,7 @@ define(['doT', 'text!temp/noRansferEarnest_template_tpl.html', 'css!style/home.c
 			$('.result2,.result').remove(); //删除之前存在的图片 显示从接口获取的数据 用来区分新添加的 和 已经保存的
 			$.ajax({
 				'type': 'GET',
-				'url': '/index/receiptImgList',
+				'url': receiv.listUrlCollectionImg,
 				data: {
 					"id": id_pic,
 				},
@@ -922,7 +939,7 @@ define(['doT', 'text!temp/noRansferEarnest_template_tpl.html', 'css!style/home.c
 //						 <img src='[%= it[item]["agent_img"] %]' class="diagram-image J_preview"
 //               data-bimg='[%= it[item]["agent_img"] %]'>
 						for(i = 0; i < data.data.length; i++) {
-							$('#container_body_img_area').append('<div class="result2"><img data-imgid="{0}" src="{1}" alt="" class="diagram-image J_preview" data-bimg="{1}"/> <span class="span-del2">删除</span></div>'.stringFormatObj({
+							$('#container_body_img_area').append('<div class="result2"><img data-imgid="{0}" src="{1}" alt="" class="diagram-image J_preview" data-bimg="{1}"/></div>'.stringFormatObj({
 								'0': data.data[i].id,
 								'1': data.data[i].img_name?urlDeal(data.data[i].img_name):data.data[i].img_name
 							}));
@@ -1479,18 +1496,11 @@ define(['doT', 'text!temp/noRansferEarnest_template_tpl.html', 'css!style/home.c
 		 */
 		buildSearchParams : function(excel){
 			var that = receiv;
-			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 maintable_deal_type = $('#maintable_deal_type').val();
-			var maintable_pay_type = $('#maintable_pay_type').val();
-			var come_from = $('#come_from').val();
-			var order_id = $('#order_id').val();
+			var transfer_start_time = $('#comit_time_start').val();
+			var transfer_end_time = $('#comit_time_end').val();
 			var get_id = $('#get_id').val();
 			var report_id = $('#report_id').val();
 			var shop_id = $('#shop_id').val();
-			var shop_addr = $('#shop_addr').val();
 			var commit_home = $('#commit_home').val();
 			var commit_shop = $('#commit_shop').val();
 			var comit_name = that.agent_id_phone;//$('#comit_name').val();
@@ -1498,9 +1508,8 @@ define(['doT', 'text!temp/noRansferEarnest_template_tpl.html', 'css!style/home.c
 			var paramsStr = "" ;
 			var is_open = $('#is_open').val();
 			var is_normality = $('#is_normality').val();
-			var open_time_start = $('#open_time_start').val();
-			var open_time_end = $('#open_time_end').val();
-			if ( open_time_start ) {
+			
+			if ( transfer_start_time ) {
 				params.open_time_start = open_time_start;
 				paramsStr += "open_time_start=" + open_time_start + "&"
 			}
@@ -1593,7 +1602,16 @@ define(['doT', 'text!temp/noRansferEarnest_template_tpl.html', 'css!style/home.c
 		getList : function(no){
 			var that = receiv;
 			that.pageNo = no;
-			var params = that.buildSearchParams(false);
+//			var params = that.buildSearchParams(false);
+            var params = {};
+            params.transfer_start_time = $('#comit_time_start').val();
+			params.transfer_end_time = $('#comit_time_end').val();
+			params.pay_id = $('#get_id').val();
+			params.order_id = $('#order_id').val();
+			params.house_id = $('#shop_id').val();
+			params.district_id = $('#commit_home').val();
+			params.store_id = $('#commit_shop').val();
+			params.agent_id = that.agent_id_phone;//$('#comit_name').val();
 			params.pageNo = that.pageNo;
 			params.pageSize = that.pageSize ;
 			$.ajax({
@@ -1606,11 +1624,9 @@ define(['doT', 'text!temp/noRansferEarnest_template_tpl.html', 'css!style/home.c
 				success: function(data) {
 					if(typeof data === 'object') {
 						if(data.code == 200) {
-//							that.totalCount = data.data.money_total;
 							that.listData = data.data.list;
 							var doTtmpl = doT.template(document.getElementById('noRansferEarnest_template_tpl').innerHTML);
 							$("#order_list").html(doTtmpl(data.data.list));
-//							$('#money_total').text((data.data.money_total-0 > 0) ? (data.data.money_total+"元"): "0元" )
                             $('.receiving-total-money').html((data.data.money_total*1+data.data.money_change_total*1).toFixed(2));//
                             $('.receiving-total-normal').html(data.data.money_total*1);
                             $('.receiving-total-adjusment').html(data.data.money_change_total*1);
@@ -1649,7 +1665,7 @@ define(['doT', 'text!temp/noRansferEarnest_template_tpl.html', 'css!style/home.c
 			var params = {
 				'pay_id' : id
 			};
-			$.post('/index/getCollectionDetail',params , function(data){
+			$.get(receiv.listUrlCollection , params , function(data){
 				if(data.code == 200) {
 					that.getValueFunction(data.data);	
                 } else {

public/resource/template/noRansferEarnest_template_tpl.html

@@ -8,13 +8,11 @@
         <td>[%= it[item]['bargain_id'] %]</td>
         <td>[%= it[item]['income_time'] %]</td>
         <td>[%= it[item]['name'] %]</td>
-        <td>[%= it[item]['money'] %]</td>
+        <td>[%= it[item]['real_money'] %]</td>
         <td>
         	<a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
 	        
-        	[% if(check_auth('index/getCollectionDetail')) { %]
            		<a class="btn1 btn-success add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-report='[%= it[item]["report_id"] %]' data-order='[%= it[item]["order_id"] %]'>收款详情</a>  
-            [% } %]
 
         </td>
     </tr>