开票税费1

application/index/view/finance/account_statement.html

@@ -303,13 +303,13 @@
 			<div class="modal-body">
 				<div>
 					<div>
-						<div class="form-group detail-modal-tax-commission-sec">
+						<div class="form-group addtax-modal-tax-commission-sec">
 							<label class="">开票金额：</label>
-							<div class="input-group"><input type="number" class="form-control" placeholder="请输入" id="">
+							<div class="input-group"><input type="number" class="form-control" placeholder="请输入" id="addtax_commission_input">
 								<div class="input-group-addon">元</div>
 							</div>
 							<label class="">开票日期：</label>
-							<div class="input-group"><input type="date" class="form-control" placeholder="请输入"></div>
+							<div class="input-group"><input type="date" class="form-control" placeholder="请输入" id="addtax_date"></div>
 						</div>
 						<div>
 							<table class="table-haveborder addtax-modal-tax-table">
@@ -331,11 +331,8 @@
 				</div>
 			</div>
 			<div class="modal-footer">
-				<button type="button" class="btn btn-default" data-dismiss="modal">取消
-                </button>
-				<button type="button" class="btn btn-primary" data-dismiss="modal">
-                    确定
-                </button>
+				<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+				<button type="button" class="btn btn-primary" data-dismiss="modal" id="addtax_commission_addok">确定</button>
 			</div>
 		</div>
 		<!-- /.modal-content -->

public/resource/css/report_list.css

@@ -6,6 +6,7 @@ detail-modal-bargaininfo-
 detail-modal-maid-
 detail-modal-tax-
 pass-modal-
+addtax-modal-
  * 
  * 
  * 
@@ -59,28 +60,28 @@ pass-modal-
 }
 
 .detail-modal-bargaininfo-commission-sec,
-.detail-modal-tax-commission-sec {
+.addtax-modal-tax-commission-sec {
 	overflow: hidden;
 }
 
 .detail-modal-bargaininfo-commission-sec>label,
-.detail-modal-tax-commission-sec>label {
+.addtax-modal-tax-commission-sec>label {
 	float: left;
 }
 
 .detail-modal-bargaininfo-commission-sec>label:nth-of-type(2),
-.detail-modal-tax-commission-sec>label:nth-of-type(2) {
+.addtax-modal-tax-commission-sec>label:nth-of-type(2) {
 	margin-left: 50px;
 }
 
 .detail-modal-bargaininfo-commission-sec>div,
-.detail-modal-tax-commission-sec>div {
+.addtax-modal-tax-commission-sec>div {
 	float: left;
 	width: 160px;
 }
 
 .detail-modal-bargaininfo-commission-sec>mark,
-.detail-modal-tax-commission-sec>mark {
+.addtax-modal-tax-commission-sec>mark {
 	float: left;
 	overflow: hidden;
 	background-color: transparent;
@@ -89,7 +90,7 @@ pass-modal-
 }
 
 .detail-modal-bargaininfo-commission-sec>mark>img,
-.detail-modal-tax-commission-sec>mark>img  {
+.addtax-modal-tax-commission-sec>mark>img  {
 	float: left;
 	width: 20px;
 }
@@ -206,6 +207,15 @@ pass-modal-
 	height: 150px;
 }
 
+
+/*详情弹出框，开票税费下的表格*/
+.detail-modal-tax-table{
+	width: 600px;
+}
+.detail-modal-tax-table td{
+	height: 40px;
+	text-align: center;
+}
 /*main-table部分,待补充*/
 .maintable-tr-bar{}
 .maintable-tr-bar>th:nth-of-type(1){}

public/resource/js/public.js

@@ -131,15 +131,20 @@ function check_auth(auth_rule) {
     return result;
 }
 
-//分页插件封装
-function PaginationX(obj){
-	obj.dom.html('wrgwg');
-	
-	var _preHtml = '<div class="ui-page-x"><span class="ui-page ui-page-prev"><svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="200" height="200" viewBox="0 0 200 200"><path d="M85.876,100.5l49.537-50.526c4.089-4.215,4.089-11.049,0-15.262 c-4.089-4.218-10.719-4.218-14.808,0L63.586,92.868c-4.089,4.215-4.089,11.049,0,15.264l57.018,58.156 c4.089,4.215,10.719,4.215,14.808,0c4.089-4.215,4.089-11.049,0-15.262L85.876,100.5z"></path></svg></span>';
-	var _aftHtml = '';
-};
-
 //手机号码格式正则验证 by xishifeng
 function is_mobile(text) {
 	return /^1[1234567890]\d{9}$/.test(text)?true:false;
-}
+}
\ No newline at end of file
+
+//处理金额的数字，最多三位小数
+function dealJineNum(num){
+	if(isFinite(num)){
+		if(parseInt(num)==num || num.toString().split(".")[1].length < 4){
+			return num;
+		}else{
+			return Number((num).toFixed(3));
+		}
+	}else{
+		return 0;
+	};
+};
\ No newline at end of file

public/resource/js/reportList.js

@@ -145,8 +145,32 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
 			});
 			
 			//点击开票税费下的新增税费,弹出框出来
-			_doc.delegate("[href=\"#modal_new_tax\"]", "click", function() {
-				bargain.newAddTax();
+			_doc.on('click', '[href=\"#modal_new_tax\"]', function(e){
+				e.preventDefault();
+				e.stopPropagation();
+				var _this = $(this);
+				bargain.newAddTax({
+					'type': _this.attr('data-recordid')?'edit':'new',
+					'id': _this.attr('data-recordid')
+				});
+			});
+			
+			//新增开票税费，金额输入框输入后，自动计算税费
+			_doc.on('input', '#addtax_commission_input', function(e){
+				e.preventDefault();
+				e.stopPropagation();
+				var _this = $(this);
+				var _trObj = $('.addtax-modal-tax-table-datatr');
+				$.each(_trObj, function(i, v) {
+					v.childNodes[3].innerHTML = dealJineNum(Number(v.childNodes[2].innerHTML.split('%')[0])*0.01*Number($.trim(_this.val()))*0.1);
+				});
+			});
+			
+			//新增开票税费，点击确定时的提交
+			_doc.on('click', '#addtax_commission_addok', function(e){
+				e.preventDefault();
+				e.stopPropagation();
+				bargain.newAddTaxOk();
 			});
 		},
 		Timeline: function() { //获取时间轴
@@ -346,7 +370,17 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
 			    }
 			});
 		},
-		newAddTax: function() {
+		newAddTax: function(obj) {
+			var _tempTableObj = $('.addtax-modal-tax-table');
+			_tempTableObj.attr('data-type',obj['type']);
+			if(obj['type'] === 'new'){
+				$('.addtax_commission_input').val('');
+				$('.addtax_date').val('');
+			}else{
+				$('.addtax_commission_input').val('');
+				$('.addtax_date').val('');
+				_tempTableObj.attr('data-recordid',obj['id']);
+			};
 			$.ajax({
 			    type: 'GET',
 			    url: '/index/searchBargainAgents',
@@ -362,10 +396,11 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
 			                if(_data['data'] && _data['data'].length && _data['data'].length>0){
 			                	var _htmlTemp = '<tr><td>分佣方</td><td>业务员</td><td>分佣比例</td><td>税费</td></tr>';
 			                	$.each(_data['data'], function(i, v) {
-			                		_htmlTemp += '<tr data-id="{id}"><td>{0}</td><td>{1}</td><td>{2}%</td><td contenteditable></td></tr>'.stringFormatObj({
+			                		_htmlTemp += '<tr class="addtax-modal-tax-table-datatr" data-id="{id}" data-role="{role}"><td>{0}</td><td>{1}</td><td>{2}%</td><td contenteditable></td></tr>'.stringFormatObj({
 			                			'0': v.role_name,
 			                			'1': v.name+'-'+v.phone,
 			                			'2': v.scale,
+			                			'role': v.role,
 			                			'id': v.id
 			                		});
 			                	});
@@ -391,6 +426,54 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
 			    }
 			});
 		},
+		newAddTaxOk: function(){
+			var _tempTableObj = $('.addtax-modal-tax-table');
+			var _data = {
+				'bargain_id': bargain.bargain_id,
+				'total_fee': $.trim($('#addtax_commission_input').val()),
+				'operation_date': $('#addtax_date').val()
+			};
+			if(_tempTableObj.attr('data-type') === 'edit'){
+				_data['id'] = _tempTableObj.attr('data-recordid');
+			};
+			$.each($('.addtax-modal-tax-table-datatr'), function(i, v) {
+				_data['tax['+i+']'] = {
+					'fee': v.childNodes[3].innerHTML,
+					'agent_id': JSON.parse(decodeURIComponent(sessionStorage.getItem('pcUserInfo'))).id,
+					'role': v.getAttribute('data-role'),
+					'scale': v.childNodes[2].innerHTML.split('%')[0]
+				};
+			});
+			$.ajax({
+			    type: 'POST',
+			    url: '/index/addTallAge',
+			    data: _data,
+			    timeout: 30000,
+			    dataType: 'json',
+			    beforeSend: function() {},
+			    success: function(_data) {
+			        if(typeof _data === 'object') {
+			            if(_data['code'] == '200') {
+			                alert('新增成功！');
+			                bargain.taxShow();
+			            } else {
+			                layerTipsX(_data['msg']);
+			            }
+			        } else {
+			            layerTipsX('数据错误');
+			        };
+			    },
+			    error: function() {
+			        layerTipsX('enter error');
+			    },
+			    complete: function(xhr, textStatus){
+			        if(textStatus === 'timeout') {
+			            //处理超时的逻辑
+			            layerTipsX('请求超时,请重试');
+			        };
+			    }
+			});
+		},
 		newCommission: function() { //新增分佣提成
 			$.ajax({
 				'type': 'POST',

public/resource/template/reportList_shuiFee_template_tpl.html

@@ -19,7 +19,7 @@
 					</tr>
 					[% if(it[item]['fee_list'] && it[item]['fee_list'].length && it[item]['fee_list'].length>0) { %]
     				[% for(var item2 in it[item]['fee_list']){ %]
-						<tr>
+						<tr data-id="[%= it[item]['fee_list'][item2]['fee_id'] %]">
 							<td>[%= getInfoType(it[item]['fee_list'][item2]['role']) %]</td>
 							<td>[%= it[item]['fee_list'][item2]['name']+'-'+it[item]['fee_list'][item2]['phone'] %]</td>
 							<td>[%= it[item]['fee_list'][item2]['scale'] %]</td>
@@ -32,7 +32,7 @@
 				</table>
 			</div>
 			<div>
-				<a class="btn btn-default" href="#modal_new_shuifee">编辑</a>
+				<a class="btn btn-default" href="#modal_new_tax" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">编辑</a>
 			</div>
 		</section>
 	[% } %]