Skip to content

L
leaf-hlcm
Commit 91f8e51b authored by 18083's avatar 18083
1 Browse files
Options

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

parent 8945a2db
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2664 additions and 1598 deletions
src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview
View file @ 91f8e51b
...@@ -269,6 +269,7 @@ ...@@ -269,6 +269,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="write_off_flag_ds"> <a:dataSet id="write_off_flag_ds">
...@@ -300,15 +301,13 @@ ...@@ -300,15 +301,13 @@
<a:record code_value="30" code_value_name="高空作业车"/> <a:record code_value="30" code_value_name="高空作业车"/>
<a:record code_value="40" code_value_name="其它"/> <a:record code_value="40" code_value_name="其它"/>
<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="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="95" 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="二手机业务"/> <a:record code_value="70" code_value_name="二手机业务"/>
<a:record code_value="95" code_value_name="经租设备"/>
<a:record code_value="93" code_value_name="新业务-厂商担保"/> <a:record code_value="93" code_value_name="新业务-厂商担保"/>
</a:datas> </a:datas>
</a:dataSet> </a:dataSet>
...@@ -540,6 +539,8 @@ ...@@ -540,6 +539,8 @@
<a:hBox> <a:hBox>
<a:comboBox bindTarget="allConditionDs" name="billing_status_n" prompt="开票状态"/> <a:comboBox bindTarget="allConditionDs" name="billing_status_n" prompt="开票状态"/>
<a:comboBox bindTarget="allConditionDs" name="full_elec_invoice_flag_n" prompt="是否全电发票"/> <a:comboBox bindTarget="allConditionDs" name="full_elec_invoice_flag_n" prompt="是否全电发票"/>
<a:textField bindTarget="allConditionDs" name="search_term_1" prompt="厂商合同编号"/>
<a:textField bindTarget="allConditionDs" name="pur_number" prompt="采购单编号"/>
</a:hBox> </a:hBox>
<!-- <a:formBody column="4" labelWidth="400"> <!-- <a:formBody column="4" labelWidth="400">
<a:lov name="contract_number_from" bindTarget="allConditionDs" prompt="HLS.CONTRACT_NUMBER_FROM"/> <a:lov name="contract_number_from" bindTarget="allConditionDs" prompt="HLS.CONTRACT_NUMBER_FROM"/>
...@@ -578,6 +579,8 @@ ...@@ -578,6 +579,8 @@
<a:column name="bp_id_agent_level1_n" prompt="代理店" width="170"/> <a:column name="bp_id_agent_level1_n" prompt="代理店" width="170"/>
<a:column name="business_type_desc" prompt="业务类型" align="center" width="70"/> <a:column name="business_type_desc" prompt="业务类型" align="center" width="70"/>
<a:column name="times" align="right" lock="true" prompt="期数" width="40"/> <a:column name="times" align="right" lock="true" prompt="期数" width="40"/>
<a:column name="search_term_1" align="right" lock="true" prompt="厂商合同编号" width="100"/>
<a:column name="pur_number" align="right" lock="true" prompt="采购单编号" width="100"/>
<a:column name="cf_item_desc" lock="true" prompt="应收项目" align="center"/> <a:column name="cf_item_desc" lock="true" prompt="应收项目" align="center"/>
<a:column name="due_date" prompt="应收日" align="center"/> <a:column name="due_date" prompt="应收日" align="center"/>
<a:column name="due_amount" align="right" prompt="应收金额" renderer="Leaf.formatMoney"/> <a:column name="due_amount" align="right" prompt="应收金额" renderer="Leaf.formatMoney"/>
...@@ -607,7 +610,7 @@ ...@@ -607,7 +610,7 @@
<a:column name="invoice_method_n" prompt="开票方式" width="100"/> <a:column name="invoice_method_n" prompt="开票方式" width="100"/>
<a:column name="division_n" prompt="租赁物" width="100"/> <a:column name="division_n" prompt="租赁物" width="100"/>
<a:column name="write_off_flag_desc" width="100" align="center" prompt="核销标记" /> <a:column name="write_off_flag_desc" width="100" align="center" prompt="核销标记" />
<a:column name="rl_flag_n" width="100" align="center" prompt="是否日立返还金" /> <a:column name="rl_flag_n" width="100" align="center" prompt="是否日立为优质客户付租金" />
<a:column name="billing_status_n" width="100" align="center" prompt="开票状态" /> <a:column name="billing_status_n" width="100" align="center" prompt="开票状态" />
<a:column name="full_elec_invoice_flag_n" width="100" align="center" prompt="是否全电发票" /> <a:column name="full_elec_invoice_flag_n" width="100" align="center" prompt="是否全电发票" />
</a:columns> </a:columns>
......
src/main/webapp/modules/cont/CON3400/contract_sales_report.lview
View file @ 91f8e51b
...@@ -113,17 +113,17 @@ ...@@ -113,17 +113,17 @@
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';
};
if(record.data.lease_name95=='Y'){//add by gzj
record.data.division=record.data.division+',95';
}; };
if(record.data.lease_name93=='Y'){//add by gzj if(record.data.lease_name93=='Y'){//add by gzj
record.data.division=record.data.division+',93'; record.data.division=record.data.division+',93';
};
if(record.data.lease_name95=='Y'){
record.data.division=record.data.division+',95';
}; };
record.data.division=record.data.division.substr(1,record.data.division.length); record.data.division=record.data.division.substr(1,record.data.division.length);
$('contract_sales_result_ds').query(); $('contract_sales_result_ds').query();
...@@ -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,16 +212,16 @@ ...@@ -211,16 +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_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_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_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: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">
...@@ -230,6 +231,7 @@ ...@@ -230,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"/>
...@@ -242,6 +244,7 @@ ...@@ -242,6 +244,7 @@
<a:column name="sale_penalty" prompt="逾期利息收入" align="center" width="220"/> <a:column name="sale_penalty" prompt="逾期利息收入" align="center" width="220"/>
<a:column name="sale_other" prompt="其他收入" align="center" width="220"/> <a:column name="sale_other" prompt="其他收入" align="center" width="220"/>
<a:column name="deposit_value_amount" prompt="保证金时间价值收益" align="center" width="220"/> <a:column name="deposit_value_amount" prompt="保证金时间价值收益" align="center" width="220"/>
<a:column name="full_name" prompt="设备名称" align="center" width="220"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
......
src/main/webapp/modules/cont/CON3500/contract_ifrs9_report.lview
View file @ 91f8e51b
...@@ -24,6 +24,11 @@ ...@@ -24,6 +24,11 @@
var period_name=$(ds_id).getAt(0).get('period_name'); var period_name=$(ds_id).getAt(0).get('period_name');
var record = $(ds_id).getAt(0); var record = $(ds_id).getAt(0);
//期间校验提示
if(period_name == null || period_name == ''){
Leaf.showMessage('提示', '请选择报表的期间');
return false;
}
record.data.division1=''; record.data.division1='';
record.data.division2=''; record.data.division2='';
record.data.division3=''; record.data.division3='';
...@@ -35,6 +40,9 @@ ...@@ -35,6 +40,9 @@
record.data.division9=''; record.data.division9='';
record.data.division10=''; record.data.division10='';
record.data.division11=''; record.data.division11='';
record.data.division12='';
record.data.division13='';
record.data.division14='';
if(record.data.lease_name10=='Y'){ if(record.data.lease_name10=='Y'){
record.data.division1='10'; record.data.division1='10';
} }
...@@ -65,12 +73,21 @@ ...@@ -65,12 +73,21 @@
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'){
record.data.division12='99';
};
if(record.data.lease_name95=='Y'){
record.data.division13='95';
};
if(record.data.lease_name93=='Y'){
record.data.division14='93';
}; };
// record.data.division=record.data.division.substr(1,record.data.division.length); // 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 == '' 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.division10 == ''&&record.data.division11 == ''){ &&record.data.division5 == ''&&record.data.division6 == ''&&record.data.division7 == ''&&record.data.division8 == ''&&record.data.division9 == ''&&record.data.division10 == ''&&record.data.division11 == ''&&record.data.division12 == ''&&record.data.division13 ==''&&record.data.division14 == ''){
// record.data.division1='10,20,30,40,50,60,70,80'; // record.data.division1='10,20,30,40,50,60,70,80';
record.data.division1='10'; record.data.division1='10';
record.data.division2='20'; record.data.division2='20';
...@@ -82,7 +99,10 @@ ...@@ -82,7 +99,10 @@
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.division13='95';
record.data.division14='93';
}; };
param['division1']= record.data.division1; param['division1']= record.data.division1;
param['division2']= record.data.division2; param['division2']= record.data.division2;
...@@ -95,6 +115,9 @@ ...@@ -95,6 +115,9 @@
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['division13']= record.data.division13;
param['division14']= record.data.division14;
param['period_name']=period_name; param['period_name']=period_name;
param['function_code'] = 'CON3400N'; param['function_code'] = 'CON3400N';
param['function_usage'] = 'MODIFY'; param['function_usage'] = 'MODIFY';
......
src/main/webapp/modules/cont/CON505/con_contract_modify.lview
View file @ 91f8e51b
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 @ 91f8e51b
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
<!--<a:link id="con_cashflow_pre_query_id" model="cont.CON930.con_contract_cashflow_monthly" modelaction="update"/>--> <!--<a:link id="con_cashflow_pre_query_id" model="cont.CON930.con_contract_cashflow_monthly" modelaction="update"/>-->
<a:link id="con_cashflow_pre_query_id" model="cont.CON930.con_contract_cashflow_monthly_n" modelaction="update"/> <a:link id="con_cashflow_pre_query_id" model="cont.CON930.con_contract_cashflow_monthly_n" modelaction="update"/>
<a:link id="con_cashflow_pre_update_id" model="cont.CON930.insert_con_cash_temp_data_job" modelaction="update"/> <a:link id="con_cashflow_pre_update_id" model="cont.CON930.insert_con_cash_temp_data_job" modelaction="update"/>
<script><![CDATA[ <script><![CDATA[
function CON321_con_contract_query() { function CON321_con_contract_query() {
if ($('con_contract_cashflow_monthly_query_ds').validate()){ if ($('con_contract_cashflow_monthly_query_ds').validate()){
...@@ -48,9 +47,9 @@ ...@@ -48,9 +47,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 +166,7 @@ ...@@ -167,7 +166,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" />
...@@ -213,14 +212,12 @@ ...@@ -213,14 +212,12 @@
<a:checkBox name="lease_name50" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="星邦高空作业车"/> <a:checkBox name="lease_name50" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="星邦高空作业车"/>
<a:checkBox name="lease_name60" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="新业务"/> <a:checkBox name="lease_name60" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="新业务"/>
<!-- <a:checkBox name="lease_name70" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="铁甲业务"/>-->
<a:checkBox name="lease_name70" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="二手机业务"/> <a:checkBox name="lease_name70" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="二手机业务"/>
<a:checkBox name="lease_name80" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="叉车"/> <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_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="新业务-厂商担保"/>
...@@ -269,6 +266,7 @@ ...@@ -269,6 +266,7 @@
<a:column name="not_due_amount_4" align="center" prompt="未到期4个月" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_4" align="center" prompt="未到期4个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_5" align="center" prompt="未到期5个月" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_5" align="center" prompt="未到期5个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_6" align="center" prompt="未到期6个月" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_6" align="center" prompt="未到期6个月" renderer="Leaf.formatMoney" width="80"/>
<!--<a:column name="not_due_amount_left" align="center" prompt="未到期6个月以上" renderer="Leaf.formatMoney" width="80"/>-->
<a:column name="not_due_amount_7" align="center" prompt="未到期7个月" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_7" align="center" prompt="未到期7个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_8" align="center" prompt="未到期8个月" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_8" align="center" prompt="未到期8个月" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_9" align="center" prompt="未到期9个月" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_9" align="center" prompt="未到期9个月" renderer="Leaf.formatMoney" width="80"/>
...@@ -341,6 +339,7 @@ ...@@ -341,6 +339,7 @@
<a:column name="not_due_amount_year_4" align="center" prompt="未到期4年" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_year_4" align="center" prompt="未到期4年" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_year_5" align="center" prompt="未到期5年" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_year_5" align="center" prompt="未到期5年" renderer="Leaf.formatMoney" width="80"/>
<a:column name="not_due_amount_year_5_left" align="center" prompt="未到期5年以上" renderer="Leaf.formatMoney" width="80"/> <a:column name="not_due_amount_year_5_left" align="center" prompt="未到期5年以上" renderer="Leaf.formatMoney" width="80"/>
<a:column name="full_name" align="center" prompt="设备名称" width="220"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
</a:tab> </a:tab>
......
src/main/webapp/modules/cont/CON_ET001/con_early_termination_et_detail.lview
View file @ 91f8e51b
...@@ -6,8 +6,9 @@ ...@@ -6,8 +6,9 @@
<a:init-procedure> <a:init-procedure>
<a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" fetchAll="true" model="wx.WX100.sys_pilot_run_user" rootPath="pilot_run_user"/> <a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" fetchAll="true" model="wx.WX100.sys_pilot_run_user" rootPath="pilot_run_user"/>
<a:model-query defaultWhereClause="t1.contract_id=${/parameter/@contract_id}" fetchAll="true" model="cont.CON_ET001.con_get_contract_status" rootPath="get_contract_status"/> <a:model-query defaultWhereClause="t1.contract_id=${/parameter/@contract_id}" fetchAll="true" model="cont.CON_ET001.con_get_contract_status" rootPath="get_contract_status"/>
<a:model-query defaultWhereClause="t1.contract_id=${/parameter/@contract_id}" fetchAll="true" model="cont.CON_ET001.create_change_req" rootPath="get_contract_division"/> <a:model-query fetchAll="true" model="cont.CON_ET001.create_change_req" rootPath="get_contract_division"/>
<a:model-query fetchAll="true" model="cont.CON_ET001.con_asset_fee_calc" rootPath="asset_flag_path" ></a:model-query> <a:model-query fetchAll="true" model="cont.CON_ET001.con_asset_fee_calc" rootPath="asset_flag_path" ></a:model-query>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="con_contract_repo_detail_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/> <a:link id="con_contract_repo_detail_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
...@@ -58,7 +59,7 @@ ...@@ -58,7 +59,7 @@
if ('${/model/pilot_run_user/record/@pilot_run_flag}' != 'Y'){ if ('${/model/pilot_run_user/record/@pilot_run_flag}' != 'Y'){
$('${/parameter/@layout_code}_user_button4').hide(); $('${/parameter/@layout_code}_user_button4').hide();
} }
//铁甲业务合同展示保证金字段 18083 2023/5/11 //铁甲业务合同展示保证金字段 18083 2023/6/14
if('${/model/get_contract_division/record/@division}' !='70' && '${/model/get_contract_division/record/@division}' != ''){ if('${/model/get_contract_division/record/@division}' !='70' && '${/model/get_contract_division/record/@division}' != ''){
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";
...@@ -68,6 +69,17 @@ ...@@ -68,6 +69,17 @@
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION_prompt").style.display = "none"; document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION_prompt").style.display = "none";
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'){
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")){
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";
}
if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION")){
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION_prompt").style.display = "none";
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION").style.display = "none";
}
}
} }
//报价中资管费字段为否时，不展示资产管理费字段 18083 2024/1/29 //报价中资管费字段为否时，不展示资产管理费字段 18083 2024/1/29
if('${/model/asset_flag_path/record/@hd_user_col_v06}' !='Y'){ if('${/model/asset_flag_path/record/@hd_user_col_v06}' !='Y'){
...@@ -87,11 +99,10 @@ ...@@ -87,11 +99,10 @@
record.getField('signer_n').setRequired(false); record.getField('signer_n').setRequired(false);
record.set('signer_n',''); record.set('signer_n','');
} }
if(record.get('division') == '70'){ if(record.get('division') == '70' && record.get('division_detail') == '01'){
record.getField('deposit_deduction').setRequired(true); record.getField('deposit_deduction').setRequired(true);
} }
} }
}; };
var clc_flag = 'N'; var clc_flag = 'N';
...@@ -102,13 +113,11 @@ ...@@ -102,13 +113,11 @@
calc_flag='N'; calc_flag='N';
record.set('calc_flag','N'); record.set('calc_flag','N');
} }
//调整后提前结清手续费
if (name == 'et_fee') { if (name == 'et_fee') {
var et_total_amount=record.get('et_total_amount')||0; var et_total_amount=record.get('et_total_amount')||0;
var old_et_fee=old_value||0; var old_et_fee=old_value||0;
record.set('et_total_amount', plus(minus(et_total_amount,old_et_fee),value||0)); record.set('et_total_amount', plus(minus(et_total_amount,old_et_fee),value||0));
} }
//调整后逾期罚息
if (name == 'ccr_penalty') { if (name == 'ccr_penalty') {
var et_total_amount=record.get('et_total_amount')||0; var et_total_amount=record.get('et_total_amount')||0;
var due_amount = record.get('penalty') || 0; var due_amount = record.get('penalty') || 0;
...@@ -128,8 +137,9 @@ ...@@ -128,8 +137,9 @@
} }
record.set('et_total_amount',minus(plus(plus(plus(plus(record.get('et_due_amount')||0,record.get('et_fee')||0),record.get('residual_value')||0),record.get('overdue_amount')||0),value),record.get('deposit_deduction')||0)); record.set('et_total_amount',minus(plus(plus(plus(plus(record.get('et_due_amount')||0,record.get('et_fee')||0),record.get('residual_value')||0),record.get('overdue_amount')||0),value),record.get('deposit_deduction')||0));
} }
//铁甲业务计算保证金抵扣金额 18083 2023/5/12
if('${/model/get_contract_division/record/@division}' =='70' && '${/model/get_contract_division/record/@division}' != ''){ //铁甲业务计算保证金抵扣金额 18083 2023/6/14
if('${/model/get_contract_division/record/@division}' =='70' && '${/model/get_contract_division/record/@division}' != '' && '${/model/get_contract_division/record/@division_detail}' == '01'){
if (name == 'deposit_deduction') { if (name == 'deposit_deduction') {
var et_total_amount=record.get('et_total_amount')||0; var et_total_amount=record.get('et_total_amount')||0;
var deposit_balance = record.get('deposit_balance') || 0; var deposit_balance = record.get('deposit_balance') || 0;
...@@ -141,7 +151,6 @@ ...@@ -141,7 +151,6 @@
}, 5); }, 5);
return; return;
} }
if (value < 0 || value == NaN || value == undefined) { if (value < 0 || value == NaN || value == undefined) {
Leaf.showMessage('${l:HLS.PROMPT}', '调整后的保证金抵扣金额应大于等于0！'); Leaf.showMessage('${l:HLS.PROMPT}', '调整后的保证金抵扣金额应大于等于0！');
setTimeout(function () { setTimeout(function () {
...@@ -149,6 +158,7 @@ ...@@ -149,6 +158,7 @@
}, 5); }, 5);
return; return;
} }
//调整后的保证金余额应小于支付总额 //调整后的保证金余额应小于支付总额
if (value > et_total_amount) { if (value > et_total_amount) {
Leaf.showMessage('${l:HLS.PROMPT}', '调整后的保证金抵扣金额应小于支付总额！'); Leaf.showMessage('${l:HLS.PROMPT}', '调整后的保证金抵扣金额应小于支付总额！');
...@@ -158,7 +168,6 @@ ...@@ -158,7 +168,6 @@
return; return;
} }
record.set('et_total_amount', minus(plus(plus(plus(plus(record.get('et_due_amount')||0,record.get('et_fee')||0),record.get('residual_value')||0),record.get('overdue_amount')||0),record.get('ccr_penalty')||0),value)); record.set('et_total_amount', minus(plus(plus(plus(plus(record.get('et_due_amount')||0,record.get('et_fee')||0),record.get('residual_value')||0),record.get('overdue_amount')||0),record.get('ccr_penalty')||0),value));
} }
} }
...@@ -177,7 +186,7 @@ ...@@ -177,7 +186,7 @@
/**留购价**/ /**留购价**/
residual_value: record.get('residual_value'), //update by xsh35973 20220613 residual_value: record.get('residual_value'), //update by xsh35973 20220613
/**保证金抵扣金额**/ /**保证金抵扣金额**/
deposit_deduction: record.get('deposit_deduction')||0 //update by 18083 2023/5/12 deposit_deduction: record.get('deposit_deduction')||0 //update by 18083 2023/6/14
}, },
success: function (res) { success: function (res) {
clc_flag = 'Y'; clc_flag = 'Y';
...@@ -228,7 +237,6 @@ ...@@ -228,7 +237,6 @@
}); });
} }
//add by xsh35973 添加修改调整后资源占用费提前结清租金跟随变动 //add by xsh35973 添加修改调整后资源占用费提前结清租金跟随变动
//调整后资金占用费
if(name == 'fund_possession_cost'&& clc_flag =='N'){ if(name == 'fund_possession_cost'&& clc_flag =='N'){
if (value < 0 || value == NaN || value == undefined) { if (value < 0 || value == NaN || value == undefined) {
Leaf.showMessage('${l:HLS.PROMPT}', '调整后的资金占用费金额应大于等于0！'); Leaf.showMessage('${l:HLS.PROMPT}', '调整后的资金占用费金额应大于等于0！');
...@@ -263,7 +271,6 @@ ...@@ -263,7 +271,6 @@
var et_total_amount_result=minus(plus(plus(plus(plus(record.get('et_due_amount') || 0, record.get('et_fee') || 0), record.get('residual_value') || 0), record.get('overdue_amount') || 0), record.get('ccr_penalty')),record.get('deposit_deduction') || 0); var et_total_amount_result=minus(plus(plus(plus(plus(record.get('et_due_amount') || 0, record.get('et_fee') || 0), record.get('residual_value') || 0), record.get('overdue_amount') || 0), record.get('ccr_penalty')),record.get('deposit_deduction') || 0);
record.set('et_total_amount',et_total_amount_result); record.set('et_total_amount',et_total_amount_result);
} }
//提前结清租金
if(name == 'et_due_amount'&& clc_flag =='N'){ if(name == 'et_due_amount'&& clc_flag =='N'){
if (value < 0 || value == NaN || value == undefined) { if (value < 0 || value == NaN || value == undefined) {
Leaf.showMessage('${l:HLS.PROMPT}', '调整后的提前结清租金金额应大于等于0！'); Leaf.showMessage('${l:HLS.PROMPT}', '调整后的提前结清租金金额应大于等于0！');
...@@ -276,7 +283,6 @@ ...@@ -276,7 +283,6 @@
record.set('et_total_amount',et_total_amount_result); record.set('et_total_amount',et_total_amount_result);
} }
} }
}; };
window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function() {
...@@ -705,7 +711,7 @@ ...@@ -705,7 +711,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/PRJ500/prj_project_create.lview
View file @ 91f8e51b
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/modules/prj/PRJ500N/prj_project_create_entrance.lview
View file @ 91f8e51b
...@@ -34,16 +34,10 @@ ...@@ -34,16 +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'){
debugger;
$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;
...@@ -64,10 +58,10 @@ ...@@ -64,10 +58,10 @@
record.set('function_code', 'PRJ500D'); record.set('function_code', 'PRJ500D');
url = "prj_chance_create_link"; url = "prj_chance_create_link";
} }
record.data['url_title'] = '报价申请创建';
record.set('function_usage', 'CREATE'); record.set('function_usage', 'CREATE');
record.set('document_category', 'PROJECT'); record.set('document_category', 'PROJECT');
record.set('default_value_dsid', ds_id); record.set('default_value_dsid', ds_id);
record.data['url_title'] = '报价申请创建';
var param = record.data; var param = record.data;
record.set('winid', 'prj_porject_create_win_id'); record.set('winid', 'prj_porject_create_win_id');
......
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