Skip to content

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

财务日报修改

parent 27d74e8a
Show whitespace changes
Inline Side-by-side
Showing with 61 additions and 1 deletion
application/index/view/finance/daily_details.html
View file @ 5b063230
...@@ -514,6 +514,8 @@ ...@@ -514,6 +514,8 @@
<th class="text-center shenzhen">POS机</th> <th class="text-center shenzhen">POS机</th>
<th class="text-center shenzhen">世家公账</th> <th class="text-center shenzhen">世家公账</th>
<!--上海 店长 commit--> <!--上海 店长 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>
...@@ -530,6 +532,7 @@ ...@@ -530,6 +532,7 @@
<th class="text-center shanghai">林老师建行卡</th> <th class="text-center shanghai">林老师建行卡</th>
<!--杭州 店长 commit--> <!--杭州 店长 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>
...@@ -545,6 +548,9 @@ ...@@ -545,6 +548,9 @@
<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>
<th class="text-center">提交人</th> <th class="text-center">提交人</th>
<th class="text-center">提交时间</th> <th class="text-center">提交时间</th>
</tr> </tr>
...@@ -650,6 +656,15 @@ ...@@ -650,6 +656,15 @@
<span id="pay_m_hangzhou"></span> <span id="pay_m_hangzhou"></span>
</td> </td>
<!--陈志杰-->
<td class="text-center">
<span id="pay_i_chen"></span>
</td>
<td class="text-center">
<span id="pay_j_chen"></span>
</td><td class="text-center">
<span id="pay_k_chen"></span>
</td>
<td class="text-center"> <td class="text-center">
...@@ -707,6 +722,10 @@ ...@@ -707,6 +722,10 @@
<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">陈志杰支付宝</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>
...@@ -818,6 +837,15 @@ ...@@ -818,6 +837,15 @@
<span id="total_n_hangzhou"></span> <span id="total_n_hangzhou"></span>
</td> </td>
<!--陈志杰-->
<td class="text-center">
<span id="total_i_chen"></span>
</td>
<td class="text-center">
<span id="total_j_chen"></span>
</td><td class="text-center">
<span id="total_k_chen"></span>
</td>
<td class="text-center"> <td class="text-center">
<span id="total_i"></span> <span id="total_i"></span>
......
public/resource/js/financial_manager_daily_list.js
View file @ 5b063230
...@@ -965,6 +965,12 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl ...@@ -965,6 +965,12 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
$('#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.create_time); $('#pay_j').html(data.data.commit_info.create_time);
//陈志杰
$('#pay_i_chen').html(data.data.commit_info.alipay_3);
$('#pay_j_chen').html(data.data.commit_info.tenpay_3);
$('#pay_k_chen').html(data.data.commit_info.bank_card_chen);
$('.audit-records').show(); $('.audit-records').show();
if(data.data.check_list&&data.data.check_list.length){ if(data.data.check_list&&data.data.check_list.length){
$('#maintable_list_f').show(); $('#maintable_list_f').show();
...@@ -1031,7 +1037,10 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl ...@@ -1031,7 +1037,10 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
$('#pay_m').html(data.data.total_info.bank_card_new); $('#pay_m').html(data.data.total_info.bank_card_new);
$('#pay_lin').html(data.data.total_info.bank_card_lin); $('#pay_lin').html(data.data.total_info.bank_card_lin);
} }
//陈志杰
$('#pay_i_chen').html(data.data.total_info.alipay_3);
$('#pay_j_chen').html(data.data.total_info.tenpay_3);
$('#pay_k_chen').html(data.data.total_info.bank_card_chen);
$('#pay_i').html(''); $('#pay_i').html('');
$('#pay_j').html(''); $('#pay_j').html('');
//店长财务日报 未提交 显示删除按钮 编辑按钮 //店长财务日报 未提交 显示删除按钮 编辑按钮
...@@ -1129,6 +1138,10 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl ...@@ -1129,6 +1138,10 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
} }
//陈志杰
$('#total_i_chen').html(data.data.total_info.alipay_3);
$('#total_j_chen').html(data.data.total_info.tenpay_3);
$('#total_k_chen').html(data.data.total_info.bank_card_chen);
$('#total_i').html(''); $('#total_i').html('');
$('#total_j').html(''); $('#total_j').html('');
$('#total_k').html(''); $('#total_k').html('');
...@@ -1281,6 +1294,10 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl ...@@ -1281,6 +1294,10 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
params.bank_card_lin=$('#pay_lin').html(); params.bank_card_lin=$('#pay_lin').html();
}; };
params.alipay_3=$('#pay_i_chen').html();
params.tenpay_3=$('#pay_j_chen').html();
params.bank_card_chen=$('#pay_k_chen').html();
//验证店长 提交日报时间 小于当前时间 //验证店长 提交日报时间 小于当前时间
var myDate = new Date(); var myDate = new Date();
var y = myDate.getFullYear(); var y = myDate.getFullYear();
...@@ -1396,6 +1413,9 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl ...@@ -1396,6 +1413,9 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
params.bank_card_lin=$('#total_lin').html(); params.bank_card_lin=$('#total_lin').html();
}; };
params.alipay_3=$('#total_i_chen').html();
params.tenpay_3=$('#total_j_chen').html();
params.bank_card_chen=$('#total_k_chen').html();
$.ajax({ $.ajax({
url: '/index/commitCheck', url: '/index/commitCheck',
type: 'GET', type: 'GET',
......
public/resource/template/financial_manager_daily_list_template_tpl.html
View file @ 5b063230
...@@ -213,6 +213,8 @@ ...@@ -213,6 +213,8 @@
[% if(it&&it.length) { %] [% if(it&&it.length) { %]
[% for(var item in it){ %] [% for(var item in it){ %]
<tr> <tr>
<!--深圳--> <!--深圳-->
<td class="shenzhen">[%= it[item]['alipay'] %]</td> <td class="shenzhen">[%= it[item]['alipay'] %]</td>
<td class="shenzhen">[%= it[item]['tenpay'] %]</td> <td class="shenzhen">[%= it[item]['tenpay'] %]</td>
...@@ -220,6 +222,10 @@ ...@@ -220,6 +222,10 @@
<td class="shenzhen">[%= it[item]['bank_card_yun'] %]</td> <td class="shenzhen">[%= it[item]['bank_card_yun'] %]</td>
<td class="shenzhen">[%= it[item]['pos'] %]</td> <td class="shenzhen">[%= it[item]['pos'] %]</td>
<td class="shenzhen">[%= it[item]['family_pay'] %]</td> <td class="shenzhen">[%= it[item]['family_pay'] %]</td>
<td class="shenzhen">[%= it[item]['alipay_3'] %]</td>
<td class="shenzhen">[%= it[item]['tenpay_3'] %]</td>
<td class="shenzhen">[%= it[item]['bank_card_chen'] %]</td>
<!--上海--> <!--上海-->
<td class="shanghai">[%= it[item]['alipay'] %]</td> <td class="shanghai">[%= it[item]['alipay'] %]</td>
...@@ -234,6 +240,9 @@ ...@@ -234,6 +240,9 @@
<td class="shanghai">[%= it[item]['other_bank'] %]</td> <td class="shanghai">[%= it[item]['other_bank'] %]</td>
<td class="shanghai">[%= it[item]['bank_card'] %]</td> <td class="shanghai">[%= it[item]['bank_card'] %]</td>
<td class="shanghai">[%= it[item]['bank_card_new'] %]</td> <td class="shanghai">[%= it[item]['bank_card_new'] %]</td>
<td class="shanghai">[%= it[item]['alipay_3'] %]</td>
<td class="shanghai">[%= it[item]['tenpay_3'] %]</td>
<td class="shanghai">[%= it[item]['bank_card_chen'] %]</td>
<!--杭州--> <!--杭州-->
<td class="hangzhou">[%= it[item]['alipay'] %]</td> <td class="hangzhou">[%= it[item]['alipay'] %]</td>
...@@ -248,6 +257,9 @@ ...@@ -248,6 +257,9 @@
<td class="hangzhou">[%= it[item]['other_bank'] %]</td> <td class="hangzhou">[%= it[item]['other_bank'] %]</td>
<td class="hangzhou">[%= it[item]['bank_card'] %]</td> <td class="hangzhou">[%= it[item]['bank_card'] %]</td>
<td class="hangzhou">[%= it[item]['bank_card_lin'] %]</td> <td class="hangzhou">[%= it[item]['bank_card_lin'] %]</td>
<td class="hangzhou">[%= it[item]['alipay_3'] %]</td>
<td class="hangzhou">[%= it[item]['tenpay_3'] %]</td>
<td class="hangzhou">[%= it[item]['bank_card_chen'] %]</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