Skip to content

L
leaf-hlcm
Commit 989e2f6a authored by niminmin's avatar niminmin
Browse files
Options

Merge branch 'feature/保证金退款和二次租赁开发' into develop 

# Conflicts:
#	src/main/webapp/modules/cus_deposit/CUS_DEPOSIT106/csh_transaction_return.lview
parents 0502bf33 8140a839
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3328 additions and 2737 deletions
src/main/database/Package/acr_invoice_pkg.pck
View file @ 989e2f6a
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/WEB-INF/classes/cont/CON_ET003/con_early_termination_modify_query.lwm
View file @ 989e2f6a
...@@ -155,11 +155,12 @@ ...@@ -155,11 +155,12 @@
v.code_value = r.req_status v.code_value = r.req_status
)req_status_n, )req_status_n,
r.created_by, r.created_by,
(SELECT su.description FROM sys_user su WHERE su.user_id=r.created_by)req_employee_n (SELECT su.description FROM sys_user su WHERE su.user_id=r.created_by)req_employee_n,
to_char(r.termination_date,'yyyy-mm-dd')termination_date
FROM FROM
con_contract t, con_contract t,
hls_bp_master b, hls_bp_master b,
hls_document_type_v dt,con_contract_change_req r hls_document_type_v dt,con_contract_change_req r
WHERE WHERE
r.change_req_id = t.contract_id AND r.change_req_id = t.contract_id AND
...@@ -193,6 +194,8 @@ ...@@ -193,6 +194,8 @@
<bm:query-field name="division" queryExpression="t1.division = ${@division}"/> <bm:query-field name="division" queryExpression="t1.division = ${@division}"/>
<bm:query-field name="contract_status" queryExpression="t1.contract_status = ${@contract_status}"/> <bm:query-field name="contract_status" queryExpression="t1.contract_status = ${@contract_status}"/>
<bm:query-field name="lease_execution_date_from" queryexpression="to_char(t1.lease_execution_date,'YYYY-MM-DD') &gt;= ${@lease_execution_date_from}"/> <bm:query-field name="lease_execution_date_from" queryexpression="to_char(t1.lease_execution_date,'YYYY-MM-DD') &gt;= ${@lease_execution_date_from}"/>
<bm:query-field name="termination_date_to" queryexpression="t1.termination_date&lt;= ${@termination_date_to}"/>
<bm:query-field name="termination_date_from" queryexpression="t1.termination_date &gt;= ${@termination_date_from}"/>
<bm:query-field name="lease_execution_date_to" queryexpression="to_char(t1.lease_execution_date,'YYYY-MM-DD') &lt;= ${@lease_execution_date_to}"/> <bm:query-field name="lease_execution_date_to" queryexpression="to_char(t1.lease_execution_date,'YYYY-MM-DD') &lt;= ${@lease_execution_date_to}"/>
<bm:query-field name="req_employee_n" datatype="java.lang.String" queryexpression="t1.req_employee_n like &apos;%&apos; || ${@req_employee_n} || &apos;%&apos;"/> <bm:query-field name="req_employee_n" datatype="java.lang.String" queryexpression="t1.req_employee_n like &apos;%&apos; || ${@req_employee_n} || &apos;%&apos;"/>
<bm:query-field name="req_status" queryExpression="t1.req_status = ${@req_status}"/> <bm:query-field name="req_status" queryExpression="t1.req_status = ${@req_status}"/>
......
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query.lwm
View file @ 989e2f6a
...@@ -81,7 +81,9 @@ ...@@ -81,7 +81,9 @@
FROM hls_bp_master_bank_account hb FROM hls_bp_master_bank_account hb
WHERE hb.bank_account_id = v.bp_bank_account_id)) sap_bvtyp_n, WHERE hb.bank_account_id = v.bp_bank_account_id)) sap_bvtyp_n,
v.pattern, v.pattern,
v.machine_number v.machine_number,
v.repur_con_amt,
v.repur_con_ddct_amt
FROM (SELECT t.contract_id, FROM (SELECT t.contract_id,
(SELECT hbbc.bank_account_id (SELECT hbbc.bank_account_id
FROM hls_bp_master_bank_account hbbc FROM hls_bp_master_bank_account hbbc
...@@ -263,7 +265,9 @@ ...@@ -263,7 +265,9 @@
'01', '01',
'CNYB')) sap_bvtyp_n, 'CNYB')) sap_bvtyp_n,
i.pattern, i.pattern,
i.machine_number i.machine_number,
nvl((select due_amount from con_contract_cashflow where contract_id=t.repur_contract_id and cf_item=250),0)repur_con_amt,
nvl((select due_amount from con_contract_cashflow where contract_id=t.repur_contract_id and cf_item=250),0)repur_con_ddct_amt
FROM con_contract_cashflow f FROM con_contract_cashflow f
join con_contract t join con_contract t
on t.contract_id = f.contract_id 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 @ 989e2f6a
...@@ -116,7 +116,9 @@ ...@@ -116,7 +116,9 @@
cpr.payment_req_ln_type, cpr.payment_req_ln_type,
cpr.ref_doc_id, cpr.ref_doc_id,
cpr.ref_doc_line_id, cpr.ref_doc_line_id,
cpr.ref_doc_category cpr.ref_doc_category,
nvl(cpr.repur_con_amt,0)repur_con_amt,
nvl(cpr.repur_con_ddct_amt,0)repur_con_ddct_amt
from csh_payment_req_ln cpr, from csh_payment_req_ln cpr,
con_contract c, con_contract c,
......
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_update.lwm
View file @ 989e2f6a
...@@ -10,12 +10,8 @@ ...@@ -10,12 +10,8 @@
<bm:operation name="update"> <bm:operation name="update">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
begin begin
update csh_transaction csh_transaction_pkg.check_csh_trans_tenant_atm(p_transaction_id=> ${@transaction_id},
set LAST_UPDATE_DATE = sysdate, p_user_id=> ${/session/@user_id});
last_updated_by = ${/session/@user_id},
confirmed_flag = 'ACCAUDITING'
where transaction_id = ${@transaction_id}
and confirmed_flag in ('NEW','CT_REJECTED');
end; end;
]]></bm:update-sql> ]]></bm:update-sql>
</bm:operation> </bm:operation>
......
src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_con_contract_cashflow.lwm
View file @ 989e2f6a
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
to_char(due_date, 'yyyy-mm-dd') due_date, to_char(due_date, 'yyyy-mm-dd') due_date,
decode(cf_item, 9, decode(cf_item, 9,
CON_OVERDUE_PENALTY_PKG.CALC_PENALTY_FOR_WRITE_OFF(p_cashflow_id=>t.cashflow_id, CON_OVERDUE_PENALTY_PKG.CALC_PENALTY_FOR_WRITE_OFF(p_cashflow_id=>t.cashflow_id,
p_calc_date=>to_date(${@transaction_date}, 'yyyy-mm-dd'), p_calc_date=>decode(nvl(${@deposit_flag},'N'),'Y',sysdate,to_date(${@transaction_date}, 'yyyy-mm-dd')),
p_user_id=>${/session/@user_id}, p_user_id=>${/session/@user_id},
p_penalty_flag=>'Y'), p_penalty_flag=>'Y'),
due_amount) due_amount, due_amount) due_amount,
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
interest - nvl(received_interest, 0) unreceived_interest, interest - nvl(received_interest, 0) unreceived_interest,
decode(cf_item, 9, decode(cf_item, 9,
CON_OVERDUE_PENALTY_PKG.CALC_PENALTY_FOR_WRITE_OFF(p_cashflow_id=>t.cashflow_id, CON_OVERDUE_PENALTY_PKG.CALC_PENALTY_FOR_WRITE_OFF(p_cashflow_id=>t.cashflow_id,
p_calc_date=>to_date(${@transaction_date}, 'yyyy-mm-dd'), p_calc_date=>decode(nvl(${@deposit_flag},'N'),'Y',sysdate,to_date(${@transaction_date}, 'yyyy-mm-dd')),
p_user_id=>${/session/@user_id}, p_user_id=>${/session/@user_id},
p_penalty_flag=>'Y'), p_penalty_flag=>'Y'),
due_amount) - due_amount) -
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/csh_transaction_maintain_query.lwm
View file @ 989e2f6a
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
<bm:field name="receipt_type_des" expression="(select v.code_value_name from sys_code_values_v v where v.code=&apos;RECEIPT_TYPE&apos; and v.code_value=t1.receipt_type)"/> <bm:field name="receipt_type_des" expression="(select v.code_value_name from sys_code_values_v v where v.code=&apos;RECEIPT_TYPE&apos; and v.code_value=t1.receipt_type)"/>
<bm:field name="ref_contract_id"/> <bm:field name="ref_contract_id"/>
<bm:field name="contract_number" expression="(select cc.contract_number from con_contract cc where cc.contract_id = t1.ref_contract_id)"/> <bm:field name="contract_number" expression="(select cc.contract_number from con_contract cc where cc.contract_id = t1.ref_contract_id)"/>
<bm:field name="contract_name" expression="(select cc.contract_number from con_contract cc where cc.contract_id = t1.ref_contract_id)"/>
<bm:field name="collection_classes"/> <bm:field name="collection_classes"/>
<bm:field name="collection_classes_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DS_COLLECTION_CLASSES' and v.code_value =t1.collection_classes)" forInsert="false" forUpdate="false"/> <bm:field name="collection_classes_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DS_COLLECTION_CLASSES' and v.code_value =t1.collection_classes)" forInsert="false" forUpdate="false"/>
<bm:field name="confirmed_flag_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'CONFIRMED_FLAG' and v.code_value =t1.confirmed_flag)" forInsert="false" forUpdate="false"/> <bm:field name="confirmed_flag_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'CONFIRMED_FLAG' and v.code_value =t1.confirmed_flag)" forInsert="false" forUpdate="false"/>
...@@ -101,6 +102,7 @@ ...@@ -101,6 +102,7 @@
<bm:field name="acc_confirmed_by_desc" expression="(select description from sys_user where user_id=t1.acc_confirmed_by)" forInsert="false" forUpdate="false"/> <bm:field name="acc_confirmed_by_desc" expression="(select description from sys_user where user_id=t1.acc_confirmed_by)" forInsert="false" forUpdate="false"/>
<bm:field name="receipt_type_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'RECEIPT_TYPE' and v.code_value =t1.receipt_type)" forInsert="false" forUpdate="false"/> <bm:field name="receipt_type_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'RECEIPT_TYPE' and v.code_value =t1.receipt_type)" forInsert="false" forUpdate="false"/>
<bm:field name="deposit_trans_type"/> <bm:field name="deposit_trans_type"/>
<bm:field name="bp_id_telnet_code" expression="(select hb.bp_code from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/>
<bm:field name="bp_id_telnet_n" expression="(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)" forInsert="false" forUpdate="false"/> <bm:field name="bp_id_telnet_n" expression="(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)" forInsert="false" forUpdate="false"/>
<bm:field name="bp_name_n" expression="(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_agent_level1)" forInsert="false" forUpdate="false"/> <bm:field name="bp_name_n" expression="(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_agent_level1)" forInsert="false" forUpdate="false"/>
<bm:field name="deposit_trans_type_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DEPOSIT_TRANS_TYPE' and v.code_value =t1.deposit_trans_type)" forInsert="false" forUpdate="false"/> <bm:field name="deposit_trans_type_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DEPOSIT_TRANS_TYPE' and v.code_value =t1.deposit_trans_type)" forInsert="false" forUpdate="false"/>
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/csh_transaction_return_query.lwm
View file @ 989e2f6a
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select * from (select cr.return_id, select * from (select cr.return_id,
cr.return_date, to_char(cr.return_date,'yyyy-mm-dd') return_date,
cr.return_amount, cr.return_amount,
ct.period_name, ct.period_name,
cr.opposite_band_na, cr.opposite_band_na,
...@@ -38,7 +38,13 @@ ...@@ -38,7 +38,13 @@
cr.csh_return_bp_id, cr.csh_return_bp_id,
(select a.bp_name (select a.bp_name
from hls_bp_master a from hls_bp_master a
where a.bp_id = cr.csh_return_bp_id) csh_return_bp_name where a.bp_id = cr.csh_return_bp_id) csh_return_bp_name,
(select hb.bp_code from hls_bp_master hb,con_contract cc where cc.contract_id=ct.ref_contract_id and hb.bp_id=cc.bp_id_tenant)bp_id_telnet_code,
(select hb.bp_name from hls_bp_master hb,con_contract cc where cc.contract_id=ct.ref_contract_id and hb.bp_id=cc.bp_id_tenant)bp_id_telnet_n,
(select cc.contract_number from con_contract cc where cc.contract_id = ct.ref_contract_id) contract_number,
(select a.bp_name
from hls_bp_master a
where a.bp_id = ct.bp_id) bp_agent_name
from csh_transaction ct, csh_transaction_return cr from csh_transaction ct, csh_transaction_return cr
where ct.transaction_id = cr.transaction_id where ct.transaction_id = cr.transaction_id
)v )v
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/get_csh_return_status.lwm 0 → 100644
View file @ 989e2f6a
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: hp
$Date: 2015-5-15 上午11:46:44
$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 t1.status from CSH_TRANSACTION_RETURN t1 #WHERE_CLAUSE# ]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="status"/>
</bm:fields>
</bm:model>
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT122/csh_transaction_record_query.lwm
View file @ 989e2f6a
...@@ -176,9 +176,10 @@ ...@@ -176,9 +176,10 @@
<bm:query-field field="bp_id" queryOperator="="/> <bm:query-field field="bp_id" queryOperator="="/>
<bm:query-field name="description" queryExpression="t1.description like &apos;%&apos;||${@description}||&apos;%&apos;"/> <bm:query-field name="description" queryExpression="t1.description like &apos;%&apos;||${@description}||&apos;%&apos;"/>
<bm:query-field name="bank_account_num" queryExpression="(select a.bank_account_num from csh_bank_account a where a.bank_account_id=t1.bank_account_id) like &apos;%&apos;||upper(${@bank_account_num})||&apos;%&apos;"/> <bm:query-field name="bank_account_num" queryExpression="(select a.bank_account_num from csh_bank_account a where a.bank_account_id=t1.bank_account_id) like &apos;%&apos;||upper(${@bank_account_num})||&apos;%&apos;"/>
<!--<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;||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 &apos;%&apos;||${@bp_id_telnet_n}||&apos;%&apos; "/>
<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="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-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
</bm:query-fields> </bm:query-fields>
</bm:model> </bm:model>
src/main/webapp/WEB-INF/classes/prj/PRJ500/get_new_prj_number.lwm
View file @ 989e2f6a
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<bm:operation name="update"> <bm:operation name="update">
<bm:parameters> <bm:parameters>
<bm:parameter name="document_category" dataType="java.lang.String" input="true" output="false"/> <bm:parameter name="document_category" dataType="java.lang.String" input="true" output="false"/>
<bm:parameter name="business_type" dataType="java.lang.String" input="true" output="false"/>
<bm:parameter name="document_type" dataType="java.lang.String" input="true" output="false"/> <bm:parameter name="document_type" dataType="java.lang.String" input="true" output="false"/>
<bm:parameter name="company_id" dataType="java.lang.Long" input="true" output="false"/> <bm:parameter name="company_id" dataType="java.lang.Long" input="true" output="false"/>
<bm:parameter name="lease_channel" dataType="java.lang.String" input="true" output="false"/> <bm:parameter name="lease_channel" dataType="java.lang.String" input="true" output="false"/>
...@@ -17,6 +18,7 @@ ...@@ -17,6 +18,7 @@
HLS_DOCUMENT_SAVE_PKG.GET_NEW_PRJ_NUMBER HLS_DOCUMENT_SAVE_PKG.GET_NEW_PRJ_NUMBER
( (
p_document_category=>${@document_category}, p_document_category=>${@document_category},
p_business_type=>${@business_type},
p_document_type=>${@document_type}, p_document_type=>${@document_type},
p_company_id=>${/session/@company_id}, p_company_id=>${/session/@company_id},
p_lease_channel=>${@lease_channel}, p_lease_channel=>${@lease_channel},
......
src/main/webapp/WEB-INF/classes/zjwfl/ZJWFL1060/zj_wfl_approve_history_v.lwm
View file @ 989e2f6a
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
(case when (case when
${/session/@role_id} in(2318,2319) then ${/session/@role_id} in(2318,2319) then
'同意' '同意'
elsemodules/cont/CON620/con_contract_rent_dun_query.lview else
t1.comment_text t1.comment_text
end ),t1.comment_text),t1.comment_text) comment_text, end ),t1.comment_text),t1.comment_text) comment_text,
-- t1.comment_text, -- t1.comment_text,
...@@ -140,42 +140,43 @@ ...@@ -140,42 +140,43 @@
WHERE WHERE
t1.instance_id =${@instance_id} ) v where (v.bp_category = 'AGENT' and v.record_type not like 'TRANSFER') t1.instance_id =${@instance_id} ) v where (v.bp_category = 'AGENT' and v.record_type not like 'TRANSFER')
UNION UNION
SELECT SELECT NULL AS node_id,
NULL AS node_id, NULL AS workflow_code,
NULL AS workflow_code, NULL AS workflow_desc,
NULL AS workflow_desc, 00 AS node_sequence_num,
00 AS node_sequence_num, '00--提交节点' AS node_desc,
'00--提交节点' AS node_desc, zw.instance_id AS instance_id,
pp.wfl_instance_id AS instance_id, NULL AS action_taken,
NULL AS action_taken, NULL AS action_type,
NULL AS action_type, ('提交--' || (select zww.workflow_desc
'提交--租赁申请流程' AS action_type_desc, from zj_wfl_workflow zww
NULL AS record_type, where zww.workflow_id = zw.workflow_id)) AS action_type_desc,
'提交' AS comment_text, NULL AS record_type,
NULL AS comment_text_out, '提交' AS comment_text,
NULL AS record_id, NULL AS comment_text_out,
NULL AS seq_number, NULL AS record_id,
NULL AS rcpt_record_id, NULL AS seq_number,
NULL AS disabled_flag, NULL AS rcpt_record_id,
NULL AS note, NULL AS disabled_flag,
to_char((select zi.creation_date from zj_wfl_workflow_instance zi where zi.instance_id=pp.wfl_instance_id),'yyyy-mm-dd hh24:mi:ss') AS create_date_fmt, NULL AS note,
(SELECT su.description FROM sys_user su WHERE su.user_id = pp.owner_user_id to_char(zw.creation_date, 'yyyy-mm-dd hh24:mi:ss') AS create_date_fmt,
) approver, (SELECT su.description
'Y' AS agent_flag, FROM sys_user su
1 AS record_approve_count, WHERE su.user_id = zw.created_by) approver,
1 AS instance_approve_count, 'N' AS agent_flag,
'N' AS node_hide_approve_record, 1 AS record_approve_count,
NULL AS node_show_approve_ht, 1 AS instance_approve_count,
NULL AS node_show_all_approve_ht, 'N' AS node_hide_approve_record,
NULL AS wfl_show_approve_ht, NULL AS node_show_approve_ht,
NULL AS wfl_show_all_approve_ht, NULL AS node_show_all_approve_ht,
NULL AS attach_count, NULL AS wfl_show_approve_ht,
NULL AS bp_category NULL AS wfl_show_all_approve_ht,
FROM NULL AS attach_count,
prj_project pp NULL AS bp_category
WHERE FROM zj_wfl_workflow_instance zw
pp.wfl_instance_id = ${@instance_id} AND WHERE zw.instance_id =${@instance_id}
pp.wfl_instance_id IS NOT NULL
) t1 #WHERE_CLAUSE# ) t1 #WHERE_CLAUSE#
ORDER BY ORDER BY
create_date_fmt DESC create_date_fmt DESC
......
src/main/webapp/modules/acr/ACR512/acr_invoice_update_query.lview
View file @ 989e2f6a
...@@ -321,12 +321,12 @@ ...@@ -321,12 +321,12 @@
<a:dataSet id="acr512_invoice_result_ds" autoPageSize="true" autoQuery="true" <a:dataSet id="acr512_invoice_result_ds" autoPageSize="true" autoQuery="true"
model="acr.ACR512.acr_invoice_update_query" queryDataSet="acr512_invoice_query_ds" model="acr.ACR512.acr_invoice_update_query" queryDataSet="acr512_invoice_query_ds"
selectable="true"/> selectable="true"/>
<a:fields> <!-- <a:fields>-->
<a:field name="compare_date_flag"/> <!-- <a:field name="compare_date_flag"/>-->
</a:fields> <!-- </a:fields>-->
<a:events> <!-- <a:events>-->
<a:event name="load" handler="load_do_info"/> <!-- <a:event name="load" handler="load_do_info"/>-->
</a:events> <!-- </a:events>-->
</a:dataSets> </a:dataSets>
<a:screenBody> <a:screenBody>
<a:screenTopToolbar> <a:screenTopToolbar>
......
src/main/webapp/modules/cont/CON301N/con_contract_query_entrance.lview
View file @ 989e2f6a
...@@ -67,11 +67,11 @@ ...@@ -67,11 +67,11 @@
function open_project_Window(record_id, ds_id) { function open_project_Window(record_id, ds_id) {
var record = $(ds_id).findById(record_id); var record = $(ds_id).findById(record_id);
//项目类layout_code //项目类layout_code
maintain_type = 'QUERY'; maintain_type = 'READONLY';
param = record.data; param = record.data;
param['document_id'] = record.get('project_id'); param['document_id'] = record.get('project_id');
param['function_code'] = 'PRJ501Q'; param['function_code'] = 'PRJ501_WFL';
param['function_usage'] = 'MODIFY'; param['function_usage'] = 'QUERY';
param['maintain_type'] = maintain_type; param['maintain_type'] = maintain_type;
param['url_title'] = '${l:HLS.PROJECT_MAITAIN}'; param['url_title'] = '${l:HLS.PROJECT_MAITAIN}';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'car_modify_link_readonly', ds_id); hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'car_modify_link_readonly', ds_id);
......
src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview
View file @ 989e2f6a
...@@ -61,6 +61,21 @@ ...@@ -61,6 +61,21 @@
}); });
}; };
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
if (ds_id == ds.id && ds_id) {
if (record.get('business_type') == 'LEASEBACK'&&'${/parameter/@function_usage}'=='MODIFY') {
record.set('submit_date',null);
record.set('guarantee_letter_f','NO');
record.set('guarantee_letter_f_n','否');
}else if(record.get('business_type') == 'LEASE'){
document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_ENTRUSTED_AMOUNT_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_ENTRUSTED_AMOUNT').style.display = 'none';
}
}
};
// window['${/parameter/@layout_code}_dynamic_link_renderer'] = function(value, record, name, config_record) { // window['${/parameter/@layout_code}_dynamic_link_renderer'] = function(value, record, name, config_record) {
...@@ -511,6 +526,7 @@ ...@@ -511,6 +526,7 @@
document_category: 'CONTRACT', document_category: 'CONTRACT',
contract_status:record.get('contract_status'), contract_status:record.get('contract_status'),
maintain_type: 'MODIFY', maintain_type: 'MODIFY',
business_type: record.get('business_type'),
calc_session_id: record.get('calc_session_id'), calc_session_id: record.get('calc_session_id'),
quotation_id: record.get('quotation_id'), quotation_id: record.get('quotation_id'),
dsId: cashflow_ds_id, dsId: cashflow_ds_id,
......
src/main/webapp/modules/cont/CON_ET003/con_early_termination_modify_query.lview
View file @ 989e2f6a
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
<a:map from="document_type_desc" to="et_type_dis"/> <a:map from="document_type_desc" to="et_type_dis"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="termination_date" datatype="date" required="true"/> <!-- <a:field name="termination_date" datatype="date" required="true"/>-->
<a:field name="overdue_status" checkedValue="Y" uncheckedValue="N"/> <a:field name="overdue_status" checkedValue="Y" uncheckedValue="N"/>
<a:field name="trial" checkedValue="Y" uncheckedValue="N"/> <a:field name="trial" checkedValue="Y" uncheckedValue="N"/>
<a:field name="lease_execution_date" datatype="date"/> <a:field name="lease_execution_date" datatype="date"/>
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
<a:gridButton click="contractQueryScreen_reset" text="HLS.RESET"/> <a:gridButton click="contractQueryScreen_reset" text="HLS.RESET"/>
<a:gridButton click="con_gur_np_pint" text="合同文本打印" id="con_gur_np_pint_id"/> <a:gridButton click="con_gur_np_pint" text="合同文本打印" id="con_gur_np_pint_id"/>
</a:screenTopToolbar> </a:screenTopToolbar>
<a:form column="4" labelWidth="100" marginWidth="40" title="HLS.QUERY_TITLE"> <a:form column="3" labelWidth="100" marginWidth="40" title="HLS.QUERY_TITLE">
<a:textField name="change_req_number" bindTarget="contractQueryScreen_paraDs" prompt="变更申请编号"/> <a:textField name="change_req_number" bindTarget="contractQueryScreen_paraDs" prompt="变更申请编号"/>
<a:textField name="contract_number" bindTarget="contractQueryScreen_paraDs" prompt="合同编号"/> <a:textField name="contract_number" bindTarget="contractQueryScreen_paraDs" prompt="合同编号"/>
<a:textField name="contract_name" bindTarget="contractQueryScreen_paraDs" prompt="合同名称"/> <a:textField name="contract_name" bindTarget="contractQueryScreen_paraDs" prompt="合同名称"/>
...@@ -181,6 +181,8 @@ ...@@ -181,6 +181,8 @@
<!-- <a:lov name="bp_agent" bindTarget="contractQueryScreen_paraDs" prompt="代理店"/>--> <!-- <a:lov name="bp_agent" bindTarget="contractQueryScreen_paraDs" prompt="代理店"/>-->
<a:comboBox name="division_n" bindTarget="contractQueryScreen_paraDs" prompt="租赁物"/> <a:comboBox name="division_n" bindTarget="contractQueryScreen_paraDs" prompt="租赁物"/>
<a:textField name="req_employee_n" bindTarget="contractQueryScreen_paraDs" prompt="申请人"/> <a:textField name="req_employee_n" bindTarget="contractQueryScreen_paraDs" prompt="申请人"/>
<a:datePicker name="termination_date_from" bindTarget="contractQueryScreen_paraDs" prompt="提前结清日从"/>
<a:datePicker name="termination_date_to" bindTarget="contractQueryScreen_paraDs" prompt="提前结清日到"/>
<a:comboBox name="req_status_n" bindTarget="contractQueryScreen_paraDs" prompt="变更审批状态"/> <a:comboBox name="req_status_n" bindTarget="contractQueryScreen_paraDs" prompt="变更审批状态"/>
</a:form> </a:form>
<a:grid id="contractQueryScreen_mainDs_grid" bindTarget="contractQueryScreen_mainDs" marginHeight="230" marginWidth="40" navBar="true"> <a:grid id="contractQueryScreen_mainDs_grid" bindTarget="contractQueryScreen_mainDs" marginHeight="230" marginWidth="40" navBar="true">
...@@ -192,6 +194,7 @@ ...@@ -192,6 +194,7 @@
<a:column name="bp_agent" prompt="代理店" width="200" align="left"/> <a:column name="bp_agent" prompt="代理店" width="200" align="left"/>
<a:column name="division_n" prompt="租赁物" width="120" align="left"/> <a:column name="division_n" prompt="租赁物" width="120" align="left"/>
<a:column name="req_employee_n" prompt="申请人" width="80" align="right"/> <a:column name="req_employee_n" prompt="申请人" width="80" align="right"/>
<a:column name="termination_date" prompt="提前结清日" width="100" align="center"/>
<a:column name="req_status_n" prompt="变更审批状态" width="100" align="center"/> <a:column name="req_status_n" prompt="变更审批状态" width="100" align="center"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
......
src/main/webapp/modules/csh/CSH509/csh_transaction_receipt_confirm.lview
View file @ 989e2f6a
...@@ -822,7 +822,9 @@ ...@@ -822,7 +822,9 @@
<!--对方账户账号--> <!--对方账户账号-->
<!-- <a:lov name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds"--> <!-- <a:lov name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds"-->
<!-- prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>--> <!-- prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>-->
<a:textField style="display:none"/> <!-- <a:textField style="display:none"/>-->
<a:comboBox name="receipt_type_des" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="收款类型"/>
<a:lov name="bp_name" bindTarget="csh_transaction_receipt_maintain_query_ds" <a:lov name="bp_name" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.BUSINESS_PARTNER"/> prompt="CSH510.CSH_TRANSACTION.BUSINESS_PARTNER"/>
<a:comboBox name="confirmed_flag_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" <a:comboBox name="confirmed_flag_desc" bindTarget="csh_transaction_receipt_maintain_query_ds"
...@@ -850,6 +852,8 @@ ...@@ -850,6 +852,8 @@
<a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT"
width="100" renderer="Leaf.formatMoney"/> width="100" renderer="Leaf.formatMoney"/>
<a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/> <a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
<a:column name="receipt_type_n" prompt="收款类型"
align="center"/>
<a:column name="returned_amount" prompt="CSH510.CSH_TRANSACTION.RETURN_AMOUNT" align="right" <a:column name="returned_amount" prompt="CSH510.CSH_TRANSACTION.RETURN_AMOUNT" align="right"
renderer="Leaf.formatMoney"/> renderer="Leaf.formatMoney"/>
<a:column name="use_money_amount" prompt="CSH510.CSH_TRANSACTION.USEFUL_AMOUNT" align="right" <a:column name="use_money_amount" prompt="CSH510.CSH_TRANSACTION.USEFUL_AMOUNT" align="right"
......
src/main/webapp/modules/csh/CSH510/csh_transaction_hand_receipt_update_readonly.lview
View file @ 989e2f6a
...@@ -30,13 +30,17 @@ ...@@ -30,13 +30,17 @@
/* var record = $(ds_id).findById(record_id); /* var record = $(ds_id).findById(record_id);
var mortgage_id = record.get('mortgage_id');*/ var mortgage_id = record.get('mortgage_id');*/
var header_id = record.get('transaction_id');
if(record.get('transaction_type') == 'ADVANCE_RECEIPT'){
header_id = record.get('source_csh_trx_id');
}
var win = new Leaf.Window({ var win = new Leaf.Window({
id: 'hn2050_upload_win', id: 'hn2050_upload_win',
url: $('hn2050_upload_win_link').getUrl(), url: $('hn2050_upload_win_link').getUrl(),
params: { params: {
winid: 'hn2050_upload_win', winid: 'hn2050_upload_win',
table_name: 'CSH_TRANSACTION', table_name: 'CSH_TRANSACTION',
header_id: record.get('transaction_id') header_id: header_id
}, },
width: 900, width: 900,
height: 400 height: 400
......
src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview
View file @ 989e2f6a
...@@ -494,7 +494,7 @@ ...@@ -494,7 +494,7 @@
var record = ds.getCurrentRecord(); var record = ds.getCurrentRecord();
// var header_id = '${/parameter/@transaction_id}'; // var header_id = '${/parameter/@transaction_id}';
var header_id = record.get('transaction_id'); var header_id = record.get('transaction_id');
if(record.get('transaction_type') == 'ADVANCE_RECEIPT'){ if(record.get('transaction_type') == 'ADVANCE_RECEIPT'||record.get('transaction_type') == 'DEPOSIT'){
header_id = record.get('source_csh_trx_id'); header_id = record.get('source_csh_trx_id');
} }
var url = $('transaction_downloadFile_id').getUrl() + '?table_name=CSH_TRANSACTION&header_id=' + header_id; var url = $('transaction_downloadFile_id').getUrl() + '?table_name=CSH_TRANSACTION&header_id=' + header_id;
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT106/csh_deposit_return_history_print.lsc 0 → 100644
View file @ 989e2f6a
<?xml version="1.0" encoding="UTF-8"?>
<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true">
<a:init-procedure>
<a:model-update model="hls.HLS811.hls_doc_file_templet_get_atm"/>
<s:server-script import="con_print_path.js"><![CDATA[
importPackage(Packages.hls.plugin.docx4j);
importPackage(Packages.com.hand.hls.hlcm.util);
importPackage(java.io);
function copyFile(fOld, fNew) {
var fis = new java.io.FileInputStream(fOld);
var fos = new java.io.FileOutputStream(fNew);
var b = new java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 1024 * 4);
var len = -1;
while ((len = fis.read(b)) != -1) {
fos.write(b, 0, len);
}
fis.close();
fos.close();
}
function transfer(file_path, os) {
println(file_path);
var fis = new FileInputStream(file_path);
var b = new java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 1024 * 64);
var len = -1;
while ((len = fis.read(b)) != -1) {
os.write(b, 0, len);
}
fis.close();
}
function download_file(file_name, file_path) {
$ctx["__request_type__"] = 'file'; //to indicate this request is not a JSON_REQUEST
var resp = $ctx['_instance.javax.servlet.http.HttpServletResponse'];
resp.setHeader("Pragma", "No-cache");
resp.setHeader("Cache-Control", "no-cache, must-revalidate");
resp.setDateHeader("Expires", 0);
resp.setContentType("application/x-msdownload");
resp.setHeader("Content-disposition", "attachment; filename=" + encodeURI(file_name, 'UTF-8'));
var os = resp.getOutputStream();
transfer(file_path, os);
os.flush();
}
var attachment_batch_dl = $bm('hls.HLS811.hls_doc_file_templet_get_atm');
var result = attachment_batch_dl.queryAsMap({
document_id: $ctx.parameter.document_id,
document_table: $ctx.parameter.document_table,
batch_flag: $ctx.parameter.batch_flag,
content_id: $ctx.parameter.content_id
});
var from_file_data = result.getChildren();
for (var i = 0;i < from_file_data.length;i++) {
if (!$ctx.parameter.file_path) {
set_parameter_file_path();
}
var to_file_path = $ctx.parameter.file_path;
var record_data = from_file_data[i];
// var to_file_name = record_data.to_file_name;
var to_file_name = $ctx.parameter.file_name+'.docx';
var from_file_path = record_data.file_path;
var guid_file_name_path = $bm('cont.CON500.con_contract_get_guid_file_name').queryAsMap();
var guid_file_name_tables = guid_file_name_path.getChildren();
to_file_path = to_file_path + guid_file_name_tables[0].guid_file_name + 'doc' + record_data.content_id;
copyFile(from_file_path, to_file_path);
$bm('hls.HLS811.hls_file_content_copy_update').update({
table_name: 'HLS_DOC_FILE_CONTENT',
content_id: record_data.content_id,
file_name: to_file_name.toString(),
file_path: to_file_path.toString(),
source_type: $ctx.parameter.source_type
});
try {
$bm('csh.CSH501.csh_transaction_return_print').update({
document_id: $ctx.parameter.document_id,
document_table: $ctx.parameter.document_table
});
var brwt = new BookmarksReplaceWithText($instance('leaf.database.service.IDatabaseServiceFactory'), $instance('uncertain.ocm.IObjectRegistry'), $ctx.getData());
brwt.replaceBookmarkFromContent(to_file_path.toString(), record_data.content_id.toString(), 'COMMON');
var resp = $ctx['_instance.javax.servlet.http.HttpServletResponse'];
HlsFileUtil.downloadFile(encodeURI(to_file_path,'utf-8'),encodeURI(to_file_name,'utf-8'),resp);
// download_file(encodeURI(to_file_name,'utf-8'), to_file_path);
// print(to_file_name);
} catch (e) {
raise_app_error(e);
}
}
]]></s:server-script>
</a:init-procedure>
</a:service>
src/main/webapp/modules/hls/HLS215N/hls_bp_master_query.lview
View file @ 989e2f6a
...@@ -15,8 +15,10 @@ ...@@ -15,8 +15,10 @@
window['${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function(ds, line_record) { window['${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function(ds, line_record) {
if (ds.id.indexOf('hls_bp_master_role') != -1) { if (ds.id.indexOf('hls_bp_master_role') != -1) {
var record = ds.getCurrentRecord(); var record = ds.getCurrentRecord();
record.getField('bp_type_n').setReadOnly(true); if(record) {
record.getField('enabled_flag').setReadOnly(true); record.getField('bp_type_n').setReadOnly(true);
record.getField('enabled_flag').setReadOnly(true);
}
} }
} }
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
View file @ 989e2f6a
...@@ -122,6 +122,7 @@ ...@@ -122,6 +122,7 @@
document_id: parent_pk_value, document_id: parent_pk_value,
document_category: 'PROJECT', document_category: 'PROJECT',
maintain_type: 'MODIFY', maintain_type: 'MODIFY',
business_type: head_record.get('business_type'),
calc_session_id: res.result.record.calc_session_id, calc_session_id: res.result.record.calc_session_id,
quotation_id: quotation_id, quotation_id: quotation_id,
dsId: quotation_ds_id, dsId: quotation_ds_id,
...@@ -164,6 +165,7 @@ ...@@ -164,6 +165,7 @@
document_id: parent_pk_value, document_id: parent_pk_value,
document_category: 'PROJECT', document_category: 'PROJECT',
maintain_type: 'MODIFY', maintain_type: 'MODIFY',
business_type: head_record.get('business_type'),
calc_session_id: record.get('calc_session_id'), calc_session_id: record.get('calc_session_id'),
quotation_id: record.get('quotation_id'), quotation_id: record.get('quotation_id'),
dsId: quotation_ds_id, dsId: quotation_ds_id,
...@@ -210,6 +212,7 @@ ...@@ -210,6 +212,7 @@
document_id: parent_pk_value, document_id: parent_pk_value,
document_category: 'PROJECT', document_category: 'PROJECT',
maintain_type: 'MODIFY', maintain_type: 'MODIFY',
business_type: head_record.get('business_type'),
calc_session_id: res.result.record.calc_session_id, calc_session_id: res.result.record.calc_session_id,
quotation_id: quotation_id, quotation_id: quotation_id,
dsId: quotation_ds_id, dsId: quotation_ds_id,
...@@ -313,6 +316,7 @@ ...@@ -313,6 +316,7 @@
var bp_rate_flag; var bp_rate_flag;
/*保存前调用，生成项目编号*/ /*保存前调用，生成项目编号*/
window['${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) { window['${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) {
var check_flag = true;
var prj_project_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project'); var prj_project_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var prj_record = $(prj_project_ds_id).getAt(0); var prj_record = $(prj_project_ds_id).getAt(0);
...@@ -349,6 +353,7 @@ ...@@ -349,6 +353,7 @@
para: { para: {
document_category: '${/parameter/@document_category}', document_category: '${/parameter/@document_category}',
document_type: record.get('document_type'), document_type: record.get('document_type'),
business_type: record.get('business_type'),
function_code: '${/parameter/@function_code}', function_code: '${/parameter/@function_code}',
function_usage: '${/parameter/@function_usage}', function_usage: '${/parameter/@function_usage}',
lease_channel: prj_record.get('lease_channel'), lease_channel: prj_record.get('lease_channel'),
...@@ -537,6 +542,48 @@ ...@@ -537,6 +542,48 @@
return returnAge;//返回周岁年龄   return returnAge;//返回周岁年龄  
} }
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
if (ds_id == ds.id && ds_id) {
if (record.get('secondary_lease') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
}else if(record.get('secondary_lease') == 'NO'){
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id',null);
record.set('repur_contract_id_n',null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
//业务类型回租时，默认只读“首付款抵扣”选项
if (record.get('business_type') == 'LEASEBACK') {
record.set('payment_deduction', 'DOWN_PAYMENT_DEDUCTION');
record.set('payment_deduction_n', "首付款抵扣");
record.getField('payment_deduction').setReadOnly(true);
record.getField('payment_deduction_n').setReadOnly(true);
record.set('pay_method', 'WIRE_TRANSFER');
record.set('pay_method_n', "电汇");
record.getField('pay_method').setReadOnly(true);
record.getField('pay_method_n').setReadOnly(true);
record.getField('bank_account_id').setReadOnly(true);
record.getField('bank_account_id_n').setReadOnly(true);
record.getField('bank_account_id').setRequired(false);
record.getField('bank_account_id_n').setRequired(false);
}
}
};
//更新时调用 //更新时调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) {
var prj_project_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project'); var prj_project_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
...@@ -545,6 +592,17 @@ ...@@ -545,6 +592,17 @@
//选择承租人带出开票信息 //选择承租人带出开票信息
if (prj_project_ds_id == ds.id && prj_project_ds_id) { if (prj_project_ds_id == ds.id && prj_project_ds_id) {
if (name == "payment_deduction" && value=="DOWN_PAYMENT_DEDUCTION") {
//业务类型回租时，默认只读“首付款抵扣”选项
if ($(prj_project_ds_id).getAt(0).get('business_type') == 'LEASE') {
Leaf.showInfoMessage("提示", "直租业务不能选择首付款抵扣");
setTimeout(function () {
$(prj_project_ds_id).getAt(0).set('payment_deduction', null);
$(prj_project_ds_id).getAt(0).set('payment_deduction_n', null);
}, 10);
}
}
if (name == "bp_id_tenant_n" && value) { if (name == "bp_id_tenant_n" && value) {
var bp_id_tenant = record.get('bp_id_tenant'); var bp_id_tenant = record.get('bp_id_tenant');
Leaf.Masker.mask(Ext.getBody()); Leaf.Masker.mask(Ext.getBody());
...@@ -650,6 +708,28 @@ ...@@ -650,6 +708,28 @@
} }
} }
//add by niminmin
//当“二次租赁”字段选择‘是’时，“回购合同编号”字段为必填。当选择‘否’时，“回购合同编号”字段为只读。
if (name == 'secondary_lease') {
if (value=='YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
}else if(value=='NO'){
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id',null);
record.set('repur_contract_id_n',null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
}
} }
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview
View file @ 989e2f6a
...@@ -172,6 +172,7 @@ ...@@ -172,6 +172,7 @@
document_id: parent_pk_value, document_id: parent_pk_value,
document_category: 'PROJECT', document_category: 'PROJECT',
maintain_type: 'MODIFY', maintain_type: 'MODIFY',
business_type: head_record.get('business_type'),
calc_session_id: res.result.record.calc_session_id, calc_session_id: res.result.record.calc_session_id,
quotation_id: quotation_id, quotation_id: quotation_id,
dsId: quotation_ds_id, dsId: quotation_ds_id,
...@@ -213,6 +214,7 @@ ...@@ -213,6 +214,7 @@
document_id: parent_pk_value, document_id: parent_pk_value,
document_category: 'PROJECT', document_category: 'PROJECT',
maintain_type: 'MODIFY', maintain_type: 'MODIFY',
business_type: head_record.get('business_type'),
calc_session_id: record.get('calc_session_id'), calc_session_id: record.get('calc_session_id'),
quotation_id: record.get('quotation_id'), quotation_id: record.get('quotation_id'),
dsId: quotation_ds_id, dsId: quotation_ds_id,
...@@ -260,6 +262,7 @@ ...@@ -260,6 +262,7 @@
document_id: parent_pk_value, document_id: parent_pk_value,
document_category: 'PROJECT', document_category: 'PROJECT',
maintain_type: 'MODIFY', maintain_type: 'MODIFY',
business_type: head_record.get('business_type'),
calc_session_id: res.result.record.calc_session_id, calc_session_id: res.result.record.calc_session_id,
quotation_id: quotation_id, quotation_id: quotation_id,
dsId: quotation_ds_id, dsId: quotation_ds_id,
...@@ -704,6 +707,41 @@ ...@@ -704,6 +707,41 @@
record.getField('bank_branch_name_n').setRequired(false); record.getField('bank_branch_name_n').setRequired(false);
} }
if('${/parameter/@function_usage}'!='QUERY'){
if (record.get('secondary_lease') == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
} else if (record.get('secondary_lease') == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
}
//业务类型回租时，默认只读“首付款抵扣”选项
if (record.get('business_type') == 'LEASEBACK') {
record.set('payment_deduction', 'DOWN_PAYMENT_DEDUCTION');
record.set('payment_deduction_n', "首付款抵扣");
record.getField('payment_deduction').setReadOnly(true);
record.getField('payment_deduction_n').setReadOnly(true);
record.set('pay_method', 'WIRE_TRANSFER');
record.set('pay_method_n', "电汇");
record.getField('pay_method').setReadOnly(true);
record.getField('pay_method_n').setReadOnly(true);
record.getField('bank_account_id').setReadOnly(true);
record.getField('bank_account_id_n').setReadOnly(true);
record.getField('bank_account_id').setRequired(false);
record.getField('bank_account_id_n').setRequired(false);
}
} }
}; };
...@@ -716,6 +754,17 @@ ...@@ -716,6 +754,17 @@
var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail'); var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
if (prj_project_ds_id == ds.id && prj_project_ds_id) { if (prj_project_ds_id == ds.id && prj_project_ds_id) {
if (name == "payment_deduction" && value=="DOWN_PAYMENT_DEDUCTION") {
//业务类型回租时，默认只读“首付款抵扣”选项
if ($(prj_project_ds_id).getAt(0).get('business_type') == 'LEASE') {
Leaf.showInfoMessage("提示", "直租业务不能选择首付款抵扣");
setTimeout(function () {
$(prj_project_ds_id).getAt(0).set('payment_deduction', null);
$(prj_project_ds_id).getAt(0).set('payment_deduction_n', null);
}, 10);
}
}
if (name == "bp_id_tenant" && value) { if (name == "bp_id_tenant" && value) {
//根据承租人查找该承租人的历史合同信息 //根据承租人查找该承租人的历史合同信息
...@@ -829,6 +878,28 @@ ...@@ -829,6 +878,28 @@
}); });
}
//add by niminmin
//当“二次租赁”字段选择‘是’时，“回购合同编号”字段为必填。当选择‘否’时，“回购合同编号”字段为只读。
if (name == 'secondary_lease') {
if (value == 'YES') {
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'block';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'block';
record.getField('repur_contract_id').setRequired(true);
record.getField('repur_contract_id_n').setRequired(true);
record.getField('repur_contract_id').setReadOnly(false);
record.getField('repur_contract_id_n').setReadOnly(false);
} else if (value == 'NO') {
record.getField('repur_contract_id').setRequired(false);
record.getField('repur_contract_id_n').setRequired(false);
record.getField('repur_contract_id').setReadOnly(true);
record.getField('repur_contract_id_n').setReadOnly(true);
record.set('repur_contract_id', null);
record.set('repur_contract_id_n', null);
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_REPUR_CONTRACT_ID').style.display = 'none';
}
} }
if (score_ds_id == ds.id) { if (score_ds_id == ds.id) {
if (name == 'bp_birth' && value) { if (name == 'bp_birth' && value) {
......
src/main/webapp/modules/prj/PRJ501N/prj_project_modify_entrance.lview
View file @ 989e2f6a
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
<!-- <link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/> <!-- <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 src="${/request/@context_path}/javascripts/lightbox.js" type="text/javascript"/>-->
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
function open_project_modify_win(record_id, ds_id) { function open_project_modify_win(record_id, ds_id) {
var record = $(ds_id).findById(record_id); var record = $(ds_id).findById(record_id);
var project_status = record.get('project_status'); var project_status = record.get('project_status');
......
src/main/webapp/modules/zjwfl/WFL2110/zj_wfl_workflow_deliver_create.lview
View file @ 989e2f6a
...@@ -131,14 +131,14 @@ ...@@ -131,14 +131,14 @@
<a:field name="workflow_code"/> <a:field name="workflow_code"/>
</a:fields> </a:fields>
</a:dataSet> </a:dataSet>
<a:dataSet id="batch_workflow_ds" autoQuery="true" fetchAll="false" model="zjwfl.zj_wfl_workflow" queryDataSet="batch_workflow_query_ds" queryUrl="${/request/@context_path}/autocrud/zjwfl.zj_wfl_workflow/query?enabled_flag=Y" selectable="true" submitUrl="${/request/@context_path}/autocrud/zjwfl.WFL2110.wfl_workflow_deliver_batch/batch_update"> <a:dataSet id="batch_workflow_ds" autoQuery="true" pageSize="5" fetchAll="false" model="zjwfl.zj_wfl_workflow" queryDataSet="batch_workflow_query_ds" queryUrl="${/request/@context_path}/autocrud/zjwfl.zj_wfl_workflow/query?enabled_flag=Y" selectable="true" submitUrl="${/request/@context_path}/autocrud/zjwfl.WFL2110.wfl_workflow_deliver_batch/batch_update">
<a:events> <a:events>
<a:event name="submitsuccess" handler="onSuccess"/> <a:event name="submitsuccess" handler="onSuccess"/>
</a:events> </a:events>
</a:dataSet> </a:dataSet>
<a:dataSet id="workflow_ds" autoQuery="true" fetchAll="true" model="zjwfl.zj_wfl_workflow_dilever" queryUrl="${/request/@context_path}/autocrud/zjwfl.zj_wfl_workflow/query?ORDER_FIELD=w.workflow_code,t.date_from" selectable="true"/> <a:dataSet id="workflow_ds" autoQuery="true" fetchAll="true" model="zjwfl.zj_wfl_workflow_dilever" queryUrl="${/request/@context_path}/autocrud/zjwfl.zj_wfl_workflow/query?ORDER_FIELD=w.workflow_code,t.date_from" selectable="true"/>
<a:dataSet id="wfl_workflow_deliver_create_query_ds" autoCreate="true" model="zjwfl.WFL2110.zj_wfl_workflow_deliver_query"/> <a:dataSet id="wfl_workflow_deliver_create_query_ds" autoCreate="true" model="zjwfl.WFL2110.zj_wfl_workflow_deliver_query"/>
<a:dataSet id="wfl_workflow_deliver_create_ds" autoQuery="true" fetchAll="false" model="zjwfl.WFL2110.zj_wfl_workflow_deliver_query" queryDataSet="wfl_workflow_deliver_create_query_ds" queryUrl="${/request/@context_path}/autocrud/zjwfl.WFL2110.zj_wfl_workflow_deliver_query/query?ORDER_FIELD=z.workflow_desc,t.date_from" selectable="true" submitUrl="${/request/@context_path}/autocrud/zjwfl.WFL2110.wfl_workflow_deliver_modify/batch_update"> <a:dataSet id="wfl_workflow_deliver_create_ds" autoQuery="true" pageSize="5" fetchAll="false" model="zjwfl.WFL2110.zj_wfl_workflow_deliver_query" queryDataSet="wfl_workflow_deliver_create_query_ds" queryUrl="${/request/@context_path}/autocrud/zjwfl.WFL2110.zj_wfl_workflow_deliver_query/query?ORDER_FIELD=z.workflow_desc,t.date_from" selectable="true" submitUrl="${/request/@context_path}/autocrud/zjwfl.WFL2110.wfl_workflow_deliver_modify/batch_update">
<a:fields> <a:fields>
<a:field name="workflow_id" required="true"/> <a:field name="workflow_id" required="true"/>
<a:field name="workflow_desc" displayField="workflow_desc" options="workflow_ds" required="true" returnField="workflow_id" valueField="workflow_id"/> <a:field name="workflow_desc" displayField="workflow_desc" options="workflow_ds" required="true" returnField="workflow_id" valueField="workflow_id"/>
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
</a:dataSet> </a:dataSet>
</a:dataSets> </a:dataSets>
<a:screenBody> <a:screenBody>
<a:tabPanel id="tabpanel" marginHeight="50" marginWidth="30"> <a:tabPanel id="tabpanel" marginHeight="15" marginWidth="30">
<a:tabs> <a:tabs>
<a:tab prompt="批量授权"> <a:tab prompt="批量授权">
<a:screenBody> <a:screenBody>
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
<a:button click="resetWorkFlow" text="HAP_RESET"/> <a:button click="resetWorkFlow" text="HAP_RESET"/>
<a:button click="batchDeliver" text="转交"/> <a:button click="batchDeliver" text="转交"/>
</a:hBox> </a:hBox>
<a:grid bindTarget="batch_workflow_ds" marginHeight="210" marginWidth="60" navBar="true"> <a:grid bindTarget="batch_workflow_ds" marginHeight="247" marginWidth="100" navBar="true">
<a:columns> <a:columns>
<a:column name="workflow_code" prompt="工作流代码" width="200"/> <a:column name="workflow_code" prompt="工作流代码" width="200"/>
<a:column name="workflow_desc" prompt="工作流描述" width="300"/> <a:column name="workflow_desc" prompt="工作流描述" width="300"/>
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
<a:button click="queryWorkCreateFlow" text="HAP_QUERY"/> <a:button click="queryWorkCreateFlow" text="HAP_QUERY"/>
<a:button click="resetWorkCreateFlow" text="HAP_RESET"/> <a:button click="resetWorkCreateFlow" text="HAP_RESET"/>
</a:hBox> </a:hBox>
<a:grid bindTarget="wfl_workflow_deliver_create_ds" marginHeight="210" marginWidth="60" navBar="true"> <a:grid bindTarget="wfl_workflow_deliver_create_ds" marginHeight="247" marginWidth="100" navBar="true">
<a:toolBar> <a:toolBar>
<a:button type="add"/> <a:button type="add"/>
<a:button type="delete"/> <a:button type="delete"/>
......
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