Skip to content

L
leaf-hlcm
Commit 9132fde0 authored by 18083's avatar 18083
Browse files
Options

经租付款保证金模块调整

parent 72dcc726
Show whitespace changes
Inline Side-by-side
Showing with 714 additions and 322 deletions
src/main/webapp/WEB-INF/classes/csh/CSH531N/con_contract.lwm
View file @ 9132fde0
......@@ -16,18 +16,25 @@
FROM sys_code_values_v sc
WHERE sc.code = 'CON500_CONTRACT_STATUS'
AND sc.code_value = t1.contract_status) contract_status_desc,
t1.payment_deduction,t1.division
t1.payment_deduction,
t1.division,
t1.business_type,
(Select bt.description
From hls_business_type bt
Where bt.business_type = t1.business_type) As business_type_n,
t1.search_term_1
from con_contract t1
where
t1.contract_status in ('INCEPT','NEW','ETING','REPURING')
and t1.data_class = 'NORMAL'
and t1.document_type<>'PUR_ORDER'
and t1.company_id in ((
select company_id
select company_id
from fnd_companies t
where t.company_id = ${/session/@company_id} or
t.parent_company_id = ${/session/@company_id}
union
select t.parent_company_id company_id
union
select t.parent_company_id company_id
from fnd_companies t
where t.parent_company_id is not null
and (t.company_id = ${/session/@company_id} or t.parent_company_id = ${/session/@company_id})))
......@@ -47,6 +54,8 @@
<bm:field name="dd_bank_account_name"/>
<bm:field name="payment_deduction"/>
<bm:field name="division"/>
<bm:field name="business_type_n"/>
<bm:field name="search_term_1"/>
</bm:fields>
<bm:query-fields>
<bm:query-field field="contract_id" queryOperator="="/>
......@@ -64,15 +73,17 @@
Where h.bp_name in ( select hbm.bp_name from hls_bp_master hbm where hbm.bp_id= ${@bp_id})
and hbr.bp_id = h.bp_id
and h.bp_id= bp.bp_id
and hbr.bp_type in('TENANT','GUTA_NP')
and hbr.bp_type in('TENANT','GUTA_NP','RENTER','GUTA_ORG')
and bp.contract_id=t.contract_id) Or not Exists
(Select 1
From hls_bp_master h, hls_bp_master_role hbr
Where h.bp_id = ${@bp_id}
and hbr.bp_id = h.bp_id
and hbr.bp_type = 'TENANT'
and hbr.bp_type in('TENANT','RENTER')
))"/>
<bm:query-field name="bp_name" queryExpression="t.bp_name like '%' || ${@bp_name} || '%'"/>
<bm:query-field field="search_term_1" queryOperator="like"/>
<bm:query-field field="business_type_n" queryOperator="like"/>
</bm:query-fields>
<bm:data-filters>
<bm:data-filter name="query" Expression=" exists
......
src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_data_confirm.lwm
View file @ 9132fde0
......@@ -16,8 +16,11 @@
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
declare
v_transaction_num varchar2(400);
begin
if ${@flag} = 'SUBMIT' then
csh_transaction_interface_pkg.check_operat_flag(p_transaction_id =>${@transaction_id} );
update CSH_TRANSACTION
set confirmed_flag = 'WF_APPROVING'
where transaction_id = ${@transaction_id};
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT100/con_contract_v.lwm
View file @ 9132fde0
......@@ -234,6 +234,7 @@
<bm:field name="con_search_term_2" databaseType="NUMBER" datatype="java.lang.Double" physicalName="CON_SEARCH_TERM_2" prompt="CON301.CON_CONTRACT_V.CON_SEARCH_TERM_2"/>
<bm:field name="con_content_confirm_status" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CON_CONTENT_CONFIRM_STATUS" prompt="CON301.CON_CONTRACT_V.CON_CONTENT_CONFIRM_STATUS"/>
<bm:field name="bp_id_agent_level1_n"/>
<bm:field name="vender_project_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="VENDER_PROJECT_NUMBER" prompt="采购单编号"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......@@ -249,5 +250,7 @@
</bm:query-fields>
<bm:data-filters>
<bm:data-filter enforceOperations="query" expression="t1.contract_status not in (&apos;TERMINATE&apos;, &apos;CANCEL&apos;, &apos;REPUR&apos;, &apos;ET&apos;, &apos;INCEPT_RETURN&apos;)"/>
<!--<bm:data-filter name="query" expression="CASE WHEN t1.business_type='LEASEOPERAT' THEN t1.bp_id_tenant else to_number(${/parameter/@bp_id_tenant}) end =to_number(${/parameter/@bp_id_tenant})"/>-->
<bm:data-filter enforceOperations="query" expression="t1.document_type not in (&apos;PUR_ORDER&apos;)"/>
</bm:data-filters>
</bm:model>
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT100/con_deposit100_v.lwm
View file @ 9132fde0
......@@ -234,6 +234,7 @@
<bm:field name="con_search_term_2" databaseType="NUMBER" datatype="java.lang.Double" physicalName="CON_SEARCH_TERM_2" prompt="CON301.CON_CONTRACT_V.CON_SEARCH_TERM_2"/>
<bm:field name="con_content_confirm_status" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CON_CONTENT_CONFIRM_STATUS" prompt="CON301.CON_CONTRACT_V.CON_CONTENT_CONFIRM_STATUS"/>
<bm:field name="bp_id_agent_level1_n"/>
<bm:field name="vender_project_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="VENDER_PROJECT_NUMBER" prompt="采购单编号"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......@@ -250,5 +251,6 @@
</bm:query-fields>
<bm:data-filters>
<bm:data-filter enforceOperations="query" expression="t1.contract_status not in (&apos;TERMINATE&apos;, &apos;CANCEL&apos;, &apos;REPUR&apos;, &apos;ET&apos;, &apos;INCEPT_RETURN&apos;)"/>
<bm:data-filter enforceOperations="query" expression="t1.document_type not in (&apos;PUR_ORDER&apos;)"/>
</bm:data-filters>
</bm:model>
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT100/csh_transaction_miantain_query.lwm
View file @ 9132fde0
......@@ -98,6 +98,7 @@
<bm:field name="acc_confirmed_by"/>
<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="deposit_trans_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DEPOSIT_TRANS_TYPE" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......@@ -110,8 +111,9 @@
<bm:data-filter name="query" expression="(t1.transaction_type in (&apos;DEPOSIT&apos;))"/>
<bm:data-filter name="query" expression="(t1.ref_contract_id is null)"/>
<bm:data-filter name="query" expression="(nvl(t1.reversed_flag,'N') = 'N')"/>
<bm:data-filter name="query" expression="(t1.confirmed_flag not in('ACCAUDITING','NEW','CT_REJECTED'))"/>
<bm:data-filter name="query" expression="(t1.confirmed_flag not in('ACCAUDITING','NEW','CT_REJECTED','ACCAUDITED_RECOI'))"/>
<bm:data-filter name="query" expression="((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0)"/>
<bm:data-filter name="query" expression="not exists(select 1 from csh_transaction ct where ct.transaction_id =t1.transaction_id and ct.deposit_trans_type in('vender_deposit'))"/>
</bm:data-filters>
<bm:query-fields>
<bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT102/csh_deposit_transaction_query.lwm
View file @ 9132fde0
......@@ -89,7 +89,7 @@
<bm:data-filter name="query" expression="(t1.transaction_type in (&apos;DEPOSIT&apos;))"/>
<bm:data-filter name="query" expression="(t1.ref_contract_id is null)"/>
<bm:data-filter name="query" expression="(nvl(t1.reversed_flag,'N') = 'N')"/>
<bm:data-filter name="query" expression="(t1.confirmed_flag not in('ACCAUDITING','NEW','CT_REJECTED'))"/>
<bm:data-filter name="query" expression="(t1.confirmed_flag not in('ACCAUDITING','NEW','CT_REJECTED','ACCAUDITED_RECOI'))"/>
<bm:data-filter name="query" expression="(t1.returned_flag &lt;&gt; 'RETURN')"/>
</bm:data-filters>
<bm:query-fields>
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT102/csh_deposit_transfer_execute.lwm
View file @ 9132fde0
......@@ -31,8 +31,8 @@
begin
hlcm_cux_deposit_pkg.create_deposit_transfer_je(
p_hd_contract_id=>${@hd_contract_id},
p_contract_id=>${@source_contract_id},
p_transaction_id=>${@source_transaction_id},
p_contract_id=>${@contract_id},
p_transaction_id=>${@transaction_id},
p_batch_id=>${@batch_id},
p_user_id=>${/session/@user_id}
);
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT102/csh_transaction_query.lwm
View file @ 9132fde0
......@@ -37,6 +37,20 @@
(select cc.contract_name
from con_contract cc
where cc.contract_id = v1.contract_id) contract_name,
(select cc.business_type
from con_contract cc
where cc.contract_id = v1.contract_id) AS business_type,
(select hb.description
from con_contract cc, hls_business_type_v hb
where cc.business_type = hb.business_type
and hb.enabled_flag = 'Y'
and cc.contract_id = v1.contract_id) AS business_type_desc,
(select cc.search_term_1 from con_contract cc where cc.contract_id=v1.contract_id) vender_contract_number,
(select p.project_number
from prj_project_lease_item pi, prj_project p, con_contract_lease_item ci
where pi.source_project_id = p.project_id
and pi.project_lease_item_id = ci.project_lease_item_id
and ci.contract_id=v1.contract_id) vender_project_number,
--to_char(v1.unwrite_off_amount,'FM999,999,999,990.00')unwrite_off_amount,
v1.unwrite_off_amount,
v1.deposit_trans_type,
......@@ -51,6 +65,10 @@
from hls_bp_master t, con_contract ct
where t.bp_id = ct.bp_id_agent_level1
and ct.contract_id = v1.contract_id) bp_name,
(select t.bp_code
from hls_bp_master t, con_contract ct
where t.bp_id = ct.bp_id_agent_level1
and ct.contract_id = v1.contract_id) agent_bp_code,
(select v.code_value_name
from sys_code_values_v v
where v.code = 'DEPOSIT_TRANS_TYPE'
......@@ -87,6 +105,7 @@
where tt.transaction_type = 'DEPOSIT'
and tt.ref_contract_id is not null
and tt.transaction_amount > 0
and tt.deposit_trans_type<>'vender_deposit'
and tt.deposit_trans_type is not null
group by tt.ref_contract_id, tt.deposit_trans_type, tt.bp_id) v1
where v1.unwrite_off_amount > 0
......@@ -96,9 +115,13 @@
tt.transaction_num,
'' contract_number,
'' contract_name,
'' business_type,
'' business_type_desc,
'' vender_contract_number,
'' vender_project_number,
nvl(tt.transaction_amount, 0) - nvl(tt.write_off_amount, 0) -
nvl(tt.returned_amount, 0) unwrite_off_amount,
'' deposit_trans_type,
tt.deposit_trans_type deposit_trans_type,
(select hbm.bp_name
from hls_bp_master hbm
where hbm.bp_id = tt.bp_id) bp_id_telnet_n,
......@@ -112,7 +135,15 @@
where hbm.unit_id = h.unit_id
and hbm.bp_id = tt.bp_id
and h.bp_category = 'AGENT') bp_name,
'' deposit_trans_type_n,
(select h.bp_code
from hls_bp_master hbm, hls_bp_master h
where hbm.unit_id = h.unit_id
and hbm.bp_id = tt.bp_id
and h.bp_category = 'AGENT') agent_bp_code,
(select v.code_value_name
from sys_code_values_v v
where v.code = 'DEPOSIT_TRANS_TYPE'
and v.code_value = tt.deposit_trans_type) deposit_trans_type_n,
nvl((hlcm_cux_deposit_pkg.get_transaction_status_new(p_contract_id => Null,
p_transaction_id => tt.transaction_id,
p_user_id => 1)),
......@@ -143,7 +174,8 @@
and tt.ref_contract_id is null
and tt.reversed_flag='N'
and tt.confirmed_flag not in
('ACCAUDITING', 'NEW', 'CT_REJECTED')
('ACCAUDITING', 'NEW', 'CT_REJECTED','ACCAUDITED_RECOI')
and not exists(select 1 from csh_transaction ct where ct.transaction_id =tt.transaction_id and ct.deposit_trans_type in('vender_deposit'))
and (nvl(tt.transaction_amount, 0) - nvl(tt.write_off_amount, 0) -
nvl(tt.returned_amount, 0) > 0)) v
#WHERE_CLAUSE#
......@@ -159,5 +191,8 @@
<bm:query-field name="bp_id_telnet_n" queryExpression="v.bp_id_telnet_n =${@bp_id_telnet_n}"/>
<bm:query-field name="deposit_trans_type" queryExpression="v.deposit_trans_type =${@deposit_trans_type}"/>
<bm:query-field name="trans_review_status" queryExpression="v.trans_review_status =${@trans_review_status}"/>
<bm:query-field name="vender_contract_number" queryExpression="v.vender_contract_number like &apos;%&apos;||${@vender_contract_number}||&apos;%&apos;"/>
<bm:query-field name="vender_project_number" queryExpression="v.vender_project_number like &apos;%&apos;||${@vender_project_number}||&apos;%&apos;"/>
<bm:query-field name="business_type" queryExpression="v.business_type =${@business_type}"/>
</bm:query-fields>
</bm:model>
\ No newline at end of file
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT102/csh_transaction_review_detail.lwm
View file @ 9132fde0
......@@ -23,13 +23,22 @@
where t.contract_id = ct.contract_id
and t.data_class = 'NORMAL'
and rownum = 1) contract_number,
(select t.search_term_1 from con_contract t
where t.contract_id = ct.contract_id
and t.data_class = 'NORMAL'
and rownum = 1) vender_contract_number,
(select p.project_number
from prj_project_lease_item pi, prj_project p, con_contract_lease_item ci
where pi.source_project_id = p.project_id
and pi.project_lease_item_id = ci.project_lease_item_id
and ci.contract_id=ct.contract_id) vender_project_number,
'' transaction_num,
ct.deposit_trans_type,
(SELECT sc.code_value_name
FROM sys_code_values_v sc
WHERE sc.code = 'DEPOSIT_TRANS_TYPE'
AND sc.code_value = ct.deposit_trans_type) deposit_trans_type_desc,
to_char(ct.je_date, 'yyyy-MM-dd') je_date,
to_char(ct.je_date,'yyyy-MM-dd') je_date,
ct.deposit_amount,
ct.deposit_info,
cc.bp_id_agent_level1,
......@@ -53,6 +62,8 @@
ct.transaction_id,
ct.source_trans_type,
'' contract_number,
'' vender_contract_number,
'' vender_project_number,
cc.transaction_num,
ct.deposit_trans_type,
(SELECT sc.code_value_name
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT102/csh_transaction_review_execute.lwm
View file @ 9132fde0
......@@ -29,6 +29,17 @@
WHERE sc.code = 'TRANS_REVIEW_STATUS'
AND sc.code_value = v.trans_review_status) trans_review_status_n,
cc.contract_number,
cc.business_type,
(select hb.description from
hls_business_type_v hb
where hb.enabled_flag = 'Y'
and hb.business_type=cc.business_type) AS business_type_desc,
cc.search_term_1 vender_contract_number,
(select p.project_number
from prj_project_lease_item pi, prj_project p, con_contract_lease_item ci
where pi.source_project_id = p.project_id
and pi.project_lease_item_id = ci.project_lease_item_id
and ci.contract_id=cc.contract_id) vender_project_number,
'' transaction_num,
cc.contract_name,
cc.bp_id_agent_level1,
......@@ -86,6 +97,10 @@
WHERE sc.code = 'TRANS_REVIEW_STATUS'
AND sc.code_value = v.trans_review_status) trans_review_status_n,
'' contract_number,
'' business_type,
'' business_type_desc,
'' vender_contract_number,
'' vender_project_number,
cc.transaction_num,
'' contract_name,
(select u.bp_id from hls_bp_master u,hls_bp_master hbm where u.unit_id= hbm.unit_id and u.bp_category='AGENT' and hbm.bp_id=cc.bp_id) bp_id_agent_level1,
......@@ -114,6 +129,7 @@
and ct.batch_id is not null
) v
where cc.transaction_id = v.source_transaction_id
) t1
#WHERE_CLAUSE#
......@@ -128,5 +144,9 @@
<bm:query-field name="deposit_trans_type" queryExpression="t1.source_trans_type = ${@deposit_trans_type}"/>
<bm:query-field name="trans_review_status" queryExpression="t1.trans_review_status =${@trans_review_status}"/>
<bm:query-field name="no_status" queryExpression="t1.trans_review_status != ${@no_status}"/>
<bm:query-field name="no_status_op" queryExpression="t1.trans_review_status != ${@no_status_op}"/>
<bm:query-field name="vender_contract_number" queryExpression="t1.vender_contract_number like &apos;%&apos;||${@vender_contract_number}||&apos;%&apos;"/>
<bm:query-field name="vender_project_number" queryExpression="t1.vender_project_number like &apos;%&apos;||${@vender_project_number}||&apos;%&apos;"/>
<bm:query-field name="business_type" queryExpression="t1.business_type like &apos;%&apos;||${@business_type}||&apos;%&apos;"/>
</bm:query-fields>
</bm:model>
\ No newline at end of file
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT102/csh_transaction_review_query.lwm
View file @ 9132fde0
......@@ -27,7 +27,9 @@
<bm:field name="file_num" databaseType="NUMBER" datatype="java.lang.Long" physicalName="FILE_NUM" forInsert="false" forUpdate="false"/>
<bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID"/>
<bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" forInsert="false" forUpdate="false"/>
<bm:field name="con_search_term_1" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="con_search_term_1" forInsert="false" forUpdate="false"/>
<bm:field name="vender_project_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="vender_project_number" forInsert="false" forUpdate="false"/>
<bm:field name="agent_bp_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="AGENT_BP_CODE" forInsert="false" forUpdate="false"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......@@ -50,6 +52,15 @@
where t.contract_id = ct.contract_id
and t.data_class = 'NORMAL'
and rownum = 1) contract_number,
(select t.search_term_1 from con_contract t
where t.contract_id = ct.contract_id
and t.data_class = 'NORMAL'
) con_search_term_1,
(select p.project_number
from prj_project_lease_item pi, prj_project p, con_contract_lease_item ci
where pi.source_project_id = p.project_id
and pi.project_lease_item_id = ci.project_lease_item_id
and ci.contract_id=ct.contract_id) vender_project_number,
ct.transaction_id,
'' transaction_num,
ct.deposit_trans_type,
......@@ -61,6 +72,7 @@
ct.deposit_amount,
ct.deposit_info,
cc.bp_id_agent_level1,
(select hbm.bp_code from hls_bp_master hbm where hbm.bp_id=bp_id_agent_level1) agent_bp_code,
(SELECT t.bp_name
FROM hls_bp_master t
WHERE t.bp_id = cc.bp_id_agent_level1) bp_id_agent_level1_n,
......@@ -85,6 +97,8 @@
ct.source_transaction_id,
ct.contract_id,
'' contract_number,
'' con_search_term_1,
'' vender_project_number,
ct.transaction_id transaction_id,
(select t.transaction_num
from csh_transaction t
......@@ -103,6 +117,11 @@
where hbm.unit_id=h.unit_id
and hbm.bp_id=cc.bp_id
and h.bp_category='AGENT') bp_id_agent_level1,
(select h.bp_code
from hls_bp_master hbm,hls_bp_master h
where hbm.unit_id=h.unit_id
and hbm.bp_id=cc.bp_id
and h.bp_category='AGENT') agent_bp_code,
(SELECT u.bp_name
FROM hls_bp_master u,hls_bp_master hbm
WHERE u.unit_id = hbm.unit_id
......@@ -125,7 +144,7 @@
</bm:operation>
</bm:operations>
<bm:data-filters>
<bm:data-filter enforceOperations="query" expression="(t1.source_contract_id is null or(t1.source_contract_id is not null and t1.source_contract_id=${@source_contract_id})) "/>
<bm:data-filter enforceOperations="query" expression="(t1.source_contract_id is null or(t1.source_contract_id is not null and t1.source_contract_id=${@source_contract_id}))"/>
<bm:data-filter enforceOperations="query" expression="t1.bp_id=${@bp_id} "/>
</bm:data-filters>
</bm:model>
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT104/csh_transaction_maintain_query.lwm
View file @ 9132fde0
......@@ -104,6 +104,10 @@
<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="approve_status" expression=" nvl(( hlcm_cux_deposit_pkg.get_transaction_status_new(p_transaction_id=>t1.transaction_id,p_user_id=>1) ),'正常')" forInsert="false" forUpdate="false"/>
<bm:field name="vender_contract_number" expression="(select cc.search_term_1 from con_contract cc where cc.contract_id = t1.ref_contract_id)"/>
<bm:field name="vender_project_number" expression="(select p.project_number from prj_project_lease_item pi, prj_project p, con_contract_lease_item ci where pi.source_project_id = p.project_id and pi.project_lease_item_id = ci.project_lease_item_id and ci.contract_id=t1.ref_contract_id)"/>
<bm:field name="business_type" expression="(select cc.business_type from con_contract cc where cc.contract_id = t1.ref_contract_id)"/>
<bm:field name="business_type_desc" expression="(select hb.description from con_contract cc,hls_business_type_v hb where cc.business_type= hb.business_type and hb.enabled_flag = 'Y' and cc.contract_id = t1.ref_contract_id)"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......@@ -113,8 +117,9 @@
</bm:primary-key>
<bm:data-filters>
<bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
<bm:data-filter name="query" expression="(t1.ref_contract_id is not null or (t1.ref_contract_id is null and nvl(t1.reversed_flag, 'N') = 'N' and t1.confirmed_flag not in ('ACCAUDITING', 'NEW', 'CT_REJECTED')))"/>
<bm:data-filter name="query" expression="(t1.ref_contract_id is not null or (t1.ref_contract_id is null and nvl(t1.reversed_flag, 'N') = 'N' and t1.confirmed_flag not in ('ACCAUDITING', 'NEW', 'CT_REJECTED','ACCAUDITED_RECOI')))"/>
<bm:data-filter name="query" expression="(t1.transaction_type ='DEPOSIT')"/>
<bm:data-filter name="query" expression="not exists(select 1 from csh_transaction ct where ct.transaction_id =t1.transaction_id and ct.deposit_trans_type in('vender_deposit'))"/>
<bm:data-filter name="query" expression="((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0)"/>
</bm:data-filters>
<bm:query-fields>
......@@ -165,5 +170,8 @@
<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 &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="vender_contract_number" queryExpression="(SELECT cc.search_term_1 FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@vender_contract_number}||&apos;%&apos;"/>
<bm:query-field name="vender_project_number" queryExpression="(select p.project_number from prj_project_lease_item pi, prj_project p, con_contract_lease_item ci where pi.source_project_id = p.project_id and pi.project_lease_item_id = ci.project_lease_item_id and ci.contract_id=t1.ref_contract_id) like &apos;%&apos;||${@vender_project_number}||&apos;%&apos;"/>
<bm:query-field name="business_type" queryExpression="(SELECT cc.business_type FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@business_type}||&apos;%&apos;"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/csh_deposit_cashflow_query.lwm
View file @ 9132fde0
......@@ -18,6 +18,16 @@
(Select cc.contract_number
From con_contract cc
Where cc.contract_id = t.contract_id) contract_number,
(select cc.search_term_1
from con_contract cc
where cc.contract_id = t.contract_id) AS vender_contract_number,
(select p.project_number
from prj_project_lease_item pi,
prj_project p,
con_contract_lease_item ci
where pi.source_project_id = p.project_id
and pi.project_lease_item_id = ci.project_lease_item_id
and ci.contract_id = t.contract_id) AS vender_project_number,
t.creation_date,
t.created_by,
t.last_updated_by,
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/csh_transaction_maintain_query.lwm
View file @ 9132fde0
......@@ -130,7 +130,11 @@
And c.ref_contract_id =
(Select c1.ref_contract_id
From csh_transaction c1
Where c1.transaction_id = t1.transaction_id) ))" forInsert="false" forUpdate="false"/>
Where c1.transaction_id = t1.transaction_id)) )" forInsert="false" forUpdate="false"/>
<bm:field name="vender_contract_number" expression="(select cc.search_term_1 vender_contract_number from con_contract cc where cc.contract_id = t1.ref_contract_id)"/>
<bm:field name="vender_project_number" expression="(select p.project_number vender_project_number from prj_project_lease_item pi, prj_project p, con_contract_lease_item ci where pi.source_project_id = p.project_id and pi.project_lease_item_id = ci.project_lease_item_id and ci.contract_id=t1.ref_contract_id)"/>
<bm:field name="business_type" expression="(select cc.business_type from con_contract cc where cc.contract_id = t1.ref_contract_id)"/>
<bm:field name="business_type_desc" expression="(select hb.description from con_contract cc,hls_business_type_v hb where cc.business_type=hb.business_type and hb.enabled_flag = 'Y'and cc.contract_id = t1.ref_contract_id)"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......@@ -141,7 +145,7 @@
<bm:data-filters>
<bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
<bm:data-filter name="query" expression="((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0)"/>
<bm:data-filter name="query" expression="(t1.ref_contract_id is not null or (t1.ref_contract_id is null and nvl(t1.reversed_flag, 'N') = 'N' and t1.confirmed_flag not in ('ACCAUDITING', 'NEW', 'CT_REJECTED')))"/>
<bm:data-filter name="query" expression="(t1.ref_contract_id is not null or (t1.ref_contract_id is null and nvl(t1.reversed_flag, 'N') = 'N' and t1.confirmed_flag not in ('ACCAUDITING', 'NEW', 'CT_REJECTED','ACCAUDITED_RECOI')))"/>
<bm:data-filter name="query" expression="(t1.transaction_type ='DEPOSIT')"/>
<bm:data-filter name="query" expression="(t1.returned_flag not in ('RETURN'))"/>
</bm:data-filters>
......@@ -191,5 +195,8 @@
<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 &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="vender_contract_number" queryExpression="(SELECT cc.search_term_1 FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like ${@vender_contract_number}"/>
<bm:query-field name="vender_project_number" queryExpression="(SELECT pp.project_number FROM con_contract_lease_item ci,prj_project_lease_item pi,prj_project pp WHERE ci.project_lease_item_id=pi.project_lease_item_id and pi.source_project_id=pp.project_id and ci.contract_id = t1.ref_contract_id ) like ${@vender_project_number}"/>
<bm:query-field name="business_type" queryExpression="(SELECT cc.business_type FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like ${@business_type}"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/csh_transaction_return_query.lwm
View file @ 9132fde0
......@@ -3,7 +3,9 @@
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select *
select
decode(v.vender_project_number,null,null,v.bp_agent_name) vender_name,
v.*
from (select
cr.return_id,
to_char(cr.return_date, 'yyyy-mm-dd') return_date,
......@@ -52,6 +54,21 @@
(select cc.contract_number
from con_contract cc
where cc.contract_id = ct.ref_contract_id) contract_number,
(select cc.search_term_1
from con_contract cc
where cc.contract_id = ct.ref_contract_id) AS vender_contract_number,
ct.deposit_trans_type,
(select v.code_value_name
from sys_code_values_v v
where v.code = 'DEPOSIT_TRANS_TYPE'
and v.code_value = ct.deposit_trans_type) deposit_trans_type_desc,
(select p.project_number
from prj_project_lease_item pi,
prj_project p,
con_contract_lease_item ci
where pi.source_project_id = p.project_id
and pi.project_lease_item_id = ci.project_lease_item_id
and ci.contract_id = ct.ref_contract_id) AS vender_project_number,
(select a.bp_name
from hls_bp_master a
where a.bp_id = ct.bp_id) bp_agent_name,
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/hls_bp_master_bank_account_lov.lwm
View file @ 9132fde0
......@@ -30,7 +30,7 @@
where ha.bp_id(+) = hb.bp_id
and ha.enabled_flag(+) = 'Y'
and hb.enabled_flag = 'Y'
and hb.bp_category in ('TENANT', 'AGENT', 'THIRD_PARTY'))t #WHERE_CLAUSE#
and hb.bp_category in ('TENANT', 'AGENT', 'THIRD_PARTY','VENDER','RENTER','MAN_FACTURER'))t #WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT110/csh_transaction_maintain_query.lwm
View file @ 9132fde0
......@@ -105,6 +105,10 @@
<bm:field name="approval_status" expression="decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'))"/>
<bm:field name="approval_status_desc" expression="(Select v.code_value_name From sys_code_values_v v Where v.code = &apos;WFL_STATUS&apos; And v.code_value = decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW')))"/>
<bm:field name="transaction_wfl_id"/>
<bm:field name="vender_contract_number" expression="(select cc.search_term_1 vender_contract_number from con_contract cc where cc.contract_id = t1.ref_contract_id)"/>
<bm:field name="vender_project_number" expression="(select p.project_number vender_project_number from prj_project_lease_item pi, prj_project p, con_contract_lease_item ci where pi.source_project_id = p.project_id and pi.project_lease_item_id = ci.project_lease_item_id and ci.contract_id=t1.ref_contract_id)"/>
<bm:field name="business_type" expression="(select cc.business_type from con_contract cc where cc.contract_id = t1.ref_contract_id)"/>
<bm:field name="business_type_desc" expression="(select hb.description from con_contract cc,hls_business_type_v hb where cc.business_type= hb.business_type and hb.enabled_flag = 'Y' and cc.contract_id = t1.ref_contract_id)"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......@@ -163,5 +167,8 @@
<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 &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="vender_contract_number" queryExpression="(SELECT cc.search_term_1 FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@vender_contract_number}||&apos;%&apos;"/>
<bm:query-field name="vender_project_number" queryExpression="(select p.project_number from prj_project_lease_item pi, prj_project p, con_contract_lease_item ci where pi.source_project_id = p.project_id and pi.project_lease_item_id = ci.project_lease_item_id and ci.contract_id=t1.ref_contract_id) like &apos;%&apos;||${@vender_project_number}||&apos;%&apos;"/>
<bm:query-field name="business_type" queryExpression="(SELECT cc.business_type FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@business_type}||&apos;%&apos;"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT122/csh_transaction_record_query.lwm
View file @ 9132fde0
......@@ -114,6 +114,10 @@
<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="source_type"/>
<bm:field name="approve_status" expression=" nvl(( hlcm_cux_deposit_pkg.get_transaction_status_new(p_transaction_id=>t1.transaction_id,p_user_id=>1) ),'正常')" forInsert="false" forUpdate="false"/>
<bm:field name="vender_contract_number" expression="(select cc.search_term_1 vender_contract_number from con_contract cc where cc.contract_id = t1.ref_contract_id)"/>
<bm:field name="vender_project_number" expression="(select p.project_number vender_project_number from prj_project_lease_item pi, prj_project p, con_contract_lease_item ci where pi.source_project_id = p.project_id and pi.project_lease_item_id = ci.project_lease_item_id and ci.contract_id=t1.ref_contract_id)"/>
<bm:field name="business_type" expression="(select cc.business_type from con_contract cc where cc.contract_id = t1.ref_contract_id)"/>
<bm:field name="business_type_desc" expression="(select hb.description from con_contract cc,hls_business_type_v hb where cc.business_type= hb.business_type and hb.enabled_flag = 'Y' and cc.contract_id = t1.ref_contract_id)"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......@@ -138,7 +142,7 @@
and t1.collection_classes = 'DEPOSIT'
and t1.paid_byother_flag = 'F') or
(t1.ref_contract_id is null and nvl(t1.reversed_flag, 'N') = 'N' and
t1.confirmed_flag not in ('ACCAUDITING', 'NEW', 'CT_REJECTED')))"/>
t1.confirmed_flag not in ('ACCAUDITING', 'NEW', 'CT_REJECTED','ACCAUDITED_RECOI')))"/>
<bm:data-filter name="query" expression="(t1.returned_flag &lt;&gt; 'RETURN')"/>
<bm:data-filter name="query" expression="(exists (
(select 1
......@@ -203,5 +207,8 @@
<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 &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="vender_contract_number" queryExpression="(SELECT cc.search_term_1 FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@vender_contract_number}||&apos;%&apos;"/>
<bm:query-field name="vender_project_number" queryExpression="(select p.project_number from prj_project_lease_item pi, prj_project p, con_contract_lease_item ci where pi.source_project_id = p.project_id and pi.project_lease_item_id = ci.project_lease_item_id and ci.contract_id=t1.ref_contract_id) like &apos;%&apos;||${@vender_project_number}||&apos;%&apos;"/>
<bm:query-field name="business_type" queryExpression="(SELECT cc.business_type FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||${@business_type}||&apos;%&apos;"/>
</bm:query-fields>
</bm:model>
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT100/csh_transaction_deposit_entry_detail.lview
View file @ 9132fde0
......@@ -14,7 +14,7 @@
<a:model-query fetchAll="true" model="csh.CSH511.fnd_financial_option" rootPath="fnd_financial_option_path"/>
<a:model-query fetchAll="true" model="csh.CSH511.csh_transaction_default_exchange_rate_type"
rootPath="default_exchange_rate_type_path"/>
<a:model-query model="cus_deposit/CUS_DEPOSIT100.csh_transaction_deposit_entry_write_off" rootPath="deposit_extend_month" />
<a:model-query model="cus_deposit/CUS_DEPOSIT100.csh_transaction_deposit_entry_write_off" rootPath="deposit_extend_month"/>
</a:init-procedure>
<a:view>
<a:link id="hn2050_upload_win_link" url="${/request/@context_path}/uploadFile.lview"/>
......@@ -52,7 +52,7 @@
var deposit_record;
deposit_record = deposit_records[i];
deposit_record.set('_status', 'insert');
//收款日期跨月则取系统当前时间，否则取收款日期 18083 2023/6/27
//收款日期跨月则取系统当前时间，否则取收款日期 18083 2023/7/6
if ('${/model/deposit_extend_month/record/@check_flag}' =='Y'){
deposit_record.set('write_off_date',new Date().format('yyyy/mm/dd'));
}else{
......@@ -171,7 +171,7 @@
}
function on_csh_trx_deposit_write_off_add(ds, record, index) {
var head_record = $('csh_transaction_receipt_head_ds').getAt(0);
if(head_record.data.bp_category=='TENANT'&&head_record.data.collection_classes=='DEPOSIT'){
if((head_record.data.bp_category=='TENANT'||head_record.data.bp_category=='RENTER')&&(head_record.data.collection_classes=='DEPOSIT'||head_record.data.collection_classes=='OPERAT_DEPOSIT')){
$('deposit_ertry_detail_result_ds').fields.contract_number.pro.lovservice='cus_deposit.CUS_DEPOSIT100.con_deposit100_v?bp_id_tenant=${/parameter/@bp_id}';
}
record.set('je_date', head_record.get('transaction_date'));
......@@ -183,7 +183,12 @@
]]></script>
<a:dataSets>
<a:dataSet id="PAID_BYOTHER_FLAG_DS" lookupCode="PAID_BYOTHER_FLAG"/>
<a:dataSet id="DEPOSIT_TRANS_TYPE_DS" lookupCode="DEPOSIT_TRANS_TYPE"/>
<a:dataSet id="DEPOSIT_TRANS_TYPE_DS_NEW" autoCreate="true">
<a:datas>
<a:record code_value="down_payment_deposit" code_value_name="首付款保证金"/>
<a:record code_value="rent_deposit" code_value_name="租金保证金"/>
</a:datas>
</a:dataSet>
<a:dataSet id="exchangerate_type_ds">
<a:datas dataSource="/model/exchangerate_type_path"/>
</a:dataSet>
......@@ -301,9 +306,11 @@
<a:map from="bp_id_agent_level1_n" to="bp_id_agent_level1_n"/>
<a:map from="bp_name" to="bp_name"/>
<a:map from="bp_id_tenant" to="bp_id_tenant"/>
<a:map from="con_search_term_1" to="con_search_term_1"/>
<a:map from="vender_project_number" to="vender_project_number"/>
</a:mapping>
</a:field>
<a:field name="deposit_trans_type_desc" options="DEPOSIT_TRANS_TYPE_DS"
<a:field name="deposit_trans_type_desc" options="DEPOSIT_TRANS_TYPE_DS_NEW"
returnField="deposit_trans_type" displayField="code_value_name" valueField="code_value" required="true"/>
</a:fields>
<a:events>
......@@ -353,7 +360,7 @@
</a:box>
</a:fieldSet>
<a:grid id="deposit_ertry_detail_result_grid" bindTarget="deposit_ertry_detail_result_ds" height="200"
navBar="false" width="800">
navBar="false" width="1050">
<a:toolBar>
<a:button type="add"/>
<a:button type="delete"/>
......@@ -361,6 +368,8 @@
<a:columns>
<a:column name="contract_number" align="center" editor="contract_number_lov" prompt="合同编号"
width="135"/>
<a:column name="con_search_term_1" align="center" prompt="厂商合同编号" width="122"/>
<a:column name="vender_project_number" align="center" prompt="采购单编号" width="122"/>
<a:column name="bp_id_agent_level1_n" align="center" prompt="代理店" width="160"/>
<a:column name="bp_name" align="center" prompt="承租人" width="122"/>
<a:column name="deposit_trans_type_desc" align="center" editor="deposit_type_box" prompt="保证金类型"
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT102/csh_transaction_deposit_transfer.lsc
View file @ 9132fde0
......@@ -3,8 +3,8 @@
<a:init-procedure>
<batch-apply sourcePath="/parameter/details">
<a:model-update model="cus_deposit.CUS_DEPOSIT102.csh_deposit_transfer_execute" trace="true"/>
</batch-apply>
<a:model-execute model="cus_deposit.CUS_DEPOSIT102.csh_deposit_transfer_execute" trace="true"/>
</batch-apply>
</a:init-procedure>
<a:service-output output="/parameter"/>
</a:service>
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT102/csh_transaction_deposit_transfer_detail.lview
View file @ 9132fde0
......@@ -7,7 +7,6 @@
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
<a:init-procedure>
<!--<a:model-query model="basic.hls_sys_time_default_value" rootPath="sys_time_default_value_path"/>-->
</a:init-procedure>
<a:view>
<a:link id="csh_review_transfer_link_id"
......@@ -44,7 +43,23 @@
}
var trans_record;
trans_record = deposit_records[i];
//划出代理店与划入代理店一致且划出代理店为经租代理店时，提交经租营业本部长审批
var check_flag= false;
if(head_record.get('agent_bp_code')!='D00010027'){
check_flag= true
}else if(head_record.get('agent_bp_code')=='D00010027'){
for (var j = 0; j < deposit_records.length; j++) {
if(head_record.get('agent_bp_code') !=deposit_records[j].get('agent_bp_code')){
var check_flag= true;
break;
}
}
}
if(check_flag){
trans_record.set('review_type', 'REVIEWING');
}else{
trans_record.set('review_type', 'REVIEWING_OP');
}
saveData.push(trans_record.data);
}
param['details'] = saveData;
......@@ -70,7 +85,7 @@
return;
}
$('deposit_transfer_detail_result_ds').submit();
//不同代理店之间的划转添加弱校验 18083 2023/8/4
//不同代理店之间的划转添加弱校验 18083 2023/9/14
var flag= true;
for (var j = 0; j < deposit_records.length; j++) {
if(head_record.get('bp_id_agent_level1') !=deposit_records[j].get('bp_id_agent_level1')){
......@@ -128,6 +143,7 @@
Leaf.Masker.unmask($('${/parameter/@winId}').wrap);
}, null, null);
}
}
}
......@@ -191,7 +207,7 @@
// }
}
}
//划转至现金事务时，保证金类型为只读 18083 2023/8/16
//划转至现金事务时，保证金类型为只读 18083 2023/9/14
if(name=='transaction_num'){
if(!Ext.isEmpty(record.get('transaction_num'))){
record.getField('deposit_trans_type').setReadOnly(true);
......@@ -222,15 +238,6 @@
record.getField('transaction_num').setRequired(true);
}
}
//已入账的合同保证金需要划转回未入账的保证金申请时，经济业务发生日为操作当天，不可修改
//if(!Ext.isEmpty(head_record.get('contract_number'))){
//if(name=='ref_contract_id'){
// if(Ext.isEmpty(record.get('ref_contract_id'))){
//record.set('je_date', '${/model/sys_time_default_value_path/record/@now_time}');
//record.getField('je_date').setReadOnly(true);
//}
//}
//}
}
......@@ -264,14 +271,6 @@
// head_record.set('current_apply_amount', total_deposit_amount);
// }
// function on_csh_trx_deposit_write_off_add(ds, record, index) {
//未入账合同进行划转时，经济业务发生日为操作当天，不可修改
//var head_record = $('deposit_transfer_maintain_result_ds').getSelected()[0];
//if(Ext.isEmpty(head_record.get('contract_number'))){
// record.set('je_date', '${/model/sys_time_default_value_path/record/@now_time}');
//record.getField('je_date').setReadOnly(true);
//}
//}
function attach_win(contemp_id){
var url = $('contemp_upload_link').getUrl();
var win = new Leaf.Window({
......@@ -328,6 +327,7 @@
deposit_records[i].getField('transaction_num').setReadOnly(false);
deposit_records[i].getField('transaction_num').setRequired(true);
}
}
head_record.set('current_apply_amount', total_deposit_amount);
}
......@@ -339,7 +339,12 @@
]]></script>
<a:dataSets>
<a:dataSet id="CUS102_DEPOSIT_TRANS_TYPE_DS" lookupCode="DEPOSIT_TRANS_TYPE"/>
<a:dataSet id="CUS102_DEPOSIT_TRANS_TYPE_DS" autoCreate="true">
<a:datas>
<a:record code_value="down_payment_deposit" code_value_name="首付款保证金"/>
<a:record code_value="rent_deposit" code_value_name="租金保证金"/>
</a:datas>
</a:dataSet>
<a:dataSet id="deposit_transfer_detail_result_ds" autoQuery="true" loadData="true" selectable="true" model="cus_deposit.CUS_DEPOSIT102.csh_transaction_review_query" queryUrl="${/request/@context_path}/autocrud/cus_deposit.CUS_DEPOSIT102.csh_transaction_review_query/query?source_contract_id=${/parameter/@contract_id}&amp;bp_id=${/parameter/@bp_id_agent_level1}&amp;source_transaction_id=${/parameter/@transaction_id}">
<a:fields>
<a:field name="je_date" required="true" prompt="经济业务发生日"/>
......@@ -362,8 +367,9 @@
<a:field name="source_transaction_id" defaultValue="${/parameter/@transaction_id}"/>
<a:field name="bp_id" defaultValue="${/parameter/@bp_id_agent_level1}"/>
<a:field name="source_trans_type" defaultValue="${/parameter/@deposit_trans_type}"/>
<a:field name="contract_number" lovGridHeight="300" lovHeight="430"
lovService="cus_deposit.CUS_DEPOSIT100.con_contract_v"
lovService="cus_deposit.CUS_DEPOSIT100.con_contract_v?bp_id_tenant=${/parameter/@bp_id_agent_level1}"
lovWidth="500" required="true" prompt="合同编号">
<a:mapping>
<a:map from="contract_number" to="contract_number"/>
......@@ -372,6 +378,8 @@
<a:map from="bp_id_agent_level1_n" to="bp_id_agent_level1_n"/>
<a:map from="bp_name" to="bp_name"/>
<a:map from="bp_id_tenant" to="bp_id_tenant"/>
<a:map from="con_search_term_1" to="con_search_term_1"/>
<a:map from="vender_project_number" to="vender_project_number"/>
</a:mapping>
</a:field>
<a:field name="transaction_num" lovGridHeight="300" lovHeight="430"
......@@ -396,7 +404,6 @@
<a:event name="remove" handler="on_csh_trx_deposit_write_off_remove"/>
<a:event name="load" handler="on_csh_trx_deposit_write_off_load"/>
<a:event name="submitsuccess" handler="on_csh_trx_deposit_write_off_remove_success"/>
<!--<a:event name="add" handler="on_csh_trx_deposit_write_off_add"/>-->
<!-- <a:event name="afterremove" handler="csh_trx_deposit_write_off_afterremove"/>-->
</a:events>
</a:dataSet>
......@@ -428,7 +435,7 @@
</a:fieldSet>
<a:grid id="deposit_transfer_detail_result_grid" bindTarget="deposit_transfer_detail_result_ds"
marginHeight="170"
navBar="false" width="1200">
navBar="false" width="1500">
<a:toolBar>
<a:button type="add"/>
<a:button type="delete"/>
......@@ -437,6 +444,8 @@
<a:columns>
<a:column name="contract_number" align="center" editor="contract_number_lov" prompt="合同编号"
width="135"/>
<a:column name="con_search_term_1" align="center" prompt="厂商合同编号" width="160"/>
<a:column name="vender_project_number" align="center" prompt="采购单编号" width="160"/>
<a:column name="transaction_num" align="center" editor="transaction_num_lov" prompt="现金事务编号"
width="135"/>
<a:column name="bp_id_agent_level1_n" align="center" prompt="代理店" width="160"/>
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT102/csh_transfer_review_detail.lview
View file @ 9132fde0
......@@ -20,18 +20,19 @@
url="${/request/@context_path}/modules/cus_deposit/CUS_DEPOSIT102/csh_deposit_trans_history_print.lsc"/>
<a:link id="check_csh_sbo_link_id" model="cus_deposit.CUS_DEPOSIT102.csh_transaction_review_execute"
modelaction="execute"/>
<a:link id="create_archive_link_id" model="cus_deposit.CUS_DEPOSIT102.csh_deposit_transfer_batch"
modelaction="insert"/>
<script type="text/javascript"><![CDATA[
function cshdeposit102N_receipt_exit() {
$('${/parameter/@winId}').close();
}
function cshdeposit102N_transfer_submit() {
debugger;
if ($('deposit_transfer_detail_result_ds').validate()) {
var deposit_records = $('deposit_transfer_detail_result_ds').getAll();
var role_code = '${/parameter/@role_code}';
//债权初审
if(role_code == '0003' || role_code == '0005'){
if(role_code == '0003' || role_code == '0005'||role_code == '0036'||role_code == '0039'){
var recordParam = {};
var recordData = [];
for (var i = 0; i < deposit_records.length; i++) {
......@@ -70,7 +71,7 @@
}else if(role_code == '0002'||role_code == '0001'){
var param = {};
var saveData = [];
//新增划转源单据为未入账收款，传现金事务id 18083 2023/8/11
//新增划转源单据为未入账收款，传现金事务id 18083 2023/9/14
param['source_transaction_id'] = '${/parameter/@transaction_id}';
param['source_contract_id'] = '${/parameter/@contract_id}';
param['je_date'] = deposit_records[0].get('je_date');
......@@ -99,6 +100,14 @@
recordParam['details'] = recordData;
recordParam['review_act'] = 'APPROVE';
recordParam['batch_id'] = deposit_records[0].get('batch_id');
Leaf.request({
url: $('create_archive_link_id').getUrl(),
para: {
review_type: 'REVIEWED',
batch_id : deposit_records[0].get('batch_id')
},
success: function () {
Leaf.request({
url: $('csh_review_deposit_transfer_link_id').getUrl(),
para: recordParam,
......@@ -127,6 +136,16 @@
},
scope: this
});
},
failure: function () {
Leaf.Masker.unmask($('${/parameter/@winId}').wrap);
},
error: function () {
Leaf.Masker.unmask($('${/parameter/@winId}').wrap);
},
scope: this
});
}, function () {
Leaf.Masker.unmask($('${/parameter/@winId}').wrap);
......@@ -151,6 +170,13 @@
recordParam['batch_id'] = deposit_records[0].get('batch_id');
Leaf.showConfirm('${l:PROMPT}', '确定拒绝保证金划转？', function () {
Leaf.Masker.mask($('${/parameter/@winId}').wrap, "正在执行。。。");
Leaf.request({
url: $('create_archive_link_id').getUrl(),
para: {
review_type: 'REJECTED',
batch_id : deposit_records[0].get('batch_id')
},
success: function () {
Leaf.request({
url: $('csh_review_deposit_transfer_link_id').getUrl(),
para: recordParam,
......@@ -170,6 +196,15 @@
},
scope: this
});
},
failure: function () {
Leaf.Masker.unmask($('${/parameter/@winId}').wrap);
},
error: function () {
Leaf.Masker.unmask($('${/parameter/@winId}').wrap);
},
scope: this
});
}, function () {
Leaf.Masker.unmask($('${/parameter/@winId}').wrap);
}, null, null);
......@@ -211,7 +246,7 @@
}
head_record.set('current_apply_amount', total_deposit_amount);
var trans_review_status = head_record.get("trans_review_status");
if (trans_review_status && trans_review_status != 'REVIEWING'&&trans_review_status != 'REVIEWING1'){
if (trans_review_status && trans_review_status != 'REVIEWING'&&trans_review_status != 'REVIEWING1'&&trans_review_status != 'REVIEWING_OP'){
$('cshdeposit102N_transfer_submit_id').disable();
$('cshdeposit102N_transfer_refuse_id').disable();
}
......@@ -275,7 +310,7 @@
readOnly="true"/>
<a:textField name="bp_name" prompt="代理店" bindTarget="deposit_review_maintain_result_ds"
readOnly="true"/>
<a:textField name="bp_id_telnet_n" prompt="承租人" bindTarget="deposit_review_maintain_result_ds"
<a:textField name="bp_id_telnet_n" prompt="承租人/收款商业伙伴" bindTarget="deposit_review_maintain_result_ds"
readOnly="true"/>
<a:textField name="deposit_trans_type_n" prompt="保证金类型"
bindTarget="deposit_review_maintain_result_ds" readOnly="true"/>
......@@ -290,12 +325,14 @@
</a:fieldSet>
<a:grid id="deposit_review_detail_result_grid" bindTarget="deposit_transfer_detail_result_ds"
marginHeight="170"
navBar="false" width="1200">
navBar="false" width="1500">
<a:columns>
<a:column name="contract_number" align="center" prompt="合同编号" width="135"/>
<a:column name="vender_contract_number" prompt="厂商合同编号" align="center"/>
<a:column name="vender_project_number" prompt="采购单编号" align="center"/>
<a:column name="transaction_num" align="center" prompt="现金事务编号" width="135"/>
<a:column name="bp_id_agent_level1_n" align="center" prompt="代理店" width="160"/>
<a:column name="bp_name" align="center" prompt="承租人" width="122"/>
<a:column name="bp_name" align="center" prompt="承租人/收款商业伙伴" width="122"/>
<a:column name="deposit_trans_type_desc" align="center" prompt="保证金类型" width="124"/>
<a:column name="deposit_amount" align="right" prompt="划转金额" width="115"/>
<a:column name="je_date" align="center" prompt="经济业务发生日" renderer="Leaf.formatDate" width="103"/>
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT102/cus_deposit_transfer_maintain.lview
View file @ 9132fde0
......@@ -57,6 +57,7 @@
contract_id:record.get('contract_id'),
transaction_id:record.get('transaction_id'),
bp_id_agent_level1:record.get('bp_id'),
agent_bp_code:record.get('agent_bp_code'),
deposit_trans_type:record.get('deposit_trans_type'),
deposit_trans_type_desc:record.get('deposit_trans_type_n')
},
......@@ -82,6 +83,13 @@
<a:dataSets>
<a:dataSet id="DEPOSIT_TRANS_TYPE_DS" lookupCode="DEPOSIT_TRANS_TYPE"/>
<a:dataSet id="TRANS_REVIEW_STATUS_DS" lookupCode="TRANS_REVIEW_STATUS"/>
<a:dataSet id="hls_business_type_ds" fetchAll="true">
<a:datas>
<a:record code_value="LEASE" code_value_name="直租"/>
<a:record code_value="LEASEBACK" code_value_name="回租"/>
<a:record code_value="LEASEOPERAT" code_value_name="经营租赁"/>
</a:datas>
</a:dataSet>
<a:dataSet id="csh_deposit_transfer_maintain_query_ds" autoCreate="true">
<a:fields>
<a:field name="deposit_trans_type"/>
......@@ -92,6 +100,11 @@
returnField="deposit_trans_type" displayField="code_value_name" valueField="code_value"/>
<a:field name="trans_review_status_desc" options="TRANS_REVIEW_STATUS_DS"
returnField="trans_review_status" displayField="code_value_name" valueField="code_value"/>
<a:field name="vender_contract_number"/>
<a:field name="vender_project_number"/>
<a:field name="business_type"/>
<a:field name="business_type_desc" options="hls_business_type_ds"
returnField="business_type" displayField="code_value_name" valueField="code_value"/>
</a:fields>
</a:dataSet>
<a:dataSet id="deposit_transfer_maintain_result_ds" autoPageSize="true" autoQuery="true" model="cus_deposit.CUS_DEPOSIT102.csh_transaction_query" queryDataSet="csh_deposit_transfer_maintain_query_ds" selectable="true" selectionModel="single">
......@@ -111,6 +124,9 @@
<a:textField name="bp_id_telnet_n" prompt="承租人/收款商业伙伴" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
<a:comboBox name="deposit_trans_type_desc" prompt="保证金类型" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
<a:comboBox name="trans_review_status_desc" prompt="复核状态" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
<a:textField name="vender_contract_number" prompt="厂商合同编号" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
<a:textField name="vender_project_number" prompt="采购单编号" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
<a:comboBox name="business_type_desc" prompt="业务类型" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
</a:form>
<a:fieldSet labelWidth="150" style="margin-left:20px">
<a:grid id="csh_transaction_receipt_maintain_grid_ds" bindTarget="deposit_transfer_maintain_result_ds" marginHeight="165" marginWidth="100" navBar="true" >
......@@ -118,6 +134,9 @@
<a:column name="bp_name" prompt="代理店" align="center" width="200"/>
<a:column name="bp_id_telnet_n" prompt="承租人/收款商业伙伴" align="center" width="180"/>
<a:column name="contract_number" prompt="合同编号" align="center"/>
<a:column name="vender_contract_number" prompt="厂商合同编号" align="center"/>
<a:column name="vender_project_number" prompt="采购单编号" align="center"/>
<a:column name="business_type_desc" prompt="业务类型" align="center"/>
<a:column name="contract_name" prompt="合同名称" align="center" width="150"/>
<a:column name="deposit_trans_type_n" prompt="保证金类型" width="110" align="center"/>
<a:column name="unwrite_off_amount" prompt="剩余可用金额" width="110" renderer="Leaf.formatMoney" align="right" />
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT102/cus_transfer_review_maintain.lview
View file @ 9132fde0
......@@ -63,15 +63,23 @@
var role_code = '${/model/role_code/record/@role_code}';
var query_redord = $('csh_deposit_review_maintain_query_ds').getCurrentRecord();
if (role_code == '0002') {
//CFO只能看到复审中(CFO)的数据，排除掉营业本部长经租和融租的数据
$('deposit_review_maintain_result_ds').setQueryParameter('no_status','REVIEWING');
//$('deposit_review_maintain_result_ds').setQueryParameter('trans_review_status','REVIEWING1');
$('deposit_review_maintain_result_ds').setQueryParameter('no_status_op','REVIEWING_OP');
query_redord.set('trans_review_status','REVIEWING1');
query_redord.set('trans_review_status_desc','复审中');
} else if (role_code == '0003' || role_code == '0005') {
//营业本部长融租只能看到融租的数据，排除CFO和经租本部长的数据
$('deposit_review_maintain_result_ds').setQueryParameter('no_status','REVIEWING1');
//$('deposit_review_maintain_result_ds').setQueryParameter('trans_review_status','REVIEWING');
$('deposit_review_maintain_result_ds').setQueryParameter('no_status_op','REVIEWING_OP');
query_redord.set('trans_review_status','REVIEWING');
query_redord.set('trans_review_status_desc','初审中');
query_redord.set('trans_review_status_desc','初审中(营业本部长-融租)');
}else if(role_code == '0036'){
//经租营业本部长排除非经租营业本部长及CFO
$('deposit_review_maintain_result_ds').setQueryParameter('no_status','REVIEWING1');
$('deposit_review_maintain_result_ds').setQueryParameter('no_status_op','REVIEWING');
query_redord.set('trans_review_status','REVIEWING_OP');
query_redord.set('trans_review_status_desc','初审中(营业本部长-经租)');
}
$('deposit_review_maintain_result_ds').query();
});
......@@ -80,6 +88,13 @@
<a:dataSets>
<a:dataSet id="DEPOSIT_TRANS_TYPE_DS" lookupCode="DEPOSIT_TRANS_TYPE"/>
<a:dataSet id="TRANS_REVIEW_STATUS_DS" lookupCode="TRANS_REVIEW_STATUS"/>
<a:dataSet id="hls_business_type_ds" fetchAll="true">
<a:datas>
<a:record code_value="LEASE" code_value_name="直租"/>
<a:record code_value="LEASEBACK" code_value_name="回租"/>
<a:record code_value="LEASEOPERAT" code_value_name="经营租赁"/>
</a:datas>
</a:dataSet>
<a:dataSet id="csh_deposit_review_maintain_query_ds" autoCreate="true">
<a:fields>
<a:field name="deposit_trans_type"/>
......@@ -91,6 +106,11 @@
<a:field name="trans_review_status_desc" options="TRANS_REVIEW_STATUS_DS"
returnField="trans_review_status" displayField="code_value_name" valueField="code_value"/>
<a:field name="trans_review_status"/>
<a:field name="vender_contract_number"/>
<a:field name="vender_project_number"/>
<a:field name="business_type"/>
<a:field name="business_type_desc" options="hls_business_type_ds"
returnField="business_type" displayField="code_value_name" valueField="code_value"/>
</a:fields>
</a:dataSet>
<a:dataSet id="deposit_review_maintain_result_ds" autoPageSize="true" autoQuery="false" model="cus_deposit.CUS_DEPOSIT102.csh_transaction_review_execute" queryDataSet="csh_deposit_review_maintain_query_ds" selectable="true" selectionModel="single">
......@@ -110,6 +130,9 @@
<a:textField name="bp_id_telnet_n" prompt="承租人/收款商业伙伴" bindTarget="csh_deposit_review_maintain_query_ds"/>
<a:comboBox name="deposit_trans_type_desc" prompt="保证金类型" bindTarget="csh_deposit_review_maintain_query_ds"/>
<a:comboBox name="trans_review_status_desc" prompt="复核状态" bindTarget="csh_deposit_review_maintain_query_ds"/>
<a:textField name="vender_contract_number" prompt="厂商合同编号" bindTarget="csh_deposit_review_maintain_query_ds"/>
<a:textField name="vender_project_number" prompt="采购单编号" bindTarget="csh_deposit_review_maintain_query_ds"/>
<a:comboBox name="business_type_desc" prompt="业务类型" bindTarget="csh_deposit_review_maintain_query_ds"/>
</a:form>
<a:fieldSet labelWidth="150" style="margin-left:20px">
<a:grid id="csh_transaction_receipt_maintain_grid_ds" bindTarget="deposit_review_maintain_result_ds" marginHeight="165" marginWidth="100" navBar="true" >
......@@ -118,6 +141,9 @@
<a:column name="bp_id_telnet_n" prompt="承租人/收款商业伙伴" align="center" width="120"/>
<a:column name="contract_number" prompt="合同编号" align="center"/>
<a:column name="contract_name" prompt="合同名称" align="center" width="200"/>
<a:column name="vender_contract_number" prompt="厂商合同编号" align="center"/>
<a:column name="vender_project_number" prompt="采购单编号" align="center"/>
<a:column name="business_type_desc" prompt="业务类型" align="center"/>
<a:column name="deposit_trans_type_n" prompt="保证金类型" width="110" align="center"/>
<a:column name="unwrite_off_amount" prompt="剩余可用金额" width="110" renderer="Leaf.formatMoney" align="right" />
<a:column name="approve_status" prompt="合同状态" width="80" align="center"/>
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT104/cus_deposit_write_off_maintain.lview
View file @ 9132fde0
......@@ -283,10 +283,22 @@
<a:dataSet id="posted_flag_ds" lookupCode="CSH510_POST_SELECT"/>
<a:dataSet id="DEPOSIT_TRANS_TYPE_DS" lookupCode="DEPOSIT_TRANS_TYPE"/>
<a:dataSet id="hls_business_type_ds" fetchAll="true">
<a:datas>
<a:record code_value="LEASE" code_value_name="直租"/>
<a:record code_value="LEASEBACK" code_value_name="回租"/>
<a:record code_value="LEASEOPERAT" code_value_name="经营租赁"/>
</a:datas>
</a:dataSet>
<a:dataSet id="csh_transaction_receipt_maintain_query_ds" autoCreate="true">
<a:fields>
<a:field name="deposit_trans_type"/>
<a:field name="contract_number"/>
<a:field name="vender_contract_number"/>
<a:field name="vender_project_number"/>
<a:field name="business_type"/>
<a:field name="business_type_desc" options="hls_business_type_ds"
returnField="business_type" displayField="code_value_name" valueField="code_value"/>
<a:field name="bp_name_n"/>
<a:field name="bp_id_telnet_n"/>
<a:field name="deposit_trans_type_desc" options="DEPOSIT_TRANS_TYPE_DS"
......@@ -507,6 +519,11 @@
bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:comboBox name="deposit_trans_type_desc" prompt="保证金类型"
bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:textField name="vender_contract_number" prompt="厂商合同编号"
bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:textField name="vender_project_number" prompt="采购单编号"
bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:comboBox name="business_type_desc" prompt="业务类型" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
</a:fieldSet>
</a:hBox>
</a:form>
......@@ -524,6 +541,9 @@
<a:column name="bp_name" prompt="代理店/厂商" align="center"/>
<a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
<a:column name="contract_number" prompt="合同编号" align="center"/>
<a:column name="vender_contract_number" prompt="厂商合同编号" align="center"/>
<a:column name="vender_project_number" prompt="采购单编号" align="center"/>
<a:column name="business_type_desc" prompt="业务类型" align="center"/>
<a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT"
width="100" renderer="Leaf.formatMoney"/>
<a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT106/csh_transaction_return.lview
View file @ 9132fde0
......@@ -252,9 +252,11 @@
prompt="承租人名称" readOnly="true" width="170"/>
<!-- <a:datePicker name="lasted_account_date" bindTarget="csh_transaction_deposit_return_maintain_ds"-->
<!-- prompt="最后一次入账时间" width="185" readOnly="true"/>-->
<a:numberField name="left_amount" allowDecimals="true" allowFormat="true"
<!--<a:numberField name="left_amount" allowDecimals="true" allowFormat="true"
allowNegative="false" bindTarget="csh_transaction_deposit_return_maintain_ds"
prompt="合同剩余保证金" readOnly="true" width="185"/>
prompt="合同剩余保证金" readOnly="true" width="185"/>-->
<a:textField name="vender_name" bindTarget="csh_transaction_deposit_return_maintain_ds"
prompt="厂商" readOnly="true" width="170"/>
</a:box>
<a:box column="4" labelWidth="115">
<a:textField name="bp_bank_account_name" bindTarget="csh_transaction_deposit_return_maintain_ds"
......@@ -267,11 +269,28 @@
prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME" width="170"/>-->
<a:textField name="bp_bank_branch_name" bindTarget="csh_transaction_deposit_return_maintain_ds"
prompt="对方分行名称" width="185"/>
<!--<a:numberField name="remain_amount" allowDecimals="true" allowFormat="true"
bindTarget="csh_transaction_deposit_return_maintain_ds"
prompt="本次退款后剩余金额" readOnly="true" width="180"/>
<a:label name="attach" bindTarget="csh_transaction_deposit_return_maintain_ds" renderer="attach_renderer" prompt="附件" width="170"/>-->
</a:box>
<a:box column="4" labelWidth="115">
<a:textField name="deposit_trans_type_desc" bindTarget="csh_transaction_deposit_return_maintain_ds"
prompt="保证金类型" readOnly="true" width="180"/>
<a:numberField name="left_amount" allowDecimals="true" allowFormat="true"
allowNegative="false" bindTarget="csh_transaction_deposit_return_maintain_ds"
prompt="合同剩余保证金" readOnly="true" width="185"/>
<a:numberField name="remain_amount" allowDecimals="true" allowFormat="true"
bindTarget="csh_transaction_deposit_return_maintain_ds"
prompt="本次退款后剩余金额" readOnly="true" width="180"/>
<a:label name="attach" bindTarget="csh_transaction_deposit_return_maintain_ds" renderer="attach_renderer" prompt="附件" width="170"/>
</a:box>
<a:box column="4" labelWidth="115">
<a:textField name="vender_contract_number" bindTarget="csh_transaction_deposit_return_maintain_ds"
prompt="厂商合同编号" readOnly="true" width="180"/>
<a:textField name="vender_project_number" bindTarget="csh_transaction_deposit_return_maintain_ds"
prompt="采购单编号" readOnly="true" width="180"/>
</a:box>
<a:box column="1">
<a:textArea name="description" bindTarget="csh_transaction_deposit_return_maintain_ds" prompt="备注"
width="849"/>
......@@ -289,6 +308,8 @@
<a:column name="transaction_num" prompt="目标单据编号" width="150" align="center"/>
<a:column name="transaction_deposit_amount" prompt="分配金额" align="right" renderer="Leaf.formatMoney"/>
<a:column name="contract_number" prompt="合同编号" width="150" align="center"/>
<a:column name="vender_contract_number" prompt="厂商合同编号" width="150" align="center"/>
<a:column name="vender_project_number" prompt="采购单编号" width="150" align="center"/>
</a:columns>
</a:grid>
......@@ -372,14 +393,24 @@
scope: this
});
//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('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_n', record.get('bp_id_telnet_n'));
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('vender_contract_number', record.get('vender_contract_number'));
deposit_record.set('vender_project_number', record.get('vender_project_number'));
//存在采购单则带出厂商字段
if (record.get('vender_project_number')){
deposit_record.set('vender_name', record.get('bp_name'));
}
//未入账现金事务隐藏合同编号、承租人编码、承租人名称、合同剩余保证金 18083 2023/7/28
if(Ext.isEmpty(record.get('ref_contract_id'))){
document.getElementById('contract_number_ds').style.display='none';
}
}
]]></script>
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT106/csh_transaction_return_wfl.lview
View file @ 9132fde0
......@@ -119,12 +119,14 @@
if(Ext.isEmpty(record.get('contract_number'))){
document.getElementById('contract_number_ds').style.display='none';
}
}else{
record.set('finance_flag','Y');
record.getField('finance_flag').setReadOnly(true);
if(Ext.isEmpty(record.get('contract_number'))){
document.getElementById('contract_number_ds').style.display='none';
}
}
}
......@@ -176,9 +178,11 @@
prompt="承租人名称" readOnly="true" width="185"/>
<!--<a:datePicker name="lasted_account_date" bindTarget="csh_transaction_return_wfl_ds"-->
<!--prompt="最后一次入账时间" width="185" readOnly="true"/>-->
<a:numberField name="left_amount" allowDecimals="true" allowFormat="true"
<!--<a:numberField name="left_amount" allowDecimals="true" allowFormat="true"
allowNegative="false" bindTarget="csh_transaction_return_wfl_ds"
prompt="合同剩余保证金" readOnly="true" width="170"/>
prompt="合同剩余保证金" readOnly="true" width="170"/>-->
<a:textField name="vender_name" bindTarget="csh_transaction_return_wfl_ds"
prompt="厂商" readOnly="true" width="170"/>
</a:box>
<a:box column="4" labelWidth="115">
<a:textField name="bp_bank_account_name" bindTarget="csh_transaction_return_wfl_ds"
......@@ -189,12 +193,30 @@
prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME" readOnly="true" width="185"/>
<a:textField name="bp_bank_branch_name" bindTarget="csh_transaction_return_wfl_ds"
prompt="对方分行名称" readOnly="true" width="170"/>
<a:label name="attach" bindTarget="csh_transaction_return_wfl_ds" renderer="attach_renderer" prompt="附件" width="170"/>
<a:checkBox name="finance_flag" bindTarget="csh_transaction_return_wfl_ds" prompt="财务部已经对银行信息进行过审核" readOnly="true"/>
<!--<a:label name="attach" bindTarget="csh_transaction_return_wfl_ds" renderer="attach_renderer" prompt="附件" width="170"/>
<a:checkBox name="finance_flag" bindTarget="csh_transaction_return_wfl_ds" prompt="财务部已经对银行信息进行过审核" readOnly="true"/>-->
<!--<a:numberField name="return_amount" allowDecimals="true" allowFormat="true" allowNegative="false" bindTarget="csh_transaction_return_wfl_ds" prompt="CSH515.CSH_REFUND_AMOUNT" readOnly="true"/>-->
<!--<a:textField name="bank_slip_num" bindTarget="csh_transaction_return_wfl_ds" prompt="银行流水号" readOnly="true"/>-->
<!--<a:comboBox name="currency_name" bindTarget="csh_transaction_return_wfl_ds" prompt="HLS.CURRENCY" readOnly="true"/>-->
<!--<a:comboBox name="exchange_rate_type_display" bindTarget="csh_transaction_return_wfl_ds" prompt="HLS.EXCHANGE_RATE_TYPE_DESC" readOnly="true"/>-->
</a:box>
<a:box column="4" labelWidth="115">
<a:textField name="deposit_trans_type_desc" bindTarget="csh_transaction_return_wfl_ds"
prompt="保证金类型" readOnly="true" width="180"/>
<a:numberField name="left_amount" allowDecimals="true" allowFormat="true"
allowNegative="false" bindTarget="csh_transaction_return_wfl_ds"
prompt="合同剩余保证金" readOnly="true" width="185"/>
<!--<a:numberField name="remain_amount" allowDecimals="true" allowFormat="true"
bindTarget="csh_transaction_return_wfl_ds"
prompt="本次退款后剩余金额" readOnly="true" width="180"/>-->
<a:label name="attach" bindTarget="csh_transaction_return_wfl_ds" renderer="attach_renderer" prompt="附件" width="170"/>
</a:box>
<a:box column="4" labelWidth="115">
<a:textField name="vender_contract_number" bindTarget="csh_transaction_return_wfl_ds"
prompt="厂商合同编号" readOnly="true" width="180"/>
<a:textField name="vender_project_number" bindTarget="csh_transaction_return_wfl_ds"
prompt="采购单编号" readOnly="true" width="180"/>
<a:checkBox name="finance_flag" bindTarget="csh_transaction_return_wfl_ds" prompt="财务部已经对银行信息进行过审核" readOnly="true"/>
</a:box>
<!--<a:box column="4">-->
<!--<a:lov name="bank_account_code" bindTarget="csh_transaction_return_wfl_ds" prompt="CSH515.CSH_REFUND_ACCOUNT" readOnly="true"/>-->
......@@ -224,6 +246,8 @@
<a:column name="transaction_num" prompt="目标单据编号" width="150" align="center"/>
<a:column name="transaction_deposit_amount" prompt="分配金额" align="right" renderer="Leaf.formatMoney"/>
<a:column name="contract_number" prompt="合同编号" width="150" align="center"/>
<a:column name="vender_contract_number" prompt="厂商合同编号" width="150" align="center"/>
<a:column name="vender_project_number" prompt="采购单编号" width="150" align="center"/>
</a:columns>
</a:grid>
<!--业务冲销-->
......@@ -252,7 +276,6 @@
if ('${/model/default_value_path/record/@status}' != 'APPROVED') {
document.getElementById("csh106_return_print_id").style.display = "none";
}
}
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT106/cus_deposit_write_off_return_maintain.lview
View file @ 9132fde0
......@@ -170,15 +170,26 @@
]]></script>
<a:dataSets>
<a:dataSet id="DEPOSIT_TRANS_TYPE_DS" lookupCode="DEPOSIT_TRANS_TYPE"/>
<a:dataSet id="hls_business_type_ds" fetchAll="true">
<a:datas>
<a:record code_value="LEASE" code_value_name="直租"/>
<a:record code_value="LEASEBACK" code_value_name="回租"/>
<a:record code_value="LEASEOPERAT" code_value_name="经营租赁"/>
</a:datas>
</a:dataSet>
<a:dataSet id="csh_transaction_receipt_maintain_query_ds" autoCreate="true">
<a:fields>
<a:field name="deposit_trans_type"/>
<a:field name="contract_number"/>
<a:field name="vender_contract_number"/>
<a:field name="vender_project_number"/>
<a:field name="business_type"/>
<a:field name="bp_name_n"/>
<a:field name="bp_id_telnet_n"/>
<a:field name="deposit_trans_type_desc" options="DEPOSIT_TRANS_TYPE_DS"
returnField="deposit_trans_type" displayField="code_value_name" valueField="code_value"/>
<a:field name="business_type_desc" options="hls_business_type_ds"
returnField="business_type" displayField="code_value_name" valueField="code_value"/>
<a:field name="bank_account_name" autoComplete="true" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850" title="CSH511.BANK_ACCOUNT_CODE">
<a:mapping>
<a:map from="precision" to="precision"/>
......@@ -337,6 +348,9 @@
<a:textField name="bp_name_n" prompt="代理店" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:textField name="bp_id_telnet_n" prompt="承租人" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:comboBox name="deposit_trans_type_desc" prompt="保证金类型" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:textField name="vender_contract_number" prompt="厂商合同编号" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:textField name="vender_project_number" prompt="采购单编号" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:comboBox name="business_type_desc" prompt="业务类型" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
</a:fieldSet>
</a:hBox>
</a:form>
......@@ -350,6 +364,9 @@
<a:column name="bp_name" prompt="代理店/厂商" align="center"/>
<a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
<a:column name="contract_number" prompt="合同编号" align="center"/>
<a:column name="vender_contract_number" prompt="厂商合同编号" align="center"/>
<a:column name="vender_project_number" prompt="采购单编号" align="center"/>
<a:column name="business_type_desc" prompt="业务类型" align="center"/>
<a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
<a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
<a:column name="unwrite_off_amount" prompt="剩余可退金额" align="right" renderer="Leaf.formatMoney"/>
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT110/cus_deposit_write_off_reserve_maintain.lview
View file @ 9132fde0
......@@ -60,7 +60,7 @@
function seedetail_transaction_num(value, record, name) {
if (record.get('transaction_id')) {
url = $('csh_write_off_reverse_detail_link').getUrl() + '?transaction_id=' + record.get('transaction_id') + '&transaction_type=' + record.get('transaction_type') + '&ref_n01=' + record.get('ref_n01') + '&receipt_type=' + record.get('receipt_type') + '&bp_category=' + record.get('bp_category') + '&paid_byother_flag=' + record.get('paid_byother_flag')+ '&ref_contract_id=' + record.get('ref_contract_id')+ '&deposit_type=Y';
url = $('csh_write_off_reverse_detail_link').getUrl() + '?transaction_id=' + record.get('transaction_id') + '&transaction_type=' + record.get('transaction_type') + '&ref_n01=' + record.get('ref_n01') + '&receipt_type=' + record.get('receipt_type') + '&bp_category=' + record.get('bp_category') + '&paid_byother_flag=' + record.get('paid_byother_flag')+ '&deposit_type=Y';
if(record.get('approval_status') == 'APPROVING' || record.get('approval_status') == 'APPROVED'){
url = $('csh_write_off_reverse_wfl_link').getUrl() + '?transaction_wfl_id=' + record.get('transaction_wfl_id')+ '&button_flag=YES';
}
......@@ -124,6 +124,14 @@
<a:dataSet id="transaction_type_ds">
<a:datas dataSource="/model/transaction_type"/>
</a:dataSet>
<a:dataSet id="hls_business_type_ds" fetchAll="true">
<a:datas>
<a:record code_value="LEASE" code_value_name="直租"/>
<a:record code_value="LEASEBACK" code_value_name="回租"/>
<a:record code_value="LEASEOPERAT" code_value_name="经营租赁"/>
</a:datas>
</a:dataSet>
<a:dataSet id="DEPOSIT_TRANS_TYPE_DS" lookupCode="DEPOSIT_TRANS_TYPE"/>
<a:dataSet id="posted_flag_ds" lookupCode="CSH510_POST_SELECT"/>
<a:dataSet id="ds_collection_classes_ds" lookupCode="DS_COLLECTION_CLASSES"/>
<a:dataSet id="csh510_collection_classes_batch_update_ds">
......@@ -136,6 +144,11 @@
<a:fields>
<a:field name="deposit_trans_type"/>
<a:field name="contract_number"/>
<a:field name="vender_contract_number"/>
<a:field name="vender_project_number"/>
<a:field name="business_type"/>
<a:field name="business_type_desc" options="hls_business_type_ds"
returnField="business_type" displayField="code_value_name" valueField="code_value"/>
<a:field name="bp_name_n"/>
<a:field name="bp_id_telnet_n"/>
<a:field name="deposit_trans_type_desc" options="DEPOSIT_TRANS_TYPE_DS"
......@@ -305,6 +318,9 @@
<a:textField name="bp_name_n" prompt="代理店" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:textField name="bp_id_telnet_n" prompt="承租人" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:comboBox name="deposit_trans_type_desc" prompt="保证金类型" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:textField name="vender_contract_number" prompt="厂商合同编号" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:textField name="vender_project_number" prompt="采购单编号" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:comboBox name="business_type_desc" prompt="业务类型" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
</a:fieldSet>
</a:hBox>
</a:form>
......@@ -321,6 +337,9 @@
<a:column name="bp_name" prompt="代理店/厂商" align="center"/>
<a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
<a:column name="contract_number" prompt="合同编号" align="center"/>
<a:column name="vender_contract_number" prompt="厂商合同编号" align="center"/>
<a:column name="vender_project_number" prompt="采购单编号" align="center"/>
<a:column name="business_type_desc" prompt="业务类型" align="center"/>
<a:column name="deposit_trans_type_desc" prompt="保证金类型" align="center"/>
<a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center" forExport="false"/>
<a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT">
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT122/cus_deposit_record_maintain.lview
View file @ 9132fde0
......@@ -166,6 +166,13 @@
</a:dataSet>
<a:dataSet id="transaction_type_ds">
<a:datas dataSource="/model/transaction_type"/>
</a:dataSet>
<a:dataSet id="hls_business_type_ds" fetchAll="true">
<a:datas>
<a:record code_value="LEASE" code_value_name="直租"/>
<a:record code_value="LEASEBACK" code_value_name="回租"/>
<a:record code_value="LEASEOPERAT" code_value_name="经营租赁"/>
</a:datas>
</a:dataSet>
<a:dataSet id="posted_flag_ds" lookupCode="CSH510_POST_SELECT"/>
<a:dataSet id="ds_collection_classes_ds" lookupCode="DS_COLLECTION_CLASSES"/>
......@@ -187,6 +194,11 @@
<a:fields>
<a:field name="deposit_trans_type"/>
<a:field name="contract_number"/>
<a:field name="vender_contract_number"/>
<a:field name="vender_project_number"/>
<a:field name="business_type"/>
<a:field name="business_type_desc" options="hls_business_type_ds"
returnField="business_type" displayField="code_value_name" valueField="code_value"/>
<a:field name="bp_name_n"/>
<a:field name="bp_id_telnet_n"/>
<a:field name="query_amount_flag" defaultValue="3"/>
......@@ -431,6 +443,11 @@
<a:datePicker name="write_off_date_to"
bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="核销日期到"/>
<a:textField name="vender_contract_number" prompt="厂商合同编号"
bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:textField name="vender_project_number" prompt="采购单编号"
bindTarget="csh_transaction_receipt_maintain_query_ds"/>
<a:comboBox name="business_type_desc" prompt="业务类型" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
</a:fieldSet>
</a:hBox>
</a:form>
......@@ -444,6 +461,9 @@
<a:column name="bp_name" prompt="代理店/厂商" align="center"/>
<a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
<a:column name="contract_number" prompt="合同编号" align="center"/>
<a:column name="vender_contract_number" prompt="厂商合同编号" align="center"/>
<a:column name="vender_project_number" prompt="采购单编号" align="center"/>
<a:column name="business_type_desc" prompt="业务类型" align="center"/>
<a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT"
width="100" renderer="Leaf.formatMoney"/>
<a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
......
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