Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
leaf-hlcm
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hlcm
leaf-hlcm
Commits
5c4d306d
Commit
5c4d306d
authored
5 years ago
by
stone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【fix】修改显示问题
parent
a590fcd7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
5 deletions
+26
-5
pom.xml
pom.xml
+0
-1
csh_payment_req_pay.lview
src/main/webapp/modules/csh/CSH502/csh_payment_req_pay.lview
+26
-4
No files found.
pom.xml
View file @
5c4d306d
...
...
@@ -144,7 +144,6 @@
<artifactId>
mail
</artifactId>
<version>
1.4
</version>
</dependency>
<dependency>
<groupId>
javax.activation
</groupId>
<artifactId>
activation
</artifactId>
...
...
This diff is collapsed.
Click to expand it.
src/main/webapp/modules/csh/CSH502/csh_payment_req_pay.lview
View file @
5c4d306d
...
...
@@ -48,14 +48,19 @@
var this_pay_vender_amount=record.get('this_pay_vender_amount');
var residual_agent_amount=record.get('residual_agent_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 identify_category='';
if(!bank_account_num){
$L.showErrorMessage("提示",'请维护银行信息!');
return;
}
if(this_pay_agent_amount!=0&&this_pay_vender_amount!=0){
$L.showErrorMessage("提示",'每个只能选择代理店,厂商中的其中一个进行支付');
return;
}
if(this_pay_agent_amount==0&&this_pay_vender_amount==0){
$L.showErrorMessage("提示",'付款金额不能为
空
!');
$L.showErrorMessage("提示",'付款金额不能为
0
!');
return;
}
...
...
@@ -440,6 +445,22 @@
}
else
{
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')
{
if
(
value =
==
0
&&
record.get('zero_amounts_allowed')
==
'N')
{
Leaf.showMessage('${l:PROMPT}',
'${l:CSH510.ZERO_AMOUNTS_ALLOWED}');
...
...
@@ -480,11 +501,12 @@
if
(record.get('transaction_amount')
||
record.get('transaction_amount')
==
0
||
record.get('handling_charge'))
{
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)
{
Leaf.showMessage('${l:PROMPT}',
'${l:CSH510.ZERO_AMOUNTS_ALLOWED}');
}
}
}
*/
}
function
showPeriod(record)
{
...
...
@@ -681,7 +703,7 @@
<a:field
name=
"exchange_rate_type"
/>
<a:field
name=
"exchange_rate"
readOnly=
"true"
required=
"false"
/>
<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=
"precision"
defaultValue=
"2"
/>
<a:field
name=
"zero_amounts_allowed"
defaultValue=
"N"
/>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment