Skip to content

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

经租收款模块调整

parent 9132fde0
Show whitespace changes
Inline Side-by-side
Showing with 161 additions and 25 deletions
src/main/webapp/WEB-INF/classes/csh/CSH510N/csh_transaction_list_tmp.lwm
View file @ 9762c958
...@@ -168,7 +168,8 @@ ...@@ -168,7 +168,8 @@
p_status =>${@status}, p_status =>${@status},
p_bank_account_num =>${@bank_account_num}, p_bank_account_num =>${@bank_account_num},
p_guarantor_name_duty =>${@guarantor_name_duty}, p_guarantor_name_duty =>${@guarantor_name_duty},
p_import_source => 'EXCEL_ADD' p_import_source => 'EXCEL_ADD',
p_operat_flag =>${@operat_flag}
); );
end; end;
]]></bm:update-sql> ]]></bm:update-sql>
......
src/main/webapp/WEB-INF/classes/csh/CSH511/csh_transaction_receipt_save.lwm
View file @ 9762c958
...@@ -76,7 +76,8 @@ ...@@ -76,7 +76,8 @@
p_ref_v05 =>${@ref_v05}, p_ref_v05 =>${@ref_v05},
p_status =>${@status}, p_status =>${@status},
p_guarantor_name_duty=>${@guarantor_name_duty}, p_guarantor_name_duty=>${@guarantor_name_duty},
p_import_source =>'HAND_ADD' p_import_source =>'HAND_ADD',
p_operat_flag =>${@operat_flag}
); );
end; end;
...@@ -148,7 +149,8 @@ ...@@ -148,7 +149,8 @@
p_gsber =>${@gsber}, p_gsber =>${@gsber},
p_sus_belnr =>${@sus_belnr}, p_sus_belnr =>${@sus_belnr},
p_bp_virtual_bank_account =>${@bp_virtual_bank_account}, 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; end;
]]></bm:update-sql> ]]></bm:update-sql>
</bm:operation> </bm:operation>
......
src/main/webapp/WEB-INF/classes/csh/CSH514/csh_write_off.lwm
View file @ 9762c958
...@@ -80,6 +80,6 @@ ...@@ -80,6 +80,6 @@
<bm:query-field field="write_off_id" queryOperator="="/> <bm:query-field field="write_off_id" queryOperator="="/>
<bm:query-field field="csh_transaction_id" queryOperator="="/> <bm:query-field field="csh_transaction_id" queryOperator="="/>
<bm:query-field field="reversed_flag" 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:query-fields>
</bm:model> </bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_write_off_interface.lwm
View file @ 9762c958
...@@ -124,6 +124,7 @@ end; ...@@ -124,6 +124,7 @@ end;
p_penalty_flag=>'Y')-nvl(received_amount,0), p_penalty_flag=>'Y')-nvl(received_amount,0),
due_amount) from con_contract_cashflow where cashflow_id = t1.write_off_cashflow_id)" /> 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="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:fields>
<bm:features> <bm:features>
<f:standard-who/> <f:standard-who/>
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT104/csh_transaction_maintain_query.lwm
View file @ 9762c958
...@@ -121,6 +121,7 @@ ...@@ -121,6 +121,7 @@
<bm:data-filter name="query" expression="(t1.transaction_type ='DEPOSIT')"/> <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="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="((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:data-filters>
<bm:query-fields> <bm:query-fields>
<bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/> <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 @ 9762c958
...@@ -217,6 +217,9 @@ ...@@ -217,6 +217,9 @@
record.set('deposit_flag', 'Y'); record.set('deposit_flag', 'Y');
record.set('transaction_type', 'DEPOSIT'); record.set('transaction_type', 'DEPOSIT');
record.getField('paid_byother_flag_n').setReadOnly(true); record.getField('paid_byother_flag_n').setReadOnly(true);
} else if(value == 'OPERAT_DEPOSIT'){
record.set('transaction_type', 'DEPOSIT');
record.set('operat_flag', 'Y');
} else { } else {
record.getField('paid_byother_flag_n').setReadOnly(false); record.getField('paid_byother_flag_n').setReadOnly(false);
record.set('transaction_type', 'RECEIPT'); record.set('transaction_type', 'RECEIPT');
......
src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview
View file @ 9762c958
...@@ -82,6 +82,9 @@ ...@@ -82,6 +82,9 @@
if (record.get('collection_classes') == 'DEPOSIT') { if (record.get('collection_classes') == 'DEPOSIT') {
record.set('transaction_type', '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 { } else {
record.set('transaction_type', 'RECEIPT'); record.set('transaction_type', 'RECEIPT');
} }
...@@ -389,7 +392,16 @@ ...@@ -389,7 +392,16 @@
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
<a:dataSet id="yes_no_ds" lookupCode="YES_NO"/> <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>
<a:dataSet id="paid_byother_flag_ds"> <a:dataSet id="paid_byother_flag_ds">
<a:datas> <a:datas>
......
src/main/webapp/modules/csh/CSH511/csh_transaction_receipt.lview
View file @ 9762c958
...@@ -248,6 +248,9 @@ ...@@ -248,6 +248,9 @@
record.set('deposit_flag', 'Y'); record.set('deposit_flag', 'Y');
record.set('transaction_type', 'DEPOSIT'); record.set('transaction_type', 'DEPOSIT');
record.getField('paid_byother_flag_n').setReadOnly(true); record.getField('paid_byother_flag_n').setReadOnly(true);
} else if(value == 'OPERAT_DEPOSIT'){
record.set('transaction_type', 'DEPOSIT');
record.set('operat_flag', 'Y');
} else { } else {
record.getField('paid_byother_flag_n').setReadOnly(false); record.getField('paid_byother_flag_n').setReadOnly(false);
record.set('transaction_type', 'RECEIPT'); record.set('transaction_type', 'RECEIPT');
......
src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview
View file @ 9762c958
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
if ('${/parameter/@collection_classes}' == 'COMBINED' && '${/parameter/@transaction_type}' !== 'DEPOSIT') { if ('${/parameter/@collection_classes}' == 'COMBINED' && '${/parameter/@transaction_type}' !== 'DEPOSIT') {
document.getElementById('write_off_deposit').style.display = 'block'; document.getElementById('write_off_deposit').style.display = 'block';
document.getElementById('write_off_operat').style.display = 'block';
} }
if ('${/parameter/@advanceDisplayFlag}' == 'Y') { if ('${/parameter/@advanceDisplayFlag}' == 'Y') {
document.getElementById('write_off_advance').style.display = 'block'; document.getElementById('write_off_advance').style.display = 'block';
...@@ -40,6 +41,8 @@ ...@@ -40,6 +41,8 @@
$('csh_grid_delete_bt').setVisible(false); $('csh_grid_delete_bt').setVisible(false);
$('csh_grid_deposit_add_bt').setVisible(false); $('csh_grid_deposit_add_bt').setVisible(false);
$('csh_grid_deposit_delete_bt').setVisible(false); $('csh_grid_deposit_delete_bt').setVisible(false);
$('csh_grid_operat_add_bt').setVisible(false);
$('csh_grid_operat_delete_bt').setVisible(false);
$('csh_write_off_grid').hideColumn('left_amount'); $('csh_write_off_grid').hideColumn('left_amount');
$('csh_write_off_grid').hideColumn('left_principal'); $('csh_write_off_grid').hideColumn('left_principal');
$('csh_write_off_grid').hideColumn('left_interest'); $('csh_write_off_grid').hideColumn('left_interest');
...@@ -104,6 +107,9 @@ ...@@ -104,6 +107,9 @@
} }
if (write_off_type == 'RECEIPT_DEPOSIT_POOL') { if (write_off_type == 'RECEIPT_DEPOSIT_POOL') {
return 'csh_transaction_deposit_grid_dp'; return 'csh_transaction_deposit_grid_dp';
}
if (write_off_type == 'OPERAT_COMBINED') {
return 'csh_transaction_operat_grid_dp';
} }
} }
if (name == 'agent_id_desc') { if (name == 'agent_id_desc') {
...@@ -312,13 +318,14 @@ ...@@ -312,13 +318,14 @@
var interfaceRs = $('csh_write_off_interface_ds').getAll(); var interfaceRs = $('csh_write_off_interface_ds').getAll();
var depositRs = $('csh_transaction_deposit_ds').getAll(); var depositRs = $('csh_transaction_deposit_ds').getAll();
var advancedRs = $('csh_transaction_advanced_ds').getAll(); var advancedRs = $('csh_transaction_advanced_ds').getAll();
var operatRs = $('csh_transaction_operat_ds').getAll();
//IE浏览器不支持ES6语法 //IE浏览器不支持ES6语法
// var allRs = [...interfaceRs, ...depositRs, ...advancedRs]; // var allRs = [...interfaceRs, ...depositRs, ...advancedRs];
var allRs = []; var allRs = [];
allRs = interfaceRs.concat(depositRs).concat(advancedRs); allRs = interfaceRs.concat(depositRs).concat(advancedRs).concat(operatRs);
for (var i = 0; i < allRs.length; i++) { for (var i = 0; i < allRs.length; i++) {
if (allRs[i].dirty) { if (allRs[i].dirty) {
...@@ -388,6 +395,13 @@ ...@@ -388,6 +395,13 @@
if (!isNaN(t)) { if (!isNaN(t)) {
sum = plus(sum,t); sum = plus(sum,t);
} }
}
var operat_recs = $('csh_transaction_operat_ds').getAll();
for (var i = 0; i < operat_recs.length; i++) {
var t = parseFloat(operat_recs[i].get('write_off_amount'));
if (!isNaN(t)) {
sum = plus(sum, t);
}
} }
var advanced_recs = $('csh_transaction_advanced_ds').getAll(); var advanced_recs = $('csh_transaction_advanced_ds').getAll();
for (var i = 0; i < advanced_recs.length; i++) { for (var i = 0; i < advanced_recs.length; i++) {
...@@ -544,6 +558,7 @@ ...@@ -544,6 +558,7 @@
success: function(res) { success: function(res) {
Leaf.Masker.unmask(Ext.getBody()); Leaf.Masker.unmask(Ext.getBody());
$('csh_transaction_deposit_ds').submit(); $('csh_transaction_deposit_ds').submit();
$('csh_transaction_operat_ds').submit();
$('csh_transaction_advanced_ds').submit(); $('csh_transaction_advanced_ds').submit();
csh531_submitsuccess(); csh531_submitsuccess();
}, },
...@@ -578,6 +593,13 @@ ...@@ -578,6 +593,13 @@
if (!isNaN(t)) { if (!isNaN(t)) {
sum = plus(sum,t); sum = plus(sum,t);
} }
}
var operat_recs = $('csh_transaction_operat_ds').getAll();
for (var i = 0; i < operat_recs.length; i++) {
var t = parseFloat(operat_recs[i].get('write_off_amount'));
if (!isNaN(t)) {
sum = plus(sum, t);
}
} }
var advanced_recs = $('csh_transaction_advanced_ds').getAll(); var advanced_recs = $('csh_transaction_advanced_ds').getAll();
for (var i = 0; i < advanced_recs.length; i++) { for (var i = 0; i < advanced_recs.length; i++) {
...@@ -623,6 +645,14 @@ ...@@ -623,6 +645,14 @@
return 'csh_transaction_deposit_grid_nf'; return 'csh_transaction_deposit_grid_nf';
} }
} }
}
function csh_operat_edit_function(record, name) {
if ('${/parameter/@readOnly}' == 'Y') {
} else {
if (name == 'write_off_amount') {
return 'csh_transaction_operat_grid_nf';
}
}
} }
function csh_advance_edit_function(record, name) { function csh_advance_edit_function(record, name) {
if ('${/parameter/@readOnly}' == 'Y') { if ('${/parameter/@readOnly}' == 'Y') {
...@@ -631,9 +661,11 @@ ...@@ -631,9 +661,11 @@
if (name == 'write_off_amount') { if (name == 'write_off_amount') {
var r = $('csh_transaction_receipt_write_off_detail_ds').getCurrentRecord(); var r = $('csh_transaction_receipt_write_off_detail_ds').getCurrentRecord();
var deposit_ds = $('csh_transaction_deposit_ds'); var deposit_ds = $('csh_transaction_deposit_ds');
var operat_ds = $('csh_transaction_operat_ds');
var advanced_ds = $('csh_transaction_advanced_ds'); var advanced_ds = $('csh_transaction_advanced_ds');
var current_deposit_r = deposit_ds.getAt(0); var current_deposit_r = deposit_ds.getAt(0);
var current_operat_r = operat_ds.getAt(0);
var current_advance_r = advanced_ds.getAt(0); var current_advance_r = advanced_ds.getAt(0);
if (r.get('exists_deposit_flag') == 'Y' && current_deposit_r) { if (r.get('exists_deposit_flag') == 'Y' && current_deposit_r) {
return; return;
...@@ -658,13 +690,14 @@ ...@@ -658,13 +690,14 @@
var interfaceRs = $('csh_write_off_interface_ds').getAll(); var interfaceRs = $('csh_write_off_interface_ds').getAll();
var depositRs = $('csh_transaction_deposit_ds').getAll(); var depositRs = $('csh_transaction_deposit_ds').getAll();
var advancedRs = $('csh_transaction_advanced_ds').getAll(); var advancedRs = $('csh_transaction_advanced_ds').getAll();
var operatRs = $('csh_transaction_operat_ds').getAll();
//IE浏览器不支持ES6语法 //IE浏览器不支持ES6语法
// var allRs = [...interfaceRs, ...depositRs, ...advancedRs]; // var allRs = [...interfaceRs, ...depositRs, ...advancedRs];
var allRs = []; var allRs = [];
allRs = interfaceRs.concat(depositRs).concat(advancedRs); allRs = interfaceRs.concat(depositRs).concat(advancedRs).concat(operatRs);
var sum = 0; var sum = 0;
...@@ -682,15 +715,23 @@ ...@@ -682,15 +715,23 @@
} }
// 以旧换新与三方协议合同的首付款不可进行电汇核销 // 以旧换新与三方协议合同的首付款不可进行电汇核销
var cf_item_2_count=0; var cf_item_2_count=0;
var write_date_count =0;
for (var i = 0; i < interfaceRs.length; i++) { for (var i = 0; i < interfaceRs.length; i++) {
if ((interfaceRs[i].get('payment_deduction')=='TRADE_IN'||interfaceRs[i].get('payment_deduction')=='TRI_AGREEMENT'||interfaceRs[i].get('payment_deduction')=='DOWN_PAYMENT_DEDUCTION')&&interfaceRs[i].get('write_off_cf_item')=='2') { if ((interfaceRs[i].get('payment_deduction')=='TRADE_IN'||interfaceRs[i].get('payment_deduction')=='TRI_AGREEMENT'||interfaceRs[i].get('payment_deduction')=='DOWN_PAYMENT_DEDUCTION')&&interfaceRs[i].get('write_off_cf_item')=='2') {
cf_item_2_count = plus(cf_item_2_count,1); cf_item_2_count = plus(cf_item_2_count,1);
}
if (interfaceRs[i].get('division') == '95' && Leaf.formatDate(interfaceRs[i].get('write_off_date')) < Leaf.formatDate(interfaceRs[i].get('due_date')) && interfaceRs[i].get('write_off_cf_item') == '1') {
write_date_count = plus(write_date_count, 1);
} }
} }
if (cf_item_2_count>0) { if (cf_item_2_count>0) {
Leaf.showInfoMessage('提示', ' 首付款抵扣为“无”以外的合同，不可进行首付款电汇核销！'); Leaf.showInfoMessage('提示', ' 首付款抵扣为“无”以外的合同，不可进行首付款电汇核销！');
return; return;
} }
if (write_date_count > 0) {
Leaf.showInfoMessage('提示', '经营性租赁合同收款核销当天的系统日期不得早于应收日！');
return;
}
var createConfirm = Leaf.showConfirm('提示', '确认提交复核吗', function () { var createConfirm = Leaf.showConfirm('提示', '确认提交复核吗', function () {
$('csh531n_write_off_submit_btn_id').disable(); $('csh531n_write_off_submit_btn_id').disable();
...@@ -804,7 +845,7 @@ ...@@ -804,7 +845,7 @@
<a:field name="contract_number" prompt="合同编号" autoComplete="true" lovAutoQuery="true" <a:field name="contract_number" prompt="合同编号" autoComplete="true" lovAutoQuery="true"
lovHeight="850" required="true" lovHeight="850" required="true"
lovUrl="${/request/@context_path}/modules/csh/CSH531N/csh_write_off_ref_contract.lview?bp_id=${/model/csh_transaction_path/record/@bp_id}&amp;deposit_flag=${/parameter/@deposit_flag}&amp;transaction_date=${/model/csh_transaction_path/record/@transaction_date}" lovUrl="${/request/@context_path}/modules/csh/CSH531N/csh_write_off_ref_contract.lview?bp_id=${/model/csh_transaction_path/record/@bp_id}&amp;deposit_flag=${/parameter/@deposit_flag}&amp;transaction_date=${/model/csh_transaction_path/record/@transaction_date}"
lovWidth="1350" title="合同号选择"> lovWidth="1550" title="合同号选择">
<a:mapping> <a:mapping>
<a:map from="contract_number" to="contract_number"/> <a:map from="contract_number" to="contract_number"/>
<a:map from="contract_name" to="contract_name"/> <a:map from="contract_name" to="contract_name"/>
...@@ -813,6 +854,7 @@ ...@@ -813,6 +854,7 @@
<a:map from="bp_id_tenant_name" to="write_off_bp_name"/> <a:map from="bp_id_tenant_name" to="write_off_bp_name"/>
<a:map from="contract_status_desc" to="contract_status_desc"/> <a:map from="contract_status_desc" to="contract_status_desc"/>
<a:map from="payment_deduction" to="payment_deduction"/> <a:map from="payment_deduction" to="payment_deduction"/>
<a:map from="division" to="division"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="batch_id" defaultValue="${/parameter/@batch_id}"/> <a:field name="batch_id" defaultValue="${/parameter/@batch_id}"/>
...@@ -822,6 +864,7 @@ ...@@ -822,6 +864,7 @@
valueField="code_value"/> valueField="code_value"/>
<a:field name="write_off_bp_id"/> <a:field name="write_off_bp_id"/>
<a:field name="payment_deduction"/> <a:field name="payment_deduction"/>
<a:field name="division"/>
<a:field name="write_off_classification_desc" prompt="核销分类" <a:field name="write_off_classification_desc" prompt="核销分类"
options="ds_csh_write_off_classification_ds" returnField="write_off_classification" options="ds_csh_write_off_classification_ds" returnField="write_off_classification"
valueField="code_value" displayField="code_value_name"/> valueField="code_value" displayField="code_value_name"/>
...@@ -898,6 +941,32 @@ ...@@ -898,6 +941,32 @@
<a:field name="write_off_date" validator="write_off_date_validator" required="true" <a:field name="write_off_date" validator="write_off_date_validator" required="true"
defaultValue="${/model/sys_default_time/record/@now_date}"/> defaultValue="${/model/sys_default_time/record/@now_date}"/>
</a:fields> </a:fields>
</a:dataSet>
<a:dataSet id="csh_transaction_operat_ds" model="csh.CSH531N.csh_transaction_plan_query" fetchAll="true"
autoQuery="true"
queryUrl="${/request/@context_path}/autocrud/csh.CSH531N.csh_transaction_plan_query/query?transaction_id=${/parameter/@transaction_id}&amp;write_off_type=OPERAT_COMBINED"
selectable="true">
<a:fields>
<a:field name="bp_name" readOnly="true" autoComplete="true" lovGridHeight="350" lovHeight="550"
lovLabelWidth="50"
lovWidth="550"
required="true"
lovService="basic.hls_bp_master_v_for_lov?bp_id=${/parameter/@bp_id}" title="HLS.BP_TITLE">
<a:mapping>
<a:map from="bp_id" to="bp_id"/>
<a:map from="bp_name" to="bp_name"/>
</a:mapping>
</a:field>
<a:field name="bp_id" defaultValue="${/parameter/@bp_id}"/>
<a:field name="bp_name" defaultValue="${/model/csh_transaction_path/record/@bp_name}"/>
<a:field name="transaction_id" defaultValue="${/parameter/@transaction_id}"/>
<a:field name="write_off_type" defaultValue="OPERAT_COMBINED"/>
<a:field name="company_id" defaultValue="${/session/@company_id}"/>
<a:field name="write_off_amount"/>
<a:field name="create_wf_flag" defaultValue="N"/>
<a:field name="write_off_date" validator="write_off_date_validator" required="true"
defaultValue="${/model/sys_default_time/record/@now_date}"/>
</a:fields>
</a:dataSet> </a:dataSet>
</a:dataSets> </a:dataSets>
<a:screenBody> <a:screenBody>
...@@ -1092,7 +1161,7 @@ ...@@ -1092,7 +1161,7 @@
</a:events> </a:events>
</a:grid> </a:grid>
</a:tab> </a:tab>
<a:tab id="write_off_deposit" tabStyle="display:none" prompt="核销为保证金" width="150"> <a:tab id="write_off_deposit" tabStyle="display:none" prompt="核销为融租保证金" width="150">
<a:grid id="csh_transaction_deposit_grid" navBar="true" <a:grid id="csh_transaction_deposit_grid" navBar="true"
bindTarget="csh_transaction_deposit_ds" bindTarget="csh_transaction_deposit_ds"
height="370" height="370"
...@@ -1159,6 +1228,40 @@ ...@@ -1159,6 +1228,40 @@
<a:event name="dblclick" handler="write_off_amount_dblclick"/> <a:event name="dblclick" handler="write_off_amount_dblclick"/>
</a:events> </a:events>
</a:grid> </a:grid>
</a:tab>
<a:tab id="write_off_operat" tabStyle="display:none" prompt="核销为经租保证金" width="150">
<a:grid id="csh_transaction_operat_grid" navBar="true"
bindTarget="csh_transaction_operat_ds"
height="370"
marginWidth="10">
<a:toolBar>
<a:button id="csh_grid_operat_add_bt" type="add"/>
<a:button id="csh_grid_operat_delete_bt" type="delete"/>
</a:toolBar>
<a:columns>
<a:column name="bp_name" prompt="商业伙伴" width="180" align="center"
editor="csh_transaction_operat_grid_lv"/>
<a:column name="write_off_amount" prompt="核销金额"
editorFunction="csh_operat_edit_function" renderer="Leaf.formatMoney"
width="180"
align="right"
footerRenderer="summaryRenderer"/>
<a:column name="write_off_date" prompt="核销日期" width="180" align="center"
renderer="Leaf.formatDate" editorFunction="csh_edit_function"/>
</a:columns>
<a:editors>
<a:lov id="csh_transaction_operat_grid_lv"/>
<a:numberField id="csh_transaction_operat_grid_nf" allowNegative="false">
<a:events>
<a:event name="focus" handler="write_off_amount_dblclick"/>
</a:events>
</a:numberField>
<a:datePicker id="csh_transaction_operat_grid_dp"/>
</a:editors>
<a:events>
<a:event name="dblclick" handler="write_off_amount_dblclick"/>
</a:events>
</a:grid>
</a:tab> </a:tab>
</a:tabs> </a:tabs>
</a:tabPanel> </a:tabPanel>
......
src/main/webapp/modules/csh/CSH531N/csh_write_off_ref_contract.lview
View file @ 9762c958
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
var rec = ds.getCurrentRecord(); var rec = ds.getCurrentRecord();
rec.set('contract_id', con_rec.get('contract_id')); rec.set('contract_id', con_rec.get('contract_id'));
rec.set('contract_number', con_rec.get('contract_number')); 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('bp_tenant_name', con_rec.get('bp_name'));
rec.set('write_off_bp_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')); rec.set('write_off_bp_id', con_rec.get('bp_id_tenant'));
...@@ -52,6 +53,7 @@ ...@@ -52,6 +53,7 @@
var rec = ds.getCurrentRecord(); var rec = ds.getCurrentRecord();
rec.set('contract_id', con_rec.get('contract_id')); rec.set('contract_id', con_rec.get('contract_id'));
rec.set('contract_number', con_rec.get('contract_number')); 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('bp_tenant_name', con_rec.get('bp_name'));
rec.set('write_off_bp_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')); rec.set('write_off_bp_id', con_rec.get('bp_id_tenant'));
...@@ -132,11 +134,16 @@ ...@@ -132,11 +134,16 @@
<a:dataSets> <a:dataSets>
<a:dataSet id="csh_lov_cf_item_ds" autoQuery="true" model="csh.CSH531N.hls_cashflow_item_v" <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"/> 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:dataSet id="csh_query_con_ds" autoCreate="true">
<a:fields> <a:fields>
<a:field name="contract_number"/> <a:field name="contract_number"/>
<a:field name="bp_name"/> <a:field name="bp_name"/>
<a:field name="bp_id" defaultValue="${/parameter/@bp_id}"/> <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:fields>
</a:dataSet> </a:dataSet>
<a:dataSet id="csh_query_cf_ds" autoCreate="true"> <a:dataSet id="csh_query_cf_ds" autoCreate="true">
...@@ -148,9 +155,8 @@ ...@@ -148,9 +155,8 @@
</a:fields> </a:fields>
</a:dataSet> </a:dataSet>
<a:dataSet id="csh_lov_con_contract_ds" selectable="true" autoQuery="true" selectionModel="single" <a:dataSet id="csh_lov_con_contract_ds" selectable="true" autoQuery="true" selectionModel="single"
model="csh.CSH531N.con_contract" 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}" 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">
<a:events> <a:events>
<a:event name="indexchange" handler="indexChangeFunction"/> <a:event name="indexchange" handler="indexChangeFunction"/>
</a:events> </a:events>
...@@ -179,21 +185,25 @@ ...@@ -179,21 +185,25 @@
<a:comboBox name="cf_item_desc" bindTarget="csh_query_cf_ds" prompt="CSH531.CF_ITEM"/> <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_from" bindTarget="csh_query_cf_ds" prompt="支付日从"/>
<a:datePicker name="due_date_to" 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:form>
<a:hBox> <a:hBox>
<a:vBox> <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"> navBar="true">
<a:columns> <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="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:columns>
</a:grid> </a:grid>
</a:vBox> </a:vBox>
<a:vBox> <a:vBox>
<a:grid bindTarget="csh_write_off_lov_ds" marginHeight="120" id="csh_con_contract_cashflow_ds" <a:grid bindTarget="csh_write_off_lov_ds" marginHeight="160" id="csh_con_contract_cashflow_ds"
width="800" navBar="true" rowRenderer="changeColor"> width="850" navBar="true" rowRenderer="changeColor">
<a:columns> <a:columns>
<a:column name="times" prompt="HLS.TIMES" align="center" width="60"/> <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"/> <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