Skip to content

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

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

parent 8945a2db
Expand all Hide 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
......@@ -140,7 +140,7 @@
} else if (datas[i].business_type == 'LEASEBACK') {
leaseback_count = leaseback_count + 1;
}
//合同编号BJS18020001与燕千云单号I-19139有关，暂不能开票，请联系IT管理员！
//合同编号BJS18020001与燕千云单号I-19139有关，暂不能开票，请联系IT管理员！
if(datas[i].contract_number == 'BJS18020001'){
$L.showErrorMessage('提示','合同编号BJS18020001与燕千云单号I-19139有关，暂不能开票，请联系IT管理员！');
Leaf.Masker.unmask(Ext.getBody());
......@@ -269,6 +269,7 @@
<a:datas>
<a:record code_value="LEASE" code_value_name="直租"/>
<a:record code_value="LEASEBACK" code_value_name="售后回租"/>
<a:record code_value="LEASEOPERAT" code_value_name="经营性租赁"/>
</a:datas>
</a:dataSet>
<a:dataSet id="write_off_flag_ds">
......@@ -300,16 +301,14 @@
<a:record code_value="30" code_value_name="高空作业车"/>
<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="90" code_value_name="租赁二手机（日立）"/>
<a:record code_value="91" code_value_name="神钢建机"/>
<a:record code_value="92" code_value_name="北京心诚"/>
<a:record code_value="99" 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="80" 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:dataSet>
<a:dataSet id="acr510n_invoice_method_ds">
......@@ -540,6 +539,8 @@
<a:hBox>
<a:comboBox bindTarget="allConditionDs" name="billing_status_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:formBody column="4" labelWidth="400">
<a:lov name="contract_number_from" bindTarget="allConditionDs" prompt="HLS.CONTRACT_NUMBER_FROM"/>
......@@ -578,6 +579,8 @@
<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="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="due_date" prompt="应收日" align="center"/>
<a:column name="due_amount" align="right" prompt="应收金额" renderer="Leaf.formatMoney"/>
......@@ -607,7 +610,7 @@
<a:column name="invoice_method_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="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="full_elec_invoice_flag_n" width="100" align="center" prompt="是否全电发票" />
</a:columns>
......@@ -629,7 +632,7 @@
width="200"/>
<a:column name="object_tax_registry_num" prompt="纳税人识别号" width="150"/>
<a:column name="object_taxpayer_type_desc" prompt="纳税人类型" align="center" width="150"/>
<a:column name="invoice_type_n" prompt="开票类型" width="150"/>
<a:column name="invoice_type_n" prompt="开票类型" width="150"/>
<a:column name="invoice_bp_address_phone_num" autoAdjust="false" prompt="开票地址电话"
showTitle="true" width="200"/>
<a:column name="invoice_bp_bank_account" autoAdjust="false" prompt="开户行及账号"
......
src/main/webapp/modules/cont/CON3400/contract_sales_report.lview
View file @ 91f8e51b
......@@ -113,17 +113,17 @@
if(record.data.lease_name91=='Y'){//addby xsh35973 20221011 I-12357新增产品线
record.data.division=record.data.division+',91';
};
if(record.data.lease_name92=='Y'){//add by gzj
record.data.division=record.data.division+',92';
};
//if(record.data.lease_name92=='Y'){//add by gzj
//record.data.division=record.data.division+',92';
//};
if(record.data.lease_name99=='Y'){//add by gzj
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
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);
$('contract_sales_result_ds').query();
......@@ -144,6 +144,7 @@
<a:datas>
<a:record code_value="LEASE" code_value_name="直租"/>
<a:record code_value="LEASEBACK" code_value_name="售后回租"/>
<a:record code_value="LEASEOPERAT" code_value_name="经营性租赁"/>
</a:datas>
</a:dataSet>
<a:dataSet id="contract_sales_report_ds" autoPageSize="true">
......@@ -211,17 +212,17 @@
<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_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_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_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_name99" 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:columns>
......@@ -230,6 +231,7 @@
<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="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="bp_tenant_code" prompt="承租人编号" align="center" width="220"/>
<a:column name="bp_tenant_name" prompt="承租人名称" align="center" width="220"/>
......@@ -242,6 +244,7 @@
<a:column name="sale_penalty" 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="full_name" prompt="设备名称" align="center" width="220"/>
</a:columns>
</a:grid>
......
src/main/webapp/modules/cont/CON3500/contract_ifrs9_report.lview
View file @ 91f8e51b
......@@ -24,6 +24,11 @@
var period_name=$(ds_id).getAt(0).get('period_name');
var record = $(ds_id).getAt(0);
//期间校验提示
if(period_name == null || period_name == ''){
Leaf.showMessage('提示', '请选择报表的期间');
return false;
}
record.data.division1='';
record.data.division2='';
record.data.division3='';
......@@ -35,6 +40,9 @@
record.data.division9='';
record.data.division10='';
record.data.division11='';
record.data.division12='';
record.data.division13='';
record.data.division14='';
if(record.data.lease_name10=='Y'){
record.data.division1='10';
}
......@@ -65,12 +73,21 @@
if(record.data.lease_name91=='Y'){
record.data.division10='91';
};
if(record.data.lease_name92=='Y'){
record.data.division11='92';
//if(record.data.lease_name92=='Y'){
//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);
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';
record.data.division2='20';
......@@ -82,7 +99,10 @@
record.data.division8='80';
record.data.division9='90';
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['division2']= record.data.division2;
......@@ -95,6 +115,9 @@
param['division9']= record.data.division9;
param['division10']= record.data.division10;
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['function_code'] = 'CON3400N';
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/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
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: wangwei5743
$Date: 2014-10-8 下午1:13:25
$Revision: 1.0
$Purpose: 租赁申请创建入口
$Author: wangwei5743
$Date: 2014-10-8 下午1:13:25
$Revision: 1.0
$Purpose: 租赁申请创建入口
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true"
trace="true">
......@@ -34,16 +34,10 @@
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var record = $(ds_id).getCurrentRecord();
if(record.data.division=='70'&&record.data.business_type!='LEASEBACK'){
debugger;
// $L.showErrorMessage("提示", '租赁物为铁甲业务的业务类型只能是售后回租！');
$L.showErrorMessage("提示", '租赁物为二手机业务的业务类型只能是售后回租！');
return false;
}
if(record.data.division=='92'&&record.data.business_type!='LEASEBACK'){
debugger;
$L.showErrorMessage("提示", '租赁物为北京心诚的业务类型只能是售后回租！');
return false;
return false;
}
if(record.data.division=='95'&&record.data.business_type!='LEASEOPERAT'){
$L.showErrorMessage("提示", '租赁物为经租设备的业务类型只能是经营性租赁！');
return false;
......@@ -64,10 +58,10 @@
record.set('function_code', 'PRJ500D');
url = "prj_chance_create_link";
}
record.data['url_title'] = '报价申请创建';
record.set('function_usage', 'CREATE');
record.set('document_category', 'PROJECT');
record.set('default_value_dsid', ds_id);
record.data['url_title'] = '报价申请创建';
var param = record.data;
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