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
86b9122f
Commit
86b9122f
authored
Oct 24, 2025
by
刘帅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.报修单创建,维修项目允许重复
2.维修单材料价格与汇总不一致问题
parent
c60793a8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ErpRepairFormMapper.xml
...usiness/src/main/resources/mapper/ErpRepairFormMapper.xml
+1
-1
index.vue
maintain-ui/src/views/business/repairFormProject/index.vue
+1
-1
No files found.
maintain-business/src/main/resources/mapper/ErpRepairFormMapper.xml
View file @
86b9122f
...
@@ -170,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -170,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
GROUP BY repair_form_id
GROUP BY repair_form_id
) erfpd ON erf.id = erfpd.repair_form_id
) erfpd ON erf.id = erfpd.repair_form_id
LEFT JOIN (
LEFT JOIN (
SELECT repair_form_id, SUM(
selling_price * collect_number
) AS totalMaterialMoney
SELECT repair_form_id, SUM(
money
) AS totalMaterialMoney
FROM erp_material_picking_info
FROM erp_material_picking_info
GROUP BY repair_form_id
GROUP BY repair_form_id
) empi ON erf.id = empi.repair_form_id
) empi ON erf.id = empi.repair_form_id
...
...
maintain-ui/src/views/business/repairFormProject/index.vue
View file @
86b9122f
...
@@ -404,7 +404,7 @@ export default {
...
@@ -404,7 +404,7 @@ export default {
/** 查询维修项目列表 */
/** 查询维修项目列表 */
getMaintainList
()
{
getMaintainList
()
{
this
.
loading
=
true
;
this
.
loading
=
true
;
listMaintainProject
({
...
this
.
queryMaintainParams
,
notInIdList
:
this
.
repairFormProjectList
.
map
(
item
=>
item
.
maintainId
)
}
).
then
(
response
=>
{
listMaintainProject
({
...
this
.
queryMaintainParams
}
).
then
(
response
=>
{
this
.
maintainProjectList
=
response
.
rows
;
this
.
maintainProjectList
=
response
.
rows
;
this
.
total
=
response
.
total
;
this
.
total
=
response
.
total
;
this
.
loading
=
false
;
this
.
loading
=
false
;
...
...
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