Skip to content

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

财务日报 修改

parent eb75795d
Show whitespace changes
Inline Side-by-side
Showing with 307 additions and 15 deletions
application/index/view/finance/daily_details.html
View file @ 8c2c5bb8
......@@ -423,7 +423,11 @@
<th class="text-center shenzhen">筠姐支付宝</th>
<th class="text-center shenzhen">筠姐微信</th>
<th class="text-center shenzhen">银满谷银行卡</th>
<!--上海 杭州 店长 commit-->
<th class="text-center shenzhen">筠姐上海银行卡</th>
<th class="text-center shenzhen">POS机</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>
......@@ -434,6 +438,23 @@
<th class="text-center shanghai">现金</th>
<th class="text-center shanghai">POS机</th>
<th class="text-center shanghai">其他</th>
<th class="text-center shanghai">银满谷银行卡</th>
<th class="text-center shanghai">新同联福居银行卡</th>
<!--杭州 店长 commit-->
<th class="text-center hangzhou">施总支付宝</th>
<th class="text-center hangzhou">林老师支付宝</th>
<th class="text-center hangzhou">施总微信</th>
<th class="text-center hangzhou">林老师微信</th>
<th class="text-center hangzhou">地产转账</th>
<th class="text-center hangzhou">世家公账</th>
<th class="text-center hangzhou">3000账号</th>
<th class="text-center hangzhou">现金</th>
<th class="text-center hangzhou">POS机</th>
<th class="text-center hangzhou">其他</th>
<th class="text-center hangzhou">银满谷银行卡</th>
<th class="text-center hangzhou">林老师建行卡</th>
<th class="text-center">提交人</th>
<th class="text-center">提交时间</th>
......@@ -451,7 +472,17 @@
<td class="text-center shenzhen">
<span id="pay_yun_card"></span>
</td>
<!--上海 杭州 店长 commit-->
<td class="text-center shenzhen">
<span id="pay_yun_bank"></span>
</td>
<td class="text-center shenzhen">
<span id="pay_yun_pos"></span>
</td>
<td class="text-center shenzhen">
<span id="pay_yun_family"></span>
</td>
<!--上海 店长 commit-->
<td class="text-center shanghai">
<span id="pay_a"></span>
</td>
......@@ -482,6 +513,52 @@
<td class="text-center shanghai">
<span id="pay_h"></span>
</td>
<td class="text-center shanghai">
<span id="pay_k"></span>
</td>
<td class="text-center shanghai">
<span id="pay_m"></span>
</td>
<!--杭州 店长 commit-->
<td class="text-center hangzhou">
<span id="pay_a_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="pay_a1_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="pay_b_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="pay_b1_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="pay_c_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="pay_d_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="pay_e_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="pay_f_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="pay_g_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="pay_h_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="pay_k_hangzhou"></span>
</td>
<td class="text-center shanghai">
<span id="pay_m_hangzhou"></span>
</td>
<td class="text-center">
<span id="pay_i"></span>
......@@ -506,6 +583,9 @@
<th class="text-center shenzhen">筠姐支付宝</th>
<th class="text-center shenzhen">筠姐微信</th>
<th class="text-center shenzhen">银满谷银行卡</th>
<th class="text-center shenzhen">筠姐上海银行卡</th>
<th class="text-center shenzhen">POS机</th>
<th class="text-center shenzhen">世家公账</th>
<!--上海 杭州 total 财务-->
<th class="text-center shanghai">施总支付宝</th>
<th class="text-center shanghai">林老师支付宝</th>
......@@ -517,6 +597,22 @@
<th class="text-center shanghai">现金</th>
<th class="text-center shanghai">POS机</th>
<th class="text-center shanghai">其他</th>
<th class="text-center shanghai">银满谷银行卡</th>
<th class="text-center shanghai">新同联福居银行卡</th>
<!--杭州 total 财务-->
<th class="text-center hangzhou">施总支付宝</th>
<th class="text-center hangzhou">林老师支付宝</th>
<th class="text-center hangzhou">施总微信</th>
<th class="text-center hangzhou">林老师微信</th>
<th class="text-center hangzhou">地产转账</th>
<th class="text-center hangzhou">世家公账</th>
<th class="text-center hangzhou">3000账号</th>
<th class="text-center hangzhou">现金</th>
<th class="text-center hangzhou">POS机</th>
<th class="text-center hangzhou">其他</th>
<th class="text-center hangzhou">银满谷银行卡</th>
<th class="text-center hangzhou">林老师建行卡</th>
<th class="text-center">审核人</th>
<th class="text-center">审核时间</th>
<th class="text-center">备注</th>
......@@ -528,6 +624,7 @@
</tbody>
<tfoot class="text-center" id="maintable_list_total">
<tr>
<!--深圳-->
<td class="text-center shenzhen">
<span id="total_yun_zhihubao"></span>
</td>
......@@ -537,7 +634,18 @@
<td class="text-center shenzhen">
<span id="total_yun_card"></span>
</td>
<td class="text-center shenzhen">
<span id="total_yun_bank"></span>
</td>
<td class="text-center shenzhen">
<span id="total_yun_pos"></span>
</td>
<td class="text-center shenzhen">
<span id="total_yun_family"></span>
</td>
<!--上海-->
<td class="text-center shanghai">
<span id="total_a"></span>
</td>
......@@ -568,6 +676,52 @@
<td class="text-center shanghai">
<span id="total_h"></span>
</td>
<td class="text-center shanghai">
<span id="total_m"></span>
</td>
<td class="text-center shanghai">
<span id="total_n"></span>
</td>
<!--杭州-->
<td class="text-center hangzhou">
<span id="total_a_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="total_a1_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="total_b_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="total_b1_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="total_c_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="total_d_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="total_e_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="total_f_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="total_g_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="total_h_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="total_m_hangzhou"></span>
</td>
<td class="text-center hangzhou">
<span id="total_n_hangzhou"></span>
</td>
<td class="text-center">
<span id="total_i"></span>
</td>
......
public/resource/js/financial_manager_daily_list.js
View file @ 8c2c5bb8
......@@ -380,15 +380,46 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
//总计commit_info
bargain.daily_id = data.data.commit_info.id;
//深圳 和 杭州上海
if(bargain.caiwu_site_id == 10003){
if(bargain.caiwu_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);
$('#pay_yun_bank').html(data.data.commit_info.bank_card_yun);
$('#pay_yun_pos').html(data.data.commit_info.pos);
$('#pay_yun_family').html(data.data.commit_info.family_pay);
$('.shenzhen').show();
$('.shanghai').hide();
}else{
$('.hangzhou').hide();
// "bank_card_yun" => "2323",
// "bank_card_lin"=>"1213",
// "bank_card_new"=>"123123"
}else if(bargain.caiwu_site_id == 10002){ //杭州
$('.shenzhen').hide();
$('.shanghai').hide();
$('.hangzhou').show();
$('#pay_a_hangzhou').html(data.data.commit_info.alipay);
$('#pay_a1_hangzhou').html(data.data.commit_info.alipay_2);
$('#pay_b_hangzhou').html(data.data.commit_info.tenpay);
$('#pay_b1_hangzhou').html(data.data.commit_info.tenpay_2);
$('#pay_c_hangzhou').html(data.data.commit_info.realty_pay);
$('#pay_d_hangzhou').html(data.data.commit_info.family_pay);
$('#pay_e_hangzhou').html(data.data.commit_info.private_bank);
$('#pay_f_hangzhou').html(data.data.commit_info.cash);
$('#pay_g_hangzhou').html(data.data.commit_info.pos);
$('#pay_h_hangzhou').html(data.data.commit_info.other_bank);
$('#pay_g_hangzhou').html(data.data.commit_info.pos);
$('#pay_h_hangzhou').html(data.data.commit_info.other_bank);
$('#pay_k_hangzhou').html(data.data.commit_info.bank_card);
$('#pay_m_hangzhou').html(data.data.commit_info.bank_card_lin);
}else{//上海
$('.shenzhen').hide();
$('.shanghai').show();
$('.hangzhou').hide();
$('#pay_a').html(data.data.commit_info.alipay);
$('#pay_a1').html(data.data.commit_info.alipay_2);
$('#pay_b').html(data.data.commit_info.tenpay);
......@@ -399,6 +430,8 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
$('#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_k').html(data.data.commit_info.bank_card);
$('#pay_m').html(data.data.commit_info.bank_card_new);
}
$('#pay_i').html(data.data.commit_info.agent_name);
......@@ -422,15 +455,37 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
$('.audit-records').hide();
$('.tips-dian').html('');
//未提交 店长
if(bargain.caiwu_site_id == 10003){
if(bargain.caiwu_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);
$('#pay_yun_bank').html(data.data.total_info.bank_card_yun);
$('#pay_yun_pos').html(data.data.total_info.pos);
$('#pay_yun_family').html(data.data.total_info.family_pay);
$('.shenzhen').show();
$('.shanghai').hide();
}else{
$('.hangzhou').hide();
}else if(bargain.caiwu_site_id == 10002){//杭州
$('.shenzhen').hide();
$('.shanghai').hide();
$('.hangzhou').show();
$('#pay_a').html(data.data.total_info.alipay);
$('#pay_a1').html(data.data.total_info.alipay_2);
$('#pay_b').html(data.data.total_info.tenpay);
$('#pay_b1').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_k').html(data.data.total_info.bank_card);
$('#pay_m').html(data.data.total_info.bank_card_lin);
}else{//上海
$('.shenzhen').hide();
$('.shanghai').show();
$('.hangzhou').hide();
$('#pay_a').html(data.data.total_info.alipay);
$('#pay_a1').html(data.data.total_info.alipay_2);
$('#pay_b').html(data.data.total_info.tenpay);
......@@ -441,6 +496,8 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
$('#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_k').html(data.data.total_info.bank_card);
$('#pay_m').html(data.data.total_info.bank_card_new);
}
$('#pay_i').html('');
......@@ -492,16 +549,37 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
$('#maintable_list_total').show();
}
//杭州 上海
if(bargain.caiwu_site_id == 10003){
//杭州 上海 深圳
if(bargain.caiwu_site_id == 10003){//深圳
$('.shenzhen').show();
$('.shanghai').hide();
$('.hangzhou').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{
$('#total_yun_bank').html(data.data.total_info.bank_card_yun);
$('#total_yun_pos').html(data.data.total_info.pos);
$('#total_yun_family').html(data.data.total_info.family_pay);
}else if(bargain.caiwu_site_id == 10002){//杭州
$('.shenzhen').hide();
$('.shanghai').hide();
$('.hangzhou').show();
$('#total_a_hangzhou').html(data.data.total_info.alipay);
$('#total_a1_hangzhou').html(data.data.total_info.alipay_2);
$('#total_b1_hangzhou').html(data.data.total_info.tenpay_2);
$('#total_b_hangzhou').html(data.data.total_info.tenpay);
$('#total_c_hangzhou').html(data.data.total_info.realty_pay);
$('#total_d_hangzhou').html(data.data.total_info.family_pay);
$('#total_e_hangzhou').html(data.data.total_info.private_bank);
$('#total_f_hangzhou').html(data.data.total_info.cash);
$('#total_g_hangzhou').html(data.data.total_info.pos);
$('#total_h_hangzhou').html(data.data.total_info.other_bank);
$('#total_m_hangzhou').html(data.data.total_info.bank_card);
$('#total_n_hangzhou').html(data.data.total_info.bank_card_lin);
}else{//上海
$('.shenzhen').hide();
$('.shanghai').show();
$('.hangzhou').hide();
$('#total_a').html(data.data.total_info.alipay);
$('#total_a1').html(data.data.total_info.alipay_2);
$('#total_b1').html(data.data.total_info.tenpay_2);
......@@ -512,6 +590,8 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
$('#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_m').html(data.data.total_info.bank_card);
$('#total_n').html(data.data.total_info.bank_card_new);
}
$('#total_i').html('');
......@@ -590,12 +670,29 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
params.agent_name=user_info_obj.name;
// 判断 深圳 杭州
if(bargain.caiwu_site_id == 10003){
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();
params.bank_card_yun=$('#pay_yun_bank').html();
params.pos=$('#pay_yun_pos').html();
params.family_pay=$('#pay_yun_family').html();
}else{
}else if(bargain.caiwu_site_id == 10002){//杭州
params.alipay=$('#pay_a_hangzhou').html();
params.alipay_2=$('#pay_a1_hangzhou').html();
params.tenpay=$('#pay_b_hangzhou').html();
params.tenpay_2=$('#pay_b1_hangzhou').html();
params.realty_pay=$('#pay_c_hangzhou').html();
params.family_pay=$('#pay_d_hangzhou').html();
params.private_bank=$('#pay_e_hangzhou').html();
params.cash=$('#pay_f_hangzhou').html();
params.pos=$('#pay_g_hangzhou').html();
params.other_bank=$('#pay_h_hangzhou').html();
params.bank_card=$('#pay_k_hangzhou').html();
params.bank_card_lin=$('#pay_m_hangzhou').html();
}else{//上海
params.alipay=$('#pay_a').html();
params.alipay_2=$('#pay_a1').html();
params.tenpay=$('#pay_b').html();
......@@ -606,7 +703,8 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
params.cash=$('#pay_f').html();
params.pos=$('#pay_g').html();
params.other_bank=$('#pay_h').html();
params.bank_card=$('#pay_k').html();
params.bank_card_new=$('#pay_m').html();
};
$.ajax({
url: '/index/addDaily',
......@@ -659,12 +757,15 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
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){
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();
params.bank_card_yun=$('#total_yun_bank').html();
params.pos=$('#total_yun_pos').html();
params.family_pay=$('#total_yun_family').html();
}else{
}else if(bargain.caiwu_site_id == 10002){//杭州
params.alipay=$('#total_a').html();
params.alipay_2=$('#total_a1').html();
params.tenpay=$('#total_b').html();
......@@ -675,7 +776,22 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
params.cash=$('#total_f').html();
params.pos=$('#total_g').html();
params.other_bank=$('#total_h').html();
params.bank_card=$('#total_m').html();
params.bank_card_lin=$('#total_n').html();
}else{//上海
params.alipay=$('#total_a').html();
params.alipay_2=$('#total_a1').html();
params.tenpay=$('#total_b').html();
params.tenpay_2=$('#total_b1').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();
params.bank_card=$('#total_m').html();
params.bank_card_new=$('#total_n').html();
};
$.ajax({
url: '/index/commitCheck',
......
public/resource/template/financial_manager_daily_list_template_tpl.html
View file @ 8c2c5bb8
......@@ -176,7 +176,11 @@
<td class="shenzhen">[%= it[item]['alipay'] %]</td>
<td class="shenzhen">[%= it[item]['tenpay'] %]</td>
<td class="shenzhen">[%= it[item]['bank_card'] %]</td>
<!--上海 杭州-->
<td class="shenzhen">[%= it[item]['bank_card_yun'] %]</td>
<td class="shenzhen">[%= it[item]['pos'] %]</td>
<td class="shenzhen">[%= it[item]['family_pay'] %]</td>
<!--上海-->
<td class="shanghai">[%= it[item]['alipay'] %]</td>
<td class="shanghai">[%= it[item]['alipay_2'] %]</td>
<td class="shanghai">[%= it[item]['tenpay'] %]</td>
......@@ -187,6 +191,24 @@
<td class="shanghai">[%= it[item]['cash'] %]</td>
<td class="shanghai">[%= it[item]['pos'] %]</td>
<td class="shanghai">[%= it[item]['other_bank'] %]</td>
<td class="shanghai">[%= it[item]['bank_card'] %]</td>
<td class="shanghai">[%= it[item]['bank_card_new'] %]</td>
<!--杭州-->
<td class="hangzhou">[%= it[item]['alipay'] %]</td>
<td class="hangzhou">[%= it[item]['alipay_2'] %]</td>
<td class="hangzhou">[%= it[item]['tenpay'] %]</td>
<td class="hangzhou">[%= it[item]['tenpay_2'] %]</td>
<td class="hangzhou">[%= it[item]['realty_pay'] %]</td>
<td class="hangzhou">[%= it[item]['family_pay']%]</td>
<td class="hangzhou">[%= it[item]['private_bank'] %]</td>
<td class="hangzhou">[%= it[item]['cash'] %]</td>
<td class="hangzhou">[%= it[item]['pos'] %]</td>
<td class="hangzhou">[%= it[item]['other_bank'] %]</td>
<td class="hangzhou">[%= it[item]['bank_card'] %]</td>
<td class="hangzhou">[%= it[item]['bank_card_lin'] %]</td>
<td>[%= it[item]['operation_name'] %]</td>
<td>[%= it[item]['update_time'] %]</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