Commit 1e4276a8 authored by xishifeng's avatar xishifeng

五项管理及分佣提成保存修改

parent 7caef2e9
......@@ -187,7 +187,7 @@
<table border="0" cellspacing="0" cellpadding="0" class="table-type9">
<tr class="table-tr-single">
<td colspan="6">同联六项管理、自我考核评分标准(每项1-10分)</td>
<td colspan="5">同联五项管理、自我考核评分标准(每项1-10分)</td>
</tr>
<tr>
<td>六项管理</td>
......@@ -229,13 +229,6 @@
<div class="div-textarea" contenteditable="true">点击填写</div>
</td>
</tr>
<tr class="">
<td>动力管理</td>
<td><input type="number" placeholder="填写" /></td>
<td>
<div class="div-textarea" contenteditable="true">点击填写</div>
</td>
</tr>
</table>
</section>
......
......@@ -83,7 +83,7 @@
<table border="0" cellspacing="0" cellpadding="0" class="table-type9">
<tr class="table-tr-single">
<td colspan="6">同联六项管理、自我考核评分标准(每项1-10分)</td>
<td colspan="5">同联五项管理、自我考核评分标准(每项1-10分)</td>
</tr>
<tr>
<td>六项管理</td>
......@@ -125,13 +125,6 @@
<div class="div-textarea" contenteditable="true">点击填写</div>
</td>
</tr>
<tr class="">
<td>动力管理</td>
<td><input type="number" placeholder="填写" /></td>
<td>
<div class="div-textarea" contenteditable="true">点击填写</div>
</td>
</tr>
</table>
</section>
......
......@@ -134,7 +134,7 @@
<table border="0" cellspacing="0" cellpadding="0" class="table-type9">
<tr class="table-tr-single">
<td colspan="6">同联六项管理、自我考核评分标准(每项1-10分)</td>
<td colspan="5">同联五项管理、自我考核评分标准(每项1-10分)</td>
</tr>
<tr>
<td>六项管理</td>
......@@ -176,13 +176,6 @@
<div class="div-textarea" contenteditable="true">点击填写</div>
</td>
</tr>
<tr class="">
<td>动力管理</td>
<td><input type="number" placeholder="填写" /></td>
<td>
<div class="div-textarea" contenteditable="true">点击填写</div>
</td>
</tr>
</table>
</section>
......
......@@ -163,7 +163,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>
......
......@@ -248,7 +248,6 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
_doc.on('click', '#maid_save_btn', function(e){
e.preventDefault();
e.stopPropagation();
// bargain.maidSave();
bargain.maidConfirmOk(0);
});
......@@ -723,7 +722,8 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
'last_commission_id': _$v.attr('lastid')?_$v.attr('lastid'):0,//最后一个提交的记录id
'is_account_commission': type//0是保存,1是确认分佣
};
if(_scaleVal == '' || _shouldCommissionVal == ''){
if((type == '1') && (_scaleVal == '' || _shouldCommissionVal == '')){
//如果是确认分佣,则每项必填。保存,则不加限制
_stopFlag = true;
}else{
var _parObj2 = _$v.find('.detail-modal-maid-mix-td>div');
......@@ -738,7 +738,8 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
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(_sfyj == ''||_sxf == ''||_csjj == ''||_xjj == ''||_ssyj == ''){
if((type == '1') && (_sfyj == ''||_sxf == ''||_csjj == ''||_xjj == ''||_ssyj == '')){
//如果是确认分佣,则每项必填。保存,则不加限制
_stopFlag = true;
}else{
_dataTemp['commission_date['+i2+']'] = {
......@@ -747,7 +748,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
'scale': Number(_scaleVal),//分佣比例
'should_commission': _shouldCommissionVal,//应分佣金
'commission_id': _cid,//子记录id
'real_fee': _sfyj,//分佣金
'real_fee': _sfyj,//分佣金
'service_charge': _sxf,//手续费
'charity_fund': _csjj,//慈善基金
'cash': _xjj,//现金奖
......@@ -755,7 +756,6 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
'step': bargain.mainTabIndex+1
};
}
});
}else{
......@@ -768,6 +768,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
_scaleTotal += Number($.trim(v.innerHTML));
});
if(_scaleTotal != 100){
//确认分佣和保存,都必须满足比例等于100%才能提交
_stopFlag = true;
_errorTips = '分佣比例一定要是100%,否则无法提交';
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment