Skip to content

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

经租收款模块调整

parent b28febf5
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 21 deletions
src/main/webapp/WEB-INF/classes/csh/CSH510N/csh_transaction_list_tmp.lwm
View file @ ccdff885
......@@ -168,7 +168,8 @@
p_status =>${@status},
p_bank_account_num =>${@bank_account_num},
p_guarantor_name_duty =>${@guarantor_name_duty},
p_import_source => 'EXCEL_ADD'
p_import_source => 'EXCEL_ADD',
p_operat_flag =>${@operat_flag}
);
end;
]]></bm:update-sql>
......
src/main/webapp/WEB-INF/classes/csh/CSH511/csh_transaction_receipt_save.lwm
View file @ ccdff885
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: gaoyang
$Date: 2013-5-9 下午06:42:00
$Revision: 1.0
$Purpose:
$Author: gaoyang
$Date: 2013-5-9 下午06:42:00
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
......@@ -76,7 +76,8 @@
p_ref_v05 =>${@ref_v05},
p_status =>${@status},
p_guarantor_name_duty=>${@guarantor_name_duty},
p_import_source =>'HAND_ADD'
p_import_source =>'HAND_ADD',
p_operat_flag =>${@operat_flag}
);
end;
......@@ -148,7 +149,8 @@
p_gsber =>${@gsber},
p_sus_belnr =>${@sus_belnr},
p_bp_virtual_bank_account =>${@bp_virtual_bank_account},
p_guarantor_name_duty=>${@guarantor_name_duty});
p_guarantor_name_duty=>${@guarantor_name_duty},
p_operat_flag =>${@operat_flag});
end;
]]></bm:update-sql>
</bm:operation>
......
src/main/webapp/WEB-INF/classes/csh/CSH514/csh_write_off.lwm
View file @ ccdff885
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: gaoyang
$Date: 2013-6-3 下午12:38:12
$Revision: 1.0
$Purpose:
$Author: gaoyang
$Date: 2013-6-3 下午12:38:12
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="CSH_WRITE_OFF" defaultOrderBy="t1.write_off_id">
<bm:fields>
......@@ -80,6 +80,6 @@
<bm:query-field field="write_off_id" queryOperator="="/>
<bm:query-field field="csh_transaction_id" queryOperator="="/>
<bm:query-field field="reversed_flag" queryOperator="="/>
<bm:query-field name="reverse_detail_flag" queryExpression="((nvl(${@deposit_type},'N')=&apos;Y&apos; and t1.write_off_type=&apos;DEPOSIT_CREDIT&apos;)or(${@reverse_detail_flag}=&apos;Y&apos; and nvl(${@deposit_type},'N') in(&apos;N&apos;,null) and t1.write_off_type in (&apos;RECEIPT_CREDIT&apos;,&apos;RECEIPT_ADVANCE_RECEIPT&apos;,&apos;ADVANCE_RECEIPT_CREDIT&apos;,&apos;DEPOSIT&apos;,&apos;RISK&apos;,&apos;DEPOSIT_CUS&apos;,&apos;RECEIPT_NONBUSINESS&apos;,&apos;RECEIPT_DEPOSIT_POOL&apos;)))"/>
<bm:query-field name="reverse_detail_flag" queryExpression="((nvl(${@deposit_type},'N')=&apos;Y&apos; and t1.write_off_type=&apos;DEPOSIT_CREDIT&apos;)or(${@reverse_detail_flag}=&apos;Y&apos; and nvl(${@deposit_type},'N') in(&apos;N&apos;,null) and t1.write_off_type in (&apos;RECEIPT_CREDIT&apos;,&apos;RECEIPT_ADVANCE_RECEIPT&apos;,&apos;ADVANCE_RECEIPT_CREDIT&apos;,&apos;DEPOSIT&apos;,&apos;RISK&apos;,&apos;DEPOSIT_CUS&apos;,&apos;RECEIPT_NONBUSINESS&apos;,&apos;RECEIPT_DEPOSIT_POOL&apos;,&apos;OPERAT_COMBINED&apos;)))"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_write_off_interface.lwm
View file @ ccdff885
......@@ -124,6 +124,7 @@ end;
p_penalty_flag=>'Y')-nvl(received_amount,0),
due_amount) from con_contract_cashflow where cashflow_id = t1.write_off_cashflow_id)" />
<bm:field name="payment_deduction" expression="(select payment_deduction from con_contract c where c.contract_id = t1.contract_id)" forInsert="false" forUpdate="false"/>
<bm:field name="division" expression="(select division from con_contract c where c.contract_id = t1.contract_id)" forInsert="false" forUpdate="false"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT104/csh_transaction_maintain_query.lwm
View file @ ccdff885
......@@ -121,6 +121,7 @@
<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-filter name="query" expression="(t1.returned_flag &lt;&gt; 'RETURN')"/>
</bm:data-filters>
<bm:query-fields>
<bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>
......
src/main/webapp/modules/csh/CSH510/csh_transaction_hand_receipt_update.lview
View file @ ccdff885
......@@ -217,6 +217,9 @@
record.set('deposit_flag', 'Y');
record.set('transaction_type', 'DEPOSIT');
record.getField('paid_byother_flag_n').setReadOnly(true);
} else if(value == 'OPERAT_DEPOSIT'){
record.set('transaction_type', 'DEPOSIT');
record.set('operat_flag', 'Y');
} else {
record.getField('paid_byother_flag_n').setReadOnly(false);
record.set('transaction_type', 'RECEIPT');
......
src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview
View file @ ccdff885
......@@ -82,6 +82,9 @@
if (record.get('collection_classes') == 'DEPOSIT') {
record.set('transaction_type', 'DEPOSIT');
} else if(record.get('collection_classes')=='OPERAT_DEPOSIT'){
record.set('transaction_type', 'DEPOSIT');
record.set('operat_flag', 'Y');
} else {
record.set('transaction_type', 'RECEIPT');
}
......@@ -389,7 +392,16 @@
]]></script>
<a:dataSets>
<a:dataSet id="yes_no_ds" lookupCode="YES_NO"/>
<a:dataSet id="collection_classes_ds" lookupCode="DS_COLLECTION_CLASSES">
<!--<a:dataSet id="collection_classes_ds" lookupCode="DS_COLLECTION_CLASSES">
</a:dataSet>-->
<a:dataSet id="collection_classes_ds">
<a:datas>
<a:record code_value="DEPOSIT" code_value_name="保证金类"/>
<a:record code_value="NON_DEPOSIT" code_value_name="非保证金类"/>
<a:record code_value="COMBINED" code_value_name="混合类"/>
<a:record code_value="REFUND" code_value_name="日立为优质客户付租金"/>
<a:record code_value="OPERAT_DEPOSIT" code_value_name="经营性租赁保证金类"/>
</a:datas>
</a:dataSet>
<a:dataSet id="paid_byother_flag_ds">
<a:datas>
......
src/main/webapp/modules/csh/CSH511/csh_transaction_receipt.lview
View file @ ccdff885
......@@ -249,6 +249,9 @@
record.set('deposit_flag', 'Y');
record.set('transaction_type', 'DEPOSIT');
record.getField('paid_byother_flag_n').setReadOnly(true);
} else if(value == 'OPERAT_DEPOSIT'){
record.set('transaction_type', 'DEPOSIT');
record.set('operat_flag', 'Y');
} else {
record.getField('paid_byother_flag_n').setReadOnly(false);
record.set('transaction_type', 'RECEIPT');
......
src/main/webapp/modules/csh/CSH531N/csh_write_off_ref_contract.lview
View file @ ccdff885
......@@ -18,6 +18,7 @@
var rec = ds.getCurrentRecord();
rec.set('contract_id', con_rec.get('contract_id'));
rec.set('contract_number', con_rec.get('contract_number'));
rec.set('division', con_rec.get('division'));
rec.set('bp_tenant_name', con_rec.get('bp_name'));
rec.set('write_off_bp_name', con_rec.get('bp_name'));
rec.set('write_off_bp_id', con_rec.get('bp_id_tenant'));
......@@ -52,6 +53,7 @@
var rec = ds.getCurrentRecord();
rec.set('contract_id', con_rec.get('contract_id'));
rec.set('contract_number', con_rec.get('contract_number'));
rec.set('division', con_rec.get('division'));
rec.set('bp_tenant_name', con_rec.get('bp_name'));
rec.set('write_off_bp_name', con_rec.get('bp_name'));
rec.set('write_off_bp_id', con_rec.get('bp_id_tenant'));
......@@ -132,11 +134,16 @@
<a:dataSets>
<a:dataSet id="csh_lov_cf_item_ds" autoQuery="true" model="csh.CSH531N.hls_cashflow_item_v"
queryUrl="${/request/@context_path}/autocrud/csh.CSH531N.hls_cashflow_item_v/query?write_off_cf_item=Y"/>
<a:dataSet id="business_type_ds" lookupCode="BUSINESS_TYPE"/>
<a:dataSet id="csh_query_con_ds" autoCreate="true">
<a:fields>
<a:field name="contract_number"/>
<a:field name="bp_name"/>
<a:field name="bp_id" defaultValue="${/parameter/@bp_id}"/>
<a:field name="search_term_1"/>
<a:field name="business_type_n" options="business_type_ds"
displayField="code_value_name" returnField="business_type" valueField="code_value"/>
<a:field name="business_type"/>
</a:fields>
</a:dataSet>
<a:dataSet id="csh_query_cf_ds" autoCreate="true">
......@@ -148,9 +155,8 @@
</a:fields>
</a:dataSet>
<a:dataSet id="csh_lov_con_contract_ds" selectable="true" autoQuery="true" selectionModel="single"
model="csh.CSH531N.con_contract"
queryUrl="${/request/@context_path}/autocrud/csh.CSH531N.con_contract/query?deposit_flag=${/parameter/@deposit_flag}&amp;transaction_date=${/parameter/@transaction_date}"
queryDataSet="csh_query_con_ds">
model="csh.CSH531N.con_contract" queryDataSet="csh_query_con_ds"
queryUrl="${/request/@context_path}/autocrud/csh.CSH531N.con_contract/query?deposit_flag=${/parameter/@deposit_flag}&amp;transaction_date=${/parameter/@transaction_date}">
<a:events>
<a:event name="indexchange" handler="indexChangeFunction"/>
</a:events>
......@@ -179,21 +185,25 @@
<a:comboBox name="cf_item_desc" bindTarget="csh_query_cf_ds" prompt="CSH531.CF_ITEM"/>
<a:datePicker name="due_date_from" bindTarget="csh_query_cf_ds" prompt="支付日从"/>
<a:datePicker name="due_date_to" bindTarget="csh_query_cf_ds" prompt="支付日到"/>
<a:textField name="search_term_1" bindTarget="csh_query_con_ds" prompt="厂商合同编号"/>
<a:comboBox name="business_type_n" bindTarget="csh_query_con_ds" prompt="业务类型"/>
</a:form>
<a:hBox>
<a:vBox>
<a:grid bindTarget="csh_lov_con_contract_ds" width="450" id="csh_con_contract_ds" marginHeight="120"
<a:grid bindTarget="csh_lov_con_contract_ds" width="668" id="csh_con_contract_ds" marginHeight="160"
navBar="true">
<a:columns>
<a:column name="contract_number" align="center" prompt="HLS.CONTRACT_NUMBER" width="120"/>
<a:column name="contract_number" align="center" prompt="HLS.CONTRACT_NUMBER" width="100"/>
<a:column name="search_term_1" align="center" prompt="厂商合同编号" width="100"/>
<a:column name="business_type_n" align="center" prompt="业务类型" width="80"/>
<a:column name="contract_status_desc" prompt="合同状态" align="center" width="100"/>
<a:column name="bp_name" prompt="客户名" width="180"/>
<a:column name="bp_name" prompt="客户名" width="250"/>
</a:columns>
</a:grid>
</a:vBox>
<a:vBox>
<a:grid bindTarget="csh_write_off_lov_ds" marginHeight="120" id="csh_con_contract_cashflow_ds"
width="800" navBar="true" rowRenderer="changeColor">
<a:grid bindTarget="csh_write_off_lov_ds" marginHeight="160" id="csh_con_contract_cashflow_ds"
width="850" navBar="true" rowRenderer="changeColor">
<a:columns>
<a:column name="times" prompt="HLS.TIMES" align="center" width="60"/>
<a:column name="cf_item_desc" prompt="HLS.CF_ITEM_DESC" align="center" width="80"/>
......
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