Commit 02e01bb4 authored by lizhe's avatar lizhe

取消机号校验请求

parent 681b2a2d
...@@ -844,35 +844,6 @@ ...@@ -844,35 +844,6 @@
} }
} }
if(!Leaf.isEmpty(secondary_lease) && secondary_lease!='YES') {
if (division == '92' && !Leaf.isEmpty(machine_number)) {
Leaf.request({
url: $('check_machine_number_id').getUrl(),
para: {
machine_number: machine_number,
project_id: project_id
},
scope: this,
success: function (res) {
machine_number_num = res.result.record.v_count;
},
failure: function () {
return false;
},
scope: this,
sync: true
});
}
if (machine_number_num > 0 && count == 0) {
count = count + 1;
$L.showErrorMessage('提示', '该机号已存在,请重新确认!');
return false;
} else if (machine_number_num > 0 && count != 0) {
count = 0;
return false;
}
}
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -426,36 +426,6 @@ ...@@ -426,36 +426,6 @@
var project_id = project_record.get('project_id'); var project_id = project_record.get('project_id');
var machine_number_num = 0; var machine_number_num = 0;
var secondary_lease = project_record.get('secondary_lease'); var secondary_lease = project_record.get('secondary_lease');
if(!Leaf.isEmpty(secondary_lease) && secondary_lease !='YES'){
if(division == '92' && !Leaf.isEmpty(machine_number)){
Leaf.request({
url: $('check_machine_number_id').getUrl(),
para: {
machine_number: machine_number,
project_id :project_id
},
scope: this,
success: function (res) {
machine_number_num= res.result.record.v_count;
},
failure: function () {
return false;
},
scope: this,
sync: true
});
}
if (machine_number_num>0 && count == 0){
count = count+1;
$L.showErrorMessage('提示', '该机号已存在,请重新确认!');
return false;
}else if(machine_number_num>0 && count != 0){
count = 0;
return false;
}
}
var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail'); var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord(); var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord();
if (prj_project_ds_id == ds.id && prj_project_ds_id) { if (prj_project_ds_id == ds.id && prj_project_ds_id) {
......
...@@ -409,35 +409,6 @@ ...@@ -409,35 +409,6 @@
var project_id = project_record.get('project_id'); var project_id = project_record.get('project_id');
var machine_number_num = 0; var machine_number_num = 0;
var secondary_lease = project_record.get('secondary_lease'); var secondary_lease = project_record.get('secondary_lease');
if(!Leaf.isEmpty(secondary_lease) && secondary_lease !='YES'){
if(division == '92' && !Leaf.isEmpty(machine_number)){
Leaf.request({
url: $('check_machine_number_id').getUrl(),
para: {
machine_number: machine_number,
project_id :project_id
},
scope: this,
success: function (res) {
machine_number_num= res.result.record.v_count;
},
failure: function () {
return false;
},
scope: this,
sync: true
});
}
if (machine_number_num>0 && count == 0){
count = count+1;
$L.showErrorMessage('提示', '该机号已存在,请重新确认!');
return false;
}else if(machine_number_num>0 && count != 0){
count = 0;
return false;
}
}
var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail'); var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
......
...@@ -2147,48 +2147,6 @@ ...@@ -2147,48 +2147,6 @@
var project_id = project_record.get('project_id'); var project_id = project_record.get('project_id');
var machine_number_num = 0; var machine_number_num = 0;
var secondary_lease = project_record.get('secondary_lease'); var secondary_lease = project_record.get('secondary_lease');
if(!Leaf.isEmpty(secondary_lease) && secondary_lease!='YES'){
if(division == '92' && !Leaf.isEmpty(machine_number)){
Leaf.request({
url: $('check_machine_number_id').getUrl(),
para: {
machine_number: machine_number,
project_id : project_id
},
scope: this,
success: function (res) {
machine_number_num= res.result.record.v_count;
},
failure: function () {
return false;
},
scope: this,
sync: true
});
}
if (machine_number_num>0 && count == 0){
count = count+1;
$L.showErrorMessage('提示', '该机号已存在,请重新确认!');
return false;
}else if(machine_number_num>0 && count != 0){
count = 0;
return false;
}
}
//神钢建机,新报单的机号与关联的合同机号必须相同
if(division == '91'){
var machine_number1 = lease_item_record.get('machine_number');
var machine_number2 = project_record.get('machine_number');
if(typeof(machine_number1) != 'undefined' && typeof(machine_number2) != 'undefined'){
if( machine_number1 != machine_number2){
$L.showErrorMessage('提示', '新报单的机号与关联的合同机号必须相同!');
return false;
}
}
}
return true; return true;
......
...@@ -1764,37 +1764,6 @@ ...@@ -1764,37 +1764,6 @@
var project_id = project_record.get('project_id'); var project_id = project_record.get('project_id');
var machine_number_num = 0; var machine_number_num = 0;
var secondary_lease = project_record.get('secondary_lease'); var secondary_lease = project_record.get('secondary_lease');
if(!Leaf.isEmpty(secondary_lease) && secondary_lease!='YES'){
if(division == '92' && !Leaf.isEmpty(machine_number)){
Leaf.request({
url: $('check_machine_number_id').getUrl(),
para: {
machine_number: machine_number,
project_id : project_id
},
scope: this,
success: function (res) {
machine_number_num= res.result.record.v_count;
},
failure: function () {
return false;
},
scope: this,
sync: true
});
}
if (machine_number_num>0 && count == 0){
count = count+1;
$L.showErrorMessage('提示', '该机号已存在,请重新确认!');
return false;
}else if(machine_number_num>0 && count != 0){
count = 0;
return false;
}
}
return true; return true;
......
...@@ -378,35 +378,6 @@ ...@@ -378,35 +378,6 @@
var machine_number = lease_item_record.get('machine_number_70'); var machine_number = lease_item_record.get('machine_number_70');
var machine_number_num = 0; var machine_number_num = 0;
var secondary_lease = project_record.get('secondary_lease'); var secondary_lease = project_record.get('secondary_lease');
if(!Leaf.isEmpty(secondary_lease) && secondary_lease !='YES') {
if (division == '92' && !Leaf.isEmpty(machine_number)) {
Leaf.request({
url: $('prj501n_check_machine_number_id').getUrl(),
para: {
machine_number: machine_number,
project_id: project_id
},
scope: this,
success: function (res) {
machine_number_num = res.result.record.v_count;
},
failure: function () {
return false;
},
scope: this,
sync: true
});
}
if (machine_number_num > 0 && count == 0) {
count = count + 1;
$L.showErrorMessage('提示', '该机号已存在,请重新确认!');
return false;
} else if (machine_number_num > 0 && count != 0) {
count = 0;
return false;
}
}
if(!bp_rate_flag){ if(!bp_rate_flag){
return false; return false;
} }
......
...@@ -419,47 +419,6 @@ ...@@ -419,47 +419,6 @@
var machine_number = lease_item_record.get('machine_number_70'); var machine_number = lease_item_record.get('machine_number_70');
var machine_number_num = 0; var machine_number_num = 0;
var secondary_lease = project_record.get('secondary_lease'); var secondary_lease = project_record.get('secondary_lease');
if(!Leaf.isEmpty(secondary_lease) && secondary_lease !='YES') {
if ((division == '92' || division == '70') && !Leaf.isEmpty(machine_number)) {
Leaf.request({
url: $('prj501n_check_machine_number_id').getUrl(),
para: {
machine_number: machine_number,
project_id: project_id
},
scope: this,
success: function (res) {
machine_number_num = res.result.record.v_count;
},
failure: function () {
return false;
},
scope: this,
sync: true
});
}
if (machine_number_num > 0 && count == 0) {
count = count + 1;
$L.showErrorMessage('提示', '该机号已存在,请重新确认!');
return false;
} else if (machine_number_num > 0 && count != 0) {
count = 0;
return false;
}
}
//神钢建机,新报单的机号与关联的合同机号必须相同
if(division == '91'){
debugger;
var machine_number1 = lease_item_record.get('machine_number');
var machine_number2 = project_record.get('machine_number');
if(typeof(machine_number1) != 'undefined' && typeof(machine_number2) != 'undefined'){
if( machine_number1 != machine_number2){
$L.showErrorMessage('提示', '新报单的机号与关联的合同机号必须相同!');
return false;
}
}
}
if(!bp_rate_flag){ if(!bp_rate_flag){
return false; return false;
} }
......
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