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
26eb1c60
Commit
26eb1c60
authored
May 07, 2020
by
仇晓婷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
整机/流水/人员控件替换
parent
4422ed6a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
24 deletions
+30
-24
index.vue
pages/aps/stream/index.vue
+7
-6
set.vue
pages/aps/stream/set.vue
+23
-18
No files found.
pages/aps/stream/index.vue
View file @
26eb1c60
...
@@ -5,9 +5,9 @@
...
@@ -5,9 +5,9 @@
<Col
:span=
"9"
class=
"chan-chi"
>
流水排产-排产池
</Col>
<Col
:span=
"9"
class=
"chan-chi"
>
流水排产-排产池
</Col>
<Col
:span=
"15"
class=
"l-ringht"
>
<Col
:span=
"15"
class=
"l-ringht"
>
<!--
<RadioGroup
v-model=
"status"
type=
"button"
@
on-change=
"changeStatus"
size=
"small"
>
<!--
<RadioGroup
v-model=
"status"
type=
"button"
@
on-change=
"changeStatus"
size=
"small"
>
<Radio
label=
"0"
>
未排产
</Radio>
-->
<Radio
label=
"0"
>
未排产
</Radio>
-->
<!--
<Radio
label=
"2"
>
已排查
</Radio>
-->
<!--
<Radio
label=
"2"
>
已排查
</Radio>
-->
<!--
<Radio
label=
"-1"
>
全部
</Radio>
-->
<!--
<Radio
label=
"-1"
>
全部
</Radio>
-->
<!--
</RadioGroup>
-->
<!--
</RadioGroup>
-->
</Col>
</Col>
</Row>
</Row>
...
@@ -190,8 +190,8 @@ export default {
...
@@ -190,8 +190,8 @@ export default {
if
(
r
.
result
)
{
if
(
r
.
result
)
{
r
.
result
.
map
(
u
=>
{
r
.
result
.
map
(
u
=>
{
u
.
aps
=
0
;
u
.
aps
=
0
;
u
.
demandFinishDate
=
u
.
demandFinishDate
.
substr
(
0
,
10
)
u
.
demandFinishDate
=
u
.
demandFinishDate
.
substr
(
0
,
10
);
u
.
demandStartDate
=
u
.
demandStartDate
.
substr
(
0
,
10
)
u
.
demandStartDate
=
u
.
demandStartDate
.
substr
(
0
,
10
);
});
});
this
.
list
=
r
.
result
;
this
.
list
=
r
.
result
;
// if (r.result[0]) {
// if (r.result[0]) {
...
@@ -268,7 +268,7 @@ export default {
...
@@ -268,7 +268,7 @@ export default {
this
.
indexId
=
index
;
this
.
indexId
=
index
;
this
.
detailId
=
item
.
detailId
;
this
.
detailId
=
item
.
detailId
;
this
.
active
=
index
;
this
.
active
=
index
;
this
.
$refs
.
setObj
.
formItem
=
{}
this
.
$refs
.
setObj
.
formItem
=
{};
// this.group.orderId = item.orderId;
// this.group.orderId = item.orderId;
// this.group.routingHeaderId = item.routingHeaderId;
// this.group.routingHeaderId = item.routingHeaderId;
// this.$refs.setObj.formItem = {};
// this.$refs.setObj.formItem = {};
...
@@ -335,6 +335,7 @@ export default {
...
@@ -335,6 +335,7 @@ export default {
if
(
r
.
result
)
{
if
(
r
.
result
)
{
this
.
$Message
.
success
(
"下发成功"
);
this
.
$Message
.
success
(
"下发成功"
);
this
.
orderlist
(
this
.
status
);
this
.
orderlist
(
this
.
status
);
this
.
result
=
[];
}
else
{
}
else
{
this
.
$Message
.
info
(
"下发失败"
);
this
.
$Message
.
info
(
"下发失败"
);
}
}
...
...
pages/aps/stream/set.vue
View file @
26eb1c60
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
<Radio
label=
"1"
>
班组
</Radio>
<Radio
label=
"1"
>
班组
</Radio>
</RadioGroup>
</RadioGroup>
</FormItem>
-->
</FormItem>
-->
<FormItem
label=
"人员"
v-if=
"mode==1"
prop=
"user"
>
<FormItem
label=
"人员"
v-if=
"mode==1"
prop=
"user
Ids
"
>
<!--
<UserSelect
<!--
<UserSelect
ref=
"userSelected"
ref=
"userSelected"
v-model=
"formItem.userIds"
v-model=
"formItem.userIds"
...
@@ -74,7 +74,8 @@ export default {
...
@@ -74,7 +74,8 @@ export default {
remark
:
""
,
remark
:
""
,
departmentTitle
:
""
,
departmentTitle
:
""
,
shopId
:
""
,
shopId
:
""
,
shopName
:
""
shopName
:
""
,
userIds
:
[]
},
},
workShop
:
[],
workShop
:
[],
listClass
:
[],
listClass
:
[],
...
@@ -91,14 +92,14 @@ export default {
...
@@ -91,14 +92,14 @@ export default {
}
}
}
}
],
],
user
:
[
//
user: [
{
//
{
required
:
true
,
//
required: true,
message
:
"请选择人员"
,
//
message: "请选择人员",
type
:
"array"
,
//
type: "array",
trigger
:
"change"
//
trigger: "change"
}
//
}
],
//
],
shopId
:
[
shopId
:
[
{
{
required
:
true
,
required
:
true
,
...
@@ -116,14 +117,18 @@ export default {
...
@@ -116,14 +117,18 @@ export default {
methods
:
{
methods
:
{
//确定
//确定
Determine
()
{
Determine
()
{
this
.
$refs
[
"formItem"
].
validate
(
valid
=>
{
if
(
this
.
formItem
.
userIds
.
length
==
0
)
{
if
(
valid
)
{
this
.
$Message
.
error
(
"人员不能为空"
);
this
.
formItem
.
detailId
=
this
.
detailId
;
}
else
{
this
.
$emit
(
"on-DetermineOk"
,
this
.
formItem
,
this
.
indexId
);
this
.
$refs
[
"formItem"
].
validate
(
valid
=>
{
}
else
{
if
(
valid
)
{
this
.
$Message
.
error
(
"Fail!"
);
this
.
formItem
.
detailId
=
this
.
detailId
;
}
this
.
$emit
(
"on-DetermineOk"
,
this
.
formItem
,
this
.
indexId
);
});
}
else
{
this
.
$Message
.
error
(
"请填写完整"
);
}
});
}
},
},
closeOk
()
{
closeOk
()
{
this
.
$emit
(
"closeOk"
);
this
.
$emit
(
"closeOk"
);
...
...
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