Skip to content

L
leaf-hlcm
Commit d4679e6b authored by gzj34291's avatar gzj34291
Browse files
Options

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

parents 2c6beb8c b56ba066
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1143 additions and 162 deletions
src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_import_head_id.lwm 0 → 100644
View file @ d4679e6b
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: lixi
$Date: 2011-8-1 上午10:21:39
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select fnd_interface_headers_s.nextval header_id from dual
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_import_header_wfl.lwm 0 → 100644
View file @ d4679e6b
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: trd
$Date: 2022-12-6 下午2:36:27
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select t1.journal_header_id,
t1.journal_submit_batch_id,
t1.journal_num,
t1.error_message,
(select c.company_short_name
from fnd_companies_vl c
where c.company_id = t1.je_company_id) js_company_short_name,
t1.period_name,
t1.journal_date,
t1.currency_code,
(SELECT gc.currency_name
FROM gld_currency_v gc
WHERE gc.currency_code = t1.currency_code) currency_desc,
t1.total_amount_fuc_dr,
(SELECT d.je_transaction_desc
FROM gld_je_transaction d
WHERE d.je_transaction_code = t1.je_transaction_code) je_transaction_desc,
t1.description,
(SELECT COUNT(1)
FROM hls_journal_detail_imp t
WHERE t.journal_header_id = t1.journal_header_id) je_detail_count,
t1.wfl_status,
(select v.code_value_name value_name
from sys_code_values_v v
where v.code = 'HLS536_WFL_STATUS'
and v.code_value = t1.wfl_status) wfl_status_n,
t1.reverse_wfl_status,
(select v.code_value_name value_name
from sys_code_values_v v
where v.code = 'HLS536_WFL_STATUS_REVERSE'
and v.code_value = t1.reverse_wfl_status) reverse_wfl_status_n,
t1.journal_type,
(select t.post_gl_status
from hls_journal_header t
where t.journal_num = t1.journal_num) post_gl_status
FROM hls_journal_header_imp t1
#WHERE_CLAUSE#
order by t1.journal_header_id desc
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="journal_num" queryExpression="t1.journal_num like ${@journal_num}"/>
<bm:query-field name="journal_date_from" queryExpression="t1.journal_date &gt;= to_date(${@journal_date_from},'yyyy-mm-dd')"/>
<bm:query-field name="journal_date_to" queryExpression="t1.journal_date &lt;= to_date(${@journal_date_to},'yyyy-mm-dd')"/>
<bm:query-field name="total_amount_dr_from" datatype="java.lang.Double" queryExpression="nvl(t1.total_amount_dr,t1.total_amount_cr) &gt;= ${@total_amount_dr_from}"/>
<bm:query-field name="total_amount_dr_to" datatype="java.lang.Double" queryExpression="nvl(t1.total_amount_dr,t1.total_amount_cr) &lt;= ${@total_amount_dr_to}"/>
<bm:query-field name="journal_submit_batch_id" queryExpression="t1.journal_submit_batch_id = ${@journal_submit_batch_id}"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_position_query.lwm 0 → 100644
View file @ d4679e6b
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
Select ep.position_code
From exp_employees e, exp_employee_assigns ea, exp_org_position ep
Where e.employee_id = ea.employee_id
And ea.position_id = ep.position_id
And nvl(e.enabled_flag, 'N') = 'Y'
And nvl(ea.enabled_flag, 'N') = 'Y'
And nvl(ep.enabled_flag, 'N') = 'Y'
And nvl(ea.primary_position_flag, 'N') = 'Y'
And e.employee_id = (Select t.employee_id
From sys_user t
Where t.user_id = ${/session/@user_id})
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/hls/HLS536/insert_hls_journal_tmp.lwm
View file @ d4679e6b
......@@ -6,9 +6,9 @@
BEGIN
hls_journal_import_pkg.insert_hls_journal_tmp(p_user_id => ${/session/@user_id},
p_header_id => ${/session/@session_id},
p_header_id => ${/model/header/record/@header_id},
p_company_id => ${/session/@company_id},
p_template_type=>${/parameter/@template_type}
p_template_type=>${@template_type}
);
END;
]]></bm:update-sql>
......@@ -18,5 +18,16 @@
<bm:parameter inputPath="/session/@template_type"/>
</bm:parameters>
</bm:operation>
<bm:operation name="update" >
<bm:update-sql><![CDATA[
BEGIN
hls_journal_import_pkg.init_journal_atm(p_document_number =>${@document_number},
p_file_path =>${@file_path},
p_file_name =>${@file_name},
p_file_length =>${@file_length},
p_user_id =>${/session/@user_id});
END;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/hls/HLS536/submit_hls_journal_reverse.lwm 0 → 100644
View file @ d4679e6b
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="insert">
<bm:parameters>
<bm:parameter name="journal_submit_batch_id" output="true" outputPath="@journal_submit_batch_id"/>
</bm:parameters>
<bm:update-sql>
<![CDATA[
declare
v_journal_submit_batch_id hls_journal_submit_batch.journal_submit_batch_id%TYPE := hls_journal_submit_batch_s.nextval;
begin
${@journal_submit_batch_id} := v_journal_submit_batch_id;
insert into hls_journal_submit_batch
(journal_submit_batch_id,
instance_id,
wfl_status,
wfl_type,
created_by,
creation_date,
last_updated_by,
last_update_date)
values
(v_journal_submit_batch_id,
null,
'NEW',
${@wfl_type},
${/session/@user_id},
sysdate,
${/session/@user_id},
sysdate
);
end;
]]>
</bm:update-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql>
<![CDATA[
begin
update hls_journal_header_imp hjhi
set hjhi.reverse_wfl_status = 'NEW',
hjhi.reversed_flag = 'R',
hjhi.journal_submit_batch_id = ${/parameter/@journal_submit_batch_id},
hjhi.last_updated_by = ${/session/@user_id},
hjhi.last_update_date = sysdate
where hjhi.journal_header_id = ${@journal_header_id};
end;
]]>
</bm:update-sql>
<!--<bm:parameters>
<bm:parameter inputPath="/session/@session_id"/>
</bm:parameters>-->
</bm:operation>
<bm:operation name="execute">
<bm:update-sql>
<![CDATA[
begin
hls_journal_import_pkg.submit_hls_journal_reverse(
p_journal_submit_batch_id => ${/parameter/@journal_submit_batch_id},
p_user_id => ${/session/@user_id},
p_company_id => ${/session/@company_id}
);
end;
]]>
</bm:update-sql>
<!--<bm:parameters>
<bm:parameter inputPath="/session/@session_id"/>
</bm:parameters>-->
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/sys/SYS1010/sys_code_values.lwm
View file @ d4679e6b
......@@ -12,6 +12,8 @@
<ns1:field name="ref_v03" databaseType="VARCHAR" datatype="java.lang.String" prompt="附加值2"/>
<ns1:field name="ref_v04" databaseType="VARCHAR" datatype="java.lang.String" prompt="附加值2描述"/>
<ns1:field name="enabled_flag" databaseType="VARCHAR" datatype="java.lang.String" prompt="SYS_CODE.ENABLED_FLAG"/>
<ns1:field name="credit_code" databaseType="VARCHAR" datatype="java.lang.String" prompt="征信代码"/>
<ns1:field name="credit_name" databaseType="VARCHAR" datatype="java.lang.String" prompt="征信描述"/>
</ns1:fields>
<ns1:primary-key>
<ns1:pk-field name="code_value_id"/>
......
src/main/webapp/WEB-INF/classes/zjwfl/ZJWFL1060/zj_wfl_monitoring_query.lwm
View file @ d4679e6b
......@@ -55,6 +55,14 @@
<bm:query-field name="approve_user_code" queryExpression="t1.approve_user_code like ${@approve_user_code}"/>
</bm:query-fields>
<bm:data-filters>
<bm:data-filter name="query" expression="( (${/session/@role_id} = (select role_id from sys_role where role_code = '0006') and t1.workflow_code in (&apos;CONTRACT_INCEPT_WFL&apos;, &apos;DCFL_CSH_PAYMENT_REQ&apos;)) or (${/session/@role_id} in (select role_id from sys_role where role_code in ('0012', '0013', '0014')) and t1.workflow_code in (&apos;DCFL_CSH_PAYMENT_REQ&apos;, &apos;DEPOSIT_RETURN&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0005') and t1.workflow_code in (&apos;PROJECT_WFL&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0008') and t1.workflow_code in (&apos;CON_ET_WFL&apos;,&apos;TENANT_CHANGE_WFL&apos;,&apos;CON_BUYBACK_WFL&apos;,&apos;DEPOSIT_RETURN&apos;)) or (${/session/@role_id} not in (select role_id from sys_role where role_code in('0005', '0006', '0008', '0012', '0013', '0014')) and 1 = 1))"/>
<!--<bm:data-filter name="query" expression="( (${/session/@role_id} = (select role_id from sys_role where role_code = '0006') and t1.workflow_code in (&apos;CONTRACT_INCEPT_WFL&apos;, &apos;DCFL_CSH_PAYMENT_REQ&apos;)) or (${/session/@role_id} in (select role_id from sys_role where role_code in ('0012', '0013', '0014')) and t1.workflow_code in (&apos;DCFL_CSH_PAYMENT_REQ&apos;, &apos;DEPOSIT_RETURN&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0005') and t1.workflow_code in (&apos;PROJECT_WFL&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0008') and t1.workflow_code in (&apos;CON_ET_WFL&apos;,&apos;TENANT_CHANGE_WFL&apos;,&apos;CON_BUYBACK_WFL&apos;,&apos;DEPOSIT_RETURN&apos;)) or (${/session/@role_id} not in (select role_id from sys_role where role_code in('0005', '0006', '0008', '0012', '0013', '0014')) and 1 = 1))"/>-->
<!--凭证导出工作流只能由提交人和审批人看到，其余人无法在工作流监控中看到-->
<bm:data-filter name="query" expression="( (${/session/@role_id} = (select role_id from sys_role where role_code = '0006') and t1.workflow_code in (&apos;CONTRACT_INCEPT_WFL&apos;, &apos;DCFL_CSH_PAYMENT_REQ&apos;)) or (${/session/@role_id} in (select role_id from sys_role where role_code in ('0012', '0013', '0014')) and t1.workflow_code in (&apos;DCFL_CSH_PAYMENT_REQ&apos;, &apos;DEPOSIT_RETURN&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0005') and t1.workflow_code in (&apos;PROJECT_WFL&apos;)) or (${/session/@role_id} = (select role_id from sys_role where role_code = '0008') and t1.workflow_code in (&apos;CON_ET_WFL&apos;,&apos;TENANT_CHANGE_WFL&apos;,&apos;CON_BUYBACK_WFL&apos;,&apos;DEPOSIT_RETURN&apos;)) or (${/session/@role_id} not in (select role_id from sys_role where role_code in('0005', '0006', '0008', '0012', '0013', '0014')) and 1 = 1)
or( ((t1.SUBMITTED_BY = ${/session/@user_id}) or (t1.APPROVE_USER_CODE = (
Select distinct e.employee_code From exp_employees e, exp_employee_assigns ea Where e.employee_id =
ea.employee_id And nvl(e.enabled_flag, 'N') = 'Y' And nvl(ea.enabled_flag, 'N') =
'Y' And
e.employee_id = (Select t.employee_id From sys_user t Where t.user_id = ${/session/@user_id})
) ) ) and t1.workflow_code = 'HLS_JOURNAL_WFL'))"/>
</bm:data-filters>
</bm:model>
src/main/webapp/modules/acr/ACR516/acr_invoice_claim_application.lview
View file @ d4679e6b
......@@ -92,19 +92,25 @@
Leaf.showMessage('提示','请勾选认领状态为已确认的单据');
return;
}
if(records[i].get('invoice_type') != 'ECT'){
//18083 2022/11/24
if(records[i].get('invoice_kind_type') != 'ELECTRONIC_GENERAL' && records[i].get('invoice_kind_type') != 'ELECTRONIC_SPECIAL'){
Leaf.showMessage('提示','请勾选电子发票进行发送');
return;
}
if(records[i].get('division') == '70'){
if(!r_map.has(records[i].get('bp_id_agent_level1'))){
var arr = new Array();
arr.add(records[i].get('invoice_hd_id'));
r_map.set(records[i].get('bp_id_agent_level1'),arr);
}else{
r_map.get(records[i].get('bp_id_agent_level1')).add(records[i].get('invoice_hd_id'));
}
} else if(!r_map.has(records[i].get('invoice_bp_id'))){
// if(records[i].get('invoice_type') != 'ECT'){
//Leaf.showMessage('提示','请勾选电子发票进行发送');
//return;
//}
//if(records[i].get('division') == '70'){
// if(!r_map.has(records[i].get('bp_id_agent_level1'))){
//var arr = new Array();
// arr.add(records[i].get('invoice_hd_id'));
// r_map.set(records[i].get('bp_id_agent_level1'),arr);
// }else{
// r_map.get(records[i].get('bp_id_agent_level1')).add(records[i].get('invoice_hd_id'));
//}
//} else
if(!r_map.has(records[i].get('invoice_bp_id'))){
var arr = new Array();
arr.add(records[i].get('invoice_hd_id'));
r_map.set(records[i].get('invoice_bp_id'),arr);
......
src/main/webapp/modules/acr/ACR517/acr_invoice_claim_confirm.lview
View file @ d4679e6b
......@@ -43,7 +43,6 @@
// $('acr517_invoice_result_ds').setSubmitUrl('${/request/@context_path}/autocrud/acr.ACR605.acr_invoice_claim_confirm_new/batch_update');
var records=$('acr517_invoice_result_ds').getSelected();
debugger;
var datas = [];
var r_map = new Map();
for (var i = 0;i < records.length;i++) {
......@@ -51,15 +50,17 @@
'invoice_hd_id':records[i].get('invoice_hd_id'),
'_status': 'update'
})
if(records[i].get('division') == '70'){
if(!r_map.has(records[i].get('bp_id_agent_level1'))){
var arr = new Array();
arr.add(records[i].get('invoice_hd_id'));
r_map.set(records[i].get('bp_id_agent_level1'),arr);
}else{
r_map.get(records[i].get('bp_id_agent_level1')).add(records[i].get('invoice_hd_id'));
}
} else if(records[i].get('invoice_type') == 'ECT'){
//铁甲业务去掉特殊处理，与非铁甲业务保持一致 18083 2022/12/8
//if(records[i].get('division') == '70'){
// if(!r_map.has(records[i].get('bp_id_agent_level1'))){
// var arr = new Array();
// arr.add(records[i].get('invoice_hd_id'));
// r_map.set(records[i].get('bp_id_agent_level1'),arr);
// }else{
// r_map.get(records[i].get('bp_id_agent_level1')).add(records[i].get('invoice_hd_id'));
// }
// } else if(records[i].get('invoice_type') == 'ECT'){
if(records[i].get('invoice_kind_type') == 'ELECTRONIC_GENERAL' || records[i].get('invoice_kind_type') == 'ELECTRONIC_SPECIAL'){
if(!r_map.has(records[i].get('invoice_bp_id'))){
var arr = new Array();
arr.add(records[i].get('invoice_hd_id'));
......
src/main/webapp/modules/hls/HLS214N/hls_bp_master_modify.lview
View file @ d4679e6b
......@@ -25,6 +25,7 @@
<a:link id="hls214_bp_master_save_link_id" model="hls.HLS214.hls_bp_change_agent" modelaction="update"/>
<a:link id="${/parameter/@layout_code}_signer_create_link_id" model="hls.HLS213.hls_bp_master_signer_create_check"
modelaction="update"/>
<a:link id="rsc303_fin_statement_link" url="${/request/@context_path}/modules/rsc/RSC303/rsc_fin_statement_prj_all_query.lview"/>
<!-- <a:link id="hls214_sap_eai_create_customer_link" url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrCustomer.lsc"/>-->
<!-- <a:link id="hls214_sap_eai_create_vender_link" url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrVender.lsc"/>-->
<!-- <script src="${/request/@context_path}/javascripts/identity_card_info_query.js"-->
......@@ -387,7 +388,7 @@
if(record.get('bp_class') && record.get('bp_class') == 'ORG'){
if(record.get('bp_type') == 'TENANT'){
record.getField('etp_sts').setRequired(true);
record.getField('credit_code').setRequired(true);
//record.getField('credit_code').setRequired(true);
record.getField('etp_sts_n').setRequired(true);
record.getField('org_type').setRequired(true);
record.getField('org_type_n').setRequired(true);
......@@ -398,9 +399,18 @@
record.getField('due_date').setRequired(true);
record.getField('org_unit_property').setRequired(true);
record.getField('org_unit_property_n').setRequired(true);
record.getField('industry').setRequired(true);
record.getField('industry_n').setRequired(true);
//record.getField('industry').setRequired(true);
//record.getField('industry_n').setRequired(true);
record.getField('industry_a').setRequired(true);
record.getField('industry_a_n').setRequired(true);
record.getField('industry_b').setRequired(true);
record.getField('industry_b_n').setRequired(true);
record.getField('industry_c').setRequired(true);
record.getField('industry_c_n').setRequired(true);
record.getField('industry_d').setRequired(true);
record.getField('industry_d_n').setRequired(true);
record.getField('nationalities').setRequired(true);
record.getField('nationalities_n').setRequired(true);
}
}
//法人供应商非必填 18083 2022/11/25
......@@ -519,7 +529,7 @@
//中征码校验
if (record.get('bp_class') == 'ORG') {
if(record.get('bp_type') == 'TENANT'){
if(record.get('bp_type') == 'TENANT' && name =='credit_code'){
var credit_code = record.get('credit_code');
if (!Leaf.isEmpty(credit_code)) {
if (credit_code.length == '16'){
......@@ -718,6 +728,69 @@
}
}
//征信添加限制
if(name == 'work_status'){
//当“就业状况”为“11 国家公务员”、“ 13 专业技术人员”、“ 17 职员”、“ 21 企业管理人员”、“ 24 工人”或“ 91 在职”时，
// “单位名称”、“单位性质”、“单位所属行业”、“职业类型 、“职务”、“职称”、“入职年份”、单位地址、“单位所在地邮编”、“单位所在地行政区划”、“单位电话”必填。
// 其余情况，这些字段为空只读
if(value == '11'||value == '13'||value == '17'||value == '21'||value == '24'||value == '91'){
record.getField('work_unit').setReadOnly(false);
record.getField('work_unit').setRequired(true);
record.getField('unit_properties_n').setReadOnly(false);
record.getField('unit_properties_n').setRequired(true);
record.getField('occuption_n').setReadOnly(false);
record.getField('occuption_n').setRequired(true);
record.getField('position_n').setReadOnly(false);
record.getField('position_n').setRequired(true);
record.getField('positional_titles').setReadOnly(false);
record.getField('positional_titles').setRequired(true);
record.getField('entry_date').setReadOnly(false);
record.getField('entry_date').setRequired(true);
record.getField('work_unit_address').setReadOnly(false);
record.getField('work_unit_address').setRequired(true);
record.getField('work_unit_zip').setReadOnly(false);
record.getField('work_unit_zip').setRequired(true);
record.getField('work_province_n').setReadOnly(false);
record.getField('work_province_n').setRequired(true);
record.getField('work_city_n').setReadOnly(false);
record.getField('work_city_n').setRequired(true);
record.getField('work_district_n').setReadOnly(false);
record.getField('work_district_n').setRequired(true);
record.getField('work_unit_phone').setReadOnly(false);
record.getField('work_unit_phone').setRequired(true);
record.getField('industry_a_n').setReadOnly(false);
record.getField('industry_a_n').setRequired(true);
}else{
record.getField('work_unit').setReadOnly(true);
record.getField('work_unit').setRequired(false);
record.getField('unit_properties_n').setReadOnly(true);
record.getField('unit_properties_n').setRequired(false);
record.getField('occuption_n').setReadOnly(true);
record.getField('occuption_n').setRequired(false);
record.getField('position_n').setReadOnly(true);
record.getField('position_n').setRequired(false);
record.getField('positional_titles').setReadOnly(true);
record.getField('positional_titles').setRequired(false);
record.getField('entry_date').setReadOnly(true);
record.getField('entry_date').setRequired(false);
record.getField('work_unit_address').setReadOnly(true);
record.getField('work_unit_address').setRequired(false);
record.getField('work_unit_zip').setReadOnly(true);
record.getField('work_unit_zip').setRequired(false);
record.getField('work_province_n').setReadOnly(true);
record.getField('work_province_n').setRequired(false);
record.getField('work_city_n').setReadOnly(true);
record.getField('work_city_n').setRequired(false);
record.getField('work_district_n').setReadOnly(true);
record.getField('work_district_n').setRequired(false);
record.getField('work_unit_phone').setReadOnly(true);
record.getField('work_unit_phone').setRequired(false);
record.getField('industry_a_n').setReadOnly(true);
record.getField('industry_a_n').setRequired(false);
}
}
//征信add end
}
var test_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASIC', 'hls_bp_master');
......@@ -979,6 +1052,37 @@
user_button4.style.display = 'none';
}
}*/
//征信 add start 财报查询按钮
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function () {
var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
var record = $(bp_ds_id).getAt(0)
if (Ext.isEmpty(record.get('bp_code'))) {
Leaf.showMessage('${l:PROMPT}', '请先保存商业伙伴数据！');
return;
}
new Leaf.Window({
id: 'rsc303_fin_statement_query',
url: $('rsc303_fin_statement_link').getUrl(),
title: '查看财报',
fullScreen: true,
params: {
bp_id: record.get('bp_id') ,
bp_code:record.get('bp_code')
}
});
}
Leaf.onReady(function () {
//自然人不展示财报按钮
if('${/parameter/@bp_class}' == 'NP' && document.getElementById('${/parameter/@layout_code}_user_button2') ){
document.getElementById('${/parameter/@layout_code}_user_button2').style.display = 'none';
}
});
//征信 add end
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
......
src/main/webapp/modules/hls/HLS214N/hls_bp_master_req_modify.lview
View file @ d4679e6b
......@@ -410,7 +410,7 @@
if(record.get('bp_class') && record.get('bp_class') == 'ORG'){
if(record.get('bp_type') == 'TENANT'){
record.getField('etp_sts').setRequired(true);
record.getField('credit_code').setRequired(true);
//record.getField('credit_code').setRequired(true);
record.getField('etp_sts_n').setRequired(true);
record.getField('org_type').setRequired(true);
record.getField('org_type_n').setRequired(true);
......@@ -421,9 +421,18 @@
record.getField('due_date').setRequired(true);
record.getField('org_unit_property').setRequired(true);
record.getField('org_unit_property_n').setRequired(true);
record.getField('industry').setRequired(true);
record.getField('industry_n').setRequired(true);
//record.getField('industry').setRequired(true);
//record.getField('industry_n').setRequired(true);
record.getField('industry_a').setRequired(true);
record.getField('industry_a_n').setRequired(true);
record.getField('industry_b').setRequired(true);
record.getField('industry_b_n').setRequired(true);
record.getField('industry_c').setRequired(true);
record.getField('industry_c_n').setRequired(true);
record.getField('industry_d').setRequired(true);
record.getField('industry_d_n').setRequired(true);
record.getField('nationalities').setRequired(true);
record.getField('nationalities_n').setRequired(true);
}
}
......@@ -569,7 +578,7 @@
//中征码校验
if (record.get('bp_class') == 'ORG') {
if(record.get('bp_type') == 'TENANT'){
if(record.get('bp_type') == 'TENANT' && name =='credit_code'){
var credit_code = record.get('credit_code');
if (!Leaf.isEmpty(credit_code)) {
if (credit_code.length == '16'){
......@@ -836,6 +845,70 @@
}
//征信添加限制
if(name == 'work_status'){
//当“就业状况”为“11 国家公务员”、“ 13 专业技术人员”、“ 17 职员”、“ 21 企业管理人员”、“ 24 工人”或“ 91 在职”时，
// “单位名称”、“单位性质”、“单位所属行业”、“职业类型 、“职务”、“职称”、“入职年份”、单位地址、“单位所在地邮编”、“单位所在地行政区划”、“单位电话”必填。
// 其余情况，这些字段为空只读
if(value == '11'||value == '13'||value == '17'||value == '21'||value == '24'||value == '91'){
record.getField('work_unit').setReadOnly(false);
record.getField('work_unit').setRequired(true);
record.getField('unit_properties_n').setReadOnly(false);
record.getField('unit_properties_n').setRequired(true);
record.getField('occuption_n').setReadOnly(false);
record.getField('occuption_n').setRequired(true);
record.getField('position_n').setReadOnly(false);
record.getField('position_n').setRequired(true);
record.getField('positional_titles').setReadOnly(false);
record.getField('positional_titles').setRequired(true);
record.getField('entry_date').setReadOnly(false);
record.getField('entry_date').setRequired(true);
record.getField('work_unit_address').setReadOnly(false);
record.getField('work_unit_address').setRequired(true);
record.getField('work_unit_zip').setReadOnly(false);
record.getField('work_unit_zip').setRequired(true);
record.getField('work_province_n').setReadOnly(false);
record.getField('work_province_n').setRequired(true);
record.getField('work_city_n').setReadOnly(false);
record.getField('work_city_n').setRequired(true);
record.getField('work_district_n').setReadOnly(false);
record.getField('work_district_n').setRequired(true);
record.getField('work_unit_phone').setReadOnly(false);
record.getField('work_unit_phone').setRequired(true);
record.getField('industry_a_n').setReadOnly(false);
record.getField('industry_a_n').setRequired(true);
}else{
record.getField('work_unit').setReadOnly(true);
record.getField('work_unit').setRequired(false);
record.getField('unit_properties_n').setReadOnly(true);
record.getField('unit_properties_n').setRequired(false);
record.getField('occuption_n').setReadOnly(true);
record.getField('occuption_n').setRequired(false);
record.getField('position_n').setReadOnly(true);
record.getField('position_n').setRequired(false);
record.getField('positional_titles').setReadOnly(true);
record.getField('positional_titles').setRequired(false);
record.getField('entry_date').setReadOnly(true);
record.getField('entry_date').setRequired(false);
record.getField('work_unit_address').setReadOnly(true);
record.getField('work_unit_address').setRequired(false);
record.getField('work_unit_zip').setReadOnly(true);
record.getField('work_unit_zip').setRequired(false);
record.getField('work_province_n').setReadOnly(true);
record.getField('work_province_n').setRequired(false);
record.getField('work_city_n').setReadOnly(true);
record.getField('work_city_n').setRequired(false);
record.getField('work_district_n').setReadOnly(true);
record.getField('work_district_n').setRequired(false);
record.getField('work_unit_phone').setReadOnly(true);
record.getField('work_unit_phone').setRequired(false);
record.getField('industry_a_n').setReadOnly(true);
record.getField('industry_a_n').setRequired(false);
}
}
//征信add end
};
function upload_file(id, name, query_only) {
......
src/main/webapp/modules/hls/HLS536/batch_hls_journal_reverse.lsc 0 → 100644
View file @ d4679e6b
<?xml version="1.0" encoding="UTF-8"?>
<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:p="uncertain.proc" trace="true">
<a:init-procedure>
<p:echo></p:echo>
<a:model-insert model="hls.HLS536.submit_hls_journal_reverse" trace="true"/>
<a:batch-apply sourcepath="/parameter/details">
<a:model-update model="hls.HLS536.submit_hls_journal_reverse" trace="true"/>
</a:batch-apply>
<a:model-execute model="hls.HLS536.submit_hls_journal_reverse" trace="true"/>
</a:init-procedure>
<a:service-output output="/parameter"/>
</a:service>
src/main/webapp/modules/hls/HLS536/hls_journal_import_entrance.lview
View file @ d4679e6b
......@@ -17,17 +17,22 @@
<!--<a:link id="hls_journal_import_link" url="${/request/@context_path}/modules/hls/HLS536/hls_journal_import_handle.lview"/>-->
<a:link id="hls_journal_import_link" url="${/request/@context_path}/modules/hls/HLS536/hls_journal_import_upload.lview"/>
<a:link id="hls_journal_submit_link_id" url="${/request/@context_path}/modules/hls/HLS536/batch_hls_journal_tmp.lsc"/>
<a:link id="hls_journal_reverse_link_id" url="${/request/@context_path}/modules/hls/HLS536/batch_hls_journal_reverse.lsc"/>
<a:link id="hls_journal_import_delete_link" model="hls.HLS536.hls_journal_import_delete"
modelaction="batch_update"/>
<a:link id="journal_attachment_uploadFile_id" url="${/request/@context_path}/downloadFile.lview"/>
<script><![CDATA[
Leaf.onReady(function() {
if ('${/session/@user_id}'!=10418) {
$('reverse_btn_id').hide();
}
});
//查询按钮
function hls536_journal_query() {
$('hls_journal_header_result_ds').query();
}
//重置按钮
//重置按钮
function hls536_journal_reset() {
$('hls_journal_header_query').reset();
}
......@@ -39,13 +44,13 @@
}
// function lock_current_window(msg) {
// Leaf.Masker.mask(Ext.getBody(), msg);
// }
function lock_current_window(msg) {
Leaf.Masker.mask(Ext.getBody(), msg);
}
//function unlock_current_window() {
//Leaf.Masker.unmask(Ext.getBody());
//}
function unlock_current_window() {
Leaf.Masker.unmask(Ext.getBody());
}
function hls536_journal_import(){
new Leaf.Window({
......@@ -142,6 +147,10 @@
var journal_type = records[0].get('journal_type');
param['wfl_type'] = journal_type;
}
//当属于工资工作模板工作流的单条或多条凭证被提交时,wfl_type也要为 SALARIES
if(is_salaries){
param['wfl_type'] = 'SALARIES';
}
if ($(ds_id).validate()) {
Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认提交审批？', function () {
Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
......@@ -167,6 +176,54 @@
}
}
//反冲
function hls536_journal_reverse(){
var records = $('hls_journal_header_result_ds').getSelected();
if(records.length == 0){
Leaf.showMessage('${l:PROMPT}', '请至少选择一条记录！');
return ;
}
//凭证传输状态不为Y的不能进行反冲
for (var i = 0; i < records.length; i++) {
if (records[i].get('wfl_status') != 'APPROVED' || records[i].get('post_gl_status') != 'Y') {
Leaf.showMessage('提示', '凭证没有审批通过或者凭证没有传输至SBO,请检查！');
return;
}
}
var journal_header_imp_list = [];
for (var i = 0; i < records.length; i++) {
var record = records[i];
record.set('_status','update')
journal_header_imp_list.push(record.data);
}
var param = {};
param['details'] = journal_header_imp_list;
Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认提交审批？', function () {
Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
//先生成批次表数据，再update这几条数据的状态，最后提交工作流
Leaf.request({
url: $('hls_journal_reverse_link_id').getUrl(),
para: param,
success: function (res) {
Leaf.Masker.unmask(Ext.getBody());
Leaf.showMessage('提示', '提交审批成功!');
// 审批成功后查询gird
hls536_journal_query();
},
failure: function () {
Leaf.Masker.unmask(Ext.getBody());
},
error: function () {
Leaf.Masker.unmask(Ext.getBody());
},
scope: this
});
}, null);
}
function hls536_link_dynamic(reocrd_id, journal_header_id) {
//增加逻辑：审批中、审批通过的只读；新建、审批拒绝的可编辑
debugger;
......@@ -216,6 +273,7 @@
height: 400
});
win.on('close', function() {
hls536_journal_query();
});
}
......@@ -306,7 +364,7 @@
<a:toolbarButton click="hls536_journal_import" text="导入凭证模板"/>
<a:toolbarButton click="hls536_journal_delete" text="删除凭证"/>
<a:toolbarButton click="hls536_journal_send" text="提交审批"/>
<a:toolbarButton id="reverse_btn_id" click="hls536_journal_reverse" text="反冲"/>
</a:screenTopToolbar>
<a:form column="5" labelSeparator=" " labelWidth="100" marginWidth="40" title="HAP_QUERY_TITLE">
<a:textField name="journal_num" bindTarget="hls_journal_header_query" prompt="凭证编号"/>
......@@ -328,11 +386,13 @@
<a:column name="journal_date" align="center" prompt="凭证日期" renderer="Leaf.formatDate" width="90"/>
<a:column name="currency_desc" align="center" prompt="币种" width="80"/>
<a:column name="total_amount_fuc_dr" align="right" prompt="金额" renderer="Leaf.formatMoney" width="120"/>
<a:column name="je_transaction_desc" prompt="凭证来源" width="150"/>
<!--<a:column name="je_transaction_desc" prompt="凭证来源" width="150"/>-->
<a:column name="description" prompt="凭证摘要" width="220"/>
<a:column name="je_detail_count" prompt="凭证行数量" width="50"/>
<a:column name="wfl_status_n" prompt="凭证导入状态" width="100"/>
<a:column name="attachment_file" prompt="附件" width="120" renderer="receipt_attachment_upload" align="center"/>-
<a:column name="reverse_wfl_status_n" prompt="凭证反冲状态" width="100"/>
<a:column name="error_message" prompt="错误信息" width="150"/>
<a:column name="attachment_file" prompt="附件" width="120" renderer="receipt_attachment_upload" align="center"/>
</a:columns>
</a:grid>
</a:screenBody>
......
src/main/webapp/modules/hls/HLS536/hls_journal_import_trans_upload.lview
View file @ d4679e6b
<?xml version="1.0" encoding="UTF-8"?>
<!--<a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">-->
<a:screen xmlns:p="uncertain.proc" xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true">
<a:init-procedure>
<a:model-execute model="hls.HLS536.delete_hls_journal_tmp"/>
<a:import-excel header_id="${/session/@session_id}" attribute5="D:\u01,fnd_interface_headers,${/session/@session_id}" separator="," status_field="/parameter/@ImportSuccess" template_code="HLS_JOURNAL_IMPORT" user_id="${/session/@user_id}" />
<a:init-procedure >
<!--<a:model-execute model="hls.HLS536.delete_hls_journal_tmp"/>-->
<a:model-query model="acr.acr_get_sys_import_head_id" rootPath="header"/>
<a:import-excel header_id="${/model/header/record/@header_id}" attribute5="D:\u01\hls_journal,fnd_interface_headers,${/model/header/record/@header_id}" separator="," status_field="/parameter/@ImportSuccess" template_code="HLS_JOURNAL_IMPORT" user_id="${/session/@user_id}" />
<!--<a:import-excel header_id="${/session/@session_id}" attribute5="D:\u01,fnd_interface_headers,${/session/@session_id}" separator="," status_field="/parameter/@ImportSuccess" template_code="HLS_JOURNAL_IMPORT" user_id="${/session/@user_id}" />-->
<a:model-execute model="hls.HLS536.insert_hls_journal_tmp"/>
</a:init-procedure>
......
src/main/webapp/modules/hls/HLS536/hls_journal_import_upload.lview
View file @ d4679e6b
<?xml version="1.0" encoding="UTF-8"?>
<a:screen xmlns:a="http://www.leaf-framework.org/application">
<a:init-procedure/>
<!--<a:screen xmlns:a="http://www.leaf-framework.org/application">-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
<a:init-procedure>
<a:model-query fetchAll="true" model="hls.HLS536.hls_journal_position_query" rootPath="hls536_position_code"/>
</a:init-procedure>
<a:view>
<script type="text/javascript"><![CDATA[
function saveClick() {
if (!$('template_ds').validate()) {
return;
}
var template_type = $('template_ds').getAt(0).get('template_type');
var templatetype = $('template_ds').getAt(0).get('template_type');
if (document.getElementById('importFile').value) {
var fileName = document.getElementById('importFile').value;
var fileType = fileName.substr(fileName.lastIndexOf("."));
......@@ -15,15 +19,79 @@
if (fileType != '.xls'&&fileType != '.xlsx') {
alert('请选择正确的导入文件！请使用xls或者xlsx后缀的文件');
} else {
document.getElementById('template_type').value=template_type;
var ds = $('template_ds');
ds.setSubmitParameter('${@template_type}', template_type);
document.getElementById('importForm').submit();
doSubmit(templatetype);
//document.getElementById('importForm').submit();
}
}
}
function doSubmit(templatetype) {
var form = document.getElementById('importForm');
var url = '${/request/@context_path}/modules/hls/HLS536/hls_journal_import_trans_upload.lview?_csrf=${/session/@_csrf.token}&template_type='+templatetype;
form.action = url;
form.submit();
}
]]></script>
<a:dataSets>
<a:dataSet id="template_type_desc_ds" autoCreate="true">
<a:datas>
<a:record code_value="GENERAL_SALARIES" code_value_name="普通工资导入模板"/>
<a:record code_value="BPO_SALARIES" code_value_name="BPO工资导入模板"/>
<a:record code_value="COST_IMPORT" code_value_name="成本导入模板"/>
<a:record code_value="FUND_POOL" code_value_name="资金池导入模板"/>
<a:record code_value="GLOBAL_TEMPLATE" code_value_name="通用模板"/>
<a:record code_value="FINANCIAL_TEMPLATE" code_value_name="财务模板"/>
</a:datas>
</a:dataSet>
<a:dataSet id="template_type_desc_ds1" autoCreate="true">
<a:datas>
<a:record code_value="GENERAL_SALARIES" code_value_name="普通工资导入模板"/>
<a:record code_value="BPO_SALARIES" code_value_name="BPO工资导入模板"/>
</a:datas>
</a:dataSet>
<a:dataSet id="template_type_desc_ds2" autoCreate="true">
<a:datas>
<a:record code_value="COST_IMPORT" code_value_name="成本导入模板"/>
<a:record code_value="GLOBAL_TEMPLATE" code_value_name="通用模板"/>
</a:datas>
</a:dataSet>
<a:dataSet id="template_type_desc_ds3" autoCreate="true">
<a:datas>
<a:record code_value="FUND_POOL" code_value_name="资金池导入模板"/>
<a:record code_value="FINANCIAL_TEMPLATE" code_value_name="财务模板"/>
</a:datas>
</a:dataSet>
<a:switch test="/model/hls536_position_code/record/@position_code">
<a:case value="026">
<a:dataSet id="template_ds" autoCreate="true">
<a:fields>
<a:field name="template_type_desc" displayField="code_value_name" options="template_type_desc_ds1"
returnField="template_type" valueField="code_value" required="true"/>
<a:field name="template_type"/>
</a:fields>
</a:dataSet>
</a:case>
<a:case value="014">
<a:dataSet id="template_ds" autoCreate="true">
<a:fields>
<a:field name="template_type_desc" displayField="code_value_name" options="template_type_desc_ds2"
returnField="template_type" valueField="code_value" required="true"/>
<a:field name="template_type"/>
</a:fields>
</a:dataSet>
</a:case>
<a:case value="012">
<a:dataSet id="template_ds" autoCreate="true">
<a:fields>
<a:field name="template_type_desc" displayField="code_value_name" options="template_type_desc_ds3"
returnField="template_type" valueField="code_value" required="true"/>
<a:field name="template_type"/>
</a:fields>
</a:dataSet>
</a:case>
<a:case value="017">
<a:dataSet id="template_ds" autoCreate="true">
<a:fields>
<a:field name="template_type_desc" displayField="code_value_name" options="template_type_desc_ds"
......@@ -31,6 +99,9 @@
<a:field name="template_type"/>
</a:fields>
</a:dataSet>
</a:case>
</a:switch>
<a:dataSet id="label_ds" autoCreate="true">
<a:fields>
<a:field name="label2" defaultValue="1、 严格按照导入模板整理数据，检查必输事项是否缺少数据。"/>
......@@ -40,16 +111,7 @@
<a:field name="label6" defaultValue="导入完毕后，请在系统内核实数据是否导入成功。"/>
</a:fields>
</a:dataSet>
<a:dataSet id="template_type_desc_ds">
<a:datas>
<a:record code_value="GENERAL_SALARIES" code_value_name="普通工资导入模板"/>
<a:record code_value="BPO_SALARIES" code_value_name="BPO工资导入模板"/>
<a:record code_value="COST_IMPORT" code_value_name="成本导入模板"/>
<a:record code_value="FUND_POOL" code_value_name="资金池导入模板"/>
<a:record code_value="GLOBAL_TEMPLATE" code_value_name="通用模板"/>
<a:record code_value="FINANCIAL_TEMPLATE" code_value_name="财务模板"/>
</a:datas>
</a:dataSet>
</a:dataSets>
<a:fieldSet style="margin-left:10px;margin-top:10px;" title="导入注意事项" width="400">
<a:label name="label2" bindTarget="label_ds" style="margin-left:10px;" width="380"/>
......@@ -61,11 +123,11 @@
<a:fieldSet style="margin-left:10px;margin-top:10px;" title="选择模板" width="400">
<a:comboBox name="template_type_desc" bindTarget="template_ds" prompt="模板类型"/>
</a:fieldSet>
<a:fieldSet style="margin-left:10px;margin-top:10px;" title="导入文件" width="400">
<form name="upload" id="importForm" action="hls_journal_import_trans_upload.lview?session_id=${/parameter/@session_id}&amp;template_type=${/parameter/@template_type}&amp;parent_ds_id=${/parameter/@parent_ds_id}&amp;type=${/parameter/@type}&amp;_csrf=${/session/@_csrf.token}" enctype="multipart/form-data" method="post">
<form name="upload" id="importForm" action="hls_journal_import_trans_upload.lview?session_id=${/parameter/@session_id}&amp;template_type=${/parameter/@template_type}&amp;parent_ds_id=${/parameter/@parent_ds_id}&amp;_csrf=${/session/@_csrf.token}" enctype="multipart/form-data" method="post">
<label style="margin-left:10px;margin-top:10px;"><![CDATA[请选择文件:]]></label>
<input name="template_type" id="template_type" type="hidden"/>
<input name="CONTENT" id="importFile" style="margin-bottom:4px;width:160px;height:22px;" type="file"/>
<input onclick="saveClick()" style="margin-left:10px;margin-top:10px;width:60px;" type="button" value="导入"/>
</form>
......
src/main/webapp/modules/hls/HLS536/hls_journal_import_wfl.lview
View file @ d4679e6b
......@@ -11,6 +11,7 @@
<a:view>
<a:link id="hls_journal_import_create_link_id" url="${/request/@context_path}/modules/hls/HLS536/hls_journal_import_create.lview"/>
<a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="journal_attachment_uploadFile_id" url="${/request/@context_path}/downloadFile.lview"/>
<a:screen-include screen="modules/hls/hls_common_javascript.lview"/>
......@@ -54,6 +55,24 @@
return '<a href="javascript:hls536_link_dynamic(' + record.id + ',' + record.get('journal_header_id') + ');">' + value + '</a>';
}
function receipt_attachment_upload(val,rec,name){
return '<a href=javascript:open_upload_window('+rec.get('journal_header_id')+')>附件</a>';
}
function open_upload_window(record_id){
var url = $('journal_attachment_uploadFile_id').getUrl() + '?table_name=HLS_JOURNAL_HEADER_IMP&header_id=' + record_id;
var win = new Leaf.Window({
url: url,
title: '${l:HLS.SUPPORTING_DOCUMENT}',
id: 'attachment_uploadFile_id',
width: 850,
height: 400
});
win.on('close', function() {
hls536_journal_query();
});
}
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
<a:dataSets>
......@@ -129,7 +148,7 @@
<a:field name="merge_parent_flag" defaultValue="N"/>
</a:fields>
</a:dataSet>
<a:dataSet id="hls_journal_header_result_ds" autoPageSize="true" autoQuery="true" model="hls.HLS536.hls_journal_import_header" queryDataSet="hls_journal_header_query" selectable="true">
<a:dataSet id="hls_journal_header_result_ds" autoPageSize="true" autoQuery="true" model="hls.HLS536.hls_journal_import_header_wfl" queryDataSet="hls_journal_header_query" selectable="true">
</a:dataSet>
</a:dataSets>
<a:screenBody>
......@@ -162,6 +181,9 @@
<a:column name="description" prompt="凭证摘要" width="220"/>
<a:column name="je_detail_count" prompt="凭证行数量" width="50"/>
<a:column name="wfl_status_n" prompt="凭证导入状态" width="100"/>
<a:column name="reverse_wfl_status_n" prompt="凭证反冲状态" width="100"/>
<a:column name="error_message" prompt="错误信息" width="150"/>
<a:column name="attachment_file" prompt="附件" width="120" renderer="receipt_attachment_upload" align="center"/>
</a:columns>
</a:grid>
</a:screenBody>
......
src/main/webapp/modules/sys/SYS1010/sys_code.lview
View file @ d4679e6b
......@@ -200,6 +200,8 @@
<a:column name="ref_v02" editorFunction="codeValueNameEditer" width="100"/>
<a:column name="ref_v03" editorFunction="codeValueNameEditer" width="100"/>
<a:column name="ref_v04" editorFunction="codeValueNameEditer" width="100"/>
<a:column name="credit_code" editorFunction="codeValueNameEditer" width="100"/>
<a:column name="credit_name" editorFunction="codeValueNameEditer" width="100"/>
</a:columns>
<a:editors>
<a:checkBox id="sys_code_ref_grid_ckb"/>
......
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