Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
leaf-hlcm
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hlcm
leaf-hlcm
Commits
089708ac
Commit
089708ac
authored
Nov 03, 2022
by
xsh241908
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[建机]神钢建机新增产品线
parent
38ffcfd3
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
209 additions
and
59 deletions
+209
-59
sys_code_value_v_lease.lwm
...n/webapp/WEB-INF/classes/basic/sys_code_value_v_lease.lwm
+3
-3
csh_payment_req_ln_query.lwm
...p/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query.lwm
+5
-3
acr_invoice_condition_n.lview
.../webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview
+1
-0
con_basic_clause_detail.lview
.../webapp/modules/cont/CON202/con_basic_clause_detail.lview
+2
-0
contract_sales_report.lview
...n/webapp/modules/cont/CON3400/contract_sales_report.lview
+4
-0
contract_ifrs9_report.lview
...n/webapp/modules/cont/CON3500/contract_ifrs9_report.lview
+7
-1
contract_ifrs9_report_query.lview
...pp/modules/cont/CON3500/contract_ifrs9_report_query.lview
+44
-34
con_doc_batch_create.lsc
src/main/webapp/modules/cont/CON500/con_doc_batch_create.lsc
+3
-1
con_contract_modify.lview
...main/webapp/modules/cont/CON505/con_contract_modify.lview
+1
-1
con_contract_cashflow_monthly.lview
...p/modules/cont/CON930/con_contract_cashflow_monthly.lview
+4
-0
csh_payment_create_entrance.lview
...bapp/modules/csh/CSH501/csh_payment_create_entrance.lview
+1
-0
csh_payment_req.lview
src/main/webapp/modules/csh/CSH501/csh_payment_req.lview
+36
-0
csh_payment_req_selected.lview
.../webapp/modules/csh/CSH501/csh_payment_req_selected.lview
+1
-1
hls_fin_calculator_update_n.lview
...app/modules/hls/HLS500N/hls_fin_calculator_update_n.lview
+51
-5
prj_project_create.lview
src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
+22
-3
prj_project_maintain.lview
...ain/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
+13
-4
prj_project_maintain_wfl_new.lview
...pp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview
+11
-3
No files found.
src/main/webapp/WEB-INF/classes/basic/sys_code_value_v_lease.lwm
View file @
089708ac
...
...
@@ -26,7 +26,7 @@
WHERE t.user_id = ${/session/@user_id}
AND unit_code NOT IN ('9998')
and PARENT_UNIT_ID = 1544
AND v.code_value IN ('10', '20', '30', '40'))
AND v.code_value IN ('10', '20', '30', '40'
,'91'
))
UNION ALL
SELECT v.code_value AS value_code, v.code_value_name AS value_name
FROM sys_code_values_v v
...
...
@@ -37,14 +37,14 @@
FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id}
and PARENT_UNIT_ID <>
1544
AND v.code_value IN ('10', '20', '30', '40','50','70','80','90'))
AND v.code_value IN ('10', '20', '30', '40','50','70','80','90'
,'91'
))
UNION ALL
SELECT v.code_value AS value_code, v.code_value_name AS value_name
FROM sys_code_values_v v
WHERE v.code_enabled_flag = 'Y'
AND v.code_value_enabled_flag = 'Y'
AND v.code = 'DIVISION'
AND v.code_value IN ('10', '20', '30', '40','50','70','80','90')
AND v.code_value IN ('10', '20', '30', '40','50','70','80','90'
,'91'
)
AND NOT EXISTS (SELECT 1
FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id}
...
...
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query.lwm
View file @
089708ac
...
...
@@ -5,7 +5,7 @@
$Revision: 1.0
$Purpose:
-->
<bm:model
xmlns:bm=
"http://www.leaf-framework.org/schema/bm"
xmlns:f=
"leaf.database.features"
alias=
"t1"
<bm:model
xmlns:bm=
"http://www.leaf-framework.org/schema/bm"
alias=
"t1"
baseTable=
"CSH_PAYMENT_REQ_LN"
needAccessControl=
"false"
>
<bm:operations>
<bm:operation
name=
"query"
>
...
...
@@ -86,7 +86,8 @@
v.entrusted_amount,
v.amount_tenant,
v.write_off_date,
v.write_off_amount
v.write_off_amount,
v.finance_amount
FROM (SELECT t.contract_id,
(SELECT hbbc.bank_account_id
FROM hls_bp_master_bank_account hbbc
...
...
@@ -216,7 +217,8 @@
where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=t.contract_id) write_off_date,
nvl((select sum(cwo.write_off_due_amount) write_off_amount
from csh_write_off cwo
where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=t.contract_id),0) write_off_amount
where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=t.contract_id),0) write_off_amount,
t.finance_amount
FROM con_contract_cashflow f
join con_contract t
on t.contract_id = f.contract_id
...
...
src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview
View file @
089708ac
...
...
@@ -296,6 +296,7 @@
<a:record
code_value=
"40"
code_value_name=
"其它"
/>
<a:record
code_value=
"50"
code_value_name=
"星邦高空作业车"
/>
<a:record
code_value=
"90"
code_value_name=
"租赁二手机"
/>
<a:record
code_value=
"91"
code_value_name=
"神钢建机"
/>
</a:datas>
</a:dataSet>
...
...
src/main/webapp/modules/cont/CON202/con_basic_clause_detail.lview
View file @
089708ac
...
...
@@ -120,6 +120,7 @@
</a:toolBar>
<a:columns>
<a:column
name=
"contract_number"
editor=
"lov"
prompt=
"合同编号"
width=
"100"
/>
<a:column
name=
"clause_id"
editor=
"lov"
prompt=
"合同编号"
width=
"100"
/>
<!-- <a:column name="withhold_way_n" editor="cb" prompt="代扣方式"/>-->
<a:column
name=
"pay_method_n"
editor=
"cb"
prompt=
"支付方式"
/>
...
...
@@ -128,6 +129,7 @@
<a:column
name=
"secondary_lease_n"
editor=
"cb"
prompt=
"二次租赁"
width=
"100"
/>
<a:column
name=
"bp_class_n"
editor=
"cb"
prompt=
"商业伙伴分类"
width=
"100"
/>
<a:column
name=
"business_type_n"
editor=
"lov"
prompt=
"业务类型"
width=
"80"
/>
<a:column
name=
"business_type"
editor=
"lov"
prompt=
"业务类型"
width=
"80"
/>
<a:column
name=
"document_type_n"
editor=
"lov"
prompt=
"单据类型"
width=
"80"
/>
<a:column
name=
"finance_type_n"
editor=
"cb"
prompt=
"融资业务类型"
width=
"80"
/>
<a:column
name=
"division_n"
editor=
"lov"
prompt=
"产品线"
width=
"100"
/>
...
...
src/main/webapp/modules/cont/CON3400/contract_sales_report.lview
View file @
089708ac
...
...
@@ -109,6 +109,9 @@
};
if(record.data.lease_name90=='Y'){
record.data.division=record.data.division+',90';
};
if(record.data.lease_name91=='Y'){//addby xsh35973 20221011 I-12357新增产品线
record.data.division=record.data.division+',91';
};
record.data.division=record.data.division.substr(1,record.data.division.length);
$('contract_sales_result_ds').query();
...
...
@@ -200,6 +203,7 @@
<a:checkBox
name=
"lease_name80"
bindTarget=
"contract_sales_report_ds"
prompt=
"叉车"
/>
<a:checkBox
name=
"lease_name90"
bindTarget=
"contract_sales_report_ds"
prompt=
"租赁二手机"
/>
<a:checkBox
name=
"lease_name40"
bindTarget=
"contract_sales_report_ds"
prompt=
"其它"
/>
<a:checkBox
name=
"lease_name91"
bindTarget=
"contract_sales_report_ds"
prompt=
"神钢建机"
/>
//addby xsh35973 20221011 I-12357新增产品线
</a:form>
...
...
src/main/webapp/modules/cont/CON3500/contract_ifrs9_report.lview
View file @
089708ac
...
...
@@ -33,6 +33,7 @@
record.data.division7='';
record.data.division8='';
record.data.division9='';
record.data.division10='';
if(record.data.lease_name10=='Y'){
record.data.division1='10';
}
...
...
@@ -60,9 +61,12 @@
if(record.data.lease_name90=='Y'){
record.data.division9='90';
};
if(record.data.lease_name91=='Y'){
record.data.division10='91';
};
// record.data.division=record.data.division.substr(1,record.data.division.length);
if(record.data.division1 == ''&&record.data.division2 == ''&&record.data.division3 == ''&&record.data.division4 == ''
&&record.data.division5 == ''&&record.data.division6 == ''&&record.data.division7 == ''&&record.data.division8 == ''&&record.data.division9 == ''){
&&record.data.division5 == ''&&record.data.division6 == ''&&record.data.division7 == ''&&record.data.division8 == ''&&record.data.division9 == ''
&&record.data.division10 == ''
){
// record.data.division1='10,20,30,40,50,60,70,80';
record.data.division1='10';
record.data.division2='20';
...
...
@@ -73,6 +77,7 @@
record.data.division7='70';
record.data.division8='80';
record.data.division9='90';
record.data.division10='91';
};
param['division1']= record.data.division1;
param['division2']= record.data.division2;
...
...
@@ -83,6 +88,7 @@
param['division7']= record.data.division7;
param['division8']= record.data.division8;
param['division9']= record.data.division9;
param['division10']= record.data.division10;
param['period_name']=period_name;
param['function_code'] = 'CON3400N';
param['function_usage'] = 'MODIFY';
...
...
src/main/webapp/modules/cont/CON3500/contract_ifrs9_report_query.lview
View file @
089708ac
<?xml version="1.0" encoding="UTF-8"?>
<a:screen
xmlns:a=
"http://www.leaf-framework.org/application"
customizationEnabled=
"true"
dynamiccreateenabled=
"true"
trace=
"true"
>
<!-- <a:init-procedure>-->
<!-- <a:model-query model="cont.CON3500.contract_ifrs9_report_flag_query" rootPath="status"/>-->
<!-- </a:init-procedure>-->
<!-- <a:init-procedure>-->
<!-- <a:model-query model="cont.CON3500.contract_ifrs9_report_flag_query" rootPath="status"/>-->
<!-- </a:init-procedure>-->
<a:init-procedure>
<a:model-query
fetchAll=
"true"
model=
"cont.CON3500.contract_ifrs9_report_flag_query"
rootPath=
"/model/status"
/>
<a:model-query
fetchAll=
"true"
model=
"cont.CON3500.contract_ifrs9_report_temp"
rootPath=
"/model/job_status"
/>
...
...
@@ -38,31 +38,41 @@
console.log(flag);
if(flag=='Y'){
$("${/parameter/@layout_code}_user_button1").disable();
$("${/parameter/@layout_code}_user_button2").disable();
$("${/parameter/@layout_code}_user_button3").disable();
}else if(job_flag>
0){
$("${/parameter/@layout_code}_user_button1").disable();
$("${/parameter/@layout_code}_user_button2").disable();
var reminder=document.getElementsByClassName('screenTopToolbar');
for(var i=0;i
<reminder.length
;
i=
i+1){
var
t=
reminder[i];
t.insertAdjacentHTML('afterend',
'<div
class=
"alert alert-danger"
id=
"reminder"
role=
"alert"
>
job正在运行中,请尝试点击获取结果按钮获得结果!
</div>
');
}
}
else{
var reminder=document.getElementsByClassName('screenTopToolbar');
for(var i=0;i
<reminder.length
;
i=
i+1){
var
t=
reminder[i];
t.insertAdjacentHTML('afterend',
'<div
class=
"alert alert-danger"
id=
"reminder"
role=
"alert"
>
数据只能保存一次,请确认后保存
</div>
');
}
}
if(flag=='Y'){
$("${/parameter/@layout_code}_user_button1").disable();
$("${/parameter/@layout_code}_user_button2").disable();
$("${/parameter/@layout_code}_user_button3").disable();
}else if(job_flag>
0){
$("${/parameter/@layout_code}_user_button1").disable();
$("${/parameter/@layout_code}_user_button2").disable();
var reminder=document.getElementsByClassName('screenTopToolbar');
for(var i=0;i
<reminder.length
;
i=
i+1){
var
t=
reminder[i];
t.insertAdjacentHTML('afterend',
'<div
class=
"alert alert-danger"
id=
"reminder"
role=
"alert"
>
job正在运行中,请尝试点击获取结果按钮获得结果!
</div>
');
}
}
else{
var reminder=document.getElementsByClassName('screenTopToolbar');
for(var i=0;i
<reminder.length
;
i=
i+1){
var
t=
reminder[i];
t.insertAdjacentHTML('afterend',
'<div
class=
"alert alert-danger"
id=
"reminder"
role=
"alert"
>
数据只能保存一次,请确认后保存
</div>
');
}
}
debugger
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_ifrs9');
$(ds_id).setQueryParameter("period_name",'${/parameter/@period_name}');
$(ds_id).setQueryParameter("period_names",'${/parameter/@period_name}');
// $(ds_id).setQueryParameter("divisions",'${/parameter/@division1},${/parameter/@division2},${/parameter/@division3},${/parameter/@division4},${/parameter/@division5},${/parameter/@division6},${/parameter/@division7},${/parameter/@division8}');
$(ds_id).setQueryParameter("division1",'${/parameter/@division1}');
$(ds_id).setQueryParameter("division2",'${/parameter/@division2}');
$(ds_id).setQueryParameter("division3",'${/parameter/@division3}');
$(ds_id).setQueryParameter("division4",'${/parameter/@division4}');
$(ds_id).setQueryParameter("division5",'${/parameter/@division5}');
$(ds_id).setQueryParameter("division6",'${/parameter/@division6}');
$(ds_id).setQueryParameter("division7",'${/parameter/@division7}');
$(ds_id).setQueryParameter("division8",'${/parameter/@division8}');
$(ds_id).setQueryParameter("division8",'${/parameter/@division10}');
$(ds_id).query();
})
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
...
...
@@ -78,13 +88,13 @@
period_name:period_name
},
success: function(result) {
$("${/parameter/@layout_code}_user_button1").disable();
$("${/parameter/@layout_code}_user_button2").disable();
$("${/parameter/@layout_code}_user_button1").disable();
$("${/parameter/@layout_code}_user_button2").disable();
// Leaf.SideBar.show({
// msg: '数据正在执行中...',
// duration: 2000
// });
// Leaf.Masker.unmask(Ext.getBody());
// Leaf.Masker.unmask(Ext.getBody());
Leaf.Masker.unmask(Ext.getBody());
document.getElementById("reminder").innerText='数据正在更新中,请稍后(请更新成功后再进行导出操作)';
$(ds_id).removeAll();
...
...
@@ -108,7 +118,7 @@
//保存数据
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
var period_name="${/parameter/@period_name}";
var period_name="${/parameter/@period_name}";
Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
Leaf.request({
url: $('update_ifrs9_report_link').getUrl(),
...
...
@@ -138,7 +148,7 @@
window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_ifrs9');
$(ds_id).setQueryParameter("period_name",'${/parameter/@period_name}');
//查看job有没有返回结果
//查看job有没有返回结果
Leaf.Masker.mask(Ext.getBody());
Leaf.request({
url: $('get_job_finish_flag_link').getUrl(),
...
...
@@ -168,9 +178,9 @@
});
};
//承租人最大逾期天数
//承租人最大逾期天数
window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function() {
var url = $('contract_ifrs9_sum_report_link').getUrl();
var url = $('contract_ifrs9_sum_report_link').getUrl();
new Leaf.Window({
id: 'contract_ifrs9_sum_report_link_winid',
params: {
...
...
@@ -182,7 +192,7 @@
width: 900,
height: 600
}).on('close', function () {
null;
null;
});
...
...
src/main/webapp/modules/cont/CON500/con_doc_batch_create.lsc
View file @
089708ac
...
...
@@ -120,7 +120,9 @@
||record_data.templet_code == 'FINANCE_LEASE_CONTRACT_FIN_A4'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_TJ'||record_data.templet_code =='CON_CONTRACT_MORTGAGE_TJ'
||record_data.templet_code =='FINANCE_LEASE_CONTRACT_TJ_SURE'||record_data.templet_code =='FINANCE_LEASE_CONTRACT_TJ_FR'
||record_data.templet_code =='FINANCE_LEASE_CONTRACT_D_ESWJ' ||record_data.templet_code =='BUSINESS_CONTRACT_D_ESWJ_OEC'||record_data.templet_code =='BUSINESS_CONTRACT_D_ESWJ'
||record_data.templet_code =='FINANCE_LEASE_CONTRACT_FR_TJ') { //update by xsh35973 添加法人铁甲保证函
||record_data.templet_code =='FINANCE_LEASE_CONTRACT_FR_TJ' //update by xsh35973 添加法人铁甲保证函
//addby xsh35973 20221017 神钢建机
||record_data.templet_code =='FINANCE_LEASE_CONTRACT_SG'||record_data.templet_code =='FINANCE_LEASE_CON_SG'||record_data.templet_code =='BUSINESS_CONTRACT_SG'||record_data.templet_code =='CON_CONTRACT_LEASE_BACK_SG') {
// word转pdf
var pdf_file_path=datePath+guid_file_name_tables[0].guid_file_name + 'con_' + record_data.content_id;
...
...
src/main/webapp/modules/cont/CON505/con_contract_modify.lview
View file @
089708ac
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/main/webapp/modules/cont/CON930/con_contract_cashflow_monthly.lview
View file @
089708ac
...
...
@@ -42,6 +42,9 @@
if(record.data.lease_name90=='Y'){
record.data.division=record.data.division+',90';
};
if(record.data.lease_name91=='Y'){//addby xsh35973 20221011 I-12357新增产品线
record.data.division=record.data.division+',91';
};
record.data.division=record.data.division.substr(1,record.data.division.length);
Leaf.Masker.mask(Ext.getBody(), '正在统计并查询,请稍等...');
Leaf.request({
...
...
@@ -169,6 +172,7 @@
<a:checkBox
name=
"lease_name80"
bindTarget=
"con_contract_cashflow_monthly_query_ds"
prompt=
"叉车"
/>
<a:checkBox
name=
"lease_name90"
bindTarget=
"con_contract_cashflow_monthly_query_ds"
prompt=
"租赁二手机"
/>
<a:checkBox
name=
"lease_name40"
bindTarget=
"con_contract_cashflow_monthly_query_ds"
prompt=
"其它"
/>
<a:checkBox
name=
"lease_name91"
bindTarget=
"con_contract_cashflow_monthly_query_ds"
prompt=
"神钢建机"
/>
//addby xsh35973 20221011 I-12357新增产品线
...
...
src/main/webapp/modules/csh/CSH501/csh_payment_create_entrance.lview
View file @
089708ac
...
...
@@ -228,6 +228,7 @@
param['division'] = record.get('division');
param['approval_status'] = record.get('approval_status');
param['con_business_type'] = record.get('con_business_type');
param['division'] = record.get('division');
if (record.get('business_type') == 'PAYMENT') {
param['function_code'] = 'CSH501D';
} else if (record.get('business_type') == 'PREPAYMENT') {
...
...
src/main/webapp/modules/csh/CSH501/csh_payment_req.lview
View file @
089708ac
...
...
@@ -174,6 +174,18 @@
}
}
}
if
(
con_business_type =
=
'LEASEBACK'){
debugger
if
('${/parameter/@division}'
==91||'${/parameter/@division}'
=='神钢建机'){
var
ds_id =
get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],
'csh_payment_req_ln');
var
records =
$(ds_id).getAll();
for
(
i =
0;
i
<
records.length;
i++)
{
records[i].getField('tenant_bank_account_number').setRequired(false);
records[i].getField('tenant_bank_account_number_n').setRequired(false);
records[i].getField('tenant_bank_account_name').setRequired(false);
}
}
}
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
};
...
...
@@ -201,6 +213,30 @@
}
}
}
if
('${/parameter/@division}'
==91||'${/parameter/@division}'
=='神钢建机'){
debugger
if
(
con_business_type =
=
'LEASEBACK'){
var
ds_id =
get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],
'csh_payment_req_ln');
var
records =
$(ds_id).getAll();
for
(
i =
0;
i
<
records.length;
i++)
{
records[i].getField('tenant_bank_account_number').setRequired(false);
records[i].getField('tenant_bank_account_number_n').setRequired(false);
records[i].getField('tenant_bank_account_name').setRequired(false);
}
}
var
ds_id =
get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],
'csh_payment_req_ln');
var
records =
$(ds_id).getAll();
for
(
i =
0;
i
<
records.length;
i++)
{
if
(records[i].getField('amount_agent'))
{
records[i].set('amount_agent',
0);
};
if
(records[i].getField('amount_vender'))
{
records[i].set('amount_vender',records[i].get('finance_amount'));
};
}
}
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}
...
...
src/main/webapp/modules/csh/CSH501/csh_payment_req_selected.lview
View file @
089708ac
...
...
@@ -119,7 +119,7 @@
// param['division_n'] = record.get('division_n');
// param['contract_name'] = record.get('contract_name');
// param['cdd_list_id'] = record.get('cdd_list_id');
//
param['division'] = record.get('division');
param['division'] = record.get('division');
// param['first_contract_day'] = record.get('first_contract_day');
//add by 9188
...
...
src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview
View file @
089708ac
...
...
@@ -5,7 +5,8 @@
$Revision: 1.0
$Purpose:
-->
<a:screen
xmlns:c=
"leaf.application.action"
xmlns:s=
"leaf.plugin.script"
xmlns:a=
"http://www.leaf-framework.org/application"
xmlns:p=
"uncertain.proc"
customizationEnabled=
"true"
trace=
"true"
>
<a:screen
xmlns:c=
"leaf.application.action"
xmlns:a=
"http://www.leaf-framework.org/application"
xmlns:p=
"uncertain.proc"
customizationEnabled=
"true"
trace=
"true"
>
<a:init-procedure
participants=
"leaf.service.exception.ExceptionHandler"
>
<a:model-query
defaultWhereClause=
"d.enabled_flag='Y' and nvl(d.display_flag,'N')!='N'"
fetchAll=
"true"
model=
"hls.HLS500.hls_fin_calc_config_ln"
rootPath=
"calc_config_ln_path"
/>
<a:model-query
defaultWhereClause=
"d.enabled_flag='Y'"
fetchAll=
"true"
model=
"hls.HLS500.hls_fin_calc_config_ln"
rootPath=
"calc_config_ln_all_path"
/>
...
...
@@ -56,6 +57,27 @@
border:none;
margin-left:3px;
}
.item-slideBar{
top:10px;
width:600px;
height:60px;
border:1px solid #009900;
background-color:#CCFBD5;
color:#009900;
font-weight:bold;
font-size:12px;
text-align:center;
line-height:20px;
white-space :nowrap;
position:absolute;
}
.item-slideBar .inner{
width: 600px;
max-width: 500px;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
]]>
</style>
<script
src=
"${/request/@context_path}/javascripts/calculate.js"
type=
"text/javascript"
/>
<a:screen-include
screen=
"modules/hls/HLS500/hls_fin_calculator_dynamic.lview?calc_session_id=${/parameter/@calc_session_id}&calc_type=CLASSIC_CALCULATOR&document_category=${/parameter/@document_category}&winId=${/parameter/@winId}"
/>
...
...
@@ -337,7 +359,8 @@
global_flag: 'Y',
id_num: id_num,
recreate_H_formula: recreate_H_formula,
recreate_L_formula: recreate_L_formula
recreate_L_formula: recreate_L_formula,
division:'${/parameter/@division}'
},
url: url,
title: '${l:HLS.FIN_CALCULATOR}',
...
...
@@ -1500,6 +1523,7 @@
function hls_hls500_save_new(nextStep, source_procedure) {
debugger;
var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
var H1, H54, H159, H16, H12,H99,H102;
for (var i = 0; i
< temp_head_records.length
;
i++)
{
...
...
@@ -1520,6 +1544,13 @@
H102 =
temp_head_records[i].get('column_value')
||
0;
}
}
debugger
if
('${/parameter/@division}'==91
&&
(((H1<=12
&&
plus(H54,4.75)
!=
6.85)
||
(H1
>
12
&&
plus(H54,4.75) != 7.3))||H54
< 0
)){
Leaf.SideBar.show({
msg:"租赁期为一年及以内的,利率为6.85%,大于一年的7.3%</br
>
利率最低值不能低于4.75%",
duration: 5000
});
}
// if(H1
<2
){
//
Leaf.showMessage('${l:PROMPT}',
'系统暂时不支持还款期数小于2期的租金计划');
//
return
false;
...
...
@@ -1529,7 +1560,7 @@
unlock_calc_current_window();
return false;
}
if (H54
< 0
)
{
if (H54
< 0
&&'${/parameter/@division}'!=91
)
{
Leaf.showMessage('${l:PROMPT}',
'利率最低值不能低于4.75');
unlock_calc_current_window();
return
false;
...
...
@@ -1542,9 +1573,16 @@
if
('${/parameter/@document_category}'
==
'PROJECT'
&&
'${/parameter/@business_type}'=='LEASEBACK')
{
var
dowm_payment =
div(H16,
plus(H99,H102)).toFixed(2)
*
100;
if
(dowm_payment
<
15)
{
if
('${/parameter/@division}'!=91)
{
Leaf.showMessage('${l:PROMPT}',
'回租首付款比例不低于15%');
unlock_calc_current_window();
return
false;
}else{
Leaf.SideBar.show({
msg:
"回租首付款比例不低于15%</br
>
租赁期为一年及以内的,利率为6.85%,大于一年的7.3%
</br>
利率最低值不能低于4.75%",
duration: 5000
});
}
}
}
...
...
@@ -1586,9 +1624,17 @@
//
alert(div((H16+H97),
(H99+H102-H16)).toFixed(2)
*
1);
var
show =
down_payment_rate_new
*
100;
if
((div((H16
+
H97),
(H99
+
H102
-
H16)).toFixed(2)
*
1)
<
down_payment_rate_new)
{
unlock_calc_current_window();
if
('${/parameter/@division}'!=91)
{
Leaf.showMessage('${l:PROMPT}',
'首付款比例+首付款保证金比例之和不能低于'
+
down_payment_rate_new
*
100
+
'%');
return
false;
unlock_calc_current_window();
return
false;
}else{
Leaf.SideBar.show({
msg:'首付款比例+首付款保证金比例之和不能低于'
+
down_payment_rate_new
*
100
+
'%</br
>
租赁期为一年及以内的,利率为6.85%,大于一年的7.3%
</br>
利率最低值不能低于4.75%',
duration: 10000
});
}
}
}
}
...
...
src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
View file @
089708ac
...
...
@@ -135,7 +135,8 @@
global_flag: 'Y',
id_num: 0,
calc_type: '${/parameter/@calc_type}' || 'CLASSIC_CALCULATOR',
recreate_L_formula: calc_recreate_L_formula
recreate_L_formula: calc_recreate_L_formula,
division:'${/parameter/@division}'
},
url: url,
fullScreen: true,
...
...
@@ -178,7 +179,8 @@
global_flag: 'Y',
id_num: 0,
calc_type: '${/parameter/@calc_type}',
recreate_L_formula: 'N'
recreate_L_formula: 'N',
division:'${/parameter/@division}'
},
url: url,
fullScreen: true,
...
...
@@ -381,7 +383,7 @@
if (record.get('signing_city')){
var reg = /^([\u2E80-\u9FFF]){4,}$/;
if (!reg.test(record.get('signing_city'))) {
$L.showErrorMessage('提示', '合同签订地
请输入**市**区
!');
$L.showErrorMessage('提示', '合同签订地
建议格式:“xx市xx区”(也可填写详细地址)
!');
return false;
}
}
...
...
@@ -1344,6 +1346,23 @@
$('PROJECT_CREATE_NP_G_LEASE_HEAD_CAR_prj_project_lease_item_layout_grid_id').hideColumn('item_type_n');
$('PROJECT_CREATE_NP_G_LEASE_HEAD_CAR_prj_project_lease_item_layout_grid_id').hideColumn('equipment_type_n');
$('PROJECT_CREATE_NP_G_LEASE_HEAD_CAR_prj_project_lease_item_layout_grid_id').hideColumn('machine_number');
}else
if
(
division=
='91'){
//若为神钢建机
var
ds_id =
get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],
'prj_project');
var
current_record =
$(ds_id).getCurrentRecord();
current_record.set('payment_deduction','TRI_AGREEMENT');
current_record.set('payment_deduction_n','三方协议');
current_record.getField('payment_deduction').setReadOnly(true);
current_record.getField('payment_deduction_n').setReadOnly(true);
$('PROJECT_CREATE_NP_G_LEASE_HEAD_CAR_prj_project_lease_item_layout_grid_id').hideColumn('machine_number_70');
$('PROJECT_CREATE_NP_G_LEASE_HEAD_CAR_prj_project_lease_item_layout_grid_id').hideColumn('lease_name_n');
$('PROJECT_CREATE_NP_G_LEASE_HEAD_CAR_prj_project_lease_item_layout_grid_id').hideColumn('brand_value');
$('PROJECT_CREATE_NP_G_LEASE_HEAD_CAR_prj_project_lease_item_layout_grid_id').hideColumn('type_name');
$('PROJECT_CREATE_NP_G_LEASE_HEAD_CAR_prj_project_lease_item_layout_grid_id').hideColumn('produce_date');
$('PROJECT_CREATE_NP_G_LEASE_HEAD_CAR_prj_project_lease_item_layout_grid_id').hideColumn('using_hour');
$('PROJECT_CREATE_NP_G_LEASE_HEAD_CAR_prj_project_lease_item_layout_grid_id').hideColumn('detention_amount');
$('PROJECT_CREATE_NP_G_LEASE_HEAD_CAR_prj_project_lease_item_layout_grid_id').hideColumn('residual_value_amount');
$('PROJECT_CREATE_NP_G_LEASE_HEAD_CAR_prj_project_lease_item_layout_grid_id').hideColumn('ownership_flag_n');
$('PROJECT_CREATE_NP_G_LEASE_HEAD_CAR_prj_project_lease_item_layout_grid_id').hideColumn('created_by_n');
}
else
{
$('PROJECT_CREATE_NP_G_LEASE_HEAD_CAR_prj_project_lease_item_layout_grid_id').hideColumn('machine_number_70');
...
...
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @
089708ac
...
...
@@ -201,7 +201,8 @@
global_flag: 'Y',
id_num: 1,
calc_type: '${/parameter/@calc_type}' || 'CLASSIC_CALCULATOR',
recreate_L_formula: calc_recreate_L_formula
recreate_L_formula: calc_recreate_L_formula,
division:'${/parameter/@division}'
},
url: url,
fullScreen: true,
...
...
@@ -247,7 +248,8 @@
global_flag: 'Y',
id_num: 1,
calc_type: '${/parameter/@calc_type}',
recreate_L_formula: 'N'
recreate_L_formula: 'N',
division:'${/parameter/@division}'
},
url: url,
fullScreen: true,
...
...
@@ -299,7 +301,8 @@
global_flag: 'Y',
id_num: 1,
calc_type: '${/parameter/@calc_type}' || 'CLASSIC_CALCULATOR',
recreate_L_formula: calc_recreate_L_formula
recreate_L_formula: calc_recreate_L_formula,
division:'${/parameter/@division}'
},
url: url,
fullScreen: true,
...
...
@@ -1062,6 +1065,12 @@
record.getField('bank_account_id_n').setRequired(false);
}
if
(
division=
='91')
{
//若为神钢建机
var
ds_id =
get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],
'prj_project');
var
current_record =
$(ds_id).getCurrentRecord();
current_record.getField('payment_deduction').setReadOnly(true);
current_record.getField('payment_deduction_n').setReadOnly(true);
}
//深圳美鹏和hcs显示分公司,其他隐藏
var
bp_code =
'${/model/user_agent_description/record/@bp_code}'
;
if
(!Ext.isEmpty(bp_code)
&&
bp_code
!==
'D00010001'
&&
bp_code
!==
'D00000009')
{
...
...
@@ -1700,7 +1709,7 @@
//
var
reg =
/^([\u2E80-\u9FFF]){4,}$/;
var
reg =
/^(.){4,}$/;
if
(!reg.test(record.get('signing_city')))
{
$L.showErrorMessage('
',
'
建议格式:“xx市xx区”(也可填写详细地址)!');
$L.showErrorMessage('
提示',
'合同签订地
建议格式:“xx市xx区”(也可填写详细地址)!');
return
false;
}
}
...
...
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview
View file @
089708ac
...
...
@@ -190,7 +190,8 @@
global_flag: 'Y',
id_num: 1,
calc_type: '${/parameter/@calc_type}' || 'CLASSIC_CALCULATOR',
recreate_L_formula: calc_recreate_L_formula
recreate_L_formula: calc_recreate_L_formula,
division:division
},
url: url,
fullScreen: true,
...
...
@@ -232,7 +233,8 @@
global_flag: 'Y',
id_num: 1,
calc_type: '${/parameter/@calc_type}',
recreate_L_formula: 'N'
recreate_L_formula: 'N',
division:division
},
url: url,
fullScreen: true,
...
...
@@ -821,7 +823,13 @@
}
}
//addby
xsh35973
20221014
神钢建机首付款抵扣只读
if
(
division=
='91')
{
//若为神钢建机
var
ds_id =
get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],
'prj_project');
var
current_record =
$(ds_id).getCurrentRecord();
current_record.getField('payment_deduction').setReadOnly(true);
current_record.getField('payment_deduction_n').setReadOnly(true);
}
//add
by
wangwei
非铁甲业务隐藏铁甲评分
var
bp_tenant_rate_detail_ds_id =
get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],
'bp_tenant_rate_detail');
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment