|
|
|
@ -448,23 +448,23 @@
|
|
|
|
|
var flag = false;
|
|
|
|
|
|
|
|
|
|
// 判断相反的是否已经存在该公司节点
|
|
|
|
|
$('.reward-data-info,.punish-data-info').each(function(){
|
|
|
|
|
var node_info = $(this).find('.info').val();
|
|
|
|
|
if (node_info) {
|
|
|
|
|
var otherData = JSON.parse(node_info);
|
|
|
|
|
// console.log(otherData)
|
|
|
|
|
// console.log((data['company_id'] != '0' ? data['company_id'] == otherData['company_id'] : data['company_name'] == otherData['company_name']) );
|
|
|
|
|
// console.log(data['company_type'] == otherData['company_type'] );
|
|
|
|
|
// 判断对立面是否有相同的公司或者部门
|
|
|
|
|
if ((data['company_type'] == otherData['company_type'])
|
|
|
|
|
&& (data['company_id'] != '0' ? data['company_id'] == otherData['company_id'] : data['company_name'] == otherData['company_name']) ) {
|
|
|
|
|
//console.log('已有相此公司的奖罚,请检查')
|
|
|
|
|
layer.closeAll();
|
|
|
|
|
layer.msg('已有此公司的奖罚,请检查');
|
|
|
|
|
flag = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
// $('.reward-data-info,.punish-data-info').each(function(){
|
|
|
|
|
// var node_info = $(this).find('.info').val();
|
|
|
|
|
// if (node_info) {
|
|
|
|
|
// var otherData = JSON.parse(node_info);
|
|
|
|
|
// // console.log(otherData)
|
|
|
|
|
// // console.log((data['company_id'] != '0' ? data['company_id'] == otherData['company_id'] : data['company_name'] == otherData['company_name']) );
|
|
|
|
|
// // console.log(data['company_type'] == otherData['company_type'] );
|
|
|
|
|
// // 判断对立面是否有相同的公司或者部门
|
|
|
|
|
// if ((data['company_type'] == otherData['company_type'])
|
|
|
|
|
// && (data['company_id'] != '0' ? data['company_id'] == otherData['company_id'] : data['company_name'] == otherData['company_name']) ) {
|
|
|
|
|
// //console.log('已有相此公司的奖罚,请检查')
|
|
|
|
|
// layer.closeAll();
|
|
|
|
|
// layer.msg('已有此公司的奖罚,请检查');
|
|
|
|
|
// flag = true;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
|
|
if (flag) {
|
|
|
|
|
return false;
|
|
|
|
|