计算优化

public/resource/js/reportList.js

@@ -294,62 +294,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
 			_doc.on('click', '#maid_count_btn', function(e){
 				e.preventDefault();
 				e.stopPropagation();
-				//计算每个实收佣金
-				var _rateTotal = 0;//分佣比例
-				var _yingfenTotal = 0;//应分佣金
-				var _yufenTotal = 0;//预分佣金
-				var _shouxuTotal = 0;//手续费
-				var _cishanTotal = 0;//慈善基金
-				var _xianjinTotal = 0;//现金奖
-				var _shishouTotal = 0;//实收佣金
-				$.each($('.detail-modal-maid-span-practical-fee'), function(i, v) {
-					var _vObj = $(v);
-					var a = Number(_vObj.parent().find('.detail-modal-maid-span-real-fee').html());//预分佣金
-					var b = Number(_vObj.parent().find('.detail-modal-maid-span-service-charge').html());//手续费
-					var c = Number(_vObj.parent().find('.detail-modal-maid-span-charity-fund').html());//慈善基金
-					var d = Number(_vObj.parent().find('.detail-modal-maid-span-cash').html());//现金奖
-					var _smallTotal = dealJineNum(a-b-c-d);
-					_shishouTotal += _smallTotal;
-					_vObj.html(_smallTotal);
-				});
-				$('#maid_count_total_shishou').html(dealJineNum(_shishouTotal));
-				
-				//计算分佣比例
-				$.each($('.detail-modal-maid-span-scale'), function(i, v) {
-					_rateTotal += Number($(v).html());
-				});
-				$('#maid_count_total_rate').html(_rateTotal+'%');
-				
-				//计算应分佣金
-				$.each($('.detail-modal-maid-td-should-commission'), function(i, v) {
-					_yingfenTotal += Number($(v).html());
-				});
-				$('#maid_count_total_yingfen').html(dealJineNum(_yingfenTotal));
-				
-				//计算预分佣金
-				$.each($('.detail-modal-maid-span-real-fee'), function(i, v) {
-					_yufenTotal += Number($(v).html());
-				});
-				$('#maid_count_total_yufen').html(dealJineNum(_yufenTotal));
-				
-				//计算手续费
-				$.each($('.detail-modal-maid-span-service-charge'), function(i, v) {
-					_shouxuTotal += Number($(v).html());
-				});
-				$('#maid_count_total_shouxu').html(dealJineNum(_shouxuTotal));
-				
-				//计算慈善基金
-				$.each($('.detail-modal-maid-span-charity-fund'), function(i, v) {
-					_cishanTotal += Number($(v).html());
-				});
-				$('#maid_count_total_cishan').html(dealJineNum(_cishanTotal));
-				
-				//计算现金奖
-				$.each($('.detail-modal-maid-span-cash'), function(i, v) {
-					_xianjinTotal += Number($(v).html());
-				});
-				$('#maid_count_total_xianjin').html(dealJineNum(_xianjinTotal));
-				
+				bargain.maidCount(1);//1为正常计算的时候
 			});
 			
 			//新增分佣提成，业务员input输入搜索，点击之后赋值
@@ -617,6 +562,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
 			                if(_isShowAddBtnFlag){
 			                	$('[href="#modal_new_maid"]').show();
 			                };
+			                bargain.maidCount(2);//计算合计的内容
 			            } else {
 			                layerTipsX(_data['msg']);
 			            }
@@ -782,6 +728,74 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
 			    }
 			});
 		},
+		maidCount: function(type){
+			//计算每个实收佣金
+			var _rateTotal = 0;//分佣比例
+			var _yingfenTotal = 0;//应分佣金
+			var _yufenTotal = 0;//预分佣金
+			var _shouxuTotal = 0;//手续费
+			var _cishanTotal = 0;//慈善基金
+			var _xianjinTotal = 0;//现金奖
+			var _shishouTotal = 0;//实收佣金
+			//计算实收佣金
+			if(type === 1){
+				//如果是而类型1，则计算每个实收佣金，和合计
+				$.each($('.detail-modal-maid-span-practical-fee'), function(i, v) {
+					var _vObj = $(v);
+					var a = Number(_vObj.parent().find('.detail-modal-maid-span-real-fee').html());//预分佣金
+					var b = Number(_vObj.parent().find('.detail-modal-maid-span-service-charge').html());//手续费
+					var c = Number(_vObj.parent().find('.detail-modal-maid-span-charity-fund').html());//慈善基金
+					var d = Number(_vObj.parent().find('.detail-modal-maid-span-cash').html());//现金奖
+					var _smallTotal = dealJineNum(a-b-c-d);
+					_shishouTotal += _smallTotal;
+					_vObj.html(_smallTotal);
+				});
+				$('#maid_count_total_shishou').html(dealJineNum(_shishouTotal));
+			}else if(type === 2){
+				//如果是类型2，则直接计算合计
+				$.each($('.detail-modal-maid-span-practical-fee'), function(i, v) {
+					_shishouTotal += Number($(v).html());
+				});
+				$('#maid_count_total_shishou').html(dealJineNum(_shishouTotal));
+			}else{}
+			
+			
+			//计算分佣比例
+			$.each($('.detail-modal-maid-span-scale'), function(i, v) {
+				_rateTotal += Number($(v).html());
+			});
+			$('#maid_count_total_rate').html(_rateTotal+'%');
+			
+			//计算应分佣金
+			$.each($('.detail-modal-maid-td-should-commission'), function(i, v) {
+				_yingfenTotal += Number($(v).html());
+			});
+			$('#maid_count_total_yingfen').html(dealJineNum(_yingfenTotal));
+			
+			//计算预分佣金
+			$.each($('.detail-modal-maid-span-real-fee'), function(i, v) {
+				_yufenTotal += Number($(v).html());
+			});
+			$('#maid_count_total_yufen').html(dealJineNum(_yufenTotal));
+			
+			//计算手续费
+			$.each($('.detail-modal-maid-span-service-charge'), function(i, v) {
+				_shouxuTotal += Number($(v).html());
+			});
+			$('#maid_count_total_shouxu').html(dealJineNum(_shouxuTotal));
+			
+			//计算慈善基金
+			$.each($('.detail-modal-maid-span-charity-fund'), function(i, v) {
+				_cishanTotal += Number($(v).html());
+			});
+			$('#maid_count_total_cishan').html(dealJineNum(_cishanTotal));
+			
+			//计算现金奖
+			$.each($('.detail-modal-maid-span-cash'), function(i, v) {
+				_xianjinTotal += Number($(v).html());
+			});
+			$('#maid_count_total_xianjin').html(dealJineNum(_xianjinTotal));
+		},
 		maidTest: function(type){
 			var _stopFlag = false;
 			var _data = [];