Skip to content

L
leaf-hlcm
Commit bb6627cb authored by 21471731's avatar 21471731
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop

parents 5293e90b d440b624
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 10 deletions
src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview
View file @ bb6627cb
...@@ -262,8 +262,8 @@ ...@@ -262,8 +262,8 @@
//设置开票类型为纸质只读 //设置开票类型为纸质只读
record.set('invoice_type','PAPER'); record.set('invoice_type','PAPER');
record.set('invoice_type_n','纸质发票'); record.set('invoice_type_n','纸质发票');
record.getField('invoice_type').setReadOnly(true); //record.getField('invoice_type').setReadOnly(true);
record.getField('invoice_type_n').setReadOnly(true); //record.getField('invoice_type_n').setReadOnly(true);
record.getField('invoice_type').setRequired(false); record.getField('invoice_type').setRequired(false);
record.getField('invoice_type_n').setRequired(false); record.getField('invoice_type_n').setRequired(false);
record.getField('reception_maile').setRequired(false); record.getField('reception_maile').setRequired(false);
...@@ -494,6 +494,13 @@ ...@@ -494,6 +494,13 @@
return false; return false;
} }
} }
}
//若选择开票类型为“纸质发票”，则系统校验无法选择“是否全电发票”为“是” 18083 2022/11/30
if (head_record.get('invoice_type')=='PAPER'){
if(head_record.get('full_elec_invoice_flag')=='Y'){
Leaf.showErrorMessage('${l:PROMPT}', '开票类型为纸质发票，不能选择【是否全电发票】为是');
return false;
}
} }
var role_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role'); var role_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role');
var role_records = $(role_ds_id).getAll(); var role_records = $(role_ds_id).getAll();
...@@ -944,8 +951,9 @@ ...@@ -944,8 +951,9 @@
//设置开票类型为纸质只读 //设置开票类型为纸质只读
record.set('invoice_type','PAPER'); record.set('invoice_type','PAPER');
record.set('invoice_type_n','纸质发票'); record.set('invoice_type_n','纸质发票');
record.getField('invoice_type').setReadOnly(true); //取消开票类型为纸质只读 18083 2022/11/30
record.getField('invoice_type_n').setReadOnly(true); //record.getField('invoice_type').setReadOnly(true);
//record.getField('invoice_type_n').setReadOnly(true);
record.getField('invoice_type').setRequired(false); record.getField('invoice_type').setRequired(false);
record.getField('invoice_type_n').setRequired(false); record.getField('invoice_type_n').setRequired(false);
record.getField('reception_maile').setRequired(false); record.getField('reception_maile').setRequired(false);
...@@ -975,10 +983,15 @@ ...@@ -975,10 +983,15 @@
} }
} }
if(name == 'invoice_type'){ if(name == 'invoice_type'){
//设置是否全电发票默认值 18083 2022/11/30
if(value == 'PAPER'){ if(value == 'PAPER'){
record.getField('reception_maile').setRequired(false); record.getField('reception_maile').setRequired(false);
record.set('full_elec_invoice_flag','N');
record.set('full_elec_invoice_flag_n','否');
}else{ }else{
record.getField('reception_maile').setRequired(true); record.getField('reception_maile').setRequired(true);
record.set('full_elec_invoice_flag','Y');
record.set('full_elec_invoice_flag_n','是');
} }
} }
} }
......
src/main/webapp/modules/hls/HLS214N/hls_bp_master_billing.lview
View file @ bb6627cb
...@@ -40,8 +40,9 @@ ...@@ -40,8 +40,9 @@
//设置开票类型为纸质只读 //设置开票类型为纸质只读
record.set('invoice_type','PAPER'); record.set('invoice_type','PAPER');
record.set('invoice_type_n','纸质发票'); record.set('invoice_type_n','纸质发票');
record.getField('invoice_type').setReadOnly(true); //取消一般纳税人开票类型为只读 18083 2022/11/30
record.getField('invoice_type_n').setReadOnly(true); //record.getField('invoice_type').setReadOnly(true);
//record.getField('invoice_type_n').setReadOnly(true);
record.getField('invoice_type').setRequired(false); record.getField('invoice_type').setRequired(false);
record.getField('invoice_type_n').setRequired(false); record.getField('invoice_type_n').setRequired(false);
record.getField('reception_maile').setRequired(false); record.getField('reception_maile').setRequired(false);
...@@ -55,8 +56,9 @@ ...@@ -55,8 +56,9 @@
} }
}else { }else {
if(record.get('taxpayer_type') == 'GENERAL_TAXPAYER'){ if(record.get('taxpayer_type') == 'GENERAL_TAXPAYER'){
record.getField('invoice_type').setReadOnly(true); //取消一般纳税人开票类型为只读 18083 2022/11/30
record.getField('invoice_type_n').setReadOnly(true); //record.getField('invoice_type').setReadOnly(true);
//record.getField('invoice_type_n').setReadOnly(true);
record.getField('invoice_type').setRequired(false); record.getField('invoice_type').setRequired(false);
record.getField('invoice_type_n').setRequired(false); record.getField('invoice_type_n').setRequired(false);
record.getField('reception_maile').setRequired(false); record.getField('reception_maile').setRequired(false);
...@@ -156,8 +158,9 @@ ...@@ -156,8 +158,9 @@
record.getField('invoice_type').setReadOnly(false); record.getField('invoice_type').setReadOnly(false);
record.getField('invoice_type_n').setReadOnly(false); record.getField('invoice_type_n').setReadOnly(false);
}else if (value == 'GENERAL_TAXPAYER') { }else if (value == 'GENERAL_TAXPAYER') {
record.getField('invoice_type').setReadOnly(true); //设置开票类型为纸质只读 18083 2022/11/30
record.getField('invoice_type_n').setReadOnly(true); //record.getField('invoice_type').setReadOnly(true);
//record.getField('invoice_type_n').setReadOnly(true);
record.getField('invoice_type').setRequired(false); record.getField('invoice_type').setRequired(false);
record.getField('invoice_type_n').setRequired(false); record.getField('invoice_type_n').setRequired(false);
record.getField('reception_maile').setRequired(false); record.getField('reception_maile').setRequired(false);
...@@ -187,10 +190,15 @@ ...@@ -187,10 +190,15 @@
} }
} }
if(name == 'invoice_type'){ if(name == 'invoice_type'){
//设置是否全电发票默认值 18083 2022/11/30
if(value == 'PAPER'){ if(value == 'PAPER'){
record.getField('reception_maile').setRequired(false); record.getField('reception_maile').setRequired(false);
record.set('full_elec_invoice_flag','N');
record.set('full_elec_invoice_flag_n','否');
}else{ }else{
record.getField('reception_maile').setRequired(true); record.getField('reception_maile').setRequired(true);
record.set('full_elec_invoice_flag','Y');
record.set('full_elec_invoice_flag_n','是');
} }
} }
}; };
...@@ -271,6 +279,19 @@ ...@@ -271,6 +279,19 @@
return value; return value;
} }
}; };
//保存前调用 18083 2022/11/30
window['${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_req');
var head_record = $(ds_id).getCurrentRecord();
//若选择开票类型为“纸质发票”，则系统校验无法选择“是否全电发票”为“是”
if (head_record.get('invoice_type')=='PAPER'){
if(head_record.get('full_elec_invoice_flag')=='Y'){
Leaf.showErrorMessage('${l:PROMPT}', '开票类型为纸质发票，不能选择【是否全电发票】为是');
return false;
}
}
}
// 提交审批 // 提交审批
window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_req'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_req');
......
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