Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
leaf-hlcm
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hlcm
leaf-hlcm
Commits
62b13ec1
Commit
62b13ec1
authored
Jun 19, 2023
by
xy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[建机]虚拟代理店-付款申请创建维护
parent
10c228ba
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
168 additions
and
21 deletions
+168
-21
csh_payment_req_ln_query.lwm
...p/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query.lwm
+6
-2
csh_payment_req_ln_query_after_save.lwm
...lasses/csh/CSH501/csh_payment_req_ln_query_after_save.lwm
+3
-2
csh_payment_req_selected.lwm
...p/WEB-INF/classes/csh/CSH501/csh_payment_req_selected.lwm
+7
-0
csh_payment_create_entrance.lview
...bapp/modules/csh/CSH501/csh_payment_create_entrance.lview
+2
-0
csh_payment_req.lview
src/main/webapp/modules/csh/CSH501/csh_payment_req.lview
+147
-17
csh_payment_req_selected.lview
.../webapp/modules/csh/CSH501/csh_payment_req_selected.lview
+3
-0
No files found.
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query.lwm
View file @
62b13ec1
...
...
@@ -88,7 +88,9 @@
v.write_off_date,
v.write_off_amount,
v.division,
v.finance_amount
v.finance_amount,
v.lease_item_amount,
v.is_buyout
FROM (SELECT t.contract_id,
(SELECT hbbc.bank_account_id
FROM hls_bp_master_bank_account hbbc
...
...
@@ -220,7 +222,9 @@
from csh_write_off cwo
where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=t.contract_id),0) write_off_amount,
t.division,
t.finance_amount
t.finance_amount,
t.lease_item_amount,
nvl(t.is_buyout,'N') is_buyout
FROM con_contract_cashflow f
join con_contract t
on t.contract_id = f.contract_id
...
...
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query_after_save.lwm
View file @
62b13ec1
...
...
@@ -60,7 +60,7 @@
cpr.bp_bank_account_name BP_BANK_ACCOUNT_NAME,
--应付我司金额
cpr.
amount_agent,
nvl(cpr.amount_agent,0)
amount_agent,
cpr.amount_vender,
to_char(cpr.amount_agent,'FM999,999,999,990.00') amount_agent_print,
to_char(cpr.amount_vender,'FM999,999,999,990.00') amount_vender_print,
...
...
@@ -131,7 +131,8 @@
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,
c.division
c.division,
nvl(c.is_buyout,'N') is_buyout
from csh_payment_req_ln cpr,
con_contract c,
hls_bp_master hbm,
...
...
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_selected.lwm
View file @
62b13ec1
...
...
@@ -158,6 +158,11 @@
(select bp_name
from hls_bp_master
where hls_bp_master.bp_id = t.bp_id_agent_level1) bp_id_agent_n,
--add by 18938
(select nvl(is_constru_unit,'N')
from hls_bp_master
where hls_bp_master.bp_id = t.bp_id_agent_level1) is_constru_unit,
nvl(t.is_buyout,'N') is_buyout,
--查找厂商
(SELECT bp_name FROM hls_bp_master h WHERE h.bp_id=hli.vender_id) vender_name_n,
hli.vender_name,
...
...
@@ -255,6 +260,8 @@
<bm:field
name=
"con_business_type_n"
/>
<bm:field
name=
"cdd_list_id"
/>
<bm:field
name=
"bp_id_agent_n"
/>
<bm:field
name=
"is_constru_unit"
/>
<bm:field
name=
"is_buyout"
/>
<bm:field
name=
"bp_id_tenant"
/>
<!-- <bm:field name="vender_name"/>-->
<bm:field
name=
"vender_name_n"
/>
...
...
src/main/webapp/modules/csh/CSH501/csh_payment_create_entrance.lview
View file @
62b13ec1
...
...
@@ -240,6 +240,8 @@
param['approval_status'] = record.get('approval_status');
param['con_business_type'] = record.get('con_business_type');
param['division'] = record.get('division');
//add by 18938
param['is_constru_unit'] = record.get('is_constru_unit');
if (record.get('business_type') == 'PAYMENT') {
param['function_code'] = 'CSH501D';
} else if (record.get('business_type') == 'PREPAYMENT') {
...
...
src/main/webapp/modules/csh/CSH501/csh_payment_req.lview
View file @
62b13ec1
...
...
@@ -39,6 +39,8 @@
<script
type=
"text/javascript"
>
<![CDATA[
jQuery.noConflict();
var con_business_type='${/parameter/@con_business_type}'||'${/model/loan_flag_path/record/@business_type}'||'LEASE';
var is_constru_unit='${/parameter/@is_constru_unit}' || 'N';
var is_buyout='${/parameter/@is_buyout}' || 'N';
//工作流审批界面校验发票状态
if ('${/parameter/@source_type}' == 'WFL_Y') {
zjwfl5110_ApproveChecker_add('zjwfl5110_submit', function (type) {
...
...
@@ -175,6 +177,7 @@
};
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;
...
...
@@ -232,6 +235,38 @@
records[i].getField('tenant_bank_account_name').setRequired(false);
}
}
//add
by
18938
if(
is_constru_unit =
=
'Y'){
var
ds_id =
get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],
'csh_payment_req_ln');
var
records =
$(ds_id).getAll();
for
(
i =
0;
i
<
records.length;
i++)
{
if(records[i].get('is_buyout')
==
'Y'){
//买断机
应付承租人金额为必填项
应付我司金额为只读项且默认为0
records[i].getField('amount_tenant').setRequired(true);
records[i].getField('amount_agent').setReadOnly(true);
records[i].getField('tenant_bank_account_number').setRequired(true);
records[i].getField('tenant_bank_account_number_n').setRequired(true);
}else{
//非买断机
应付承租人金额为只读项,默认为0,承租人账号为非必填
应付我司金额为只读项且默认为0
委托付款金额为必填项(界面已配置)
records[i].getField('amount_tenant').setReadOnly(true);
records[i].getField('amount_agent').setReadOnly(true);
}
}
}
}
//非虚拟店
应付承租人金额非必填且未只读
if(is_constru_unit
!=
'Y'){
var
ds_id =
get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],
'csh_payment_req_ln');
var
records =
$(ds_id).getAll();
for
(
i =
0;
i
<
records.length;
i++)
{
records[i].getField('amount_tenant').setRequired(false);
records[i].getField('amount_tenant').setReadOnly(true);
if(
con_business_type =
=
'LEASEBACK'){
records[i].getField('tenant_bank_account_number').setRequired(true);
records[i].getField('tenant_bank_account_number_n').setRequired(true);
}
}
}
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
};
...
...
@@ -239,6 +274,7 @@
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')
{
...
...
@@ -285,6 +321,39 @@
};
}
}
//add
by
18938
if(
is_constru_unit =
=
'Y'){
if(
con_business_type =
=
'LEASEBACK'){
var
ds_id =
get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],
'csh_payment_req_ln');
var
records =
$(ds_id).getAll();
for
(
i =
0;
i
<
records.length;
i++)
{
if(
is_buyout =
=
'Y'){
//买断机
应付承租人金额为必填项
应付我司金额为只读项且默认为0
承租人账号必填
records[i].getField('amount_tenant').setRequired(true);
records[i].getField('amount_agent').setReadOnly(true);
records[i].getField('tenant_bank_account_number').setRequired(true);
records[i].getField('tenant_bank_account_number_n').setRequired(true);
}else{
//非买断机
应付承租人金额为只读项,默认为0,承租人账号为非必填
应付我司金额为只读项且默认为0
委托付款金额为必填项(界面已配置)
records[i].getField('amount_tenant').setReadOnly(true);
records[i].getField('amount_agent').setReadOnly(true);
}
}
}
}else{
//非虚拟店
应付承租人金额非必填且未只读
var
ds_id =
get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],
'csh_payment_req_ln');
var
records =
$(ds_id).getAll();
for
(
i =
0;
i
<
records.length;
i++)
{
records[i].getField('amount_tenant').setRequired(false);
records[i].getField('amount_tenant').setReadOnly(true);
if(
con_business_type =
=
'LEASEBACK'){
records[i].getField('tenant_bank_account_number').setRequired(true);
records[i].getField('tenant_bank_account_number_n').setRequired(true);
}
}
}
//end
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}
...
...
@@ -400,6 +469,8 @@
var
repur_con_ddct_amt =
get_current_amount(line_data.get('repur_con_ddct_amt'));
//应付承租人金额
var
amount_tenant =
get_current_amount(line_data.get('amount_tenant'));
//设备款
add
by
18938
var
lease_item_amount =
get_current_amount(line_data.get('lease_item_amount'));
if
(amount_agent
<
0
||
amount_vender
<
0)
{
$L.showErrorMessage("提示",
'应付我司金额和首付款抵冲金额不能为负数!');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
...
...
@@ -428,18 +499,31 @@
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
//add by 18938
if(is_constru_unit == 'Y'){
if(plus(plus(other_payment2, amount_vender), repur_con_ddct_amt) != lease_item_amount){
$L.showErrorMessage("提示", '首付款抵扣金额,委托付款金额,回购租金抵冲金额之和应等于设备款!',null,500,300);
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
}
} else if (con_business_type == 'LEASEBACK') {
var entrusted_amount = get_current_amount(line_data.get('entrusted_amount'));
if (plus(plus(amount_agent, amount_vender),repur_con_ddct_amt) != entrusted_amount) {
$L.showErrorMessage("提示", '应付代理店金额、应付厂商金额、回购租金抵冲金额合计不等于合同签约时承租人所填写委托付款金额,请重新填写!',null,500,300);
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
if (plus(plus(plus(plus(amount_agent, amount_vender), other_payment2), repur_con_ddct_amt), amount_tenant) != due_amount) {
$L.showErrorMessage("提示", '应付我司金额,委托付款金额,应付承租人金额,首付款抵冲金额和回购租金抵冲金额之和应等于应付金额!',null,500,300);
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
//add by 18938
if(is_constru_unit == 'Y'){
if(plus(plus(plus(other_payment2, amount_tenant), amount_vender), repur_con_ddct_amt) != lease_item_amount){
$L.showErrorMessage("提示", '首付款抵扣金额,应付承租人金额,委托付款金额,回购租金抵冲金额之和应等于设备款!',null,500,300);
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
}
//end
}
//本次申请金额等于委托加我司加应付承租人金额
...
...
@@ -454,6 +538,23 @@
$L.showErrorMessage("提示",
'买断机合同(即厂商的付款金额为0)不可与其他正常合同同时进行付款申请支付');
return
false;
}
//add
by
18938
if(
is_constru_unit =
=
'Y'){
if(
con_business_type =
=
'LEASEBACK'){
if(plus(plus(total_amount_agent,
total_amount_vender),
total_amount_tenant)
!=
total_apply_amount){
$L.showErrorMessage("提示",
'应付代理店总金额,应付厂商总金额,应付承租人总金额之和应等于申请总金额!',null,500,300);
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return
false;
}
}else{
if(plus(total_amount_agent,
total_amount_vender)
!=
total_apply_amount){
$L.showErrorMessage("提示",
'应付代理店总金额,应付厂商总金额之和应等于申请总金额!',null,500,300);
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return
false;
}
}
}
//end
//给头表赋值
$(ds_id).getAt(0).set('amount_agent_total',
total_amount_agent);
$(ds_id).getAt(0).set('amount_vender_total',
total_amount_vender);
...
...
@@ -503,6 +604,7 @@
};
window['${/parameter/@layout_code}_on_layout_dynamic_form_add_and_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');
if
(
hdds_id =
=
ds.id
&&
record.isNew)
{
if
('${/parameter/@business_type}'
==
'PAYMENT')
{
...
...
@@ -541,19 +643,47 @@
//record.getField('t_bank_account_name_n').setRequired(true);
}else{
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_THIRD_BP_ID_prompt')
.style.display =
'none'
;
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_THIRD_BP_ID')
.style.display =
'none'
;
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NAME_prompt')
.style.display =
'none'
;
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NAME')
.style.display =
'none'
;
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NUM_prompt')
.style.display =
'none'
;
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NUM')
.style.display =
'none'
;
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_FULL_NAME_prompt')
.style.display =
'none'
;
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_FULL_NAME')
.style.display =
'none'
;
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_BRANCH_NAME_prompt')
.style.display =
'none'
;
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_BRANCH_NAME')
.style.display =
'none'
;
if(document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_THIRD_BP_ID')){
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_THIRD_BP_ID_prompt')
.style.display =
'none'
;
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_THIRD_BP_ID')
.style.display =
'none'
;
}
if(document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NAME')){
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NAME_prompt')
.style.display =
'none'
;
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NAME')
.style.display =
'none'
;
}
if(document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NUM')){
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NUM_prompt')
.style.display =
'none'
;
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NUM')
.style.display =
'none'
;
}
if(document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_FULL_NAME')){
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_FULL_NAME_prompt')
.style.display =
'none'
;
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_FULL_NAME')
.style.display =
'none'
;
}
if(document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_BRANCH_NAME')){
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_BRANCH_NAME_prompt')
.style.display =
'none'
;
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_BRANCH_NAME')
.style.display =
'none'
;
}
}
//add
by
18938
if(
is_constru_unit =
=
'Y'){
if(document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_THIRD_BP_ID')){
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_THIRD_BP_ID_prompt')
.style.display =
'block'
;
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_THIRD_BP_ID')
.style.display =
'block'
;
}
if(document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NAME')){
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NAME_prompt')
.style.display =
'block'
;
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NAME')
.style.display =
'block'
;
}
if(document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NUM')){
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NUM_prompt')
.style.display =
'block'
;
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_ACCOUNT_NUM')
.style.display =
'block'
;
}
if(document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_FULL_NAME')){
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_FULL_NAME_prompt')
.style.display =
'block'
;
document.getElementById('CSH501D_PAYMENT_REQ_HD_CSH_PAYMENT_REQ_HD_T_BANK_FULL_NAME')
.style.display =
'block'
;
}
}
//end
}
};
//保存submitsuccess调用
...
...
src/main/webapp/modules/csh/CSH501/csh_payment_req_selected.lview
View file @
62b13ec1
...
...
@@ -129,6 +129,9 @@
param['product_type_n'] = record.get('product_type_n');
param['product_name_write'] = record.get('product_name_write');
}
//add by 18938
param['is_constru_unit'] = record.get('is_constru_unit');
param['is_buyout'] = record.get('is_buyout');
param['winid'] = 'csh501_csh_payment_req_link_winid';
param['url_title'] = '付款申请';
hls_doc_get_layout_code('csh501_get_layout_code_link_id', param, 'csh501_csh_payment_req_link_id', 'csh_payment_req_selectedDs');
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment