Commit f5507ecd authored by stone's avatar stone

【fix】修改付款申请bug

parent 09172d70
......@@ -12,10 +12,10 @@
select *
from ( select count(*) total_number,
TRIM(to_char(sum(nvl(c.lease_item_amount, 0)),'999,999,999,999.99')) sum_amount,
TRIM(to_char(sum(nvl(v.amount_agent, 0)),'999,999,999,999.99')) sum_amount_agent,
TRIM(to_char(sum(nvl(v.amount_vender, 0)),'999,999,999,999.99')) sum_amount_vender,
TRIM(to_char(sum(nvl(v.other_payment2, 0)),'999,999,999,999.99')) sum_other_payment,
TRIM(to_char(sum(nvl(c.lease_item_amount, 0)),'FM999,999,999,990.00')) sum_amount,
TRIM(to_char(sum(nvl(v.amount_agent, 0)),'FM999,999,999,990.00')) sum_amount_agent,
TRIM(to_char(sum(nvl(v.amount_vender, 0)),'FM999,999,999,990.00')) sum_amount_vender,
TRIM(to_char(sum(nvl(v.other_payment2, 0)),'FM999,999,999,990.00')) sum_other_payment,
to_char(sysdate, 'yyyy') || '年' || to_char(sysdate, 'mm') || '月' purchase_date
from csh_payment_req_ln v,con_contract c
WHERE v.ref_doc_id=c.contract_id
......
......@@ -292,6 +292,13 @@
var payment_req_id = hd_record.get('payment_req_id');
var line_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var line_record = $(line_ds_id).getAt(0);
// var datas=$(line_ds_id).data;
// if(datas.length<=0){
// $L.showInfoMessage("提示",'无付款记录,不可提交审批!');
// window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
// return;
// }
// if (line_record.get('cf_item') == '52' || line_record.get('cf_item') == '509') {
// //保证金退还Doodream审批接口 CFL-FE5D96CF-694C-4290-A22E-241FC3F6DEF0
// var case_type = 'CFL-FE5D96CF-694C-4290-A22E-241FC3F6DEF0';
......@@ -718,6 +725,11 @@
var check_flag = false;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
var ds_line_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
if($(ds_line_id).data.length<=0){
$L.showErrorMessage("错误",'无付款记录,不可提交审批!');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return;
}
var total_amount_agent=0;
var total_amount_vender=0;
......
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