Skip to content

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

修改 后台

parent 20668ca7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 44 deletions
application/index/view/finance/daily_details.html
View file @ 18d9b91e
...@@ -415,44 +415,70 @@ ...@@ -415,44 +415,70 @@
<table class="table table-striped table-bordered table-hover table-condensed"> <table class="table table-striped table-bordered table-hover table-condensed">
<thead> <thead>
<tr class="maintable-tr-bar"> <tr class="maintable-tr-bar">
<th class="text-center">支付宝转账</th> <!--深圳-->
<th class="text-center">微信转账</th> <th class="text-center shenzhen">筠姐支付宝</th>
<th class="text-center">地产转账</th> <th class="text-center shenzhen">筠姐微信</th>
<th class="text-center">世家公账</th> <th class="text-center shenzhen">银满谷银行卡</th>
<th class="text-center">3000账号</th> <!--上海 杭州 店长 commit-->
<th class="text-center">现金</th> <th class="text-center shanghai">施总支付宝</th>
<th class="text-center">POS机</th> <th class="text-center shanghai">林老师支付宝</th>
<th class="text-center">其他</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> <th class="text-center">提交时间</th>
</tr> </tr>
</thead> </thead>
<tbody class="text-center" id=""> <tbody class="text-center" id="">
<tr> <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> <span id="pay_a"></span>
</td> </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> <span id="pay_b"></span>
</td> </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> <span id="pay_c"></span>
</td> </td>
<td class="text-center"> <td class="text-center shanghai">
<span id="pay_d"></span> <span id="pay_d"></span>
</td> </td>
<td class="text-center"> <td class="text-center shanghai">
<span id="pay_e"></span> <span id="pay_e"></span>
</td> </td>
<td class="text-center"> <td class="text-center shanghai">
<span id="pay_f"></span> <span id="pay_f"></span>
</td> </td>
<td class="text-center"> <td class="text-center shanghai">
<span id="pay_g"></span> <span id="pay_g"></span>
</td> </td>
<td class="text-center"> <td class="text-center shanghai">
<span id="pay_h"></span> <span id="pay_h"></span>
</td> </td>
<td class="text-center"> <td class="text-center">
<span id="pay_i"></span> <span id="pay_i"></span>
</td> </td>
...@@ -472,14 +498,21 @@ ...@@ -472,14 +498,21 @@
<table class="table table-striped table-bordered table-hover table-condensed"> <table class="table table-striped table-bordered table-hover table-condensed">
<thead> <thead>
<tr class="maintable-tr-bar"> <tr class="maintable-tr-bar">
<th class="text-center">支付宝转账</th> <!--深圳-->
<th class="text-center">微信转账</th> <th class="text-center shenzhen">筠姐支付宝</th>
<th class="text-center">地产转账</th> <th class="text-center shenzhen">筠姐微信</th>
<th class="text-center">世家公账</th> <th class="text-center shenzhen">银满谷银行卡</th>
<th class="text-center">3000账号</th> <!--上海 杭州 total 财务-->
<th class="text-center">现金</th> <th class="text-center shanghai">施总支付宝</th>
<th class="text-center">POS机</th> <th class="text-center shanghai">林老师支付宝</th>
<th class="text-center">其他</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> <th class="text-center">审核时间</th>
<th class="text-center">备注</th> <th class="text-center">备注</th>
...@@ -491,38 +524,54 @@ ...@@ -491,38 +524,54 @@
</tbody> </tbody>
<tfoot class="text-center" id="maintable_list_total"> <tfoot class="text-center" id="maintable_list_total">
<tr> <tr>
<td class="text-center"> <td class="text-center shenzhen">
<span id="total_a">555</span> <span id="total_yun_zhihubao"></span>
</td> </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> <span id="total_b"></span>
</td> </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> <span id="total_c"></span>
</td> </td>
<td class="text-center"> <td class="text-center shanghai">
<span id="total_d"></span> <span id="total_d"></span>
</td> </td>
<td class="text-center"> <td class="text-center shanghai">
<span id="total_e"></span> <span id="total_e"></span>
</td> </td>
<td class="text-center"> <td class="text-center shanghai">
<span id="total_f"></span> <span id="total_f"></span>
</td> </td>
<td class="text-center"> <td class="text-center shanghai">
<span id="total_g"></span> <span id="total_g"></span>
</td> </td>
<td class="text-center"> <td class="text-center shanghai">
<span id="total_h"></span> <span id="total_h"></span>
</td> </td>
<td class="text-center"> <td class="text-center">
<span id="total_f"></span> <span id="total_i"></span>
</td> </td>
<td class="text-center"> <td class="text-center">
<span id="total_g"></span> <span id="total_j"></span>
</td> </td>
<td class="text-center"> <td class="text-center">
<span id="total_h"></span> <span id="total_k"></span>
</td> </td>
</tr> </tr>
......
application/index/view/finance/wait_back_out.html
View file @ 18d9b91e
...@@ -185,4 +185,27 @@ ...@@ -185,4 +185,27 @@
</div><!-- /.modal-content --> </div><!-- /.modal-content -->
</div><!-- /.modal --> </div><!-- /.modal -->
</div> </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/waitBackout.js
View file @ 18d9b91e
...@@ -59,6 +59,14 @@ define(['doT', 'text!temp/wait_backout_template_tpl.html', 'text!temp/reportList ...@@ -59,6 +59,14 @@ define(['doT', 'text!temp/wait_backout_template_tpl.html', 'text!temp/reportList
_doc.on("click", ".timeline", function() { _doc.on("click", ".timeline", function() {
bargain.Timeline(); bargain.Timeline();
}); });
//撤销成交报告 按钮 获取成交报告id
_doc.on("click", ".backNormal", function() {
bargain.bargain_id = $(this).attr("data-id");
});
//撤销成交报告 确定按钮
_doc.on("click", "#backToNormal", function() {
bargain.backToNormal();
});
//点击通过,修改全局bargain_id,弹出框出来 //点击通过,修改全局bargain_id,弹出框出来
_doc.on('click', '[href=\"#modal-pass\"]', function() { _doc.on('click', '[href=\"#modal-pass\"]', function() {
...@@ -342,6 +350,27 @@ define(['doT', 'text!temp/wait_backout_template_tpl.html', 'text!temp/reportList ...@@ -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; 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 @@ ...@@ -155,14 +155,22 @@
[% if(it&&it.length) { %] [% if(it&&it.length) { %]
[% for(var item in it){ %] [% for(var item in it){ %]
<tr> <tr>
<td>[%= it[item]['alipay'] %]</td> <!--深圳-->
<td>[%= it[item]['tenpay'] %]</td> <td class="shenzhen">[%= it[item]['alipay'] %]</td>
<td>[%= it[item]['realty_pay'] %]</td> <td class="shenzhen">[%= it[item]['tenpay'] %]</td>
<td>[%= it[item]['family_pay']%]</td> <td class="shenzhen">[%= it[item]['bank_card'] %]</td>
<td>[%= it[item]['private_bank'] %]</td> <!--上海 杭州-->
<td>[%= it[item]['cash'] %]</td> <td class="shanghai">[%= it[item]['alipay'] %]</td>
<td>[%= it[item]['pos'] %]</td> <td class="shanghai">[%= it[item]['alipay_2'] %]</td>
<td>[%= it[item]['other_bank'] %]</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]['operation_name'] %]</td>
<td>[%= it[item]['update_time'] %]</td> <td>[%= it[item]['update_time'] %]</td>
<td>[%= it[item]['remark'] %]</td> <td>[%= it[item]['remark'] %]</td>
......
public/resource/template/wait_backout_template_tpl.html
View file @ 18d9b91e
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
[% } %] [% } %]
[% } %] [% } %]
<a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal">时间轴</a> <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> </td>
</tr> </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