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
f17feb44
Commit
f17feb44
authored
Oct 30, 2020
by
仇晓婷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单暂停记录
parent
5ff9024a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
5 deletions
+19
-5
index.vue
pages/order/monitoring/index.vue
+3
-3
record.vue
pages/order/monitoring/record.vue
+15
-1
suspend.vue
pages/order/monitoring/suspend.vue
+1
-1
No files found.
pages/order/monitoring/index.vue
View file @
f17feb44
<
template
>
<
template
>
<div
class=
"monitoring h100"
>
<div
class=
"monitoring h100"
>
<DataGrid
:columns=
"columns"
ref=
"grid"
:action=
"action"
>
<DataGrid
:columns=
"columns"
ref=
"grid"
:action=
"action"
:conditions=
"easySearch"
>
<template
slot=
"easySearch"
>
<template
slot=
"easySearch"
>
<Form
ref=
"formInline"
:model=
"easySearch"
inline
style=
"margin-top:5px;"
>
<Form
ref=
"formInline"
:model=
"easySearch"
inline
style=
"margin-top:5px;"
>
<FormItem
prop=
"productingpreparationpeople"
style=
"width:200px"
>
<FormItem
prop=
"productingpreparationpeople"
style=
"width:200px"
>
...
@@ -529,7 +529,7 @@ export default {
...
@@ -529,7 +529,7 @@ export default {
// this.curId = 0
// this.curId = 0
},
},
start
(
row
)
{
start
(
row
)
{
this
.
laster
=
this
.
$store
.
state
.
userInfo
.
login_id
;
this
.
laster
=
this
.
$store
.
state
.
userInfo
.
userId
,
this
.
$Modal
.
confirm
({
this
.
$Modal
.
confirm
({
title
:
"提示"
,
title
:
"提示"
,
content
:
"<p>确定要启动,是否继续?</p>"
,
content
:
"<p>确定要启动,是否继续?</p>"
,
...
@@ -556,7 +556,7 @@ export default {
...
@@ -556,7 +556,7 @@ export default {
this
.
SpeedModal
=
false
;
this
.
SpeedModal
=
false
;
},
},
suspend
(
row
)
{
suspend
(
row
)
{
console
.
log
(
row
);
//
console.log(row);
this
.
suspendModal
=
true
;
this
.
suspendModal
=
true
;
this
.
rowSuspend
=
row
;
this
.
rowSuspend
=
row
;
this
.
$refs
.
addBug
.
getEid
();
this
.
$refs
.
addBug
.
getEid
();
...
...
pages/order/monitoring/record.vue
View file @
f17feb44
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
ref=
"grid"
ref=
"grid"
:action=
"action"
:action=
"action"
:conditions=
"easySearch"
:conditions=
"easySearch"
:format=
"formatFun"
:tool=
"false"
:tool=
"false"
:height=
"tdHeight"
:height=
"tdHeight"
></DataGrid>
></DataGrid>
...
@@ -101,6 +102,7 @@ export default {
...
@@ -101,6 +102,7 @@ export default {
easy
:
true
,
easy
:
true
,
high
:
true
,
high
:
true
,
align
:
"left"
,
align
:
"left"
,
type
:
"user"
,
},
},
{
{
key
:
"laster"
,
key
:
"laster"
,
...
@@ -108,6 +110,7 @@ export default {
...
@@ -108,6 +110,7 @@ export default {
easy
:
true
,
easy
:
true
,
high
:
true
,
high
:
true
,
align
:
"left"
,
align
:
"left"
,
type
:
"user"
,
},
},
{
{
key
:
"lastModificationTime"
,
key
:
"lastModificationTime"
,
...
@@ -189,7 +192,7 @@ export default {
...
@@ -189,7 +192,7 @@ export default {
eid
:
Number
,
eid
:
Number
,
},
},
mounted
()
{
mounted
()
{
this
.
$refs
.
grid
.
reload
(
this
.
easySearch
);
//
this.$refs.grid.reload(this.easySearch);
// if (this.eid) {
// if (this.eid) {
// this.loadList();
// this.loadList();
// }
// }
...
@@ -208,6 +211,17 @@ export default {
...
@@ -208,6 +211,17 @@ export default {
await
store
.
dispatch
(
"loadDictionary"
);
// 加载数据字典
await
store
.
dispatch
(
"loadDictionary"
);
// 加载数据字典
},
},
methods
:
{
methods
:
{
//格式化原始数据
formatFun
(
data
)
{
data
.
map
((
e
)
=>
{
if
(
e
.
laster
)
{
e
.
laster
=
parseInt
(
e
.
laster
);
}
else
if
(
e
.
creator
)
{
e
.
creator
=
parseInt
(
e
.
creator
);
}
});
return
data
;
},
loadList
()
{
loadList
()
{
let
params
=
{
let
params
=
{
FilterText
:
'order_id="'
+
this
.
eid
+
'"'
,
FilterText
:
'order_id="'
+
this
.
eid
+
'"'
,
...
...
pages/order/monitoring/suspend.vue
View file @
f17feb44
...
@@ -98,7 +98,7 @@ export default {
...
@@ -98,7 +98,7 @@ export default {
productName
:
this
.
rowSuspend
.
productName
,
productName
:
this
.
rowSuspend
.
productName
,
drawnNumber
:
this
.
rowSuspend
.
drawnNumber
,
drawnNumber
:
this
.
rowSuspend
.
drawnNumber
,
status
:
5
,
status
:
5
,
creator
:
this
.
$store
.
state
.
userInfo
.
login_i
d
,
creator
:
this
.
$store
.
state
.
userInfo
.
userI
d
,
};
};
Api
.
create
(
data
)
Api
.
create
(
data
)
...
...
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