Commit 011f9704 authored by 38823's avatar 38823

采购单和合同起租 付款预定日调整

parent c7cb90f3
...@@ -634,10 +634,10 @@ ...@@ -634,10 +634,10 @@
var contract_id = record.get('contract_id'); var contract_id = record.get('contract_id');
var ref_d09 = timestampToTime(Date.parse(lease_item_record.get('ref_d09'))); var ref_d09 = timestampToTime(Date.parse(lease_item_record.get('ref_d09')));
var lease_start_date = timestampToTime(Date.parse(record.get('lease_start_date'))); var lease_start_date = timestampToTime(Date.parse(record.get('lease_start_date')));
if(lease_start_date>ref_d09){ /*if(lease_start_date>ref_d09){
Leaf.showMessage('${l:PROMPT}','采购单的付款预定日期需大于合同起租日,请重新选择!'); Leaf.showMessage('${l:PROMPT}','采购单的付款预定日期需大于合同起租日,请重新选择!');
return; return;
} }*/
if (lease_item_record.dirty) { if (lease_item_record.dirty) {
Leaf.showMessage('${l:PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}'); Leaf.showMessage('${l:PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
return; return;
...@@ -824,10 +824,10 @@ ...@@ -824,10 +824,10 @@
var ref_d09 = timestampToTime(Date.parse(lease_item_record.get('ref_d09'))); var ref_d09 = timestampToTime(Date.parse(lease_item_record.get('ref_d09')));
var lease_start_date = timestampToTime(Date.parse(contract_record.get('lease_start_date'))); var lease_start_date = timestampToTime(Date.parse(contract_record.get('lease_start_date')));
//校验付款预定日期 //校验付款预定日期
if(lease_start_date>ref_d09){ /*if(lease_start_date>ref_d09){
Leaf.showMessage('${l:PROMPT}','采购单的付款预定日期需大于合同起租日,请重新选择!'); Leaf.showMessage('${l:PROMPT}','采购单的付款预定日期需大于合同起租日,请重新选择!');
return false; return false;
} }*/
//校验合同状态 //校验合同状态
if(!Leaf.isEmpty(contract_status)){ if(!Leaf.isEmpty(contract_status)){
Leaf.request({ Leaf.request({
......
...@@ -639,7 +639,7 @@ ...@@ -639,7 +639,7 @@
} }
//将申请信息中的预计采购日期同步到报价信息 //将申请信息中的预计采购日期同步到报价信息
if(base_ds_id == ds.id&&base_ds_id){ if(base_ds_id == ds.id&&base_ds_id){
if(name == 'ref_d10'&&value){ if(name == 'ref_d09'&&value){
var record_quotation = $(prj_quotation_ds_id).getCurrentRecord(); var record_quotation = $(prj_quotation_ds_id).getCurrentRecord();
record_quotation.set('contract_inception_date',value); record_quotation.set('contract_inception_date',value);
} }
......
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