Skip to content

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

修改 后台

parent 20668ca7
Hide whitespace changes
Inline Side-by-side
Showing with 281 additions and 101 deletions
application/index/view/finance/daily_details.html
View file @ 18d9b91e
......@@ -415,44 +415,70 @@
<table class="table table-striped table-bordered table-hover table-condensed">
<thead>
<tr class="maintable-tr-bar">
<th class="text-center">支付宝转账</th>
<th class="text-center">微信转账</th>
<th class="text-center">地产转账</th>
<th class="text-center">世家公账</th>
<th class="text-center">3000账号</th>
<th class="text-center">现金</th>
<th class="text-center">POS机</th>
<th class="text-center">其他</th>
<!--深圳-->
<th class="text-center shenzhen">筠姐支付宝</th>
<th class="text-center shenzhen">筠姐微信</th>
<th class="text-center shenzhen">银满谷银行卡</th>
<!--上海 杭州 店长 commit-->
<th class="text-center shanghai">施总支付宝</th>
<th class="text-center shanghai">林老师支付宝</th>
<th class="text-center shanghai">施总微信</th>
<th class="text-center shanghai">林老师微信</th>
<th class="text-center shanghai">地产转账</th>
<th class="text-center shanghai">世家公账</th>
<th class="text-center shanghai">3000账号</th>
<th class="text-center shanghai">现金</th>
<th class="text-center shanghai">POS机</th>
<th class="text-center shanghai">其他</th>
<th class="text-center">提交人</th>
<th class="text-center">提交时间</th>
</tr>
</thead>
<tbody class="text-center" id="">
<tr>
<td class="text-center">
<!--深圳-->
<td class="text-center shenzhen">
<span id="pay_yun_zhihubao"></span>
</td>
<td class="text-center shenzhen">
<span id="pay_yun_weixin"></span>
</td>
<td class="text-center shenzhen">
<span id="pay_yun_card"></span>
</td>
<!--上海 杭州 店长 commit-->
<td class="text-center shanghai">
<span id="pay_a"></span>
</td>
<td class="text-center">
<td class="text-center shanghai">
<span id="pay_a1"></span>
</td>
<td class="text-center shanghai">
<span id="pay_b"></span>
</td>
<td class="text-center">
<td class="text-center shanghai">
<span id="pay_b1"></span>
</td>
<td class="text-center shanghai">
<span id="pay_c"></span>
</td>
<td class="text-center">
<td class="text-center shanghai">
<span id="pay_d"></span>
</td>
<td class="text-center">
<td class="text-center shanghai">
<span id="pay_e"></span>
</td>
<td class="text-center">
<td class="text-center shanghai">
<span id="pay_f"></span>
</td>
<td class="text-center">
<td class="text-center shanghai">
<span id="pay_g"></span>
</td>
<td class="text-center">
<td class="text-center shanghai">
<span id="pay_h"></span>
</td>
<td class="text-center">
<span id="pay_i"></span>
</td>
......@@ -472,14 +498,21 @@
<table class="table table-striped table-bordered table-hover table-condensed">
<thead>
<tr class="maintable-tr-bar">
<th class="text-center">支付宝转账</th>
<th class="text-center">微信转账</th>
<th class="text-center">地产转账</th>
<th class="text-center">世家公账</th>
<th class="text-center">3000账号</th>
<th class="text-center">现金</th>
<th class="text-center">POS机</th>
<th class="text-center">其他</th>
<!--深圳-->
<th class="text-center shenzhen">筠姐支付宝</th>
<th class="text-center shenzhen">筠姐微信</th>
<th class="text-center shenzhen">银满谷银行卡</th>
<!--上海 杭州 total 财务-->
<th class="text-center shanghai">施总支付宝</th>
<th class="text-center shanghai">林老师支付宝</th>
<th class="text-center shanghai">施总微信</th>
<th class="text-center shanghai">林老师微信</th>
<th class="text-center shanghai">地产转账</th>
<th class="text-center shanghai">世家公账</th>
<th class="text-center shanghai">3000账号</th>
<th class="text-center shanghai">现金</th>
<th class="text-center shanghai">POS机</th>
<th class="text-center shanghai">其他</th>
<th class="text-center">审核人</th>
<th class="text-center">审核时间</th>
<th class="text-center">备注</th>
......@@ -491,38 +524,54 @@
</tbody>
<tfoot class="text-center" id="maintable_list_total">
<tr>
<td class="text-center">
<span id="total_a">555</span>
<td class="text-center shenzhen">
<span id="total_yun_zhihubao"></span>
</td>
<td class="text-center">
<td class="text-center shenzhen">
<span id="total_yun_weixin"></span>
</td>
<td class="text-center shenzhen">
<span id="total_yun_card"></span>
</td>
<td class="text-center shanghai">
<span id="total_a"></span>
</td>
<td class="text-center shanghai">
<span id="total_a1"></span>
</td>
<td class="text-center shanghai">
<span id="total_b"></span>
</td>
<td class="text-center">
<td class="text-center shanghai">
<span id="total_b1"></span>
</td>
<td class="text-center shanghai">
<span id="total_c"></span>
</td>
<td class="text-center">
<td class="text-center shanghai">
<span id="total_d"></span>
</td>
<td class="text-center">
<td class="text-center shanghai">
<span id="total_e"></span>
</td>
<td class="text-center">
<td class="text-center shanghai">
<span id="total_f"></span>
</td>
<td class="text-center">
<td class="text-center shanghai">
<span id="total_g"></span>
</td>
<td class="text-center">
<td class="text-center shanghai">
<span id="total_h"></span>
</td>
<td class="text-center">
<span id="total_f"></span>
<span id="total_i"></span>
</td>
<td class="text-center">
<span id="total_g"></span>
<span id="total_j"></span>
</td>
<td class="text-center">
<span id="total_h"></span>
<span id="total_k"></span>
</td>
</tr>
......
application/index/view/finance/wait_back_out.html
View file @ 18d9b91e
......@@ -185,4 +185,27 @@
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
<!-- 弹出框 恢复正常 -->
<div class="modal fade" id="modal-backNormal" 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">
<div style="font-size: 15px;font-weight: 600;">该成交报告将从撤销状态恢复到一级审核的状态，确定恢复正常么？</div>
</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="backToNormal">确定</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
public/resource/js/financial_manager_daily_list.js
View file @ 18d9b91e
......@@ -18,6 +18,8 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
store_id:'',//日报id
house_fatherid:'',//收款id
house_id: '',
caiwu_site_id: '',
init: function() {
//初始化时间
......@@ -343,6 +345,7 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
success: function(data) {
if(typeof data === 'object') {
if(data.code == 200) {
bargain.caiwu_site_id=data.data.site_id;
//中介费
var doTtmpl = doT.template(document.getElementById('a_financial_daily_list_tpl').innerHTML);
$("#maintable_list_a").html(doTtmpl(data.data.list.agency_fee));
......@@ -362,19 +365,34 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
var doTtmpl = doT.template(document.getElementById('f_financial_daily_list_tpl').innerHTML);
$("#maintable_list_f").html(doTtmpl(data.data.check_list));
//判断店长是否提交过
if(data.data.is_commit*1){//提交过
if(data.data.is_commit*1){//提交过 店长
$('.is-submit').hide();
$('.tips-dian').html('日报已经提交过');
//总计commit_info
bargain.daily_id = data.data.commit_info.id;
$('#pay_a').html(data.data.commit_info.alipay);
$('#pay_b').html(data.data.commit_info.tenpay);
$('#pay_c').html(data.data.commit_info.realty_pay);
$('#pay_d').html(data.data.commit_info.family_pay);
$('#pay_e').html(data.data.commit_info.private_bank);
$('#pay_f').html(data.data.commit_info.cash);
$('#pay_g').html(data.data.commit_info.pos);
$('#pay_h').html(data.data.commit_info.other_bank);
//深圳 和 杭州上海
if(data.data.site_id == 10003){
$('#pay_yun_zhihubao').html(data.data.commit_info.alipay);
$('#pay_yun_weixin').html(data.data.commit_info.tenpay);
$('#pay_yun_card').html(data.data.commit_info.bank_card);
$('shenzhen').show();
$('shanghai').hide();
}else{
$('shenzhen').hide();
$('shanghai').show();
$('#pay_a').html(data.data.commit_info.alipay);
$('#pay_a1').html(data.data.commit_info.alipay_2);
$('#pay_b1').html(data.data.commit_info.tenpay);
$('#pay_b').html(data.data.commit_info.tenpay_2);
$('#pay_c').html(data.data.commit_info.realty_pay);
$('#pay_d').html(data.data.commit_info.family_pay);
$('#pay_e').html(data.data.commit_info.private_bank);
$('#pay_f').html(data.data.commit_info.cash);
$('#pay_g').html(data.data.commit_info.pos);
$('#pay_h').html(data.data.commit_info.other_bank);
}
$('#pay_i').html(data.data.commit_info.agent_name);
$('#pay_j').html(data.data.commit_info.create_time);
$('.audit-records').show();
......@@ -395,15 +413,28 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
$('.is-submit').html('提交');
$('.audit-records').hide();
$('.tips-dian').html('');
//未提交
$('#pay_a').html(data.data.total_info.alipay);
$('#pay_b').html(data.data.total_info.tenpay);
$('#pay_c').html(data.data.total_info.realty_pay);
$('#pay_d').html(data.data.total_info.family_pay);
$('#pay_e').html(data.data.total_info.private_bank);
$('#pay_f').html(data.data.total_info.cash);
$('#pay_g').html(data.data.total_info.pos);
$('#pay_h').html(data.data.total_info.other_bank);
//未提交 店长
if(data.data.site_id == 10003){
$('#pay_yun_zhihubao').html(data.data.total_info.alipay);
$('#pay_yun_weixin').html(data.data.total_info.tenpay);
$('#pay_yun_card').html(data.data.total_info.bank_card);
$('.shenzhen').show();
$('.shanghai').hide();
}else{
$('.shenzhen').hide();
$('.shanghai').show();
$('#pay_a').html(data.data.total_info.alipay);
$('#pay_a1').html(data.data.total_info.alipay_2);
$('#pay_b1').html(data.data.total_info.tenpay);
$('#pay_b').html(data.data.total_info.tenpay_2);
$('#pay_c').html(data.data.total_info.realty_pay);
$('#pay_d').html(data.data.total_info.family_pay);
$('#pay_e').html(data.data.total_info.private_bank);
$('#pay_f').html(data.data.total_info.cash);
$('#pay_g').html(data.data.total_info.pos);
$('#pay_h').html(data.data.total_info.other_bank);
}
$('#pay_i').html('');
$('#pay_j').html('');
//店长财务日报 未提交 显示删除按钮 编辑按钮
......@@ -453,16 +484,32 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
$('#maintable_list_total').show();
}
$('#total_a').html(data.data.total_info.alipay);
$('#total_b').html(data.data.total_info.tenpay);
$('#total_c').html(data.data.total_info.realty_pay);
$('#total_d').html(data.data.total_info.family_pay);
$('#total_e').html(data.data.total_info.private_bank);
$('#total_f').html(data.data.total_info.cash);
$('#total_g').html(data.data.total_info.pos);
$('#total_h').html(data.data.total_info.other_bank);
//杭州 上海
if(data.data.site_id == 10003){
$('.shenzhen').show();
$('.shanghai').hide();
$('#total_yun_zhihubao').html(data.data.total_info.alipay);
$('#total_yun_weixin').html(data.data.total_info.tenpay);
$('#total_yun_card').html(data.data.total_info.bank_card);
}else{
$('.shenzhen').hide();
$('.shanghai').show();
$('#total_a').html(data.data.total_info.alipay);
$('#total_a1').html(data.data.total_info.alipay_2);
$('#total_b').html(data.data.total_info.tenpay_2);
$('#total_b1').html(data.data.total_info.tenpay);
$('#total_c').html(data.data.total_info.realty_pay);
$('#total_d').html(data.data.total_info.family_pay);
$('#total_e').html(data.data.total_info.private_bank);
$('#total_f').html(data.data.total_info.cash);
$('#total_g').html(data.data.total_info.pos);
$('#total_h').html(data.data.total_info.other_bank);
}
$('#total_i').html('');
$('#total_j').html('');
$('#total_k').html('');
}
}
......@@ -529,23 +576,35 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
},
//店长提交日报
submitReport: function() {
var params = {};
params.daily_date=bargain.financialTime;
params.agent_id=user_info_obj.id;
params.agent_name=user_info_obj.name;
// 判断 深圳 杭州
if(bargain.caiwu_site_id == 10003){
params.alipay=$('#pay_yun_zhihubao').html();
params.tenpay=$('#pay_yun_weixin').html();
params.bank_card=$('#pay_yun_card').html();
}else{
params.alipay=$('#pay_a').html();
params.alipay_2=$('#pay_a1').html();
params.tenpay=$('#pay_b1').html();
params.tenpay_2=$('#pay_b').html();
params.realty_pay=$('#pay_c').html();
params.family_pay=$('#pay_d').html();
params.private_bank=$('#pay_e').html();
params.cash=$('#pay_f').html();
params.pos=$('#pay_g').html();
params.other_bank=$('#pay_h').html();
};
$.ajax({
url: '/index/addDaily',
type: 'GET',
async: true,
data: {
'agent_id': user_info_obj.id,
"agent_name": user_info_obj.name,
'daily_date': bargain.financialTime,
"alipay": $('#pay_a').html(),
'tenpay': $('#pay_b').html(),
"realty_pay": $('#pay_c').html(),
'family_pay': $('#pay_d').html(),
"private_bank": $('#pay_e').html(),
"cash": $('#pay_f').html(),
"pos": $('#pay_g').html(),
"other_bank": $('#pay_h').html()
},
data: params,
dataType: 'json',
success: function(data) {
if(data.code == 200) {
......@@ -580,34 +639,41 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
}else{
$('#container_body_img_area').append('<div class="result2">暂无图片</div>');
}
}
}
});
},
//财务审核通过 转到已审核
submitPassReport: function() {
var params = {};
params.daily_id=bargain.daily_id;
params.agent_id=user_info_obj.id;
params.agent_name=user_info_obj.name;
params.remark=(bargain.operationStatus)*1?'审核通过':($.trim($('.remark-financial').val()));
params.operation_status=bargain.operationStatus//0审核通过 1转为已审核
if(bargain.caiwu_site_id == 10003){
params.alipay=$('#total_yun_zhihubao').html();
params.tenpay=$('#total_yun_weixin').html();
params.bank_card=$('#total_yun_card').html();
}else{
params.alipay=$('#total_a').html();
params.alipay_2=$('#total_a1').html();
params.tenpay=$('#total_b1').html();
params.tenpay_2=$('#total_b').html();
params.realty_pay=$('#total_c').html();
params.family_pay=$('#total_d').html();
params.private_bank=$('#total_e').html();
params.cash=$('#total_f').html();
params.pos=$('#total_g').html();
params.other_bank=$('#total_h').html();
};
$.ajax({
url: '/index/commitCheck',
type: 'GET',
async: true,
data: {
'daily_id':bargain.daily_id,
'agent_id': user_info_obj.id,
"agent_name": user_info_obj.name,
// 'daily_date': bargain.financialTime,
"alipay": $('#total_a').html(),
'tenpay': $('#total_b').html(),
"realty_pay": $('#total_c').html(),
'family_pay': $('#total_d').html(),
"private_bank": $('#total_e').html(),
"cash": $('#total_f').html(),
"pos": $('#total_g').html(),
"other_bank": $('#total_h').html(),
'remark':(bargain.operationStatus)*1?'审核通过':($.trim($('.remark-financial').val())),
"operation_status": bargain.operationStatus//0审核通过 1转为已审核
},
data: params,
dataType: 'json',
success: function(data) {
if(data.code == 200) {
......
public/resource/js/waitBackout.js
View file @ 18d9b91e
......@@ -59,6 +59,14 @@ define(['doT', 'text!temp/wait_backout_template_tpl.html', 'text!temp/reportList
_doc.on("click", ".timeline", function() {
bargain.Timeline();
});
//撤销成交报告 按钮 获取成交报告id
_doc.on("click", ".backNormal", function() {
bargain.bargain_id = $(this).attr("data-id");
});
//撤销成交报告 确定按钮
_doc.on("click", "#backToNormal", function() {
bargain.backToNormal();
});
//点击通过,修改全局bargain_id,弹出框出来
_doc.on('click', '[href=\"#modal-pass\"]', function() {
......@@ -342,6 +350,27 @@ define(['doT', 'text!temp/wait_backout_template_tpl.html', 'text!temp/reportList
}
});
},
//恢复正常
backToNormal: function() {
$.ajax({
url: '/index/recoveryBargain',
type: 'POST',
async: true,
data: {
'id': bargain.bargain_id,
},
dataType: 'json',
success: function(data) {
if(data.code == 200 && data.data != null) {
alert(data.msg);
bargain.getList(1);
}else{
alert(data.msg)
}
}
});
},
};
return bargain;
});
\ No newline at end of file
public/resource/template/financial_manager_daily_list_template_tpl.html
View file @ 18d9b91e
......@@ -155,14 +155,22 @@
[% if(it&&it.length) { %]
[% for(var item in it){ %]
<tr>
<td>[%= it[item]['alipay'] %]</td>
<td>[%= it[item]['tenpay'] %]</td>
<td>[%= it[item]['realty_pay'] %]</td>
<td>[%= it[item]['family_pay']%]</td>
<td>[%= it[item]['private_bank'] %]</td>
<td>[%= it[item]['cash'] %]</td>
<td>[%= it[item]['pos'] %]</td>
<td>[%= it[item]['other_bank'] %]</td>
<!--深圳-->
<td class="shenzhen">[%= it[item]['alipay'] %]</td>
<td class="shenzhen">[%= it[item]['tenpay'] %]</td>
<td class="shenzhen">[%= it[item]['bank_card'] %]</td>
<!--上海 杭州-->
<td class="shanghai">[%= it[item]['alipay'] %]</td>
<td class="shanghai">[%= it[item]['alipay_2'] %]</td>
<td class="shanghai">[%= it[item]['tenpay_2'] %]</td>
<td class="shanghai">[%= it[item]['tenpay'] %]</td>
<td class="shanghai">[%= it[item]['realty_pay'] %]</td>
<td class="shanghai">[%= it[item]['family_pay']%]</td>
<td class="shanghai">[%= it[item]['private_bank'] %]</td>
<td class="shanghai">[%= it[item]['cash'] %]</td>
<td class="shanghai">[%= it[item]['pos'] %]</td>
<td class="shanghai">[%= it[item]['other_bank'] %]</td>
<td>[%= it[item]['operation_name'] %]</td>
<td>[%= it[item]['update_time'] %]</td>
<td>[%= it[item]['remark'] %]</td>
......
public/resource/template/wait_backout_template_tpl.html
View file @ 18d9b91e
......@@ -22,6 +22,10 @@
[% } %]
[% } %]
<a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal">时间轴</a>
[% if(check_auth('index/recoveryBargain')){ %]
<a class="btn1 btn-success backNormal" href="#modal-backNormal" data-toggle="modal" data-id="[%= it['list'][item]['id'] %]">恢复正常</a>
[% } %]
</td>
</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