Commit cc6eeafe authored by panhong18943's avatar panhong18943

茂甲起租付款流程优化

parent 38ffcfd3
......@@ -86,7 +86,8 @@
v.entrusted_amount,
v.amount_tenant,
v.write_off_date,
v.write_off_amount
v.write_off_amount,
v.division
FROM (SELECT t.contract_id,
(SELECT hbbc.bank_account_id
FROM hls_bp_master_bank_account hbbc
......@@ -216,7 +217,8 @@
where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=t.contract_id) write_off_date,
nvl((select sum(cwo.write_off_due_amount) write_off_amount
from csh_write_off cwo
where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=t.contract_id),0) write_off_amount
where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=t.contract_id),0) write_off_amount,
t.division
FROM con_contract_cashflow f
join con_contract t
on t.contract_id = f.contract_id
......
......@@ -130,8 +130,8 @@
where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=c.contract_id) write_off_date,
nvl((select sum(cwo.write_off_due_amount) write_off_amount
from csh_write_off cwo
where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=c.contract_id),0) write_off_amount
where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=c.contract_id),0) write_off_amount,
c.division
from csh_payment_req_ln cpr,
con_contract c,
hls_bp_master hbm,
......
......@@ -66,7 +66,6 @@
}
//如果头id 不为空,就使用自在定义的ds进行查询
Leaf.onReady(function () {
debugger;
if ('${/parameter/@source_type}' == 'WFL') {
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
......@@ -150,7 +149,6 @@
};
window['${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) {
debugger;
var hdds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var hd_ds, lineRecords, currency_code;
......@@ -174,13 +172,21 @@
}
}
}
var lnds_records = $(ds_id).getAll();
if (ds.id == ds_id) {
for (var i = 0; i < lnds_records.length; i++) {
if (lnds_records[i].get('division') == '70') {
lnds_records[i].getField('tenant_bank_account_number').setRequired(false);
lnds_records[i].getField('tenant_bank_account_number_n').setRequired(false);
}
}
}
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
};
var first_load_flag = 'N';
function on_csh_payment_req_temp_ln_ds_load(ds) {
debugger;
var lnds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var records = ds.getAll();
if (!'${/parameter/@payment_req_id}' && lnds_id && '${/parameter/@business_type}' == 'PAYMENT') {
......@@ -199,6 +205,12 @@
ln_record.getField('tenant_bank_account_number_n').setRequired(false);
ln_record.getField('tenant_bank_account_name').setRequired(false);
}
var ln_record = $(lnds_id).getCurrentRecord();
if (ln_record.get('division') == '70'){
ln_record.getField('tenant_bank_account_number').setRequired(false);
ln_record.getField('tenant_bank_account_number_n').setRequired(false);
}
}
}
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
......@@ -276,7 +288,6 @@
//保存前调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
debugger;
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');
......@@ -448,7 +459,6 @@
};
//保存submitsuccess调用
window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function (ds, record, res, bp_seq) {
debugger;
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
dirty_flag = 'N';
var hdds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
......
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