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
3862d11c
Commit
3862d11c
authored
Apr 03, 2020
by
renjintao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
important_flag
parent
7d5ece4c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
14 deletions
+14
-14
zh-CN.js
i18n/locale/zh-CN.js
+1
-0
excute.vue
pages/aps/aps/components/excute.vue
+13
-14
No files found.
i18n/locale/zh-CN.js
View file @
3862d11c
...
...
@@ -1043,6 +1043,7 @@ export default {
multi_machine
:
'多台分配'
,
notes
:
'备注'
,
insert_flag
:
'插单'
,
important_flag
:
"插单"
,
outside_time
:
'外协时间'
,
discrete_percent
:
'离散百分比%'
,
taskseq_des
:
''
,
...
...
pages/aps/aps/components/excute.vue
View file @
3862d11c
...
...
@@ -57,8 +57,8 @@ export default {
{
key
:
"id"
,
title
:
this
.
l
(
"id"
),
hide
:
true
,
align
:
"left"
},
{
title
:
" "
,
width
:
130
},
{
key
:
"i
nsert_flag"
,
title
:
this
.
l
(
"i
nser
t_flag"
),
key
:
"i
mportant_flag"
,
//insert_flag?
title
:
this
.
l
(
"i
mportan
t_flag"
),
align
:
"center"
,
high
:
true
,
width
:
60
,
...
...
@@ -68,7 +68,7 @@ export default {
{
props
:
{
content
:
params
.
row
.
i
nser
t_flag
==
1
?
"取消插单"
:
"进行插单"
,
params
.
row
.
i
mportan
t_flag
==
1
?
"取消插单"
:
"进行插单"
,
placement
:
"top"
},
class
:
"ico"
...
...
@@ -77,11 +77,11 @@ export default {
h
(
"Icon"
,
{
attrs
:
{
type
:
params
.
row
.
i
nser
t_flag
==
1
params
.
row
.
i
mportan
t_flag
==
1
?
"ios-flag"
:
"ios-flag-outline"
,
size
:
20
,
color
:
params
.
row
.
i
nser
t_flag
==
1
?
"#2680EB"
:
"#aaa"
color
:
params
.
row
.
i
mportan
t_flag
==
1
?
"#2680EB"
:
"#aaa"
},
on
:
{
click
:
()
=>
this
.
changeFlag
(
params
.
row
.
id
,
params
.
index
)
...
...
@@ -198,16 +198,16 @@ export default {
hide
:
true
},
{
key
:
"
first_equip
"
,
title
:
this
.
l
(
"
first_equip
"
),
key
:
"
equip_type
"
,
title
:
this
.
l
(
"
equip_type
"
),
align
:
"left"
,
easy
:
true
,
high
:
true
,
hide
:
true
},
{
key
:
"
equip_type
"
,
title
:
this
.
l
(
"
equip_type
"
),
key
:
"
first_equip
"
,
title
:
this
.
l
(
"
first_equip
"
),
align
:
"left"
,
easy
:
true
,
high
:
true
,
...
...
@@ -384,7 +384,7 @@ export default {
//插单事件start----
changeFlag
(
id
,
index
)
{
this
.
rowIndex
=
index
;
if
(
this
.
data1
[
this
.
rowIndex
].
i
nser
t_flag
==
1
)
{
if
(
this
.
data1
[
this
.
rowIndex
].
i
mportan
t_flag
==
1
)
{
this
.
insertTItle
=
"取消插单"
;
}
else
{
this
.
insertTItle
=
"插单"
;
...
...
@@ -393,13 +393,12 @@ export default {
},
insertOk
()
{
//this.loadData(this.row)
if
(
this
.
data1
[
this
.
rowIndex
].
i
nser
t_flag
==
1
)
{
if
(
this
.
data1
[
this
.
rowIndex
].
i
mportan
t_flag
==
1
)
{
//根据插单数据状态进行插单或取消插单操作
this
.
data1
[
this
.
rowIndex
].
i
nser
t_flag
=
0
;
this
.
data1
[
this
.
rowIndex
].
i
mportan
t_flag
=
0
;
}
else
{
this
.
data1
[
this
.
rowIndex
].
i
nser
t_flag
=
1
;
this
.
data1
[
this
.
rowIndex
].
i
mportan
t_flag
=
1
;
}
this
.
setParsModal
=
false
;
this
.
detailModal
=
false
;
this
.
editModal
=
false
;
...
...
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