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
ed0ece29
Commit
ed0ece29
authored
Aug 05, 2020
by
仇晓婷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工艺设置,未设置
parent
b945fd4f
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
412 additions
and
113 deletions
+412
-113
index.vue
pages/order/monitoring/index.vue
+91
-91
api.js
pages/technology/setProcess/api.js
+37
-0
index.vue
pages/technology/setProcess/index.vue
+74
-22
set.vue
pages/technology/setProcess/set.vue
+210
-0
No files found.
pages/order/monitoring/index.vue
View file @
ed0ece29
...
@@ -71,7 +71,7 @@ export default {
...
@@ -71,7 +71,7 @@ export default {
Record
,
Record
,
Search
,
Search
,
Suspend
,
Suspend
,
Speed
Speed
,
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -85,7 +85,7 @@ export default {
...
@@ -85,7 +85,7 @@ export default {
action
:
Api
.
index
,
action
:
Api
.
index
,
easySearch
:
{
easySearch
:
{
keys
:
{
op
:
"mesCode"
,
value
:
null
},
keys
:
{
op
:
"mesCode"
,
value
:
null
},
productingpreparationpeople
:
{
op
:
"Equal"
,
value
:
null
}
productingpreparationpeople
:
{
op
:
"Equal"
,
value
:
null
}
,
},
},
suspendModal
:
false
,
suspendModal
:
false
,
recordModal
:
false
,
recordModal
:
false
,
...
@@ -98,7 +98,7 @@ export default {
...
@@ -98,7 +98,7 @@ export default {
title
:
"序号"
,
title
:
"序号"
,
type
:
"index"
,
type
:
"index"
,
width
:
70
,
width
:
70
,
align
:
"center"
align
:
"center"
,
},
},
{
{
key
:
"status"
,
key
:
"status"
,
...
@@ -107,7 +107,7 @@ export default {
...
@@ -107,7 +107,7 @@ export default {
align
:
"center"
,
align
:
"center"
,
easy
:
true
,
easy
:
true
,
high
:
true
,
high
:
true
,
width
:
100
width
:
100
,
},
},
{
{
key
:
"mesCode"
,
key
:
"mesCode"
,
...
@@ -122,11 +122,11 @@ export default {
...
@@ -122,11 +122,11 @@ export default {
{
{
props
:
{
props
:
{
content
:
"开工预警:"
+
params
.
row
.
startWarning
+
"条"
,
content
:
"开工预警:"
+
params
.
row
.
startWarning
+
"条"
,
trigger
:
"hover"
trigger
:
"hover"
,
},
},
style
:
{
style
:
{
cursor
:
"pointer"
cursor
:
"pointer"
,
}
}
,
},
},
[
[
h
(
h
(
...
@@ -135,25 +135,25 @@ export default {
...
@@ -135,25 +135,25 @@ export default {
props
:
{
props
:
{
type
:
"warning"
,
type
:
"warning"
,
// count: 2,
// count: 2,
count
:
params
.
row
.
startWarning
count
:
params
.
row
.
startWarning
,
},
},
style
:
{
style
:
{
marginTop
:
"12px"
,
marginTop
:
"12px"
,
marginLeft
:
"5px"
marginLeft
:
"5px"
,
}
}
,
},
},
[
[
h
(
"Icon"
,
{
h
(
"Icon"
,
{
props
:
{
props
:
{
type
:
"md-alert"
type
:
"md-alert"
,
},
},
style
:
{
style
:
{
fontSize
:
"16px"
,
fontSize
:
"16px"
,
color
:
"#f1cb08"
color
:
"#f1cb08"
,
}
}
,
})
})
,
]
]
)
)
,
]
]
),
),
h
(
h
(
...
@@ -161,8 +161,8 @@ export default {
...
@@ -161,8 +161,8 @@ export default {
{
{
props
:
{
props
:
{
content
:
"完工预警:"
+
params
.
row
.
finishWarning
+
"条"
,
content
:
"完工预警:"
+
params
.
row
.
finishWarning
+
"条"
,
trigger
:
"hover"
trigger
:
"hover"
,
}
}
,
},
},
[
[
h
(
h
(
...
@@ -171,38 +171,38 @@ export default {
...
@@ -171,38 +171,38 @@ export default {
props
:
{
props
:
{
type
:
"info"
,
type
:
"info"
,
// count: 2,
// count: 2,
count
:
params
.
row
.
finishWarning
count
:
params
.
row
.
finishWarning
,
},
},
style
:
{
style
:
{
marginTop
:
"12px"
,
marginTop
:
"12px"
,
marginLeft
:
"5px"
marginLeft
:
"5px"
,
}
}
,
},
},
[
[
h
(
"Icon"
,
{
h
(
"Icon"
,
{
props
:
{
props
:
{
type
:
"md-alert"
type
:
"md-alert"
,
},
},
style
:
{
style
:
{
fontSize
:
"16px"
,
fontSize
:
"16px"
,
color
:
"#31F8E6"
,
color
:
"#31F8E6"
,
marginLeft
:
"5px"
marginLeft
:
"5px"
,
}
},
})
}),
]
)
]
]
)
),
]
]
),
],
]);
]);
}
}
,
},
},
{
{
key
:
"productName"
,
key
:
"productName"
,
title
:
this
.
l
(
"productName"
),
title
:
this
.
l
(
"productName"
),
align
:
"left"
,
align
:
"left"
,
easy
:
true
,
easy
:
true
,
high
:
true
high
:
true
,
},
},
{
{
...
@@ -217,7 +217,7 @@ export default {
...
@@ -217,7 +217,7 @@ export default {
this
.
sliceStr
(
params
.
row
.
demandStartDate
+
" "
,
0
,
10
),
this
.
sliceStr
(
params
.
row
.
demandStartDate
+
" "
,
0
,
10
),
params
.
row
.
demandStartDate
params
.
row
.
demandStartDate
);
);
}
}
,
},
},
{
{
key
:
"demandFinishDate"
,
key
:
"demandFinishDate"
,
...
@@ -231,7 +231,7 @@ export default {
...
@@ -231,7 +231,7 @@ export default {
this
.
sliceStr
(
params
.
row
.
demandFinishDate
+
" "
,
0
,
10
),
this
.
sliceStr
(
params
.
row
.
demandFinishDate
+
" "
,
0
,
10
),
params
.
row
.
demandFinishDate
params
.
row
.
demandFinishDate
);
);
}
}
,
},
},
{
{
key
:
"actualStartDate"
,
key
:
"actualStartDate"
,
...
@@ -247,7 +247,7 @@ export default {
...
@@ -247,7 +247,7 @@ export default {
?
""
?
""
:
params
.
row
.
actualStartDate
:
params
.
row
.
actualStartDate
);
);
}
}
,
},
},
{
{
key
:
"actualFinishDate"
,
key
:
"actualFinishDate"
,
...
@@ -263,7 +263,7 @@ export default {
...
@@ -263,7 +263,7 @@ export default {
?
""
?
""
:
params
.
row
.
actualFinishDate
:
params
.
row
.
actualFinishDate
);
);
}
}
,
},
},
{
{
key
:
"routingType"
,
key
:
"routingType"
,
...
@@ -272,7 +272,7 @@ export default {
...
@@ -272,7 +272,7 @@ export default {
code
:
"mes_xingchi_plan.order_material.routingType"
,
code
:
"mes_xingchi_plan.order_material.routingType"
,
easy
:
true
,
easy
:
true
,
high
:
true
,
high
:
true
,
width
:
100
width
:
100
,
},
},
{
{
title
:
this
.
l
(
"jindu"
),
title
:
this
.
l
(
"jindu"
),
...
@@ -285,8 +285,8 @@ export default {
...
@@ -285,8 +285,8 @@ export default {
"ButtonGroup"
,
"ButtonGroup"
,
{
{
props
:
{
props
:
{
shape
:
"circle"
shape
:
"circle"
,
}
}
,
},
},
[
[
h
(
h
(
...
@@ -294,13 +294,13 @@ export default {
...
@@ -294,13 +294,13 @@ export default {
{
{
style
:
{
style
:
{
background
:
"#e4e6ed "
,
background
:
"#e4e6ed "
,
borderColor
:
"#e4e6ed "
borderColor
:
"#e4e6ed "
,
},
},
on
:
{
on
:
{
click
:
()
=>
{
click
:
()
=>
{
this
.
speed
(
params
.
row
);
this
.
speed
(
params
.
row
);
}
}
,
}
}
,
},
},
params
.
row
.
unstartCount
//未开工数
params
.
row
.
unstartCount
//未开工数
),
),
...
@@ -309,13 +309,13 @@ export default {
...
@@ -309,13 +309,13 @@ export default {
{
{
style
:
{
style
:
{
background
:
"#ffc000"
,
background
:
"#ffc000"
,
borderColor
:
"#ffc000"
borderColor
:
"#ffc000"
,
},
},
on
:
{
on
:
{
click
:
()
=>
{
click
:
()
=>
{
this
.
speed
(
params
.
row
);
this
.
speed
(
params
.
row
);
}
}
,
}
}
,
},
},
params
.
row
.
startCount
//开工数
params
.
row
.
startCount
//开工数
),
),
...
@@ -325,14 +325,14 @@ export default {
...
@@ -325,14 +325,14 @@ export default {
{
{
style
:
{
style
:
{
background
:
"#ff7a8b"
,
background
:
"#ff7a8b"
,
borderColor
:
"#ff7a8b"
borderColor
:
"#ff7a8b"
,
},
},
on
:
{
on
:
{
click
:
()
=>
{
click
:
()
=>
{
this
.
speed
(
params
.
row
);
this
.
speed
(
params
.
row
);
}
}
,
}
}
,
},
},
params
.
row
.
stopCount
//暂停数
params
.
row
.
stopCount
//暂停数
),
),
...
@@ -341,27 +341,27 @@ export default {
...
@@ -341,27 +341,27 @@ export default {
{
{
style
:
{
style
:
{
background
:
"#27c149"
,
background
:
"#27c149"
,
borderColor
:
"#27c149"
borderColor
:
"#27c149"
,
// color: '#fff'
// color: '#fff'
},
},
on
:
{
on
:
{
click
:
()
=>
{
click
:
()
=>
{
this
.
speed
(
params
.
row
);
this
.
speed
(
params
.
row
);
}
}
,
}
}
,
},
},
params
.
row
.
finishCount
//完成数
params
.
row
.
finishCount
//完成数
)
)
,
]
]
)
)
,
]);
]);
}
}
,
},
},
{
{
key
:
"remark"
,
key
:
"remark"
,
title
:
this
.
l
(
"remark"
),
title
:
this
.
l
(
"remark"
),
align
:
"center"
,
align
:
"center"
,
hide
:
true
hide
:
true
,
},
},
{
{
title
:
"暂停记录"
,
title
:
"暂停记录"
,
...
@@ -374,12 +374,12 @@ export default {
...
@@ -374,12 +374,12 @@ export default {
"op"
,
"op"
,
{
{
attrs
:
{
oprate
:
"record"
,
class
:
"edit"
},
attrs
:
{
oprate
:
"record"
,
class
:
"edit"
},
on
:
{
click
:
()
=>
this
.
record
(
params
.
row
.
id
)
}
on
:
{
click
:
()
=>
this
.
record
(
params
.
row
.
id
)
}
,
},
},
"暂停记录"
"暂停记录"
)
)
,
]);
]);
}
}
,
},
},
{
{
title
:
"操作"
,
title
:
"操作"
,
...
@@ -400,73 +400,73 @@ export default {
...
@@ -400,73 +400,73 @@ export default {
type
:
"error"
,
type
:
"error"
,
size
:
"small"
,
size
:
"small"
,
icon
:
"md-play"
,
icon
:
"md-play"
,
ghost
:
true
ghost
:
true
,
},
},
style
:
{
style
:
{
fontSize
:
"18px"
,
fontSize
:
"18px"
,
width
:
"50px"
,
width
:
"50px"
,
height
:
"25px"
,
height
:
"25px"
,
paddingTop
:
"0"
paddingTop
:
"0"
,
},
},
on
:
{
on
:
{
click
:
()
=>
{
click
:
()
=>
{
this
.
start
(
params
.
row
);
this
.
start
(
params
.
row
);
}
}
,
}
}
,
},
},
""
""
),
),
h
(
h
(
params
.
row
.
status
==
6
params
.
row
.
status
==
6
?
"Button"
:
""
,
//订单状态执行中,暂停
?
"Button"
:
""
,
//订单状态执行中,暂停
{
{
props
:
{
props
:
{
type
:
"success"
,
type
:
"success"
,
size
:
"small"
,
size
:
"small"
,
icon
:
"ios-pause"
,
icon
:
"ios-pause"
,
ghost
:
true
,
ghost
:
true
,
tooltip
:
"暂停"
tooltip
:
"暂停"
,
},
},
style
:
{
style
:
{
fontSize
:
"18px"
,
fontSize
:
"18px"
,
width
:
"50px"
,
width
:
"50px"
,
height
:
"25px"
,
height
:
"25px"
,
paddingTop
:
"0"
paddingTop
:
"0"
,
},
},
on
:
{
on
:
{
click
:
()
=>
{
click
:
()
=>
{
this
.
suspend
(
params
.
row
);
this
.
suspend
(
params
.
row
);
}
}
,
}
}
,
},
},
""
""
),
),
h
(
h
(
params
.
row
.
status
==
5
&&
params
.
row
.
splitCardStatus
==
0
?
"op"
:
""
,
//订单状态执行中,暂停
params
.
row
.
status
==
5
&&
params
.
row
.
splitCardStatus
==
0
?
"op"
:
""
,
//订单状态执行中,暂停
{
{
attrs
:
{
attrs
:
{
icon
:
"md-sync"
,
icon
:
"md-sync"
,
type
:
"icon"
,
type
:
"icon"
,
title
:
"回收订单"
,
title
:
"回收订单"
,
oprate
:
"edit"
,
oprate
:
"edit"
,
msg
:
"确认要恢复工序吗?"
msg
:
"确认要恢复工序吗?"
,
},
},
on
:
{
on
:
{
click
:
()
=>
{
click
:
()
=>
{
this
.
recycle
(
params
.
row
);
this
.
recycle
(
params
.
row
);
},
},
}
}
}
),
}
)
]);
]);
}
}
,
}
}
,
],
],
loading
:
false
,
loading
:
false
,
recovery
:
{
recovery
:
{
orderId
:
null
,
orderId
:
null
,
demandFinishDate
:
""
//计划完成时间
demandFinishDate
:
""
,
//计划完成时间
},
},
mesCode
:
""
,
mesCode
:
""
,
rulesRecycle
:
{
rulesRecycle
:
{
...
@@ -475,10 +475,10 @@ export default {
...
@@ -475,10 +475,10 @@ export default {
required
:
true
,
required
:
true
,
message
:
"请选择计划完成时间"
,
message
:
"请选择计划完成时间"
,
trigger
:
"change"
,
trigger
:
"change"
,
type
:
"date"
type
:
"date"
,
}
}
,
]
]
,
}
}
,
};
};
},
},
mounted
()
{},
mounted
()
{},
...
@@ -509,15 +509,15 @@ export default {
...
@@ -509,15 +509,15 @@ export default {
this
.
orderId
=
row
.
id
;
this
.
orderId
=
row
.
id
;
Api
.
info
({
Api
.
info
({
routingHeaderId
:
row
.
routingHeaderId
,
routingHeaderId
:
row
.
routingHeaderId
,
dispatchExecuteId
:
row
.
dispatchExecuteId
dispatchExecuteId
:
row
.
dispatchExecuteId
,
})
})
.
then
(
r
=>
{
.
then
(
(
r
)
=>
{
if
(
r
.
success
)
{
if
(
r
.
success
)
{
this
.
result
=
r
.
result
;
this
.
result
=
r
.
result
;
this
.
loading
=
false
;
this
.
loading
=
false
;
}
}
})
})
.
catch
(
err
=>
{
.
catch
(
(
err
)
=>
{
this
.
$Message
.
error
(
"连接错误"
);
this
.
$Message
.
error
(
"连接错误"
);
});
});
}
}
...
@@ -536,8 +536,8 @@ export default {
...
@@ -536,8 +536,8 @@ export default {
Api
.
start
({
Api
.
start
({
id
:
row
.
id
,
id
:
row
.
id
,
status
:
6
,
status
:
6
,
laster
:
this
.
laster
laster
:
this
.
laster
,
}).
then
(
r
=>
{
}).
then
(
(
r
)
=>
{
if
(
r
.
success
)
{
if
(
r
.
success
)
{
this
.
$refs
.
grid
.
load
();
this
.
$refs
.
grid
.
load
();
this
.
$Message
.
success
(
"启动成功"
);
this
.
$Message
.
success
(
"启动成功"
);
...
@@ -548,7 +548,7 @@ export default {
...
@@ -548,7 +548,7 @@ export default {
},
},
onCancel
:
()
=>
{
onCancel
:
()
=>
{
this
.
$Message
.
info
(
"已取消"
);
this
.
$Message
.
info
(
"已取消"
);
}
}
,
});
});
},
},
clsoeSpeedModal
()
{
clsoeSpeedModal
()
{
...
@@ -562,7 +562,7 @@ export default {
...
@@ -562,7 +562,7 @@ export default {
},
},
removeOk
()
{
removeOk
()
{
Api
.
delete
({
id
:
this
.
curId
}).
then
(
r
=>
{
Api
.
delete
({
id
:
this
.
curId
}).
then
(
(
r
)
=>
{
if
(
r
.
success
)
{
if
(
r
.
success
)
{
this
.
$refs
.
grid
.
load
();
this
.
$refs
.
grid
.
load
();
this
.
deletelModal
=
false
;
this
.
deletelModal
=
false
;
...
@@ -576,7 +576,7 @@ export default {
...
@@ -576,7 +576,7 @@ export default {
this
.
mesCode
=
row
.
mesCode
;
this
.
mesCode
=
row
.
mesCode
;
this
.
recovery
=
{
this
.
recovery
=
{
orderId
:
row
.
id
,
orderId
:
row
.
id
,
demandFinishDate
:
row
.
demandFinishDate
demandFinishDate
:
row
.
demandFinishDate
,
};
};
},
},
changeFinishiDate
()
{
changeFinishiDate
()
{
...
@@ -584,14 +584,14 @@ export default {
...
@@ -584,14 +584,14 @@ export default {
this
.
recovery
.
demandFinishDate
=
""
;
this
.
recovery
.
demandFinishDate
=
""
;
this
.
recovery
.
demandFinishDate
=
this
.
getFormatDateEnd
(
temTime
);
this
.
recovery
.
demandFinishDate
=
this
.
getFormatDateEnd
(
temTime
);
Api
.
orderrecovery
(
this
.
recovery
)
Api
.
orderrecovery
(
this
.
recovery
)
.
then
(
res
=>
{
.
then
(
(
res
)
=>
{
if
(
res
.
success
)
{
if
(
res
.
success
)
{
this
.
$Message
.
success
(
"回收成功"
);
this
.
$Message
.
success
(
"回收成功"
);
this
.
$refs
.
grid
.
reload
(
this
.
easySearch
);
this
.
$refs
.
grid
.
reload
(
this
.
easySearch
);
this
.
recycleModal
=
false
;
this
.
recycleModal
=
false
;
}
}
})
})
.
catch
(
err
=>
{
.
catch
(
(
err
)
=>
{
this
.
$Message
.
error
(
"数据连接错误"
);
this
.
$Message
.
error
(
"数据连接错误"
);
});
});
},
},
...
@@ -599,7 +599,7 @@ export default {
...
@@ -599,7 +599,7 @@ export default {
this
.
mesCode
=
""
;
this
.
mesCode
=
""
;
this
.
recovery
=
{
this
.
recovery
=
{
orderId
:
null
,
orderId
:
null
,
demandFinishDate
:
""
//计划完成时间
demandFinishDate
:
""
,
//计划完成时间
};
};
this
.
recycleModal
=
false
;
this
.
recycleModal
=
false
;
},
},
...
@@ -631,8 +631,8 @@ export default {
...
@@ -631,8 +631,8 @@ export default {
l
(
key
)
{
l
(
key
)
{
let
vkey
=
"mes_order_watch"
+
"."
+
key
;
let
vkey
=
"mes_order_watch"
+
"."
+
key
;
return
this
.
$t
(
vkey
)
||
key
;
return
this
.
$t
(
vkey
)
||
key
;
}
}
,
}
}
,
};
};
</
script
>
</
script
>
<
style
lang=
"less"
>
<
style
lang=
"less"
>
...
...
pages/technology/setProcess/api.js
0 → 100644
View file @
ed0ece29
import
Api
from
'@/plugins/request'
export
default
{
index
:
`
${
PlanUrl
}
/mesorders/getpagedmesordersforpdefm`
,
paged
(
params
)
{
return
Api
.
post
(
`
${
PlanUrl
}
/mesorders/getpagedmesordersforpdefm`
,
params
);
},
index1
:
`
${
technologyUrl
}
routingheader/paged`
,
paged1
(
params
)
{
return
Api
.
post
(
`
${
technologyUrl
}
routingheader/paged`
,
params
);
},
// get(params) {
// return Api.get(`${technologyUrl}routingheader/get`, params);
// },
// create(params) {
// return Api.post(`${technologyUrl}routingheader/create`, params);
// },
// update(params) {
// return Api.put(`${technologyUrl}routingheader/update`, params);
// },
// getCloneHeader(params){
// return Api.post(`${technologyUrl}routingheader/cloneheader`,params);
// },
// getCodeNumber(params){
// return Api.post(`${systemUrl}/cache/generate_serialcode`,params);
// },
// delete(id) {
// return Api.delete(`${technologyUrl}routingheader/delete`, {
// params: {
// id: id
// }
// });
// },
// deletes(params) {
// return Api.post(`${technologyUrl}routingheader/batchdelete`, params);
// }
}
pages/technology/setProcess/index.vue
View file @
ed0ece29
...
@@ -13,8 +13,11 @@
...
@@ -13,8 +13,11 @@
<DataGrid
:columns=
"columns"
ref=
"grid"
:action=
"action"
:conditions=
"easySearch"
>
<DataGrid
:columns=
"columns"
ref=
"grid"
:action=
"action"
:conditions=
"easySearch"
>
<template
slot=
"easySearch"
>
<template
slot=
"easySearch"
>
<Form
ref=
"formInline"
:model=
"easySearch"
inline
>
<Form
ref=
"formInline"
:model=
"easySearch"
inline
>
<FormItem
prop=
"productingpreparationpeople"
style=
"width:200px"
>
<departmentSelect
v-model=
"easySearch.productingpreparationpeople.value"
:type=
"3"
></departmentSelect>
</FormItem>
<FormItem
prop=
"keys"
>
<FormItem
prop=
"keys"
>
<Input
placeholder=
"请输入订单编号/产品名称"
v-model=
"easySearch.keys.value"
/>
<Input
placeholder=
"请输入订单编号/产品名称"
v-model=
"easySearch.keys.value"
clearable
/>
</FormItem>
</FormItem>
<FormItem>
<FormItem>
<Button
type=
"primary"
@
click=
"search"
>
查询
</Button>
<Button
type=
"primary"
@
click=
"search"
>
查询
</Button>
...
@@ -32,9 +35,20 @@
...
@@ -32,9 +35,20 @@
</DataGrid>
</DataGrid>
</Content>
</Content>
</Layout>
</Layout>
<Modal
v-model=
"modal"
:title=
"title"
width=
"1200"
footer-hide
fullscreen
:mask-closable=
"false"
>
<component
:is=
"detail"
:eid=
"curId"
@
on-close=
"cancel"
@
on-ok=
"ok"
/>
</Modal>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
Api
from
"./api"
;
import
ProductTree
from
"@/components/page/productTree.vue"
;
//左侧树列表
import
ProductTree
from
"@/components/page/productTree.vue"
;
//左侧树列表
import
Search
from
"./search"
;
import
Search
from
"./search"
;
export
default
{
export
default
{
...
@@ -44,54 +58,82 @@ export default {
...
@@ -44,54 +58,82 @@ export default {
},
},
data
()
{
data
()
{
return
{
return
{
action
:
""
,
action
:
Api
.
index
,
showMenu
:
true
,
showMenu
:
true
,
showMenu
:
true
,
showMenu
:
true
,
title
:
""
,
curId
:
0
,
detail
:
null
,
modal
:
false
,
easySearch
:
{
easySearch
:
{
keys
:
{
op
:
"mmcode,name"
,
value
:
null
},
keys
:
{
op
:
"mescode,productName"
,
value
:
null
},
levelId
:
{
op
:
"In"
,
value
:
""
},
productingpreparationpeople
:
{
op
:
"Equal"
,
value
:
null
},
upId
:
{
op
:
"In"
,
value
:
0
},
},
},
columns
:
[
columns
:
[
{
type
:
"selection"
,
width
:
70
,
align
:
"center"
},
//
{ type: "selection", width: 70, align: "center" },
{
{
title
:
"序号"
,
title
:
"序号"
,
key
:
"id
"
,
type
:
"index
"
,
width
:
80
,
width
:
80
,
align
:
"center"
,
align
:
"center"
,
},
},
{
{
title
:
"订单编号"
,
title
:
"订单编号"
,
key
:
"mesCode"
,
key
:
"mesCode"
,
align
:
"center"
,
align
:
"center"
,
},
},
{
{
title
:
"任务类型"
,
title
:
"任务类型"
,
key
:
"taskType
Name
"
,
key
:
"taskType"
,
align
:
"center"
,
align
:
"center"
,
code
:
"plan.order.taskType"
,
code
:
"plan.order.taskType"
,
},
},
{
{
title
:
"产品名称"
,
title
:
"产品名称"
,
key
:
"productName"
,
key
:
"productName"
,
align
:
"center"
,
align
:
"center"
,
},
},
{
title
:
"图号"
,
key
:
"drawnNumber"
},
{
title
:
"图号"
,
key
:
"drawnNumber"
},
{
title
:
"项目号"
,
key
:
"projectNumber"
},
{
title
:
"项目号"
,
key
:
"projectNumber"
},
{
title
:
"批次号"
,
key
:
"batchNumber"
},
{
title
:
"批次号"
,
key
:
"batchNumber"
},
{
title
:
"数量"
,
key
:
"quantity"
,
align
:
"center"
},
{
title
:
"数量"
,
key
:
"quantity"
,
align
:
"center"
},
{
{
title
:
"工艺规程"
,
title
:
"工艺规程"
,
key
:
"mainRoutingID"
,
key
:
"mainRoutingStatus"
,
render
:
(
h
,
params
)
=>
{
return
h
(
"div"
,
[
h
(
"state"
,
{
props
:
{
code
:
"process.RoutingStatus"
,
code
:
"process.RoutingStatus"
,
type
:
"text"
,
value
:
params
.
row
.
mainRoutingStatus
!=
4
?
params
.
row
.
mainRoutingStatus
:
""
,
},
}),
h
(
"a"
,
{
on
:
{
click
:
()
=>
{
this
.
record
(
params
.
row
);
},
},
},
params
.
row
.
mainRoutingStatus
==
4
?
"未设置"
:
""
),
],
{}
);
},
},
},
{
{
title
:
"料单"
,
title
:
"料单"
,
key
:
"materialbill
ID
"
,
key
:
"materialbill
Status
"
,
code
:
"process.RoutingStatus"
,
code
:
"process.RoutingStatus"
,
},
},
],
],
...
@@ -101,6 +143,12 @@ export default {
...
@@ -101,6 +143,12 @@ export default {
await
store
.
dispatch
(
"loadDictionary"
);
// 加载数据字典
await
store
.
dispatch
(
"loadDictionary"
);
// 加载数据字典
},
},
methods
:
{
methods
:
{
record
(
row
)
{
this
.
curId
=
0
;
this
.
title
=
"设置"
;
this
.
detail
=
()
=>
import
(
"./set"
);
this
.
modal
=
true
;
},
onHide
()
{
onHide
()
{
this
.
showMenu
=
false
;
this
.
showMenu
=
false
;
},
},
...
@@ -108,13 +156,8 @@ export default {
...
@@ -108,13 +156,8 @@ export default {
this
.
showMenu
=
true
;
this
.
showMenu
=
true
;
},
},
productSearch
(
id
,
item
,
ids
)
{
productSearch
(
id
,
item
,
ids
)
{
if
(
ids
.
length
>
0
)
{
let
where
=
{
productId
:
{
op
:
"In"
,
value
:
ids
}
};
this
.
orderSearchForm
.
productId
=
ids
.
join
(
","
);
this
.
$refs
.
grid
.
reload
(
where
);
}
else
{
this
.
orderSearchForm
.
productId
=
"-1"
;
this
.
orderSearchForm
.
productName
=
""
;
}
this
.
easySearch
(
this
.
orderSearchForm
);
},
},
search
()
{
search
()
{
this
.
$refs
.
grid
.
reload
(
this
.
easySearch
);
this
.
$refs
.
grid
.
reload
(
this
.
easySearch
);
...
@@ -122,6 +165,15 @@ export default {
...
@@ -122,6 +165,15 @@ export default {
search2
()
{
search2
()
{
this
.
$refs
.
grid
.
modalSearch
=
true
;
this
.
$refs
.
grid
.
modalSearch
=
true
;
},
},
ok
()
{
this
.
$refs
.
grid
.
load
();
this
.
modal
=
false
;
this
.
curId
=
0
;
},
cancel
()
{
this
.
curId
=
0
;
this
.
modal
=
false
;
},
},
},
};
};
</
script
>
</
script
>
...
...
pages/technology/setProcess/set.vue
0 → 100644
View file @
ed0ece29
<
template
>
<div
class=
"product-mix"
>
<Layout>
<Sider
hide-trigger
v-if=
"showMenu"
width=
"300"
>
<ProductTree
@
on-hide=
"onHide"
@
on-select=
"productSearch"
/>
</Sider>
<div
v-if=
"!showMenu"
class=
"show_menu"
>
<a
class=
"menu_play fr"
@
click=
"showMenuFn"
title=
"展开"
>
<Icon
type=
"ios-arrow-forward"
size=
"24"
/>
</a>
</div>
<Content
:class=
"!showMenu?'con_bord':''"
>
<DataGrid
:columns=
"columns"
ref=
"grid"
:action=
"action"
:conditions=
"easySearch"
:set=
"false"
>
<template
slot=
"easySearch"
>
<Form
ref=
"formInline"
:model=
"easySearch"
inline
>
<FormItem
prop=
"keys"
>
<Input
placeholder=
"请输入工艺名称/工艺编号"
v-width=
"200"
v-model=
"easySearch.keys.value"
clearable
/>
</FormItem>
<FormItem>
<Button
type=
"primary"
@
click=
"search"
>
查询
</Button>
</FormItem>
</Form>
</
template
>
</DataGrid>
</Content>
</Layout>
</div>
</template>
<
script
>
import
Api
from
"./api"
;
import
ProductTree
from
"@/components/page/productTree.vue"
;
//左侧树列表
export
default
{
components
:
{
ProductTree
,
},
data
()
{
return
{
action
:
Api
.
index1
,
showMenu
:
true
,
showMenu
:
true
,
title
:
""
,
easySearch
:
{
keys
:
{
op
:
"unicode,name,code"
,
value
:
null
},
},
columns
:
[
{
type
:
"selection"
,
width
:
70
,
align
:
"center"
},
{
key
:
"code"
,
title
:
this
.
l
(
"code"
),
align
:
"left"
,
width
:
200
,
easy
:
true
,
high
:
true
,
},
{
key
:
"name"
,
title
:
this
.
l
(
"name"
),
align
:
"left"
,
easy
:
true
,
high
:
true
,
tooltip
:
true
,
},
{
key
:
"phase"
,
title
:
this
.
l
(
"phase"
),
align
:
"center"
,
high
:
true
,
width
:
100
,
code
:
"Process.Routing.phase"
,
},
{
key
:
"versionid"
,
title
:
this
.
l
(
"version"
),
align
:
"center"
,
high
:
true
,
width
:
100
,
code
:
"Process.Routing.version"
,
},
{
title
:
this
.
l
(
"approvalStatus"
),
key
:
"approvalStatus"
,
align
:
"center"
,
width
:
"120"
,
code
:
"process.RoutingStatus"
,
},
{
key
:
"routingType"
,
title
:
this
.
l
(
"routingType"
),
align
:
"center"
,
width
:
100
,
high
:
true
,
code
:
"Process.Routing.routingType"
,
},
{
key
:
"drawingNo"
,
title
:
this
.
l
(
"drawingNo"
),
align
:
"left"
,
high
:
true
,
},
{
key
:
"productName"
,
title
:
this
.
l
(
"productName"
),
align
:
"left"
,
high
:
true
,
tooltip
:
true
,
},
{
key
:
"departmentName"
,
title
:
this
.
l
(
"departmentName"
),
width
:
100
,
align
:
"left"
,
high
:
true
,
tooltip
:
true
,
},
{
key
:
"isEffect"
,
title
:
this
.
l
(
"isEffect"
),
align
:
"center"
,
width
:
80
,
high
:
true
,
code
:
"Process.Status"
,
},
{
key
:
"creationTime"
,
title
:
this
.
$t
(
"creationTime"
),
align
:
"left"
,
hide
:
true
,
},
{
key
:
"creatorUserId"
,
title
:
this
.
$t
(
"creatorUserId"
),
align
:
"left"
,
hide
:
true
,
type
:
"user"
,
},
{
key
:
"lastModificationTime"
,
title
:
this
.
$t
(
"lastModificationTime"
),
align
:
"left"
,
hide
:
true
,
},
{
key
:
"lastModifierUserId"
,
title
:
this
.
$t
(
"lastModifierUserId"
),
align
:
"left"
,
hide
:
true
,
type
:
"user"
,
},
],
};
},
async
fetch
({
store
,
params
})
{
await
store
.
dispatch
(
"loadDictionary"
);
// 加载数据字典
},
methods
:
{
record
(
row
)
{
alert
(
1
);
},
onHide
()
{
this
.
showMenu
=
false
;
},
showMenuFn
()
{
this
.
showMenu
=
true
;
},
productSearch
(
id
,
item
,
ids
)
{
let
where
=
{
productId
:
{
op
:
"In"
,
value
:
ids
}
};
this
.
$refs
.
grid
.
reload
(
where
);
},
search
()
{
this
.
$refs
.
grid
.
reload
(
this
.
easySearch
);
},
l
(
key
)
{
let
vkey
=
"routingHeader"
+
"."
+
key
;
return
this
.
$t
(
vkey
)
||
key
;
},
},
};
</
script
>
<
style
lang=
"less"
>
.product-mix {
font-family: Microsoft YaHei;
padding-top: 3px;
.ivu-layout-sider {
background: rgba(255, 255, 255, 1);
margin-right: 10px;
box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
height: 91vh;
overflow: auto;
}
.ivu-layout-content {
// margin-left: 5px;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
overflow: auto;
padding: 10px;
height: 91vh;
}
}
</
style
>
\ No newline at end of file
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