Skip to content

L
leaf-hlcm
Commit 7bdd7cef authored by 23459's avatar 23459
Browse files
Options

I-8072 【建机】铁甲二手挖机开发--同步正式环境代码

parent 5b03c2ef
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 16 deletions
src/main/webapp/WEB-INF/classes/cont/CON3100N/csh_write_detail_report.lwm
View file @ 7bdd7cef
......@@ -58,11 +58,11 @@
(select hbt.DESCRIPTION
from hls_business_type hbt
where hbt.BUSINESS_TYPE = c.BUSINESS_TYPE) BUSINESS_TYPE_N,
(select sh.large_balance from prj_quotation sh where sh.DOCUMENT_ID = c.project_id) large_balance,
c.large_balance,
(select v.code_value_name
from sys_code_values_v v
where v.code = 'SECONDARY_LEASE'
and v.code_value = (select sh.large_balance from prj_quotation sh where sh.DOCUMENT_ID = c.project_id)) large_balance_n,
and v.code_value = c.large_balance) large_balance_n,
c.branch_code,
(Select v.code_value_name
From sys_code_values_v v
......@@ -81,7 +81,9 @@
And nvl(cwo.reversed_flag, 'N') = 'N'
And h.bp_id = c.bp_id_tenant
And cwo.write_off_type In ('RECEIPT_CREDIT', 'DEPOSIT_CREDIT')
And ccc.cf_status = 'RELEASE'
--And ccc.cf_status = 'RELEASE'
--modify by 18938 I-7158
And ccc.cf_status in ('RELEASE','BLOCK')
And cwo.write_off_due_amount > 0
Order By c.contract_id,
ccc.times,
......
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query.lwm
View file @ 7bdd7cef
......@@ -205,8 +205,8 @@
and pq.document_category = 'PROJECT')) other_payment2,
i.pattern,
i.machine_number,
nvl((select due_amount-nvl(received_amount,0) from con_contract_cashflow where contract_id=t.repur_contract_id and cf_item=250),0)repur_con_amt,
nvl((select due_amount-nvl(received_amount,0) from con_contract_cashflow where contract_id=t.repur_contract_id and cf_item=250),0)repur_con_ddct_amt,
nvl((select sum(due_amount-nvl(received_amount,0)) from con_contract_cashflow where contract_id=t.repur_contract_id and cf_item=250),0)repur_con_amt,
nvl((select sum(due_amount-nvl(received_amount,0)) from con_contract_cashflow where contract_id=t.repur_contract_id and cf_item=250),0)repur_con_ddct_amt,
nvl(t.entrusted_amount,0) entrusted_amount,
decode(t.business_type,'LEASEBACK',(f.due_amount-nvl((select to_number(hd.other_payment2)
from hls_fin_calculator_hd hd
......
src/main/webapp/modules/acr/ACR516/acr_invoice_claim_application.lview
View file @ 7bdd7cef
......@@ -246,7 +246,7 @@
<a:column name="bp_agent_name" prompt="代理商" width="100"/>
<!-- <a:column name="invoice_kind_desc" prompt="发票种类" width="100"/>-->
<a:column name="invoice_kind_type_n" prompt="发票类型" width="200"/>
<a:column name="invoice_number" width="120" prompt="发票号码"/>
<!--<a:column name="invoice_number" width="120" prompt="发票号码"/>-->
<a:column name="vat_invoice_code" width="120" prompt="发票代码"/>
<a:column name="invoice_date" renderer="Leaf.formatDate" prompt="发票日期" width="100"/>
<a:column name="invoice_bp_code" prompt="开票客户编号" width="100"/>
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
View file @ 7bdd7cef
......@@ -697,8 +697,8 @@
var bp_code='${/model/user_agent_description/record/@bp_code}';
if(!Ext.isEmpty(description) && description == 'AGENT'){
if(!Ext.isEmpty(bp_code)){
if(bp_code !== 'C00010180' && bp_code !== 'C00010175' && bp_code !== 'C00010176' && bp_code !== 'C00010187'){
if(bp_code =='D00010001'){
if(bp_code !== 'D00000029' && bp_code !== 'D00000031' && bp_code !== 'D00000026' && bp_code !== 'D00000030'){
if(bp_code =='X00010005' || bp_code =='J00010006'){
record.set('credit_line','TENANT');
record.set('credit_line_n','承租人');
record.getField('credit_line').setRequired(false);
......@@ -726,9 +726,9 @@
document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT').style.display = 'none';
record.getField('deduction_limit').setRequired(false);
}
document.getElementById('PROJECT_CREATE_NP_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'none';
document.getElementById('PROJECT_CREATE_NP_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'none';
}
document.getElementById('PROJECT_CREATE_NP_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'none';
document.getElementById('PROJECT_CREATE_NP_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'none';
};
//更新时调用
......@@ -955,6 +955,9 @@
}
}
}
document.getElementById('PROJECT_CREATE_NP_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'none';
document.getElementById('PROJECT_CREATE_NP_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'none';
};
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create_entrance.lview
View file @ 7bdd7cef
......@@ -54,8 +54,8 @@
var invoice_agent_id = '${/model/user_agent_description/record/@bp_id}';
var invoice_agent_id_n = '${/model/user_agent_description/record/@bp_name}';
//head_record.set('unit_id', '${/model/4s_root_path/record/@value_code}');
//head_record.set('unit_id_n', '${/model/4s_root_path/record/@value_name}');
head_record.set('unit_id', '${/model/4s_root_path/record/@value_code}');
head_record.set('unit_id_n', '${/model/4s_root_path/record/@value_name}');
head_record.set('company_id', '${/model/company_info_path/record/@company_id}');
head_record.set('company_id_n', '${/model/company_info_path/record/@company_short_name}');
//head_record.set('invoice_agent_id', '${/model/prj_project_invoice_agent_id_dafault_value_path/record/@bp_id}');
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @ 7bdd7cef
......@@ -856,6 +856,8 @@
}
}
}
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'none';
};
......@@ -1017,8 +1019,8 @@
var credit_record = $(ds_id).getCurrentRecord();
if(!Ext.isEmpty(description) && description == 'AGENT'){
if(!Ext.isEmpty(bp_code)){
if(bp_code !== 'C00010180' && bp_code !== 'C00010175' && bp_code !== 'C00010176' && bp_code !== 'C00010187'){
if(bp_code =='D00010001'){
if(bp_code !== 'D00000026' && bp_code !== 'D00000029' && bp_code !== 'D00000030' && bp_code !== 'D00000031'){
if(bp_code =='X00010005' || bp_code =='J00010006'){
credit_record.set('credit_line','TENANT');
credit_record.set('credit_line_n','承租人');
credit_record.getField('credit_line').setReadOnly(true);
......@@ -1120,6 +1122,8 @@
}
}
}
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'none';
};
//pdf预览 add by zhuxianfei
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview
View file @ 7bdd7cef
......@@ -858,7 +858,7 @@
var credit_record = $(ds_id).getCurrentRecord();
if(!Ext.isEmpty(create_bp_code)){
debugger;
if(create_bp_code == 'C00010180' || create_bp_code == 'C00010175' || create_bp_code == 'C00010176' || create_bp_code == 'C00010187'){
if(create_bp_code == 'D00000029' || create_bp_code == 'D00000026' || create_bp_code == 'D00000030' || create_bp_code == 'D00000031'){
if('${/parameter/@editable_flag}' == 'Y' || '${/parameter/@editable_flag}' == 'YE'){
credit_record.getField('credit_line').setReadOnly(false);
credit_record.getField('credit_line_n').setReadOnly(false);
......@@ -868,7 +868,7 @@
}else {
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
}
}else if(create_bp_code =='D00010001') {
}else if(create_bp_code =='X00010005' || create_bp_code =='J00010006') {
credit_record.getField('credit_line').setReadOnly(true);
credit_record.getField('credit_line_n').setReadOnly(true);
credit_record.getField('credit_line').setRequired(false);
......@@ -956,6 +956,8 @@
}
}
debugger;
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'none';
if('${/parameter/@function_usage}' == 'QUERY' && '${/parameter/@editable_flag}' != 'YE' && '${/parameter/@editable_flag}' != 'Y' ){
debugger;
document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
......@@ -1217,6 +1219,8 @@
}
}
}
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'none';
};
//附件打包下载
window['${/parameter/@layout_code}_ACY_USER_BUTTON1_layout_dynamic_tab_click'] = function () {
......
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