commite

application/index/view/finance/receivables.html

@@ -655,8 +655,8 @@
 								<strong><span class="col-xs-3 ld-Marheight">是否开业:</span></strong>
 								<div class="col-xs-6">
 									<select class="form-control" id="running">
-										<option value="1">是</option>		
-										<option value="0">否</option>		
+										<option value="0">是</option>		
+										<option value="1">否</option>		
 									</select>
 								</div>
 							</div>

public/resource/js/receivables.js

@@ -570,21 +570,6 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 				}
 			});
 		},
-		/**
-		 * 时间轴
-		 * @param {Object} id
-		 */
-		getTimmerLine : function(id){
-			var that = receiv;
-			console.log("get the timmerLine with id = " + id );
-			var params = {
-				'id' : id
-			};
-			$.post('',params , function(data){
-				console.log(data);
-				that.getValueFunction();
-			},'json')
-		},
 		/**
 		 * 收款详情
 		 * @param {Object} id
@@ -593,13 +578,44 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 			var that = receiv;
 			console.log("get the timmerLine with id = " + id );
 			var params = {
-				'id' : id
+				'pay_id' : id
 			};
-			$.post('',params , function(data){
+			$.post('/index/getCollectionDetail',params , function(data){
+				console.log("12321321321321313213213")
 				console.log(data);
-				that.getValueFunction();
+				that.getValueFunction(data.data);
 			},'json')
 		},
+		
+		
+		getValueFunction : function(data){
+			var doc = $('#modal-addPic');
+			doc.find("#ruzhangId").text(data.id);
+			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("#address").text(data.address);
+			doc.find("#comit_time").text(data.create_time);
+			doc.find("#intoType").text(data.type);
+			doc.find("#shopNo").val(data.house_number);
+			doc.find("#intoDate").val(data.income_time);
+	 		doc.find("#salePrice").val(data.price);
+	 		doc.find("#intoPrice").val(data.money);
+	 		doc.find("#shouxu").val(data.transaction_fee);
+	 		doc.find("#realPrice").val(data.real_money);
+	 		doc.find("#getPrice").val((data.price-0)*0.7);
+	 		doc.find("#morePrice").val(data.money - ((data.price-0)*0.7));
+	 		doc.find("#person").val(data.current_agent_name);
+	 		doc.find("#belongT").val(data.store_name);
+	 		doc.find("#payType").val(data.pay_type);
+	 		doc.find("#payNo").val(data.transfer_name);
+	 		doc.find("#running").val(data.is_open);
+			doc.find("#fenhong").val(data.is_dividend);
+	 		doc.find("#comes").val(data.soucre);
+	 		doc.find("#status").val(data.soucre_id);
+	 		doc.find("#lastTime").val(data.last_transfer_time);
+		},
 		/**
 		 * 调整
 		 * @param {Object} id

public/resource/template/receivables_template_tpl.html

@@ -14,15 +14,15 @@
         <td>[%= it[item]['money'] %]</td>
         <td>[%= it[item]['real_money'] %]</td>
         [% if(it[item]['soucre'] == 0) { %]
-        	<td>APP</td>
+        	<td>正常</td>
         [% } else if ( it[item]['soucre'] == 1 ) { %]
-        	<td>智能pos机</td>
+        	<td>正常</td>
         [% } else if ( it[item]['soucre'] == 2) { %]
          	<td>调整</td>
         [% } else {%]
         	<td>--</td>
         [% } %]
-        <td>[%= it[item]['soucre_id'] %]</td>
+        <td>[%= it[item]['source_id'] %]</td>
         <td>
         	<a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
             <a class="btn1 btn-success add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]'>收款详情</a>