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
417d9426
Commit
417d9426
authored
Nov 06, 2020
by
仇晓婷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
流水排产
parent
9d9aafa5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
221 additions
and
181 deletions
+221
-181
api.js
pages/aps/stream/api.js
+8
-2
index.vue
pages/aps/stream/index.vue
+163
-143
set.vue
pages/aps/stream/set.vue
+50
-36
No files found.
pages/aps/stream/api.js
View file @
417d9426
import
Api
from
'@/plugins/request'
export
default
{
// getpooltypeorderlist(params) {
// return Api.get(`${PlanUrl}/messchedule/getpooltypeorderlist`, params); //排产池订单数据
// },
getpooltypeorderlist
(
params
)
{
return
Api
.
get
(
`
${
PlanUrl
}
/messchedule/getpooltypeorderlist`
,
params
);
//排产池订单数据
return
Api
.
get
(
`
${
PlanUrl
}
/messchedule/getpooltypeorderlist
_new
`
,
params
);
//排产池订单数据
},
// getroutingdetails(params) {
// return Api.get(`${PlanUrl}/messchedule/getroutingdetails`, params); //工序信息
// },
getroutingdetails
(
params
)
{
return
Api
.
get
(
`
${
PlanUrl
}
/messchedule/getroutingdetails`
,
params
);
//工序信息
return
Api
.
get
(
`
${
PlanUrl
}
/messchedule/getroutingdetails
_mutiroutinggroup
`
,
params
);
//工序信息
},
flonestepschedule
(
params
)
{
return
Api
.
post
(
`
${
PlanUrl
}
/messchedule/flonestepschedule`
,
params
);
//流水一级
...
...
pages/aps/stream/index.vue
View file @
417d9426
This diff is collapsed.
Click to expand it.
pages/aps/stream/set.vue
View file @
417d9426
<
template
>
<div
class=
"set"
>
<Form
:model=
"formItem"
:label-width=
"100"
:rules=
"ruleValidate"
ref=
"formItem"
>
<Form
:model=
"formItem"
:label-width=
"100"
:rules=
"ruleValidate"
ref=
"formItem"
>
<FormItem
label=
"工时"
prop=
"time"
>
<DatePicker
type=
"datetimerange"
...
...
@@ -8,7 +13,7 @@
placeholder=
"请选择工时"
@
on-change=
"changeFormat"
v-model=
"formItem.time"
style=
"width:300px"
style=
"width:
300px"
></DatePicker>
</FormItem>
<!--
<FormItem
label=
"类型"
>
...
...
@@ -17,32 +22,41 @@
<Radio
label=
"1"
>
班组
</Radio>
</RadioGroup>
</FormItem>
-->
<FormItem
label=
"人员"
v-if=
"mode
==
1"
prop=
"userIds"
>
<FormItem
label=
"人员"
v-if=
"mode
==
1"
prop=
"userIds"
>
<!--
<UserSelect
ref=
"userSelected"
v-model=
"formItem.userIds"
style=
"width:300px"
:multiple=
"true"
/>
-->
<UserSelect
v-model=
"formItem.userIds"
:multiple=
"true"
:type=
"2"
/>
<UserSelect
v-model=
"formItem.userIds"
:multiple=
"true"
:type=
"2"
/>
</FormItem>
<FormItem
label=
"班组"
v-if=
"mode==2"
prop=
"shopId"
>
<Select
v-model=
"formItem.shopId"
placeholder=
"请选择"
style=
"width:300px"
>
<FormItem
label=
"班组"
v-if=
"mode == 2"
prop=
"shopId"
>
<Select
v-model=
"formItem.shopId"
placeholder=
"请选择"
style=
"width: 300px"
>
<Option
v-for=
"(item,index) in listClass"
v-for=
"(item,
index) in listClass"
:key=
"index"
:value=
"item.value"
:label=
"item.label"
style=
"display:none"
style=
"display:
none"
></Option>
<Tree
key=
"mytree"
:data=
"workShop"
ref=
"mytree"
:render=
"renderContent"
></Tree>
<Tree
key=
"mytree"
:data=
"workShop"
ref=
"mytree"
:render=
"renderContent"
></Tree>
</Select>
</FormItem>
<FormItem
label=
"备注"
>
<Input
v-model=
"formItem.remark"
type=
"textarea"
:autosize=
"
{
minRows: 2,maxRows: 5
}"
:autosize=
"
{
minRows: 2, maxRows: 5
}"
placeholder="请输入备注信息"
>
</Input>
</FormItem>
...
...
@@ -60,7 +74,7 @@ export default {
props
:
{
detailId
:
Number
,
indexId
:
Number
,
mode
:
Number
mode
:
Number
,
},
data
()
{
return
{
...
...
@@ -75,7 +89,7 @@ export default {
departmentTitle
:
""
,
shopId
:
""
,
shopName
:
""
,
userIds
:
[]
userIds
:
[]
,
},
workShop
:
[],
listClass
:
[],
...
...
@@ -88,26 +102,26 @@ export default {
trigger
:
"blur"
,
fields
:
{
0
:
{
type
:
"date"
,
required
:
true
,
message
:
"请选择工时时间段"
},
1
:
{
type
:
"date"
,
required
:
true
,
message
:
"请选择工时时间段"
}
}
}
1
:
{
type
:
"date"
,
required
:
true
,
message
:
"请选择工时时间段"
},
},
},
],
userIds
:
[
{
required
:
true
,
message
:
"请选择人员"
,
type
:
"array"
,
trigger
:
"change"
,
},
],
// user: [
// {
// required: true,
// message: "请选择人员",
// type: "array",
// trigger: "change"
// }
// ],
shopId
:
[
{
required
:
true
,
message
:
"请选择班组"
,
trigger
:
"change"
}
]
}
trigger
:
"change"
,
}
,
]
,
}
,
};
},
mounted
()
{
...
...
@@ -120,7 +134,7 @@ export default {
if
(
this
.
formItem
.
userIds
&&
this
.
formItem
.
userIds
.
length
==
0
)
{
this
.
$Message
.
error
(
"人员不能为空"
);
}
else
{
this
.
$refs
[
"formItem"
].
validate
(
valid
=>
{
this
.
$refs
[
"formItem"
].
validate
(
(
valid
)
=>
{
if
(
valid
)
{
this
.
formItem
.
detailId
=
this
.
detailId
;
this
.
$emit
(
"on-DetermineOk"
,
this
.
formItem
,
this
.
indexId
);
...
...
@@ -146,7 +160,7 @@ export default {
//部门(班组)
getWorkshop
()
{
let
url
=
`
${
systemUrl
}
/department/getdepartmentsbyproterty`
;
this
.
$api
.
get
(
url
,
{
Property
:
2
}).
then
(
r
=>
{
this
.
$api
.
get
(
url
,
{
Property
:
2
}).
then
((
r
)
=>
{
if
(
r
.
result
)
{
this
.
workShop
=
r
.
result
;
}
...
...
@@ -158,13 +172,13 @@ export default {
"span"
,
{
style
:
{
cursor
:
"pointer"
cursor
:
"pointer"
,
},
on
:
{
click
:
()
=>
{
this
.
handleSelect
(
data
);
//手动选择树节点
}
}
}
,
}
,
},
data
.
name
);
...
...
@@ -172,21 +186,21 @@ export default {
handleSelect
(
data
)
{
let
obj
=
{
label
:
data
.
name
,
value
:
data
.
id
value
:
data
.
id
,
};
this
.
listClass
=
[];
this
.
listClass
.
push
(
obj
);
this
.
formItem
.
shopId
=
this
.
listClass
[
0
].
value
;
this
.
formItem
.
shopName
=
this
.
listClass
[
0
].
label
;
}
}
,
},
watch
:
{
"formItem.radio"
(
v
)
{
if
(
v
==
1
)
{
this
.
getWorkshop
();
}
}
}
}
,
}
,
};
</
script
>
<
style
lang=
"less"
scoped
>
...
...
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