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
5b3338b6
Commit
5b3338b6
authored
Apr 06, 2020
by
任金涛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aps/edit/excute
parent
90dc20fd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
31 deletions
+29
-31
edit.vue
pages/aps/aps/components/edit.vue
+12
-14
excute.vue
pages/aps/aps/components/excute.vue
+17
-17
No files found.
pages/aps/aps/components/edit.vue
View file @
5b3338b6
...
...
@@ -3,18 +3,18 @@
<Row>
<Col
:span=
"12"
>
<FormItem
:label=
"l('tASKSEQ')"
prop=
"tASKSEQ"
>
<Input></Input>
<Input
v-model=
"entity.task_seq"
></Input>
</FormItem>
</Col>
<Col
:span=
"12"
>
<FormItem
:label=
"l('tASKNAME')"
prop=
"tASKNAME"
>
<Input></Input>
<Input
v-model=
"entity.task_name"
></Input>
</FormItem>
</Col>
<Col
:span=
"12"
>
<FormItem
:label=
"l('sHOPID')"
prop=
"sHOPID"
>
<!-- v-model="orderSearchForm.orderCat" -->
<Select
>
<Select
v-model=
"entity.sHOPID"
>
<Option
value=
""
class=
"option-text"
>
请选择
</Option>
<Option
v-for=
"item in orderCatList"
:value=
"item"
:key=
"item"
>
{{
item
}}
</Option>
</Select>
...
...
@@ -22,7 +22,7 @@
</Col>
<Col
:span=
"12"
>
<FormItem
:label=
"l('eQUIPID')"
prop=
"eQUIPID"
>
<Select
>
<Select
v-model=
"entity.eQUIPID"
>
<Option
value=
""
class=
"option-text"
>
请选择
</Option>
<Option
v-for=
"item in orderCatList"
:value=
"item"
:key=
"item"
>
{{
item
}}
</Option>
</Select>
...
...
@@ -30,16 +30,16 @@
</Col>
<Col
:span=
"12"
>
<FormItem
label=
"关重资源名称"
prop=
"rUNTIME"
>
<Select
>
<Select
v-model=
"entity.run_time"
>
<Option
value=
""
class=
"option-text"
>
请选择
</Option>
<Option
v-for=
"item in orderCatList"
:value=
"item"
:key=
"item"
>
{{
item
}}
</Option>
</Select>
</FormItem>
</Col>
<Col
:span=
"12"
>
<Col
:span=
"12"
v-model=
"entity.rUNTIME"
>
<FormItem
:label=
"l('rUNTIME')"
prop=
"rUNTIME"
>
<!-- v-model="value1" -->
<InputNumber
:max=
"100"
:min=
"1"
></InputNumber>
<InputNumber
v-model=
"entity.run_time"
:max=
"100"
:min=
"1"
></InputNumber>
</FormItem>
</Col>
</Row>
...
...
@@ -75,10 +75,7 @@ export default {
},
methods
:
{
load
(
v
)
{
// Api.get({ id: v }).then((r) => {
// this.entity = r.result
// this.$emit('on-load')
// })
this
.
entity
=
v
},
handleSubmit
()
{
this
.
$refs
.
form
.
validate
((
v
)
=>
{
...
...
@@ -111,9 +108,10 @@ export default {
}
},
watch
:
{
eid
(
v
)
{
if
(
v
!=
0
)
{
this
.
load
(
v
)
row
(
v
)
{
if
(
v
!=
{})
{
alert
(
JSON
.
stringify
(
v
))
this
.
entity
=
v
}
}
}
...
...
pages/aps/aps/components/excute.vue
View file @
5b3338b6
...
...
@@ -13,15 +13,7 @@
:height=
"gridHeight"
></DataGrid>
<Modal
v-model=
"editModal"
title=
"编辑"
footer-hide
width=
"800"
>
<Edit
:eid=
"curId"
:opTaskPk=
"setParams.opTaskPk"
:partTaskPk=
"setParams.partTaskPk"
:taskSeq=
"setParams.taskSeq"
:count=
"setParams.count"
@
on-close=
"cancel"
@
on-option-ok=
"addOk"
/>
<Edit
:row=
"rowData"
@
on-close=
"cancel"
@
on-option-ok=
"addOk"
/>
</Modal>
<Modal
v-model=
"insertlModal"
...
...
@@ -32,7 +24,15 @@
<p>
确定进行
{{
insertTItle
}}
操作?
</p>
</Modal>
<Modal
v-model=
"setParsModal"
title=
"工序参数设置"
footer-hide
width=
"1000"
>
<Add
:eid=
"curId"
@
on-parameter-ok=
"addOk"
@
on-close=
"cancel"
/>
<Add
:eid=
"curId"
@
on-parameter-ok=
"addOk"
@
on-close=
"cancel"
:opTaskPk=
"setParams.opTaskPk"
:partTaskPk=
"setParams.partTaskPk"
:taskSeq=
"setParams.taskSeq"
:count=
"setParams.count"
/>
</Modal>
</div>
</
template
>
...
...
@@ -348,9 +348,8 @@ export default {
type
:
"icon"
,
title
:
"編輯工序"
,
oprate
:
"edit"
,
msg
:
"确认要移出排产吗?"
,
},
on
:
{
click
:
()
=>
this
.
edit
(
params
.
row
.
id
)
},
on
:
{
click
:
()
=>
this
.
edit
(
params
.
row
)
},
}),
h
(
"op"
,
{
attrs
:
{
...
...
@@ -377,6 +376,7 @@ export default {
count
:
0
,
},
//生产计划数量
//设置参数结束
rowData
:{},
//编辑时传入行数据
};
},
mounted
()
{
...
...
@@ -428,7 +428,7 @@ export default {
//单个工序进行参设置start----
openParms
(
row
)
{
this
.
setParams
=
{
opTaskPk
:
row
.
op_task_pk
,
opTaskPk
:
row
.
op_task_pk
,
partTaskPk
:
row
.
part_task_pk
,
taskSeq
:
row
.
task_seq
,
count
:
row
.
put_into_qty
,
...
...
@@ -438,9 +438,9 @@ export default {
//单个工序进行参数设置end----
//编辑工序start----
edit
(
id
)
{
edit
(
row
)
{
this
.
editModal
=
true
;
this
.
curId
=
Number
(
id
)
;
this
.
rowData
=
row
;
},
//编辑工序end----
...
...
@@ -460,11 +460,11 @@ export default {
}
});
},
addOk
()
{
addOk
()
{
this
.
data1
=
[];
this
.
loadData
(
this
.
rowId
);
this
.
setParsModal
=
false
;
this
.
editModal
=
false
this
.
editModal
=
false
;
},
//删除工序时间end-----
cancel
()
{
...
...
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