Skip to content

T
tl_estate
Commit b6627397 authored by xishifeng's avatar xishifeng
Browse files
Options

开票税费2

parent dfb5bb36
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 34 deletions
application/index/view/finance/account_statement.html
View file @ b6627397
...@@ -67,8 +67,8 @@ ...@@ -67,8 +67,8 @@
</div> </div>
</div> </div>
<!-- 弹出框 详情 --> <!-- 弹出框 详情 -->
<div class="modal fade" id="modal-edit" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="modal_detail" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-0522"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
...@@ -141,31 +141,66 @@ ...@@ -141,31 +141,66 @@
</div> </div>
</div> </div>
<div class="detail-modal-body-sec"> <div class="detail-modal-body-sec">
<!--分佣提成--> <div class="detail-modal-maid-top-btn-area oh">
<a class="btn btn-success edit_new" href="#modal-new" data-toggle="modal">新增</a> <a class="btn btn-success" href="#modal_new_maid" data-toggle="modal">新增</a>
<!--增加实收--> <a id="maid_new_btn" class="btn btn-success" href="javascript:;" data-toggle="modal">增加实收</a>
<a class="btn btn-success edit_new" href="#modal-new" data-toggle="modal">增加实收</a> </div>
<a class="btn btn-success edit_new" href="#modal-new" data-toggle="modal">确认分佣</a> <table class="table table-striped table-bordered table-hover table-condensed" id="maid_table_main">
<table class="table table-striped table-bordered table-hover table-condensed" id="caozuo_hide">
<thead> <thead>
<tr> <tr>
<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> <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>
<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="caozuo_table"> <tbody class="text-center">
<tr>
<td>盘方</td>
<td>刘丹丹-13918937741</td>
<td>同联一部南京东路店</td>
<td>30%</td>
<td>350000</td>
<td colspan="6" class="detail-modal-maid-mix-td oh">
<div class="oh">
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span></span>
</div>
<!--<div class="oh">
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span></span>
</div>-->
<!--<div class="oh">
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span contenteditable></span>
<span></span>
</div>-->
</td>
</tr>
</tbody>
</table> </table>
<div>
<a id="maid_ok_btn" class="btn btn-success" href="javascript:;" data-toggle="modal">确认分佣</a>
</div>
<!--分佣提成--> <!--分佣提成-->
</div> </div>
<div class="detail-modal-body-sec"> <div class="detail-modal-body-sec">
...@@ -245,7 +280,7 @@ ...@@ -245,7 +280,7 @@
<!-- /.modal --> <!-- /.modal -->
</div> </div>
<!-- 弹出框 分佣提成新增 --> <!-- 弹出框 分佣提成新增 -->
<div class="modal fade" id="modal-new" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="modal_new_maid" 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">
......
public/resource/css/public.css
View file @ b6627397
...@@ -214,6 +214,9 @@ a:hover{ ...@@ -214,6 +214,9 @@ a:hover{
} }
/*共用样式*/ /*共用样式*/
.oh{
overflow: hidden;
}
.tc{ .tc{
text-align: center; text-align: center;
} }
......
public/resource/css/report_list.css
View file @ b6627397
...@@ -106,7 +106,47 @@ addtax-modal- ...@@ -106,7 +106,47 @@ addtax-modal-
} }
/*详情弹出框,分佣提成*/ /*详情弹出框,分佣提成*/
.detail-modal-maid-top-btn-area{
padding: 0 10px 10px;
}
[href="#modal_new_maid"]{
float: left;
}
#maid_new_btn{
float: right;
}
#maid_table_main>thead th:nth-last-of-type(-n+6){
width: 91px;
}
#maid_table_main>thead th:nth-last-of-type(1){
width: 149px;
}
.detail-modal-maid-mix-td{
padding: 0!important;
}
.detail-modal-maid-mix-td>div{
width: 100%;
height: 100%;
}
.detail-modal-maid-mix-td>div>span{
float: left;
width: 91px;
height: 30px;
line-height: 30px;
border-right: 1px solid #ddd;
border-bottom: 1px solid #ddd;
}
.detail-modal-maid-mix-td>div:nth-last-of-type(1)>span{
border-bottom: none;
}
.detail-modal-maid-mix-td>div>span:nth-last-of-type(1){
width: 146px;
border-right: none;
}
/*详情弹出框,开票税费*/ /*详情弹出框,开票税费*/
.addtax-modal-tax-table{ .addtax-modal-tax-table{
...@@ -146,11 +186,6 @@ addtax-modal- ...@@ -146,11 +186,6 @@ addtax-modal-
} }
/********************/ /********************/
.edit_new {
float: right;
margin-bottom: 5px;
margin-top: -10px;
}
.form-control-one { .form-control-one {
display: inline-block; display: inline-block;
...@@ -192,8 +227,9 @@ addtax-modal- ...@@ -192,8 +227,9 @@ addtax-modal-
.modal-dialog-0522 { #modal_detail>div {
width: 1030px; /*width: 1030px;*/
width: 1250px;
} }
/*成交信息tab*/ /*成交信息tab*/
......
public/resource/js/reportList.js
View file @ b6627397
...@@ -373,20 +373,24 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s ...@@ -373,20 +373,24 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
newAddTax: function(obj) { newAddTax: function(obj) {
var _tempTableObj = $('.addtax-modal-tax-table'); var _tempTableObj = $('.addtax-modal-tax-table');
_tempTableObj.attr('data-type',obj['type']); _tempTableObj.attr('data-type',obj['type']);
var _url = '';
var _data = {};
$('#addtax_commission_input').val('');//开票金额置空
$('#addtax_date').val('');//开票日期置空
if(obj['type'] === 'new'){ if(obj['type'] === 'new'){
$('.addtax_commission_input').val(''); $('#modal_new_tax .modal-title').html('新增开票');
$('.addtax_date').val(''); _url = '/index/searchBargainAgents';
_data['bargain_id'] = bargain.bargain_id;
}else{ }else{
$('.addtax_commission_input').val(''); $('#modal_new_tax .modal-title').html('编辑开票');
$('.addtax_date').val('');
_tempTableObj.attr('data-recordid',obj['id']); _tempTableObj.attr('data-recordid',obj['id']);
_url = '/index/getTaxesById';
_data['taxes_id'] = obj['id'];
}; };
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: '/index/searchBargainAgents', url: _url,
data: { data: _data,
'bargain_id': bargain.bargain_id
},
timeout: 30000, timeout: 30000,
dataType: 'json', dataType: 'json',
beforeSend: function() {}, beforeSend: function() {},
...@@ -394,12 +398,15 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s ...@@ -394,12 +398,15 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
if(typeof _data === 'object') { if(typeof _data === 'object') {
if(_data['code'] == '200') { if(_data['code'] == '200') {
if(_data['data'] && _data['data'].length && _data['data'].length>0){ if(_data['data'] && _data['data'].length && _data['data'].length>0){
$('#addtax_commission_input').val(_data['data'][0]['total_fee']);
$('#addtax_date').val(_data['data'][0]['operation_date']);
var _htmlTemp = '<tr><td>分佣方</td><td>业务员</td><td>分佣比例</td><td>税费</td></tr>'; var _htmlTemp = '<tr><td>分佣方</td><td>业务员</td><td>分佣比例</td><td>税费</td></tr>';
$.each(_data['data'], function(i, v) { $.each(_data['data'], function(i, v) {
_htmlTemp += '<tr class="addtax-modal-tax-table-datatr" data-id="{id}" data-role="{role}"><td>{0}</td><td>{1}</td><td>{2}%</td><td contenteditable></td></tr>'.stringFormatObj({ _htmlTemp += '<tr class="addtax-modal-tax-table-datatr" data-id="{id}" data-role="{role}"><td>{0}</td><td>{1}</td><td>{2}%</td><td contenteditable>{3}</td></tr>'.stringFormatObj({
'0': v.role_name, '0': v.role_name,
'1': v.name+'-'+v.phone, '1': v.name+'-'+v.phone,
'2': v.scale, '2': v.scale,
'3': (obj['type'] === 'new')?'':v.fee,
'role': v.role, 'role': v.role,
'id': v.id 'id': v.id
}); });
......
public/resource/template/reportList_template_tpl.html
View file @ b6627397
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<td>[%= it["list"][item]['practical_fee'] %]</td> <td>[%= it["list"][item]['practical_fee'] %]</td>
<td> <td>
[% if(check_auth('index/bargainInfo')) { %] [% if(check_auth('index/bargainInfo')) { %]
<a class="btn1 btn-success details-btn" href="#modal-edit" data-toggle="modal">详情</a> <a class="btn1 btn-success details-btn" href="#modal_detail" data-toggle="modal">详情</a>
[% } %] [% } %]
[% if(it["step"]<3) { %] [% if(it["step"]<3) { %]
[% if(check_auth('index/checkReportAttache/0')||check_auth('index/checkReportManager/1')||check_auth('index/checkReportMajordomo/2')||check_auth('index/checkReportCashier/3')) { %] [% if(check_auth('index/checkReportAttache/0')||check_auth('index/checkReportManager/1')||check_auth('index/checkReportMajordomo/2')||check_auth('index/checkReportCashier/3')) { %]
......
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