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
8e69ae17
Commit
8e69ae17
authored
Apr 13, 2020
by
renjintao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mesplane/delet
parent
8244b431
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
15 deletions
+28
-15
excute.vue
pages/aps/aps/components/excute.vue
+0
-1
index.vue
pages/mesPlan/index.vue
+28
-14
No files found.
pages/aps/aps/components/excute.vue
View file @
8e69ae17
...
@@ -128,7 +128,6 @@ export default {
...
@@ -128,7 +128,6 @@ export default {
high
:
true
,
high
:
true
,
hide
:
true
hide
:
true
},
},
{
{
key
:
"put_into_qty"
,
key
:
"put_into_qty"
,
title
:
this
.
l
(
"put_into_qty"
),
title
:
this
.
l
(
"put_into_qty"
),
...
...
pages/mesPlan/index.vue
View file @
8e69ae17
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
</
template
>
</
template
>
<
template
slot=
"batch"
>
<
template
slot=
"batch"
>
<Button
type=
"primary"
class=
"mr10 ml10"
@
click=
"openSendModal"
>
订单派发
</Button>
<Button
type=
"primary"
class=
"mr10 ml10"
@
click=
"openSendModal"
>
订单派发
</Button>
<Button
type=
"primary"
class=
"mr10 ml10"
>
批量删除
</Button>
<Button
type=
"primary"
class=
"mr10 ml10"
@
click=
"removeList"
>
批量删除
</Button>
</
template
>
</
template
>
</DataGrid>
</DataGrid>
<Modal
v-model=
"addModal"
title=
"新增"
footer-hide
width=
"1200"
>
<Modal
v-model=
"addModal"
title=
"新增"
footer-hide
width=
"1200"
>
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
<Send
:row=
"rowDataArry"
ref=
"orderSplit"
/>
<Send
:row=
"rowDataArry"
ref=
"orderSplit"
/>
<div
slot=
"footer"
>
<div
slot=
"footer"
>
<Button
@
click=
"sendModal = false"
>
取消
</Button>
<Button
@
click=
"sendModal = false"
>
取消
</Button>
<
!-- <Button type="primary" @click="orderSplitOk">确定分解</Button> --
>
<
Button
type=
"primary"
>
确定派发
</Button
>
</div>
</div>
</Modal>
</Modal>
<Modal
v-model=
"deletelModal"
title=
"删除"
@
on-ok=
"removeOk"
@
on-cancel=
"cancel"
>
<Modal
v-model=
"deletelModal"
title=
"删除"
@
on-ok=
"removeOk"
@
on-cancel=
"cancel"
>
...
@@ -285,7 +285,7 @@ export default {
...
@@ -285,7 +285,7 @@ export default {
title
:
"操作"
,
title
:
"操作"
,
key
:
"action"
,
key
:
"action"
,
width
:
180
,
width
:
180
,
align
:
"
center
"
,
align
:
"
left
"
,
render
:
(
h
,
params
)
=>
{
render
:
(
h
,
params
)
=>
{
return
h
(
"div"
,
{
class
:
"action"
},
[
return
h
(
"div"
,
{
class
:
"action"
},
[
h
(
h
(
...
@@ -300,7 +300,8 @@ export default {
...
@@ -300,7 +300,8 @@ export default {
"op"
,
"op"
,
{
{
attrs
:
{
oprate
:
"edit"
},
attrs
:
{
oprate
:
"edit"
},
on
:
{
click
:
()
=>
this
.
edit
(
params
.
row
)
}
on
:
{
click
:
()
=>
this
.
edit
(
params
.
row
)
},
style
:
params
.
row
.
_disabled
?
"display:none"
:
""
},
},
"编辑"
"编辑"
),
),
...
@@ -308,7 +309,8 @@ export default {
...
@@ -308,7 +309,8 @@ export default {
"op"
,
"op"
,
{
{
attrs
:
{
oprate
:
"remove"
},
attrs
:
{
oprate
:
"remove"
},
on
:
{
click
:
()
=>
this
.
remove
(
params
.
row
.
id
)
}
on
:
{
click
:
()
=>
this
.
remove
(
params
.
row
.
id
)
},
style
:
params
.
row
.
_disabled
?
"display:none"
:
""
},
},
"删除"
"删除"
),
),
...
@@ -316,7 +318,8 @@ export default {
...
@@ -316,7 +318,8 @@ export default {
"op"
,
"op"
,
{
{
attrs
:
{
oprate
:
"detail"
},
attrs
:
{
oprate
:
"detail"
},
on
:
{
click
:
()
=>
this
.
split
(
params
.
row
)
}
on
:
{
click
:
()
=>
this
.
split
(
params
.
row
)
},
style
:
params
.
row
.
_disabled
?
"display:none"
:
""
},
},
"分解"
"分解"
)
)
...
@@ -367,6 +370,7 @@ export default {
...
@@ -367,6 +370,7 @@ export default {
urgencyLevel
:
"1"
,
urgencyLevel
:
"1"
,
_disabled
:
true
,
_disabled
:
true
,
divideMark
:
1
,
divideMark
:
1
,
_showChildren
:
true
,
children
:
[
children
:
[
{
{
actualFinishDate
:
"2020-04-09 18:36:31"
,
actualFinishDate
:
"2020-04-09 18:36:31"
,
...
@@ -396,7 +400,7 @@ export default {
...
@@ -396,7 +400,7 @@ export default {
productName
:
"气源分配器壳体"
,
productName
:
"气源分配器壳体"
,
projectNumber
:
"5"
,
projectNumber
:
"5"
,
putintDocmentCode
:
"5"
,
putintDocmentCode
:
"5"
,
quantity
:
1
0
,
quantity
:
1
,
remark
:
"555"
,
remark
:
"555"
,
rootCode
:
"DDBH_20200409_13"
,
rootCode
:
"DDBH_20200409_13"
,
rootId
:
540
,
rootId
:
540
,
...
@@ -442,7 +446,7 @@ export default {
...
@@ -442,7 +446,7 @@ export default {
productName
:
"气源分配器壳体"
,
productName
:
"气源分配器壳体"
,
projectNumber
:
"5"
,
projectNumber
:
"5"
,
putintDocmentCode
:
"5"
,
putintDocmentCode
:
"5"
,
quantity
:
10
,
quantity
:
9
,
remark
:
"555"
,
remark
:
"555"
,
rootCode
:
"DDBH_20200409_13"
,
rootCode
:
"DDBH_20200409_13"
,
rootId
:
540
,
rootId
:
540
,
...
@@ -463,6 +467,7 @@ export default {
...
@@ -463,6 +467,7 @@ export default {
]
]
},
},
{
{
_showChildren
:
true
,
actualFinishDate
:
"2020-04-09 18:36:31"
,
actualFinishDate
:
"2020-04-09 18:36:31"
,
actualStartDate
:
"2020-04-09 17:52:42"
,
actualStartDate
:
"2020-04-09 17:52:42"
,
batchNumber
:
"5"
,
batchNumber
:
"5"
,
...
@@ -699,10 +704,10 @@ export default {
...
@@ -699,10 +704,10 @@ export default {
taskTypeList
:
[],
//任务类型
taskTypeList
:
[],
//任务类型
statusList
:
[],
//状态类型
statusList
:
[],
//状态类型
rowData
:
{},
//编辑、查看的当前行数据
rowData
:
{},
//编辑、查看的当前行数据
rowDataArry
:[],
rowDataArry
:
[],
ModalInfoStaut
:
""
,
ModalInfoStaut
:
""
,
sendList
:
[],
sendList
:
[],
metCodesStrTxt
:
''
,
metCodesStrTxt
:
""
};
};
},
},
created
()
{
created
()
{
...
@@ -767,8 +772,12 @@ export default {
...
@@ -767,8 +772,12 @@ export default {
this
.
rowData
=
row
;
this
.
rowData
=
row
;
},
},
split
(
row
)
{
split
(
row
)
{
this
.
splitModal
=
true
;
if
(
row
.
quantity
>
1
)
{
this
.
rowData
=
row
;
this
.
splitModal
=
true
;
this
.
rowData
=
row
;
}
else
{
this
.
$Message
.
error
(
"数量为1,不能进行分解"
);
}
},
},
//确定分解
//确定分解
orderSplitOk
()
{
orderSplitOk
()
{
...
@@ -856,8 +865,6 @@ export default {
...
@@ -856,8 +865,6 @@ export default {
},
},
//打开派发
//打开派发
openSendModal
()
{
openSendModal
()
{
// alert(JSON.stringify(this.sendList))
// alert(this.sendList.length)
if
(
this
.
rowDataArry
.
length
>
0
)
{
if
(
this
.
rowDataArry
.
length
>
0
)
{
this
.
sendModal
=
true
;
this
.
sendModal
=
true
;
}
else
{
}
else
{
...
@@ -877,6 +884,13 @@ export default {
...
@@ -877,6 +884,13 @@ export default {
}
}
});
});
},
},
removeList
()
{
if
(
this
.
rowDataArry
.
length
>
0
)
{
this
.
deletelModal
=
true
;
}
else
{
this
.
$Message
.
error
(
"请选择订单"
);
}
},
removeCancel
()
{
removeCancel
()
{
this
.
deletelModal
=
false
;
this
.
deletelModal
=
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