Skip to content

L
leaf-hlcm
Commit 87db2a38 authored by xsh241908's avatar xsh241908
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop 

# Conflicts:
#	src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query.lwm
#	src/main/webapp/modules/csh/CSH501/csh_payment_req.lview
parents 089708ac 8db3d770
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1735 additions and 944 deletions
src/main/webapp/WEB-INF/classes/cont/CON731/con_guarantor_comparison.lwm 0 → 100644
View file @ 87db2a38
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="update">
<bm:parameters>
<bm:parameter name="same_flag" dataType="java.lang.String" input="false" output="true"/>
</bm:parameters>
<bm:update-sql><![CDATA[
BEGIN
cus_con_change_req_pkg.con_guarantor_comparison( p_change_req_id=>${@change_req_id},
p_same_flag =>${@same_flag});
END;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query.lwm
View file @ 87db2a38
......@@ -5,7 +5,7 @@
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1"
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1"
baseTable="CSH_PAYMENT_REQ_LN" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
......@@ -87,6 +87,7 @@
v.amount_tenant,
v.write_off_date,
v.write_off_amount,
v.division,
v.finance_amount
FROM (SELECT t.contract_id,
(SELECT hbbc.bank_account_id
......@@ -218,7 +219,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=t.contract_id),0) write_off_amount,
t.finance_amount
t.finance_amount,
t.division
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 @ 87db2a38
......@@ -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,
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT104/csh_transaction_maintain_query.lwm
View file @ 87db2a38
......@@ -163,7 +163,7 @@
<!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>-->
<bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/>
<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
<bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like ${@bp_name_n} "/>
<bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like &apos;%&apos;||${@bp_name_n}||&apos;%&apos; "/>
<bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/csh_transaction_maintain_query.lwm
View file @ 87db2a38
......@@ -180,7 +180,7 @@
<!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>-->
<bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/>
<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
<bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like ${@bp_name_n} "/>
<bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like &apos;%&apos;||${@bp_name_n}||&apos;%&apos; "/>
<bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106N/csh_transaction_maintain_query.lwm
View file @ 87db2a38
......@@ -181,7 +181,7 @@
<!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>-->
<bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/>
<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
<bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like ${@bp_name_n} "/>
<bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like &apos;%&apos;||${@bp_name_n}||&apos;%&apos; "/>
<bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT110/csh_transaction_maintain_query.lwm
View file @ 87db2a38
......@@ -158,7 +158,7 @@
<!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>-->
<bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/>
<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
<bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like ${@bp_name_n} "/>
<bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like &apos;%&apos;||${@bp_name_n}||&apos;%&apos; "/>
<bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/hls/HLS801/con_exist_approving.lwm 0 → 100644
View file @ 87db2a38
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: gzj
$Date: 2022年6月14日
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:fields>
<bm:field name="wfl_count" databaseType="NUMBER" datatype="java.lang.Long" physicalName="WFL_COUNT"/>
</bm:fields>
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT count(1) wfl_count
FROM con_monthly_statement t
where t.history_flag='N'
and t.status_name ='APPROVING'
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="wfl_count"></bm:field>
</bm:fields>
</bm:model>
src/main/webapp/WEB-INF/classes/hls/HLS801/con_monthly_statement.lwm 0 → 100644
View file @ 87db2a38
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: gzj
$Date: 2022-10-9 14:14:34
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<!-- <bm:fields>-->
<!-- <bm:field name="sbo_file_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ATTACH_FILE_NAME" prompt="HLS.ATTACH_FILE_NAME"/>-->
<!-- <bm:field name="business_file_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ATTACH_FILE_NAME" prompt="HLS.ATTACH_FILE_NAME"/>-->
<!-- </bm:fields>-->
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT t.*,
(SELECT sv.code_value_name
FROM sys_code_values_v sv
WHERE sv.code = 'HLS_REPORT_NAME'
and sv.code_value = t.report_name
and sv.code_enabled_flag = 'Y') report_name_desc,
hls_sys_upload_pkg.get_atm_file_names(p_table_pk_value => t.tab_id,
p_source_type => 'SBO_REPORT',
p_user_id => 10423) AS sbo_file_name,
hls_sys_upload_pkg.get_atm_file_names(p_table_pk_value => t.tab_id,
p_source_type => 'BUSINESS_REPORT',
p_user_id => 10423) AS business_file_name
FROM con_monthly_statement t
where t.monthly_date = (${@year}||${@month})
and t.history_flag = 'N'
order by t.tab_id asc
]]></bm:query-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
con_monthly_statement_pkg.create_monthly_statement(p_user_id =>${/session/@user_id},
p_date =>${@date});
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/hls/HLS801/con_monthly_statement_wfl.lwm 0 → 100644
View file @ 87db2a38
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: gzj
$Date: 2022-10-9 14:14:34
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT t.*,
(SELECT sv.code_value_name
FROM sys_code_values_v sv
WHERE sv.code = 'HLS_REPORT_NAME'
and sv.code_value = t.report_name
and sv.code_enabled_flag = 'Y') report_name_desc,
hls_sys_upload_pkg.get_atm_file_names(p_table_pk_value => t.tab_id,
p_source_type => 'SBO_REPORT',
p_user_id => 10423) AS sbo_file_name,
hls_sys_upload_pkg.get_atm_file_names(p_table_pk_value => t.tab_id,
p_source_type => 'BUSINESS_REPORT',
p_user_id => 10423) AS business_file_name
FROM con_monthly_statement t
where t.monthly_date = ${@month_date}
and t.batch_number=${@batch_num}
order by t.tab_id asc
]]></bm:query-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
con_monthly_statement_pkg.monthly_wfl_start(p_user_id =>${/session/@user_id},
p_date =>${@date});
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/hls/HLS801/get_wfl_status.lwm 0 → 100644
View file @ 87db2a38
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: gzj
$Date: 2022年6月14日
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT count(1) wfl_count
FROM con_monthly_statement t
where t.monthly_date = ${@date}
and t.status_name ='APPROVED'
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="wfl_count"></bm:field>
</bm:fields>
</bm:model>
src/main/webapp/WEB-INF/classes/hls/HLS801/hls_attachment_list.lwm 0 → 100644
View file @ 87db2a38
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: 34291
$Date: 2022-10-17 11:26:43
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:e="leaf.service.exception" xmlns:o="leaf.database.local.oracle" xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="CON_MONTHLY_ATTACHMENT_LIST">
<bm:fields>
<bm:field name="list_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="LIST_ID" prompt="CON_MONTHLY_ATTACHMENT_LIST.LIST_ID"/>
<bm:field name="report_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="REPORT_NAME" prompt="CON_MONTHLY_ATTACHMENT_LIST.REPORT_NAME"/>
</bm:fields>
<bm:features>
<o:sequence-pk sequenceName="con_monthly_attachment_list_s"/>
<f:standard-who/>
</bm:features>
<bm:primary-key>
<bm:pk-field name="list_id"/>
</bm:primary-key>
</bm:model>
src/main/webapp/WEB-INF/classes/zjwfl/WFL2110/zj_wfl_workflow_deliver_query.lwm
View file @ 87db2a38
......@@ -48,6 +48,7 @@
<bm:ref-field name="employee_name" prompt="WFL_WORKFLOW_DELIVER.DELIVER_TO" relationname="e" sourcefield="name"/>
</bm:ref-fields>
<bm:data-filters>
<bm:data-filter name="query" expression="(exists (select 1 from sys_user su where su.user_id= ${/session/@user_id} and (su.user_name in('HAND','HL_ADMIN') or (su.user_name not in('HAND','HL_ADMIN') and su.user_id=t.recipient_id) )))"/>
<!-- <bm:data-filter name="query" expression="(exists (select 1 from sys_user su where su.user_id= ${/session/@user_id} and (su.user_name in('HAND','HL_ADMIN') or (su.user_name not in('HAND','HL_ADMIN') and su.user_id=t.recipient_id) )))"/>-->
<bm:data-filter name="query" expression="(exists (select 1 from sys_role sr where sr.role_id= ${/session/@role_id} and (sr.role_code in('0017','HAND') or (sr.role_code not in('0017','HAND') and ${/session/@user_id}=t.recipient_id) )))"/>
</bm:data-filters>
</bm:model>
src/main/webapp/downloadFile.lview 0 → 100644
View file @ 87db2a38
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: niujiaqing1265 $
$Date: 2010/11/30 06:14:58 $
$Revision: 1.8 $
$Purpose: 系统级描述
-->
<a:screen xmlns:c="leaf.application.action" xmlns:a="http://www.leaf-framework.org/application" xmlns:p="uncertain.proc" trace="true">
<a:init-procedure>
<a:model-query model="sys.sys_enable_image_system_query" rootPath="enable_image_system_flag"/>
<p:switch test="/model/enable_image_system_flag/record/@enable_image_system">
<p:case value="Y">
<a:model-query model="img.img_attachment_url" rootPath="att_url"/>
<a:model-query model="img.img_document_num_query" rootPath="doc_info"/>
<a:model-execute model="db.img_pkg.add_doc_to_interface"/>
<a:model-query model="img.img_upload_seqid_query" rootPath="upload"/>
<a:model-execute model="db.img_pkg.add_img_upload_control"/>
<a:model-query model="img.img_download_seqid_query" rootPath="download"/>
<a:model-execute model="db.img_pkg.add_img_download_control"/>
</p:case>
</p:switch>
</a:init-procedure>
<a:view package="leaf.ui.std" template="default">
<!--<link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/>
<script src="${/request/@context_path}/javascripts/lightbox.js" type="text/javascript"/>-->
<script type="text/javascript"><![CDATA[
function selectTabFun(tab,tabIndex){
if(tabIndex == 0){
reloadUpload();
}else if (tabIndex == 1){
reloadDownload();
}
}
function reloadUpload(){
document.getElementById('upload_att').src = '${/model/att_url/record/@img_attachment_url}?type=1&barcode=${/model/doc_info/record/@document_number}&seqid=${/model/upload/record/@upload_seqid}&IMGTYPE=${/model/doc_info/record/@img_type}&IMGNAME=${/model/doc_info/record/@img_name}&CURRENTIMGTYPE=${/model/doc_info/record/@current_img_type}&CURRENTIMGNAME=${/model/doc_info/record/@current_img_name}&_csrf=${/session/@_csrf.token}';
}
function reloadDownload(){
document.getElementById('download_att').src = '${/model/att_url/record/@img_attachment_url}?type=2&barcode=${/model/doc_info/record/@document_number}&seqid=${/model/download/record/@download_seqid}&IMGTYPE=${/model/doc_info/record/@img_type}&IMGNAME=${/model/doc_info/record/@img_name}&CURRENTIMGTYPE=${/model/doc_info/record/@current_img_type}&CURRENTIMGNAME=${/model/doc_info/record/@current_img_name}&_csrf=${/session/@_csrf.token}';
}
//Ext.ux.Lightbox.register('a[ref=img]', true);
]]></script>
<a:screenBody>
<a:switch test="/model/enable_image_system_flag/record/@enable_image_system">
<a:case value="N">
<div style="width:800px">
<a:switch test="/parameter/@useSubFolder">
<a:case value="Y">
<a:upload buttonWidth="75" fileType="*.*" pkvalue="${/parameter/@header_id}" showDelete="false" showUpload="false" sourcetype="${/parameter/@table_name}" text="附件上传" uploadurl="${/request/@context_path}/atm_upload_unUseSubFolder.lsc"/>
</a:case>
<a:case value="*">
<a:upload buttonWidth="75" fileType="*.*" pkvalue="${/parameter/@header_id}" showDelete="false" showUpload="false" sourcetype="${/parameter/@table_name}" text="附件上传" uploadurl="${/request/@context_path}/atm_upload.lsc"/>
</a:case>
</a:switch>
<br/>
</div>
</a:case>
<a:case value="Y">
<a:tabPanel height="380" width="580">
<a:tabs>
<a:tab prompt="附件上传">
<iframe id="upload_att" frameborder="no" height="345" src="${/model/att_url/record/@img_attachment_url}?type=1&amp;barcode=${/model/doc_info/record/@document_number}&amp;seqid=${/model/upload/record/@upload_seqid}&amp;IMGTYPE=${/model/doc_info/record/@img_type}&amp;IMGNAME=${/model/doc_info/record/@img_name}&amp;CURRENTIMGTYPE=${/model/doc_info/record/@current_img_type}&amp;CURRENTIMGNAME=${/model/doc_info/record/@current_img_name}&amp;_csrf=${/session/@_csrf.token}" style="broder:none;margin:0;padding:0;" width="570"/>
</a:tab>
<a:tab prompt="附件查看">
<iframe id="download_att" frameborder="no" height="345" src="${/model/att_url/record/@img_attachment_url}?type=2&amp;barcode=${/model/doc_info/record/@document_number}&amp;seqid=${/model/download/record/@download_seqid}&amp;IMGTYPE=${/model/doc_info/record/@img_type}&amp;IMGNAME=${/model/doc_info/record/@img_name}&amp;CURRENTIMGTYPE=${/model/doc_info/record/@current_img_type}&amp;CURRENTIMGNAME=${/model/doc_info/record/@current_img_name}&amp;_csrf=${/session/@_csrf.token}" style="broder:none;margin:0;padding:0;" width="570"/>
</a:tab>
</a:tabs>
<a:events>
<a:event name="select" handler="selectTabFun"/>
</a:events>
</a:tabPanel>
</a:case>
</a:switch>
</a:screenBody>
</a:view>
</a:screen>
src/main/webapp/modules/cont/CON733/hls_con_contract_et_create_entrance.lview
View file @ 87db2a38
......@@ -108,7 +108,8 @@
Leaf.showErrorMessage('${l:PROMPT}', '售后回租无法操作此项变更!');
return;
}
if(record.get('division') == '70' &&(ccr_document_type == 'LEASE_CHAG' ||ccr_document_type == 'CUT_CHAG')){
if(record.get('division') == '70' && ccr_document_type == 'LEASE_CHAG'){
//if(record.get('division') == '70' &&(ccr_document_type == 'LEASE_CHAG' ||ccr_document_type == 'CUT_CHAG')){
Leaf.showErrorMessage('${l:PROMPT}', '铁甲业务无法操作此项变更!');
return;
}
......
src/main/webapp/modules/cont/CON_ET001/con_early_termination_et_detail.lview
View file @ 87db2a38
......@@ -83,6 +83,7 @@
}
};
var clc_flag = 'N';
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) {
debugger;
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_01', 'con_contract_change_req');
......@@ -150,6 +151,7 @@
residual_value: record.get('ccr_residual_value') //update by xsh35973 20220613
},
success: function (res) {
clc_flag = 'Y';
//record.set('et_fee', res.result.et_fee);
var deposit_deduct =record.get('deposit_deduct')||0;
record.set('et_total_amount', minus(res.result.et_total_amount,deposit_deduct));
......@@ -163,6 +165,7 @@
record.set('fund_possession_rate', res.result.fund_possession_rate);
record.set('last_rent_due_date', res.result.last_rent_due_date);
record.set('sum_unreceived_principal', res.result.sum_unreceived_principal);
clc_flag = 'N';
},
failure: function () {
record.set('termination_date', '');
......@@ -194,7 +197,7 @@
});
}
//add by xsh35973 添加修改调整后资源占用费提前结清租金跟随变动
if(name == 'fund_possession_cost'){
if(name == 'fund_possession_cost' && clc_flag =='N'){
if (value < 0 || value == NaN || value == undefined) {
Leaf.showMessage('${l:HLS.PROMPT}', '调整后的资金占用费金额应大于等于0！');
setTimeout(function () {
......@@ -208,7 +211,7 @@
record.set('et_due_amount', et_due_amount_result);
}
}
if(name == 'residual_value'){
if(name == 'residual_value' && clc_flag =='N'){
if (value < 0 || value == NaN || value == undefined) {
Leaf.showMessage('${l:HLS.PROMPT}', '调整后的留购金金额应大于等于0！');
setTimeout(function () {
......@@ -219,7 +222,7 @@
var et_total_amount_result=plus(plus(plus(plus(record.get('et_due_amount') || 0, record.get('et_fee') || 0), record.get('residual_value') || 0), record.get('overdue_amount') || 0), record.get('ccr_penalty'));
record.set('et_total_amount',et_total_amount_result);
}
if(name == 'et_due_amount'){
if(name == 'et_due_amount' && clc_flag =='N'){
if (value < 0 || value == NaN || value == undefined) {
Leaf.showMessage('${l:HLS.PROMPT}', '调整后的提前结清租金金额应大于等于0！');
setTimeout(function () {
......
src/main/webapp/modules/csh/CSH501/csh_payment_req.lview
View file @ 87db2a38
......@@ -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;
......@@ -192,7 +190,6 @@
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') {
......@@ -211,6 +208,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);
}
}
}
......@@ -312,7 +315,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');
......@@ -484,7 +486,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');
......
src/main/webapp/modules/csh/CSH510/csh_transaction_hand_receipt_update.lview
View file @ 87db2a38
......@@ -128,7 +128,7 @@
function onUpdate_csh511_receipt(ds, record, name, value, oldvalue) {
if (name == 'bp_id') {
if (value != oldvalue && '${/parameter/@import_source}' != 'HSBC_ADD') {
if (value != oldvalue && '${/parameter/@import_source}' != 'HSBC_ADD'&&'${/parameter/@import_source}' != 'EXCEL_ADD') {
record.set('bp_bank_account_id', '');
record.set('bp_bank_account_code', '');
record.set('bp_bank_account_name', '');
......@@ -843,7 +843,7 @@
Leaf.onReady(init);
function init() {
if('${/parameter/@import_source}' == 'HSBC_ADD'){
if('${/parameter/@import_source}' == 'HSBC_ADD'||'${/parameter/@import_source}' == 'EXCEL_ADD' ){
var record = $('csh_transaction_receipt_head_ds').getAt(0);
record.getField('transaction_date').setReadOnly(true);
record.getField('transaction_amount').setReadOnly(true);
......
src/main/webapp/modules/hls/HLS801/hls_monthly_enclosure_wfl.lview 0 → 100644
View file @ 87db2a38
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: qwm
$Date: 2013-12-28 下午1:24:13
$Revision: 1.0
$Purpose:
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
<a:init-procedure>
<a:model-query model="rsc.RSC510.workflow_info" defaultWhereClause="instance_id=${/parameter/@instance_id}" rootPath="wolkflow_path"></a:model-query>
</a:init-procedure>
<a:view>
<a:link id="hls_attachment_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/>
<a:link id="hls_attachment_uploadonlyFile_id" url="${/request/@context_path}/downloadFile.lview"/>
<a:link id="hls_month_end_print_id"
url="${/request/@context_path}/modules/cus_deposit/CUS_DEPOSIT106/hls_month_end_print.lsc"/>
<script><![CDATA[
//add by gzj
function detail_upload_window(record_id) {
if('${/model/wolkflow_path/record/@current_seq}' == '10'){
var url = $('hls_attachment_uploadFile_id').getUrl() + '?table_name=BUSINESS_REPORT&header_id=' + record_id;
var win = new Leaf.Window({
url: url,
title: '${l:HLS.SUPPORTING_DOCUMENT}',
id: 'hls_month_downloadFile_id',
width: 850,
height: 400
});
}else{
var url = $('hls_attachment_uploadonlyFile_id').getUrl() + '?table_name=BUSINESS_REPORT&header_id=' + record_id;
var win = new Leaf.Window({
url: url,
title: '${l:HLS.SUPPORTING_DOCUMENT}',
id: 'month_downloadFile_id',
width: 850,
height: 400
});
}
}
function attachment_upload(val,rec,name) {
return '<a href=javascript:detail_upload_window('+rec.get('tab_id')+')>附件上传</a>';
}
function sbo_detail_upload_window(record_id) {
if('${/model/wolkflow_path/record/@current_seq}' == '10'){
var url = $('hls_attachment_uploadFile_id').getUrl() + '?table_name=SBO_REPORT&header_id=' + record_id;
var win = new Leaf.Window({
url: url,
title: '${l:HLS.SUPPORTING_DOCUMENT}',
id: 'hls_sbo_month_downloadFile_id',
width: 850,
height: 400
});
}else{
var url = $('hls_attachment_uploadonlyFile_id').getUrl() + '?table_name=SBO_REPORT&header_id=' + record_id;
var win = new Leaf.Window({
url: url,
title: '${l:HLS.SUPPORTING_DOCUMENT}',
id: 'sbo_month_downloadFile_id',
width: 850,
height: 400
});
}
}
function sbo_attachment_upload(val,rec,name) {
return '<a href=javascript:sbo_detail_upload_window('+rec.get('tab_id')+')>附件上传</a>';
}
//审批通过打印审批记录
function month_approved_print() {
debugger;
var headers_ds = $('unearned_finance_income_query_ds');
var record = headers_ds.getCurrentRecord();
var year = record.get('year');
var month = record.get('month');
var date = year+month;
// var record = $('csh_transaction_return_wfl_ds').getCurrentRecord();
// var return_id = record.get('return_id');
var file_name = "报表确认流程" + "-" + year+'年'+ month + "月审批记录";
var url_l = $('hls_month_end_print_id').getUrl() + '?document_id=' + date + '&file_name=' + encodeURI(file_name) + '&document_table=HLS_MONTH_END&batch_flag=Y&source_type=common';
window.open(href = url_l, target = "_self");
}
]]></script>
<a:dataSets>
<a:dataSet id="unearned_finance_income_query_ds" autoCreate="true" >
<a:fields>
<a:field name="month_date" defaultValue="${/parameter/@month_date}"/>
<a:field name="year"/>
<a:field name="month"/>
<a:field name="batch_num" defaultValue="${/parameter/@batch_num}"/>
</a:fields>
</a:dataSet>
<a:dataSet id="report_name_ds" lookupCode="HLS_REPORT_NAME"/>
<a:dataSet id="month_report_ds" autoQuery="true" fetchAll="true" model="hls.HLS801.con_monthly_statement_wfl"
queryDataSet="unearned_finance_income_query_ds">
</a:dataSet>
</a:dataSets>
<a:screenBody>
<a:screenTopToolbar>
<a:gridButton id="month_approved_print_id" click="month_approved_print" text="月结报表审批记录打印"/>
</a:screenTopToolbar>
<a:form column="1" marginWidth="80" style="margin-left:3px" title="HLS.QUERY_TITLE">
<a:box column="3" labelWidth="150" style="margin-left:-80px">
<a:textField name="year" bindTarget="unearned_finance_income_query_ds"
prompt="HLS801.YEAR" readOnly="true"/>
<a:textField name="month" bindTarget="unearned_finance_income_query_ds"
prompt="HLS801.MONTH" readOnly="true"/>
</a:box>
</a:form>
<a:grid id="month_report_id" bindTarget="month_report_ds" marginHeight="300"
marginWidth="150">
<a:columns>
<a:column name="report_name" align="center" prompt="报表名称"
width="100" />
<a:column name="sbo_attachment_upload" align="center" prompt="SB0报表" renderer="sbo_attachment_upload" width="80"/>
<a:column name="sbo_file_name" align="center" prompt="附件名称"
width="100" />
<a:column name="attachment_upload" align="center" prompt="业务系统报表" renderer="attachment_upload" width="80"/>
<a:column name="business_file_name" align="center" prompt="附件名称"
width="100" />
</a:columns>
</a:grid>
</a:screenBody>
<script>
Leaf.onReady(function () {
Leaf.onReady(init);
function init() {
debugger;
var a = '${/parameter/@instance_id}';
alert(a);
var record = $('unearned_finance_income_query_ds').getCurrentRecord();
var year = "${/parameter/@month_date}".substring(0, 4);
var month = "${/parameter/@month_date}".substring(4, 6);
record.set('year',year);
record.set('month',month);
if ('${/model/wolkflow_path/record/@current_seq}' == '10'||'${/model/wolkflow_path/record/@current_seq}' == '20') {
document.getElementById("month_approved_print_id").style.display = "none";
}
// var records = $('month_report_ds').getAll()[0];
// var status=records.get('status_name');
// if (status != 'APPROVED') {
// document.getElementById("month_approved_print_id").style.display = "none";
// }
$('month_report_ds').query();
}
})
</script>
</a:view>
</a:screen>
src/main/webapp/modules/hsbc/HSBC100/hsbc_paying_batch_create.lview
View file @ 87db2a38
......@@ -158,9 +158,11 @@
window['${/parameter/@layout_code}_on_layout_dynamic_grid_select'] = function(ds, record, bp_seq) {
var form_ds_id = '${/parameter/@layout_code}_F_QUERY__ds';
var formr_r_ds_id = '${/parameter/@layout_code}_R_F_QUERY__ds';
var req_ln_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var con_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
var form_record = $(form_ds_id).getAt(0);
var form_r_record = $(formr_r_ds_id).getAt(0);
var req_records = $(req_ln_ds_id).getSelected();
var con_records = $(con_ds_id).getSelected();
......@@ -177,15 +179,17 @@
for (var i = 0;i < con_records.length;i++) {
sum = plus(sum, con_records[i].get('this_return_amount'));
}
form_record.set('total_unpaid_amount', sum);
form_r_record.set('total_unpaid_amount', sum);
}
};
window['${/parameter/@layout_code}_on_layout_dynamic_grid_unselect'] = function(ds, record, bp_seq) {
var form_ds_id = '${/parameter/@layout_code}_F_QUERY__ds';
var formr_r_ds_id = '${/parameter/@layout_code}_R_F_QUERY__ds';
var req_ln_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var con_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
var form_record = $(form_ds_id).getAt(0);
var form_r_record = $(formr_r_ds_id).getAt(0);
var req_records = $(req_ln_ds_id).getSelected();
var con_records = $(con_ds_id).getSelected();
......@@ -202,7 +206,7 @@
for (var i = 0;i < con_records.length;i++) {
sum = plus(sum, con_records[i].get('this_return_amount'));
}
form_record.set('total_unpaid_amount', sum);
form_r_record.set('total_unpaid_amount', sum);
}
};
......
src/main/webapp/modules/hsbc/HSBC110/hsbc_paying_batch_detail.lview
View file @ 87db2a38
......@@ -9,10 +9,12 @@
<a:init-procedure/>
<a:view>
<a:link id="prj_project_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="prj_project_query_link" url="${/request/@context_path}/modules/prj/PRJ501DF/prj_project_maintain.screen"/>
<a:link id="${/parameter/@layout_code}_df_csh_payment_apply_link" url="${/request/@context_path}/modules/csh/CSH770/df_csh_payment_apply_wfl.screen"/>
<!--<a:link id="prj_project_query_link" url="${/request/@context_path}/modules/prj/PRJ501DF/prj_project_maintain.screen"/>
<a:link id="${/parameter/@layout_code}_df_csh_payment_apply_link" url="${/request/@context_path}/modules/csh/CSH770/df_csh_payment_apply_wfl.screen"/>-->
<a:link id="${/parameter/@layout_code}con_contract_query_link" url="${/request/@context_path}/modules/cont/CON3200/con_re_incept_modify.lview"/>
<a:link id="transaction_return_downloadFile_link_id" url="${/request/@context_path}/downloadFile.lview"/>
<script><![CDATA[
function open_project_win(ds_id, record_id) {
/*function open_project_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
var param = {};
param['project_id'] = record.get('contract_id');
......@@ -35,16 +37,50 @@
param['url_title'] = '付款明细';
param['winid'] = 'payment_req_number_link';
hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, '${/parameter/@layout_code}_df_csh_payment_apply_link', ds_id,'${/parameter/@layout_code}');
};
};*/
function open_contract_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
var param = record.data;
param['function_usage'] = 'QUERY';
param['function_code'] = 'CON3200Q';
param['maintain_type'] = 'QUERY';
param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, '${/parameter/@layout_code}con_contract_query_link', ds_id,'${/parameter/@layout_code}');
}
function open_return_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
var header_id = record.data.source_id;
var url = $('transaction_return_downloadFile_link_id').getUrl() + '?table_name=CSH_TRANSACTION_RETURN&_csrf=${/session/@_csrf.token}&header_id=' + header_id;
var win = new Leaf.Window({
url: url,
title: '${l:HLS.SUPPORTING_DOCUMENT}',
id: 'transaction_return_uploadFile_id',
width: 850,
height: 400
});
}
window['${/parameter/@layout_code}_dynamic_link_renderer'] = function(value, record, name, config_record) {
if (name == 'contract_number' && value && '${/parameter/@lease_channel}' == '01') {
return '<a href="javascript:open_project_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + value + '</a>';
if (name == 'contract_number' && value) {
return '<a href="javascript:open_contract_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + value + '</a>';
}
if (name == 'payment_req_number' && value && '${/parameter/@lease_channel}' == '01') {
if (name == 'attachment_r' && record.get('source_table') == 'CSH_TRANSACTION_RETURN') {
return '<a href="javascript:open_return_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + '附件' + '</a>';
}
/*if (name == 'payment_req_number' && value && '${/parameter/@lease_channel}' == '01') {
link_function = '${/parameter/@layout_code}_payment_req_number_win';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.get('payment_req_id') + '\',\'' + record.ds.id + '\',\'' + '\');">' + value + '</a>';
}
if (name == 'payment_req_number' && value && '${/parameter/@lease_channel}' == '01') {
return value;
}*/
if (name == 'payment_req_number' && value && '${/parameter/@lease_channel}' == '01') {
link_function = '${/parameter/@layout_code}_payment_req_number_win';
return value
}
if (name == 'payment_req_number' && value && '${/parameter/@lease_channel}' == '01') {
return value;
}
......
src/main/webapp/modules/hsbc/HSBC110/hsbc_paying_batch_modify.lview
View file @ 87db2a38
......@@ -233,6 +233,60 @@
}
});
window['${/parameter/@layout_code}_on_layout_dynamic_grid_select'] = function(ds, record, bp_seq) {
var form_ds_id = '${/parameter/@layout_code}_F_QUERY__ds';
var formr_r_ds_id = '${/parameter/@layout_code}_R_F_QUERY__ds';
var g_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_RESULT', 'hl_hsbc_paying_batch');
var r_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'R_RESULT', 'hl_hsbc_paying_batch');
var form_record = $(form_ds_id).getAt(0);
var form_r_record = $(formr_r_ds_id).getAt(0);
var g_records = $(g_ds_id).getSelected();
var r_records = $(r_ds_id).getSelected();
if (g_ds_id == ds.id) {
var sum = 0;
for (var i = 0;i < g_records.length;i++) {
sum = plus(sum, g_records[i].get('totalamt'));
}
form_record.set('total_unpaid_amount', sum);
}
if (r_ds_id == ds.id) {
var sum = 0;
for (var i = 0;i < r_records.length;i++) {
sum = plus(sum, r_records[i].get('totalamt'));
}
form_r_record.set('total_unpaid_amount', sum);
}
};
window['${/parameter/@layout_code}_on_layout_dynamic_grid_unselect'] = function(ds, record, bp_seq) {
var form_ds_id = '${/parameter/@layout_code}_F_QUERY__ds';
var formr_r_ds_id = '${/parameter/@layout_code}_R_F_QUERY__ds';
var g_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_RESULT', 'hl_hsbc_paying_batch');
var r_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'R_RESULT', 'hl_hsbc_paying_batch');
var form_record = $(form_ds_id).getAt(0);
var form_r_record = $(formr_r_ds_id).getAt(0);
var g_records = $(g_ds_id).getSelected();
var r_records = $(r_ds_id).getSelected();
if (g_ds_id == ds.id) {
var sum = 0;
for (var i = 0;i < g_records.length;i++) {
sum = plus(sum, g_records[i].get('totalamt'));
}
form_record.set('total_unpaid_amount', sum);
}
if (r_ds_id == ds.id) {
var sum = 0;
for (var i = 0;i < r_records.length;i++) {
sum = plus(sum, r_records[i].get('totalamt'));
}
form_r_record.set('total_unpaid_amount', sum);
}
};
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
......
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