Skip to content

L
leaf-hlcm
Commit 68935b9d authored by 18083's avatar 18083
Browse files
Options

北京心诚合并至二手机改造

parent 73c7d1c9
Expand all Show whitespace changes
Inline Side-by-side
Showing with 306 additions and 239 deletions
src/main/webapp/WEB-INF/classes/basic/sys_code_value_v_lease.lwm
View file @ 68935b9d
...@@ -37,14 +37,14 @@ ...@@ -37,14 +37,14 @@
FROM exp_emp_assign_e_v t FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id} WHERE t.user_id = ${/session/@user_id}
and PARENT_UNIT_ID <> 1544 and PARENT_UNIT_ID <> 1544
AND v.code_value IN ('10', '20', '30', '40','50','70','80','90','91','92','99','60','95','93')) AND v.code_value IN ('10', '20', '30', '40','50','70','80','90','91','99','60','95','93'))
UNION ALL UNION ALL
SELECT v.code_value AS value_code, v.code_value_name AS value_name SELECT v.code_value AS value_code, v.code_value_name AS value_name
FROM sys_code_values_v v FROM sys_code_values_v v
WHERE v.code_enabled_flag = 'Y' WHERE v.code_enabled_flag = 'Y'
AND v.code_value_enabled_flag = 'Y' AND v.code_value_enabled_flag = 'Y'
AND v.code = 'DIVISION' AND v.code = 'DIVISION'
AND v.code_value IN ('10', '20', '30', '40','50','70','80','90','91','92','99','60','95','93') AND v.code_value IN ('10', '20', '30', '40','50','70','80','90','91','99','60','95','93')
AND NOT EXISTS (SELECT 1 AND NOT EXISTS (SELECT 1
FROM exp_emp_assign_e_v t FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id} WHERE t.user_id = ${/session/@user_id}
......
src/main/webapp/WEB-INF/classes/cont/CON_ET001/create_change_req.lwm
View file @ 68935b9d
...@@ -3,7 +3,12 @@ ...@@ -3,7 +3,12 @@
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select division from con_contract t1 #WHERE_CLAUSE# select t1.division,
decode(t1.division, 70, nvl(hma.division_detail, '01'), '') division_detail
from con_contract t1, hls_bp_master_agent_division hma
where t1.bp_id_agent_level1 = hma.bp_id
and t1.division = hma.division
and t1.contract_id=${/parameter/@contract_id}
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
<bm:operation name="execute"> <bm:operation name="execute">
......
src/main/webapp/WEB-INF/classes/wx/WX100/con_file_download.lwm
View file @ 68935b9d
...@@ -59,15 +59,6 @@ select fa.file_name,fa.file_path,fa.attachment_id ...@@ -59,15 +59,6 @@ select fa.file_name,fa.file_path,fa.attachment_id
'FINANCE_LEASE_CONTRACT_TJ_FR_E', 'FINANCE_LEASE_CONTRACT_TJ_FR_E',
'CON_GUR_NP', 'CON_GUR_NP',
'CON_GUR_NP', 'CON_GUR_NP',
'FINANCE_LEASE_CONTRACT_FR_KJ_E','FINANCE_LEASE_CONTRACT_FR_KJ_E',--update by gzj 北京卡家电子签约
'FINANCE_LEASE_CONTRACT_KJ_FR_E','FINANCE_LEASE_CONTRACT_KJ_FR_E',
'FINANCE_LEASE_CONTRACT_KJ_S_E','FINANCE_LEASE_CONTRACT_KJ_S_E',
'FINANCE_LEASE_CONTRACT_KJ_E','FINANCE_LEASE_CONTRACT_KJ_E',
'CSH_PAYMENT_REQ_KJ_1_E','CSH_PAYMENT_REQ_KJ_1_E',
'CON_CONTRACT_MORTGAGE_KJ_E','CON_CONTRACT_MORTGAGE_KJ_E',
'LEASE_CONTRACT_PAR_KJ_E','LEASE_CONTRACT_PAR_KJ_E',
'LEASE_CONTRACT_PAR_KJ_1_E','LEASE_CONTRACT_PAR_KJ_1_E',
'CON_COLLECTION_PAYMENT_KJ_E','CON_COLLECTION_PAYMENT_KJ_E',
--博雷顿 --博雷顿
'PERSONAL_CREDIT_BLD_E', 'PERSONAL_CREDIT_BLD_E',
'CREDIT_AUTHOR', 'CREDIT_AUTHOR',
......
src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview
View file @ 68935b9d
...@@ -304,7 +304,7 @@ ...@@ -304,7 +304,7 @@
<a:record code_value="50" code_value_name="星邦高空作业车"/> <a:record code_value="50" code_value_name="星邦高空作业车"/>
<a:record code_value="90" code_value_name="租赁二手机（日立）"/> <a:record code_value="90" code_value_name="租赁二手机（日立）"/>
<a:record code_value="91" code_value_name="神钢建机"/> <a:record code_value="91" code_value_name="神钢建机"/>
<a:record code_value="92" code_value_name="北京心诚"/> <!--<a:record code_value="92" code_value_name="北京心诚"/>-->
<a:record code_value="99" code_value_name="工程机械"/> <a:record code_value="99" code_value_name="工程机械"/>
<a:record code_value="80" code_value_name="叉车"/> <a:record code_value="80" code_value_name="叉车"/>
<a:record code_value="70" code_value_name="二手机业务"/> <a:record code_value="70" code_value_name="二手机业务"/>
......
src/main/webapp/modules/cont/CON3400/contract_sales_report.lview
View file @ 68935b9d
...@@ -113,9 +113,9 @@ ...@@ -113,9 +113,9 @@
if(record.data.lease_name91=='Y'){//addby xsh35973 20221011 I-12357新增产品线 if(record.data.lease_name91=='Y'){//addby xsh35973 20221011 I-12357新增产品线
record.data.division=record.data.division+',91'; record.data.division=record.data.division+',91';
}; };
if(record.data.lease_name92=='Y'){//add by gzj //if(record.data.lease_name92=='Y'){//add by gzj
record.data.division=record.data.division+',92'; //record.data.division=record.data.division+',92';
}; //};
if(record.data.lease_name99=='Y'){//add by gzj if(record.data.lease_name99=='Y'){//add by gzj
record.data.division=record.data.division+',99'; record.data.division=record.data.division+',99';
}; };
...@@ -144,6 +144,7 @@ ...@@ -144,6 +144,7 @@
<a:datas> <a:datas>
<a:record code_value="LEASE" code_value_name="直租"/> <a:record code_value="LEASE" code_value_name="直租"/>
<a:record code_value="LEASEBACK" code_value_name="售后回租"/> <a:record code_value="LEASEBACK" code_value_name="售后回租"/>
<a:record code_value="LEASEOPERAT" code_value_name="经营性租赁"/>
</a:datas> </a:datas>
</a:dataSet> </a:dataSet>
<a:dataSet id="contract_sales_report_ds" autoPageSize="true"> <a:dataSet id="contract_sales_report_ds" autoPageSize="true">
...@@ -211,12 +212,16 @@ ...@@ -211,12 +212,16 @@
<a:checkBox name="lease_name30" bindTarget="contract_sales_report_ds" prompt="高空作业车"/> <a:checkBox name="lease_name30" bindTarget="contract_sales_report_ds" prompt="高空作业车"/>
<a:checkBox name="lease_name50" bindTarget="contract_sales_report_ds" prompt="星邦高空作业车"/> <a:checkBox name="lease_name50" bindTarget="contract_sales_report_ds" prompt="星邦高空作业车"/>
<a:checkBox name="lease_name60" bindTarget="contract_sales_report_ds" prompt="新业务"/> <a:checkBox name="lease_name60" bindTarget="contract_sales_report_ds" prompt="新业务"/>
<a:checkBox name="lease_name70" bindTarget="contract_sales_report_ds" prompt="铁甲业务"/> <a:checkBox name="lease_name70" bindTarget="contract_sales_report_ds" prompt="二手机业务"/>
<a:checkBox name="lease_name80" bindTarget="contract_sales_report_ds" prompt="叉车"/> <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_name90" bindTarget="contract_sales_report_ds" prompt="租赁二手机（日立）"/>
<a:checkBox name="lease_name40" 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:checkBox name="lease_name91" bindTarget="contract_sales_report_ds" prompt="神钢建机"/>//addby xsh35973 20221011 I-12357新增产品线
<a:checkBox name="lease_name92" bindTarget="contract_sales_report_ds" prompt="北京心诚"/> <!--<a:checkBox name="lease_name92" bindTarget="contract_sales_report_ds" prompt="北京心诚"/>-->
<a:checkBox name="lease_name99" bindTarget="contract_sales_report_ds" prompt="工程机械"/>
<a:checkBox name="lease_name95" bindTarget="contract_sales_report_ds" prompt="经租设备"/>
<a:checkBox name="lease_name93" bindTarget="contract_sales_report_ds" prompt="新业务-厂商担保"/>
</a:form> </a:form>
<a:grid id="contract_sales_result_ds_grid" bindTarget="contract_sales_result_ds" marginHeight="150" navBar="true" marginWidth="40"> <a:grid id="contract_sales_result_ds_grid" bindTarget="contract_sales_result_ds" marginHeight="150" navBar="true" marginWidth="40">
...@@ -226,6 +231,7 @@ ...@@ -226,6 +231,7 @@
<a:column name="journal_date" prompt="记账日期" align="center" width="220" renderer="formatDate"/> <a:column name="journal_date" prompt="记账日期" align="center" width="220" renderer="formatDate"/>
<a:column name="division_n" prompt="租赁物" align="center" width="220"/> <a:column name="division_n" prompt="租赁物" align="center" width="220"/>
<a:column name="contract_number" prompt="合同编号" align="center" width="220"/> <a:column name="contract_number" prompt="合同编号" align="center" width="220"/>
<a:column name="search_term_1" prompt="厂商合同编号" align="center" width="220"/>
<a:column name="business_type_n" prompt="业务类型" align="center" width="220"/> <a:column name="business_type_n" prompt="业务类型" align="center" width="220"/>
<a:column name="bp_tenant_code" prompt="承租人编号" align="center" width="220"/> <a:column name="bp_tenant_code" prompt="承租人编号" align="center" width="220"/>
<a:column name="bp_tenant_name" prompt="承租人名称" align="center" width="220"/> <a:column name="bp_tenant_name" prompt="承租人名称" align="center" width="220"/>
......
src/main/webapp/modules/cont/CON3500/contract_ifrs9_report.lview
View file @ 68935b9d
...@@ -72,9 +72,9 @@ ...@@ -72,9 +72,9 @@
if(record.data.lease_name91=='Y'){ if(record.data.lease_name91=='Y'){
record.data.division10='91'; record.data.division10='91';
}; };
if(record.data.lease_name92=='Y'){ //if(record.data.lease_name92=='Y'){
record.data.division11='92'; //record.data.division11='92';
}; // };
if(record.data.lease_name99=='Y'){ if(record.data.lease_name99=='Y'){
record.data.divisio12='99'; record.data.divisio12='99';
}; };
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
record.data.division8='80'; record.data.division8='80';
record.data.division9='90'; record.data.division9='90';
record.data.division10='91'; record.data.division10='91';
record.data.division11='92'; //record.data.division11='92';
record.data.division12='99'; record.data.division12='99';
record.data.division14='93'; record.data.division14='93';
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
param['division8']= record.data.division8; param['division8']= record.data.division8;
param['division9']= record.data.division9; param['division9']= record.data.division9;
param['division10']= record.data.division10; param['division10']= record.data.division10;
param['division11']= record.data.division11; //param['division11']= record.data.division11;
param['division12']= record.data.division12; param['division12']= record.data.division12;
param['division14']= record.data.division14; param['division14']= record.data.division14;
param['division13']= record.data.division13; param['division13']= record.data.division13;
......
src/main/webapp/modules/cont/CON505/con_contract_modify.lview
View file @ 68935b9d
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview
View file @ 68935b9d
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION").style.display = "none"; document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION").style.display = "none";
} }
}else if('${/model/get_contract_division/record/@division}' =='70'){ }else if('${/model/get_contract_division/record/@division}' =='70'){
if('${/model/get_contract_division/record/@division_detail}' =='03' ){ if('${/model/get_contract_division/record/@division_detail}' =='03'||'${/model/get_contract_division/record/@division_detail}' =='02' ){
if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE")){ if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE")){
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE_prompt").style.display = "none"; document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE_prompt").style.display = "none";
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE").style.display = "none"; document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE").style.display = "none";
...@@ -918,10 +918,9 @@ ...@@ -918,10 +918,9 @@
} }
var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_10', 'con_contract_lease_item'); var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_10', 'con_contract_lease_item');
if(ds.id == lease_ds_id&&lease_ds_id){ if(ds.id == lease_ds_id&&lease_ds_id){
debugger;
var gridId= ds.bindname+'_layout_grid_id'; var gridId= ds.bindname+'_layout_grid_id';
//var division =$(project_ds_id).getAt(0).get('division'); //var division =$(project_ds_id).getAt(0).get('division');
if(record.data.division=='70' || record.data.division=='92'){ if(record.data.division=='70'){
$(gridId).hideColumn('full_name'); $(gridId).hideColumn('full_name');
$(gridId).hideColumn('machine_number'); $(gridId).hideColumn('machine_number');
}else { }else {
......
src/main/webapp/modules/cont/CON930/con_contract_cashflow_monthly.lview
View file @ 68935b9d
...@@ -48,9 +48,9 @@ ...@@ -48,9 +48,9 @@
if(record.data.lease_name91=='Y'){//addby xsh35973 20221011 I-12357新增产品线 if(record.data.lease_name91=='Y'){//addby xsh35973 20221011 I-12357新增产品线
record.data.division=record.data.division+',91'; record.data.division=record.data.division+',91';
}; };
if(record.data.lease_name92=='Y'){//add by gzj 2022-12-19 10:17:53 //if(record.data.lease_name92=='Y'){//add by gzj 2022-12-19 10:17:53
record.data.division=record.data.division+',92'; //record.data.division=record.data.division+',92';
}; //};
if(record.data.lease_name99=='Y'){//add by gzj 2022-12-19 10:17:53 if(record.data.lease_name99=='Y'){//add by gzj 2022-12-19 10:17:53
record.data.division=record.data.division+',99'; record.data.division=record.data.division+',99';
}; };
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
<a:field checkedValue="Y" name="lease_name70" uncheckedValue="N" defaultValue="N"/> <a:field checkedValue="Y" name="lease_name70" uncheckedValue="N" defaultValue="N"/>
<a:field checkedValue="Y" name="lease_name80" uncheckedValue="N" defaultValue="N"/> <a:field checkedValue="Y" name="lease_name80" uncheckedValue="N" defaultValue="N"/>
<a:field checkedValue="Y" name="lease_name90" uncheckedValue="N" defaultValue="N"/> <a:field checkedValue="Y" name="lease_name90" uncheckedValue="N" defaultValue="N"/>
<a:field checkedValue="Y" name="lease_name92" uncheckedValue="N" defaultValue="N"/> <!--<a:field checkedValue="Y" name="lease_name92" uncheckedValue="N" defaultValue="N"/>-->
<a:field checkedValue="Y" name="lease_name99" uncheckedValue="N" defaultValue="N"/> <a:field checkedValue="Y" name="lease_name99" uncheckedValue="N" defaultValue="N"/>
<a:field checkedValue="Y" name="lease_name93" uncheckedValue="N" defaultValue="N"/> <a:field checkedValue="Y" name="lease_name93" uncheckedValue="N" defaultValue="N"/>
<a:field name="division" /> <a:field name="division" />
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
<a:checkBox name="lease_name90" 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_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新增产品线 <a:checkBox name="lease_name91" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="神钢建机"/>//addby xsh35973 20221011 I-12357新增产品线
<a:checkBox name="lease_name92" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="北京心诚"/> <!-- <a:checkBox name="lease_name92" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="北京心诚"/>-->
<a:checkBox name="lease_name99" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="工程机械"/> <a:checkBox name="lease_name99" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="工程机械"/>
<a:checkBox name="lease_name93" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="新业务-厂商担保"/> <a:checkBox name="lease_name93" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="新业务-厂商担保"/>
......
src/main/webapp/modules/cont/CON_ET001/con_early_termination_et_detail.lview
View file @ 68935b9d
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION").style.display = "none"; document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION").style.display = "none";
} }
}else if('${/model/get_contract_division/record/@division}' =='70'){ }else if('${/model/get_contract_division/record/@division}' =='70'){
if('${/model/get_contract_division/record/@division_detail}' =='03' ){ if('${/model/get_contract_division/record/@division_detail}' =='03'||'${/model/get_contract_division/record/@division_detail}' =='02' ){
if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE")){ if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE")){
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE_prompt").style.display = "none"; document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE_prompt").style.display = "none";
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE").style.display = "none"; document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE").style.display = "none";
...@@ -720,7 +720,7 @@ ...@@ -720,7 +720,7 @@
var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_10', 'con_contract_lease_item'); var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_10', 'con_contract_lease_item');
if(ds.id == lease_ds_id&&lease_ds_id){ if(ds.id == lease_ds_id&&lease_ds_id){
var gridId= ds.bindname+'_layout_grid_id'; var gridId= ds.bindname+'_layout_grid_id';
if(record.data.division=='70' || record.data.division=='92'){ if(record.data.division=='70'){
$(gridId).hideColumn('full_name'); $(gridId).hideColumn('full_name');
$(gridId).hideColumn('machine_number'); $(gridId).hideColumn('machine_number');
}else { }else {
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create_entrance.lview
View file @ 68935b9d
...@@ -34,15 +34,10 @@ ...@@ -34,15 +34,10 @@
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var record = $(ds_id).getCurrentRecord(); var record = $(ds_id).getCurrentRecord();
if(record.data.division=='70'&&record.data.business_type!='LEASEBACK'){ if(record.data.division=='70'&&record.data.business_type!='LEASEBACK'){
debugger;
// $L.showErrorMessage("提示", '租赁物为铁甲业务的业务类型只能是售后回租！');
$L.showErrorMessage("提示", '租赁物为二手机业务的业务类型只能是售后回租！'); $L.showErrorMessage("提示", '租赁物为二手机业务的业务类型只能是售后回租！');
return false; return false;
} }
if(record.data.division=='92'&&record.data.business_type!='LEASEBACK'){
$L.showErrorMessage("提示", '租赁物为北京心诚的业务类型只能是售后回租！');
return false;
}
if(record.data.division=='95'&&record.data.business_type!='LEASEOPERAT'){ if(record.data.division=='95'&&record.data.business_type!='LEASEOPERAT'){
$L.showErrorMessage("提示", '租赁物为经租设备的业务类型只能是经营性租赁！'); $L.showErrorMessage("提示", '租赁物为经租设备的业务类型只能是经营性租赁！');
return false; return false;
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview
View file @ 68935b9d
...@@ -377,9 +377,8 @@ ...@@ -377,9 +377,8 @@
} }
if (bp_tenant_detail_r && ds.id == prj_project_ds_id) { if (bp_tenant_detail_r && ds.id == prj_project_ds_id) {
for (var key in bp_tenant_detail_r.data) { for (var key in bp_tenant_detail_r.data) {
if(division!='70'&&division != '92'){ if(division!='70'){
if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' && key != 'project_id'&& key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'contract_id'&& key != 'third_guar_score'&&key != 'tj_score') { if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' && key != 'project_id'&& key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'contract_id'&& key != 'third_guar_score'&&key != 'tj_score') {
//if(!bp_tenant_detail_r.get(key)){
if (typeof bp_tenant_detail_r.get(key)== "null"||typeof bp_tenant_detail_r.get(key)== "undefined"|| bp_tenant_detail_r.get(key)== "") { if (typeof bp_tenant_detail_r.get(key)== "null"||typeof bp_tenant_detail_r.get(key)== "undefined"|| bp_tenant_detail_r.get(key)== "") {
Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方担保附件分数\"外，其他都为必输字段，请填写！"); Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方担保附件分数\"外，其他都为必输字段，请填写！");
bp_rate_flag = false; bp_rate_flag = false;
...@@ -388,19 +387,8 @@ ...@@ -388,19 +387,8 @@
bp_rate_flag = true; bp_rate_flag = true;
} }
} }
}else if(division == '92'){
if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age'&& key != 'contract_id' && key != 'project_id' && key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'third_guar_score'&&key != 'tj_score') {
//if (!bp_tenant_detail_r.get(key)) {
if (typeof bp_tenant_detail_r.get(key) == "null" || typeof bp_tenant_detail_r.get(key) == "undefined" || bp_tenant_detail_r.get(key) === "") {
Leaf.showInfoMessage("提示", "承租人评分信息区域的所有字段，除\"第三方担保附件得分\"外，其他都为必输字段，请填写！");
bp_rate_flag = false;
break;
}else{ }else{
bp_rate_flag = true; if('${/parameter/@division_detail}'=='03'||'${/parameter/@division_detail}'=='02'){
}
}
} else{
if('${/parameter/@division_detail}'=='03'){
if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age'&& key != 'contract_id' && key != 'project_id' && key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'third_guar_score'&&key != 'tj_score') { if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age'&& key != 'contract_id' && key != 'project_id' && key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'third_guar_score'&&key != 'tj_score') {
if (typeof bp_tenant_detail_r.get(key) == "null" || typeof bp_tenant_detail_r.get(key) == "undefined" || bp_tenant_detail_r.get(key) === "") { if (typeof bp_tenant_detail_r.get(key) == "null" || typeof bp_tenant_detail_r.get(key) == "undefined" || bp_tenant_detail_r.get(key) === "") {
Leaf.showInfoMessage("提示", "承租人评分信息区域的所有字段，除\"第三方担保附件得分\"外，其他都为必输字段，请填写！"); Leaf.showInfoMessage("提示", "承租人评分信息区域的所有字段，除\"第三方担保附件得分\"外，其他都为必输字段，请填写！");
...@@ -412,7 +400,6 @@ ...@@ -412,7 +400,6 @@
} }
}else{ }else{
if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' && key != 'project_id'&& key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'contract_id'&& key != 'third_guar_score') { if (key != 'bp_detail_id' && key != 'score_name' && key != 'bp_age' && key != 'project_id'&& key != 'third_party_credibility' && key != 'third_party_credibility_n'&& key != 'contract_id'&& key != 'third_guar_score') {
//if(!bp_tenant_detail_r.get(key)){
if (typeof bp_tenant_detail_r.get(key)== "null"||typeof bp_tenant_detail_r.get(key)== "undefined"|| bp_tenant_detail_r.get(key)== "") { if (typeof bp_tenant_detail_r.get(key)== "null"||typeof bp_tenant_detail_r.get(key)== "undefined"|| bp_tenant_detail_r.get(key)== "") {
Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方担保附件分数\"外，其他都为必输字段，请填写！"); Leaf.showInfoMessage("提示","承租人评分信息区域的所有字段，除\"第三方担保附件分数\"外，其他都为必输字段，请填写！");
bp_rate_flag = false; bp_rate_flag = false;
...@@ -660,7 +647,7 @@ ...@@ -660,7 +647,7 @@
if(division!='30' && division!='50'){ if(division!='30' && division!='50'){
$(gridId).hideColumn('machine_number_n'); $(gridId).hideColumn('machine_number_n');
} }
if((division=='70'||division=='92')&&division!=''){ if(division=='70'&&division!=''){
if(record!=''){ if(record!=''){
record.getField('lease_name_n').setRequired(true); record.getField('lease_name_n').setRequired(true);
record.getField('brand_value').setRequired(true); record.getField('brand_value').setRequired(true);
...@@ -1001,7 +988,6 @@ ...@@ -1001,7 +988,6 @@
} }
var division=''; var division='';
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
debugger;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var prj_quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation'); var prj_quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
...@@ -1037,7 +1023,7 @@ ...@@ -1037,7 +1023,7 @@
document.getElementById('${/parameter/@layout_code}_F_TENANT_SCORE_INFO_BP_TENANT_RATE_DETAIL_TJ_SCORE_prompt').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_F_TENANT_SCORE_INFO_BP_TENANT_RATE_DETAIL_TJ_SCORE_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_TENANT_SCORE_INFO_BP_TENANT_RATE_DETAIL_TJ_SCORE').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_F_TENANT_SCORE_INFO_BP_TENANT_RATE_DETAIL_TJ_SCORE').style.display = 'none';
} }
}else if(division == '70' && division != '' && '${/parameter/@division_detail}'=='03'){ }else if(division == '70' && division != '' && ('${/parameter/@division_detail}'=='03'||'${/parameter/@division_detail}'=='02')){
if(document.getElementById('${/parameter/@layout_code}_F_TENANT_SCORE_INFO_BP_TENANT_RATE_DETAIL_TJ_SCORE')){ if(document.getElementById('${/parameter/@layout_code}_F_TENANT_SCORE_INFO_BP_TENANT_RATE_DETAIL_TJ_SCORE')){
document.getElementById('${/parameter/@layout_code}_F_TENANT_SCORE_INFO_BP_TENANT_RATE_DETAIL_TJ_SCORE_prompt').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_F_TENANT_SCORE_INFO_BP_TENANT_RATE_DETAIL_TJ_SCORE_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_TENANT_SCORE_INFO_BP_TENANT_RATE_DETAIL_TJ_SCORE').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_F_TENANT_SCORE_INFO_BP_TENANT_RATE_DETAIL_TJ_SCORE').style.display = 'none';
...@@ -1122,13 +1108,9 @@ ...@@ -1122,13 +1108,9 @@
} }
if ('${/parameter/@function_usage}' != 'QUERY') { if ('${/parameter/@function_usage}' != 'QUERY') {
if (division == '92') {
record.getField('pay_method').setReadOnly(false);
record.getField('pay_method_n').setReadOnly(false);
}
//云南铁拳并入二手机，调整租金支付方式为必填 //云南铁拳并入二手机，调整租金支付方式为必填
if (division == '70') { if (division == '70') {
if('${/parameter/@division_detail}'=='03'){ if('${/parameter/@division_detail}'=='03'||'${/parameter/@division_detail}'=='02'){
record.getField('pay_method').setReadOnly(false); record.getField('pay_method').setReadOnly(false);
record.getField('pay_method_n').setReadOnly(false); record.getField('pay_method_n').setReadOnly(false);
} }
...@@ -1236,7 +1218,7 @@ ...@@ -1236,7 +1218,7 @@
record.getField('customer_margin').setReadOnly(true); record.getField('customer_margin').setReadOnly(true);
record.getField('customer_margin_n').setReadOnly(true); record.getField('customer_margin_n').setReadOnly(true);
} }
if(division!='70'&&division!='92'&&division!=''){ if(division!='70'&&division!=''){
if(division != '93'){ if(division != '93'){
if(document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN')){ if(document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN')){
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN_prompt').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN_prompt').style.display = 'none';
...@@ -1279,7 +1261,7 @@ ...@@ -1279,7 +1261,7 @@
} }
}else if((division=='70'||division=='92')&&division!=''){ }else if(division=='70'&&division!=''){
if( document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_OTHER_FEE')){ if( document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_OTHER_FEE')){
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_OTHER_FEE_prompt').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_OTHER_FEE_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_OTHER_FEE').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_OTHER_FEE').style.display = 'none';
...@@ -1298,20 +1280,13 @@ ...@@ -1298,20 +1280,13 @@
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_LARGE_BALANCE').style.display = 'none';
} }
//云南铁拳隐藏承租人保证金字段 18083 2023/5/24 //云南铁拳隐藏承租人保证金字段 18083 2023/5/24
if('${/parameter/@division_detail}'=='03'){ if('${/parameter/@division_detail}'=='03'||'${/parameter/@division_detail}'=='02'){
if(document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN')){ if(document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN')){
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN_prompt').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN').style.display = 'none' document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN').style.display = 'none'
} }
} }
}
if (division=='92' && division != '') {
if(document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN')){
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_F_QUOTATION_N_PRJ_QUOTATION_CUSTOMER_MARGIN').style.display = 'none';
}
} }
var bp_code = '${/model/user_agent_description/record/@bp_code}'; var bp_code = '${/model/user_agent_description/record/@bp_code}';
...@@ -1440,7 +1415,7 @@ ...@@ -1440,7 +1415,7 @@
var prj_quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation'); var prj_quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item'); var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
if (lease_item_ds_id == ds.id && lease_item_ds_id) { if (lease_item_ds_id == ds.id && lease_item_ds_id) {
if(division=='70'||division=='92'){ if(division=='70'){
record.getField('lease_name_n').setRequired(true); record.getField('lease_name_n').setRequired(true);
record.getField('brand_value').setRequired(true); record.getField('brand_value').setRequired(true);
record.getField('produce_date').setReadOnly(false); record.getField('produce_date').setReadOnly(false);
......
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