Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
a1e60e5e
Commit
a1e60e5e
authored
Jan 18, 2019
by
季圣华
Browse files
更新单据的时间,显示到秒
parent
9550c031
Changes
4
Hide whitespace changes
Inline
Side-by-side
erp_web/js/pages/materials/bill_detail.js
View file @
a1e60e5e
...
...
@@ -216,7 +216,7 @@
$
(
"
#bill .AccountIdShow
"
).
text
(
accountIdShow
);
}
$
(
"
#bill .OrganIdShow
"
).
text
(
data
.
organName
);
$
(
"
#bill .OperTimeShow
"
).
text
(
data
.
opertime
);
$
(
"
#bill .OperTimeShow
"
).
text
(
data
.
opertime
Str
);
$
(
"
#bill .NumberShow
"
).
text
(
data
.
number
);
$
(
"
#bill .RemarkShow
"
).
text
(
data
.
remark
);
$
(
"
#bill .DiscountShow
"
).
text
(
data
.
discount
);
...
...
erp_web/js/pages/materials/in_out.js
View file @
a1e60e5e
...
...
@@ -563,7 +563,7 @@
formatter
:
function
(
value
,
rec
)
{
var
str
=
''
;
var
rowInfo
=
rec
.
id
+
'
AaBb
'
+
rec
.
projectid
+
'
AaBb
'
+
rec
.
number
+
'
AaBb
'
+
rec
.
operpersonname
+
'
AaBb
'
+
rec
.
opertime
+
'
AaBb
'
+
rec
.
organid
+
'
AaBb
'
+
rec
.
handspersonid
+
'
AaBb
'
+
rec
.
opertime
Str
+
'
AaBb
'
+
rec
.
organid
+
'
AaBb
'
+
rec
.
handspersonid
+
'
AaBb
'
+
rec
.
accountid
+
'
AaBb
'
+
rec
.
changeamount
+
'
AaBb
'
+
rec
.
remark
+
'
AaBb
'
+
rec
.
projectName
+
'
AaBb
'
+
rec
.
organName
+
'
AaBb
'
+
rec
.
handsPersonName
+
'
AaBb
'
+
rec
.
accountName
+
'
AaBb
'
+
rec
.
totalprice
+
'
AaBb
'
+
rec
.
allocationprojectid
...
...
@@ -588,7 +588,7 @@
}
}
},
{
title
:
'
单据日期
'
,
field
:
'
opertime
'
,
width
:
130
},
{
title
:
'
单据日期
'
,
field
:
'
opertime
Str
'
,
width
:
130
},
{
title
:
'
操作员
'
,
field
:
'
operpersonname
'
,
width
:
60
},
{
title
:
'
金额合计
'
,
field
:
'
totalprice
'
,
width
:
60
},
{
title
:
'
含税合计
'
,
field
:
'
totaltaxlastmoney
'
,
hidden
:
isShowLastMoneyColumn
,
width
:
60
,
formatter
:
function
(
value
,
rec
){
...
...
src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java
View file @
a1e60e5e
...
...
@@ -73,6 +73,8 @@ public class DepotHeadVo4List {
private
String
materialsList
;
private
String
opertimeStr
;
public
Long
getId
()
{
return
id
;
}
...
...
@@ -344,4 +346,12 @@ public class DepotHeadVo4List {
public
void
setMaterialsList
(
String
materialsList
)
{
this
.
materialsList
=
materialsList
;
}
public
String
getOpertimeStr
()
{
return
opertimeStr
;
}
public
void
setOpertimeStr
(
String
opertimeStr
)
{
this
.
opertimeStr
=
opertimeStr
;
}
}
\ No newline at end of file
src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View file @
a1e60e5e
...
...
@@ -25,6 +25,8 @@ import java.util.ArrayList;
import
java.util.Date
;
import
java.util.List
;
import
static
com
.
jsh
.
erp
.
utils
.
Tools
.
getCenternTime
;
@Service
public
class
DepotHeadService
{
private
Logger
logger
=
LoggerFactory
.
getLogger
(
DepotHeadService
.
class
);
...
...
@@ -60,6 +62,7 @@ public class DepotHeadService {
if
(
dh
.
getTotalprice
()
!=
null
)
{
dh
.
setTotalprice
(
dh
.
getTotalprice
().
abs
());
}
dh
.
setOpertimeStr
(
getCenternTime
(
dh
.
getOpertime
()));
dh
.
setMaterialsList
(
findMaterialsListByHeaderId
(
dh
.
getId
()));
resList
.
add
(
dh
);
}
...
...
@@ -243,6 +246,7 @@ public class DepotHeadService {
if
(
dh
.
getTotalprice
()
!=
null
)
{
dh
.
setTotalprice
(
dh
.
getTotalprice
().
abs
());
}
dh
.
setOpertimeStr
(
getCenternTime
(
dh
.
getOpertime
()));
dh
.
setMaterialsList
(
findMaterialsListByHeaderId
(
dh
.
getId
()));
resList
.
add
(
dh
);
}
...
...
Write
Preview
Supports
Markdown
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