Skip to content

L
leaf-hlcm
Commit 79e93377 authored by 18083's avatar 18083
Browse files
Options

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

parents 3217b419 526740e9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 415 additions and 34 deletions
src/main/resources/com/hand/hls/hlcm/cont/mapper/ConExportMapper.xml
View file @ 79e93377
......@@ -13,7 +13,7 @@
<select id="selectCashflowList" parameterType="integer" resultType="java.util.LinkedHashMap">
Select
Select
contract_id,
cashflow_id,
write_off_id,
......@@ -101,10 +101,14 @@
cwo.write_off_due_amount received_amount,
(ccc.due_amount -
nvl((Select Sum(tn.write_off_due_amount)
From csh_write_off tn
From csh_write_off tn,csh_transaction ct
Where tn.cashflow_id = cwo.cashflow_id
And tn.creation_date &lt;=
cwo.creation_date),
and tn.csh_transaction_id=ct.transaction_id
and (ct.transaction_date &lt; t.transaction_date or
(ct.transaction_date = t.transaction_date and
(tn.write_off_date &lt; cwo.write_off_date or
(tn.write_off_date = cwo.write_off_date and
tn.write_off_id &lt;= cwo.write_off_id))))),
0)) As unreceived_amount
From con_contract_cashflow ccc,
con_contract c,
......@@ -343,10 +347,14 @@
cwo.write_off_due_amount received_amount,
(ccc.due_amount -
nvl((Select Sum(tn.write_off_due_amount)
From csh_write_off tn
From csh_write_off tn,csh_transaction ct
Where tn.cashflow_id = cwo.cashflow_id
And tn.creation_date &lt;=
cwo.creation_date),
and tn.csh_transaction_id=ct.transaction_id
and (ct.transaction_date &lt; t.transaction_date or
(ct.transaction_date = t.transaction_date and
(tn.write_off_date &lt; cwo.write_off_date or
(tn.write_off_date = cwo.write_off_date and
tn.write_off_id &lt;= cwo.write_off_id))))),
0)) As unreceived_amount
From con_contract_cashflow ccc,
con_contract c,
......@@ -618,11 +626,14 @@
cwo.write_off_due_amount received_amount,
(ccc.due_amount -
nvl((Select Sum(tn.write_off_due_amount)
From csh_write_off tn
Where tn.cashflow_id =
cwo.cashflow_id
And tn.creation_date &lt;=
cwo.creation_date),
From csh_write_off tn,csh_transaction ct
Where tn.cashflow_id = cwo.cashflow_id
and tn.csh_transaction_id=ct.transaction_id
and (ct.transaction_date &lt; t.transaction_date or
(ct.transaction_date = t.transaction_date and
(tn.write_off_date &lt; cwo.write_off_date or
(tn.write_off_date = cwo.write_off_date and
tn.write_off_id &lt;= cwo.write_off_id))))),
0)) As unreceived_amount
From con_contract_cashflow ccc,
con_contract c,
......@@ -874,11 +885,14 @@
cwo.write_off_due_amount received_amount,
(ccc.due_amount -
nvl((Select Sum(tn.write_off_due_amount)
From csh_write_off tn
Where tn.cashflow_id =
cwo.cashflow_id
And tn.creation_date &lt;=
cwo.creation_date),
From csh_write_off tn,csh_transaction ct
Where tn.cashflow_id = cwo.cashflow_id
and tn.csh_transaction_id=ct.transaction_id
and (ct.transaction_date &lt; t.transaction_date or
(ct.transaction_date = t.transaction_date and
(tn.write_off_date &lt; cwo.write_off_date or
(tn.write_off_date = cwo.write_off_date and
tn.write_off_id &lt;= cwo.write_off_id))))),
0)) As unreceived_amount
From con_contract_cashflow ccc,
con_contract c,
......@@ -1079,7 +1093,6 @@
transaction_date,
write_off_date)
</select>
......
src/main/webapp/WEB-INF/classes/sys/SYS1010/sys_code_values.lwm
View file @ 79e93377
......@@ -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/modules/hls/HLS214N/hls_bp_master_modify.lview
View file @ 79e93377
......@@ -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 @ 79e93377
......@@ -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/hls_journal_import_entrance.lview
View file @ 79e93377
......@@ -147,6 +147,10 @@
var journal_type = records[0].get('journal_type');
param['wfl_type'] = journal_type;
}
//当属于工资工作模板工作流的单条凭证被提交时,wfl_type也要为 SALARIES
if(records.length == 1 && is_salaries){
param['wfl_type'] = 'SALARIES';
}
if ($(ds_id).validate()) {
Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认提交审批？', function () {
Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
......
src/main/webapp/modules/sys/SYS1010/sys_code.lview
View file @ 79e93377
......@@ -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