Skip to content

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

财务修改

parent 3834d08c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 63 additions and 18 deletions
application/index/view/finance/commission.html
View file @ a3198cfc
......@@ -131,19 +131,19 @@
<span>商铺地址：</span><span id="bargaininfo_internal_address"></span><br>
<span>客户姓名：</span><span id="bargaininfo_user_name"></span><br>
<span>成交类型：</span>
<select class="form-control" id="bargaininfo_type">
<select class="form-control" id="bargaininfo_type" disabled="disabled">
<option value="10">出租</option>
<option value="20">增佣</option>
<option value="30">代理</option>
<option value="40">好处费</option>
</select>
<br />
<span>应收总佣金：</span>&nbsp;<input class="form-control" id="bargaininfo_total_commission" type="number">元<br>
<span>应收总佣金：</span>&nbsp;<input class="form-control" id="bargaininfo_total_commission" type="number" disabled="disabled">元<br>
</div>
<div class="detail-modal-bargaininfo-main-right">
<span>是否开业：</span>
<select class="form-control" id="bargaininfo_is_open">
<select class="form-control" id="bargaininfo_is_open" disabled="disabled">
<option value="0">否</option>
<option value="1">是</option>
</select> <br />
......@@ -156,33 +156,33 @@
<div class="form-group detail-modal-bargaininfo-commission-sec">
<label class="">实收佣金：</label>
<div class="input-group">
<input type="number" class="form-control" placeholder="请输入">
<input type="number" class="form-control" placeholder="请输入" disabled="disabled">
<div class="input-group-addon">元</div>
</div>
<label class="">收佣日期：</label>
<div class="input-group">
<input type="date" class="form-control" placeholder="请输入">
<input type="date" class="form-control" placeholder="请输入" disabled="disabled">
</div>
<!--<mark href="javascript:;" class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png" /></mark>-->
</div>
</div>
<div id="bargaininfo_commission_add_btn">
<!--<div id="bargaininfo_commission_add_btn">
<img src="/resource/image/jia2@2x.png" />
</div>
</div>-->
</div>
<div>
<span class="detail-modal-bargaininfo-span-beizhu">备注：</span>
<textarea id="bargaininfo_beizhu"></textarea>
<textarea id="bargaininfo_beizhu" disabled="disabled"></textarea>
</div>
</form>
<div class="tc">
<button type="button" class="btn btn-primary" id="bargaininfo_btn_save">保存</button>
<!--<button type="button" class="btn btn-primary" id="bargaininfo_btn_save">保存</button>-->
</div>
</div>
<div class="detail-modal-body-sec">
<div class="detail-modal-maid-top-btn-area oh">
<a class="btn btn-success" href="#modal_new_maid" data-toggle="modal">新增</a>
<a id="maid_new_btn" class="btn btn-primary" 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-primary" data-toggle="modal">增加实收</a>-->
</div>
<table class="table table-striped table-bordered table-hover table-condensed" id="maid_table_main">
<thead>
......@@ -239,15 +239,15 @@
</table>
<div class="detail-modal-maid-bottom-btn-area text-right">
<a id="maid_ok_btn" class="btn btn-primary" data-toggle="modal">确认分佣</a>
<a id="maid_save_btn" class="btn btn-primary" data-toggle="modal">保存</a>
<!--<a id="maid_ok_btn" class="btn btn-primary" data-toggle="modal">确认分佣</a>-->
<!--<a id="maid_save_btn" class="btn btn-primary" data-toggle="modal">保存</a>-->
</div>
<!--分佣提成-->
</div>
<div class="detail-modal-body-sec">
<div>
<div class="tc">
<a class="btn btn-success" href="#modal_new_tax" data-toggle="modal">新增开票</a>
<!--<a class="btn btn-success" href="#modal_new_tax" data-toggle="modal">新增开票</a>-->
</div>
<div id="tax_main_box">
<!--内容为模板生成-->
......
application/index/view/finance/tax.html
View file @ a3198cfc
This diff is collapsed.
public/resource/js/commission.js
View file @ a3198cfc
......@@ -355,7 +355,7 @@
// };
// return business;
//});
define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_shuiFee_template_tpl.html', 'text!temp/reportList_maid_template_tpl.html', 'text!temp/reportList_maid_sub1_template_tpl.html', 'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax, template_maid, template_maid_sub1) {
define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_shuiFee_template_tpl.html', 'text!temp/reportList_maidtwo_template_tpl.html', 'text!temp/reportList_maid_sub1_template_tpl.html', 'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax, template_maid, template_maid_sub1) {
bargain = {
pageNo: 1,
/*第几页*/
......
public/resource/js/tax.js
View file @ a3198cfc
This diff is collapsed.
public/resource/template/reportList_maidtwo_template_tpl.html 0 → 100644
View file @ a3198cfc
<script id="reportList_maid_list_tpl" type="text/template">
[% if(it['data'] && it['data'].length && it['data'].length>0) { %]
[% var dealT=function(g){if(g&&(g!="null")){return g}else{return""}}; %]
[% for(var i in it['data']){ %]
<tr class="text-center" data-id="[%= it['data'][i]['id'] %]" data-agentid="[%= it['data'][i]['agent_id'] %]" data-role="[%= it['data'][i]['role'] %]" data-lastid="[%= it['data'][i]['last_commission_id'] %]">
<td>[%= it['data'][i]['role_name'] %]</td>
<td>[%= it['data'][i]['agent'] %]</td>
<td>[%= it['data'][i]['district_store'] %]</td>
<td><span class="detail-modal-maid-span-scale">[%= it['data'][i]['scale'] %]</span><span>%</span></td>
<td class="detail-modal-maid-td-should-commission">[%= it['data'][i]['scale_fee'] %]</td>
<td colspan="6" class="detail-modal-maid-mix-td oh">
[% if(it['data'][i]['partial_commission'] && it['data'][i]['partial_commission'].length && it['data'][i]['partial_commission'].length>0) { %]
[% for(var j in it['data'][i]['partial_commission']){ %]
<div class="oh" data-id="[%= it['data'][i]['partial_commission'][j]['id'] %]">
<span class="detail-modal-maid-span-real-fee">[%= it['data'][i]['partial_commission'][j]['real_fee'] %]</span>
<span class="detail-modal-maid-span-service-charge">[%= it['data'][i]['partial_commission'][j]['service_charge'] %]</span>
<span class="detail-modal-maid-span-charity-fund">[%= it['data'][i]['partial_commission'][j]['charity_fund'] %]</span>
<span class="detail-modal-maid-span-cash">[%= it['data'][i]['partial_commission'][j]['cash'] %]</span>
<span class="detail-modal-maid-span-practical-fee">[%= it['data'][i]['partial_commission'][j]['practical_fee'] %]</span>
<span class="detail-modal-maid-span-time">[%= dealT(it['data'][i]['partial_commission'][j]['confirm_date']) %]</span>
</div>
[% } %]
[% }else{ %]
<div class="oh">
<span class="detail-modal-maid-span-real-fee"></span>
<span class="detail-modal-maid-span-service-charge">0</span>
<span class="detail-modal-maid-span-charity-fund">0</span>
<span class="detail-modal-maid-span-cash">0</span>
<span class="detail-modal-maid-span-practical-fee"></span>
<span class="detail-modal-maid-span-time"></span>
</div>
[% } %]
</td>
</tr>
[% } %]
[% }else{ %]
<tr>
<td colspan="11" style="text-align:center;"> 暂无数据</td>
</tr>
[% } %]
</script>
public/resource/template/tax_template_tpl.html
View file @ a3198cfc
<script id="tax_list_tpl" type="text/template">
[% if(it) { %]
[% for(var item in it){ %]
<tr class="text-center">
<tr class="text-center" data-id="[%= it[item]['id'] %]" data-orderid="[%= it[item]['order_id'] %]" data-fatherid="[%= it[item]['father_id'] %]">
<td>[%= it[item]['create_time'] %]</td>
<td>[%= it[item]['district_store'] %]</td>
<td>[%= it[item]['name'] %]</td>
......@@ -11,8 +11,8 @@
<td>
<a class="btn1 btn-info edit" href="#modal-details" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
<a class="btn1 btn-info timeline" href="#modal-linetime" data-toggle="modal" data-id='[%= it[item]["id"] %]'>时间轴</a>
<a class="btn1 btn-info details-btn" href="#modal_detail" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
<a class="btn1 btn-info timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[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