后台 优化

application/index/view/finance/account_statement.html

@@ -133,7 +133,7 @@
 												<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-real"></span>元</span>
-												<span class="total-commission">未收佣金总计：<span class="total-commission-no"></span>元</span>
+												<span class="total-commission">未收佣金总计：<span class="total-commission-no">0</span>元</span>
 												<div class="clear">
 												</div>
 												<div class="text-right">

public/resource/js/reportList.js

@@ -1618,9 +1618,9 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
 							//添加 佣金总计
 							$('.total-commission-should').html(data.data.total_commission);
 							$('.total-commission-real').html(data.data.total_income_money);
-							$('.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')));
+							if(data.data.total_commission){
+							    $('.total-commission-no').html((data.data.total_commission*1-data.data.total_income_money*1).toFixed(2));
+							}
 							/*分页代码*/
 							add_page(data.data.total, pageNo, bargain.pageSize, bargain.getList);
 

public/resource/template/professional_list_template_tpl.html

@@ -2,9 +2,11 @@
 <script id="professional_list_tpl" type="text/template">
 	[% var sw=function(s){switch(Number(s)){case 0:return"新人";case 1:return"店长";case 2:return"经理";case 3:return"主任";case 4:return"顾问";case 1:return"无职称"}}; %]
 	[% var sw2=function(s){switch(Number(s)){case 10:return"业务员";case 20:return"店长";case 30:return"总监";case 40:return"店长和总监"}}; %]
+	[% var sw3=function(s){switch(Number(s)){case 10001:return"上海市";case 10002:return"杭州市";default: return ''}}; %]
     [% if(it && it.length && it.length>0) { %]
     <tr class="maintable-tr-bar">
 		<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>
@@ -15,6 +17,7 @@
     [% for(var item in it){ %]
     <tr data-id="[%= it[item]['district_id'] %]">
         <td class="text-center">[%= it[item]['id'] %]</td>
+        <td class="text-center">[%= sw3(it[item]['site_id']) %]</td>
         <td class="text-center">[%= sw2(it[item]['level']) %]</td>
         <td class="text-center">[%= sw(it[item]['position']) %]</td>
         <td class="text-center">[%= it[item]['store_name'] %]</td>