Skip to content

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

I-19567 【建机】混合类款项校验注释

parent edc76360
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 73 deletions
src/main/webapp/modules/csh/CSH510/csh_transaction_hand_receipt_update.lview
View file @ 151673a7
...@@ -80,12 +80,12 @@ ...@@ -80,12 +80,12 @@
function csh511_receipt_save() { function csh511_receipt_save() {
var record=$('csh_transaction_receipt_head_ds').getAt(0); var record=$('csh_transaction_receipt_head_ds').getAt(0);
if (record.get('collection_classes') == 'COMBINED') { /*if (record.get('collection_classes') == 'COMBINED') {
if (record.get('paid_byother_flag') != 'T'||record.get('bp_category')!='AGENT') { if (record.get('paid_byother_flag') != 'T'||record.get('bp_category')!='AGENT') {
Leaf.showMessage('${l:PROMPT}', '混合类款项为代理店代付，请检查代付标志和所选商业伙伴！'); Leaf.showMessage('${l:PROMPT}', '混合类款项为代理店代付，请检查代付标志和所选商业伙伴！');
return; return;
} }
} } */
// Leaf.Masker.mask(Ext.getBody()); // Leaf.Masker.mask(Ext.getBody());
// Leaf.request({ // Leaf.request({
// url: $('csh510_update_bp_info_link').getUrl(), // url: $('csh510_update_bp_info_link').getUrl(),
...@@ -127,8 +127,8 @@ ...@@ -127,8 +127,8 @@
} }
function onUpdate_csh511_receipt(ds, record, name, value, oldvalue) { function onUpdate_csh511_receipt(ds, record, name, value, oldvalue) {
if (name == 'bp_id') { if (name == 'bp_id'&& '${/parameter/@import_source}' != 'HSBC_ADD'&&'${/parameter/@import_source}' != 'EXCEL_ADD') {
if (value != oldvalue && '${/parameter/@import_source}' != 'HSBC_ADD'&&'${/parameter/@import_source}' != 'EXCEL_ADD') { if (value != oldvalue) {
record.set('bp_bank_account_id', ''); record.set('bp_bank_account_id', '');
record.set('bp_bank_account_code', ''); record.set('bp_bank_account_code', '');
record.set('bp_bank_account_name', ''); record.set('bp_bank_account_name', '');
......
src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview
View file @ 151673a7
...@@ -55,12 +55,12 @@ ...@@ -55,12 +55,12 @@
//不将这条数据传递到数组中 //不将这条数据传递到数组中
continue; continue;
} }
if (record.get('collection_classes') == 'COMBINED') { /*if (record.get('collection_classes') == 'COMBINED') {
if (record.get('paid_byother_flag') != 'T'||record.get('bp_category')!='AGENT') { if (record.get('paid_byother_flag') != 'T'||record.get('bp_category')!='AGENT') {
Leaf.showMessage('${l:PROMPT}', '混合类款项为代理店代付，请检查代付标志和所选商业伙伴！'); Leaf.showMessage('${l:PROMPT}', '混合类款项为代理店代付，请检查代付标志和所选商业伙伴！');
return; return;
} }
} }*/
//否则的话添加必要的字段 //否则的话添加必要的字段
record.set('receipt_type', 'IMPORT'); record.set('receipt_type', 'IMPORT');
record.set('bank_account_num', record.get('bank_num')); record.set('bank_account_num', record.get('bank_num'));
...@@ -196,47 +196,47 @@ ...@@ -196,47 +196,47 @@
if (unit_code == 241 || unit_code == 610){ if (unit_code == 241 || unit_code == 610){
if (paid_byother_flag == null){ if (paid_byother_flag == null){
//dev环境code --- C00010168(每次部署uat或者生产，需要将下面代码注释) //dev环境code --- C00010168(每次部署uat或者生产，需要将下面代码注释)
record.set('bp_code','C00010168'); // record.set('bp_code','C00010168');
//uat和生产有两个深圳美鹏code(每次部署uat或者生产，需求解除下面代码注释) //uat和生产有两个深圳美鹏code(每次部署uat或者生产，需求解除下面代码注释)
// if (unit_code == 241){ if (unit_code == 241){
// record.set('bp_code','D00010001'); record.set('bp_code','D00010001');
// }else if (unit_code == 610){ }else if (unit_code == 610){
// record.set('bp_code','D00000009'); record.set('bp_code','D00000009');
// } }
record.getField('guarantor_name_duty_desc').setReadOnly(true); record.getField('guarantor_name_duty_desc').setReadOnly(true);
record.set('guarantor_name_duty_desc','否'); record.set('guarantor_name_duty_desc','否');
record.set('guarantor_name_duty','N'); record.set('guarantor_name_duty','N');
}else if (paid_byother_flag == 'T'){ }else if (paid_byother_flag == 'T'){
//dev环境code --- C00010168(每次部署uat或者生产，需要将下面代码注释) //dev环境code --- C00010168(每次部署uat或者生产，需要将下面代码注释)
record.set('bp_code','C00010168'); // record.set('bp_code','C00010168');
//uat和生产有两个深圳美鹏code(每次部署uat或者生产，需求解除下面代码注释) //uat和生产有两个深圳美鹏code(每次部署uat或者生产，需求解除下面代码注释)
// if (unit_code == 241){ if (unit_code == 241){
// record.set('bp_code','D00010001'); record.set('bp_code','D00010001');
// }else if (unit_code == 610){ }else if (unit_code == 610){
// record.set('bp_code','D00000009'); record.set('bp_code','D00000009');
// } }
record.set('guarantor_name_duty','Y'); record.set('guarantor_name_duty','Y');
record.set('guarantor_name_duty_desc','是'); record.set('guarantor_name_duty_desc','是');
record.getField('guarantor_name_duty_desc').setReadOnly(false); record.getField('guarantor_name_duty_desc').setReadOnly(false);
}else { }else {
//dev环境code --- C00010168(每次部署uat或者生产，需要将下面代码注释) //dev环境code --- C00010168(每次部署uat或者生产，需要将下面代码注释)
if (unit_code == 241 || unit_code == 610){ // if (unit_code == 241 || unit_code == 610){
record.set('bp_code','C00010168'); // record.set('bp_code','C00010168');
}else{
record.set('bp_code','C00000000');
}
//uat和生产有两个深圳美鹏code(每次部署uat或者生产，需求解除下面代码注释)
// if (unit_code == 241){
// record.set('bp_code','D00010001');
// }else if (unit_code == 610){
// record.set('bp_code','D00000009');
// }else{ // }else{
// record.set('bp_code','C00000000'); // record.set('bp_code','C00000000');
// } // }
//uat和生产有两个深圳美鹏code(每次部署uat或者生产，需求解除下面代码注释)
if (unit_code == 241){
record.set('bp_code','D00010001');
}else if (unit_code == 610){
record.set('bp_code','D00000009');
}else{
record.set('bp_code','C00000000');
}
record.getField('guarantor_name_duty_desc').setReadOnly(true); record.getField('guarantor_name_duty_desc').setReadOnly(true);
record.set('guarantor_name_duty_desc','否'); record.set('guarantor_name_duty_desc','否');
...@@ -425,7 +425,7 @@ ...@@ -425,7 +425,7 @@
displayField="code_value_name" returnField="collection_classes" valueField="code_value"/> displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
<a:field name="collection_classes"/> <a:field name="collection_classes"/>
<a:field name="bp_name" required="true" lovGridHeight="350" lovHeight="500" lovLabelWidth="90" <a:field name="bp_name" required="true" lovGridHeight="350" lovHeight="500" lovLabelWidth="90"
lovService="basic.hls_bp_master_v_for_agent_vender_lov" lovWidth="550" title="HLS.BP_TITLE"> lovService="basic.hls_bp_master_v_for_agent_lov" lovWidth="550" title="HLS.BP_TITLE">
<a:mapping> <a:mapping>
<a:map from="bp_id" to="bp_id"/> <a:map from="bp_id" to="bp_id"/>
<a:map from="bp_code" to="bp_name_code"/> <a:map from="bp_code" to="bp_name_code"/>
......
src/main/webapp/modules/csh/CSH511/csh_transaction_receipt.lview
View file @ 151673a7
...@@ -95,14 +95,13 @@ ...@@ -95,14 +95,13 @@
$('csh511_receipt_save').disable(); $('csh511_receipt_save').disable();
if ($('csh_transaction_receipt_head_ds').validate()) { if ($('csh_transaction_receipt_head_ds').validate()) {
var record = $('csh_transaction_receipt_head_ds').getAt(0); var record = $('csh_transaction_receipt_head_ds').getAt(0);
if (record.get('collection_classes') == 'COMBINED') { /*if (record.get('collection_classes') == 'COMBINED') {
if (record.get('paid_byother_flag') != 'T'||record.get('bp_category')!='AGENT') { if (record.get('paid_byother_flag') != 'T'||record.get('bp_category')!='AGENT') {
Leaf.showMessage('${l:PROMPT}', '混合类款项为代理店代付，请检查代付标志和所选商业伙伴！'); Leaf.showMessage('${l:PROMPT}', '混合类款项为代理店代付，请检查代付标志和所选商业伙伴！');
$('csh511_receipt_save').enable(); $('csh511_receipt_save').enable();
return; return;
} }
} }*/
if (flag != 'Y') { if (flag != 'Y') {
Leaf.Masker.mask(Ext.getBody(), '${l:HLS.SAVING}'); Leaf.Masker.mask(Ext.getBody(), '${l:HLS.SAVING}');
} }
...@@ -257,24 +256,24 @@ ...@@ -257,24 +256,24 @@
record.set('transaction_type', 'RECEIPT'); record.set('transaction_type', 'RECEIPT');
} }
} }
// else if(name == 'extra_nam'){ // else if(name == 'extra_nam'){
// //深圳美鹏 // //深圳美鹏
// // var extra_nam = record.get('extra_nam'); // // var extra_nam = record.get('extra_nam');
// var bp_code = record.get('bp_code'); // var bp_code = record.get('bp_code');
// //bp_code == 'C00010168' // //bp_code == 'C00010168'
// if (bp_code == 'D00010001' || bp_code == 'D00000009'){ // if (bp_code == 'D00010001' || bp_code == 'D00000009'){
// record.getField('guarantor_name_duty_desc').setReadOnly(false); // record.getField('guarantor_name_duty_desc').setReadOnly(false);
// record.set('guarantor_name_duty_desc','是'); // record.set('guarantor_name_duty_desc','是');
// record.set('guarantor_name_duty','Y'); // record.set('guarantor_name_duty','Y');
// record.getField('guarantor_name_duty_desc').setRequired(true); // record.getField('guarantor_name_duty_desc').setRequired(true);
// }else if (bp_code != 'D00010001' || bp_code == 'D00000009'){ // }else if (bp_code != 'D00010001' || bp_code == 'D00000009'){
// record.getField('guarantor_name_duty_desc').setReadOnly(true); // record.getField('guarantor_name_duty_desc').setReadOnly(true);
// record.set('guarantor_name_duty_desc','否'); // record.set('guarantor_name_duty_desc','否');
// record.set('guarantor_name_duty','N'); // record.set('guarantor_name_duty','N');
// record.getField('guarantor_name_duty_desc').setRequired(false); // record.getField('guarantor_name_duty_desc').setRequired(false);
// } // }
// } // }
else if (name == 'bp_code') { else if (name =='bp_code') {
var bp_id = record.get('bp_id'); var bp_id = record.get('bp_id');
Leaf.request({ Leaf.request({
url: $('extra_nam_csh_transaction_receipt_data_link_id').getUrl(), url: $('extra_nam_csh_transaction_receipt_data_link_id').getUrl(),
...@@ -302,12 +301,12 @@ ...@@ -302,12 +301,12 @@
success: function (res) { success: function (res) {
var unit_code = res.result.unit_code; var unit_code = res.result.unit_code;
if (unit_code == 241 || unit_code == 610) { if (unit_code == 241 || unit_code == 610) {
if (record.get('paid_byother_flag') == 'T') { if(record.get('paid_byother_flag') == 'T'){
record.getField('guarantor_name_duty_desc').setReadOnly(false); record.getField('guarantor_name_duty_desc').setReadOnly(false);
record.set('guarantor_name_duty_desc', '是'); record.set('guarantor_name_duty_desc', '是');
record.set('guarantor_name_duty', 'Y'); record.set('guarantor_name_duty', 'Y');
record.getField('guarantor_name_duty_desc').setRequired(true); record.getField('guarantor_name_duty_desc').setRequired(true);
} else if (record.get('paid_byother_flag') == 'F') { }else if(record.get('paid_byother_flag') == 'F'){
record.getField('guarantor_name_duty_desc').setReadOnly(true); record.getField('guarantor_name_duty_desc').setReadOnly(true);
record.set('guarantor_name_duty_desc', '否'); record.set('guarantor_name_duty_desc', '否');
record.set('guarantor_name_duty', 'N'); record.set('guarantor_name_duty', 'N');
...@@ -344,10 +343,10 @@ ...@@ -344,10 +343,10 @@
Leaf.Masker.unmask(Ext.getBody()); Leaf.Masker.unmask(Ext.getBody());
} }
}); });
} else if (name == 'paid_byother_flag') { }else if(name == 'paid_byother_flag'){
if (record.get('paid_byother_flag') == 'T') { if(record.get('paid_byother_flag') =='T'){
var extra_id = record.get('bp_id'); var extra_id = record.get('bp_id');
if (extra_id != null) { if (extra_id != null){
Leaf.request({ Leaf.request({
url: $('get_extra_code_csh_transaction_receipt_data_link_id').getUrl(), url: $('get_extra_code_csh_transaction_receipt_data_link_id').getUrl(),
para: {bp_id: extra_id}, para: {bp_id: extra_id},
...@@ -373,15 +372,15 @@ ...@@ -373,15 +372,15 @@
Leaf.Masker.unmask(Ext.getBody()); Leaf.Masker.unmask(Ext.getBody());
} }
}); });
} else { }else {
record.getField('guarantor_name_duty_desc').setReadOnly(false); record.getField('guarantor_name_duty_desc').setReadOnly(false);
record.set('guarantor_name_duty_desc', '是'); record.set('guarantor_name_duty_desc', '是');
record.set('guarantor_name_duty', 'Y'); record.set('guarantor_name_duty', 'Y');
record.getField('guarantor_name_duty_desc').setRequired(true); record.getField('guarantor_name_duty_desc').setRequired(true);
} }
} else if (record.get('paid_byother_flag') == 'F') { }else if(record.get('paid_byother_flag') =='F'){
var extra_id = record.get('bp_id'); var extra_id = record.get('bp_id');
if (extra_id != undefined) { if (extra_id != undefined){
Leaf.request({ Leaf.request({
url: $('get_extra_code_csh_transaction_receipt_data_link_id').getUrl(), url: $('get_extra_code_csh_transaction_receipt_data_link_id').getUrl(),
para: {bp_id: extra_id}, para: {bp_id: extra_id},
...@@ -407,7 +406,7 @@ ...@@ -407,7 +406,7 @@
Leaf.Masker.unmask(Ext.getBody()); Leaf.Masker.unmask(Ext.getBody());
} }
}); });
} else { }else {
record.getField('guarantor_name_duty_desc').setReadOnly(true); record.getField('guarantor_name_duty_desc').setReadOnly(true);
record.set('guarantor_name_duty_desc', '否'); record.set('guarantor_name_duty_desc', '否');
record.set('guarantor_name_duty', 'N'); record.set('guarantor_name_duty', 'N');
...@@ -416,7 +415,6 @@ ...@@ -416,7 +415,6 @@
} }
} }
} }
// function onAdd_csh511_receipt(ds, record) { // function onAdd_csh511_receipt(ds, record) {
// record.set('precision',2); // record.set('precision',2);
// record.set('zero_amounts_allowed','N'); // record.set('zero_amounts_allowed','N');
...@@ -438,8 +436,8 @@ ...@@ -438,8 +436,8 @@
record.set('currency_name', '人民币'); record.set('currency_name', '人民币');
record.getField('guarantor_name_duty_desc').setReadOnly(true); record.getField('guarantor_name_duty_desc').setReadOnly(true);
record.set('guarantor_name_duty_desc', '否'); record.set('guarantor_name_duty_desc','否');
record.set('guarantor_name_duty', 'N'); record.set('guarantor_name_duty','N');
} }
...@@ -537,7 +535,7 @@ ...@@ -537,7 +535,7 @@
}); });
} else { } else {
Leaf.showMessage('${l:HLS.PROMPT}', '请先保存!'); Leaf.showMessage('${l:HLS.PROMPT}', '请先保存!');
return;
} }
} }
...@@ -602,8 +600,7 @@ ...@@ -602,8 +600,7 @@
</a:field> </a:field>
<!--担保人履行担保义务--> <!--担保人履行担保义务-->
<a:field name="guarantor_name_duty_desc" displayField="code_value_name" options="yes_no_ds" <a:field name="guarantor_name_duty_desc" displayField="code_value_name" options="yes_no_ds" prompt="担保人履行担保义务" returnField="guarantor_name_duty" valueField="code_value"/>
prompt="担保人履行担保义务" returnField="guarantor_name_duty" valueField="code_value"/>
<a:field name="guarantor_name_duty" required="true"/> <a:field name="guarantor_name_duty" required="true"/>
<!-- <a:field name="bank_slip_num" lovGridHeight="350" lovHeight="600" lovService="csh.CSH510.csh_transaction_contract_query" lovWidth="1200" title="合同编号"> <!-- <a:field name="bank_slip_num" lovGridHeight="350" lovHeight="600" lovService="csh.CSH510.csh_transaction_contract_query" lovWidth="1200" title="合同编号">
...@@ -682,9 +679,8 @@ ...@@ -682,9 +679,8 @@
<a:field name="bp_bank_account_num"/> <a:field name="bp_bank_account_num"/>
<a:field name="bp_bank_account_name" required="true"/> <a:field name="bp_bank_account_name" required="true"/>
<a:field name="collection_classes"/> <a:field name="collection_classes" />
<a:field name="collection_classes_desc" required="true" options="ds_collection_classes_ds" <a:field name="collection_classes_desc" required="true" options="ds_collection_classes_ds" prompt="款项用途"
prompt="款项用途"
displayField="code_value_name" returnField="collection_classes" valueField="code_value"/> displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
<a:field name="paid_byother_flag_n" options="PAID_BYOTHER_FLAG_DS" returnField="paid_byother_flag" <a:field name="paid_byother_flag_n" options="PAID_BYOTHER_FLAG_DS" returnField="paid_byother_flag"
displayField="code_value_name" valueField="code_value" required="true"/> displayField="code_value_name" valueField="code_value" required="true"/>
...@@ -759,11 +755,11 @@ ...@@ -759,11 +755,11 @@
</a:box> </a:box>
<a:hBox style="width:800px"> <a:hBox style="width:800px">
<a:textField width="300" name="description" bindTarget="csh_transaction_receipt_head_ds"/> <a:textField width="300" name="description" bindTarget="csh_transaction_receipt_head_ds"/>
<!--代理店简称--> <!--代理店简称-->
<a:lov name="extra_nam" bindTarget="csh_transaction_receipt_head_ds" <a:lov name="extra_nam" bindTarget="csh_transaction_receipt_head_ds"
prompt="代理店简称" width="180" readOnly="true"/> prompt="代理店简称" width="180" readOnly="true" />
</a:hBox> </a:hBox>
<a:hBox style="width:800px"> <a:hBox style="width:800px">
...@@ -772,7 +768,7 @@ ...@@ -772,7 +768,7 @@
bindTarget="csh_transaction_receipt_head_ds"/> bindTarget="csh_transaction_receipt_head_ds"/>
<!--担保人履行担保义务--> <!--担保人履行担保义务-->
<a:comboBox name="guarantor_name_duty_desc" bindTarget="csh_transaction_receipt_head_ds" <a:comboBox name="guarantor_name_duty_desc" bindTarget="csh_transaction_receipt_head_ds"
prompt="担保人履行担保义务" width="180"/> prompt="担保人履行担保义务" width="180" />
</a:hBox> </a:hBox>
</a:fieldSet> </a:fieldSet>
<!--删除下面的字段 currency_name,bank_account_name,banka,bank_branch_name,bank_account_num,bank_account_type_name,exchange_rate_type_display--> <!--删除下面的字段 currency_name,bank_account_name,banka,bank_branch_name,bank_account_num,bank_account_type_name,exchange_rate_type_display-->
......
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