Skip to content

L
leaf-hlcm
Commit 39d9eb43 authored by panhong18943's avatar panhong18943
Browse files
Options

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

parents 4ab928e4 0c8f9040
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2189 additions and 211 deletions
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_wfl_query.lwm
View file @ 39d9eb43
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
t.ref_d04, t.ref_d04,
t.ref_d05, t.ref_d05,
t.wfl_instance_id, t.wfl_instance_id,
t.csh_transaction_atm_id,
nvl(t.gld_rent_flag,'N') gld_rent_flag,
t.approval_status, t.approval_status,
nvl(t.ignore_invoice_check_flag,'N') ignore_invoice_check_flag, nvl(t.ignore_invoice_check_flag,'N') ignore_invoice_check_flag,
nvl(t.extend_month_flag,'N') extend_month_flag nvl(t.extend_month_flag,'N') extend_month_flag
......
src/main/webapp/WEB-INF/classes/csh/CSH514/check_contract_invoice.lwm
View file @ 39d9eb43
...@@ -28,8 +28,11 @@ ...@@ -28,8 +28,11 @@
p_transaction_wfl_id =>${@transaction_wfl_id}, p_transaction_wfl_id =>${@transaction_wfl_id},
p_check_flag =>${@check_flag}, p_check_flag =>${@check_flag},
p_extend_month_flag =>${@extend_month_flag}, p_extend_month_flag =>${@extend_month_flag},
p_gld_rent_flag =>${@gld_rent_flag},
p_user_id => ${/session/@user_id} p_user_id => ${/session/@user_id}
); );
end; end;
]]></bm:update-sql> ]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model> </bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH514/csh_transaction_write_off_reverse_wfl.lwm
View file @ 39d9eb43
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
p_transaction_date => to_date(${@transaction_date}, 'yyyy-mm-dd'), p_transaction_date => to_date(${@transaction_date}, 'yyyy-mm-dd'),
p_description => ${@description}, p_description => ${@description},
p_note => ${@note}, p_note => ${@note},
p_csh_transaction_atm_id => ${@csh_transaction_atm_id},
p_user_id => ${/session/@user_id} p_user_id => ${/session/@user_id}
); );
end; end;
......
src/main/webapp/WEB-INF/classes/csh/CSH514/extend_gld_rent_check.lwm 0 → 100644
View file @ 39d9eb43
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: trd
$Date: 2025-02-10下午03:25:19
$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 csh_transaction_wfl_pkg.extend_gld_rent_check(p_transaction_wfl_id => ${@transaction_wfl_id}) rent_check_flag from dual
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH514/get_csh_transaction_list_id.lwm 0 → 100644
View file @ 39d9eb43
<?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="query">
<bm:query-sql><![CDATA[
select csh_transaction_list_s.nextval transaction_list_id from dual
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="transaction_list_id"/>
</bm:fields>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH531/get_trans_review_status.lwm
View file @ 39d9eb43
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
or t.trans_review_status ='REVIEWING_OP') or t.trans_review_status ='REVIEWING_OP')
and cc.contract_id = t.source_contract_id and cc.contract_id = t.source_contract_id
and cc.data_class = 'NORMAL' and cc.data_class = 'NORMAL'
and to_char(t.je_date,'yyyy-mm') = ${@csh_date}
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/csh_transaction_maintain_query.lwm
View file @ 39d9eb43
...@@ -88,6 +88,10 @@ ...@@ -88,6 +88,10 @@
<bm:field name="bank_branch_name" expression="(select bank_branch_name from csh_bank_branch where bank_branch_id = (select bank_branch_id from csh_bank_account where bank_account_id = t1.bank_account_id))" forInsert="false" forUpdate="false"/> <bm:field name="bank_branch_name" expression="(select bank_branch_name from csh_bank_branch where bank_branch_id = (select bank_branch_id from csh_bank_account where bank_account_id = t1.bank_account_id))" forInsert="false" forUpdate="false"/>
<bm:field name="use_money_amount" expression="(select t1.transaction_amount-t1.returned_amount from dual)" forInsert="false" forUpdate="false"/> <bm:field name="use_money_amount" expression="(select t1.transaction_amount-t1.returned_amount from dual)" forInsert="false" forUpdate="false"/>
<bm:field name="opposite_band_na"/> <bm:field name="opposite_band_na"/>
<bm:field name="opposite_band_name" expression="(select a.bank_full_name from hls_bp_master_bank_account a where a.bp_id = t1.bp_id and a.enabled_flag = 'Y' and rownum=1)"/>
<bm:field name="bp_bank_account_number" expression="(select a.Bank_Account_Num from hls_bp_master_bank_account a where a.bp_id = t1.bp_id and a.enabled_flag = 'Y' and rownum=1)"/>
<bm:field name="bp_bank_branch_name" expression="(select a.Bank_Branch_Name from hls_bp_master_bank_account a where a.bp_id = t1.bp_id and a.enabled_flag = 'Y' and rownum=1)"/>
<bm:field name="bank_sum" expression="(select COUNT(*) as bank_sum from hls_bp_master_bank_account a where a.bp_id = t1.bp_id and a.enabled_flag = 'Y')"/>
<bm:field name="applying_amount" expression="(nvl((select sum(cr.return_amount) from csh_transaction_return cr where cr.transaction_id=t1.transaction_id and cr.status='APPROVING'),0))" forInsert="false" forUpdate="false"/> <bm:field name="applying_amount" expression="(nvl((select sum(cr.return_amount) from csh_transaction_return cr where cr.transaction_id=t1.transaction_id and cr.status='APPROVING'),0))" forInsert="false" forUpdate="false"/>
<bm:field name="return_id" expression="(select cr.return_id from csh_transaction_return cr where cr.transaction_id=t1.transaction_id and cr.status='APPROVING')" forInsert="false" forUpdate="false"/> <bm:field name="return_id" expression="(select cr.return_id from csh_transaction_return cr where cr.transaction_id=t1.transaction_id and cr.status='APPROVING')" forInsert="false" forUpdate="false"/>
<bm:field name="banka"/> <bm:field name="banka"/>
......
src/main/webapp/WEB-INF/classes/efile/EFILE1030/e_archive_pool_temp_import_his.lwm 0 → 100644
View file @ 39d9eb43
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: luochenglong
$Date: 2023-02-10 下午3:03:31
$Revision: 1.0
$Purpose:电子档案池bm
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select * from (SELECT t1.pool_id,
t1.primary_field,
t1.internal_period_num,
t1.base_archive_code,
t1.archive_type,
t1.document_id,
t1.document_number,
t1.document_info,
t1.post_status,
t1.e_archives_id,
(SELECT hl.workflow_id FROM hl_e_archives_post_list hl
WHERE hl.e_archives_id = t1.e_archives_id) workflow_id,
(SELECT e.je_check_flag
FROM e_archives_define e
WHERE e.base_archive_code = t1.base_archive_code
AND nvl(e.workflow_id,'-1') = nvl((SELECT hl.workflow_id
FROM hl_e_archives_post_list hl
WHERE hl.e_archives_id = t1.e_archives_id),'-1')
and nvl(e.func_type,'-1')=nvl((select hl.func_type from hl_e_archives_post_list hl where hl.e_archives_id=t1.e_archives_id),'-1')) je_check_flag,
(SELECT e.post_stru_data_flag
FROM e_archives_define e
WHERE e.base_archive_code = t1.base_archive_code
AND nvl(e.workflow_id,'-1') = nvl((SELECT hl.workflow_id
FROM hl_e_archives_post_list hl
WHERE hl.e_archives_id = t1.e_archives_id),'-1')
and nvl(e.func_type,'-1')=nvl((select hl.func_type from hl_e_archives_post_list hl where hl.e_archives_id=t1.e_archives_id),'-1')) post_stru_data_flag,
(SELECT e.post_atm_flag
FROM e_archives_define e
WHERE e.base_archive_code = t1.base_archive_code
AND nvl(e.workflow_id,'-1') = nvl((SELECT hl.workflow_id
FROM hl_e_archives_post_list hl
WHERE hl.e_archives_id = t1.e_archives_id),'-1')
and nvl(e.func_type,'-1')=nvl((select hl.func_type from hl_e_archives_post_list hl where hl.e_archives_id=t1.e_archives_id),'-1')) post_atm_flag,
(SELECT e.base_archive_id
FROM e_archives_define e
WHERE e.base_archive_code = t1.base_archive_code
AND nvl(e.workflow_id,'-1') = nvl((SELECT hl.workflow_id
FROM hl_e_archives_post_list hl
WHERE hl.e_archives_id = t1.e_archives_id),'-1')
and nvl(e.func_type,'-1')=nvl((select hl.func_type from hl_e_archives_post_list hl where hl.e_archives_id=t1.e_archives_id),'-1')) base_archive_id,
(SELECT c.code_value_name
FROM sys_code_values_v c
WHERE c.code = 'DATA_CLASSIFICATION'
AND c.code_value = t1.archive_type) archive_type_desc,
(SELECT c.code_value_name
FROM sys_code_values_v c
WHERE c.code = 'YES_NO'
AND c.code_value = 'Y') suppl_trans_flag,
t1.hly_req_number ,
t1.post_message
FROM hl_e_archives_pool t1
where to_number(t1.internal_period_num) >=
nvl(to_number(${@period_num_from}),
to_number(t1.internal_period_num))
AND to_number(t1.internal_period_num) <=
nvl(to_number(${@period_num_to}),
to_number(t1.internal_period_num))
AND t1.archive_type =
nvl(${@archive_type}, t1.archive_type)
AND t1.post_status <>'POST_SUCCESS'
AND t1.pool_id IN
(SELECT tmp.document_id FROM hls_archive_pool_tmp tmp WHERE tmp.session_id = ${@session_id}))
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="e_archives_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="E_ARCHIVES_ID" />
<bm:field name="workflow_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="WORKFLOW_ID" />
<bm:field name="je_check_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="JE_CHECK_FLAG"/>
<bm:field name="base_archive_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BASE_ARCHIVE_ID" />
<bm:field name="pool_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="POOL_ID" />
<bm:field name="primary_field" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PRIMARY_ID" />
<bm:field name="internal_period_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INTERNAL_PERIOD_NUM"/>
<bm:field name="base_archive_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BASE_ARCHIVE_CODE" />
<bm:field name="archive_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ARCHIVE_TYPE"/>
<bm:field name="document_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DOCUMENT_ID"/>
<bm:field name="document_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DOCUMENT_NUMBER"/>
<bm:field name="post_status" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DOCUMENT_NUMBER"/>
<bm:field name="document_info" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="POST_STATUS"/>
<bm:field name="post_message" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="POST_MESSAGE"/>
</bm:fields>
</bm:model>
src/main/webapp/WEB-INF/classes/efile/EFILE1030/efile_pool_data_post.lwm 0 → 100644
View file @ 39d9eb43
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="insert">
<bm:update-sql><![CDATA[
BEGIN
insert into hl_e_archives_pool_temp
(primary_field,
pool_id
)
values
(
${@primary_field},
${@pool_id}
);
END;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="delete">
<bm:update-sql><![CDATA[
begin
delete from hl_e_archives_pool_temp t;
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
update hl_e_archives_pool t set t.post_status='POST_FAILED' where t.pool_id=${@pool_id};
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/hls/HLS801/check_business_monthly.lwm 0 → 100644
View file @ 39d9eb43
<?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="query">
<bm:query-sql><![CDATA[
select dbms_lob.substr(t.err_msg) as err_msg from hls_monthy_business_log t where t.csh_date = ${@csh_date}
]]>
</bm:query-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
hls_monthy_business_pkg.csh_transaction_confirm(
p_csh_date=>${@csh_date},
p_check_flag=>${@p_check_flag}
);
end;
]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="p_check_flag" dataType="java.lang.String" input="false" output="true" outputPath="@p_check_flag"/>
</bm:parameters>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/hsbc/HSBC120/submit_hsbc_change_req.lwm 0 → 100644
View file @ 39d9eb43
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
hl_hsbc_bank_change_pkg.hsbc_bank_account_itfc_ins(p_batch_id => ${@batch_id},
p_user_id => ${/session/@user_id},
p_bank_itfc_id => ${@bank_itfc_id});
end;
]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="bank_itfc_id" dataType="java.lang.Long" output="true" outputPath="@bank_itfc_id"/>
</bm:parameters>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
hl_hsbc_bank_change_pkg.hsbc_bank_change_submit(
p_bank_itfc_id =>${@bank_itfc_id},
p_company_id => ${/session/@company_id},
p_user_id => ${/session/@user_id}
);
end;]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/prj/PRJ500D/update_prj_credit_code.lwm 0 → 100644
View file @ 39d9eb43
<?xml version="1.0" encoding="UTF-8"?>
<!--
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
Begin
update prj_project_bp pb
set pb.credit_code = ${@credit_code},
pb.rsc_flag =${@rsc_flag},
pb.rsc_text = ${@rsc_text}
where pb.project_id = ${@project_id}
and pb.bp_class = 'ORG'
and pb.bp_category = 'TENANT';
End;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/rsc/RSC303/rsc_fin_statement_prj_all_query.lwm
View file @ 39d9eb43
...@@ -25,10 +25,33 @@ ...@@ -25,10 +25,33 @@
t1.PROJECT_NUMBER, t1.PROJECT_NUMBER,
t1.PROJECT_NAME, t1.PROJECT_NAME,
t1.currency_code, t1.currency_code,
t1.creation_date,
t1.CURRENCY_NAME t1.CURRENCY_NAME
FROM FROM
RSC_FIN_STATEMENT_PRJ_HDS_V t1 RSC_FIN_STATEMENT_PRJ_HDS_V t1 order by t1.creation_date desc
) v #WHERE_CLAUSE# ) v where v.bp_id=${/parameter/@bp_id} and v.project_id is null and NVL(${/parameter/@if_prj},'N')='N' and rownum=1
union all
SELECT
*
FROM
(SELECT DISTINCT
t1.FIN_STATEMENT_TEMPLET_ID,
t1.FIN_STATEMENT_TEMPLET_CODE,
t1.FIN_STATEMENT_TEMPLET_NAME,
t1.BP_ID,
t1.BP_CODE,
t1.BP_NAME,
t1.BP_CATEGORY,
t1.BP_TYPE,
t1.PROJECT_ID,
t1.PROJECT_NUMBER,
t1.PROJECT_NAME,
t1.currency_code,
t1.creation_date,
t1.CURRENCY_NAME
FROM
RSC_FIN_STATEMENT_PRJ_HDS_V t1 order by t1.creation_date desc
) v where v.bp_id=${/parameter/@bp_id} and ${/parameter/@if_prj} ='Y' and rownum=1
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
...@@ -54,6 +77,6 @@ ...@@ -54,6 +77,6 @@
<bm:query-field name="creation_date_to" queryExpression="t1.creation_date &lt;=${@creation_date_to}"/> --> <bm:query-field name="creation_date_to" queryExpression="t1.creation_date &lt;=${@creation_date_to}"/> -->
</bm:query-fields> </bm:query-fields>
<bm:data-filters> <bm:data-filters>
<bm:data-filter name="project_id" expression="project_id is null"/> <!-- <bm:data-filter name="project_id" expression="project_id is null"/>-->
</bm:data-filters> </bm:data-filters>
</bm:model> </bm:model>
src/main/webapp/WEB-INF/classes/sys/SYS405/sys_mail_sent.lwm 0 → 100644
View file @ 39d9eb43
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select case when v.job_count>=2 then 'Y' else 'N' end as existsFlag
from (select count(1) job_count
from sch_concurrent_job t1
where task_code = 'SYS_SEND_MAIL_BY_JAVA'
and job_status in ('RUNNING')) v
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="existsFlag"/>
</bm:fields>
</bm:model>
src/main/webapp/WEB-INF/classes/sys/SYS405/zj_sys_mailing_list.lwm
View file @ 39d9eb43
...@@ -23,12 +23,13 @@ ...@@ -23,12 +23,13 @@
zj_sys_mailing_list zj_sys_mailing_list
WHERE WHERE
sent_flag = 'N' AND sent_flag = 'N' AND
mail_to is not null AND
error_times <= 3 AND error_times <= 3 AND
( (
sysdate - creation_date sysdate - creation_date
) )
< 3 < 3
and rownum<=30 and rownum<=15
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
<bm:operation name="update"> <bm:operation name="update">
......
src/main/webapp/WEB-INF/classes/sys/SYS8210/login_account_query.lwm
View file @ 39d9eb43
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
WHERE EE.EMPLOYEE_ID = SU.EMPLOYEE_ID) EMPLOYEE_NAME, WHERE EE.EMPLOYEE_ID = SU.EMPLOYEE_ID) EMPLOYEE_NAME,
(SELECT SCV.CODE_VALUE_NAME FROM SYS_CODE_VALUES_V SCV WHERE CODE='USER_TYPE' AND SCV.CODE_VALUE = SU.BP_CATEGORY) BP_CATEGORY_NAME, (SELECT SCV.CODE_VALUE_NAME FROM SYS_CODE_VALUES_V SCV WHERE CODE='USER_TYPE' AND SCV.CODE_VALUE = SU.BP_CATEGORY) BP_CATEGORY_NAME,
(SELECT HD.BP_CODE FROM HLS_BP_MASTER HD WHERE SU.BP_ID=HD.BP_ID) BP_CODE, (SELECT HD.BP_CODE FROM HLS_BP_MASTER HD WHERE SU.BP_ID=HD.BP_ID) BP_CODE,
(SELECT HD.BP_NAME FROM HLS_BP_MASTER HD WHERE SU.BP_ID=HD.BP_ID) BP_NAME (SELECT HD.BP_NAME FROM HLS_BP_MASTER HD WHERE SU.BP_ID=HD.BP_ID) BP_NAME,
sys_login_pkg.get_login_time(p_user_id =>su.user_id) login_time
from sys_user su order by su.USER_NAME ) from sys_user su order by su.USER_NAME )
#WHERE_CLAUSE#]]></bm:query-sql> #WHERE_CLAUSE#]]></bm:query-sql>
......
src/main/webapp/WEB-INF/classes/zjwfl/ZJWFL5110/zj_wfl_approve_refuse_batch.lwm
View file @ 39d9eb43
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
select select
t.node_action_id t.node_action_id
into v_node_action_id into v_node_action_id
from ZJ_WFL_WORKFLOW_NODE_ACTION t where t.node_id = ${@node_id} and t.action_type = 3; from ZJ_WFL_WORKFLOW_NODE_ACTION t where t.node_id = ${@node_id} and t.action_type = ${@action_type};
${@result_num} := zj_wfl_core_pkg.workflow_approve(p_rcpt_record_id => ${@record_id}, ${@result_num} := zj_wfl_core_pkg.workflow_approve(p_rcpt_record_id => ${@record_id},
p_node_action_id => v_node_action_id, p_node_action_id => v_node_action_id,
......
src/main/webapp/WEB-INF/server-script/layoutconfig/jcredit_entrance_confirm_f_credit_hd_queryfields.js
View file @ 39d9eb43
var add_datafilters = [ var add_datafilters = [
{ {
name: '', name: '',
expression: "((t1.credit_status in ('REJECT','APPROVING_OP','APPROVED') and ${/session/@user_id}=11319) or (t1.credit_status in ('REJECT','APPROVING_OP','APPROVED','APPROVING') and ${/session/@user_id}!=11319))" expression: "((t1.credit_status in ('REJECT','APPROVING_OP','APPROVED') and ${/session/@role_id}=2554) or (t1.credit_status in ('REJECT','APPROVING_OP','APPROVED','APPROVING') and ${/session/@role_id}!=2554))"
}, },
{ {
name : "unit_code", name : "unit_code",
......
src/main/webapp/WEB-INF/server-script/layoutconfig/jcredit_entrance_confirm_f_credit_op_queryfields.js
View file @ 39d9eb43
var add_datafilters = [ var add_datafilters = [
{ {
name: '', name: '',
expression: "((t1.credit_status in ('REJECT','APPROVING_OP','APPROVED') and ${/session/@user_id}=11319) or (t1.credit_status in ('REJECT','APPROVING','APPROVED') and ${/session/@user_id}=10399) or (t1.credit_status in ('REJECT','APPROVING_OP','APPROVED','APPROVING') and ${/session/@user_id} not in (11319,10399)))" expression: "((t1.credit_status in ('REJECT','APPROVING_OP','APPROVED') and ${/session/@role_id}=2554) or (t1.credit_status in ('REJECT','APPROVING_OP','APPROVED','APPROVING') and ${/session/@role_id} != 2554))"
}, },
{ {
name : "unit_code", name : "unit_code",
......
src/main/webapp/WEB-INF/server-script/layoutconfig/layout_config.js
View file @ 39d9eb43
...@@ -356,5 +356,6 @@ var enableLayoutConfig = { ...@@ -356,5 +356,6 @@ var enableLayoutConfig = {
'modules/csh/CSH501R/csh_payment_comm_create_entrance.lview':true, 'modules/csh/CSH501R/csh_payment_comm_create_entrance.lview':true,
'modules/csh/CSH501R/csh_payment_comm_selected.lview':true, 'modules/csh/CSH501R/csh_payment_comm_selected.lview':true,
'modules/csh/CSH501R/csh_payment_comm_req.lview':true, 'modules/csh/CSH501R/csh_payment_comm_req.lview':true,
'modules/cont/CON1380/con_commission_report.lview':true 'modules/cont/CON1380/con_commission_report.lview':true,
'modules/hsbc/HSBC120/hsbc_paying_account_change.lview':true
}; };
\ No newline at end of file
src/main/webapp/modules/cont/CON500/con_contract_get_layout_code.lview
View file @ 39d9eb43
...@@ -76,7 +76,6 @@ ...@@ -76,7 +76,6 @@
}); });
} }
win.on('close', function () { win.on('close', function () {
if(list_ds=='acp522_acp_invoice_import_detail_ds'){ if(list_ds=='acp522_acp_invoice_import_detail_ds'){
location.reload(); location.reload();
}else if((param['function_code']=='HLS214B'||param['function_code']=='HLS214F')&&param['change_req_id']&&param['delete_flag']=='Y'){ }else if((param['function_code']=='HLS214B'||param['function_code']=='HLS214F')&&param['change_req_id']&&param['delete_flag']=='Y'){
...@@ -87,6 +86,8 @@ ...@@ -87,6 +86,8 @@
}else if(param['function_code']=='PRJ501INC'){ }else if(param['function_code']=='PRJ501INC'){
$('PROJECT_CREATE_NP_G_LEASE_HEAD_CAR_prj_project_lease_item_ds').query(); $('PROJECT_CREATE_NP_G_LEASE_HEAD_CAR_prj_project_lease_item_ds').query();
$('PROJECT_CREATE_NP_F_QUOTATION_N_prj_quotation_ds').query(); $('PROJECT_CREATE_NP_F_QUOTATION_N_prj_quotation_ds').query();
}else if((param['function_code']=='HSBC110D_CHANGE')&&param['bank_itfc_id']){
$('HSBC120_G_RESULT_hl_hsbc_paying_batch_ds').query();
} }
else{ else{
if (list_ds) { if (list_ds) {
......
src/main/webapp/modules/csh/CSH1400/csh_agricultural_bank_check.lview
View file @ 39d9eb43
...@@ -152,6 +152,7 @@ ...@@ -152,6 +152,7 @@
var saveOrc = []; var saveOrc = [];
if (orc_save.length <= 0) { if (orc_save.length <= 0) {
Leaf.showMessage('提示', '请至少选择一条数据！'); Leaf.showMessage('提示', '请至少选择一条数据！');
} else { } else {
for (var i = 0; i < orc_save.length; i++) { for (var i = 0; i < orc_save.length; i++) {
var lineOrc = {}; var lineOrc = {};
...@@ -183,6 +184,7 @@ ...@@ -183,6 +184,7 @@
param['AbcOrc'] = saveOrc; param['AbcOrc'] = saveOrc;
if(recode.get('re_flag')=='N'){ if(recode.get('re_flag')=='N'){
Leaf.showConfirm('特别注意', '日志号, <font color="red">'+recode.get('receipt_no')+'</font>,的单据未匹配到对应回单数据，是否确认提交？', function () { Leaf.showConfirm('特别注意', '日志号, <font color="red">'+recode.get('receipt_no')+'</font>,的单据未匹配到对应回单数据，是否确认提交？', function () {
Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
Leaf.request({ Leaf.request({
url: $('csh_abc_import_transaction_link').getUrl(), url: $('csh_abc_import_transaction_link').getUrl(),
para: { para: {
...@@ -193,27 +195,42 @@ ...@@ -193,27 +195,42 @@
msg: '${l:HLS.SUBMIT_SUCCESS}', msg: '${l:HLS.SUBMIT_SUCCESS}',
duration: 2000 duration: 2000
}); });
Leaf.Masker.unmask(Ext.getBody());
$('AbcBankDs').query(); $('AbcBankDs').query();
$("OcrQueryDs").query(); $("OcrQueryDs").query();
//returnBack(); //returnBack();
},
failure: function (res) {
Leaf.Masker.unmask(Ext.getBody());
},
error: function (res) {
Leaf.Masker.unmask(Ext.getBody());
}, },
scope: this scope: this
}); });
}); });
}else { }else {
Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
Leaf.request({ Leaf.request({
url: $('csh_abc_import_transaction_link').getUrl(), url: $('csh_abc_import_transaction_link').getUrl(),
para: { para: {
param: param param: param
}, },
success: function () { success: function () {
Leaf.SideBar.show({ Leaf.SideBar.show({
msg: '${l:HLS.SUBMIT_SUCCESS}', msg: '${l:HLS.SUBMIT_SUCCESS}',
duration: 2000 duration: 2000
}); });
Leaf.Masker.unmask(Ext.getBody());
$('AbcBankDs').query(); $('AbcBankDs').query();
$("OcrQueryDs").query(); $("OcrQueryDs").query();
//returnBack(); //returnBack();
},
failure: function (res) {
Leaf.Masker.unmask(Ext.getBody());
},
error: function (res) {
Leaf.Masker.unmask(Ext.getBody());
}, },
scope: this scope: this
}); });
...@@ -223,6 +240,7 @@ ...@@ -223,6 +240,7 @@
if (abc_save.length > 0) { if (abc_save.length > 0) {
Leaf.showMessage('提示', '农行回单OCR页面的单据无法提交！'); Leaf.showMessage('提示', '农行回单OCR页面的单据无法提交！');
} }
} }
......
src/main/webapp/modules/csh/CSH514/csh_transaction_receipt_write_off_reverse_detail.lview
View file @ 39d9eb43
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<a:init-procedure> <a:init-procedure>
<a:model-query fetchAll="true" model="basic.hls_sys_time_default_value" rootPath="default_value"/> <a:model-query fetchAll="true" model="basic.hls_sys_time_default_value" rootPath="default_value"/>
<a:model-query fetchAll="true" model="csh.CSH510.csh_transaction_query" rootPath="csh_value"/> <a:model-query fetchAll="true" model="csh.CSH510.csh_transaction_query" rootPath="csh_value"/>
<a:model-query model="csh.CSH514.get_csh_transaction_list_id" rootPath="csh_transaction_list_id"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="csh_transaction_write_off_reverse_link_id" <a:link id="csh_transaction_write_off_reverse_link_id"
...@@ -16,7 +17,9 @@ ...@@ -16,7 +17,9 @@
<!--<a:link id="csh514_write_off_reverse_link_id" model="csh.CSH514.csh_transaction_write_off_reverse" modelaction="batch_update"/>--> <!--<a:link id="csh514_write_off_reverse_link_id" model="csh.CSH514.csh_transaction_write_off_reverse" modelaction="batch_update"/>-->
<a:link id="csh514_write_off_reverse_link_id" url="${/request/@context_path}/modules/csh/CSH514/csh_transaction_write_off_reverse.lsc"/> <a:link id="csh514_write_off_reverse_link_id" url="${/request/@context_path}/modules/csh/CSH514/csh_transaction_write_off_reverse.lsc"/>
<a:link id="get_period_name_id" model="csh.CSH511.csh_transaction_get_period_name" modelaction="query"/> <a:link id="get_period_name_id" model="csh.CSH511.csh_transaction_get_period_name" modelaction="query"/>
<a:link id="csh514_write_off_attach_win_link" url="${/request/@context_path}/uploadFile.lview"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
var csh_transaction_atm_id = '${/model/csh_transaction_list_id/record/@transaction_list_id}';
function csh514_write_off_reverse() { function csh514_write_off_reverse() {
...@@ -33,6 +36,7 @@ ...@@ -33,6 +36,7 @@
} }
var param = head_record.data; var param = head_record.data;
param['transaction_id'] = '${/parameter/@transaction_id}'; param['transaction_id'] = '${/parameter/@transaction_id}';
param['csh_transaction_atm_id'] = csh_transaction_atm_id;
if (records[0].get('history_flag') === 'Y') { if (records[0].get('history_flag') === 'Y') {
Leaf.showConfirm('${l:PROMPT}', '该事务是历史事务，请检查是否进行了补生成凭证', function () { Leaf.showConfirm('${l:PROMPT}', '该事务是历史事务，请检查是否进行了补生成凭证', function () {
var saveData = []; var saveData = [];
...@@ -236,6 +240,22 @@ ...@@ -236,6 +240,22 @@
} }
} }
//附件上传
function upload_attachment_win() {
var win = new Leaf.Window({
id: 'csh514_upload_win',
url: $('csh514_write_off_attach_win_link').getUrl(),
params: {
winid: 'csh514_upload_win',
table_name: 'CSH_TRANSACTION_WFL',
header_id: csh_transaction_atm_id
},
width: 900,
height: 400
}).on('close', function() {
});
}
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
<a:dataSet id="csh_transaction_receipt_write_off_reverse_detail_head_ds" autoCreate="true"> <a:dataSet id="csh_transaction_receipt_write_off_reverse_detail_head_ds" autoCreate="true">
...@@ -283,6 +303,7 @@ ...@@ -283,6 +303,7 @@
<a:hBox> <a:hBox>
<a:textArea name="note" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" <a:textArea name="note" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds"
prompt="备注" width="600"/> prompt="备注" width="600"/>
<a href="javascript:upload_attachment_win()" style="color:red">附件上传</a>
</a:hBox> </a:hBox>
</a:form> </a:form>
<a:grid id="csh_transaction_receipt_write_off_reverse_detail_grid_ds" <a:grid id="csh_transaction_receipt_write_off_reverse_detail_grid_ds"
......
src/main/webapp/modules/csh/CSH514/csh_transaction_receipt_write_off_reverse_wfl.lview
View file @ 39d9eb43
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/> <a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
<a:model-query model="csh.CSH514.workflow_info" defaultWhereClause="t2.transaction_wfl_id=${/parameter/@transaction_wfl_id}" rootPath="wolkflow_path"></a:model-query> <a:model-query model="csh.CSH514.workflow_info" defaultWhereClause="t2.transaction_wfl_id=${/parameter/@transaction_wfl_id}" rootPath="wolkflow_path"></a:model-query>
<a:model-query model="csh.CSH514.extend_next_month_check" rootPath="extend_month" /> <a:model-query model="csh.CSH514.extend_next_month_check" rootPath="extend_month" />
<a:model-query model="csh.CSH514.extend_gld_rent_check" rootPath="extend_gld_rent" />
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="csh_transaction_write_off_reverse_link_id" url="${/request/@context_path}/modules/csh/CSH514/csh_transaction_write_off_reverse_new.lsc"/> <a:link id="csh_transaction_write_off_reverse_link_id" url="${/request/@context_path}/modules/csh/CSH514/csh_transaction_write_off_reverse_new.lsc"/>
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
<a:link id="get_period_name_id" model="csh.CSH511.csh_transaction_get_period_name" modelaction="query"/> <a:link id="get_period_name_id" model="csh.CSH511.csh_transaction_get_period_name" modelaction="query"/>
<a:link id="csh514_check_contract_invoice_link_id" model="csh.CSH514.check_contract_invoice" modelaction="batch_update"/> <a:link id="csh514_check_contract_invoice_link_id" model="csh.CSH514.check_contract_invoice" modelaction="batch_update"/>
<a:link id="csh514_save_invoice_flag_id" model="csh.CSH514.check_contract_invoice" modelaction="execute"/> <a:link id="csh514_save_invoice_flag_id" model="csh.CSH514.check_contract_invoice" modelaction="execute"/>
<a:link id="csh514_write_wfl_attach_win_link" url="${/request/@context_path}/uploadFile.lview"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
function csh514_write_off_reverse_return() { function csh514_write_off_reverse_return() {
...@@ -25,8 +27,7 @@ ...@@ -25,8 +27,7 @@
} }
if("${/model/role_info/record/@role_code}"=="0014") { if("${/model/role_info/record/@role_code}"=="0014") {
zjwfl5110_ApproveChecker_add('zjwfl5110_submit', function (type) { zjwfl5110_ApproveChecker_add('zjwfl5110_submit', function (type) {
debugger; var root_ds = $('${/parameter/@layout_code}_virtual_ds');
var root_ds = $('${/parameter/@layout_code}_virtual_ds');
if (type == 'agree') { if (type == 'agree') {
var headers_ds = $('csh_transaction_receipt_write_off_reverse_detail_head_ds'); var headers_ds = $('csh_transaction_receipt_write_off_reverse_detail_head_ds');
var record = headers_ds.getAt(0); var record = headers_ds.getAt(0);
...@@ -42,7 +43,8 @@ ...@@ -42,7 +43,8 @@
para: { para: {
transaction_wfl_id:record.get('transaction_wfl_id'), transaction_wfl_id:record.get('transaction_wfl_id'),
check_flag :record.get('ignore_invoice_check_flag'), check_flag :record.get('ignore_invoice_check_flag'),
extend_month_flag:record.get('extend_month_flag') extend_month_flag:record.get('extend_month_flag'),
gld_rent_flag:record.get('gld_rent_flag')
}, },
success: function () { success: function () {
}, },
...@@ -87,6 +89,23 @@ ...@@ -87,6 +89,23 @@
}else return true; }else return true;
}); });
} }
//附件上传
function upload_attachment_win() {
var record = $('csh_transaction_receipt_write_off_reverse_detail_head_ds').getCurrentRecord();
var csh_transaction_atm_id = record.get('csh_transaction_atm_id');
var win = new Leaf.Window({
id: 'csh514_upload_win',
url: $('csh514_write_wfl_attach_win_link').getUrl(),
params: {
winid: 'csh514_upload_win',
table_name: 'CSH_TRANSACTION_WFL',
header_id: csh_transaction_atm_id
},
width: 900,
height: 400
}).on('close', function() {
});
}
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
...@@ -135,10 +154,12 @@ ...@@ -135,10 +154,12 @@
prompt="HLS.NOTE" width="300"/> prompt="HLS.NOTE" width="300"/>
<a:checkBox name="ignore_invoice_check_flag" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" prompt="是否跳过合同开票校验"/> <a:checkBox name="ignore_invoice_check_flag" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" prompt="是否跳过合同开票校验"/>
<a:checkBox id="extend_month_id" name="extend_month_flag" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" prompt="是否允许跨月反冲"/> <a:checkBox id="extend_month_id" name="extend_month_flag" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" prompt="是否允许跨月反冲"/>
<a:checkBox id="gld_rent_id" name="gld_rent_flag" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" prompt="是否反冲后不出具凭证"/>
</a:hBox> </a:hBox>
<a:hBox> <a:hBox>
<a:textArea name="note" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" <a:textArea name="note" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds"
prompt="备注" width="600"/> prompt="备注" width="600"/>
<a href="javascript:upload_attachment_win()" style="color:red">附件上传</a>
</a:hBox> </a:hBox>
</a:form> </a:form>
<a:grid id="csh_transaction_receipt_write_off_reverse_detail_grid_ds" <a:grid id="csh_transaction_receipt_write_off_reverse_detail_grid_ds"
...@@ -163,14 +184,16 @@ ...@@ -163,14 +184,16 @@
<script> <script>
Leaf.onReady(init); Leaf.onReady(init);
function init() { function init() {
debugger; var headers_ds = $('csh_transaction_receipt_write_off_reverse_detail_head_ds');
var headers_ds = $('csh_transaction_receipt_write_off_reverse_detail_head_ds');
if ('${/model/wolkflow_path/record/@current_seq}' != '10'){ if ('${/model/wolkflow_path/record/@current_seq}' != '10'){
headers_ds.getField('ignore_invoice_check_flag').setReadOnly(true); headers_ds.getField('ignore_invoice_check_flag').setReadOnly(true);
} }
if ('${/model/extend_month/record/@check_flag}' =='N'){ if ('${/model/extend_month/record/@check_flag}' =='N'){
$('extend_month_id').hide(); $('extend_month_id').hide();
} }
if ('${/model/extend_month/record/@check_flag}' =='N' && '${/model/extend_gld_rent/record/@rent_check_flag}' =='N'){
$('gld_rent_id').hide();
}
} }
</script> </script>
......
src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview
View file @ 39d9eb43
...@@ -12,6 +12,50 @@ ...@@ -12,6 +12,50 @@
<a:link id="csh531n_submit_interface_link_id" model="csh.CSH531N.csh_write_off_interface" modelaction="batch_update"/> <a:link id="csh531n_submit_interface_link_id" model="csh.CSH531N.csh_write_off_interface" modelaction="batch_update"/>
<script src="${/request/@context_path}/javascripts/calculate.js" type="text/javascript"/> <script src="${/request/@context_path}/javascripts/calculate.js" type="text/javascript"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
function batch_delete(){
var ds_id = 'csh_write_off_interface_ds';
var ds = $(ds_id);
var records = ds.getSelected();
if (records.length < 1) {
Leaf.showMessage('${l:PROMPT}', '请选择至少一条记录！');
return;
}
var post_data = [];
for (var i = 0; i < records.length; i++) {
post_data.push({
'write_off_interface_id': records[i].get('write_off_interface_id'),
'_status': 'delete'
});
}
Leaf.showConfirm('提示', '确认删除选中的记录？', function() {
csh531d_lock_current_window();
Leaf.request({
url: $('csh531n_submit_interface_link_id').getUrl(),
para: post_data,
success: function () {
csh531d_unlock_current_window();
var allRecords = ds.getAll();
if(records.length == allRecords.length) {
ds.removeAll();
}else{
for (var i=records.length-1;i>=0;i--)
{
ds.removeLocal(records[i]);
}
}
}, failure: function () {
csh531d_unlock_current_window();
},
error: function () {
csh531d_unlock_current_window();
},
scope: this
});
},function () {
csh531d_unlock_current_window();},null, 400);
}
function csh531n_detail_win_close() { function csh531n_detail_win_close() {
$('${/parameter/@winid}').close(); $('${/parameter/@winid}').close();
...@@ -159,7 +203,7 @@ ...@@ -159,7 +203,7 @@
if (name == 'write_off_amount') { if (name == 'write_off_amount') {
if(!checkAmount()){ if(!checkAmount()){
setTimeout(function () {//防止递归 setTimeout(function () {//防止递归
record.set(name, oldValue); record.set(name, 0);
}); });
} }
...@@ -280,6 +324,7 @@ ...@@ -280,6 +324,7 @@
record.set('due_date', ''); record.set('due_date', '');
record.set('write_off_principal', ''); record.set('write_off_principal', '');
record.set('write_off_interest', ''); record.set('write_off_interest', '');
record.set('write_off_amount', '');
record.set('left_amount', ''); record.set('left_amount', '');
record.set('left_principal', ''); record.set('left_principal', '');
record.set('left_interest', ''); record.set('left_interest', '');
...@@ -1191,7 +1236,8 @@ ...@@ -1191,7 +1236,8 @@
marginWidth="10" navBar="true"> marginWidth="10" navBar="true">
<a:toolBar> <a:toolBar>
<a:button id="csh_grid_add_bt" type="add"/> <a:button id="csh_grid_add_bt" type="add"/>
<a:button id="csh_grid_delete_bt" type="delete"/> <!--<a:button id="csh_grid_delete_bt" type="delete"/>-->
<a:button id="csh_grid_delete_bt" click="batch_delete" text="— 删除" />
</a:toolBar> </a:toolBar>
<a:columns> <a:columns>
<!--<a:column name="csh_bank_slip_num" footerRenderer="summaryRenderer" prompt="CSH531.BANK_SLIP_NUM" width="120"/>--> <!--<a:column name="csh_bank_slip_num" footerRenderer="summaryRenderer" prompt="CSH531.BANK_SLIP_NUM" width="120"/>-->
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT100/csh_transaction_deposit_entry_detail.lview
View file @ 39d9eb43
...@@ -359,7 +359,7 @@ ...@@ -359,7 +359,7 @@
prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME" readOnly="true"/> prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME" readOnly="true"/>
</a:box> </a:box>
</a:fieldSet> </a:fieldSet>
<a:grid id="deposit_ertry_detail_result_grid" bindTarget="deposit_ertry_detail_result_ds" height="200" <a:grid id="deposit_ertry_detail_result_grid" bindTarget="deposit_ertry_detail_result_ds" height="400"
navBar="false" width="1050"> navBar="false" width="1050">
<a:toolBar> <a:toolBar>
<a:button type="add"/> <a:button type="add"/>
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT106/csh_transaction_return.lview
View file @ 39d9eb43
...@@ -377,18 +377,36 @@ ...@@ -377,18 +377,36 @@
if (res.result.record.v_flag=='Y'){ if (res.result.record.v_flag=='Y'){
deposit_record.set('csh_return_bp_name', record.get('bp_name')); deposit_record.set('csh_return_bp_name', record.get('bp_name'));
deposit_record.set('csh_return_bp_id', record.get('bp_id')); deposit_record.set('csh_return_bp_id', record.get('bp_id'));
if(record.get('bank_sum')==1){
deposit_record.set('opposite_band_na', record.get('opposite_band_name'));
deposit_record.set('bp_bank_account_num', record.get('bp_bank_account_number'));
deposit_record.set('bp_bank_branch_name', record.get('bp_bank_branch_name'));
}else {
deposit_record.set('opposite_band_na','');
deposit_record.set('bp_bank_account_num','');
deposit_record.set('bp_bank_branch_name','');
}
}else{ }else{
deposit_record.set('csh_return_bp_name',''); deposit_record.set('csh_return_bp_name','');
deposit_record.set('csh_return_bp_id',''); deposit_record.set('csh_return_bp_id','');
deposit_record.set('opposite_band_na','');
deposit_record.set('bp_bank_account_num','');
deposit_record.set('bp_bank_branch_name','');
} }
}, },
failure: function () { failure: function () {
deposit_record.set('csh_return_bp_name',''); deposit_record.set('csh_return_bp_name','');
deposit_record.set('csh_return_bp_id',''); deposit_record.set('csh_return_bp_id','');
deposit_record.set('opposite_band_na','');
deposit_record.set('bp_bank_account_num','');
deposit_record.set('bp_bank_branch_name','');
}, },
error: function () { error: function () {
deposit_record.set('csh_return_bp_name',''); deposit_record.set('csh_return_bp_name','');
deposit_record.set('csh_return_bp_id',''); deposit_record.set('csh_return_bp_id','');
deposit_record.set('opposite_band_na','');
deposit_record.set('bp_bank_account_num','');
deposit_record.set('bp_bank_branch_name','');
}, },
scope: this scope: this
}); });
...@@ -398,7 +416,7 @@ ...@@ -398,7 +416,7 @@
deposit_record.set('contract_number', record.get('contract_number')); deposit_record.set('contract_number', record.get('contract_number'));
deposit_record.set('bp_id_telnet_code', record.get('bp_id_telnet_code')); deposit_record.set('bp_id_telnet_code', record.get('bp_id_telnet_code'));
deposit_record.set('bp_id_telnet_n', record.get('bp_id_telnet_n')); deposit_record.set('bp_id_telnet_n', record.get('bp_id_telnet_n'));
deposit_record.set('bp_bank_branch_name', record.get('bp_bank_branch_name')); //deposit_record.set('bp_bank_branch_name', record.get('bp_bank_branch_name'));
deposit_record.set('deposit_trans_type_desc', record.get('deposit_trans_type_desc')); deposit_record.set('deposit_trans_type_desc', record.get('deposit_trans_type_desc'));
deposit_record.set('vender_contract_number', record.get('vender_contract_number')); deposit_record.set('vender_contract_number', record.get('vender_contract_number'));
deposit_record.set('vender_project_number', record.get('vender_project_number')); deposit_record.set('vender_project_number', record.get('vender_project_number'));
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT106/cus_deposit_write_off_return_maintain.lview
View file @ 39d9eb43
...@@ -143,8 +143,8 @@ ...@@ -143,8 +143,8 @@
params: { params: {
return_id: return_id, return_id: return_id,
bp_bank_account_name: record.get('bp_bank_account_name'), bp_bank_account_name: record.get('bp_bank_account_name'),
opposite_band_na: record.get('opposite_band_na'), opposite_band_na: record.get('opposite_band_name'),
bp_bank_account_num: record.get('bp_bank_account_num'), bp_bank_account_num: record.get('bp_bank_account_number'),
left_amount: record.get('left_amount'), left_amount: record.get('left_amount'),
ref_contract_id: record.get('ref_contract_id'), ref_contract_id: record.get('ref_contract_id'),
winId: 'csh_transaction_deposit_link_winid' winId: 'csh_transaction_deposit_link_winid'
......
src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview
View file @ 39d9eb43
...@@ -195,8 +195,11 @@ ...@@ -195,8 +195,11 @@
//删除角色按钮 //删除角色按钮
window['${/parameter/@layout_code}_G_ROLE_USER_BUTTON1_layout_dynamic_tab_click'] = function () { window['${/parameter/@layout_code}_G_ROLE_USER_BUTTON1_layout_dynamic_tab_click'] = function () {
debugger;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role');
var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
var records = $(ds_id).getSelected(); var records = $(ds_id).getSelected();
var bp_records = $(bp_ds_id).getCurrentRecord();
if (!records.length) { if (!records.length) {
Leaf.showMessage('${l:PROMPT}', '请至少选择一条记录'); Leaf.showMessage('${l:PROMPT}', '请至少选择一条记录');
return false; return false;
...@@ -206,14 +209,27 @@ ...@@ -206,14 +209,27 @@
//} //}
//alert(records.length); //alert(records.length);
for (var i = 0; i < records.length; i++) { for (var i = 0; i < records.length; i++) {
var primary_flag = records[i].get('primary_flag'); if(!Ext.isEmpty(bp_records.get('bp_id'))){
if (primary_flag == 'Y') { if(!Ext.isEmpty(records[i].get('primary_flag_bak'))){
Leaf.showMessage('${l:PROMPT}', '主角色无法被删除！'); if(records[i].get('primary_flag_bak') == 'Y'){
continue; $L.showMessage('提示','主角色无法被删除！');
} else { return;
}
}
$(ds_id).remove(records[i]);
}else{
if(records[i].get('primary_flag') == 'Y'){
$L.showMessage('提示','主角色无法被删除！');
return;
}
$(ds_id).remove(records[i]); $(ds_id).remove(records[i]);
} }
} }
if(!Ext.isEmpty(bp_records.get('bp_id'))){
setTimeout(function () {
$(ds_id).query();
}, 100)
}
}; };
//法人供应商经办人身份证号非必填 18083 2022/12/1 //法人供应商经办人身份证号非必填 18083 2022/12/1
...@@ -819,6 +835,7 @@ ...@@ -819,6 +835,7 @@
// $(ds_id).query(); // $(ds_id).query();
//add by zc //add by zc
var signer_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_signer'); var signer_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_signer');
var role_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role');
if(head_record.get('bp_id')){ if(head_record.get('bp_id')){
Leaf.request({ Leaf.request({
url: $('${/parameter/@layout_code}_signer_create_link_id').getUrl(), url: $('${/parameter/@layout_code}_signer_create_link_id').getUrl(),
...@@ -829,6 +846,9 @@ ...@@ -829,6 +846,9 @@
if($(signer_ds_id)){ if($(signer_ds_id)){
$(signer_ds_id).query(); $(signer_ds_id).query();
} }
if($(role_ds_id)){
$(role_ds_id).query();
}
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, },
failure: function (res) { failure: function (res) {
......
src/main/webapp/modules/hls/HLS214N/hls_bp_master_modify.lview
View file @ 39d9eb43
...@@ -232,7 +232,29 @@ ...@@ -232,7 +232,29 @@
}; };
//商业伙伴角色信息删除
window['${/parameter/@layout_code}_G_ROLE_USER_BUTTON1_layout_dynamic_tab_click'] = function() {
debugger;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role');
var records = $(ds_id).getSelected();
Leaf.showConfirm('提示', '是否确认删除', function() {
debugger;
var records = $(ds_id).getSelected();
if(records.length ==0){
$L.showMessage('提示','请至少选择一条数据!');
return;
}
for(var i=0;i<records.length;i++){
if(!Ext.isEmpty(records[i].get('primary_flag_bak'))){
if(records[i].get('primary_flag_bak') == 'Y'){
$L.showMessage('提示','主角色无法被删除！');
return;
}
}
$(ds_id).remove(records[i]);
}
});
};
function CheckSocialCreditCode(Code) { function CheckSocialCreditCode(Code) {
var patrn = /^[0-9A-Z]+$/; var patrn = /^[0-9A-Z]+$/;
...@@ -278,6 +300,7 @@ ...@@ -278,6 +300,7 @@
window['${/parameter/@layout_code}_lock_layout_dynamic_window'](); window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref');
var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master'); var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
var role_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role');
var records = $(ds_id); var records = $(ds_id);
if (!(records == 'undefined' || records == null)) { if (!(records == 'undefined' || records == null)) {
$(ds_id).query(); $(ds_id).query();
...@@ -296,6 +319,7 @@ ...@@ -296,6 +319,7 @@
}, },
success: function (res) { success: function (res) {
$(signer_ds_id).query(); $(signer_ds_id).query();
$(role_ds_id).query();
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, },
failure: function (res) { failure: function (res) {
...@@ -1610,6 +1634,7 @@ ...@@ -1610,6 +1634,7 @@
} }
Leaf.onReady(function () { Leaf.onReady(function () {
debugger;
//自然人不展示财报按钮 //自然人不展示财报按钮
if('${/parameter/@bp_class}' == 'NP' && document.getElementById('${/parameter/@layout_code}_user_button2') ){ if('${/parameter/@bp_class}' == 'NP' && document.getElementById('${/parameter/@layout_code}_user_button2') ){
document.getElementById('${/parameter/@layout_code}_user_button2').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_user_button2').style.display = 'none';
......
src/main/webapp/modules/hls/HLS361N/credit_credit.lview
View file @ 39d9eb43
...@@ -9,6 +9,7 @@ $Purpose: 商业伙伴授信创建 ...@@ -9,6 +9,7 @@ $Purpose: 商业伙伴授信创建
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true"> <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure> <a:init-procedure>
<a:model-query fetchAll="true" model="basic.get_sys_default_time" rootPath="sys_default_time"/>--> <a:model-query fetchAll="true" model="basic.get_sys_default_time" rootPath="sys_default_time"/>-->
<a:model-query defaultWhereClause="t1.user_id=${/session/@user_id} and position_code in(9070)" fetchAll="true" model="csh.CSH509.query_roles_info" rootPath="position_code"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="credit_enhance_detail_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/> <a:link id="credit_enhance_detail_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
...@@ -16,6 +17,7 @@ $Purpose: 商业伙伴授信创建 ...@@ -16,6 +17,7 @@ $Purpose: 商业伙伴授信创建
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
//保存前调用 //保存前调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function(ds, record) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function(ds, record) {
debugger;
window['${/parameter/@layout_code}_lock_layout_dynamic_window'](); window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var check_flag = true; var check_flag = true;
...@@ -30,6 +32,16 @@ $Purpose: 商业伙伴授信创建 ...@@ -30,6 +32,16 @@ $Purpose: 商业伙伴授信创建
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false; return false;
} }
var user_code='${/model/position_code/record/@position_code}';
if(user_code>0){
record.set('credit_status','APPROVING');
}else if(Ext.isEmpty(user_code) && record.get('bp_category_n')=='RENTER'){
record.set('credit_status','APPROVING_OP');
}else if(Ext.isEmpty(user_code) && record.get('bp_category_n')=='AGENT' && record.get('unit_code')=='1011'){
record.set('credit_status','APPROVING_OP');
}else {
record.set('credit_status','APPROVING');
}
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return check_flag; return check_flag;
......
src/main/webapp/modules/hls/HLS362N/hls_bp_master_credit_confirm.lview
View file @ 39d9eb43
...@@ -8,7 +8,7 @@ $Purpose: 商业伙伴授信维护 ...@@ -8,7 +8,7 @@ $Purpose: 商业伙伴授信维护
--> -->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true"> <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure> <a:init-procedure>
<a:model-query defaultWhereClause="t1.user_id=${/session/@user_id} and position_code in(003,9070)" fetchAll="true" model="csh.CSH509.query_roles_info" rootPath="position_code"/> <a:model-query defaultWhereClause="t1.role_id=${/session/@role_id}" fetchAll="true" model="cont.CON733.query_roles_info" rootPath="position_code"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
...@@ -24,8 +24,8 @@ $Purpose: 商业伙伴授信维护 ...@@ -24,8 +24,8 @@ $Purpose: 商业伙伴授信维护
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
var user_code=''; var user_code='';
Leaf.onReady(function(){ Leaf.onReady(function(){
user_code='${/model/position_code/record/@position_code}'; user_code='${/model/position_code/record/@role_code}';
if(user_code == 9070){ if(user_code == '0039'){
var ds_id=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_CREDIT_HD', 'hls_bp_master_credit_hd'); var ds_id=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_CREDIT_HD', 'hls_bp_master_credit_hd');
var op_ds_id=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_CREDIT_OP', 'hls_bp_master_credit_hd'); var op_ds_id=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_CREDIT_OP', 'hls_bp_master_credit_hd');
var record = 'JCREDIT_ENTRANCE_CONFIRM_F_QUERY__ds'; var record = 'JCREDIT_ENTRANCE_CONFIRM_F_QUERY__ds';
...@@ -61,6 +61,7 @@ $Purpose: 商业伙伴授信维护 ...@@ -61,6 +61,7 @@ $Purpose: 商业伙伴授信维护
//变更确认 //变更确认
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
//授信额度变更 //授信额度变更
debugger;
var credit_ds=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_CREDIT_HD', 'hls_bp_master_credit_hd'); var credit_ds=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_CREDIT_HD', 'hls_bp_master_credit_hd');
var op_credit_ds=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_CREDIT_OP', 'hls_bp_master_credit_hd'); var op_credit_ds=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_CREDIT_OP', 'hls_bp_master_credit_hd');
var credit_datas = $(credit_ds).selected; var credit_datas = $(credit_ds).selected;
...@@ -79,7 +80,7 @@ $Purpose: 商业伙伴授信维护 ...@@ -79,7 +80,7 @@ $Purpose: 商业伙伴授信维护
//判断角色是否可以操作 //判断角色是否可以操作
//002 营业本部长 //002 营业本部长
for (var i = 0; i < datas.length; i++){ for (var i = 0; i < datas.length; i++){
if(user_code==''||user_code==undefined){ if(user_code!='0039' && user_code!='0003'){
$L.showInfoMessage("提示",'只有建设机械部部长/营业副部长（经租）才能操作数据！'); $L.showInfoMessage("提示",'只有建设机械部部长/营业副部长（经租）才能操作数据！');
return; return;
} }
...@@ -95,11 +96,15 @@ $Purpose: 商业伙伴授信维护 ...@@ -95,11 +96,15 @@ $Purpose: 商业伙伴授信维护
$L.showInfoMessage("提示",'请选择状态为审批中的数据！',null,null) $L.showInfoMessage("提示",'请选择状态为审批中的数据！',null,null)
return; return;
} }
if(user_code == '0003' && credit_status == 'APPROVING_OP'){
$L.showInfoMessage("提示",'当前单据未到达建机部部长审批节点，请确认！');
return;
}
var data_record; var data_record;
data_record = datas[i]; data_record = datas[i];
data_record.set('_status', 'update'); data_record.set('_status', 'update');
data_record.set('bp_credit_hd_id', datas[i].data.bp_credit_hd_id); data_record.set('bp_credit_hd_id', datas[i].data.bp_credit_hd_id);
if(user_code == 9070){ if(user_code == '0039'){
data_record.set('wanted_status', 'APPROVING'); data_record.set('wanted_status', 'APPROVING');
}else { }else {
data_record.set('wanted_status', 'APPROVED'); data_record.set('wanted_status', 'APPROVED');
...@@ -153,7 +158,7 @@ $Purpose: 商业伙伴授信维护 ...@@ -153,7 +158,7 @@ $Purpose: 商业伙伴授信维护
//角色判断 //角色判断
//002 营业本部长 //002 营业本部长
for (var i = 0; i < datas.length; i++){ for (var i = 0; i < datas.length; i++){
if(user_code==''||user_code==undefined){ if(user_code!='0039' && user_code!='0003'){
$L.showInfoMessage("提示",'只有建设机械部部长/营业副部长（经租）才能操作数据！'); $L.showInfoMessage("提示",'只有建设机械部部长/营业副部长（经租）才能操作数据！');
return; return;
} }
...@@ -170,6 +175,10 @@ $Purpose: 商业伙伴授信维护 ...@@ -170,6 +175,10 @@ $Purpose: 商业伙伴授信维护
$L.showInfoMessage("提示",'请选择状态为审批中的数据！',null,null) $L.showInfoMessage("提示",'请选择状态为审批中的数据！',null,null)
return; return;
} }
if(user_code == '0003' && credit_status == 'APPROVING_OP'){
$L.showInfoMessage("提示",'当前单据未到达建机部部长审批节点，请确认！');
return;
}
var data_record; var data_record;
data_record = datas[i]; data_record = datas[i];
data_record.set('_status', 'update'); data_record.set('_status', 'update');
......
src/main/webapp/modules/hls/HLS801/hls_monthly_business.lview 0 → 100644
View file @ 39d9eb43
<?xml version="1.0" encoding="UTF-8"?>
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
<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_link_readonly"
url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain.lview"/>
<a:link id="${/parameter/@layout_code}lease_number_query_link_prj501n"
url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_lease_import_details.lview"/>
<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="${/parameter/@layout_code}con_contract_op_query_link"
url="${/request/@context_path}/modules/cont/CON3200/con_re_incept_op_modify.lview"/>
<script type="text/javascript"><![CDATA[
function hls_monthly_business_ds_query() {
$('hls_monthly_business_ds').setQueryParameter('csh_date', '${/parameter/@csh_date}');
}
function win_quit() {
debugger;
$('${/parameter/@winid}').close();
}
]]></script>
<a:dataSets>
<a:dataSet id="hls_monthly_business_ds" autoPageSize="true" autoQuery="true"
model="hls.HLS801.check_business_monthly">
<a:events>
<a:event name="query" handler="hls_monthly_business_ds_query"/>
</a:events>
</a:dataSet>
</a:dataSets>
<a:grid id="hls_monthly_business_ds_grid" bindTarget="hls_monthly_business_ds" readOnly="true" Height="250"
Width="790" navBar="true">
<a:toolBar>
<a:button type="excel"/>
</a:toolBar>
<a:columns>
<a:column name="err_msg" prompt="提示信息" width="790" editor="text_area_ta"/>
</a:columns>
<a:editors>
<a:textArea id="text_area_ta" readOnly="true"/>
</a:editors>
</a:grid>
<a:screenTopToolbar>
<a:toolbarButton id="confirm_btn_id" click="win_quit" text="确认" style="position:absolute;left:350px;"/>
</a:screenTopToolbar>
</a:view>
</a:screen>
src/main/webapp/modules/hls/HLS801/hls_monthly_statement.lview
View file @ 39d9eb43
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
<a:link id="user_main_link" url="${/request/@context_path}/user_role_home_page.lview"/> <a:link id="user_main_link" url="${/request/@context_path}/user_role_home_page.lview"/>
<a:link id="csh_current_period_link" model="hls.HLS801.csh_current_period_query" modelaction="update"/> <a:link id="csh_current_period_link" model="hls.HLS801.csh_current_period_query" modelaction="update"/>
<a:link id="csh_check_acr_link" model="hls.HLS801.csh_current_period_query" modelaction="execute"/> <a:link id="csh_check_acr_link" model="hls.HLS801.csh_current_period_query" modelaction="execute"/>
<a:link id="csh_check_business_link" model="hls.HLS801.check_business_monthly" modelaction="update"/>
<a:link id="hls_tax_confirm_link" model="hls.HLS801.hls_tax_act_confirm" modelaction="update"/> <a:link id="hls_tax_confirm_link" model="hls.HLS801.hls_tax_act_confirm" modelaction="update"/>
<a:link id="hls_tax_refresh_link" model="hls.HLS801.hls_tax_act_confirm" modelaction="execute"/> <a:link id="hls_tax_refresh_link" model="hls.HLS801.hls_tax_act_confirm" modelaction="execute"/>
<a:link id="hls_tax_confirm_create_je_link" <a:link id="hls_tax_confirm_create_je_link"
...@@ -50,6 +51,7 @@ ...@@ -50,6 +51,7 @@
<a:link id="hls_attachment_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/> <a:link id="hls_attachment_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/>
<a:link id="hls_attachment_downloadFile_id" url="${/request/@context_path}/downloadFile.lview"/> <a:link id="hls_attachment_downloadFile_id" url="${/request/@context_path}/downloadFile.lview"/>
<a:link id="hls_attachment_uploadonlyFile_id" url="${/request/@context_path}/uploadonlyFile.lview"/> <a:link id="hls_attachment_uploadonlyFile_id" url="${/request/@context_path}/uploadonlyFile.lview"/>
<a:link id="hls_business_logs_link_id" url="${/request/@context_path}/modules/hls/HLS801/hls_monthly_business.lview"/>
<a:link id="con_exist_approving_id" model="hls.HLS801.con_exist_approving" modelaction="query"/> <a:link id="con_exist_approving_id" model="hls.HLS801.con_exist_approving" modelaction="query"/>
<a:link id="gld_close_period_check_link" model="db.gld_period_pkg.close_period" modelaction="update"/> <a:link id="gld_close_period_check_link" model="db.gld_period_pkg.close_period" modelaction="update"/>
<script><![CDATA[ <script><![CDATA[
...@@ -855,29 +857,30 @@ ...@@ -855,29 +857,30 @@
var record = $('csh_transaction_confirm_ds').getSelected()[0]; var record = $('csh_transaction_confirm_ds').getSelected()[0];
//校验是否还有未审核的保证金划转 //校验是否还有未审核的保证金划转
var trans_review_count; var trans_review_count;
if(role_flag == 'YES') {
$L.request({
url: '${/request/@context_path}/autocrud/csh.CSH531.get_trans_review_status/query',
para: {
csh_date: record.get('csh_date')
},
sync: true,
success: function (res) {
trans_review_count = res.result.record.trans_review_number;
},
error: function () {
$L.request({ },
url: '${/request/@context_path}/autocrud/csh.CSH531.get_trans_review_status/query', failure: function () {
para: {
csh_date: record.get('csh_date')
},
sync: true,
success: function (res) {
trans_review_count=res.result.record.trans_review_number;
},
error: function () {
},
failure: function () {
}, },
scope: this, scope: this,
sync: true, sync: true,
}); });
if( trans_review_count >0){ if (trans_review_count > 0) {
$L.showMessage('提示','有复核中的保证金，请完成复核后，再进行会计关账'); $L.showMessage('提示', '有复核中的保证金，请完成复核后，再进行会计关账');
return ; return;
}
} }
...@@ -887,38 +890,71 @@ ...@@ -887,38 +890,71 @@
$L.showMessage('提示', '该月收款已确认,无需再次确认'); $L.showMessage('提示', '该月收款已确认,无需再次确认');
return; return;
} }
$L.showConfirm('提示', '是否进行月结确认?', function () { Leaf.request({
$L.Masker.mask(Ext.getBody(), '正在确认......'); url: $('csh_check_business_link').getUrl(),
$L.request({ para: {
url: $('csh_current_period_link').getUrl(), csh_date: record.get('csh_date')
para: { },
ref_v04: record.get('ref_v04'), scope: this,
csh_date: record.get('csh_date'), success: function (res) {
role_flag: role_flag var repeat_flag = res.result.p_check_flag;
}, if (repeat_flag == 'N'){
success: function (args) { var url_l = $('hls_business_logs_link_id').getUrl();
$L.Masker.unmask(Ext.getBody()); var hls_business_win = new Leaf.Window({
if (args.result.p_err_msg) { id: 'hls_business_logs_detail_win',
$L.showErrorMessage("提示", args.result.p_err_msg, null, 800, 300); url: url_l,
} else { params: {
$L.SideBar.show({ 'winid': 'hls_business_logs_detail_win',
msg: '已确认', 'csh_date': record.get('csh_date')
duration: 2000
},
title: '月结校验提示',
width: 800,
height: 300,
closeable: false
});
}else {
$L.showConfirm('提示', '是否进行月结确认?', function () {
$L.Masker.mask(Ext.getBody(), '正在确认......');
$L.request({
url: $('csh_current_period_link').getUrl(),
para: {
ref_v04: record.get('ref_v04'),
csh_date: record.get('csh_date'),
role_flag: role_flag
},
success: function (args) {
$L.Masker.unmask(Ext.getBody());
if (args.result.p_err_msg) {
$L.showErrorMessage("提示", args.result.p_err_msg, null, 800, 300);
} else {
$L.SideBar.show({
msg: '已确认',
duration: 2000
});
$('csh_transaction_confirm_ds').query();
}
},
failure: function () {
$L.Masker.unmask(Ext.getBody());
},
error: function () {
$L.Masker.unmask(Ext.getBody());
},
scope: this,
sync: true,
}); });
$('csh_transaction_confirm_ds').query(); });
}
} },
failure: function () {
}, window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
failure: function () { },
$L.Masker.unmask(Ext.getBody()); error: function () {
}, window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
error: function () { }
$L.Masker.unmask(Ext.getBody());
},
scope: this,
sync: true,
});
}); });
} }
......
src/main/webapp/modules/hsbc/HSBC120/hsbc_paying_account_change.lview 0 → 100644
View file @ 39d9eb43
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: trd
$Date: 2024-11-22 上午10:36:25
$Revision: 1.0
$Purpose:
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true">
<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="${/parameter/@layout_code}con_contract_query_link" url="${/request/@context_path}/modules/cont/CON3200/con_re_incept_modify.lview"/>
<a:link id="transaction_downloadFile_link_id" url="${/request/@context_path}/downloadFile.lview"/>
<a:link id="transaction_uploadFile_link_id" url="${/request/@context_path}/uploadFile.lview"/>
<a:link id="hsbc_bank_change_submit_link" model="hsbc.HSBC120.submit_hsbc_change_req" modelaction="execute"/>
<script type="text/javascript"><![CDATA[
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_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
});
}
//上传附件
function upload_csh_bank_attch(id, name, query_only) {
if (query_only == 'Y'){
var url = $('transaction_downloadFile_link_id').getUrl() + '?table_name=HSBC_BANK_ACCOUNT_ITFC&header_id=' + '${/parameter/@bank_itfc_id}'
}else{
var url = $('transaction_uploadFile_link_id').getUrl() + '?table_name=HSBC_BANK_ACCOUNT_ITFC&header_id=' + '${/parameter/@bank_itfc_id}';
}
var win = new Leaf.Window({
url: url,
title: '${l:HLS.SUPPORTING_DOCUMENT}',
id: 'csh_bank_attch_uploadFile_id',
width: 850,
height: 400
});
win.on('close', function () {
});
}
window['${/parameter/@layout_code}_dynamic_link_renderer'] = function(value, record, name, config_record) {
if (name == 'contract_number' && value) {
return '<a href="javascript:open_contract_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + value + '</a>';
}else if(name == 'attachment_r' && record.get('source_table') == 'CSH_TRANSACTION_RETURN') {
return '<a href="javascript:open_return_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + '附件' + '</a>';
}else if (name == 'attach_link'){
return '<a href="javascript:upload_csh_bank_attch(\'' + record.ds.id + '\',\'' + name +'\',\'' + '${/parameter/@query_only}'+'\')">' + '附件上传' + '</a><span style="color:#FF0000"> 需上传付款请求书、情况说明、银行卡、收款信息等相关材料</span>';
}
};
//提交审批
window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function() {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
var bank_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hsbc_bank_account_itfc');
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_PAYING_DOC', 'hl_hsbc_paying_doc');
var bank_record = $(bank_ds_id).getCurrentRecord();
var batch_id =bank_record.get('batch_id');
var bank_itfc_id =bank_record.get('bank_itfc_id');
var hsbc_records = $(ds_id).getAll();
var hsbc_record = hsbc_records[0];
if (bank_record.dirty == true) {
Leaf.showMessage('${l:PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
if(hsbc_record.get('inacctno')==bank_record.get('bank_account_num')
&&hsbc_record.get('bank_branch_name')==bank_record.get('bank_full_name')){
var submmit_info ='该笔付款单据的收款银行账号信息未变化，请确认是否提交?';
}else{
var submmit_info ='是否确认提交审批?';
}
Leaf.showConfirm('${l:PROMPT}',submmit_info, function () {
Leaf.request({
url: $('hsbc_bank_change_submit_link').getUrl(),
para: { bank_itfc_id:bank_itfc_id
},
success: function () {
Leaf.SideBar.show({
msg: '提交成功',
duration: 2000
});
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
$('${/parameter/@winid}').close();
},
failure: function() {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function() {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
scope: this
});
}, function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, null, null);
};
Leaf.onReady(function () {
if ("${/parameter/@function_usage}" == 'QUERY'){
if(document.getElementById("${/parameter/@layout_code}_submit_approval")){
document.getElementById("${/parameter/@layout_code}_submit_approval").style.display = "none";
}
if(document.getElementById("${/parameter/@layout_code}_save")){
document.getElementById("${/parameter/@layout_code}_save").style.display = "none";
}
}
});
//加载时调用(grid,table,gridBox)
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function(ds, qpara, bp_seq) {
var bank_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hsbc_bank_account_itfc');
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_PAYING_DOC', 'hl_hsbc_paying_doc');
var bank_record = $(bank_ds_id).getCurrentRecord();
var hsbc_records = $(ds_id).getAll();
var hsbc_record = hsbc_records[0];
if(hsbc_record.get('inacctno')!=bank_record.get('bank_account_num')){
var bank_account_num_id = document.getElementById('${/parameter/@layout_code}_F_ACCOUNT_01_HSBC_BANK_ACCOUNT_ITFC_BANK_ACCOUNT_NUM');
var bank_account_num_id_input = bank_account_num_id.getElementsByTagName('input');
bank_account_num_id_input[0].style.setProperty('background-color', '#FF9965', 'important');
}
if(hsbc_record.get('bank_branch_name')!=bank_record.get('bank_full_name')){
var bank_full_name_id = document.getElementById('${/parameter/@layout_code}_F_ACCOUNT_01_HSBC_BANK_ACCOUNT_ITFC_BANK_FULL_NAME');
var bank_full_name_id_input = bank_full_name_id.getElementsByTagName('input');
bank_full_name_id_input [0].style.setProperty('background-color', '#FF9965', 'important');
}
};
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
src/main/webapp/modules/hsbc/HSBC120/hsbc_paying_batch_query.lview
View file @ 39d9eb43
...@@ -6,11 +6,23 @@ ...@@ -6,11 +6,23 @@
$Purpose: $Purpose:
--> -->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true"> <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true">
<a:init-procedure/> <a:init-procedure>
<a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
</a:init-procedure>
<a:view> <a:view>
<a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/> <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="batch_detail_link" url="${/request/@context_path}/modules/hsbc/HSBC110/hsbc_paying_batch_detail.lview"/> <a:link id="batch_detail_link" url="${/request/@context_path}/modules/hsbc/HSBC110/hsbc_paying_batch_detail.lview"/>
<script type="text/javascript"><![CDATA[ <a:link id="account_change_detail_link" url="${/request/@context_path}/modules/hsbc/HSBC120/hsbc_paying_account_change.lview"/>
<script type="text/javascript"><![CDATA[
//仅营业担当、营业内勤、债权担当、债权内勤角色可操作重新支付按钮
Leaf.onReady(function() {
if ('${/model/role_info/record/@role_code}'!='0006'&&'${/model/role_info/record/@role_code}'!='0008'
&&'${/model/role_info/record/@role_code}'!='0009'&&'${/model/role_info/record/@role_code}'!='0007') {
if($('${/parameter/@layout_code}_user_button2')){
$('${/parameter/@layout_code}_user_button2').hide();
}
}
});
function open_batch_win(ds_id, record_id) { function open_batch_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id); var record = $(ds_id).findById(record_id);
...@@ -28,6 +40,56 @@ ...@@ -28,6 +40,56 @@
return value; return value;
}; };
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_RESULT', 'hl_hsbc_paying_batch');
var hsbc_records = $(ds_id).getSelected();
var hsbc_record = hsbc_records[0];
var batch_status = hsbc_record.get('batch_status');
if (hsbc_records.length != 1) {
Leaf.showMessage('${l:PROMPT}', '${l:HLS.SELECT_RECORD}');
return;
}
if(batch_status=='APPROVING'||batch_status=='APPROVED'){
var param = hsbc_record.data;
param['function_code']= 'HSBC110D_CHANGE';
param['function_usage'] = 'QUERY';
param['query_only'] = 'Y';
param['bank_itfc_id'] = hsbc_record.get('bank_itfc_id');
param['query_only'] = 'Y';
param['url_title'] = '付款单变更明细';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id',param,'account_change_detail_link');
}else{
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var url = '${/request/@context_path}/autocrud/hsbc.HSBC120.submit_hsbc_change_req/update';
Leaf.request({
url: url,
para: {
batch_id: hsbc_record.get('batch_id')
},
success: function (res) {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
if (res.result.bank_itfc_id) {
var param = hsbc_record.data;
param['function_code']= 'HSBC110D_CHANGE';
param['function_usage'] = 'MODIFY';
param['bank_itfc_id'] = res.result.bank_itfc_id;
param['query_only'] = 'N';
param['url_title'] = '付款单变更明细';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id',param,'account_change_detail_link');
}
},
failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
scope: this
});
}
}
]]></script> ]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/> <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view> </a:view>
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @ 39d9eb43
...@@ -1160,6 +1160,12 @@ ...@@ -1160,6 +1160,12 @@
record.getField('vender_bank_account_num').setRequired(false); record.getField('vender_bank_account_num').setRequired(false);
} }
} }
if(record.get('bp_class') == 'NP'){
var ds_gridBpId= ds.bindname+'_layout_grid_id';
$(ds_gridBpId).hideColumn('credit_code');
$(ds_gridBpId).hideColumn('rsc_flag');
$(ds_gridBpId).hideColumn('rsc_text');
}
} }
//现金流列表加载时隐藏资管费 18083 //现金流列表加载时隐藏资管费 18083
if(cashflow_ds_id == ds.id &&cashflow_ds_id){ if(cashflow_ds_id == ds.id &&cashflow_ds_id){
......
src/main/webapp/modules/rsc/RSC303/rsc_fin_statement_prj_all_query.lview
View file @ 39d9eb43
...@@ -100,7 +100,8 @@ ...@@ -100,7 +100,8 @@
url: $('rsc_fin_statement_prj_import_handle_id').getUrl(), url: $('rsc_fin_statement_prj_import_handle_id').getUrl(),
params: { params: {
bp_id:'${/parameter/@bp_id}', bp_id:'${/parameter/@bp_id}',
winid:'rsc_fin_statement_prj_import_handle_winid' winid:'rsc_fin_statement_prj_import_handle_winid',
project_id:'${/parameter/@project_id}'
} , } ,
title: '${l:STATEMENTS_BUSINESS_DATA_IMPORT}', title: '${l:STATEMENTS_BUSINESS_DATA_IMPORT}',
width: 950, width: 950,
...@@ -235,7 +236,7 @@ ...@@ -235,7 +236,7 @@
<a:field name="group_by_flag" defaultValue="Y"/> <a:field name="group_by_flag" defaultValue="Y"/>
</a:fields> </a:fields>
</a:dataSet> </a:dataSet>
<a:dataSet id="rsc303_fin_statement_prj_result_ds" autoPageSize="true" autoQuery="true" model="rsc.RSC303.rsc_fin_statement_prj_all_query" queryDataSet="rsc303_fin_statement_prj_query_ds" queryUrl="${/request/@context_path}/autocrud/rsc.RSC303.rsc_fin_statement_prj_all_query/query?bp_id=${/parameter/@bp_id}" selectable="true"/> <a:dataSet id="rsc303_fin_statement_prj_result_ds" autoPageSize="true" autoQuery="true" model="rsc.RSC303.rsc_fin_statement_prj_all_query" queryDataSet="rsc303_fin_statement_prj_query_ds" queryUrl="${/request/@context_path}/autocrud/rsc.RSC303.rsc_fin_statement_prj_all_query/query?bp_id=${/parameter/@bp_id}&amp;project_id=${/parameter/@project_id}&amp;if_prj=${/parameter/@if_prj}" selectable="true"/>
</a:dataSets> </a:dataSets>
<a:screenBody> <a:screenBody>
<a:screenTopToolbar> <a:screenTopToolbar>
......
src/main/webapp/modules/sys/SYS405/sys_mail_send_by_java.lsc
View file @ 39d9eb43
...@@ -9,6 +9,12 @@ ...@@ -9,6 +9,12 @@
importPackage(Packages.com.hand.hls.hlcm.util); importPackage(Packages.com.hand.hls.hlcm.util);
try { try {
var existsFlag_query = $bm('sys.SYS405.sys_mail_sent');
existsFlag_map = existsFlag_query.queryAsMap({
});
var existsFlag_details = existsFlag_map.getChildren();
existsFlag = existsFlag_details[0].existsFlag;
if(existsFlag=='N'){
var mail_server_bm = $bm('sys.SYS405.sys_get_mail_server'); var mail_server_bm = $bm('sys.SYS405.sys_get_mail_server');
var mail_server_result = mail_server_bm.queryAsMap().getChildren(); var mail_server_result = mail_server_bm.queryAsMap().getChildren();
println('###############'+JSON.stringify(mail_server_result)+'###############'); println('###############'+JSON.stringify(mail_server_result)+'###############');
...@@ -46,6 +52,7 @@ ...@@ -46,6 +52,7 @@
}); });
} }
} }
}
} catch (e) { } catch (e) {
raise_app_error(e); raise_app_error(e);
} }
......
src/main/webapp/modules/sys/SYS8210/sys_user.lview
View file @ 39d9eb43
...@@ -156,6 +156,7 @@ ...@@ -156,6 +156,7 @@
<a:column name="assign_role" align="center" prompt="SYS_USER.ROLE_ASSIGN" renderer="render_userDs_grid" width="70"/> <a:column name="assign_role" align="center" prompt="SYS_USER.ROLE_ASSIGN" renderer="render_userDs_grid" width="70"/>
<a:column name="set_password" align="center" prompt="MODIFY_PASSWORD" renderer="render_userDs_grid" width="70"/> <a:column name="set_password" align="center" prompt="MODIFY_PASSWORD" renderer="render_userDs_grid" width="70"/>
<a:column name="edit_user" align="center" prompt="HAP_EDIT" renderer="render_userDs_grid" width="70"/> <a:column name="edit_user" align="center" prompt="HAP_EDIT" renderer="render_userDs_grid" width="70"/>
<a:column name="login_time" align="center" prompt="最近登录日期" renderer="Leaf.formatDate"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
</a:screenBody> </a:screenBody>
......
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