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
ad50350b
Commit
ad50350b
authored
Sep 01, 2020
by
renjintao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工单执行 data
parent
1c4d984b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
408 additions
and
376 deletions
+408
-376
zh-CN.js
i18n/locale/zh-CN.js
+1
-1
api.js
pages/aps/plan/api.js
+4
-0
index.vue
pages/produce/execute/MaterialCollec/index.vue
+47
-2
orderlist.vue
pages/produce/orderlist.vue
+356
-373
No files found.
i18n/locale/zh-CN.js
View file @
ad50350b
...
@@ -1664,7 +1664,7 @@ export default {
...
@@ -1664,7 +1664,7 @@ export default {
nameMaterial
:
'物料名称'
,
nameMaterial
:
'物料名称'
,
materialNumber
:
'物料编号'
,
materialNumber
:
'物料编号'
,
needCount
:
'需要数量'
,
needCount
:
'需要数量'
,
totalCount
:
'需
要
数量'
,
totalCount
:
'需
求
数量'
,
outStockNumber
:
'出库数量'
,
outStockNumber
:
'出库数量'
,
orderId
:
''
,
orderId
:
''
,
remark
:
'备注'
,
remark
:
'备注'
,
...
...
pages/aps/plan/api.js
View file @
ad50350b
...
@@ -56,6 +56,10 @@ export default {
...
@@ -56,6 +56,10 @@ export default {
matchdetaillist
(
params
){
//配套审核单列表
matchdetaillist
(
params
){
//配套审核单列表
return
Api
.
get
(
`
${
technologyUrl
}
materiallist/matchdetaillist`
,
params
);
return
Api
.
get
(
`
${
technologyUrl
}
materiallist/matchdetaillist`
,
params
);
},
},
//物料领用
materialreceiveCreate
(
params
){
//配套审核单列表
return
Api
.
post
(
`
${
technologyUrl
}
materialreceive/create`
,
params
);
},
}
}
\ No newline at end of file
pages/produce/execute/MaterialCollec/index.vue
View file @
ad50350b
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
</Table>
</Table>
</div>
</div>
<FooterToolbar
v-show=
"footerToolbar"
>
<FooterToolbar
v-show=
"footerToolbar"
>
<Button
type=
"primary"
class=
"mr10
"
>
物料领用
</Button>
<Button
type=
"primary"
class=
"mr10
"
@
click=
"materialCreate
"
>
物料领用
</Button>
</FooterToolbar>
</FooterToolbar>
</div>
</div>
</template>
</template>
...
@@ -41,6 +41,7 @@ export default {
...
@@ -41,6 +41,7 @@ export default {
key
:
"routingDetailNo"
,
key
:
"routingDetailNo"
,
title
:
this
.
l
(
"routingDetailNo"
),
title
:
this
.
l
(
"routingDetailNo"
),
align
:
"left"
,
align
:
"left"
,
width
:
100
},
},
{
{
key
:
"routingDetailName"
,
key
:
"routingDetailName"
,
...
@@ -61,6 +62,7 @@ export default {
...
@@ -61,6 +62,7 @@ export default {
key
:
"totalCount"
,
key
:
"totalCount"
,
title
:
this
.
l
(
"totalCount"
),
title
:
this
.
l
(
"totalCount"
),
align
:
"left"
,
align
:
"left"
,
width
:
150
,
},
},
{
{
key
:
"applicationNumber"
,
key
:
"applicationNumber"
,
...
@@ -85,7 +87,7 @@ export default {
...
@@ -85,7 +87,7 @@ export default {
key
:
"count4"
,
key
:
"count4"
,
title
:
this
.
l
(
"count4"
),
title
:
this
.
l
(
"count4"
),
align
:
"center"
,
align
:
"center"
,
width
:
1
2
0
,
width
:
1
5
0
,
slot
:
"counts4"
,
slot
:
"counts4"
,
},
},
{
{
...
@@ -181,6 +183,49 @@ export default {
...
@@ -181,6 +183,49 @@ export default {
//输入数量
//输入数量
this
.
$set
(
this
.
datas
[
i
].
suport
,
index
,
row
);
this
.
$set
(
this
.
datas
[
i
].
suport
,
index
,
row
);
},
},
//物料领用
materialCreate
()
{
let
temDataOld
=
this
.
$u
.
clone
(
this
.
datas
)
let
temData
=
[]
temDataOld
.
forEach
(
ele
=>
{
temData
=
temData
.
concat
(
ele
.
suport
)
})
// alert(JSON.stringify(temData))
let
datas
=
[]
temData
.
forEach
(
el
=>
{
if
(
el
.
count4
&&
el
.
count4
>
0
&&
el
.
count4
!=
""
)
{
let
temObj
=
{
routingHeaderId
:
el
.
routingHeaderId
,
routingDeatilId
:
el
.
routingDetailId
,
routingDetailName
:
el
.
routingDetailName
,
routingDetailSeq
:
el
.
routingDetailNo
,
count
:
el
.
count4
,
materialId
:
el
.
materialId
,
materialName
:
el
.
nameMaterial
,
materialNumber
:
el
.
materialNumber
,
supportMainId
:
0
,
}
datas
.
push
(
temObj
)
}
})
if
(
datas
.
length
>
0
)
{
let
params
=
{
items
:
datas
,
orderId
:
this
.
entity
.
orderId
,
dispatchId
:
this
.
entity
.
id
,
creator
:
this
.
$store
.
state
.
userInfo
.
userName
,
status
:
0
}
Api
.
materialreceiveCreate
(
params
).
then
(
r
=>
{
if
(
r
.
success
)
{
this
.
$Message
.
success
(
"物料领用成功"
);
this
.
loadInfo
();
}
});
}
else
{
this
.
$Message
.
error
(
"请输入领用物料数量!"
);
}
},
l
(
key
)
{
l
(
key
)
{
let
vkey
=
"support_item"
+
"."
+
key
;
let
vkey
=
"support_item"
+
"."
+
key
;
return
this
.
$t
(
vkey
)
||
key
;
return
this
.
$t
(
vkey
)
||
key
;
...
...
pages/produce/orderlist.vue
View file @
ad50350b
This diff is collapsed.
Click to expand it.
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