Skip to content

L
leaf-hlcm
Commit ff4a0811 authored by stone's avatar stone
Browse files
Options

Merge branch 'feature/paypment_pay_feature' into develop

parents 0d8fc5a4 099a0f75
Show whitespace changes
Inline Side-by-side
Showing with 183 additions and 64 deletions
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query.lwm
View file @ ff4a0811
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
'NEW' approval_status, 'NEW' approval_status,
v.invoice_uploaded_flag, v.invoice_uploaded_flag,
v.invoice_uploaded_flag_n, v.invoice_uploaded_flag_n,
v.bp_id_agent_level1,
v.times, v.times,
v.cashflow_id, v.cashflow_id,
v.cashflow_id ref_doc_line_id, v.cashflow_id ref_doc_line_id,
...@@ -95,6 +96,7 @@ ...@@ -95,6 +96,7 @@
t.contract_name, t.contract_name,
t.document_category, t.document_category,
t.search_term_1, t.search_term_1,
t.bp_id_agent_level1,
p.project_name, p.project_name,
t.bp_id_tenant tenant_bp_id, t.bp_id_tenant tenant_bp_id,
h.description cf_description, h.description cf_description,
......
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query_after_save.lwm
View file @ ff4a0811
...@@ -13,7 +13,12 @@ ...@@ -13,7 +13,12 @@
from (select c.contract_number, from (select c.contract_number,
c.contract_name, c.contract_name,
hbm.bp_name, hbm.bp_name,
cpr.apply_pay_date,
cpr.bp_bank_account_id, cpr.bp_bank_account_id,
(select cph.payment_req_number
from csh_payment_req_hd cph
where cpr.payment_req_id = cph.payment_req_id) payment_req_number,
cpr.ref_doc_line_id cashflow_id,
(select times (select times
from con_contract_cashflow ccc from con_contract_cashflow ccc
where ccc.cashflow_id = cpr.ref_doc_line_id) times, where ccc.cashflow_id = cpr.ref_doc_line_id) times,
...@@ -25,13 +30,17 @@ ...@@ -25,13 +30,17 @@
where hci.cf_item = ccc.cf_item where hci.cf_item = ccc.cf_item
and hci.cf_type = ccc.cf_type and hci.cf_type = ccc.cf_type
and ccc.cashflow_id = cpr.ref_doc_line_id) CF_DESCRIPTION, and ccc.cashflow_id = cpr.ref_doc_line_id) CF_DESCRIPTION,
（select c.transaction_num /* (select c.transaction_num
from csh_transaction c
where c.source_doc_line_id = cpr.payment_req_ln_id
and c.source_doc_id = cpr.payment_req_id) transaction_num,
(select c.bank_slip_num
from csh_transaction c from csh_transaction c
where c.source_doc_line_id = cpr.payment_req_ln_id where c.source_doc_line_id = cpr.payment_req_ln_id
and c.source_doc_id = cpr.payment_req_id and c.source_doc_id = cpr.payment_req_id
and c.transaction_type = 'PAYMENT') transaction_num, and c.transaction_type = 'PAYMENT') bank_slip_num,*/
--bp_id 存的是哪个字段
(select bp_name (select bp_name
from hls_bp_master hbm from hls_bp_master hbm
where hbm.bp_id = cpr.bp_id) BP_ID_AGENT_N, where hbm.bp_id = cpr.bp_id) BP_ID_AGENT_N,
...@@ -48,8 +57,8 @@ ...@@ -48,8 +57,8 @@
cpr.amount_agent, cpr.amount_agent,
cpr.amount_vender, cpr.amount_vender,
--未付金额 --未付金额
(cpr.amount_agent-nvl(cpr.amount_agent_paid,0)) residual_agent_amount, (cpr.amount_agent - nvl(cpr.amount_agent_paid, 0)) residual_agent_amount,
(cpr.amount_vender-nvl(cpr.amount_vender_paid,0)) residual_vender_amount, (cpr.amount_vender - nvl(cpr.amount_vender_paid, 0)) residual_vender_amount,
(select bp_name (select bp_name
from hls_bp_master hbm from hls_bp_master hbm
......
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_selected.lwm
View file @ ff4a0811
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
hls_bp_master hbm, hls_bp_master hbm,
con_contract t con_contract t
WHERE i.contract_id = t.contract_id WHERE i.contract_id = t.contract_id
AND i.lease_item_id = hli.lease_item_id AND i.lease_item_id = hli.lease_item_id(+)
AND i.enabled_flag = 'Y' AND i.enabled_flag = 'Y'
AND i.equipment_type = 'MAIN' AND i.equipment_type = 'MAIN'
AND t.contract_id = f.contract_id AND t.contract_id = f.contract_id
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
AND t.contract_status NOT IN AND t.contract_status NOT IN
('NEW', 'SIGN', 'CANCEL', 'PENDING', 'CLOSED') ('NEW', 'SIGN', 'CANCEL', 'PENDING', 'CLOSED')
--测试用，cf_itme应当为0 --测试用，cf_itme应当为0
AND f.cf_item <> 0) t1 AND f.cf_item in (0,21)) t1
#WHERE_CLAUSE# #WHERE_CLAUSE#
#ORDER_BY_CLAUSE# #ORDER_BY_CLAUSE#
......
src/main/webapp/WEB-INF/classes/csh/CSH502/csh_payment_req_pay.lwm
View file @ ff4a0811
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
p_payment_req_id=>${@payment_req_id}, p_payment_req_id=>${@payment_req_id},
p_session_id=>${/session/@session_id}, p_session_id=>${/session/@session_id},
p_pay_date=>to_date(${@transaction_date},'yyyy-mm-dd'), p_pay_date=>to_date(${@transaction_date},'yyyy-mm-dd'),
p_pay_amount=>${@transaction_amount}, p_pay_amount=>${@amt},
p_company_id=>${/session/@company_id}, p_company_id=>${/session/@company_id},
p_internal_period_num=>${@internal_period_num}, p_internal_period_num=>${@internal_period_num},
p_period_name=>${@period_name}, p_period_name=>${@period_name},
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
p_handling_charge=>nvl(${@handling_charge},0), p_handling_charge=>nvl(${@handling_charge},0),
p_payment_method_id =>${@payment_method_id}, p_payment_method_id =>${@payment_method_id},
p_payment_status =>${@payment_status}, p_payment_status =>${@payment_status},
p_this_pay_agent_amount=>nvl(${@this_pay_agent_amount},0),
p_this_pay_vender_amount=>nvl(${@this_pay_vender_amount},0),
p_merge_flag =>nvl(${@merge_flag},'N'), p_merge_flag =>nvl(${@merge_flag},'N'),
p_due_amount =>nvl(${@due_amount},0)); p_due_amount =>nvl(${@due_amount},0));
end;]]></bm:update-sql> end;]]></bm:update-sql>
......
src/main/webapp/WEB-INF/classes/csh/CSH502/csh_payment_req_query.lwm
View file @ ff4a0811
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
where cprl.payment_req_id = h.payment_req_id) residual_agent_amount, where cprl.payment_req_id = h.payment_req_id) residual_agent_amount,
--统计所有的未付厂商金额 --统计所有的未付厂商金额
(select sum(cprl.amount_vender - (select sum(cprl.amount_vender -
nvl(cprl.amount_agent_paid, 0)) nvl(cprl.amount_vender_paid, 0))
from csh_payment_req_ln cprl from csh_payment_req_ln cprl
where cprl.payment_req_id = h.payment_req_id) residual_vender_amount, where cprl.payment_req_id = h.payment_req_id) residual_vender_amount,
--获取厂商字段 --获取厂商字段
...@@ -130,6 +130,15 @@ ...@@ -130,6 +130,15 @@
-- ) -- )
-- ) -- )
-- )price, -- )price,
( select bp_name
from hls_bp_master hbm
where hbm.bp_id = (
select hbmba.bp_id
from csh_payment_req_ln cprl , hls_bp_master_bank_account hbmba
where cprl.bp_bank_account_id=hbmba.bank_account_id
and cprl.payment_req_id=h.payment_req_id
and rownum <= 1
)) bp_id_agent_n,
(select sv.code_value_name (select sv.code_value_name
from hls_bpm_interface hi, sys_code_values_v sv from hls_bpm_interface hi, sys_code_values_v sv
where hi.payment_req_id = h.payment_req_id where hi.payment_req_id = h.payment_req_id
...@@ -149,9 +158,8 @@ ...@@ -149,9 +158,8 @@
AND h.company_id IN AND h.company_id IN
(SELECT company_id (SELECT company_id
FROM fnd_companies FROM fnd_companies
START WITH company_id = ${/session/@company_id} START WITH company_id = 1
CONNECT BY prior company_id = parent_biz_company_id)) v CONNECT BY prior company_id = parent_biz_company_id)) v
#WHERE_CLAUSE#
ORDER BY v.req_date DESC, v.payment_req_number DESC ORDER BY v.req_date DESC, v.payment_req_number DESC
]]></bm:query-sql> ]]></bm:query-sql>
......
src/main/webapp/modules/csh/CSH501/csh_payment_req.lview
View file @ ff4a0811
...@@ -285,7 +285,7 @@ ...@@ -285,7 +285,7 @@
var hd_record = $(ds_id).getCurrentRecord(); var hd_record = $(ds_id).getCurrentRecord();
var payment_req_id = hd_record.get('payment_req_id'); 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_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var line_record = $(line_ds_id).getAll()[0]; var line_record = $(line_ds_id).getAt(0);
if (line_record.get('cf_item') == '52' || line_record.get('cf_item') == '509') { if (line_record.get('cf_item') == '52' || line_record.get('cf_item') == '509') {
//保证金退还Doodream审批接口 CFL-FE5D96CF-694C-4290-A22E-241FC3F6DEF0 //保证金退还Doodream审批接口 CFL-FE5D96CF-694C-4290-A22E-241FC3F6DEF0
var case_type = 'CFL-FE5D96CF-694C-4290-A22E-241FC3F6DEF0'; var case_type = 'CFL-FE5D96CF-694C-4290-A22E-241FC3F6DEF0';
...@@ -412,6 +412,14 @@ ...@@ -412,6 +412,14 @@
window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function () { window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function () {
Leaf.SideBar.enable = false; Leaf.SideBar.enable = false;
//提交之前必须要保存
/* var hdds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
var hd_record = $(hdds_id).getCurrentRecord();
var payment_req_id = hd_record.get('payment_req_id');
if(payment_req_id){
$L.showInfoMessage("提示",'请先保存数据！');
return;
}*/
window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](csh_payment_req_submit_finally); window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](csh_payment_req_submit_finally);
}; };
...@@ -603,6 +611,7 @@ ...@@ -603,6 +611,7 @@
line_records = ln_ds.getSelected(); line_records = ln_ds.getSelected();
var payment_req_id = hd_record.get('payment_req_id'); var payment_req_id = hd_record.get('payment_req_id');
if (line_records.length == 0) { if (line_records.length == 0) {
Leaf.showMessage('${l:PROMPT}', '请选择一条单据进行确认！');
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return; return;
} }
...@@ -632,6 +641,7 @@ ...@@ -632,6 +641,7 @@
return; return;
} */ } */
//支付金额为应付代理店 //支付金额为应付代理店
var this_pay_amount=plus(line_record.get('residual_agent_amount'),line_record.get('residual_vender_amount')); var this_pay_amount=plus(line_record.get('residual_agent_amount'),line_record.get('residual_vender_amount'));
if (this_pay_amount <=0) { if (this_pay_amount <=0) {
...@@ -653,14 +663,18 @@ ...@@ -653,14 +663,18 @@
bp_bank_account_code_n = line_record.get('bp_bank_account_code_n'); bp_bank_account_code_n = line_record.get('bp_bank_account_code_n');
bp_bank_account_id = line_record.get('bp_bank_account_id'); bp_bank_account_id = line_record.get('bp_bank_account_id');
contract_id = line_record.get('contract_id'); contract_id = line_record.get('contract_id');
line_record.set('loan_date',hd_record.get('loan_date')) line_record.set('loan_date',hd_record.get('loan_date'));
line_record.set('hdds_id',hdds_id);
line_record.set('lnds_id',lnds_id);
line_record.set('winid','csh_payment_req_pay_win');
var data=[]; var data=[];
data.push(line_record); data.push(line_record);
var win = new Leaf.Window({ var win = new Leaf.Window({
id: 'csh_payment_req_pay_win', id: 'csh_payment_req_pay_win',
url: $('csh_payment_req_pay_win_link').getUrl(), url: $('csh_payment_req_pay_win_link').getUrl(),
params: params:line_record.data,
{ /* {
payment_req_id: payment_req_id, payment_req_id: payment_req_id,
winid: 'csh_payment_req_pay_win', winid: 'csh_payment_req_pay_win',
hdds_id: hdds_id, hdds_id: hdds_id,
...@@ -674,7 +688,7 @@ ...@@ -674,7 +688,7 @@
loan_date: hd_record.get('loan_date') loan_date: hd_record.get('loan_date')
//first_contract_day: hd_record.get('first_contract_day') //first_contract_day: hd_record.get('first_contract_day')
// ,first_repayment_flag: first_repayment_flag // ,first_repayment_flag: first_repayment_flag
}, },*/
title: '${l:CSH502.CSH_PAYMENT_REQ_PAY}', title: '${l:CSH502.CSH_PAYMENT_REQ_PAY}',
fullScreen: true fullScreen: true
}); });
...@@ -710,8 +724,14 @@ ...@@ -710,8 +724,14 @@
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false; return false;
} }
if((amount_agent+amount_vender+other_payment2)!=due_amount){ console.log(amount_agent);
check_due_amount_flag=false; console.log(amount_vender);
console.log(other_payment2);
console.log(due_amount);
if(plus(plus(amount_agent,amount_vender),other_payment2)!=due_amount){
$L.showErrorMessage("提示",'应付我司金额,委托付款金额和首付款抵充金额之后应等于应付金额！');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
} }
//本次申请金额等于委托加我司 //本次申请金额等于委托加我司
var this_apply_amount=plus(amount_agent,amount_vender); var this_apply_amount=plus(amount_agent,amount_vender);
...@@ -1139,9 +1159,10 @@ ...@@ -1139,9 +1159,10 @@
// }; // };
window['${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function (ds, qpara, bp_seq) { window['${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function (ds, qpara, bp_seq) {
/* debugger
var hdds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd'); var hdds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
var hd_record = $(hdds_id).getCurrentRecord(); var hd_record = $(hdds_id).getAt(0);
qpara['payment_req_id'] = hd_record.get('payment_req_id'); qpara['payment_req_id'] = hd_record.get('payment_req_id');*/
/*if (hd_record.get('bp_id_vender_n')) { /*if (hd_record.get('bp_id_vender_n')) {
qpara['bp_id_vender_n'] = hd_record.get('bp_id_vender_n'); qpara['bp_id_vender_n'] = hd_record.get('bp_id_vender_n');
}*/ }*/
......
src/main/webapp/modules/csh/CSH502/csh_payment_req_pay.lview
View file @ ff4a0811
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
<a:link id="con_doc_batch_create_link_id" url="${/request/@context_path}/modules/cont/CON500/con_doc_batch_create.lsc"/> <a:link id="con_doc_batch_create_link_id" url="${/request/@context_path}/modules/cont/CON500/con_doc_batch_create.lsc"/>
<a:link id="con_doc_batch_create_job_link_id" url="${/request/@context_path}/modules/csh/CSH502/csh_atm_batch_download_pdf_job.lsc"/> <a:link id="con_doc_batch_create_job_link_id" url="${/request/@context_path}/modules/csh/CSH502/csh_atm_batch_download_pdf_job.lsc"/>
<a:link id="csh_atm_batch_download_pdf_link_id" url="${/request/@context_path}/modules/csh/CSH502/csh_atm_batch_download_pdf.lsc"/> <a:link id="csh_atm_batch_download_pdf_link_id" url="${/request/@context_path}/modules/csh/CSH502/csh_atm_batch_download_pdf.lsc"/>
<script src="${/request/@context_path}/javascripts/calculate.js" type="text/javascript"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
function csh502_pay_lock_window() { function csh502_pay_lock_window() {
...@@ -42,7 +43,21 @@ ...@@ -42,7 +43,21 @@
function csh502_payment_pay_submit() { function csh502_payment_pay_submit() {
var record = $('csh_payment_req_pay_ds').getCurrentRecord(); var record = $('csh_payment_req_pay_ds').getCurrentRecord();
if (record.validateRecord(true)) { var check_flag=true;
var this_pay_agent_amount=record.get('this_pay_agent_amount');
var this_pay_vender_amount=record.get('this_pay_vender_amount');
var residual_agent_amount=record.get('residual_agent_amount');
var residual_vender_amount=record.get('residual_vender_amount');
var pay_amount=plus(this_pay_agent_amount,this_pay_vender_amount);
record.set('transaction_amount', pay_amount);
//检验手动输入的金额必须小于应付金额
if((this_pay_agent_amount>residual_agent_amount)||(this_pay_vender_amount>residual_vender_amount)){
$L.showErrorMessage("提示",'本次付代理店金额,厂商金额不能超过未付金额！');
check_flag=false;
}
if (record.validateRecord(true)&&check_flag){
console.log('${/parameter/@lnds_id}');
ajax_flag = 'Y'; ajax_flag = 'Y';
csh502_pay_lock_window(); csh502_pay_lock_window();
var param = record.data; var param = record.data;
...@@ -53,13 +68,27 @@ ...@@ -53,13 +68,27 @@
pre_line_record.set('_status', 'insert'); pre_line_record.set('_status', 'insert');
pre_line_record.set('type', 'PAYMENT_REQ_PAYMENT'); pre_line_record.set('type', 'PAYMENT_REQ_PAYMENT');
pre_line_record.set('id', pre_line_record.get('payment_req_ln_id')); pre_line_record.set('id', pre_line_record.get('payment_req_ln_id'));
pre_line_record.set('amt', pre_line_record.get('pay_amount') || 0); pre_line_record.set('amt', pay_amount);
pre_line_record.set('transaction_date', record.get('transaction_date'));
pre_line_record.set('internal_period_num', record.get('internal_period_num'));
pre_line_record.set('period_name', record.get('period_name'));
pre_line_record.set('exchange_rate', record.get('exchange_rate'));
pre_line_record.set('payment_description', record.get('payment_description'));
pre_line_record.set('cashflow_id', record.get('cashflow_id'));
pre_line_record.set('bank_slip_num', record.get('bank_slip_num'));
pre_line_record.set('payment_method_id', record.get('payment_method_id'));
pre_line_record.set('merge_flag', record.get('merge_flag'));
pre_line_record.set('this_pay_agent_amount',this_pay_agent_amount );
pre_line_record.set('this_pay_vender_amount',this_pay_vender_amount );
pre_line_record.set('bank_flag','Y' );
//付款行临时表
saveData.push(pre_line_record.data); saveData.push(pre_line_record.data);
} }
param['payment_req_id'] = pre_line_records[0].get('payment_req_id'); param['payment_req_id'] = pre_line_records[0].get('payment_req_id');
param['payment_req_ln_id'] = pre_line_records[0].get('payment_req_ln_id'); param['payment_req_ln_id'] = pre_line_records[0].get('payment_req_ln_id');
param['merge_flag'] = 'N'; param['merge_flag'] = 'N';
param['details'] = saveData; param['details'] = saveData;
console.log(param);
Leaf.showConfirm('${l:PROMPT_MESSAGE}', '确定提交？', function okFun() { Leaf.showConfirm('${l:PROMPT_MESSAGE}', '确定提交？', function okFun() {
Leaf.request({ Leaf.request({
url: $('csh_payment_req_pay_link_id').getUrl(), url: $('csh_payment_req_pay_link_id').getUrl(),
...@@ -335,6 +364,7 @@ ...@@ -335,6 +364,7 @@
function on_csh_payment_req_pay_ds_update(ds, record, name, value, oldvalue) { function on_csh_payment_req_pay_ds_update(ds, record, name, value, oldvalue) {
var handling_charge = record.get('handling_charge'); var handling_charge = record.get('handling_charge');
/* console.log(record);*/
if (Ext.isEmpty(handling_charge)) { if (Ext.isEmpty(handling_charge)) {
handling_charge = 0; handling_charge = 0;
} }
...@@ -366,7 +396,7 @@ ...@@ -366,7 +396,7 @@
} }
} else if (name == 'rate_method_code') { } else if (name == 'rate_method_code') {
record.set('exchange_rate_quotation', ''); record.set('exchange_rate_quotation', '');
record.set('exchange_rate', ''); record.set('exchange_rate', '1');
if (value == 'PERIOD' || value == 'DAILY' || value == 'FIXED') { if (value == 'PERIOD' || value == 'DAILY' || value == 'FIXED') {
record.getField('exchange_rate').setReadOnly(true); record.getField('exchange_rate').setReadOnly(true);
...@@ -397,7 +427,7 @@ ...@@ -397,7 +427,7 @@
} else { } else {
setfunctionamount(record); setfunctionamount(record);
} }
} else if (name == 'transaction_amount') { } /*else if (name == 'transaction_amount') {
if (value === 0 && record.get('zero_amounts_allowed') == 'N') { if (value === 0 && record.get('zero_amounts_allowed') == 'N') {
Leaf.showMessage('${l:PROMPT}', '${l:CSH510.ZERO_AMOUNTS_ALLOWED}'); Leaf.showMessage('${l:PROMPT}', '${l:CSH510.ZERO_AMOUNTS_ALLOWED}');
} }
...@@ -406,9 +436,22 @@ ...@@ -406,9 +436,22 @@
} else { } else {
setfunctionamount(record); setfunctionamount(record);
} }
} else if (name == 'transaction_date') { } */else if (name == 'transaction_date') {
showPeriod(record); showPeriod(record);
} else if (name == 'precision') { }/*else if(name='this_pay_agent_amount'&&value){
if(record.get('this_pay_vender_amount')){
}
}*//*else if(name='this_pay_vender_amount'){
var agent_amount=record.get('this_pay_agent_amount');
alert(agent_amount);
if(agent_amount){
alert(value+agent_amount)
record.set('transaction_amount',value+agent_amount);
}
}*/ else if (name == 'precision') {
record.getField('transaction_amount').setPropertity('decimalprecision', value); record.getField('transaction_amount').setPropertity('decimalprecision', value);
record.getField('transaction_functional_amount').setPropertity('decimalprecision', value); record.getField('transaction_functional_amount').setPropertity('decimalprecision', value);
record.getField('handling_charge').setPropertity('decimalprecision', value); record.getField('handling_charge').setPropertity('decimalprecision', value);
...@@ -508,10 +551,8 @@ ...@@ -508,10 +551,8 @@
// } else { // } else {
// ds.getField('first_payment_date').setRequired(false); // ds.getField('first_payment_date').setRequired(false);
// } // }
console.log('${/parameter}'); /*console.log('${/parameter}');*/
// var lnds='${/parameter/@lnds_id}'; // var lnds='${/parameter/@lnds_id}';
console.log($(lnds));
var date = new Date(); var date = new Date();
if ('${/parameter/@loan_date}') { if ('${/parameter/@loan_date}') {
r_date = (('${/parameter/@loan_date}').match(/\d{4}.\d{1,2}.\d{1,2}/mg).toString()).replace(/[^0-9]/mg, '-'); r_date = (('${/parameter/@loan_date}').match(/\d{4}.\d{1,2}.\d{1,2}/mg).toString()).replace(/[^0-9]/mg, '-');
...@@ -595,6 +636,9 @@ ...@@ -595,6 +636,9 @@
<a:map from="type_code" to="exchange_rate_type"/> <a:map from="type_code" to="exchange_rate_type"/>
<a:map from="rate_method_code" to="rate_method_code"/> <a:map from="rate_method_code" to="rate_method_code"/>
</a:mapping> </a:mapping>
</a:field>
<a:field name="this_pay_agent_amount">
</a:field> </a:field>
<a:field name="transaction_date" defaultValue="${/parameter/@loan_date}" required="true"/> <a:field name="transaction_date" defaultValue="${/parameter/@loan_date}" required="true"/>
<a:field name="exchange_rate_type"/> <a:field name="exchange_rate_type"/>
...@@ -608,8 +652,7 @@ ...@@ -608,8 +652,7 @@
<a:field name="currency_name" defaultValue="人民币"/> <a:field name="currency_name" defaultValue="人民币"/>
<a:field name="bank_account_id" defaultValue="1531"/> <a:field name="bank_account_id" defaultValue="1531"/>
<a:field name="bank_account_name"/> <a:field name="bank_account_name"/>
<a:field name="bank_account_num"/> <a:field name="bank_account_num" autoComplete="true" autoCompleteField="bank_account_num" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850" required="true" title="CSH511.BANK_ACCOUNT_CODE">
<a:field name="bank_account_code" autoComplete="true" autoCompleteField="bank_account_num" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850" required="true" title="CSH511.BANK_ACCOUNT_CODE">
<a:mapping> <a:mapping>
<a:map from="precision" to="precision"/> <a:map from="precision" to="precision"/>
<a:map from="zero_amounts_allowed" to="zero_amounts_allowed"/> <a:map from="zero_amounts_allowed" to="zero_amounts_allowed"/>
...@@ -619,6 +662,7 @@ ...@@ -619,6 +662,7 @@
<a:map from="bank_account_code" to="bank_account_code"/> <a:map from="bank_account_code" to="bank_account_code"/>
<a:map from="currency_code" to="currency_code"/> <a:map from="currency_code" to="currency_code"/>
<a:map from="currency_name" to="currency_name"/> <a:map from="currency_name" to="currency_name"/>
<a:map from="bank_branch_name" to="bank_branch_name"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="bp_bank_account_code" autoComplete="true" autoCompleteField="bank_account_num" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="basic.hls_bp_master_bank_account_v_for_lov?enabled_flag=Y&amp;bp_enabled_flag=Y" lovWidth="580" title="CSH511.BANK_ACCOUNT_CODE"> <a:field name="bp_bank_account_code" autoComplete="true" autoCompleteField="bank_account_num" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="basic.hls_bp_master_bank_account_v_for_lov?enabled_flag=Y&amp;bp_enabled_flag=Y" lovWidth="580" title="CSH511.BANK_ACCOUNT_CODE">
...@@ -627,7 +671,6 @@ ...@@ -627,7 +671,6 @@
<a:map from="bank_account_num" to="bp_bank_account_num"/> <a:map from="bank_account_num" to="bp_bank_account_num"/>
<a:map from="bank_account_name" to="bp_bank_account_name"/> <a:map from="bank_account_name" to="bp_bank_account_name"/>
<a:map from="bank_account_code" to="bp_bank_account_code"/> <a:map from="bank_account_code" to="bp_bank_account_code"/>
<a:map from="bank_branch_name" to="bank_branch_name"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="payment_method_display" defaultValue="银行转账" displayField="description" options="payment_method_ds" returnField="payment_method_id" valueField="payment_method_id"/> <a:field name="payment_method_display" defaultValue="银行转账" displayField="description" options="payment_method_ds" returnField="payment_method_id" valueField="payment_method_id"/>
...@@ -654,17 +697,37 @@ ...@@ -654,17 +697,37 @@
<a:gridButton click="csh502_create_pdf3" text="pdf测试3"/> --> <a:gridButton click="csh502_create_pdf3" text="pdf测试3"/> -->
<!-- <a:gridButton click="csh502_payment_pay_reset" text="HLS.RESET"/> --> <!-- <a:gridButton click="csh502_payment_pay_reset" text="HLS.RESET"/> -->
</a:screenTopToolbar> </a:screenTopToolbar>
<a:form labelWidth="100" title="CSH502.CSH_PAYMENT_REQ_PAY"> <a:form labelWidth="180" title="CSH502.CSH_PAYMENT_REQ_PAY">
<a:box column="4"> <a:box column="4">
<a:textField name="bp_name" bindTarget="csh_payment_req_pay_ds" prompt="CSH501.CSH_PAYMENT_OBJ_NAME" readOnly="true" width="150"/> <!-- <a:textField name="bp_name" bindTarget="csh_payment_req_pay_ds" prompt="CSH501.CSH_PAYMENT_OBJ_NAME" readOnly="true" width="150"/>-->
<a:textField name="bp_bank_account_id" bindTarget="csh_payment_req_pay_ds" prompt="付款代理商对象" readOnly="true" width="150"/> <a:textField name="bp_bank_account_name" bindTarget="csh_payment_req_pay_ds" prompt="付款代理商对象" readOnly="true" width="150"/>
<a:textField name="bp_bank_account_num" bindTarget="csh_payment_req_pay_ds" prompt="付款代理商账号" readOnly="true" width="150"/>
<a:textField name="vender_bank_account_id" bindTarget="csh_payment_req_pay_ds" prompt="付款厂商对象" readOnly="true" width="150"/> <a:textField name="vender_bank_account_id" bindTarget="csh_payment_req_pay_ds" prompt="付款厂商对象" readOnly="true" width="150"/>
<a:textField name="con_contarct_number" bindTarget="csh_payment_req_pay_ds" prompt="合同编号" readOnly="true" width="150"/> <a:textField name="vender_bank_account_num" bindTarget="csh_payment_req_pay_ds" prompt="付款厂商账号" readOnly="true" width="150"/>
<a:textField name="cf_item_n" bindTarget="csh_payment_req_pay_ds" prompt="应付项目" readOnly="true" width="150"/> </a:box>
<a:box column="4">
<a:textField name="contract_number" bindTarget="csh_payment_req_pay_ds" prompt="合同编号" readOnly="true" width="150"/>
<a:textField name="cf_description" bindTarget="csh_payment_req_pay_ds" prompt="应付项目" readOnly="true" width="150"/>
<a:numberField name="residual_agent_amount" bindTarget="csh_payment_req_pay_ds" prompt="未付代理店金额" readOnly="true" width="150" renderer="Leaf.formatMoney"/> <a:numberField name="residual_agent_amount" bindTarget="csh_payment_req_pay_ds" prompt="未付代理店金额" readOnly="true" width="150" renderer="Leaf.formatMoney"/>
<a:numberField name="residual_vender_amount" bindTarget="csh_payment_req_pay_ds" prompt="未付厂商金额" readOnly="true" width="150" renderer="Leaf.formatMoney"/> <a:numberField name="residual_vender_amount" bindTarget="csh_payment_req_pay_ds" prompt="未付厂商金额" readOnly="true" width="150" renderer="Leaf.formatMoney"/>
<a:numberField name="amount_paid" bindTarget="csh_payment_req_pay_ds" prompt="本次付款金额" readOnly="true" width="150" renderer="Leaf.formatMoney"/> <!-- <a:numberField name="amount_paid" bindTarget="csh_payment_req_pay_ds" prompt="本次付款金额" readOnly="true" width="150" renderer="Leaf.formatMoney"/>-->
</a:box>
<a:box column="2">
<a:numberField name="transaction_amount" allowDecimals="true" allowFormat="true" bindTarget="csh_payment_req_pay_ds" prompt="本次付款金额" width="150"/>
<a:textField name="period_name" bindTarget="csh_payment_req_pay_ds" prompt="HLS.ACCOUNT_PERIOD_NAME" readOnly="true"/> <a:textField name="period_name" bindTarget="csh_payment_req_pay_ds" prompt="HLS.ACCOUNT_PERIOD_NAME" readOnly="true"/>
<a:datePicker name="transaction_date" bindTarget="csh_payment_req_pay_ds" prompt="CSH502.CSH_PAY_DATE" width="150"/>
</a:box>
<!-- <a:box column="4">
<a:lov name="bp_bank_account_code" bindTarget="csh_payment_req_pay_ds" prompt="对方账户"/>
<a:textField name="bp_bank_account_num" bindTarget="csh_payment_req_pay_ds" prompt="对方账号" readOnly="true"/>
&lt;!&ndash; <a:lov name="bank_account_code" bindTarget="csh_payment_req_pay_ds" prompt="付款账户" width="150"/>
<a:textField name="bank_account_num" bindTarget="csh_payment_req_pay_ds" prompt="HLS.BANK_ACCOUNT_NUM" readOnly="true" width="150"/>&ndash;&gt;
&lt;!&ndash; <a:textField name="bank_account_name" bindTarget="csh_payment_req_pay_ds" prompt="HLS.BANK_ACCOUNT_NAME" readOnly="true" width="428"/> &ndash;&gt;
</a:box>-->
<a:box column="1">
<a:textField name="payment_description" bindTarget="csh_payment_req_pay_ds" prompt="HLS.COMMENT" width="849"/>
</a:box>
<!-- <a:textField name="cf_description" bindTarget="csh_payment_req_pay_ds" prompt="CSH501.CSH_PAYMENT_PRJ" readOnly="true" width="150"/> --> <!-- <a:textField name="cf_description" bindTarget="csh_payment_req_pay_ds" prompt="CSH501.CSH_PAYMENT_PRJ" readOnly="true" width="150"/> -->
<!-- <a:numberField name="residual_amount" allowDecimals="true" allowFormat="true" bindTarget="csh_payment_req_pay_ds" prompt="CSH501.CSH_RESIDUAL_AMOUNT" readOnly="true" width="150"/>--> <!-- <a:numberField name="residual_amount" allowDecimals="true" allowFormat="true" bindTarget="csh_payment_req_pay_ds" prompt="CSH501.CSH_RESIDUAL_AMOUNT" readOnly="true" width="150"/>-->
<!-- <a:textField name="currency_name" bindTarget="csh_payment_req_pay_ds" prompt="HLS.CURRENCY" readOnly="true" width="150"/> --> <!-- <a:textField name="currency_name" bindTarget="csh_payment_req_pay_ds" prompt="HLS.CURRENCY" readOnly="true" width="150"/> -->
...@@ -672,19 +735,13 @@ ...@@ -672,19 +735,13 @@
<!-- <a:comboBox name="exchange_rate_type_display" bindTarget="csh_payment_req_pay_ds" prompt="HLS.EXCHANGE_RATE_TYPE_DESC" width="150"/> --> <!-- <a:comboBox name="exchange_rate_type_display" bindTarget="csh_payment_req_pay_ds" prompt="HLS.EXCHANGE_RATE_TYPE_DESC" width="150"/> -->
<!-- <a:numberField name="due_amount" bindTarget="csh_payment_req_pay_ds" prompt="CSH502.CSH_PAYMENT_AMOUNT" readOnly="true" width="150"/> <!-- <a:numberField name="due_amount" bindTarget="csh_payment_req_pay_ds" prompt="CSH502.CSH_PAYMENT_AMOUNT" readOnly="true" width="150"/>
<a:datePicker name="due_date" bindTarget="csh_payment_req_pay_ds" prompt="CSH501.CSH_DUE_DATE" readOnly="true" width="150"/> --> <a:datePicker name="due_date" bindTarget="csh_payment_req_pay_ds" prompt="CSH501.CSH_DUE_DATE" readOnly="true" width="150"/> -->
<a:numberField name="transaction_amount" allowDecimals="true" allowFormat="true" bindTarget="csh_payment_req_pay_ds" prompt="CSH502.CSH_PAYMENT_AMOUNT" width="150"/>
<!-- <a:numberField name="handling_charge" allowDecimals="true" allowFormat="true" bindTarget="csh_payment_req_pay_ds" prompt="HLS.HANDLING_CHARGE" width="150"/> --> <!-- <a:numberField name="handling_charge" allowDecimals="true" allowFormat="true" bindTarget="csh_payment_req_pay_ds" prompt="HLS.HANDLING_CHARGE" width="150"/> -->
<a:numberField name="transaction_functional_amount" allowDecimals="true" allowFormat="true" bindTarget="csh_payment_req_pay_ds" prompt="HLS.FUNCTIONAL_AMOUNT" readOnly="true" width="150"/> <!-- <a:numberField name="transaction_functional_amount" allowDecimals="true" allowFormat="true" bindTarget="csh_payment_req_pay_ds" prompt="HLS.FUNCTIONAL_AMOUNT" readOnly="true" width="150"/>
<!-- <a:comboBox name="exchange_rate_type_display" bindTarget="csh_payment_req_pay_ds" prompt="HLS.EXCHANGE_RATE_TYPE_DESC" width="150"/> --> &lt;!&ndash; <a:comboBox name="exchange_rate_type_display" bindTarget="csh_payment_req_pay_ds" prompt="HLS.EXCHANGE_RATE_TYPE_DESC" width="150"/> &ndash;&gt;
<a:textField name="bank_slip_num" bindTarget="csh_payment_req_pay_ds" prompt="CSH511.CSH_TRANSACTION.BANK_SLIP_NUM"/> <a:textField name="bank_slip_num" bindTarget="csh_payment_req_pay_ds" prompt="CSH511.CSH_TRANSACTION.BANK_SLIP_NUM"/>
</a:box>
<a:box column="4">
<a:lov name="bp_bank_account_code" bindTarget="csh_payment_req_pay_ds" prompt="对方账户"/>
<a:textField name="bp_bank_account_num" bindTarget="csh_payment_req_pay_ds" prompt="对方账号" readOnly="true"/>
<a:lov name="bank_account_code" bindTarget="csh_payment_req_pay_ds" prompt="付款账户" width="150"/>
<a:textField name="bank_account_num" bindTarget="csh_payment_req_pay_ds" prompt="HLS.BANK_ACCOUNT_NUM" readOnly="true" width="150"/>
<!-- <a:textField name="bank_account_name" bindTarget="csh_payment_req_pay_ds" prompt="HLS.BANK_ACCOUNT_NAME" readOnly="true" width="428"/> -->
</a:box>
<a:box column="4"> <a:box column="4">
<a:textField name="bp_bank_account_name" bindTarget="csh_payment_req_pay_ds" prompt="对方账户名" readOnly="true" width="382"/> <a:textField name="bp_bank_account_name" bindTarget="csh_payment_req_pay_ds" prompt="对方账户名" readOnly="true" width="382"/>
<a:textField name="bank_account_name" bindTarget="csh_payment_req_pay_ds" prompt="HLS.BANK_ACCOUNT_NAME" readOnly="true" width="382"/> <a:textField name="bank_account_name" bindTarget="csh_payment_req_pay_ds" prompt="HLS.BANK_ACCOUNT_NAME" readOnly="true" width="382"/>
...@@ -695,10 +752,9 @@ ...@@ -695,10 +752,9 @@
<a:numberField name="exchange_rate" allowNegative="false" bindTarget="csh_payment_req_pay_ds" decimalPrecision="-1" prompt="HLS.EXCHANGE_RATE" readOnly="true" width="150"/> <a:numberField name="exchange_rate" allowNegative="false" bindTarget="csh_payment_req_pay_ds" decimalPrecision="-1" prompt="HLS.EXCHANGE_RATE" readOnly="true" width="150"/>
</a:box> </a:box>
<a:box column="4"> <a:box column="4">
<a:datePicker name="transaction_date" bindTarget="csh_payment_req_pay_ds" prompt="CSH502.CSH_PAY_DATE" width="150"/> &lt;!&ndash; <a:textField name="first_contract_day" bindTarget="csh_payment_req_pay_ds" prompt="首次支付表日期末位" readOnly="true"/> &ndash;&gt;
<!-- <a:textField name="first_contract_day" bindTarget="csh_payment_req_pay_ds" prompt="首次支付表日期末位" readOnly="true"/> --> &lt;!&ndash; <a:datePicker name="first_payment_date" bindTarget="csh_payment_req_pay_ds" dayRenderer="rendererDay" prompt="首期还款日" width="150"/> &ndash;&gt;
<!-- <a:datePicker name="first_payment_date" bindTarget="csh_payment_req_pay_ds" dayRenderer="rendererDay" prompt="首期还款日" width="150"/> --> </a:box>-->
</a:box>
<!-- <a:box column="4"> <!-- <a:box column="4">
<a:numberField name="transaction_amount" allowDecimals="true" allowFormat="true" bindTarget="csh_payment_req_pay_ds" prompt="CSH502.CSH_PAYMENT_AMOUNT" width="150"/> <a:numberField name="transaction_amount" allowDecimals="true" allowFormat="true" bindTarget="csh_payment_req_pay_ds" prompt="CSH502.CSH_PAYMENT_AMOUNT" width="150"/>
<a:numberField name="handling_charge" allowDecimals="true" allowFormat="true" bindTarget="csh_payment_req_pay_ds" prompt="HLS.HANDLING_CHARGE" width="150"/> <a:numberField name="handling_charge" allowDecimals="true" allowFormat="true" bindTarget="csh_payment_req_pay_ds" prompt="HLS.HANDLING_CHARGE" width="150"/>
...@@ -707,15 +763,36 @@ ...@@ -707,15 +763,36 @@
<a:textField name="bank_slip_num" bindTarget="csh_payment_req_pay_ds" prompt="CSH511.CSH_TRANSACTION.BANK_SLIP_NUM"/> <a:textField name="bank_slip_num" bindTarget="csh_payment_req_pay_ds" prompt="CSH511.CSH_TRANSACTION.BANK_SLIP_NUM"/>
<div/> <div/>
</a:box> --> </a:box> -->
<a:box column="1">
<a:textField name="payment_description" bindTarget="csh_payment_req_pay_ds" prompt="HLS.COMMENT" width="849"/>
</a:box>
</a:form> </a:form>
<a:grid id="bank_account_ds" bindTarget="csh_payment_req_pay_ds" height="200">
<a:columns>
<a:column name="bank_account_num" prompt="银行账号" editor="lov_editor" width="150"/>
<a:column name="bank_branch_name" prompt="银行名称" width="150"/>
<a:column name="bank_account_name" prompt="账户名" width="150"/>
<a:column name="this_pay_agent_amount" prompt="本次付代理店金额" editor="number_editor" width="150" renderer="Leaf.formatMoney" align="right"/>
<a:column name="this_pay_vender_amount" prompt="本次付厂商金额" editor="number_editor" width="150" renderer="Leaf.formatMoney" align="right"/>
</a:columns>
<a:editors>
<a:lov id="lov_editor"/>
<a:numberField id="number_editor"/>
</a:editors>
</a:grid>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
$('csh_payment_req_pay_ds').getAt(0).set('bp_bank_account_num','${/parameter/@bp_bank_account_num}'); $('csh_payment_req_pay_ds').getAt(0).set('bp_bank_account_num','${/parameter/@bp_bank_account_num}');
$('csh_payment_req_pay_ds').getAt(0).set('bp_bank_account_code','${/parameter/@bp_bank_account_code}'); $('csh_payment_req_pay_ds').getAt(0).set('bp_bank_account_code','${/parameter/@bp_bank_account_code}');
$('csh_payment_req_pay_ds').getAt(0).set('bp_bank_account_name','${/parameter/@bp_bank_account_name}'); $('csh_payment_req_pay_ds').getAt(0).set('bp_bank_account_name','${/parameter/@bp_bank_account_name}');
$('csh_payment_req_pay_ds').getAt(0).set('bp_bank_account_id','${/parameter/@bp_bank_account_id}'); $('csh_payment_req_pay_ds').getAt(0).set('bp_bank_account_id','${/parameter/@bp_bank_account_id}');
$('csh_payment_req_pay_ds').getAt(0).set('vender_bank_account_id','${/parameter/@vender_bank_account_id}');
$('csh_payment_req_pay_ds').getAt(0).set('vender_bank_account_num','${/parameter/@vender_bank_account_num}');
$('csh_payment_req_pay_ds').getAt(0).set('contract_number','${/parameter/@contract_number}');
$('csh_payment_req_pay_ds').getAt(0).set('cf_description','${/parameter/@cf_description}');
$('csh_payment_req_pay_ds').getAt(0).set('residual_agent_amount','${/parameter/@residual_agent_amount}');
$('csh_payment_req_pay_ds').getAt(0).set('residual_vender_amount','${/parameter/@residual_vender_amount}');
$('csh_payment_req_pay_ds').getAt(0).set('this_pay_agent_amount',0);
$('csh_payment_req_pay_ds').getAt(0).set('this_pay_vender_amount',0);
]]></script> ]]></script>
</a:screenBody> </a:screenBody>
</a:view> </a:view>
......
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