Skip to content

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

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

parent edc76360
Expand all 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"/>
......
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