Skip to content

L
leaf-hlcm
Commit 0388d72d authored by stone's avatar stone
Browse files
Options

[fix]去除合同界面的状态条件，修改付款打印功能

parent 46deac36
Show whitespace changes
Inline Side-by-side
Showing with 97 additions and 76 deletions
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query_after_save.lwm
View file @ 0388d72d
......@@ -16,6 +16,7 @@
c.bp_id_agent_level1,
ccli.pattern pattern,
ccli.machine_number machine_number,
ccli.modelcd,
--add 添加预付款的时间
(select b.bp_name
from con_contract_bp b
......
src/main/webapp/WEB-INF/leaf.plugin.export.word/payment_apply_content.xml
View file @ 0388d72d
......@@ -6,17 +6,17 @@
</settings>
<body>
<p align="center" line="100" >
<t bold="true" fontFamily="宋体" fontSize="20" fontColor="000000" >付款请求书</t>
<t bold="true" fontFamily="黑体" fontSize="40" fontColor="000000" >付款请求书</t>
</p>
<p line="200" >
<t fontFamily="宋体" fontSize="10" fontColor="000000" >宏菱融资租赁（上海）有限公司:
<t fontFamily="黑体" fontSize="20" fontColor="000000" >宏菱融资租赁（上海）有限公司:
</t>
</p>
<p indFirstLine="1" line="100" >
<t fontFamily="宋体" fontSize="10" fontColor="000000" >非常感谢贵司长期以来的支持与帮助!</t>
<t fontFamily="黑体" fontSize="20" fontColor="000000" >非常感谢贵司长期以来的支持与帮助!</t>
</p>
<p indFirstLine="1" line="100" >
<t fontFamily="宋体" fontSize="10" fontColor="000000" >我司在${model.getObject('/model/static_data_date/record/@req_date')!''}向贵司销售${model.getObject('/model/static_data/record/@total_number')!''}台机器,具体委托明细如下:</t>
<t fontFamily="黑体" fontSize="20" fontColor="000000" >我司在${model.getObject('/model/static_data_date/record/@req_date')!''}向贵司销售${model.getObject('/model/static_data/record/@total_number')!''}台机器,具体委托明细如下:</t>
</p>
<!--插入表单数据-->
<tbl indLeft="1" border="true">
......@@ -38,105 +38,105 @@
style: 边框style，默认single
-->
<border type="bottom" color="000000" style="single"/>
<p align="left">
<t fontFamily="宋体" fontSize="10" fontColor="000000">序号</t>
<p align="center">
<t fontFamily="黑体" fontSize="16" fontColor="000000">序号</t>
</p>
</tc>
<tc width="5">
<p align="left">
<t fontFamily="宋体" fontSize="10" fontColor="000000">买卖合同号</t>
<p align="center">
<t fontFamily="黑体" fontSize="16" fontColor="000000">买卖合同号</t>
</p>
</tc>
<tc width="2">
<p align="left">
<t fontFamily="宋体" fontSize="10" fontColor="000000">机型</t>
<p align="center">
<t fontFamily="黑体" fontSize="16" fontColor="000000">机型</t>
</p>
</tc>
<tc width="2">
<p align="left">
<t fontFamily="宋体" fontSize="10" fontColor="000000">机号</t>
<p align="center">
<t fontFamily="黑体" fontSize="16" fontColor="000000">机号</t>
</p>
</tc>
<tc width="6">
<p align="left">
<t fontFamily="宋体" fontSize="10" fontColor="000000">付款预定日期</t>
<p align="center">
<t fontFamily="黑体" fontSize="16" fontColor="000000">付款预定日期</t>
</p>
</tc>
<tc width="4">
<p align="left">
<t fontFamily="宋体" fontSize="10" fontColor="000000">合同金额</t>
<p align="center">
<t fontFamily="黑体" fontSize="16" fontColor="000000">合同金额</t>
</p>
</tc>
<tc width="6">
<p align="left">
<t fontFamily="宋体" fontSize="10" fontColor="000000">委托付款金额</t>
<p align="center">
<t fontFamily="黑体" fontSize="16" fontColor="000000">委托付款金额</t>
</p>
</tc>
<tc width="6">
<p align="left">
<t fontFamily="宋体" fontSize="10" fontColor="000000">应付我司金额</t>
<tc width="4">
<p align="center">
<t fontFamily="黑体" fontSize="16" fontColor="000000">应付我司金额</t>
</p>
</tc>
<tc width="4">
<p align="left">
<t fontFamily="宋体" fontSize="10" fontColor="000000">客户名称</t>
<tc width="8">
<p align="center">
<t fontFamily="黑体" fontSize="16" fontColor="000000">客户名称</t>
</p>
</tc>
<tc width="8">
<p align="left">
<t fontFamily="宋体" fontSize="10" fontColor="000000">我司应付${model.getObject('/model/bank_info/record/@vender_name')!''}金额</t>
<p align="center">
<t fontFamily="黑体" fontSize="16" fontColor="000000">我司应付${model.getObject('/model/bank_info/record/@vender_name')!''}金额</t>
</p>
</tc>
<tc width="5">
<p align="left">
<t fontFamily="宋体" fontSize="10" fontColor="000000">付款日期</t>
<p align="center">
<t fontFamily="黑体" fontSize="16" fontColor="000000">付款日期</t>
</p>
</tc>
</tr>
<!--循环获取数据-->
<#if model.getObject("/model/payment_details").getChilds()??>
<#list model.getObject('/model/payment_details').getChilds() as detail_item_l>
<tr height="0.2">
<tr height="1">
<tc width="4">
<p align="center"><t fontSize="10" fontFamily="宋体">${detail_item_l.getString('rownum')!''}</t></p>
<p align="center"><t fontSize="16" fontFamily="黑体">${detail_item_l.getString('rownum')!''}</t></p>
</tc>
<tc width="4">
<p align="center"><t fontSize="10" fontFamily="宋体">${detail_item_l.getString('contract_number')!''}</t></p>
<p align="center"><t fontSize="16" fontFamily="黑体">${detail_item_l.getString('contract_number')!''}</t></p>
</tc>
<tc width="4">
<p align="center"><t fontSize="10" fontFamily="宋体">${detail_item_l.getString('pattern')!''}</t></p>
<p align="center"><t fontSize="16" fontFamily="黑体">${detail_item_l.getString('modelcd')!''}</t></p>
</tc>
<tc width="4">
<p align="center"><t fontSize="10" fontFamily="宋体">${detail_item_l.getString('machine_number')!''}</t></p>
<p align="center"><t fontSize="16" fontFamily="黑体">${detail_item_l.getString('machine_number')!''}</t></p>
</tc>
<tc width="4">
<p align="center"><t fontSize="10" fontFamily="宋体">${detail_item_l.getString('apply_pay_date')!''}</t></p>
<p align="center"><t fontSize="16" fontFamily="黑体">${detail_item_l.getString('apply_pay_date')!''}</t></p>
</tc>
<tc width="4">
<p align="center"><t fontSize="10" fontFamily="宋体">${detail_item_l.getString('lease_item_amount_print')!''}</t></p>
<p align="center"><t fontSize="16" fontFamily="黑体">${detail_item_l.getString('lease_item_amount_print')!''}</t></p>
</tc>
<tc width="4">
<p align="center"><t fontSize="10" fontFamily="宋体">${detail_item_l.getString('amount_vender_print')!''}</t></p>
<p align="center"><t fontSize="16" fontFamily="黑体">${detail_item_l.getString('amount_vender_print')!''}</t></p>
</tc>
<tc width="4">
<p align="center"><t fontSize="10" fontFamily="宋体">${detail_item_l.getString('amount_agent_print')!''}</t></p>
<p align="center"><t fontSize="16" fontFamily="黑体">${detail_item_l.getString('amount_agent_print')!''}</t></p>
</tc>
<tc width="4">
<p align="center"><t fontSize="10" fontFamily="宋体">${detail_item_l.getString('bp_id_tenant_n')!''}</t></p>
<p align="center"><t fontSize="16" fontFamily="黑体">${detail_item_l.getString('bp_id_tenant_n')!''}</t></p>
</tc>
<tc width="4">
<p align="center"><t fontSize="10" fontFamily="宋体">${detail_item_l.getString('other_payment2_print')!''}</t></p>
<p align="center"><t fontSize="16" fontFamily="黑体">${detail_item_l.getString('other_payment2_print')!''}</t></p>
</tc>
<tc width="4">
<p align="center"><t fontSize="10" fontFamily="宋体"></t></p>
<p align="center"><t fontSize="16" fontFamily="黑体"></t></p>
</tc>
</tr>
</#list>
......@@ -150,49 +150,49 @@
style: 边框style，默认single
-->
<p align="center">
<t fontFamily="宋体" fontSize="12" fontColor="000000"></t>
<t fontFamily="黑体" fontSize="20" fontColor="000000"></t>
</p>
</tc>
<tc span="3">
<p align="center">
<t fontFamily="宋体" fontSize="12" fontColor="000000">合计</t>
<t fontFamily="黑体" fontSize="20" fontColor="000000">合计</t>
</p>
</tc>
<tc width="2">
<p align="center">
<t fontFamily="宋体" fontSize="12" fontColor="000000"></t>
<t fontFamily="黑体" fontSize="20" fontColor="000000"></t>
</p>
</tc>
<!--合同金额-->
<tc width="2">
<p align="center">
<t fontFamily="宋体" fontSize="12" fontColor="000000">${model.getObject('/model/static_data/record/@sum_amount')!''}</t>
<t fontFamily="黑体" fontSize="20" fontColor="000000">${model.getObject('/model/static_data/record/@sum_amount')!''}</t>
</p>
</tc>
<tc width="6">
<p align="center">
<t fontFamily="宋体" fontSize="12" fontColor="000000">${model.getObject('/model/static_data/record/@sum_amount_vender')!''}</t>
<t fontFamily="黑体" fontSize="20" fontColor="000000">${model.getObject('/model/static_data/record/@sum_amount_vender')!''}</t>
</p>
</tc>
<tc width="4">
<p align="center">
<t fontFamily="宋体" fontSize="12" fontColor="000000">${model.getObject('/model/static_data/record/@sum_amount_agent')!''}</t>
<t fontFamily="黑体" fontSize="20" fontColor="000000">${model.getObject('/model/static_data/record/@sum_amount_agent')!''}</t>
</p>
</tc>
<!--客户名称-->
<tc width="6">
<p align="center">
<t fontFamily="宋体" fontSize="12" fontColor="000000"></t>
<t fontFamily="黑体" fontSize="20" fontColor="000000"></t>
</p>
</tc>
<tc width="6">
<p align="center">
<t fontFamily="宋体" fontSize="12" fontColor="000000">${model.getObject('/model/static_data/record/@sum_other_payment')!''}</t>
<t fontFamily="黑体" fontSize="20" fontColor="000000">${model.getObject('/model/static_data/record/@sum_other_payment')!''}</t>
</p>
</tc>
<tc width="4">
<p align="center">
<t fontFamily="宋体" fontSize="12" fontColor="000000"></t>
<t fontFamily="黑体" fontSize="20" fontColor="000000"></t>
</p>
</tc>
......@@ -201,91 +201,91 @@
</tbl>
<p line="200" >
<t fontFamily="宋体" fontSize="12" fontColor="000000" >备注:以上款项如核对无误,烦请贵司向我司付款${model.getObject('/model/static_data/record/@sum_amount_agent')!''}元,向${model.getObject('/model/bank_info/record/@vender_name')!''}付款${model.getObject('/model/static_data/record/@sum_amount_vender')!''}元。特此申请! </t>
<t fontFamily="黑体" fontSize="20" fontColor="000000" >备注:以上款项如核对无误,烦请贵司向我司付款${model.getObject('/model/static_data/record/@sum_amount_agent')!''}元,向${model.getObject('/model/bank_info/record/@vender_name')!''}付款${model.getObject('/model/static_data/record/@sum_amount_vender')!''}元。特此申请! </t>
</p>
<p indFirstLine="1" line="200" >
<t fontFamily="宋体" fontSize="12" fontColor="000000" >本公司和${model.getObject('/model/bank_info/record/@vender_name')!''}的一切债权债务关系由本公司和${model.getObject('/model/bank_info/record/@vender_name')!''}自行解决和宏菱融资租赁（上海）有限公司无关。</t>
<t fontFamily="黑体" fontSize="20" fontColor="000000" >本公司和${model.getObject('/model/bank_info/record/@vender_name')!''}的一切债权债务关系由本公司和${model.getObject('/model/bank_info/record/@vender_name')!''}自行解决和宏菱融资租赁（上海）有限公司无关。</t>
</p>
<p indFirstLine="1" line="200" >
<t fontFamily="宋体" fontSize="12" fontColor="000000" >烦请贵司将款项汇至以下账号:</t>
<t fontFamily="黑体" fontSize="20" fontColor="000000" >烦请贵司将款项汇至以下账号:</t>
</p>
<p height="0.1"/>
<tbl indLeft="1" border="false">
<tr height="0.3">
<tc width="10">
<p align="left"><t fontSize="12" fontFamily="宋体">开户名:${model.getObject('/model/bank_info/record/@agent_account_name')!''}</t></p>
<p align="left"><t fontSize="20" fontFamily="黑体">开户名:${model.getObject('/model/bank_info/record/@agent_account_name')!''}</t></p>
</tc>
<tc width="10">
<p align="left"><t fontSize="12" fontFamily="宋体">开户名:${model.getObject('/model/bank_info/record/@vender_account_name')!''}</t></p>
<p align="left"><t fontSize="20" fontFamily="黑体">开户名:${model.getObject('/model/bank_info/record/@vender_account_name')!''}</t></p>
</tc>
</tr>
<tr height="0.3">
<tc width="10">
<p align="left"><t fontSize="12" fontFamily="宋体">开户行:${model.getObject('/model/bank_info/record/@agent_bank_name')!''}</t></p>
<p align="left"><t fontSize="20" fontFamily="黑体">开户行:${model.getObject('/model/bank_info/record/@agent_bank_name')!''}</t></p>
</tc>
<tc width="10">
<p align="left"><t fontSize="12" fontFamily="宋体">开户行:${model.getObject('/model/bank_info/record/@vender_bank_name')!''}</t></p>
<p align="left"><t fontSize="20" fontFamily="黑体">开户行:${model.getObject('/model/bank_info/record/@vender_bank_name')!''}</t></p>
</tc>
</tr>
<tr height="0.3">
<tc width="10">
<p align="left"><t fontSize="12" fontFamily="宋体">账号:${model.getObject('/model/bank_info/record/@agent_bank_num')!''}</t></p>
<p align="left"><t fontSize="20" fontFamily="黑体">账号:${model.getObject('/model/bank_info/record/@agent_bank_num')!''}</t></p>
</tc>
<tc width="10">
<p align="left"><t fontSize="12" fontFamily="宋体">账号:${model.getObject('/model/bank_info/record/@vender_bank_num')!''}</t></p>
<p align="left"><t fontSize="20" fontFamily="黑体">账号:${model.getObject('/model/bank_info/record/@vender_bank_num')!''}</t></p>
</tc>
</tr>
<tr height="0.3">
<tc width="10">
<p align="left"><t fontSize="12" fontFamily="宋体"></t></p>
<p align="left"><t fontSize="20" fontFamily="黑体"></t></p>
</tc>
<tc width="10">
<p align="left"><t fontSize="12" fontFamily="宋体"></t></p>
<p align="left"><t fontSize="20" fontFamily="黑体"></t></p>
</tc>
</tr>
<tr height="0.3">
<tc width="10">
<p align="left"><t fontSize="12" fontFamily="宋体">委托收款人确认金额无误</t></p>
<p align="left"><t fontSize="20" fontFamily="黑体">委托收款人确认金额无误</t></p>
</tc>
<tc width="10">
<p align="left"><t fontSize="12" fontFamily="宋体">委托公司名称:${model.getObject('/model/bank_info/record/@agent_name')!''}</t></p>
<p align="left"><t fontSize="20" fontFamily="黑体">委托公司名称:${model.getObject('/model/bank_info/record/@agent_name')!''}</t></p>
</tc>
</tr>
<tr height="0.3">
<tc width="10">
<p align="left"><t fontSize="12" fontFamily="宋体">收款人:${model.getObject('/model/bank_info/record/@vender_name')!''}</t></p>
<p align="left"><t fontSize="20" fontFamily="黑体">收款人:${model.getObject('/model/bank_info/record/@vender_name')!''}</t></p>
</tc>
<tc width="10">
<p align="left"><t fontSize="12" fontFamily="宋体">申请日期:${model.getObject('/model/bank_info/record/@current_date')!''}</t></p>
<p align="left"><t fontSize="20" fontFamily="黑体">申请日期:${model.getObject('/model/bank_info/record/@current_date')!''}</t></p>
</tc>
</tr>
<tr height="0.3">
<tc width="10">
<p indFirstLine="1"><t fontSize="12" fontFamily="宋体">确认日期:</t></p>
<p indFirstLine="1"><t fontSize="20" fontFamily="黑体">确认日期:</t></p>
</tc>
<tc width="10">
<p align="left"><t fontSize="12" fontFamily="宋体"></t></p>
<p align="left"><t fontSize="20" fontFamily="黑体"></t></p>
</tc>
</tr>
</tbl>
<!-- <p indFirstLine="1" line="200" >-->
<!-- <t fontFamily="宋体" fontSize="12" fontColor="000000" >开户名:${model.getObject('/model/bank_info/record/@agent_account_name')!''} 开户名:${model.getObject('/model/bank_info/record/@vender_account_name')!''} </t>-->
<!-- <t fontFamily="黑体" fontSize="12" fontColor="000000" >开户名:${model.getObject('/model/bank_info/record/@agent_account_name')!''} 开户名:${model.getObject('/model/bank_info/record/@vender_account_name')!''} </t>-->
<!-- </p>-->
<!-- <p indFirstLine="1" line="200" >-->
<!-- <t fontFamily="宋体" fontSize="12" fontColor="000000" >开户行:${model.getObject('/model/bank_info/record/@agent_bank_name')!''} 开户行:${model.getObject('/model/bank_info/record/@vender_bank_name')!''} </t>-->
<!-- <t fontFamily="黑体" fontSize="12" fontColor="000000" >开户行:${model.getObject('/model/bank_info/record/@agent_bank_name')!''} 开户行:${model.getObject('/model/bank_info/record/@vender_bank_name')!''} </t>-->
<!-- </p>-->
<!-- <p indFirstLine="1" line="200">-->
<!-- <t fontFamily="宋体" fontSize="12" fontColor="000000" >账号:${model.getObject('/model/bank_info/record/@agent_bank_num')!''} 账号:${model.getObject('/model/bank_info/record/@vender_bank_num')!''}</t>-->
<!-- <t fontFamily="黑体" fontSize="12" fontColor="000000" >账号:${model.getObject('/model/bank_info/record/@agent_bank_num')!''} 账号:${model.getObject('/model/bank_info/record/@vender_bank_num')!''}</t>-->
<!-- </p>-->
<!-- <p indFirstLine="1" line="200" >-->
<!-- <t fontFamily="宋体" fontSize="12" fontColor="000000" >委托收款人确认金额无误 委托公司名称:${model.getObject('/model/bank_info/record/@agent_name')!''}</t>-->
<!-- <t fontFamily="黑体" fontSize="12" fontColor="000000" >委托收款人确认金额无误 委托公司名称:${model.getObject('/model/bank_info/record/@agent_name')!''}</t>-->
<!-- </p>-->
<!-- <p indFirstLine="1" line="200" >-->
<!-- <t fontFamily="宋体" fontSize="12" fontColor="000000" >收款人:${model.getObject('/model/bank_info/record/@vender_name')!''} 申请日期:${model.getObject('/model/bank_info/record/@current_date')!''}</t>-->
<!-- <t fontFamily="黑体" fontSize="12" fontColor="000000" >收款人:${model.getObject('/model/bank_info/record/@vender_name')!''} 申请日期:${model.getObject('/model/bank_info/record/@current_date')!''}</t>-->
<!-- </p>-->
<!-- <p indFirstLine="9" line="200">-->
<!-- <t fontFamily="宋体" fontSize="12" fontColor="000000"> 确认日期:</t>-->
<!-- <t fontFamily="黑体" fontSize="12" fontColor="000000"> 确认日期:</t>-->
<!-- </p>-->
<p orientation="landscape">
</p>
......
src/main/webapp/WEB-INF/server-script/layoutconfig/contract_print_entrance_g_contract_result_queryfields.js
View file @ 0388d72d
......@@ -4,10 +4,10 @@ var add_datafilters = [
name: 'document_type',
expression: "t1.document_type = 'CARCON'"
},
{
name:'contract_status',
expression:"t1.contract_status ='NEW'"
},
// {
// name:'contract_status',
// expression:"t1.contract_status ='NEW'"
// },
{
name: 'sign_contract_status',
expression: "t1.sign_contract_status in ('NEW','SIGNING','SIGN','SIGN_RETURN')"
......
src/main/webapp/modules/csh/CSH501/csh_payment_req.lview
View file @ 0388d72d
......@@ -79,6 +79,7 @@
<a:link id="tre_loan_con_print_excel_link_id" url="${/request/@context_path}/modules/csh/CSH501/csh_payment_contract_export.lsc"/>
<script type="text/javascript"><![CDATA[
jQuery.noConflict();
//如果头id 不为空，就使用自在定义的ds进行查询
......@@ -95,6 +96,7 @@
}
})
Ext.ux.Lightbox.register('a[ref=img]', true);
if ('${/parameter/@payment_req_id}') {
......@@ -183,6 +185,15 @@
hdrecord.set('currency_code', currency_code);
hdrecord.set('currency_name', currency_name);
record.set('act_amount', minus(record.get('amount'), record.get('sum_ddct_amount') || 0));
} else if(name=='amount_vender'&& value){
var due_amount=record.get('due_amount');
var other_payment2=record.get('other_payment2');
var amount_agent=minus(minus(due_amount,other_payment2),value);
if(amount_agent<0){
$L.showErrorMessage("提示",'委托付款金额和首付款抵充金额不能大于应付金额！');
return;
}
record.set('amount_agent',amount_agent);
} else if (name == 'act_amount') {
hdrecord.set('sum_act_amount', plus(minus(hdrecord.get('sum_act_amount') || 0, old_value || 0), value || 0));
}
......@@ -1218,6 +1229,15 @@
qpara['payment_bp_id'] = '${/parameter/@payment_bp_id}';
}
// function on_csh_payment_req_temp_ln_ds_update( dataSet, record, name, value,oldvalue) {
// if(name=='amount_vender'&&value){
// var due_amount=record.get('due_amount');
// var other_payment2=record.get('other_payment2');
// var amount_agent=minus(minus(due_amount,other_payment2),value);
// record.set('amount_agent',amount_agent);
// }
//
// }
function sumFunction(datas, name) {
......
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