Commit 3cc480d1 authored by agping's avatar agping

修改

parent b952de97
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
font-size: 16px; font-size: 16px;
font-weight: 600; font-weight: 600;
float: left; float: left;
margin-left: 32px; margin-left: 12px;
} }
#maintable_form_search>span.total-commission{ #maintable_form_search>span.total-commission{
margin-top: 16px; margin-top: 16px;
...@@ -130,11 +130,11 @@ ...@@ -130,11 +130,11 @@
<ul class="user-ul"></ul> <ul class="user-ul"></ul>
</div> </div>
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="bargain_id" placeholder="成交报告id" type="text" value=""> <input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="bargain_id" placeholder="成交报告id" type="text" value="">
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="maintable_user_ID" placeholder="客户ID" type="text" value="">
<span class="total-commission">应收佣金总计:<span class="total-commission-should"></span></span> <span class="total-commission">应收佣金总计:<span class="total-commission-should"></span></span>
<span class="total-commission">已收佣金总计:<span class="total-commission-real"></span></span> <span class="total-commission">已收佣金总计:<span class="total-commission-real"></span></span>
<span class="total-commission">未收佣金总计:<span class="total-commission-no"></span></span> <span class="total-commission">未收佣金总计:<span class="total-commission-no"></span></span>
<div class="clear"> <div class="clear">
</div> </div>
<span class="btn btn-info btn3 search" id="maintable_search">搜索</span> <span class="btn btn-info btn3 search" id="maintable_search">搜索</span>
<span class="btn btn-info btn3" id="maintable_reset">重置</span> <span class="btn btn-info btn3" id="maintable_reset">重置</span>
......
...@@ -129,6 +129,7 @@ ...@@ -129,6 +129,7 @@
<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>
......
...@@ -137,6 +137,7 @@ export default { ...@@ -137,6 +137,7 @@ export default {
duringRequest(){ duringRequest(){
//请求发送状态判断 //请求发送状态判断
let arr = [...arguments];//arguments本身不是数组,是一个特殊的对象,后面的调用会使arguments发生变化,所以需要缓存起来 let arr = [...arguments];//arguments本身不是数组,是一个特殊的对象,后面的调用会使arguments发生变化,所以需要缓存起来
console.log(arr)
axios.interceptors.request.use((config) => { axios.interceptors.request.use((config) => {
arr.forEach((a, i) => { arr.forEach((a, i) => {
if(~config.url.indexOf(a.urlStr)){ if(~config.url.indexOf(a.urlStr)){
......
...@@ -1617,7 +1617,8 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', ' ...@@ -1617,7 +1617,8 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
//添加 佣金总计 //添加 佣金总计
$('.total-commission-should').html(data.data.total_commission); $('.total-commission-should').html(data.data.total_commission);
$('.total-commission-real').html(data.data.total_income_money); $('.total-commission-real').html(data.data.total_income_money);
$('.total-commission-no').html(data.data.total_commission*1-data.data.total_income_money*1); $('.total-commission-no').html((data.data.total_commission*1-data.data.total_income_money*1).toFixed(2));
// $('.total-commission-no').html((data.data.total_commission*1-data.data.total_income_money*1).toFixed(2));
// var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); // var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));
/*分页代码*/ /*分页代码*/
add_page(data.data.total, pageNo, bargain.pageSize, bargain.getList); add_page(data.data.total, pageNo, bargain.pageSize, bargain.getList);
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<td>[%= it[item]['internal_address'] %]</td> <td>[%= it[item]['internal_address'] %]</td>
<td>[%= it[item]['house_number'] %]</td> <td>[%= it[item]['house_number'] %]</td>
<td>[%= it[item]['scale_fee'] %]</td> <td>[%= it[item]['scale_fee'] %]</td>
<td>[%= it[item]['scale_fee'] %]</td>
<td>[%= it[item]['practical_fee'] %]</td> <td>[%= it[item]['practical_fee'] %]</td>
<td> <td>
......
...@@ -290,8 +290,8 @@ ...@@ -290,8 +290,8 @@
<th class="text-center">成交报告ID</th> <th class="text-center">成交报告ID</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>
...@@ -303,7 +303,7 @@ ...@@ -303,7 +303,7 @@
<td class="text-center">[%= it[item]['create_time'] %]</a></td> <td class="text-center">[%= it[item]['create_time'] %]</a></td>
<td class="text-left">[%= hideStr(it[item]['internal_address']) %]</td> <td class="text-left">[%= hideStr(it[item]['internal_address']) %]</td>
<td class="text-center">[%= it[item]['user_name'] %]</td> <td class="text-center">[%= it[item]['user_name'] %]</td>
<td class="text-center">[%= hideTel(it[item]['user_phone']) %]</td> <!--<td class="text-center">[%= hideTel(it[item]['user_phone']) %]</td>-->
<td class="text-center">[%= sw(it[item]['trade_type']) %]</td> <td class="text-center">[%= sw(it[item]['trade_type']) %]</td>
<td class="text-center">[%= it[item]['scale_fee'] %]</td> <td class="text-center">[%= it[item]['scale_fee'] %]</td>
<td class="text-center"> <td class="text-center">
...@@ -511,7 +511,7 @@ ...@@ -511,7 +511,7 @@
<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>
[% for(var item in it){ %] [% for(var item in it){ %]
......
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