Skip to content

T
tl_estate
Commit 7012c977 authored by xishifeng's avatar xishifeng
Browse files
Options

bug处理

parent 88b960fc
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 73 deletions
application/index/view/finance/account_statement.html
View file @ 7012c977
......@@ -35,7 +35,7 @@
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_user_phone" placeholder="客户电话" type="text" value="">
<span class="btn btn-info btn3 search" id="maintable_search">搜索</span>
<span class="btn btn-info btn3" id="maintable_reset">重置</span>
<span class="btn btn-info btn3" id="maintable_export">导出excel</span>
<!--<span class="btn btn-info btn3" id="maintable_export">导出excel</span>-->
</form>
</td>
</tr>
......@@ -252,35 +252,25 @@
<!-- /.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">
<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 class="modal-title">
时间轴
</h4>
</div>
<div class="modal-body">
<div class="modal-body" id="del_msg">
时间轴
</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=" ">
删除
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
<div class="modal-body" class="iframe-div-parent">
<iframe class="iframe-time-line"></iframe>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
<!-- 弹出框 分佣提成新增 -->
<div class="modal fade" id="modal_new_maid" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
......
application/index/view/finance/refund_order_list.html
View file @ 7012c977
......@@ -230,7 +230,7 @@
</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">
......
public/resource/css/report_list.css
View file @ 7012c977
......@@ -118,6 +118,7 @@ addtax_
}
[href="#modal_new_maid"]{
float: left;
display: none;
}
#maid_new_btn{
float: right;
......
public/resource/js/reportList.js
View file @ 7012c977
define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_shuiFee_template_tpl.html', 'text!temp/reportList_maid_template_tpl.html', 'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax, template_maid) {
define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_shuiFee_template_tpl.html', 'text!temp/reportList_maid_template_tpl.html', 'text!temp/reportList_maid_sub1_template_tpl.html', 'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax, template_maid, template_maid_sub1) {
bargain = {
pageNo: 1,
/*第几页*/
......@@ -12,7 +12,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
maidTotalCommission: 0,//应收总佣金
init: function() {
//初始化dot
$(document.body).append(template + template_tax + template_maid);
$(document.body).append(template + template_tax + template_maid + template_maid_sub1);
bargain.getList(1);
bargain.event();
},
......@@ -273,7 +273,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
content: '确认增加吗?',
btn: ['确定', '取消'],
yes: function(_index){
$('.detail-modal-maid-mix-td').append('<div class="oh"><span contenteditable class="detail-modal-maid-span-real-fee"></span><span contenteditable class="detail-modal-maid-span-service-charge"></span><span contenteditable class="detail-modal-maid-span-charity-fund"></span><span contenteditable class="detail-modal-maid-span-cash"></span><span contenteditable class="detail-modal-maid-span-practical-fee"></span><span class="detail-modal-maid-span-time"></span></div>');
$('.detail-modal-maid-mix-td').append(document.getElementById('reportList_maid_sub1_list_tpl').innerHTML);
layer.close(_index);
}
});
......@@ -293,58 +293,73 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
//新增分佣提成，业务员input输入搜索
var _ajaxObjTel = null;
var _addmaid_input_servantObj = $('#addmaid_input_servant');
_doc.on('input', '#addmaid_input_ywy', function() {
var _this = $(this),
_thisVal = $.trim(_this.val());
_this.removeAttr('data-id'); //移除之前携带的信息
if(_thisVal != '') {
_ajaxObjTel && _ajaxObjTel.abort();
_ajaxObjTel = $.ajax({
type: 'GET',
url: '/index/getBroker_new',
data: {
'phone': $.trim(_this.val())
},
timeout: 30000,
dataType: 'json',
beforeSend: function() {},
success: function(data) {
if(typeof data === 'object') {
if(data.code == 200) {
if(data['data'].length > 0) {
var _htmlTemp = '';
$.each(data['data'], function(i, item) {
_htmlTemp += '<li data-id="{3}">{0}-{1}<li>'.stringFormatObj({
'0': item['name'],
'1': item['phone'],
'3': item['id']
var _this = $(this);
if(_addmaid_input_servantObj.val() == '5'){
//当分佣方的值为5，合作方的时候，才能查询
var _thisVal = $.trim(_this.val());
_this.removeAttr('data-id'); //移除之前携带的信息
if(_thisVal != '') {
_ajaxObjTel && _ajaxObjTel.abort();
_ajaxObjTel = $.ajax({
type: 'GET',
url: '/index/getBroker_new',
data: {
'phone': $.trim(_this.val())
},
timeout: 30000,
dataType: 'json',
beforeSend: function() {},
success: function(data) {
if(typeof data === 'object') {
if(data.code == 200) {
if(data['data'].length > 0) {
var _htmlTemp = '';
$.each(data['data'], function(i, item) {
_htmlTemp += '<li data-id="{3}">{0}-{1}<li>'.stringFormatObj({
'0': item['name'],
'1': item['phone'],
'3': item['id']
});
});
});
_this.next().show().html(_htmlTemp);
_this.next().show().html(_htmlTemp);
} else {
_this.next().html('');
};
} else {
_this.next().html('');
alert(data['msg']);
};
} else {
alert(data['msg']);
alert('数据错误');
};
} else {
alert('数据错误');
};
},
error: function() {
//alert('error');
},
complete: function(xhr, textStatus) {
if(textStatus === 'timeout') {
alert('请求超时');
};
}
});
}else{
_this.next().hide();
}
},
error: function() {
//alert('error');
},
complete: function(xhr, textStatus) {
if(textStatus === 'timeout') {
alert('请求超时');
};
}
});
}else{
_this.next().hide();
}
}else{}
});
//时间轴点击事件
_doc.on('click', 'a[href="#modal-time"]', function(e){
e.preventDefault();
e.stopPropagation();
var _this = $(this);
var _id = _this.closest('tr').data('id');
console.log(_id);
$('.iframe-time-line').attr('src', '/app_broker/timeline_pc?order_id='+_id);
});
},
getDefaultRadio: function(v){
switch (Number(v)){
......@@ -488,6 +503,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
});
},
maidShow: function() {
$('[href="#modal_new_maid"]').hide();//默认隐藏新增按钮
$("#maid_new_table_list").html('');
$.ajax({
type: 'GET',
......@@ -502,6 +518,16 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
if(typeof _data === 'object') {
if(_data['code'] == '200') {
$("#maid_new_table_list").html(doT.template($('#reportList_maid_list_tpl').html())(_data));
var _isShowAddBtnFlag = true;
$.each($('.detail-modal-maid-span-time'), function(i, v) {
if(v.innerHTML){
_isShowAddBtnFlag = false;
};
});
//如果确认时间都有，都不为空，则把新增按钮显示出来
if(_isShowAddBtnFlag){
$('[href="#modal_new_maid"]').show();
};
} else {
layerTipsX(_data['msg']);
}
......
public/resource/template/reportList_maid_sub1_template_tpl.html 0 → 100644
View file @ 7012c977
<script id="reportList_maid_sub1_list_tpl" type="text/template">
<div class="oh">
<span contenteditable class="detail-modal-maid-span-real-fee"></span>
<span contenteditable class="detail-modal-maid-span-service-charge">0</span>
<span contenteditable class="detail-modal-maid-span-charity-fund">0</span>
<span contenteditable class="detail-modal-maid-span-cash">0</span>
<span contenteditable class="detail-modal-maid-span-practical-fee"></span>
<span class="detail-modal-maid-span-time"></span>
</div>
</script>
\ No newline at end of file
public/resource/template/reportList_template_tpl.html
View file @ 7012c977
......@@ -5,7 +5,7 @@
<tr class="text-center" data-id='[%= it["list"][item]["id"] %]'>
<td>[%= it["list"][item]['create_time'] %]</td>
<td>[%= it["list"][item]['internal_address'] %]</td>
<td>[%= it["list"][item]['internal_title'] %]</td>
<td>[%= it["list"][item]['house_number'] %]</td>
<td>[%= it["list"][item]['user_name'] %]</td>
<td>[%= hideTel(it["list"][item]['user_phone']) %]</td>
<td>[%= sw(it["list"][item]['trade_type']) %]</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