收佣日期

application/index/view/finance/account_statement.html

@@ -259,6 +259,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>
 								</tr>
@@ -313,12 +314,13 @@
 									<td class="text-center" id="maid_count_total_shishou"></td>
 									<td class="text-center"></td>
 									<td class="text-center"></td>
+									<td class="text-center"></td>
 								</tr>
 							</tfoot>
 
 						</table>
 						<div class="detail-modal-maid-bottom-btn-area text-right">
-							
+							<div href="#modal_date_select" data-toggle="modal">打开收佣日期选择框（默认隐藏）</div>
 							<a id="maid_ok_btn" class="btn btn-primary" data-toggle="modal">确认分佣</a>
 							<a id="maid_save_btn" class="btn btn-primary" data-toggle="modal">保存</a>
 						</div>
@@ -484,6 +486,24 @@
 	<!-- /.modal -->
 </div>
 
+<!-- 弹出框 分佣提成选择收佣日期 -->
+<div class="modal fade" id="modal_date_select" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop='static'>
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+				<h4 class="modal-title">选择一个日期</h4>
+			</div>
+			<div class="modal-body">
+				<ul id="modal_date_select_ul">
+				</ul>
+			</div>
+		</div>
+		<!-- /.modal-content -->
+	</div>
+	<!-- /.modal -->
+</div>
+
 <!-- 弹出框 开票税费新增 -->
 <div class="modal fade" id="modal_new_tax" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 	<div class="modal-dialog">

public/resource/css/report_list.css

@@ -153,7 +153,7 @@ addtax_
 #maid_count_btn{
 	margin-right: 10px;
 }
-#maid_table_main>thead th:nth-last-of-type(-n+7){
+#maid_table_main>thead th:nth-last-of-type(-n+8){
 	width: 91px;
 }
 #maid_table_main>thead th:nth-of-type(1){
@@ -162,8 +162,11 @@ addtax_
 #maid_table_main>thead th:nth-of-type(2){
 	width: 170px;
 }
+#maid_table_main>thead th:nth-last-of-type(3){
+	width: 91px;
+}
 #maid_table_main>thead th:nth-last-of-type(2){
-	width: 149px;
+	width: 91px;
 }
 #maid_table_main>thead th:nth-last-of-type(1){
 	width: 100px;
@@ -205,12 +208,22 @@ addtax_
 .detail-modal-maid-mix-td>div:nth-last-of-type(1)>span{
 	border-bottom: none;
 }
-
+.detail-modal-maid-mix-td>div>span:nth-last-of-type(2){
+	width: 91px;
+}
 .detail-modal-maid-mix-td>div>span:nth-last-of-type(1){
-	width: 146px;
+	width: 88px;
 	border-right: none;
 }
 
+.detail-modal-maid-span-date{
+	cursor: pointer;
+}
+
+[href="#modal_date_select"]{
+	display: none;
+}
+
 /*详情弹出框,开票税费*/
 .addtax-modal-tax-table{
 	width:600px;
@@ -276,17 +289,21 @@ addtax_
 	display: none;
 }
 
-#addmaid_select_ul{
+#addmaid_select_ul,
+#modal_date_select_ul{
 	list-style: none;
 	padding: 0;
 	margin: 0;
 }
-#addmaid_select_ul>li{
+#addmaid_select_ul>li,
+#modal_date_select_ul>li{
+	text-align: center;
 	height: 50px;
 	line-height: 50px;
 	cursor: pointer;
 }
-#addmaid_select_ul>li:hover{
+#addmaid_select_ul>li:hover,
+#modal_date_select_ul>li:hover{
 	background-color: rgba(0, 0, 0, .2);
 }
 
@@ -339,7 +356,7 @@ addtax_
 
 
 #modal_detail>div {
-	width: 1180px;
+	width: 1350px;
 }
 
 /*成交信息tab*/

public/resource/js/reportList.js

@@ -13,6 +13,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
 		agent_id_phone:'',//分佣方 姓名搜索
 		detail_user_id:'',//用户id
 		detail_shop_id:'',//商铺id
+		shouyong_date_active_sapn: null,
 		init: function() {
 			//初始化dot
 			$(document.body).append(template);
@@ -378,6 +379,66 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
 				bargain.maidCount(1);//1为正常计算的时候
 			});
 			
+			//详情弹出框，分佣提成里，收佣日期里的点击选择
+			_doc.on('click', '.detail-modal-maid-span-date', function(e){
+				e.preventDefault();
+				e.stopPropagation();
+				var _$this = $(this);
+				bargain.shouyong_date_active_sapn = _$this;
+				var _id = _$this.closest('tr').attr('data-id');
+				$.ajax({
+					type: 'GET',
+					url: '/index/getRealIncome',
+					data: {
+						'bargain_id': _id
+					},
+					timeout: 30000,
+					dataType: 'json',
+					beforeSend: function() {},
+					success: function(data) {
+						if(typeof data === 'object') {
+							if(data.code == 200) {
+								if(data.data && Array.isArray(data.data) && data.data.length>0){
+									$('[href="#modal_date_select"]').click();
+									var _tempHtml = '';
+									$.each(data.data, function(i, v) {
+										_tempHtml += '<li data-data="{data}">{0}</li>'.stringFormatObj({
+											'data': encodeURIComponent(JSON.stringify(v)),
+											'0': v.income_time
+										});
+									});
+									$('#modal_date_select_ul').html(_tempHtml);
+								}else{
+									alert('请先在成交信息里填写收佣日期');
+								}
+							} else {
+								alert(data['msg']);
+							};
+						} else {
+							alert('数据错误');
+						};
+					},
+					error: function() {
+						//alert('error');
+					},
+					complete: function(xhr, textStatus) {
+						if(textStatus === 'timeout') {
+							alert('请求超时');
+						};
+					}
+				});
+			});
+			
+			//详情弹出框，分佣提成里，收佣日期弹出框里，选择列表触发的事件
+			_doc.on('click', '#modal_date_select_ul>li', function(e){
+				e.preventDefault();
+				e.stopPropagation();
+				var _this = $(this);
+				var _dataTemp = JSON.parse(decodeURIComponent(_this.attr('data-data')));
+				bargain.shouyong_date_active_sapn.html(_dataTemp.income_time).attr('data-dateid',_dataTemp.id);
+				_this.closest('.modal-content').find('button.close').click();
+			});
+			
 			//新增分佣提成，业务员input输入搜索，点击之后赋值
 			_doc.on('click', '#addmaid_input_ywy+ul>li', function() {
 				var _this = $(this);
@@ -1077,7 +1138,8 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
 								var _csjj = $.trim(_$v2.find('.detail-modal-maid-span-charity-fund').html());
 								var _xjj = $.trim(_$v2.find('.detail-modal-maid-span-cash').html());
 								var _ssyj = $.trim(_$v2.find('.detail-modal-maid-span-practical-fee').html());
-								if((type == '1') && (_sfyj == ''||_sxf == ''||_csjj == ''||_xjj == ''||_ssyj == '')){
+								var _syrqid = $.trim(_$v2.find('.detail-modal-maid-span-date').attr('data-dateid'));
+								if((type == '1') && (_sfyj == ''||_sxf == ''||_csjj == ''||_xjj == ''||_ssyj == ''||!_syrqid)){
 									//如果是确认分佣，则每项必填。保存，则不加限制
 									_stopFlag = true;
 								}else{
@@ -1092,6 +1154,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
 										'charity_fund': _csjj,//慈善基金
 										'cash': _xjj,//现金奖
 										'practical_fee': _ssyj,//实收佣金,
+										'real_income_id': _syrqid,//收佣日期id
 										'step': bargain.mainTabIndex
 									};
 								}

public/resource/template/reportList_template_tpl.html

@@ -99,7 +99,7 @@
         <td>[%= it['data'][i]['district_store'] %]</td>
         <td><span contenteditable class="detail-modal-maid-span-scale">[%= it['data'][i]['scale'] %]</span><span>%</span></td>
         <td contenteditable class="detail-modal-maid-td-should-commission">[%= it['data'][i]['scale_fee'] %]</td>
-        <td colspan="6" class="detail-modal-maid-mix-td oh">
+        <td colspan="7" class="detail-modal-maid-mix-td oh">
         	[% if(it['data'][i]['partial_commission'] && it['data'][i]['partial_commission'].length && it['data'][i]['partial_commission'].length>0) { %]
         		[% for(var j in it['data'][i]['partial_commission']){ %]
 				<div class="oh" data-id="[%= it['data'][i]['partial_commission'][j]['id'] %]">
@@ -108,6 +108,12 @@
 					<span contenteditable class="detail-modal-maid-span-charity-fund">[%= it['data'][i]['partial_commission'][j]['charity_fund'] %]</span>
 					<span contenteditable class="detail-modal-maid-span-cash">[%= it['data'][i]['partial_commission'][j]['cash'] %]</span>
 					<span contenteditable class="detail-modal-maid-span-practical-fee">[%= it['data'][i]['partial_commission'][j]['practical_fee'] %]</span>
+					[% if(it['data'][i]['income_time']) { %]
+						<span class="detail-modal-maid-span-date" data-dateid="[%= it['data'][i]['income_time']['id'] %]">[%= it['data'][i]['income_time']['income_time'] %]</span>
+					[% }else{ %]
+						<span class="detail-modal-maid-span-date" data-dateid="">请点击选择</span>
+					[% } %]
+					
 					<span class="detail-modal-maid-span-time">[%= dealT(it['data'][i]['partial_commission'][j]['confirm_date']) %]</span>
 				</div>
 				[% } %]
@@ -118,6 +124,7 @@
 					<span contenteditable class="detail-modal-maid-span-charity-fund">0</span>
 					<span contenteditable class="detail-modal-maid-span-cash">0</span>
 					<span contenteditable class="detail-modal-maid-span-practical-fee"></span>
+					<span class="detail-modal-maid-span-date" data-dateid="">请点击选择</span>
 					<span class="detail-modal-maid-span-time"></span>
 				</div>	
     		[% } %]
@@ -146,6 +153,7 @@
 		<span contenteditable class="detail-modal-maid-span-charity-fund">0</span>
 		<span contenteditable class="detail-modal-maid-span-cash">0</span>
 		<span contenteditable class="detail-modal-maid-span-practical-fee"></span>
+		<span class="detail-modal-maid-span-date" data-dateid="">请点击选择</span>
 		<span class="detail-modal-maid-span-time"></span>
 	</div>
 </script>
\ No newline at end of file