Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mes-ui
Project
Project
Details
Activity
Releases
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-ui
Commits
7f353f0c
Commit
7f353f0c
authored
Apr 02, 2020
by
佟礼
Browse files
Options
Browse Files
Download
Plain Diff
料单
parents
635fd0b4
481b3ae4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
440 additions
and
559 deletions
+440
-559
processMain.vue
pages/processManage/Process/processMain.vue
+1
-2
orderMaterial.vue
pages/processManage/setProcess/components/orderMaterial.vue
+434
-553
index.vue
pages/processManage/setProcess/index.vue
+4
-2
processMain.vue
pages/processManage/setProcess/processMain.vue
+1
-2
No files found.
pages/processManage/Process/processMain.vue
View file @
7f353f0c
...
...
@@ -406,8 +406,7 @@ export default {
var
url
=
`
${
designUrl
}
/routingheader/GetListSmall?approvalstatus=1&product_id=`
+
productid
+
'&routingType='
+
this
.
formValidate
.
routingType
'&routingType=0'
;
service
.
get
(
`
${
url
}
`
).
then
((
response
)
=>
{
this
.
RoutingList
=
response
.
result
})
...
...
pages/processManage/setProcess/components/orderMaterial.vue
View file @
7f353f0c
This diff is collapsed.
Click to expand it.
pages/processManage/setProcess/index.vue
View file @
7f353f0c
...
...
@@ -526,7 +526,7 @@ export default {
{
title
:
'
主工艺
'
,
title
:
'
工艺规程
'
,
key
:
'mainRoutingID'
,
width
:
120
,
render
:
(
h
,
params
)
=>
{
...
...
@@ -610,7 +610,7 @@ export default {
key
:
'materialbillID'
,
width
:
120
,
render
:
(
h
,
params
)
=>
{
if
(
this
.
tabstatus
==
'1'
)
{
if
(
params
.
row
.
mainRoutingID
==
0
)
{
h
(
'div'
,
''
)
}
else
{
let
id
=
params
.
row
.
id
...
...
@@ -1663,6 +1663,8 @@ export default {
ld
.
orderids
=
orderids
.
toString
(
','
)
ld
.
formValidate
.
routingHeaderId
=
params
.
row
.
mainRoutingID
ld
.
formValidate
.
id
=
params
.
row
.
materialbillID
ld
.
loaddata
()
...
...
pages/processManage/setProcess/processMain.vue
View file @
7f353f0c
...
...
@@ -540,8 +540,7 @@ export default {
var
url
=
`
${
designUrl
}
/routingheader/GetListSmall?approvalstatus=1&product_id=`
+
productid
+
"&routingType="
+
this
.
formValidate
.
routingType
;
"&routingType=0"
;
service
.
get
(
`
${
url
}
`
).
then
(
response
=>
{
this
.
RoutingList
=
response
.
result
;
});
...
...
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