Skip to content

T
tl_estate
Commit 41fdb526 authored by hujun's avatar hujun
Browse files
Options

Merge remote-tracking branch 'origin/test' into test

parents 1651772a 5d327ee6
Show whitespace changes
Inline Side-by-side
Showing with 213 additions and 29 deletions
application/index/view/finance/index.html
View file @ 41fdb526
{layout name="global/frame_tpl" /} {layout name="global/frame_tpl" /}
<input type="hidden" class="page-load" id="reportList" /> <input type="hidden" class="page-load" id="reportList" />
<style>
#note_text{
width: 80%;
margin-left: 48px;
margin-top: -20px;
}
#note_text_re{
width: 80%;
margin-left: 48px;
margin-top: -20px;
}
.Tswitch_one{
display: none;
}
.Tswitch_two{
display: none;
}
</style>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-10 col-lg-offset-0"> <div class="col-lg-10 col-lg-offset-0">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading breadcrumb"> <div class="panel-heading breadcrumb">
<li><a href="#">成交报告-未接单</a></li> <li><a href="#">成交报告-未接单66</a></li>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="table-responsive"> <div class="table-responsive">
...@@ -32,7 +50,7 @@ ...@@ -32,7 +50,7 @@
<th class="text-center">操作</th> <th class="text-center">操作</th>
</tr> </tr>
</thead> </thead>
<tbody class="text-center" id="reportList_list"> <tbody class="text-center" id="follow_list">
</tbody> </tbody>
</table> </table>
...@@ -48,8 +66,8 @@ ...@@ -48,8 +66,8 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 弹出框 --> <!-- 弹出框 编辑 -->
<div class="modal fade" id="modal-delete" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="modal-edit" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
...@@ -57,7 +75,94 @@ ...@@ -57,7 +75,94 @@
× ×
</button> </button>
<h4 class="modal-title"> <h4 class="modal-title">
删除 <span class="btn btn-info" id="information">成交信息</span>
<span class="btn btn-info" id="fees">分佣提成</span>
<span class="btn btn-info" id="records">收款记录</span>
</h4>
</div>
<div class="modal-body">
<div class="Tswitch">成交信息</div>
<div class="Tswitch Tswitch_one">分佣提成</div>
<div class="Tswitch Tswitch_two">收款记录</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">取消
</button>
<button type="button" class="btn btn-primary" id="confirm_delete">
确定
</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
<!-- 弹出框 通过 -->
<div class="modal fade" id="modal-pass" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<h4 class="modal-title">
通过
</h4>
</div>
<div class="modal-body">
<label class="control-label">备注：</label>
<textarea class="form-control" rows="5" id="note_text"></textarea>
<!-- <span class="use-span text-danger">(必填)</span> -->
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">取消
</button>
<button type="button" class="btn btn-info" data-dismiss="modal" id="confirm_pass">
确定
</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
<!-- 弹出框 跟进 -->
<div class="modal fade" id="modal-follow" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<h4 class="modal-title">
跟进
</h4>
</div>
<div class="modal-body">
<label class="control-label">备注：</label>
<textarea class="form-control" rows="5" id="note_text_re"></textarea>
<!-- <span class="use-span text-danger">(必填)</span> -->
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">取消
</button>
<button type="button" class="btn btn-primary" data-dismiss="modal" id="confirm_follow">
确定
</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
<!-- 弹出框 时间 -->
<div class="modal fade" id="modal-time" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
×
</button>
<h4 class="modal-title">
时间轴
</h4> </h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
...@@ -76,4 +181,5 @@ ...@@ -76,4 +181,5 @@
</div><!-- /.modal --> </div><!-- /.modal -->
</div> </div>
<!-- -->
application/index/view/member/users_list.html
View file @ 41fdb526
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
</div> </div>
<!-- /#page-content-wrapper --> <!-- /#page-content-wrapper -->
<div class="text-left"> <div class="text-left">
每页显示<span id="page">15</span>条 | 共<span id="total_page">888888</span>条 每页显示<span id="page">15</span>条 | 共<span id="total_page"></span>条
</div> </div>
<div class="text-right" id="pagediv"> <div class="text-right" id="pagediv">
......
public/resource/js/reportList.js
View file @ 41fdb526
...@@ -25,10 +25,35 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', ' ...@@ -25,10 +25,35 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
$("#reset").click(function() { //重置 $("#reset").click(function() { //重置
document.getElementById("form_search").reset(); document.getElementById("form_search").reset();
}); });
$ (document).delegate (".caozuo", "click", function () {//点击操作跟进详情 // 时间轴
$ (document).delegate (".timeline", "click", function () {//点击操作跟进详情
follow.house_id = $ (this).attr ("data-id"); follow.house_id = $ (this).attr ("data-id");
follow.Caozuo(); follow.Timeline();
}); });
// 编辑
$ (document).delegate (".edit", "click", function () {//点击操作跟进详情
follow.house_id = $ (this).attr ("data-id");
follow.Edit();
});
// =========三个按钮=========
$ (document).delegate ("#information", "click", function () {//点击操作跟进详情
// follow.house_id = $ (this).attr ("data-id");
follow.Information();
});
$ (document).delegate ("#fees", "click", function () {//点击操作跟进详情
// follow.house_id = $ (this).attr ("data-id");
follow.Fees();
});
$ (document).delegate ("#records", "click", function () {//点击操作跟进详情
// follow.house_id = $ (this).attr ("data-id");
follow.Records();
});
// ===================
// $ (document).delegate (".caozuo", "click", function () {//点击操作跟进详情
// follow.house_id = $ (this).attr ("data-id");
// follow.Caozuo();
// });
$ (document).delegate (".submit_edit", "click", function () {//提交 $ (document).delegate (".submit_edit", "click", function () {//提交
follow.house_id = $ (this).attr ("data-id"); follow.house_id = $ (this).attr ("data-id");
follow.Submit_follow(); follow.Submit_follow();
...@@ -76,27 +101,59 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', ' ...@@ -76,27 +101,59 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
} }
}); });
}, },
Caozuo:function(){//获取跟进详情的数据 // 时间轴
Timeline:function(){//获取时间轴
$.ajax({
'type': 'GET',
'url' : '/index/selectReportAll',
data: {"order_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);
}
} else {
alert('获取失败！');
}
}
});
},
// 编辑
Edit:function(){//报告详情
$.ajax({ $.ajax({
'type': 'GET', 'type': 'GET',
'url' : '/index/reportListAttache/0', 'url' : '/index/reportListAttache/0',
data: {"user_id":follow.house_id}, // data: {"id":follow.house_id},
dataType: "json", dataType: "json",
success: function(data){ success: function(data){
if(data.code == 200){ if(data.code == 200){
if (data.data) { if (data.data) {
$("#cus_id").html(data.data.user_info.user_id);//客户编号 console.log(data.data);
$("#cus_name").val(data.data.user_info.user_nick);//姓名 // $("#cus_id").html(data.data.user_info.user_id);//客户编号
$("#sex").val(data.data.user_info.sex);//性别 // $("#cus_name").val(data.data.user_info.user_nick);//姓名
$("#cus_phone").html(data.data.user_info.user_phone);//电话 // $("#sex").val(data.data.user_info.sex);//性别
$("#cus_date").html(data.data.user_info.create_time);//上传时间 // $("#cus_phone").html(data.data.user_info.user_phone);//电话
$("#cus_fang").val(data.data.user_info.agentinfo);//客方 // $("#cus_date").html(data.data.user_info.create_time);//上传时间
var caozuo_table=""; // $("#cus_fang").val(data.data.user_info.agentinfo);//客方
$.each(data['data']['user_date'], function(i, item) { // var caozuo_table="";
console.log(item) // $.each(data['data']['user_date'], function(i, item) {
caozuo_table +='<tr><td>'+item.content+'</td><td>'+item.agentinfo+'</td><td>'+item.create_time+'</td></tr>'; // 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); // });
// $("#caozuo_table").html(caozuo_table);
} }
} else { } else {
alert('获取失败！'); alert('获取失败！');
...@@ -104,7 +161,26 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', ' ...@@ -104,7 +161,26 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
} }
}); });
}, },
// ===========666=========
Information:function(){
$(".Tswitch").eq(0).show();
$(".Tswitch").eq(1).hide();
$(".Tswitch").eq(2).hide();
},
Fees:function(){
$(".Tswitch").eq(0).hide();
$(".Tswitch").eq(1).show();
$(".Tswitch").eq(2).hide();
},
Records:function(){
$(".Tswitch").eq(0).hide();
$(".Tswitch").eq(1).hide();
$(".Tswitch").eq(2).show();
},
// =====================
Submit_follow: function() { //提交 Submit_follow: function() { //提交
$.ajax({ $.ajax({
'type': 'POST', 'type': 'POST',
...@@ -127,7 +203,6 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', ' ...@@ -127,7 +203,6 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
}); });
}, },
getList: function(pageNo) { getList: function(pageNo) {
console.log($('#customer_name').val());
follow.pageNo = pageNo; follow.pageNo = pageNo;
var params = {}; var params = {};
params.user_name =$('#customer_name').val(); params.user_name =$('#customer_name').val();
...@@ -150,7 +225,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', ' ...@@ -150,7 +225,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
dataType: 'json', dataType: 'json',
beforeSend: function() {}, beforeSend: function() {},
success: function(data) { success: function(data) {
console.log(data,666) // console.log(data,666)
if(typeof data === 'object') { if(typeof data === 'object') {
if (data.code == 200) { if (data.code == 200) {
var doTtmpl = doT.template(document.getElementById('reportList_list_tpl').innerHTML); var doTtmpl = doT.template(document.getElementById('reportList_list_tpl').innerHTML);
......
public/resource/js/user.js
View file @ 41fdb526
...@@ -377,6 +377,8 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', ' ...@@ -377,6 +377,8 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
data: params, data: params,
dataType: 'json', dataType: 'json',
success: function (data) { success: function (data) {
console.log(data);
console.log(44);
var temp = document.getElementById ('user_list_tpl').innerHTML; var temp = document.getElementById ('user_list_tpl').innerHTML;
var doTtmpl = doT.template (temp); var doTtmpl = doT.template (temp);
$ ("#users_list").html (doTtmpl (data.data.list)); $ ("#users_list").html (doTtmpl (data.data.list));
......
public/resource/template/reportList_template_tpl.html
View file @ 41fdb526
...@@ -10,10 +10,11 @@ ...@@ -10,10 +10,11 @@
<td>[%= it[item]['commission'] %]</td> <td>[%= it[item]['commission'] %]</td>
<td>[%= it[item]['practical_fee'] %]</td> <td>[%= it[item]['practical_fee'] %]</td>
<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 " href="/admin.php/index/houseEdit?id=[%= it[item]['id']%]" data-toggle="modal" >编辑</a> -->
<a class="btn1 btn-success is_show" data-toggle="modal" data-id='[%= it[item]["id"] %]'>通过</a> <a class="btn1 btn-success edit" href="#modal-edit" data-toggle="modal" >编辑</a>
<a class="btn1 btn-success dujia" href="#modal-dujia" 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 caozuo" href="#modal-record" 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>
</td> </td>
</tr> </tr>
[% } %] [% } %]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment