财务修改

application/index/view/finance/index.html

@@ -17,6 +17,21 @@
     .Tswitch_two{
         display: none;
     }
+    .left{
+        float: left;
+        width: 340px;
+        line-height: 30px;
+        
+    }
+    .right{
+        line-height: 30px;
+    }
+    .btn_2{
+        width: 60px;
+        display: inline-block;
+        height: 26px;
+        padding: 3px 6px
+    }
 </style>
 <div id="page-content-wrapper">
     <div class="container">
@@ -24,7 +39,7 @@
             <div class="col-lg-10 col-lg-offset-0">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
-                        <li><a href="#">成交报告-未接单66</a></li>
+                        <li><a href="#">成交报告-未接单</a></li>
                     </div>
                     <div class="panel-body">
                         <div class="table-responsive">
@@ -81,11 +96,24 @@
                 </h4>
             </div>
             <div class="modal-body">               
+                    <div class="Tswitch">
+                        <div class="left">
+                            <span>商铺地址：</span><span class="internal_address"></span><br>
+                            <span>客户姓名：</span><span class="user_name"></span><br>
+                            <span>应收总佣金：</span>&nbsp;<input class="form-control btn_2 commission" type="text">元<br>
+                            <span>实收佣金：</span>&nbsp;<input class="form-control btn_2 practical_fee" type="text">元<br>
+                        </div>
+                        <div class="right">
+                            <span>商铺名称：</span><span class="internal_title"></span><br>
+                            <span>客户电话：</span><span class="user_phone"></span><br>
+                            <span>提交日期：</span><span class="create_time"></span><br>
+                        </div>
+                    </div>
+                    <div class="Tswitch Tswitch_one">分佣提成 <br>
+                    </div>
 
-                    <div class="Tswitch">成交信息</div>
-                    <div class="Tswitch Tswitch_one">分佣提成</div>
                     <div class="Tswitch Tswitch_two">收款记录</div>
-
+                    <br><br><br><br>            
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">取消

public/resource/js/reportList.js

@@ -112,18 +112,6 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
 					if(data.code == 200){
 						if (data.data) {
 							console.log(data.data);
-							// $("#cus_id").html(data.data.user_info.user_id);//客户编号
-							// $("#cus_name").val(data.data.user_info.user_nick);//姓名
-							// $("#sex").val(data.data.user_info.sex);//性别
-							// $("#cus_phone").html(data.data.user_info.user_phone);//电话
-							// $("#cus_date").html(data.data.user_info.create_time);//上传时间
-							// $("#cus_fang").val(data.data.user_info.agentinfo);//客方
-							// var caozuo_table="";
-							// $.each(data['data']['user_date'], function(i, item) {
-							// 	console.log(item)
-							// 	caozuo_table +='<tr><td>'+item.content+'</td><td>'+item.agentinfo+'</td><td>'+item.create_time+'</td></tr>';
-							// });
-							// $("#caozuo_table").html(caozuo_table);
 						}
 					} else {
 						alert('获取失败！');
@@ -135,25 +123,20 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
 		Edit:function(){//报告详情			
 			$.ajax({
 				'type': 'GET',
-				'url' : '/index/reportListAttache/0',
-				// data: {"id":follow.house_id},
+				'url' : '/index/bargainInfo',
+				data: {"id":follow.house_id},
 				dataType: "json",
 				success: function(data){
 					if(data.code == 200){
 						if (data.data) {
-							console.log(data.data);
-							// $("#cus_id").html(data.data.user_info.user_id);//客户编号
-							// $("#cus_name").val(data.data.user_info.user_nick);//姓名
-							// $("#sex").val(data.data.user_info.sex);//性别
-							// $("#cus_phone").html(data.data.user_info.user_phone);//电话
-							// $("#cus_date").html(data.data.user_info.create_time);//上传时间
-							// $("#cus_fang").val(data.data.user_info.agentinfo);//客方
-							// var caozuo_table="";
-							// $.each(data['data']['user_date'], function(i, item) {
-							// 	console.log(item)
-							// 	caozuo_table +='<tr><td>'+item.content+'</td><td>'+item.agentinfo+'</td><td>'+item.create_time+'</td></tr>';
-							// });
-							// $("#caozuo_table").html(caozuo_table);
+							console.log(data.data.commission);							
+							 $(".create_time").html(data.data.create_time);
+							 $(".user_phone").html(data.data.user_phone);
+							 $(".user_name").html(data.data.user_name);
+							 $(".internal_address").html(data.data.internal_address);
+							 $(".internal_title").html(data.data.internal_title);
+							 $(".commission").val(data.data.commission);
+							 $(".practical_fee").val(data.data.practical_fee);							
 						}
 					} else {
 						alert('获取失败！');

public/resource/template/reportList_template_tpl.html

@@ -10,8 +10,7 @@
         <td>[%= it[item]['commission'] %]</td>
         <td>[%= it[item]['practical_fee'] %]</td>
         <td>
-            <!-- <a class="btn1 btn-success " href="/admin.php/index/houseEdit?id=[%= it[item]['id']%]" data-toggle="modal" >编辑</a> -->
-            <a class="btn1 btn-success edit" href="#modal-edit" data-toggle="modal" >编辑</a>
+            <a class="btn1 btn-success edit" href="#modal-edit" 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>
             <a class="btn1 btn-success genjing" href="#modal-follow" 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]["id"] %]'>时间轴</a>