Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mes-ui
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
mes
mes-ui
Commits
c9a5a0fc
Commit
c9a5a0fc
authored
Dec 16, 2024
by
tanjunxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 解决追加组合单接口冲突
parent
4a6e6836
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
combination.js
src/api/mes/pro/combination.js
+9
-0
chooseWorkorderForComb.vue
src/views/mes/pro/combination/chooseWorkorderForComb.vue
+2
-2
No files found.
src/api/mes/pro/combination.js
View file @
c9a5a0fc
...
...
@@ -38,6 +38,15 @@ export function addCombination(data) {
// 新增生产组合单
export
function
batchAddCombination
(
data
)
{
return
request
({
url
:
'/pro/combination/batchAdd'
,
method
:
'post'
,
data
:
data
})
}
// 生产组合单-新增-追加组合单
export
function
insertCombination
(
data
)
{
return
request
({
url
:
'/pro/combination/insert'
,
method
:
'post'
,
...
...
src/views/mes/pro/combination/chooseWorkorderForComb.vue
View file @
c9a5a0fc
...
...
@@ -182,7 +182,7 @@ import VendorSelect from "@/components/vendorSelect/single.vue";
import
{
genCode
}
from
"@/api/system/autocode/rule"
;
import
"@riophae/vue-treeselect/dist/vue-treeselect.css"
;
import
{
getToken
}
from
"@/utils/auth"
;
import
{
batchAdd
Combination
}
from
"@/api/mes/pro/combination"
;
import
{
insert
Combination
}
from
"@/api/mes/pro/combination"
;
export
default
{
name
:
"chooseWorkorderForComb"
,
...
...
@@ -324,7 +324,7 @@ export default {
}
);
}
);
if
(
!
shouldExit
)
{
batchAdd
Combination
(
params
).
then
((
response
)
=>
{
insert
Combination
(
params
).
then
((
response
)
=>
{
if
(
response
.
length
==
0
)
{
this
.
$modal
.
msgWarning
(
"不允许组合"
);
}
else
{
...
...
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