Merge branch 'test-v1.9' into test

public/appnew/src/components/reportDetails/reportDetails.vue

@@ -207,19 +207,19 @@
 			},
 			//判断分佣方类型
 			centCommission(e) {
-				if(e === 1) {
+				if(e =='1' ) {
 					return '盘方'
 				}
-				if(e === 2) {
+				if(e =='2' ) {
 					return '客方'
 				}
-				if(e === 3) {
+				if(e =='3') {
 					return '反签'
 				}
-				if(e === 4) {
+				if(e =='4') {
 					return '独家'
 				}
-				if(e === 5) {
+				if(e =='5') {
 					return '合作方'
 				}
 			},

public/resource/js/commissionTotal.js

@@ -331,10 +331,11 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
 					console.log(data);
 					var temp = document.getElementById('commissionTotal_list_tpl').innerHTML;
 					var doTtmpl = doT.template(temp);
-					$("#business_list").html(doTtmpl(data.data.data.list));
+					$("#business_list").html(doTtmpl(data.data.list));
+					console.log(data.data.list);
 
 					/*分页代码*/
-					add_page(data.data.data.total, pageNo, business.pageSize, business.getList);
+					add_page(data.data.total, pageNo, business.pageSize, business.getList);
 				}
 			});
 		},

public/resource/js/tax.js

@@ -334,7 +334,7 @@ define(['doT', 'text!temp/tax_template_tpl.html', 'css!style/home.css', 'ckfinde
 					var temp = document.getElementById('tax_list_tpl').innerHTML;
 					var doTtmpl = doT.template(temp);
 					$("#business_list").html(doTtmpl(data.data.list));
-					$("taxTotal").html(data.total_tax);
+					$("#taxTotal").html(data.data.total_fee);
 
 					/*分页代码*/
 					add_page(data.data.total, pageNo, business.pageSize, business.getList);

public/resource/template/commissionTotal_template_tpl.html

@@ -3,22 +3,17 @@
     [% for(var item in it){ %]
     <tr class="text-center">
         <td>[%= it[item]['create_time'] %]</td>
+        <td>[%= it[item]['income_time'] %]</td>
         <td>[%= it[item]['district_store'] %]</td>
-        <td>[%= it[item]['agent'] %]</td>
-        <td>[%= it[item]['internal_address'] %]</td>
-        <td>[%= it[item]['house_number'] %]</td>
-        <td>[%= it[item]['scale_fee'] %]</td>
+        <td>[%= it[item]['name'] %]</td>
+        <td>[%= it[item]['cash'] %]</td>
         <td>[%= it[item]['practical_fee'] %]</td>
-        <!--create_time	string	提交时间
-id	int	成交报告id
-agent_id	string	经纪人id
-fee	int	税费
-practical_fee	int	实收佣金
-name	string	经纪人名
-phone	string	经纪人手机
-district_store	string	所属部门/门店
-scale_fee	int	应收佣金
-        <!--<td>-->
+        <td>[%= it[item]['cash'] %]</td>
+        <td>[%= it[item]['service_charge'] %]</td>
+        <td>[%= it[item]['practical_fee'] %]</td>
+        <td>[%= it[item]['fee'] %]</td>
+        <!--<td>[%= it[item]['service_charge'] %]</td>-->
+        <!--<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>
         </td>-->