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
b9b647e0
Commit
b9b647e0
authored
Aug 08, 2022
by
季圣华
Browse files
给采购销售统计和出入库汇总报表增加数据角色类型传参
parent
f89a9c00
Changes
4
Hide whitespace changes
Inline
Side-by-side
jshERP-web/src/views/report/BuyInReport.vue
View file @
b9b647e0
...
@@ -96,7 +96,8 @@
...
@@ -96,7 +96,8 @@
materialParam
:
''
,
materialParam
:
''
,
beginTime
:
getNowFormatYear
()
+
'
-01-01
'
,
beginTime
:
getNowFormatYear
()
+
'
-01-01
'
,
endTime
:
moment
().
format
(
'
YYYY-MM-DD
'
),
endTime
:
moment
().
format
(
'
YYYY-MM-DD
'
),
mpList
:
getMpListShort
(
Vue
.
ls
.
get
(
'
materialPropertyList
'
))
mpList
:
getMpListShort
(
Vue
.
ls
.
get
(
'
materialPropertyList
'
)),
roleType
:
Vue
.
ls
.
get
(
'
roleType
'
),
},
},
ipagination
:{
ipagination
:{
pageSize
:
11
,
pageSize
:
11
,
...
...
jshERP-web/src/views/report/InMaterialCount.vue
View file @
b9b647e0
...
@@ -107,6 +107,7 @@
...
@@ -107,6 +107,7 @@
import
{
findBySelectSup
}
from
'
@/api/api
'
import
{
findBySelectSup
}
from
'
@/api/api
'
import
JEllipsis
from
'
@/components/jeecg/JEllipsis
'
import
JEllipsis
from
'
@/components/jeecg/JEllipsis
'
import
moment
from
'
moment
'
import
moment
from
'
moment
'
import
Vue
from
'
vue
'
export
default
{
export
default
{
name
:
"
InMaterialCount
"
,
name
:
"
InMaterialCount
"
,
mixins
:[
JeecgListMixin
],
mixins
:[
JeecgListMixin
],
...
@@ -129,7 +130,8 @@
...
@@ -129,7 +130,8 @@
depotId
:
''
,
depotId
:
''
,
beginTime
:
getNowFormatYear
()
+
'
-01-01
'
,
beginTime
:
getNowFormatYear
()
+
'
-01-01
'
,
endTime
:
moment
().
format
(
'
YYYY-MM-DD
'
),
endTime
:
moment
().
format
(
'
YYYY-MM-DD
'
),
type
:
"
入库
"
type
:
"
入库
"
,
roleType
:
Vue
.
ls
.
get
(
'
roleType
'
),
},
},
ipagination
:{
ipagination
:{
pageSize
:
11
,
pageSize
:
11
,
...
...
jshERP-web/src/views/report/OutMaterialCount.vue
View file @
b9b647e0
...
@@ -107,6 +107,7 @@
...
@@ -107,6 +107,7 @@
import
{
findBySelectCus
}
from
'
@/api/api
'
import
{
findBySelectCus
}
from
'
@/api/api
'
import
JEllipsis
from
'
@/components/jeecg/JEllipsis
'
import
JEllipsis
from
'
@/components/jeecg/JEllipsis
'
import
moment
from
'
moment
'
import
moment
from
'
moment
'
import
Vue
from
'
vue
'
export
default
{
export
default
{
name
:
"
OutMaterialCount
"
,
name
:
"
OutMaterialCount
"
,
mixins
:[
JeecgListMixin
],
mixins
:[
JeecgListMixin
],
...
@@ -129,7 +130,8 @@
...
@@ -129,7 +130,8 @@
depotId
:
''
,
depotId
:
''
,
beginTime
:
getNowFormatYear
()
+
'
-01-01
'
,
beginTime
:
getNowFormatYear
()
+
'
-01-01
'
,
endTime
:
moment
().
format
(
'
YYYY-MM-DD
'
),
endTime
:
moment
().
format
(
'
YYYY-MM-DD
'
),
type
:
"
出库
"
type
:
"
出库
"
,
roleType
:
Vue
.
ls
.
get
(
'
roleType
'
),
},
},
ipagination
:{
ipagination
:{
pageSize
:
11
,
pageSize
:
11
,
...
...
jshERP-web/src/views/report/SaleOutReport.vue
View file @
b9b647e0
...
@@ -101,7 +101,8 @@
...
@@ -101,7 +101,8 @@
materialParam
:
''
,
materialParam
:
''
,
beginTime
:
getNowFormatYear
()
+
'
-01-01
'
,
beginTime
:
getNowFormatYear
()
+
'
-01-01
'
,
endTime
:
moment
().
format
(
'
YYYY-MM-DD
'
),
endTime
:
moment
().
format
(
'
YYYY-MM-DD
'
),
mpList
:
getMpListShort
(
Vue
.
ls
.
get
(
'
materialPropertyList
'
))
mpList
:
getMpListShort
(
Vue
.
ls
.
get
(
'
materialPropertyList
'
)),
roleType
:
Vue
.
ls
.
get
(
'
roleType
'
),
},
},
ipagination
:{
ipagination
:{
pageSize
:
11
,
pageSize
:
11
,
...
...
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