Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TF-MOM-WEB
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
TFMOM
TF-MOM-WEB
Commits
4c63044d
Commit
4c63044d
authored
May 07, 2024
by
jingnan
👀
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://94.191.100.41/tfmom/tf-mom-web
into dev
parents
224a15b1
217ccdc1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
3 deletions
+1
-3
index.vue
.../src/privateComponents/components/SearchSorties/index.vue
+0
-2
index.vue
...-mes/src/privateComponents/components/backApply/index.vue
+1
-1
No files found.
applications/dee-mes/src/privateComponents/components/SearchSorties/index.vue
View file @
4c63044d
...
...
@@ -107,7 +107,6 @@ export default {
label
:
row
.
serialNumber
}
})
this
.
postionList
.
push
({
value
:
'全部'
,
label
:
'全部'
})
this
.
$set
(
this
.
form
,
'postion'
,
this
.
postionList
[
0
].
value
)
this
.
$set
(
this
.
form
,
'postionName'
,
this
.
postionList
[
0
].
label
)
this
.
$bus
.
$emit
(
'getTableData'
,
this
.
form
)
...
...
@@ -127,7 +126,6 @@ export default {
sortiesName
:
row
.
defName
}
})
this
.
sortiesData
.
push
({
value
:
'全部'
,
label
:
'全部'
,
sortiesName
:
'全部'
})
this
.
$set
(
this
.
form
,
'sorties'
,
this
.
sortiesData
[
0
].
value
)
this
.
$set
(
this
.
form
,
'sortiesName'
,
this
.
sortiesData
[
0
].
sortiesName
)
}
...
...
applications/dee-mes/src/privateComponents/components/backApply/index.vue
View file @
4c63044d
...
...
@@ -194,7 +194,7 @@ export default {
}
})
}
else
if
(
isTkdBack
===
this
.
selectionRows
.
length
)
{
post
(
'/In
StorageRequestItem
/purchaseApply/submit?applyIds='
+
this
.
selectionRows
.
map
(
item
=>
Number
(
item
.
id
))).
then
(
res
=>
{
post
(
'/In
ventoryRequest
/purchaseApply/submit?applyIds='
+
this
.
selectionRows
.
map
(
item
=>
Number
(
item
.
id
))).
then
(
res
=>
{
this
.
$utils
.
showMessageSuccess
(
'提交成功'
)
this
.
$refs
.
applyTable
.
$refs
.
asCom
.
getData
()
}).
catch
(()
=>
{
...
...
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