Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
maintain_service
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
刘帅
maintain_service
Commits
f051971d
You need to sign in or sign up before continuing.
Commit
f051971d
authored
Jul 26, 2025
by
刘帅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.优化
parent
676c8c98
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
10 deletions
+13
-10
ReportController.java
...va/com/maintain/web/controller/tool/ReportController.java
+8
-5
index.vue
maintain-ui/src/views/business/materialCheck/index.vue
+1
-1
index.vue
maintain-ui/src/views/business/materialPicking/index.vue
+2
-2
index.vue
maintain-ui/src/views/business/pickingReturn/index.vue
+2
-2
No files found.
maintain-admin/src/main/java/com/maintain/web/controller/tool/ReportController.java
View file @
f051971d
package
com
.
maintain
.
web
.
controller
.
tool
;
package
com
.
maintain
.
web
.
controller
.
tool
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
cn.dev33.satoken.annotation.SaCheckPermission
;
import
com.maintain.common.utils.ip.IpUtils
;
import
groovy.transform.AnnotationCollector
;
import
org.springframework.core.env.Environment
;
import
org.springframework.core.env.Environment
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.beans.factory.annotation.Autowired
;
@RestController
@RestController
...
@@ -17,24 +20,24 @@ public class ReportController {
...
@@ -17,24 +20,24 @@ public class ReportController {
//报表设计
//报表设计
@GetMapping
(
value
=
"/reportList"
)
@GetMapping
(
value
=
"/reportList"
)
public
String
ReportList
(){
public
String
ReportList
(){
return
"http://
10.100.102.82
:"
+
environment
.
getProperty
(
"server.port"
)
+
"/jmreport/list"
;
return
"http://
"
+
IpUtils
.
getHostIp
()
+
"
:"
+
environment
.
getProperty
(
"server.port"
)
+
"/jmreport/list"
;
}
}
//报表查看
//报表查看
@GetMapping
(
value
=
"/reportView"
)
@GetMapping
(
value
=
"/reportView"
)
public
String
ReportView
(){
public
String
ReportView
(){
return
"http://
10.100.102.82
:"
+
environment
.
getProperty
(
"server.port"
)
+
"/jmreport/view"
;
return
"http://
"
+
IpUtils
.
getHostIp
()
+
"
:"
+
environment
.
getProperty
(
"server.port"
)
+
"/jmreport/view"
;
}
}
//报表查看
//报表查看
@GetMapping
(
value
=
"/biList"
)
@GetMapping
(
value
=
"/biList"
)
public
String
bi
(){
public
String
bi
(){
return
"http://
10.100.102.82
:"
+
environment
.
getProperty
(
"server.port"
)
+
"/drag/list"
;
return
"http://
"
+
IpUtils
.
getHostIp
()
+
"
:"
+
environment
.
getProperty
(
"server.port"
)
+
"/drag/list"
;
}
}
//报表查看
//报表查看
@GetMapping
(
value
=
"/biView"
)
@GetMapping
(
value
=
"/biView"
)
public
String
biView
(){
public
String
biView
(){
return
"http://
10.100.102.82
:"
+
environment
.
getProperty
(
"server.port"
)
+
"/drag/share/view"
;
return
"http://
"
+
IpUtils
.
getHostIp
()
+
"
:"
+
environment
.
getProperty
(
"server.port"
)
+
"/drag/share/view"
;
}
}
}
}
maintain-ui/src/views/business/materialCheck/index.vue
View file @
f051971d
...
@@ -647,7 +647,7 @@ export default {
...
@@ -647,7 +647,7 @@ export default {
taskName
:
undefined
,
taskName
:
undefined
,
taskUserId
:
undefined
,
taskUserId
:
undefined
,
taskUserName
:
undefined
,
taskUserName
:
undefined
,
taskStartTime
:
undefined
,
taskStartTime
:
formatDate
(
new
Date
().
getTime
())
,
taskEndTime
:
undefined
,
taskEndTime
:
undefined
,
warehouseId
:
undefined
,
warehouseId
:
undefined
,
warehouseName
:
undefined
,
warehouseName
:
undefined
,
...
...
maintain-ui/src/views/business/materialPicking/index.vue
View file @
f051971d
...
@@ -210,7 +210,7 @@
...
@@ -210,7 +210,7 @@
<
el
-
row
>
<
el
-
row
>
<
el
-
col
:
span
=
"
6
"
>
<
el
-
col
:
span
=
"
6
"
>
<
el
-
form
-
item
label
=
"
报修单
"
prop
=
"
repairFormId
"
>
<
el
-
form
-
item
label
=
"
报修单
"
prop
=
"
repairFormId
"
>
<
el
-
select
v
-
model
=
"
form.repairFormId
"
placeHolder
=
"
请选择报修单
"
@
change
=
"
repairFormChange
"
>
<
el
-
select
v
-
model
=
"
form.repairFormId
"
placeHolder
=
"
请选择报修单
"
@
change
=
"
repairFormChange
"
style
=
"
width: 100%
"
>
<
el
-
option
v
-
for
=
"
item in repairFormOpt
"
:
key
=
"
item.id
"
:
value
=
"
item.id
"
:
label
=
"
item.repairNumber
"
/>
<
el
-
option
v
-
for
=
"
item in repairFormOpt
"
:
key
=
"
item.id
"
:
value
=
"
item.id
"
:
label
=
"
item.repairNumber
"
/>
<
/el-select
>
<
/el-select
>
<
/el-form-item
>
<
/el-form-item
>
...
@@ -633,7 +633,7 @@ export default {
...
@@ -633,7 +633,7 @@ export default {
receiveUserName
:
undefined
,
receiveUserName
:
undefined
,
receiveTime
:
undefined
,
receiveTime
:
undefined
,
state
:
undefined
,
state
:
undefined
,
outTime
:
undefined
,
outTime
:
formatDate
(
new
Date
().
getTime
())
,
createBy
:
this
.
$store
.
state
.
user
.
userInfo
.
userName
,
createBy
:
this
.
$store
.
state
.
user
.
userInfo
.
userName
,
createTime
:
formatDate
(
new
Date
().
getTime
()),
createTime
:
formatDate
(
new
Date
().
getTime
()),
pickingInfoList
:
[]
pickingInfoList
:
[]
...
...
maintain-ui/src/views/business/pickingReturn/index.vue
View file @
f051971d
...
@@ -134,14 +134,14 @@
...
@@ -134,14 +134,14 @@
<
/el-col
>
<
/el-col
>
<
el
-
col
:
span
=
"
6
"
>
<
el
-
col
:
span
=
"
6
"
>
<
el
-
form
-
item
label
=
"
报修单
"
prop
=
"
repairFormId
"
>
<
el
-
form
-
item
label
=
"
报修单
"
prop
=
"
repairFormId
"
>
<
el
-
select
v
-
model
=
"
form.repairFormId
"
placeHolder
=
"
请选择报修单
"
@
change
=
"
repairFormChange
"
>
<
el
-
select
v
-
model
=
"
form.repairFormId
"
placeHolder
=
"
请选择报修单
"
@
change
=
"
repairFormChange
"
style
=
"
width: 100%;
"
>
<
el
-
option
v
-
for
=
"
item in repairFormOpt
"
:
key
=
"
item.id
"
:
value
=
"
item.id
"
:
label
=
"
item.repairNumber
"
/>
<
el
-
option
v
-
for
=
"
item in repairFormOpt
"
:
key
=
"
item.id
"
:
value
=
"
item.id
"
:
label
=
"
item.repairNumber
"
/>
<
/el-select
>
<
/el-select
>
<
/el-form-item
>
<
/el-form-item
>
<
/el-col
>
<
/el-col
>
<
el
-
col
:
span
=
"
6
"
>
<
el
-
col
:
span
=
"
6
"
>
<
el
-
form
-
item
label
=
"
出库单号
"
prop
=
"
outNumber
"
>
<
el
-
form
-
item
label
=
"
出库单号
"
prop
=
"
outNumber
"
>
<
el
-
select
v
-
model
=
"
form.outNumber
"
placeHolder
=
"
请选择出库单号
"
@
change
=
"
outNumberChange
"
>
<
el
-
select
v
-
model
=
"
form.outNumber
"
placeHolder
=
"
请选择出库单号
"
@
change
=
"
outNumberChange
"
style
=
"
width: 100%;
"
>
<
el
-
option
v
-
for
=
"
item in pickingOpt
"
:
key
=
"
item.id
"
:
value
=
"
item.id
"
:
label
=
"
item.outNumber
"
/>
<
el
-
option
v
-
for
=
"
item in pickingOpt
"
:
key
=
"
item.id
"
:
value
=
"
item.id
"
:
label
=
"
item.outNumber
"
/>
<
/el-select
>
<
/el-select
>
<
/el-form-item
>
<
/el-form-item
>
...
...
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