Commit 5c4d306d authored by stone's avatar stone

【fix】修改显示问题

parent a590fcd7
...@@ -144,7 +144,6 @@ ...@@ -144,7 +144,6 @@
<artifactId>mail</artifactId> <artifactId>mail</artifactId>
<version>1.4</version> <version>1.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.activation</groupId> <groupId>javax.activation</groupId>
<artifactId>activation</artifactId> <artifactId>activation</artifactId>
......
...@@ -48,14 +48,19 @@ ...@@ -48,14 +48,19 @@
var this_pay_vender_amount=record.get('this_pay_vender_amount'); var this_pay_vender_amount=record.get('this_pay_vender_amount');
var residual_agent_amount=record.get('residual_agent_amount'); var residual_agent_amount=record.get('residual_agent_amount');
var residual_vender_amount=record.get('residual_vender_amount'); var residual_vender_amount=record.get('residual_vender_amount');
var bank_account_num=record.get('bank_account_num');
var pay_amount=plus(this_pay_agent_amount,this_pay_vender_amount); var pay_amount=plus(this_pay_agent_amount,this_pay_vender_amount);
var identify_category=''; var identify_category='';
if(!bank_account_num){
$L.showErrorMessage("提示",'请维护银行信息!');
return;
}
if(this_pay_agent_amount!=0&&this_pay_vender_amount!=0){ if(this_pay_agent_amount!=0&&this_pay_vender_amount!=0){
$L.showErrorMessage("提示",'每个只能选择代理店,厂商中的其中一个进行支付'); $L.showErrorMessage("提示",'每个只能选择代理店,厂商中的其中一个进行支付');
return; return;
} }
if(this_pay_agent_amount==0&&this_pay_vender_amount==0){ if(this_pay_agent_amount==0&&this_pay_vender_amount==0){
$L.showErrorMessage("提示",'付款金额不能为!'); $L.showErrorMessage("提示",'付款金额不能为0!');
return; return;
} }
...@@ -440,6 +445,22 @@ ...@@ -440,6 +445,22 @@
} else { } else {
record.set('transaction_functional_amount', ''); record.set('transaction_functional_amount', '');
} }
}else if(name=='this_pay_agent_amount'||name=='this_pay_vender_amount'){
var agent_amount= record.get('this_pay_agent_amount');
var vender_amount= record.get('this_pay_vender_amount');
if(agent_amount&&vender_amount){
$('csh_payment_req_pay_ds').getAt(0).set('transaction_amount',agent_amount+vender_amount)
}else if(agent_amount){
$('csh_payment_req_pay_ds').getAt(0).set('transaction_amount',agent_amount)
}else if(vender_amount){
$('csh_payment_req_pay_ds').getAt(0).set('transaction_amount',vender_amount)
}else{
$('csh_payment_req_pay_ds').getAt(0).set('transaction_amount',0)
}
} else if (name == 'handling_charge') { } else if (name == 'handling_charge') {
if (value === 0 && record.get('zero_amounts_allowed') == 'N') { if (value === 0 && record.get('zero_amounts_allowed') == 'N') {
Leaf.showMessage('${l:PROMPT}', '${l:CSH510.ZERO_AMOUNTS_ALLOWED}'); Leaf.showMessage('${l:PROMPT}', '${l:CSH510.ZERO_AMOUNTS_ALLOWED}');
...@@ -480,11 +501,12 @@ ...@@ -480,11 +501,12 @@
if (record.get('transaction_amount') || record.get('transaction_amount') == 0 || record.get('handling_charge')) { if (record.get('transaction_amount') || record.get('transaction_amount') == 0 || record.get('handling_charge')) {
setfunctionamount(record); setfunctionamount(record);
} }
} else if (name == 'bank_account_id') { } /*else if (name == 'bank_account_id') {
if (record.get('zero_amounts_allowed') == 'N' && record.get('transaction_amount') === 0) { if (record.get('zero_amounts_allowed') == 'N' && record.get('transaction_amount') === 0) {
Leaf.showMessage('${l:PROMPT}', '${l:CSH510.ZERO_AMOUNTS_ALLOWED}'); Leaf.showMessage('${l:PROMPT}', '${l:CSH510.ZERO_AMOUNTS_ALLOWED}');
} }
} }*/
} }
function showPeriod(record) { function showPeriod(record) {
...@@ -681,7 +703,7 @@ ...@@ -681,7 +703,7 @@
<a:field name="exchange_rate_type"/> <a:field name="exchange_rate_type"/>
<a:field name="exchange_rate" readOnly="true" required="false"/> <a:field name="exchange_rate" readOnly="true" required="false"/>
<a:field name="rate_method_code"/> <a:field name="rate_method_code"/>
<a:field name="transaction_amount" readOnly="true" required="true"/> <a:field name="transaction_amount" readOnly="true"/>
<a:field name="transaction_functional_amount" readOnly="true" required="true"/> <a:field name="transaction_functional_amount" readOnly="true" required="true"/>
<a:field name="precision" defaultValue="2"/> <a:field name="precision" defaultValue="2"/>
<a:field name="zero_amounts_allowed" defaultValue="N"/> <a:field name="zero_amounts_allowed" defaultValue="N"/>
......
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