后台 优化

application/index/view/performancesubsidiary/performancesubsidiaryList.html

@@ -52,7 +52,7 @@
 								<thead>
 									<!--三级审核的搜索功能-->
 									<tr>
-										<td colspan="13">
+										<td colspan="16">
 											<form id="maintable_form_search">
 												<!--<span class="fore-span">商铺类型:</span>-->
 												<select class="form-control btn2" name="maintable_shop_type" id="maintable_shop_type_yeji">
@@ -110,10 +110,11 @@
 										<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>
 								</thead>

public/resource/js/getCollection.js

@@ -28,15 +28,16 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
 
                 };
             }(jQuery));
-
+            //入账日期修改为 只提交 年月日
 			$(".form_datetime").datetimepicker({
-				//format: 'yyyy-mm-dd hh:ii:ss',
-				format: 'yyyy-mm-dd hh:ii:00',
+//				format: 'yyyy-mm-dd hh:ii:ss',
+//				format: 'yyyy-mm-dd hh:ii:00',
+				format: 'yyyy-mm-dd',
 		        autoclose: true,
 		        language: 'zh-CN',
-		        minView: 0,
-		        minuteStep: 30
-		        //hourStep: 1
+		        minView: 'month',
+//		        minuteStep: 30
+//		        hourStep: 1
 			});
            	$('.datetimepicker').hide();//初始化隐藏时间控件
 		},

public/resource/template/performance_subsidiary_template_tpl.html

@@ -12,10 +12,11 @@
         <td>[%= it[item]['house_id'] %]</td>
         <td>[%= it[item]['name'] %]-[%= it[item]['phone'] %]</td>
         <td>[%= sw2(it[item]['role']) %]</td>
-        <td>[%= it[item]['district_name'] %]-[%= it[item]['store_name'] %]</td>
+        <td>[%= it[item]['store_name'] %]</td>
         <td>[%= it[item]['scale'] %]%</td>
         <td>[%= it[item]['scale_fee'] %]</td>
         <td>[%= it[item]['practical_fee'] %]</td>
+        <td>[%= it[item]['practical_fee'] %]</td>
         <td>
             [% if(it[item]["father_id"] == 0 || it[item]["father_id"] == "0") { %]
                 <a class="btn1 btn-success details-btn" href="#modal_detail" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
@@ -28,7 +29,7 @@
     [% } %]
     [% }else{ %]
     <tr>
-        <td colspan="12" style="text-align:center;"> 暂无数据</td>
+        <td colspan="16" style="text-align:center;"> 暂无数据</td>
     </tr>
     [% } %]
 </script> 

public/resource/template/real_time_performance_template_tpl.html

@@ -243,7 +243,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>