Skip to content

T
tl_estate
Commit 9e4445d9 authored by zw's avatar zw
Browse files
Options

Merge remote-tracking branch 'origin/1210-v3.0.2' into 1210-v3.0.2

parents 6cbb481e 155f0056
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 14 deletions
application/index/controller/Finance.php
View file @ 9e4445d9
...@@ -2474,6 +2474,7 @@ class Finance extends Basic ...@@ -2474,6 +2474,7 @@ class Finance extends Basic
$list[$k]['pay_type_num'] = $v['pay_type']; $list[$k]['pay_type_num'] = $v['pay_type'];
$list[$k]['type_num'] = $v['type']; $list[$k]['type_num'] = $v['type'];
} }
$data['list'] = $list; $data['list'] = $list;
//加时间条件 //加时间条件
if ($is_show) { if ($is_show) {
...@@ -3360,7 +3361,7 @@ class Finance extends Basic ...@@ -3360,7 +3361,7 @@ class Finance extends Basic
} }
$m_pay_adjustment = new OPayLogAdjustment(); $m_pay_adjustment = new OPayLogAdjustment();
$pay_id = $m_pay_adjustment->getFieldValue('id', ['paylog_id'=>$this->params['pay_id']]); $pay_id = $m_pay_adjustment->getFieldValue('id', ['new_paylog_id'=>$this->params['pay_id']]);
if ($pay_id) { if ($pay_id) {
return $this->response($code, '该收款有调整信息，不能删除'); return $this->response($code, '该收款有调整信息，不能删除');
} }
......
application/index/view/finance/adjustment.html
View file @ 9e4445d9
...@@ -508,6 +508,35 @@ ...@@ -508,6 +508,35 @@
</div> </div>
<!-- /.modal --> <!-- /.modal -->
</div> </div>
<!-- /#删除模态框 -->
<div class="modal fade" id="modal-delete" 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">
&times;
</button>
<h4 class="modal-title">
删除
</h4>
</div>
<div class="modal-body">
<div class="modal-body">
<input type="hidden" value="" id="delete_id" /> 确认删除吗？
</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" data-dismiss="modal">
删除
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
<div id="img_mask_area" title="点击任意位置可关闭"> <div id="img_mask_area" title="点击任意位置可关闭">
<img /> <img />
</div> </div>
\ No newline at end of file
application/index/view/finance/getCollection.html
View file @ 9e4445d9
...@@ -484,7 +484,7 @@ ...@@ -484,7 +484,7 @@
<div class="col-xs-6"> <div class="col-xs-6">
<div class="form-group"> <div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">调整后商铺地址:</span></strong> <strong><span class="col-xs-4 ld-Marheight">调整后商铺地址:</span></strong>
<span id="shop_addr_change" class="col-xs-6 ld-Marheight">123456</span> <span id="shop_addr_change" class="col-xs-6 ld-Marheight"></span>
</div> </div>
</div> </div>
...@@ -814,7 +814,7 @@ ...@@ -814,7 +814,7 @@
<img /> <img />
</div> </div>
<!-- /#删除模态框 --> <!-- /#删除模态框 -->
<div class="modal fade" id="modal-delete1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="modal-delete" 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">
......
application/route.php
View file @ 9e4445d9
...@@ -270,6 +270,7 @@ Route::group('index', [ ...@@ -270,6 +270,7 @@ Route::group('index', [
'getBargainCommission' => ['index/Finance/getBargainCommission', ['method' => 'GET|POST']], //获取成交报告分佣方佣金和修改 'getBargainCommission' => ['index/Finance/getBargainCommission', ['method' => 'GET|POST']], //获取成交报告分佣方佣金和修改
'dailyList' => ['index/Finance/dailyList', ['method' => 'GET']], //财务日报列表 'dailyList' => ['index/Finance/dailyList', ['method' => 'GET']], //财务日报列表
'dailyDetails' => ['index/Finance/dailyDetails', ['method' => 'GET|POST']], //财务日报详情 'dailyDetails' => ['index/Finance/dailyDetails', ['method' => 'GET|POST']], //财务日报详情
'dailyDetailsFinance' => ['index/Finance/dailyDetails', ['method' => 'GET|POST']], //财务日报详情
'addReceiptImg' => ['index/Finance/addReceiptImg', ['method' => 'post|get']],//收款图片信息保存 'addReceiptImg' => ['index/Finance/addReceiptImg', ['method' => 'post|get']],//收款图片信息保存
'deleteReceiptImg' => ['index/Finance/deleteReceiptImg', ['method' => 'post|get']],//删除收款图片 'deleteReceiptImg' => ['index/Finance/deleteReceiptImg', ['method' => 'post|get']],//删除收款图片
'receiptImgList' => ['index/Finance/receiptImgList', ['method' => 'post|get']],//收款列表-收款图片列表 'receiptImgList' => ['index/Finance/receiptImgList', ['method' => 'post|get']],//收款列表-收款图片列表
......
public/resource/js/adjustment.js
View file @ 9e4445d9
...@@ -37,9 +37,14 @@ define(['doT', 'text!temp/adjustment_template_tpl.html', 'css!style/home.css', ' ...@@ -37,9 +37,14 @@ define(['doT', 'text!temp/adjustment_template_tpl.html', 'css!style/home.css', '
//操作----删除 //操作----删除
$(document).on('click','.list_delete',function(e){ $(document).on('click','.list_delete',function(e){
var id = e.target.dataset.id; var id = e.target.dataset.id;
that.deleteTableRow(id); that.deleteId = id ;
console.log(id); // that.deleteTableRow(id);
// console.log(id);
}); });
$(document).on('click','#confirm_delete',function(e){
var id = that.deleteId;
that.deleteTableRow(id);
});
//搜索 //搜索
$(document).on('click','#search',function(e){ $(document).on('click','#search',function(e){
that.getList(that.pageNo); that.getList(that.pageNo);
......
public/resource/js/financial_daily_list.js
View file @ 9e4445d9
...@@ -32,7 +32,7 @@ define(['doT', 'text!temp/financial_daily_list_template_tpl.html', 'css!style/ho ...@@ -32,7 +32,7 @@ define(['doT', 'text!temp/financial_daily_list_template_tpl.html', 'css!style/ho
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
localStorage.setItem('financial_check_string_liu',$(this).attr("data-store")); localStorage.setItem('financial_check_string_liu',$(this).attr("data-store"));
location.href=href='/index/dailyDetails?time=' + $(this).attr("data-storeTime")+"&storeId="+$(this).attr("data-storeId"); location.href=href='/index/dailyDetailsFinance?time=' + $(this).attr("data-storeTime")+"&storeId="+$(this).attr("data-storeId");
}); });
//搜索按钮的事件 //搜索按钮的事件
......
public/resource/js/financial_manager_daily_list.js
View file @ 9e4445d9
...@@ -70,6 +70,10 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css! ...@@ -70,6 +70,10 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
//店长日报 时间搜索 //店长日报 时间搜索
_doc.on('input', '#create_time_start', function() { _doc.on('input', '#create_time_start', function() {
bargain.financialTime = $('#create_time_start').val(); bargain.financialTime = $('#create_time_start').val();
if(!($('#create_time_start').val())){
alert('时间不能为空!');
return
}
bargain.getList(1); bargain.getList(1);
}); });
//搜索按钮的事件 //搜索按钮的事件
...@@ -223,11 +227,15 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css! ...@@ -223,11 +227,15 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
$('#pay_h').html(data.data.commit_info.other_bank); $('#pay_h').html(data.data.commit_info.other_bank);
$('#pay_i').html(data.data.commit_info.agent_name); $('#pay_i').html(data.data.commit_info.agent_name);
$('#pay_j').html(data.data.commit_info.daily_date); $('#pay_j').html(data.data.commit_info.daily_date);
if(data.data.check_list){ $('.audit-records').show();
$('.audit-records').hide(); if(data.data.check_list&&data.data.check_list.length){
$('#maintable_list_f').show();
}else{
$('#maintable_list_f').hide();
} }
}else{//未提交 }else{//未提交
$('.is-submit').show();
$('.is-submit').html('提交'); $('.is-submit').html('提交');
$('.audit-records').hide(); $('.audit-records').hide();
$('.tips-dian').html(''); $('.tips-dian').html('');
...@@ -266,8 +274,12 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css! ...@@ -266,8 +274,12 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
$('.is-submit-passed').hide(); $('.is-submit-passed').hide();
$('#maintable_list_total').hide(); $('#maintable_list_total').hide();
}else{ }else{
$('.is-submit-pass-btn').show(); if(getUrlParam('time')){
$('.is-submit-passed').show(); $('.is-submit-pass-btn').show();
$('.is-submit-passed').show();
$('#maintable_list_total').show();
}
$('#total_a').html(data.data.total_info.alipay); $('#total_a').html(data.data.total_info.alipay);
$('#total_b').html(data.data.total_info.tenpay); $('#total_b').html(data.data.total_info.tenpay);
$('#total_c').html(data.data.total_info.realty_pay); $('#total_c').html(data.data.total_info.realty_pay);
...@@ -424,6 +436,7 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css! ...@@ -424,6 +436,7 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
alert('提交成功'); alert('提交成功');
$("#modal_financialremark").modal('hide');//提交成功后 关闭弹窗 $("#modal_financialremark").modal('hide');//提交成功后 关闭弹窗
bargain.getList(); bargain.getList();
location.href='/index/dailyList'
}else{ }else{
alert(data.msg); alert(data.msg);
} }
......
public/resource/js/getCollection.js
View file @ 9e4445d9
...@@ -189,6 +189,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -189,6 +189,10 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
//操作----删除 //操作----删除
$(document).on('click','.list_delete',function(e){ $(document).on('click','.list_delete',function(e){
var id = e.target.dataset.id; var id = e.target.dataset.id;
that.deleteId = id ;
});
$(document).on('click','#confirm_delete',function(e){
var id = that.deleteId;
that.deleteTableRow(id); that.deleteTableRow(id);
console.log(id) console.log(id)
}); });
...@@ -457,9 +461,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -457,9 +461,9 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
if(data.code == 200) { if(data.code == 200) {
var user_ul = ""; var user_ul = "";
$.each(data.data, function(i, item) { $.each(data.data, function(i, item) {
user_ul += '<li class="intoIdBuild" data-house_number="'+item.house_id+'"data-order_id="'+item.order_id+'" data-addr="'+item.house_address+'" data-id="' + item.id user_ul += '<li class="intoIdBuild" data-house_number="'+item.house_id+'"data-order_id="'+item.order_id+'" data-addr="'+item.house_address+'" data-id="' + item.report_id
+'" data-agent_id="' + item.report_agent_id +'" data-agent_name="' + item.report_agent_name +'" data-order_no="' + item.order_no +'" data-agent_id="' + item.report_agent_id +'" data-agent_name="' + item.report_agent_name +'" data-order_no="' + item.order_no
+ '">' + item.house_address + ',商铺ID：+' + item.house_id + '，带看ID' + item.id+'</li>'; + '">' + item.house_address + ',商铺ID：+' + item.house_id + '，带看ID' + item.report_id+'，客户编号' + item.user_id+'</li>';
}); });
$('.intoIdArea').show(); $('.intoIdArea').show();
$(".intoIdArea").html(user_ul); $(".intoIdArea").html(user_ul);
...@@ -973,12 +977,15 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -973,12 +977,15 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
doc.find("#fenhong").val(data.is_dividend); doc.find("#fenhong").val(data.is_dividend);
if (data.source == 0) { if (data.source == 0) {
$("#comes").text('APP'); $("#comes").text('APP');
doc.find("#status").text("正常");
} else if (data.source == 1){ } else if (data.source == 1){
$("#comes").text('只能pos机'); $("#comes").text('智能pos机');
doc.find("#status").text("正常");
} else { } else {
$("#comes").text('调整'); $("#comes").text('调整');
doc.find("#status").text("被调整");
} }
doc.find("#status").text(data.source_id); // doc.find("#status").text(data.source_id);
doc.find("#lastTime").val(data.last_transfer_time); doc.find("#lastTime").val(data.last_transfer_time);
if ( data.type == 91 || data.type == 92) { if ( data.type == 91 || data.type == 92) {
......
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