Skip to content

T
tl_estate
Commit a2e261c1 authored by agping's avatar agping
Browse files
Options

收款记录修改

parent 3e2f3a98
Hide whitespace changes
Inline Side-by-side
Showing with 387 additions and 110 deletions
application/index/view/agent/agent.html
View file @ a2e261c1
...@@ -57,7 +57,12 @@ ...@@ -57,7 +57,12 @@
<th>姓名</th> <th>姓名</th>
<th>手机号</th> <th>手机号</th>
<th>角色</th> <th>角色</th>
<!--2.2版本 -->
<!--<th>评价次数</th>
<th>分数</th>-->
<th>操作</th> <th>操作</th>
</tr> </tr>
</thead> </thead>
<tbody id="agentlist"> <tbody id="agentlist">
...@@ -199,4 +204,38 @@ ...@@ -199,4 +204,38 @@
<!-- /.modal-content --> <!-- /.modal-content -->
</div> </div>
<!-- /.modal --> <!-- /.modal -->
</div> </div>
\ No newline at end of file <!--绑定手机 2.2版本-->
<div class="modal fade" id="modal-unbundling" 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">
<form class="form-horizontal">
<div class="form-group">
绑定手机
<!--<label class="col-sm-3 control-label">权限角色：</label>
<select name="status" class="form-control btn6" id="edit_role">
</select>-->
</div>
</form>
</div>
<div class="modal-footer">
<!--<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>
<button type="button" class="btn btn-primary submit_user" data-dismiss="modal">
提交
</button>-->
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
application/index/view/collection/getCollection.html
View file @ a2e261c1
{layout name="global/frame_tpl" /} {layout name="global/frame_tpl" /}
<input type="hidden" class="page-load" id="getCollection" /> <input type="hidden" class="page-load" id="getCollection" />
<style> <style>
.modal-body{ .modal-body {
/*height: 600px;*/ /*height: 600px;*/
overflow-y: auto; overflow-y: auto;
padding-bottom: 60px; padding-bottom: 60px;
} }
.user-ul2{
width: 100%; .user-ul2 {
height: auto; width: 100%;
padding-bottom: 15px; height: auto;
float: left; padding-bottom: 15px;
} float: left;
.user-ul2 li{ }
list-style: none;
line-height: 30px; .user-ul2 li {
} list-style: none;
.money_total_two{ line-height: 30px;
font-weight: bold; }
font-size: 15px;
.money_total_two {
} font-weight: bold;
#search{ font-size: 15px;
float: left; }
}
#reset{ #search {
float: left; float: left;
} }
#reset {
float: left;
}
.img-pre-ul {
padding-left: 0;
overflow: hidden;
/*width: 100%;*/
}
/*图片上传相关样式*/
.img-pre-ul>li {
list-style: no;
float: left;
width: 210px;
height: 170px;
overflow: hidden;
margin-right: 10px;
margin-top: 10px;
}
.img-pre-ul>li.pdf-pre-li {
height: 70px;
}
.img-pre-ul>li>img {
float: left;
width: 210px;
height: 140px;
object-fit: contain;
cursor: pointer;
}
.img-pre-ul>li>a {
float: left;
width: 210px;
text-align: center;
line-height: 30px;
}
.img-pre-ul>li>a.pdf-pre-a {
line-height: 20px;
word-break: break-all;
}
/*图片点击放大预览区域的样式*/
#img_mask_area {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
overflow: hidden;
z-index: 1999;
background-color: rgba(0, 0, 0, .3);
display: none;
}
#img_mask_area>img {
width: 900px;
height: 700px;
object-fit: contain;
position: absolute;
left: 50%;
top: 50%;
margin-left: -450px;
margin-top: -350px;
}
/*上传图片列表 样式*/
.form-group {
margin: 10px;
}
.input-100-width {
width: 100px!important;
}
.input-360-width {
width: 360px!important;
}
.textarea-500-width {
width: 500px!important;
}
.list-group-item>.full-width-100+.full-width-100 {
padding-top: 10px;
}
.list-group-item>.full-width-100>label {
width: 60px;
}
.list-group-item>.full-pic-area>label {
width: 120px;
}
.delet-pic-btn{
color:red;
}
</style> </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> <li>
<a href="javascript:;">收款记录</a> <a href="javascript:;">收款记录</a>
</li> </li>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-bordered table-hover table-condensed"> <table class="table table-striped table-bordered table-hover table-condensed">
<thead> <thead>
<tr> <tr>
<td colspan="10"> <td colspan="10">
<form id="form_search"> <form id="form_search">
<span class="fore-span ld-Marheight">收款时间:</span> <span class="fore-span ld-Marheight">收款时间:</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date1" type="date"> <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date1" type="date">
<span class="fore-span ld-Marheight">-</span> <span class="fore-span ld-Marheight">-</span>
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_date" name="end_date1" type="date"> <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_date" name="end_date1" type="date">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="shop_name" placeholder="商铺名称" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="shop_name" placeholder="商铺名称" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="shop_num" placeholder="铺号" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="shop_num" placeholder="铺号" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="customer_phone" placeholder="客户手机号" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="customer_phone" placeholder="客户手机号" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="customer_name" placeholder="客户姓名" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="customer_name" placeholder="客户姓名" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="store_name" placeholder="门店" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="store_name" placeholder="门店" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="applicant_phone" placeholder="报备手机号" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="applicant_phone" placeholder="报备手机号" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="applicant_name" placeholder="报备人姓名" type="text" value=""> <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="applicant_name" placeholder="报备人姓名" type="text" value="">
<span class=" btn btn-info btn3 ld-Marheight" style="visibility: hidden;">搜索</span> <span class=" btn btn-info btn3 ld-Marheight" style="visibility: hidden;">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span> <span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span> <span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
<span class="money_total_two fore-span ld-Marheight ">总额：</span><span id="money_total" class="money_total_two fore-span ld-Marheight"></span> <span class="money_total_two fore-span ld-Marheight ">总额：</span><span id="money_total" class="money_total_two fore-span ld-Marheight"></span>
<span class="btn btn-info btn3 ld-Marheight" id="export">导出报表</span> <span class="btn btn-info btn3 ld-Marheight" id="export">导出报表</span>
</form> </form>
</form> </form>
</td> </td>
</tr> </tr>
<tr> <tr>
<th class="text-center">收款时间</th> <th class="text-center">收款时间</th>
<th class="text-center">客户姓名</th> <th class="text-center">客户姓名</th>
<th class="text-center">客户手机号</th> <th class="text-center">客户手机号</th>
<th class="text-center">收款金额（元）</th> <th class="text-center">收款金额（元）</th>
<th class="text-center">实付金额（元）</th> <th class="text-center">实付金额（元）</th>
<th class="text-center">入账类型</th>
<th class="text-center">入账方式</th>
<th class="text-center">商铺地址</th>
<th class="text-center">商铺号</th>
<th class="text-center">操作</th>
</tr>
</thead>
<tbody class="text-center" id="follow_list">
</table>
</div>
<!-- /#page-content-wrapper -->
<div class="text-right" id="pagediv">
</div> <th class="text-center">入账类型</th>
</div> <th class="text-center">入账方式</th>
</div> <th class="text-center">商铺地址</th>
</div> <th class="text-center">商铺号</th>
<th class="text-center">操作</th>
</tr>
</thead>
<tbody class="text-center" id="follow_list">
</table>
</div>
<!-- /#page-content-wrapper -->
<div class="text-right" id="pagediv">
</div> </div>
</div> </div>
</div>
</div>
</div>
</div>
</div> </div>
<!--时间轴--> <!--时间轴-->
<div class="modal fade" id="modal-time" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="modal-time" 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">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
× ×
</button> </button>
<h4 class="modal-title"> <h4 class="modal-title">
时间轴 时间轴
</h4> </h4>
</div> </div>
<div class="modal-body" class="iframe-div-parent"> <div class="modal-body" class="iframe-div-parent">
<iframe class="iframe-time-line"></iframe> <iframe class="iframe-time-line"></iframe>
</div> </div>
</div><!-- /.modal-content --> </div>
</div><!-- /.modal --> <!-- /.modal-content -->
</div>
<!-- /.modal -->
</div> </div>
<div class="modal fade" id="modal-linetime" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="modal-linetime" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
...@@ -124,7 +226,7 @@ ...@@ -124,7 +226,7 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="modal-body" id="del_msg"> <div class="modal-body" id="del_msg">
实付金额：<input type="number" id='real_money'/>元 实付金额：<input type="number" id='real_money' />元
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
...@@ -139,12 +241,46 @@ ...@@ -139,12 +241,46 @@
</div> </div>
<!-- /.modal --> <!-- /.modal -->
</div> </div>
<!--收款图片 2.2版本-->
<div class="modal fade" id="modal-addPic" 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">
<ul class="list-group">
<li class="list-group-item">
<div class="form-group full-width-100 full-pic-area">
<!--<label for="">详情页轮播图(至少4张)</label>-->
<input readonly="readonly" type="text" name="xiangqing_pic_input" class="form-control" style="display: none" id="xiangqing_pic_input" placeholder="请选择图片">
<button class="btn btn-default upload-image-btn" id="xiangqing_pic_btn" type="button" data-limittop="20">上传图片</button>
<span class="tip"></span>
</div>
<ul class="img-pre-ul" id="xiangqing_pic_ul">
\ No newline at end of file </ul>
</li>
</ul>
</div>
<div class="modal-footer">
<!--<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>-->
<button type="button" class="btn btn-primary submit_edit" id=" " data-dismiss="modal">
保存
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
<div id="img_mask_area" title="点击任意位置可关闭">
<img />
</div>
\ No newline at end of file
public/resource/js/getCollection.js
View file @ a2e261c1
...@@ -20,6 +20,8 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css ...@@ -20,6 +20,8 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
}, },
event: function() { event: function() {
var _doc = $(document); var _doc = $(document);
var _imgMaskObj = $('#img_mask_area'); //预览大图的mask
_doc.on('click', 'a[href="#modal-time"]', function(e){ _doc.on('click', 'a[href="#modal-time"]', function(e){
follow.house_id = $ (this).attr ("data-id"); follow.house_id = $ (this).attr ("data-id");
e.preventDefault(); e.preventDefault();
...@@ -56,6 +58,99 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css ...@@ -56,6 +58,99 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
$ (document).delegate (".addphone2", "click", function () {//list2消失 $ (document).delegate (".addphone2", "click", function () {//list2消失
follow.addphone2(this); follow.addphone2(this);
}); });
//图片上传 2.2版本
//图片上传，附件上传处理事件
$(".upload-image-btn").click(function() {
var _this = $(this),
_spFile = _this.data('spfile'),
_limitTop = _this.data('limittop'),
_fileNum = _this.parent().next().find('.delet-pic-btn').length; //根据删除按钮的个数，确定文件的个数
if(_limitTop && (_fileNum < _limitTop)) {
BrowseServer(_this.prev().attr('id'), function(url) {
console.log(url);
if(_spFile == 'pdf') {
if(/(\.pdf)$/i.test(url)) {
_this.parent().next().prepend('<li class="pdf-pre-li"><a class="pdf-pre-a" href="{0}" target="_blank" title="点击查看">{1}</a><a href="javascript:;" class="delet-pic-btn">删除</a></li>'.stringFormatObj({
'0': url,
'1': dealFileName(decodeURI(url.slice(url.lastIndexOf('/') + 1)))
}));
} else {
alert('所选择的格式不是pdf,请重新选择');
return false;
}
} else {
if(/(\.jpg|\.jpeg|\.png|\.gif|\.bmp)$/i.test(url)) {
_this.parent().next().prepend('<li><img title="点击查看大图" src="{0}" /><a href="javascript:;" class="delet-pic-btn">删除</a></li>'.stringFormatObj({
'0': url
}));
} else {
alert('所选择的格式不正确,请重新选择');
return false;
}
};
});
} else {
alert('上传上限为 ' + _limitTop);
return false;
};
});
//图片上传删除键事件
_doc.on('click', '.delet-pic-btn', function(e) {
var _this = $(this);
e.preventDefault();
e.stopPropagation();
if(confirm('确定删除该文件吗？')){
var _imgId = _this.parent().attr('data-imgid');
if(_imgId){
$.ajax({
type: 'POST',
url: '/index/delHouseFile',
data: {
'id': _imgId,
'house_id': _id
},
timeout: 30000,
dataType: 'json',
beforeSend: function() {},
success: function(_data) {
if(typeof _data === 'object') {
if(_data['code'] == '200') {
_this.parent().remove();
} else {
alert(_data['msg']);
}
} else {
alert('数据错误');
};
},
error: function() {
alert('enter error');
},
complete: function(xhr, textStatus){
if(textStatus === 'timeout') {
//处理超时的逻辑
alert('请求超时,请重试');
};
}
});
}else{
_this.parent().remove();
}
};
});
//图片预览点击放大事件
_doc.on('click', '.img-pre-ul>li>img', function(e) {
_imgMaskObj.show().find('img').attr('src', this.src);
});
_imgMaskObj.click(function(e) {
this.style.display = 'none';
});
//图片上传 2.2版本
}, },
addphone2:function(obj){ addphone2:function(obj){
......
public/resource/template/agent_template_tpl.html
View file @ a2e261c1
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
<td>[%= it[item]["name"] %]</td> <td>[%= it[item]["name"] %]</td>
<td>[%= it[item]["phone"] %]</td> <td>[%= it[item]["phone"] %]</td>
<td>[%= it[item]["groupname"] %]</td> <td>[%= it[item]["groupname"] %]</td>
<!--增加评价次数 分数2.2-->
<!--<td>[%= it[item]["groupname"] %]</td>
<td>[%= it[item]["groupname"] %]</td>-->
<!--<td><span class="fa fa-check text-success"></span></td>--> <!--<td><span class="fa fa-check text-success"></span></td>-->
<td> <td>
<a class="btn1 btn-success edit" href="#modal-edit" data-toggle="modal" data-id='[%= it[item]["id"] %]'>编辑</a> <a class="btn1 btn-success edit" href="#modal-edit" data-toggle="modal" data-id='[%= it[item]["id"] %]'>编辑</a>
...@@ -27,6 +30,9 @@ ...@@ -27,6 +30,9 @@
[% if(check_auth('index/updateRole')) {%] [% if(check_auth('index/updateRole')) {%]
<a href="#modal-user" class="btn1 btn-danger" id='role' href="#modal-edit" data-toggle="modal" data-id='[%= it[item]["id"] %]'>角色设置</a> <a href="#modal-user" class="btn1 btn-danger" id='role' href="#modal-edit" data-toggle="modal" data-id='[%= it[item]["id"] %]'>角色设置</a>
[% } %] [% } %]
<!--增加绑定手机号按钮 2.2版本-->
<!--<a class="btn1 btn-success" href="#modal-unbundling" data-toggle="modal" data-id='[%= it[item]["id"] %]'>绑定手机</a>-->
</td> </td>
</tr> </tr>
[% } %] [% } %]
......
public/resource/template/get_collection_template_tpl.html
View file @ a2e261c1
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
<td>[%= it[item]['internal_address'] %]</td> <td>[%= it[item]['internal_address'] %]</td>
<td>[%= it[item]['house_number'] %]</td> <td>[%= it[item]['house_number'] %]</td>
<td> <td>
<!--增加收款图片 2.2版本-->
<!--<a class="btn1 btn-info add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>收款图片</a>-->
<a class="btn1 btn-info timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a> <a class="btn1 btn-info timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
<a class="btn1 btn-info submit_edit2" href="#modal-linetime" data-toggle="modal" data-id='[%= it[item]["id"]%]' data-money='[%= it[item]["real_money"] %]'>编辑</a> <a class="btn1 btn-info submit_edit2" href="#modal-linetime" data-toggle="modal" data-id='[%= it[item]["id"]%]' data-money='[%= it[item]["real_money"] %]'>编辑</a>
</td> </td>
......
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