财务修改

application/index/view/finance/commission_total.html

 {layout name="global/frame_tpl" /}
 <input type="hidden" class="page-load" id="commissionTotal" />
 <style>
-     #note_text{
+	#note_text {
 		width: 80%;
 		margin-left: 48px;
 		margin-top: -20px;
 	}
-    #note_text_re{
+	
+	#note_text_re {
 		width: 80%;
 		margin-left: 48px;
 		margin-top: -20px;
 	}
-    .Tswitch_one{
+	
+	.Tswitch_one {
 		display: none;
 	}
-    .Tswitch_two{
+	
+	.Tswitch_two {
 		display: none;
 	}
-    .left{
+	
+	.left {
 		float: left;
 		width: 340px;
 		line-height: 36px;
-        
 	}
-    .right{
+	
+	.right {
 		line-height: 36px;
 	}
-    .btn_2{
+	
+	.btn_2 {
 		width: 60px;
 		display: inline-block;
 		height: 26px;
 		padding: 3px 6px
 	}
-    .edit_new{
+	
+	.edit_new {
 		float: right;
 		margin-bottom: 5px;
 		margin-top: -10px;
 	}
-    .form-control-one{
+	
+	.form-control-one {
 		display: inline-block;
 		width: 40%;
 	}
-    #form_search{
+	
+	#form_search {
 		line-height: 48px;
 	}
-    .modal-body-two{
+	
+	.modal-body-two {
 		height: 500px;
 		overflow-y: scroll;
 	}
@@ -55,7 +64,9 @@
 			<div class="col-lg-10 col-lg-offset-0">
 				<div class="panel panel-default">
 					<div class="panel-heading breadcrumb">
-                        <li><a href="#">分佣提成汇总表</a></li>
+						<li>
+							<a href="#">分佣提成汇总表</a>
+						</li>
 					</div>
 
 					<div class="panel-body">
@@ -75,16 +86,12 @@
 												<span class="fore-span ld-Marheight">-</span>
 												<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_dealtime" name="end_date" type="date">
 
-	                                            
 												<select class="form-control btn4 ld-Marheight" id="deal_status">
 													<option value="-1">请选择部门</option>
 													<option value="10">市场一部</option>
 													<option value="20">市场二部</option>
-													<!--<option value="30">代理</option>-->
-													<!--<option value="40">好处费</option>-->
 												</select>
 
-	                                            
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="store_name" placeholder="所属门店名称" type="text" value="">
 												<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_num" placeholder="商铺号" type="text" value="">-->
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_name" placeholder="业务员姓名" type="text" value="">
@@ -155,7 +162,7 @@
 						<span>客户电话：</span><span class="user_phone"></span><br>
 						<span>提交日期：</span><span class="create_time"></span><br>
 					</div>
-                        <input type="hidden" class="page-pass"/>
+					<input type="hidden" class="page-pass" />
 				</div>
 				<div class="Tswitch Tswitch_one">
 					<!--分佣提成-->
@@ -202,8 +209,10 @@
                     确定
                 </button>
 			</div>
-        </div><!-- /.modal-content -->
-    </div><!-- /.modal -->
+		</div>
+		<!-- /.modal-content -->
+	</div>
+	<!-- /.modal -->
 </div>
 <!-- 弹出框 时间 -->
 <div class="modal fade" id="modal-linetime" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
@@ -229,8 +238,10 @@
                     删除
                 </button>
 			</div>
-        </div><!-- /.modal-content -->
-    </div><!-- /.modal -->
+		</div>
+		<!-- /.modal-content -->
+	</div>
+	<!-- /.modal -->
 </div>
 <!-- 分佣提成新增 -->
 <div class="modal fade" id="modal-new" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
@@ -248,7 +259,8 @@
 				<div class="modal-body" id="">
 					<!--  新增分佣提成 -->
 					<form id="form_search">
-                          分佣方：&nbsp;&nbsp;&nbsp;<select class="form-control form-control-one" id="is_carefully_chosen">
+						分佣方：&nbsp;&nbsp;&nbsp;
+						<select class="form-control form-control-one" id="is_carefully_chosen">
 							<option value="0">请选择</option>
 							<option value="1">盘方</option>
 							<option value="2">客方</option>
@@ -271,7 +283,8 @@
                     确定
                 </button>
 			</div>
-        </div><!-- /.modal-content -->
-    </div><!-- /.modal -->
+		</div>
+		<!-- /.modal-content -->
+	</div>
+	<!-- /.modal -->
 </div>
\ No newline at end of file
-

application/index/view/finance/tax.html

@@ -77,7 +77,7 @@
 	                                            <span class="btn btn-info btn3" id="search">搜索</span>
 	                                            <span class="btn btn-info btn3" id="reset">重置</span>
 	                                            <!--<span class="btn btn-info btn3" id="export">导出excel</span>-->   
-	                                            <span>税费合计:</span><span id="taxTotal">15000元</span>
+	                                            <span>税费合计:</span><span id="taxTotal">15000</span>元
                                         </form>
                                     </td>
                                 </tr>

public/resource/js/commissionTotal.js

@@ -315,11 +315,16 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
 			var params = {};
 			params.pageNo = business.pageNo;
 			params.pageSize = business.pageSize;
-			//          params.create_time  = $('#create_time') .val();
-			params.internal_address = $('#internal_address').val();
 			params.name = $('#user_name').val();
 			params.phone = $('#user_phone').val();
-			params.house_number = $('#internal_num').val();
+			params.commission_start_date = $('#create_time').val();
+			params.commission_end_date = $('#end_time').val();
+			params.deal_start_date = $('#create_dealtime').val();
+			params.deal_end_date = $('#end_dealtime').val();
+			params.operation_start_date = $('#create_ticketTime').val();
+			params.operation_end_date = $('#end_ticketTime').val();
+			params.district_id = $('#user_phone').val();
+			params.store_name = $('#store_name').val();
 			
 			$.ajax({
 				url: '/index/getCommissionTotalList', //获取列表