Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
T
topsun-bpm
Project
Project
Details
Activity
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
鲁鑫
topsun-bpm
Commits
5b736052
Commit
5b736052
authored
Sep 12, 2024
by
鲁鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
费用报销相关总金额计算优化
parent
37c4cac0
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
86 additions
and
14 deletions
+86
-14
advancePayment.js
...webapp/biz/topsun/sap/costReimbursement/advancePayment.js
+19
-2
costReimbursement.js
...app/biz/topsun/sap/costReimbursement/costReimbursement.js
+2
-1
employeeLoan.js
...n/webapp/biz/topsun/sap/costReimbursement/employeeLoan.js
+18
-1
payApply.js
.../main/webapp/biz/topsun/sap/costReimbursement/payApply.js
+25
-6
payApplyNoPO.js
...n/webapp/biz/topsun/sap/costReimbursement/payApplyNoPO.js
+3
-2
refundApply.js
...in/webapp/biz/topsun/sap/costReimbursement/refundApply.js
+19
-2
No files found.
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/advancePayment.js
View file @
5b736052
...
...
@@ -231,7 +231,7 @@ var tableArray = [
data
:
{
name
:
'zlsch'
},
textField
:
'zlschTextView'
,
valueField
:
'zlsch'
,
required
:
tru
e
,
required
:
fals
e
,
render
:
function
(
item
)
{
return
item
.
zlschTextView
;
}
...
...
@@ -347,7 +347,7 @@ function loadGrid(obj) {
}
else
if
(
obj
.
node
===
"financialAuditGrid"
//|| obj.node==="capitalPostGrid"
){
canDelay
=
true
;
//
canDelay = true;
}
}
var
subProcUnitId
=
getSubProcUnitId
();
...
...
@@ -359,6 +359,7 @@ function loadGrid(obj) {
columns
.
some
(
column
=>
{
if
(
//column.name == "rstgrName" ||
column
.
name
==
"zepPay"
||
column
.
name
==
"zlschTextView"
//|| column.name == "zepBank"
){
column
.
editor
.
required
=
true
;
...
...
@@ -418,6 +419,22 @@ function loadGrid(obj) {
})
totalGrid
();
initFinancialAuditGridData
();
},
copyHandler
:
{
id
:
'copyHandler'
,
text
:
'复制'
,
img
:
'fa-copy'
,
click
:
function
()
{
tableArray
.
forEach
((
item
)
=>
{
//var row = DataUtil.getSelectedRow(item.gridManager);
var
row
=
item
.
gridManager
.
getSelectedRow
();
if
(
!
row
)
{
Public
.
tip
(
"请勾选一条数据"
);
return
;
}
var
newRow
=
JSON
.
parse
(
JSON
.
stringify
(
row
));
newRow
.
zepItemno
=
getZepItemNo
();
newRow
.
reimbursementDetailId
=
null
;
UICtrl
.
addGridRow
(
item
.
gridManager
,
newRow
);
});
}
}
});
}
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/costReimbursement.js
View file @
5b736052
...
...
@@ -440,7 +440,7 @@ var tableArray = [
data
:
{
name
:
'zlsch'
},
textField
:
'zlschTextView'
,
valueField
:
'zlsch'
,
required
:
tru
e
,
required
:
fals
e
,
render
:
function
(
item
)
{
return
item
.
zlschTextView
;
}
...
...
@@ -526,6 +526,7 @@ function loadGrid(obj) {
columns
.
some
(
column
=>
{
if
(
//column.name == "rstgrName" ||
column
.
name
==
"zepPay"
||
column
.
name
==
"zlschTextView"
//|| column.name == "zepBank"
){
column
.
editor
.
required
=
true
;
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/employeeLoan.js
View file @
5b736052
...
...
@@ -263,7 +263,7 @@ var tableArray = [
data
:
{
name
:
'zlsch'
},
textField
:
'zlschTextView'
,
valueField
:
'zlsch'
,
required
:
tru
e
,
required
:
fals
e
,
render
:
function
(
item
)
{
return
item
.
zlschTextView
;
}
...
...
@@ -383,6 +383,7 @@ function loadGrid(obj) {
columns
.
some
(
column
=>
{
if
(
//column.name == "rstgrName" ||
column
.
name
==
"zepPay"
||
column
.
name
==
"zlschTextView"
//|| column.name == "zepBank"
){
column
.
editor
.
required
=
true
;
...
...
@@ -434,6 +435,22 @@ function loadGrid(obj) {
});
})
totalGrid
();
},
copyHandler
:
{
id
:
'copyHandler'
,
text
:
'复制'
,
img
:
'fa-copy'
,
click
:
function
()
{
tableArray
.
forEach
((
item
)
=>
{
//var row = DataUtil.getSelectedRow(item.gridManager);
var
row
=
item
.
gridManager
.
getSelectedRow
();
if
(
!
row
)
{
Public
.
tip
(
"请勾选一条数据"
);
return
;
}
var
newRow
=
JSON
.
parse
(
JSON
.
stringify
(
row
));
newRow
.
zepItemno
=
getZepItemNo
();
newRow
.
reimbursementDetailId
=
null
;
UICtrl
.
addGridRow
(
item
.
gridManager
,
newRow
);
});
}
}
});
}
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApply.js
View file @
5b736052
...
...
@@ -71,10 +71,10 @@ var tableArray = [
}
},
{
display
:
"BP账号名称"
,
name
:
"koinh"
,
width
:
12
0
,
minwidth
:
120
,
type
:
"string"
,
align
:
"left"
,
display
:
"BP账号名称"
,
name
:
"koinh"
,
width
:
20
0
,
minwidth
:
120
,
type
:
"string"
,
align
:
"left"
,
},
{
display
:
"BP银行账号"
,
name
:
"bankn"
,
width
:
12
0
,
minwidth
:
120
,
type
:
"string"
,
align
:
"left"
,
display
:
"BP银行账号"
,
name
:
"bankn"
,
width
:
20
0
,
minwidth
:
120
,
type
:
"string"
,
align
:
"left"
,
editor
:
{
required
:
true
,
type
:
"select"
,
data
:
{
...
...
@@ -257,7 +257,7 @@ var tableArray = [
data
:
{
name
:
'zlsch'
},
textField
:
'zlschTextView'
,
valueField
:
'zlsch'
,
required
:
tru
e
,
required
:
fals
e
,
render
:
function
(
item
)
{
return
item
.
zlschTextView
;
}
...
...
@@ -370,7 +370,7 @@ function loadGrid(obj) {
}
else
if
(
obj
.
node
===
"financialAuditGrid"
//|| obj.node==="capitalPostGrid"
){
canDelay
=
true
;
//
canDelay = true;
}
}
var
subProcUnitId
=
getSubProcUnitId
();
...
...
@@ -382,6 +382,7 @@ function loadGrid(obj) {
columns
.
some
(
column
=>
{
if
(
//column.name == "rstgrName" ||
column
.
name
==
"zepPay"
||
column
.
name
==
"zlschTextView"
//|| column.name == "zepBank"
){
column
.
editor
.
required
=
true
;
...
...
@@ -433,6 +434,22 @@ function loadGrid(obj) {
});
})
totalGrid
();
},
copyHandler
:
{
id
:
'copyHandler'
,
text
:
'复制'
,
img
:
'fa-copy'
,
click
:
function
()
{
tableArray
.
forEach
((
item
)
=>
{
//var row = DataUtil.getSelectedRow(item.gridManager);
var
row
=
item
.
gridManager
.
getSelectedRow
();
if
(
!
row
)
{
Public
.
tip
(
"请勾选一条数据"
);
return
;
}
var
newRow
=
JSON
.
parse
(
JSON
.
stringify
(
row
));
newRow
.
zepItemno
=
getZepItemNo
();
newRow
.
reimbursementDetailId
=
null
;
UICtrl
.
addGridRow
(
item
.
gridManager
,
newRow
);
});
}
}
});
}
...
...
@@ -491,7 +508,9 @@ function loadGrid(obj) {
onAfterEdit
:
function
(
item
)
{
if
(
item
.
column
.
name
==
"waers"
||
item
.
column
.
name
==
"kursf"
||
item
.
column
.
name
==
"kzwi1"
){
||
item
.
column
.
name
==
"kzwi1"
||
item
.
column
.
name
==
"belnr2"
){
totalGrid
();
}
if
(
item
.
column
.
name
==
"zepPtdamount1"
){
...
...
@@ -826,7 +845,7 @@ function businessJudgmentUnit() {
var
isApply
=
isApplyProcUnit
();
if
(
isApply
)
{
$
(
"#approvalMoney"
).
hide
();
//
$("#financialAudit").hide();
$
(
"#financialAudit"
).
hide
();
$
(
"#financialAudit_sapReturn"
).
hide
();
$
(
"#capitalPost"
).
hide
();
$
(
"#paymentAccomplish_sapReturn"
).
hide
();
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApplyNoPO.js
View file @
5b736052
...
...
@@ -444,7 +444,7 @@ var tableArray = [
data
:
{
name
:
'zlsch'
},
textField
:
'zlschTextView'
,
valueField
:
'zlsch'
,
required
:
tru
e
,
required
:
fals
e
,
render
:
function
(
item
)
{
return
item
.
zlschTextView
;
}
...
...
@@ -511,7 +511,7 @@ function loadGrid(obj) {
}
else
if
(
obj
.
node
===
"financialAuditGrid"
//|| obj.node==="capitalPostGrid"
){
canDelay
=
true
;
//
canDelay = true;
}
}
var
subProcUnitId
=
getSubProcUnitId
();
...
...
@@ -523,6 +523,7 @@ function loadGrid(obj) {
columns
.
some
(
column
=>
{
if
(
//column.name == "rstgrName" ||
column
.
name
==
"zepPay"
||
column
.
name
==
"zlschTextView"
//|| column.name == "zepBank"
){
column
.
editor
.
required
=
true
;
...
...
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/refundApply.js
View file @
5b736052
...
...
@@ -204,7 +204,7 @@ var tableArray = [
data
:
{
name
:
'zlsch'
},
textField
:
'zlschTextView'
,
valueField
:
'zlsch'
,
required
:
tru
e
,
required
:
fals
e
,
render
:
function
(
item
)
{
return
item
.
zlschTextView
;
}
...
...
@@ -270,7 +270,7 @@ function loadGrid(obj) {
}
else
if
(
obj
.
node
===
"financialAuditGrid"
//|| obj.node==="capitalPostGrid"
){
canDelay
=
true
;
//
canDelay = true;
}
}
var
subProcUnitId
=
getSubProcUnitId
();
...
...
@@ -282,6 +282,7 @@ function loadGrid(obj) {
columns
.
some
(
column
=>
{
if
(
//column.name == "rstgrName" ||
column
.
name
==
"zepPay"
||
column
.
name
==
"zlschTextView"
//|| column.name == "zepBank"
){
column
.
editor
.
required
=
true
;
...
...
@@ -334,6 +335,22 @@ function loadGrid(obj) {
})
totalGrid
();
initFinancialAuditGridData
();
},
copyHandler
:
{
id
:
'copyHandler'
,
text
:
'复制'
,
img
:
'fa-copy'
,
click
:
function
()
{
tableArray
.
forEach
((
item
)
=>
{
//var row = DataUtil.getSelectedRow(item.gridManager);
var
row
=
item
.
gridManager
.
getSelectedRow
();
if
(
!
row
)
{
Public
.
tip
(
"请勾选一条数据"
);
return
;
}
var
newRow
=
JSON
.
parse
(
JSON
.
stringify
(
row
));
newRow
.
zepItemno
=
getZepItemNo
();
newRow
.
reimbursementDetailId
=
null
;
UICtrl
.
addGridRow
(
item
.
gridManager
,
newRow
);
});
}
}
});
}
...
...
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