2

public/resource/js/receivables.js

@@ -316,84 +316,81 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 			var that = receiv;
 			var params = that.recervablesParams();
 			console.log(params);
+			$.post('/index/getCollectionEdit',params,function(data){
+				that.getList(that.pageNo);
+			},'json')
 		},
 		
 		recervablesParams : function(){
 			var params = {} ; 
 			if ($('#ruzhangId').text()){//入账ID
-				params.ruzhangId = $('#ruzhangId').text()
+				params.pay_id = $('#ruzhangId').text()
 			};				
 			if ($('#dingdanId').text()){//订单ID
-				params.dingdanId = $('#dingdanId').text()
+				params.order_id = $('#dingdanId').text()
 			};					
 			if ($('#chengjiaobaogaoId').text()){//成交报告ID
-				params.chengjiaobaogaoId = $('#chengjiaobaogaoId').text()
+				params.bargain_id = $('#chengjiaobaogaoId').text()
 			};	  	
 			if ($('#fangyuanId').text()){//房源ID
-				params.fangyuanId = $('#fangyuanId').text()
+				params.house_id = $('#fangyuanId').text()
 			};	 			
 			if ($('#tijiaoren').text()){//提交人
-				params.tijiaoren = $('#tijiaoren').text()
+				params.agent_name = $('#tijiaoren').text()
 			};					
 			if ($('#address').text()){//房源地址
 				params.address = $('#address').text()
 			};					
 			if ($('#comit_time').text()){//提交时间
-				params.comit_time = $('#comit_time').text()
+				params.create_time = $('#comit_time').text()
 			};				
 			if ($('#intoType').text()){//入账类型
-				params.intoType = $('#intoType').text()
+				params.type = $('#intoType').text()
 			};		 			
 			if ($('#shopNo').val()){//商铺号
-				params.shopNo = $('#shopNo').val()
+				params.house_number = $('#shopNo').val()
 			};						
 			if ($('#intoDate').val()){//入账日期
-				params.intoDate = $('#intoDate').val()
-			};	 				
+				params.income_time = $('#intoDate').val()
+			};	 		
 			if ($('#salePrice').val()){//成交价
-				params.salePrice = $('#salePrice').val()
+				params.price = $('#salePrice').val()
 			};					
 			if ($('#intoPrice').val()){//入账金额
-				params.intoPrice = $('#intoPrice').val()
+				params.money = $('#intoPrice').val()
 			};	  			
 			if ($('#shouxu').val()){//手续费
-				params.shouxu = $('#shouxu').val()
+				params.transaction_fee = $('#shouxu').val()
 			};	 				
 			if ($('#realPrice').val()){//实付金额
-				params.realPrice = $('#realPrice').val()
-			};				 	
-			if ($('#getPrice').val()){//应收金额
-				params.getPrice = $('#getPrice').val()
-			};	 				
-			if ($('#morePrice').val()){//多收金额
-				params.morePrice = $('#morePrice').val()
-			};	 				
+				params.real_money = $('#realPrice').val()
+			};				 	 				 				
 			if ($('#person').text()){//业务员
-				params.person = $('#person').text()
+				params.current_agent_name = $('#person').text()
 			};	 				
 			if ($('#belongT').text()){//所属门店
-				params.belongT = $('#belongT').text()
+				params.store_name = $('#belongT').text()
 			};					
 			if ($('#payType').val()){//支付方式
-				params.payType = $('#payType').val()
+				params.pay_type = $('#payType').val()
 			};				
 			if ($('#payNo').val()){//支付户名
-				params.payNo = $('#payNo').val()
+				params.transfer_name = $('#payNo').val()
 			};						 
 			if ($('#running').val()){//是否开业 1是 0否
-				params.running = $('#running').val()
+				params.is_open = $('#running').val()
 			};					
 			if ($('#fenhong').val()){//分红
-				params.fenhong = $('#fenhong').val()
+				params.is_dividend = $('#fenhong').val()
 			};					
 			if ($('#comes').text()){//来源
-				params.comes = $('#comes').text()
+				params.soucre = $('#comes').text()
 			};						
 			if ($('#status').text()){//装填
-				params.status = $('#status').text()
+				params.soucre_id = $('#status').text()
 			};					
 			if ($('#lastTime').val()){//最后转定时间
-				params.lastTime = $('#lastTime').val()
+				params.last_transfer_time = $('#lastTime').val()
 			};		
 			return params ; 
 		},
@@ -428,10 +425,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 			$.post('',params, function(data){
 				console.log(data);
 			})
-			window.open('/index/getCollection?' +
-				'excel=1&start_time=' + params.start_time + '&end_time=' + params.end_time + '&internal_address=' + params.internal_address + 
-				'&id=' + params.id + '&income_start_time=' + params.income_start_time+ '&income_end_time=' + params.income_end_time+ '&agent_name=' + params.agent_name+
-				'&store_id=' + params.store_id+'&district_id=' + params.district_id+ '&pay_type=' + params.pay_type+ '&type=' + params.type);
+			window.open('/index/getCollection' +params);
 		},
 		
 		/**
@@ -479,8 +473,6 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 				params.pay_type = maintable_pay_type;
 				paramsStr += "pay_type=" + maintable_pay_type + "&"
 			}
-			
-			
 			if ( come_from ) {
 				params.soucre = come_from;
 				paramsStr += "soucre=" + come_from + "&"
@@ -594,7 +586,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 			doc.find("#dingdanId").text(data.order_id);
 			doc.find("#chengjiaobaogaoId").text(data.bargain_id);
 			doc.find("#fangyuanId").text(data.house_id);
-			doc.find("#tijiaoren").text(data.name);
+			doc.find("#tijiaoren").text(data.agent_name);
 			doc.find("#address").text(data.address);
 			doc.find("#comit_time").text(data.create_time);
 			doc.find("#intoType").text(data.type);

public/resource/template/receivables_template_tpl.html

@@ -7,8 +7,8 @@
         <td>[%= it[item]['order_id'] %]</td>
         <td>[%= it[item]['bargain_id'] %]</td>
         <td>[%= it[item]['income_time'] %]</td>
-        <td>[%= it[item][''] %]</td>
-        <td>[%= it[item]['report_agent_name'] %]</td>
+        <td>[%= it[item]['name'] %]</td>
+        <td>[%= it[item]['current_agent_name'] %]</td>
         <td>[%= it[item]['store_name'] %]</td>
         <td>[%= it[item]['type'] %]</td>
         <td>[%= it[item]['money'] %]</td>