Skip to content

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

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

parent 361ac535
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 932 additions and 1127 deletions
src/main/webapp/WEB-INF/classes/wx/WX100/con_file_download.lwm
View file @ c621fdeb
...@@ -57,19 +57,32 @@ select fa.file_name,fa.file_path,fa.attachment_id ...@@ -57,19 +57,32 @@ select fa.file_name,fa.file_path,fa.attachment_id
'PERSONAL_CREDIT', 'PERSONAL_CREDIT',
'FINANCE_LEASE_CONTRACT_TJ_FR_E', 'FINANCE_LEASE_CONTRACT_TJ_FR_E',
'FINANCE_LEASE_CONTRACT_TJ_FR_E', 'FINANCE_LEASE_CONTRACT_TJ_FR_E',
'FINANCE_LEASE_CONTRACT_FR_TJ_E','FINANCE_LEASE_CONTRACT_FR_TJ_E',
'CSH_PAYMENT_REQ_TJ_E','CSH_PAYMENT_REQ_TJ_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_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_FR_E','FINANCE_LEASE_CONTRACT_KJ_FR_E',
'FINANCE_LEASE_CONTRACT_KJ_S_E','FINANCE_LEASE_CONTRACT_KJ_S_E', --'FINANCE_LEASE_CONTRACT_KJ_S_E','FINANCE_LEASE_CONTRACT_KJ_S_E',
'FINANCE_LEASE_CONTRACT_KJ_E','FINANCE_LEASE_CONTRACT_KJ_E', --'FINANCE_LEASE_CONTRACT_KJ_E','FINANCE_LEASE_CONTRACT_KJ_E',
'CSH_PAYMENT_REQ_KJ_1_E','CSH_PAYMENT_REQ_KJ_1_E', --'CSH_PAYMENT_REQ_KJ_1_E','CSH_PAYMENT_REQ_KJ_1_E',
'CON_CONTRACT_MORTGAGE_KJ_E','CON_CONTRACT_MORTGAGE_KJ_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_E','LEASE_CONTRACT_PAR_KJ_E',
'LEASE_CONTRACT_PAR_KJ_1_E','LEASE_CONTRACT_PAR_KJ_1_E', --'LEASE_CONTRACT_PAR_KJ_1_E','LEASE_CONTRACT_PAR_KJ_1_E',
'CON_COLLECTION_PAYMENT_KJ_E','CON_COLLECTION_PAYMENT_KJ_E', --'CON_COLLECTION_PAYMENT_KJ_E','CON_COLLECTION_PAYMENT_KJ_E',
--博雷顿 --北京心诚合并二手机
'PERSONAL_CREDIT_BLD_E', 'FINANCE_LEASE_CONTRACT_KJ_E','FINANCE_LEASE_CONTRACT_TJ_E',
'CON_CONTRACT_MORTGAGE_KJ_E','CON_CONTRACT_MORTGAGE_TJ_E',
'CON_COLLECTION_PAYMENT_KJ_E','CON_COLLECTION_PAYMENT_TJ_E',
'CSH_PAYMENT_REQ_KJ_1_E','CSH_PAYMENT_REQ_TJ_E',
'LEASE_CONTRACT_PAR_KJ_1_E','SPOUSE_COMMITMENT',
'LEASE_CONTRACT_PAR_KJ_E','GUARANTEE_COMMITMENT',
'FINANCE_LEASE_CONTRACT_KJ_S_E','FINANCE_LEASE_CONTRACT_TJ_S_E',
'FINANCE_LEASE_CONTRACT_FR_KJ_E','FINANCE_LEASE_CONTRACT_FR_TJ_E',
'FINANCE_LEASE_CONTRACT_KJ_FR_E','FINANCE_LEASE_CONTRACT_TJ_FR_E',
--'PERSONAL_CREDIT','PERSONAL_CREDIT',
'ENTERPRISE_CREDIT','ENTERPRISE_CREDIT',
'PERSONAL_CREDIT_BLD_E',
'CREDIT_AUTHOR', 'CREDIT_AUTHOR',
'ENTERPRISE_CREDIT_BLD_E', 'ENTERPRISE_CREDIT_BLD_E',
'CREDIT_AUTHOR', 'CREDIT_AUTHOR',
...@@ -104,7 +117,34 @@ select fa.file_name,fa.file_path,fa.attachment_id ...@@ -104,7 +117,34 @@ select fa.file_name,fa.file_path,fa.attachment_id
'CON_CONTRACT_MORTGAGE_BLD_E', 'CON_CONTRACT_MORTGAGE_BLD_E',
'MORT_CONTRACT', 'MORT_CONTRACT',
'CON_CONTRACT_LEASEBACK_BLD_E', 'CON_CONTRACT_LEASEBACK_BLD_E',
'CONTRACT' 'CONTRACT',
--云南铁拳合同文本匹配关系 18083 2024/5/22
'CON_CONTRACT_LEASEBACK_YNTQ','FINANCE_LEASE_CONTRACT_TJ_E',
'CON_CONTRACT_MORTGAGE_YNTQ','CON_CONTRACT_MORTGAGE_TJ_E',
'CON_COLLECTION_PAYMENT_YNTQ','CON_COLLECTION_PAYMENT_TJ_E',
'CSH_LEASEBACK_YNTQ','CSH_PAYMENT_REQ_TJ_E',
'PAR_TENANT_YNTQ','SPOUSE_COMMITMENT',
'PAR_GUTA_YNTQ','GUARANTEE_COMMITMENT',
'SURE_LEASEBACK_GR_YNTQ','FINANCE_LEASE_CONTRACT_TJ_S_E',
'SURE_LEASEBACK_FR_YNTQ','FINANCE_LEASE_CONTRACT_FR_TJ_E',
'SURE_LEASEBACK_FR_HLJ_YNTQ','FINANCE_LEASE_CONTRACT_TJ_FR_E',
'PERSONAL_CREDIT_YNTQ','PERSONAL_CREDIT',
'ENTERPRISE_CREDIT_YNTQ','ENTERPRISE_CREDIT',
'PERSONAL_CREDIT_GUTA_YNTQ','PERSONAL_CREDIT',
'ENTERPRISE_CREDIT_GUTA_YNTQ','ENTERPRISE_CREDIT',
--河南融投和茂甲文本匹配 38823
'PAR_TENANT_LB_OEC','SPOUSE_COMMITMENT',
'PAR_GUTA_LB_OEC','GUARANTEE_COMMITMENT',
'F_LEASE_CONTRACT_TJ_S_EHN','FINANCE_LEASE_CONTRACT_TJ_E',
'LEASEBACK_ORDER_OEC','LEASEBACK_ORDER_OEC',
--二手机合并新增模板匹配
'PERSONAL_CREDIT_KJ_E','PERSONAL_CREDIT',
'GUARANTOR_PERSONAL_CREDIT_KJ_E','PERSONAL_CREDIT',
'ENTERPRISE_CREDIT_KJ_E','ENTERPRISE_CREDIT',
'PERSONAL_CREDIT_MJ_E','PERSONAL_CREDIT',
'GUARANTOR_PERSONAL_CREDIT_MJ_E','PERSONAL_CREDIT',
'ENTERPRISE_CREDIT_MJ_E','ENTERPRISE_CREDIT'
) )
from con_ele_signer_file cf, con_contract_ele_signer cs from con_ele_signer_file cf, con_contract_ele_signer cs
where cf.con_ele_signer_id = cs.con_ele_signer_id where cf.con_ele_signer_id = cs.con_ele_signer_id
...@@ -124,8 +164,11 @@ select fa.file_name,fa.file_path,fa.attachment_id ...@@ -124,8 +164,11 @@ select fa.file_name,fa.file_path,fa.attachment_id
and ht.templet_code = ct.templet_code and ht.templet_code = ct.templet_code
and ct.templet_id = cf.templet_id and ct.templet_id = cf.templet_id
and hs.enable_flag = 'Y' and hs.enable_flag = 'Y'
and hs.signer_category not in ('AGENCY_STORE_SEAL','AGENCY_STORE_SIGN','HONGLING_SEAL','HONGLING_SIGN', and hs.signer_category not in ('AGENCY_STORE_SEAL',
'MAN_FACTURER_SEAL', 'AGENCY_STORE_SIGN',
'HONGLING_SEAL',
'HONGLING_SIGN',
'MAN_FACTURER_SEAL',
'MAN_FACTURER_SIGN', 'MAN_FACTURER_SIGN',
'SUPPLIER_SEAL', 'SUPPLIER_SEAL',
'SUPPLIER_SIGN', 'SUPPLIER_SIGN',
...@@ -136,7 +179,7 @@ select fa.file_name,fa.file_path,fa.attachment_id ...@@ -136,7 +179,7 @@ select fa.file_name,fa.file_path,fa.attachment_id
where cb.bp_id = hm.bp_id where cb.bp_id = hm.bp_id
and hm.social_code = ${@id_no} and hm.social_code = ${@id_no}
and cb.contract_id = cs.contract_id) and cb.contract_id = cs.contract_id)
or 'VENDER' in (select cb.bp_category or 'VENDER' in (select cb.bp_category
from con_contract_bp cb, hls_bp_master hm from con_contract_bp cb, hls_bp_master hm
where cb.bp_id = hm.bp_id where cb.bp_id = hm.bp_id
and hm.social_code = ${@id_no} and hm.social_code = ${@id_no}
......
src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview
View file @ c621fdeb
...@@ -118,7 +118,6 @@ ...@@ -118,7 +118,6 @@
function invoiceHd_confirm() { function invoiceHd_confirm() {
debugger;
Leaf.Masker.mask(Ext.getBody()); Leaf.Masker.mask(Ext.getBody());
var final_bill_flag = $('allConditionDs').getAt(0).get('final_bill_flag'); var final_bill_flag = $('allConditionDs').getAt(0).get('final_bill_flag');
var cat_ini_flag = $('allConditionDs').getAt(0).get('cat_ini_flag'); var cat_ini_flag = $('allConditionDs').getAt(0).get('cat_ini_flag');
...@@ -141,7 +140,7 @@ ...@@ -141,7 +140,7 @@
} else if (datas[i].business_type == 'LEASEBACK') { } else if (datas[i].business_type == 'LEASEBACK') {
leaseback_count = leaseback_count + 1; leaseback_count = leaseback_count + 1;
} }
//合同编号BJS18020001与燕千云单号I-19139有关，暂不能开票，请联系IT管理员！ //合同编号BJS18020001与燕千云单号I-19139有关，暂不能开票，请联系IT管理员！
if(datas[i].contract_number == 'BJS18020001'){ if(datas[i].contract_number == 'BJS18020001'){
$L.showErrorMessage('提示','合同编号BJS18020001与燕千云单号I-19139有关，暂不能开票，请联系IT管理员！'); $L.showErrorMessage('提示','合同编号BJS18020001与燕千云单号I-19139有关，暂不能开票，请联系IT管理员！');
Leaf.Masker.unmask(Ext.getBody()); Leaf.Masker.unmask(Ext.getBody());
...@@ -270,7 +269,7 @@ ...@@ -270,7 +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: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">
...@@ -289,10 +288,10 @@ ...@@ -289,10 +288,10 @@
<a:record code_value="REPUR" code_value_name="解约回购"/> <a:record code_value="REPUR" code_value_name="解约回购"/>
</a:datas> </a:datas>
</a:dataSet> </a:dataSet>
<a:dataSet id="acr510n_invoice_type_ds"> <a:dataSet id="acr510n_invoice_type_ds">
<a:datas> <a:datas>
<a:record code_value="ECT" code_value_name="电子发票"/> <a:record code_value="ECT" code_value_name="电子发票"/>
<a:record code_value="PAPER" code_value_name="数电纸质发票"/> <a:record code_value="PAPER" code_value_name="纸质发票"/>
</a:datas> </a:datas>
</a:dataSet> </a:dataSet>
<a:dataSet id="acr510n_division_ds"> <a:dataSet id="acr510n_division_ds">
...@@ -304,12 +303,12 @@ ...@@ -304,12 +303,12 @@
<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="95" 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="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>
<a:dataSet id="acr510n_invoice_method_ds"> <a:dataSet id="acr510n_invoice_method_ds">
...@@ -320,7 +319,7 @@ ...@@ -320,7 +319,7 @@
</a:dataSet> </a:dataSet>
<a:dataSet id="allConditionDs" autoCreate="true"> <a:dataSet id="allConditionDs" autoCreate="true">
<a:fields> <a:fields>
<a:field name="invoice_method"/> <a:field name="invoice_method"/>
<a:field displayField="code_value_name" name="invoice_method_n" options="acr510n_invoice_method_ds" <a:field displayField="code_value_name" name="invoice_method_n" options="acr510n_invoice_method_ds"
returnField="invoice_method" valueField="code_value"/> returnField="invoice_method" valueField="code_value"/>
<a:field name="division"/> <a:field name="division"/>
...@@ -461,9 +460,9 @@ ...@@ -461,9 +460,9 @@
<a:field name="billing_status"/> <a:field name="billing_status"/>
<a:field name="billing_status_n" displayField="code_value_name" options="billing_status_ds" <a:field name="billing_status_n" displayField="code_value_name" options="billing_status_ds"
returnField="billing_status" valueField="code_value"/> returnField="billing_status" valueField="code_value"/>
<a:field name="full_elec_invoice_flag"/> <a:field name="full_elec_invoice_flag"/>
<a:field name="full_elec_invoice_flag_n" displayField="code_value_name" options="overdue_status_ds" <a:field name="full_elec_invoice_flag_n" displayField="code_value_name" options="overdue_status_ds"
returnField="full_elec_invoice_flag" valueField="code_value"/> returnField="full_elec_invoice_flag" valueField="code_value"/>
</a:fields> </a:fields>
<a:events> <a:events>
<a:event name="update" handler="queryUpdateFunction"/> <a:event name="update" handler="queryUpdateFunction"/>
...@@ -539,8 +538,9 @@ ...@@ -539,8 +538,9 @@
</a:hBox> </a:hBox>
<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"/>
...@@ -579,6 +579,8 @@ ...@@ -579,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"/>
...@@ -605,13 +607,13 @@ ...@@ -605,13 +607,13 @@
<a:column name="exchange_rate" align="right" width="80"/> <a:column name="exchange_rate" align="right" width="80"/>
<a:column name="exchange_rate_type_desc" width="100"/> --> <a:column name="exchange_rate_type_desc" width="100"/> -->
<a:column name="bill_object_bp_class_desc" width="100" align="center" prompt="商业伙伴分类" /> <a:column name="bill_object_bp_class_desc" width="100" align="center" prompt="商业伙伴分类" />
<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>
</a:grid> </a:grid>
</a:tab> </a:tab>
<a:tab prompt="抬头信息" width="150"> <a:tab prompt="抬头信息" width="150">
...@@ -622,8 +624,7 @@ ...@@ -622,8 +624,7 @@
<!--<a:column name="object_taxpayer_type_desc" prompt="纳税人类型"/>--> <!--<a:column name="object_taxpayer_type_desc" prompt="纳税人类型"/>-->
<a:column name="contract_number" prompt="合同编号" align="center" width="100"/> <a:column name="contract_number" prompt="合同编号" align="center" width="100"/>
<a:column name="contract_status_desc" prompt="合同状态" align="center" width="80"/> <a:column name="contract_status_desc" prompt="合同状态" align="center" width="80"/>
<a:column name="billing_method_desc" prompt="开票规则" <a:column name="billing_method_desc" prompt="开票规则" width="155"/>
width="155"/>
<a:column name="billing_object_name" autoAdjust="false" <a:column name="billing_object_name" autoAdjust="false"
editor="contractDs_grid_editor_lov" prompt="开票对象名称" editor="contractDs_grid_editor_lov" prompt="开票对象名称"
renderer="render_contractDs_grid" showTitle="true" width="200"/> renderer="render_contractDs_grid" showTitle="true" width="200"/>
......
src/main/webapp/modules/cont/CON3400/contract_sales_report.lview
View file @ c621fdeb
...@@ -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,17 @@ ...@@ -211,16 +212,17 @@
<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:form> <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: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">
<a:columns> <a:columns>
...@@ -229,6 +231,7 @@ ...@@ -229,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"/>
...@@ -240,6 +243,8 @@ ...@@ -240,6 +243,8 @@
<a:column name="sale_amount" prompt="销售收入" align="center" width="220"/> <a:column name="sale_amount" prompt="销售收入" align="center" width="220"/>
<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="full_name" prompt="设备名称" align="center" width="220"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
...@@ -250,6 +255,7 @@ ...@@ -250,6 +255,7 @@
<a:column name="sale_amount" prompt="销售收入" align="center" width="220"/> <a:column name="sale_amount" prompt="销售收入" align="center" width="220"/>
<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="sum_total" prompt="合计" align="center" width="220"/> <a:column name="sum_total" 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 @ c621fdeb
...@@ -40,8 +40,9 @@ ...@@ -40,8 +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.division12='';
record.data.division14=''; 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';
} }
...@@ -72,21 +73,21 @@ ...@@ -72,21 +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_name99=='Y'){ if(record.data.lease_name95=='Y'){
record.data.divisio12='99'; record.data.division13='95';
}; };
if(record.data.lease_name93=='Y'){ if(record.data.lease_name93=='Y'){
record.data.divisio14='93'; record.data.division14='93';
};
if(record.data.lease_name95=='Y'){
record.data.division13='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);
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.division12 ==''&&record.data.division13 == ''&&record.data.division14 == ''){ &&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';
...@@ -98,11 +99,10 @@ ...@@ -98,11 +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.division12='99';
record.data.division14='93'; record.data.division13='95';
record.data.division14='93';
record.data.division13='95';
}; };
param['division1']= record.data.division1; param['division1']= record.data.division1;
param['division2']= record.data.division2; param['division2']= record.data.division2;
...@@ -115,9 +115,9 @@ ...@@ -115,9 +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['division12']= record.data.division12;
param['division14']= record.data.division14; param['division13']= record.data.division13;
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 @ c621fdeb
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 @ c621fdeb
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
<a:init-procedure> <a:init-procedure>
<a:model-query defaultWhereClause="t1.change_req_id = ${/parameter/@change_req_id}" <a:model-query defaultWhereClause="t1.change_req_id = ${/parameter/@change_req_id}"
model="cus_deposit.CUS_DEPOSIT106.get_contract_wfl_status" rootPath="default_value_path"/> model="cus_deposit.CUS_DEPOSIT106.get_contract_wfl_status" rootPath="default_value_path"/>
<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="con731_calc_ccr_fee_link" model="cont.CON731.calc_ccr_fee" modelaction="execute"/>--> <!-- <a:link id="con731_calc_ccr_fee_link" model="cont.CON731.calc_ccr_fee" modelaction="execute"/>-->
<a:link id="calc_leasse_amount_link" model="cont.CON731.calc_leasse_date" modelaction="execute"/> <a:link id="calc_leasse_amount_link" model="cont.CON731.calc_leasse_date" modelaction="execute"/>
...@@ -51,12 +51,12 @@ ...@@ -51,12 +51,12 @@
$(ds_con_id).setQueryParameter('contract_id', '${/parameter/@contract_id}'); $(ds_con_id).setQueryParameter('contract_id', '${/parameter/@contract_id}');
$(ds_con_id).query(); $(ds_con_id).query();
} }
//让历史信息查询 //让历史信息查询
var history_con_id=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master'); var history_con_id=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master');
if($(history_con_id)){ if($(history_con_id)){
var url = '${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?bp_id=${/parameter/@bp_id}'; var url = '${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?bp_id=${/parameter/@bp_id}';
$(history_con_id).setQueryUrl(url); $(history_con_id).setQueryUrl(url);
$(history_con_id).query(); $(history_con_id).query();
} }
//铁甲业务合同展示保证金字段 18083 2023/5/11 //铁甲业务合同展示保证金字段 18083 2023/5/11
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}' != ''){
...@@ -68,14 +68,25 @@ ...@@ -68,14 +68,25 @@
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'){
//报价中资管费字段为否时，不展示资产管理费字段 18083 2024/1/29 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
if('${/model/asset_flag_path/record/@hd_user_col_v06}' !='Y'){ if('${/model/asset_flag_path/record/@hd_user_col_v06}' !='Y'){
if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_ASSET_POSSESSION_COST")){ if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_ASSET_POSSESSION_COST")){
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_ASSET_POSSESSION_COST_prompt").style.display = "none"; document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_ASSET_POSSESSION_COST_prompt").style.display = "none";
document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_ASSET_POSSESSION_COST").style.display = "none"; document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_ASSET_POSSESSION_COST").style.display = "none";
} }
} }
}); });
function open_contract_win(ds_id, record_id) { function open_contract_win(ds_id, record_id) {
...@@ -300,7 +311,6 @@ ...@@ -300,7 +311,6 @@
} }
// 回款賬戶變更 // 回款賬戶變更
if ('${/parameter/@layout_code}' == 'CON_ACCOUNT_CHANGE_MODIFY') { if ('${/parameter/@layout_code}' == 'CON_ACCOUNT_CHANGE_MODIFY') {
debugger;
if (name == 'pay_method') { if (name == 'pay_method') {
if ( value== 'WIRE_TRANSFER') { if ( value== 'WIRE_TRANSFER') {
record.set('bank_account_id', null); record.set('bank_account_id', null);
...@@ -600,8 +610,7 @@ ...@@ -600,8 +610,7 @@
change_req_id: '${/parameter/@change_req_id}', change_req_id: '${/parameter/@change_req_id}',
}, },
success: function (res) { success: function (res) {
debugger; same_flag = res.result.same_flag;
same_flag = res.result.same_flag;
}, },
failure: function () { failure: function () {
...@@ -618,8 +627,7 @@ ...@@ -618,8 +627,7 @@
}else{ }else{
var showMessage ='担保人未发生变更,是否确认提交审批？'; var showMessage ='担保人未发生变更,是否确认提交审批？';
} }
// debugger; Leaf.showConfirm('${l:HLS.PROMPT}', showMessage, function () {
Leaf.showConfirm('${l:HLS.PROMPT}', showMessage, function () {
var req_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract'); var req_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var req_record = $(req_ds_id).getAt(0); var req_record = $(req_ds_id).getAt(0);
window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window'](); window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
...@@ -910,8 +918,8 @@ ...@@ -910,8 +918,8 @@
} }
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 {
...@@ -930,8 +938,7 @@ ...@@ -930,8 +938,7 @@
};*/ };*/
//add by lihh 20210330审批记录打印 //add by lihh 20210330审批记录打印
window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function() {
debugger; var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var records = $(ds_id).getCurrentRecord(); var records = $(ds_id).getCurrentRecord();
var document_id = records.get('contract_id'); var document_id = records.get('contract_id');
var url_l; var url_l;
...@@ -950,7 +957,7 @@ ...@@ -950,7 +957,7 @@
} }
var OpenWindow = window.open(href = url_l, target = "_blank"); var OpenWindow = window.open(href = url_l, target = "_blank");
}; };
//保存前调用 //保存前调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) {
var check_flag = true; var check_flag = true;
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create_entrance.lview
View file @ c621fdeb
...@@ -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