Skip to content

L
leaf-hlcm
Commit c4a4ac83 authored by Luochenglong's avatar Luochenglong
Browse files
Options

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

parents 882e643b 3532ccbb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 821 additions and 54 deletions
src/main/webapp/WEB-INF/classes/acp/ACP522/acp_invoice_inf_import_total.lwm 0 → 100644
View file @ c4a4ac83
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: zhuxianfei
$Date: 2018/7/26 14:11
$Revision: 1.0
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
acp_invoice_import_pkg.ACP_INVOICE_IMPORT_TOTAL(
p_invoice_type => ${@invoice_type},
p_invoice_code => ${@invoice_code},
p_invoice_number => ${@invoice_number},
p_total_amount => ${@total_amount},
p_invoice_date => ${@invoice_date},
p_user_id => ${/session/@user_id},
p_contract_id => ${@contract_id});
end;
]]>
</bm:update-sql>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
acp_invoice_import_pkg.submit_wfl( p_contract_id => ${@contract_id},
p_user_id => ${/session/@user_id},
p_company_id => ${/session/@company_id});
end;
]]>
</bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/modules/acr/ACR630/acr_invoice_vat_rpt.lview 0 → 100644
View file @ c4a4ac83
This diff is collapsed.
src/main/webapp/modules/cont/CON505/con_contract_modify.lview
View file @ c4a4ac83
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview
View file @ c4a4ac83
......@@ -724,6 +724,30 @@
var gird_ds_id = 'BP_NP_CREATE_BP_ASSETS01_hls_bp_assets_ds';
var gird_ds_id2 = 'BP_NP_CREATE_BP_ASSETS04_hls_bp_assets_ds';
var gird_ds_id3 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_bank_flow');
//单位性质和职业校验 20230420
if (name == 'unit_properties' || name == 'occuption') {
debugger
var unit_properties = record.get('unit_properties');
var occuption = record.get('occuption');
if (unit_properties == '30' || unit_properties == '40' || unit_properties == '50') {
if (occuption == '0' || occuption == 'X') {
//当单位性质为“30-外资企业”、“40-个体、私营企业”、“50-其他“时，职业不能为“0-国家机关、党群组织、企业、事业单位负责人”、“X-军人”
Leaf.showMessage('提示', '当单位性质为“外资企业”、“个体、私营企业”、“其他“时，职业不能为“国家机关、党群组织、企业、事业单位负责人”、“军人”。', null, 500, 100);
if(name == 'unit_properties' ){
record.set('occuption','');
record.set('occuption_n','');
}
if(name == 'occuption' ){
record.set('unit_properties','');
record.set('unit_properties_n','');
}
}
}
}
//征信add start 中征码校验
if (record.get('bp_class') == 'ORG') {
......
src/main/webapp/modules/hls/HLS214N/hls_bp_master_modify.lview
View file @ c4a4ac83
......@@ -533,6 +533,28 @@
var gird_ds_id2 = 'BP_NP_MODIFY_N_BP_ASSETS04_hls_bp_assets_ds';
var gird_ds_id3 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_bank_flow');
//单位性质和职业校验 20230420
if (name == 'unit_properties' || name == 'occuption') {
debugger
var unit_properties = record.get('unit_properties');
var occuption = record.get('occuption');
if (unit_properties == '30' || unit_properties == '40' || unit_properties == '50') {
if (occuption == '0' || occuption == 'X') {
//当单位性质为“30-外资企业”、“40-个体、私营企业”、“50-其他“时，职业不能为“0-国家机关、党群组织、企业、事业单位负责人”、“X-军人”
Leaf.showMessage('提示', '当单位性质为“外资企业”、“个体、私营企业”、“其他“时，职业不能为“国家机关、党群组织、企业、事业单位负责人”、“军人”。', null, 500, 100);
if(name == 'unit_properties' ){
record.set('occuption','');
record.set('occuption_n','');
}
if(name == 'occuption' ){
record.set('unit_properties','');
record.set('unit_properties_n','');
}
}
}
}
//中征码校验
if (record.get('bp_class') == 'ORG') {
......
src/main/webapp/modules/hls/HLS214N/hls_bp_master_req_modify.lview
View file @ c4a4ac83
......@@ -572,6 +572,28 @@
var gird_ds_id2 = 'BP_NP_MODIFY_N_BP_ASSETS04_hls_bp_assets_ds';
var gird_ds_id3 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_bank_flow');
//单位性质和职业校验 20230420
if (name == 'unit_properties' || name == 'occuption') {
debugger
var unit_properties = record.get('unit_properties');
var occuption = record.get('occuption');
if (unit_properties == '30' || unit_properties == '40' || unit_properties == '50') {
if (occuption == '0' || occuption == 'X') {
//当单位性质为“30-外资企业”、“40-个体、私营企业”、“50-其他“时，职业不能为“0-国家机关、党群组织、企业、事业单位负责人”、“X-军人”
Leaf.showMessage('提示', '当单位性质为“外资企业”、“个体、私营企业”、“其他“时，职业不能为“国家机关、党群组织、企业、事业单位负责人”、“军人”。', null, 500, 100);
if(name == 'unit_properties' ){
record.set('occuption','');
record.set('occuption_n','');
}
if(name == 'occuption' ){
record.set('unit_properties','');
record.set('unit_properties_n','');
}
}
}
}
//中征码校验
if (record.get('bp_class') == 'ORG') {
......
src/main/webapp/modules/hls/HLS536/hls_journal_attach_trans_upload.lview
View file @ c4a4ac83
......@@ -13,6 +13,7 @@
var year=data[0].year;
var month=data[0].month;
var factory = new Packages.org.apache.commons.fileupload.disk.DiskFileItemFactory();
factory.setSizeThreshold(10);
var up = new Packages.org.apache.commons.fileupload.servlet.ServletFileUpload(factory);
var items = up.parseRequest(request);
var i = items.iterator();
......@@ -57,7 +58,7 @@
if(output!=null){
output.close();
}
raise_app_error('上传文件出错,请联系管理员！');
raise_app_error('上传文件出错,请联系管理员！'+String(e.javaException.getMessage()));
println('上传文件出错,请联系管理员！e');
}
var file_length=get_file_length(file_path+file_name);
......
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