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
8e16cabf
Commit
8e16cabf
authored
Jun 03, 2020
by
仇晓婷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工单
parent
c796b76e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
21 deletions
+24
-21
entryrecorddata.vue
pages/produce/execute/datafilling/entryrecorddata.vue
+12
-13
index.vue
pages/produce/execute/datafilling/index.vue
+8
-6
index.vue
pages/technology/details/routingqccard/index.vue
+2
-1
index.vue
pages/technology/index.vue
+2
-1
No files found.
pages/produce/execute/datafilling/entryrecorddata.vue
View file @
8e16cabf
...
@@ -108,28 +108,27 @@ export default {
...
@@ -108,28 +108,27 @@ export default {
loadpage
(
params
,
fill_in_user_type
,
product_code
,
board_code
,
isedit
)
{
loadpage
(
params
,
fill_in_user_type
,
product_code
,
board_code
,
isedit
)
{
this
.
isedit
=
isedit
;
this
.
isedit
=
isedit
;
(
this
.
datafrom
.
dispatch_id
=
params
.
dispatch_id
),
this
.
datafrom
.
dispatch_id
=
params
.
dispatch_id
;
(
this
.
datafrom
.
execute_id
=
params
.
execute_id
),
this
.
datafrom
.
execute_id
=
params
.
execute_id
;
(
this
.
datafrom
.
order_id
=
params
.
order_id
),
this
.
datafrom
.
order_id
=
params
.
order_id
;
(
this
.
datafrom
.
qc_card_id
=
params
.
qc_card_id
),
this
.
datafrom
.
qc_card_id
=
params
.
qc_card_id
;
(
this
.
datafrom
.
fill_in_user_type
=
fill_in_user_type
),
this
.
datafrom
.
fill_in_user_type
=
fill_in_user_type
;
(
this
.
datafrom
.
data_type
=
4
)
;
this
.
datafrom
.
data_type
=
4
;
this
.
ids
=
[];
this
.
ids
=
[];
console
.
log
(
params
);
if
(
if
(
fill_in_user_type
==
1
&&
fill_in_user_type
==
1
&&
//自检
params
.
selfchecklist
!=
null
&&
params
.
selfchecklist
!=
null
&&
params
.
selfchecklist
.
fill_in_content
!=
null
&&
params
.
selfchecklist
.
fill_in_content
!=
null
&&
params
.
selfchecklist
.
fill_in_content
!=
""
params
.
selfchecklist
.
fill_in_content
!=
""
)
{
)
{
this
.
ids
=
params
.
selfchecklist
.
fill_in_content
.
split
(
","
);
this
.
ids
=
params
.
selfchecklist
.
fill_in_content
.
split
(
","
);
this
.
datafrom
.
record_id
=
this
.
datafrom
.
record_id
=
params
.
selfchecklist
.
record_id
==
null
params
.
selfchecklist
.
record_id
==
null
?
0
?
0
:
params
.
selfchecklist
.
record_id
;
:
params
.
selfchecklist
.
record_id
;
}
else
if
(
}
else
if
(
fill_in_user_type
==
2
&&
fill_in_user_type
==
2
&&
//互检
params
.
mutualchecklist
!=
null
&&
params
.
mutualchecklist
!=
null
&&
params
.
mutualchecklist
.
fill_in_content
!=
null
&&
params
.
mutualchecklist
.
fill_in_content
!=
null
&&
params
.
mutualchecklist
.
fill_in_content
!=
""
params
.
mutualchecklist
.
fill_in_content
!=
""
...
@@ -140,7 +139,7 @@ export default {
...
@@ -140,7 +139,7 @@ export default {
?
0
?
0
:
params
.
mutualchecklist
.
record_id
;
:
params
.
mutualchecklist
.
record_id
;
}
else
if
(
}
else
if
(
fill_in_user_type
==
3
&&
fill_in_user_type
==
3
&&
//专检
params
.
seizurechecklist
!=
null
&&
params
.
seizurechecklist
!=
null
&&
params
.
seizurechecklist
.
fill_in_content
!=
null
&&
params
.
seizurechecklist
.
fill_in_content
!=
null
&&
params
.
seizurechecklist
.
fill_in_content
!=
""
params
.
seizurechecklist
.
fill_in_content
!=
""
...
@@ -154,7 +153,7 @@ export default {
...
@@ -154,7 +153,7 @@ export default {
this
.
datafrom
.
product_code
=
product_code
.
join
(
","
);
this
.
datafrom
.
product_code
=
product_code
.
join
(
","
);
// this.datafrom.board_code = board_code
// this.datafrom.board_code = board_code
alert
(
2
)
this
.
loaddata
();
this
.
loaddata
();
},
},
loaddata
()
{
loaddata
()
{
...
...
pages/produce/execute/datafilling/index.vue
View file @
8e16cabf
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
v-model=
"row.selfchecklist.fill_in_content"
v-model=
"row.selfchecklist.fill_in_content"
v-else-if=
"row.fillintype == 2"
v-else-if=
"row.fillintype == 2"
placeholder=
"请输入..."
placeholder=
"请输入..."
@
on-blur=
"selfchecklistinput(index,
$ev
ent)"
@
on-blur=
"selfchecklistinput(index,
row.selfchecklist.fill_in_cont
ent)"
></Input>
></Input>
<template
v-else
>
<template
v-else
>
<op
<op
...
@@ -89,7 +89,7 @@
...
@@ -89,7 +89,7 @@
v-model=
"row.mutualchecklist.fill_in_content"
v-model=
"row.mutualchecklist.fill_in_content"
v-else-if=
"row.fillintype == 2"
v-else-if=
"row.fillintype == 2"
placeholder=
"请输入..."
placeholder=
"请输入..."
@
on-blur=
"mutualchecklistinput(index,
$ev
ent)"
@
on-blur=
"mutualchecklistinput(index,
row.mutualchecklist.fill_in_cont
ent)"
></Input>
></Input>
<template
v-else
>
<template
v-else
>
<op
<op
...
@@ -531,7 +531,7 @@ export default {
...
@@ -531,7 +531,7 @@ export default {
},
},
handleselfCheckAll
()
{
handleselfCheckAll
()
{
this
.
isselfCheckAll
=
!
this
.
isselfCheckAll
;
this
.
isselfCheckAll
=
!
this
.
isselfCheckAll
;
console
.
log
(
this
.
recorddata
)
for
(
let
i
=
0
;
i
<
this
.
recorddata
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
this
.
recorddata
.
length
;
i
++
)
{
let
obj
=
this
.
recorddata
[
i
];
let
obj
=
this
.
recorddata
[
i
];
if
(
obj
.
fillintype
==
1
)
{
if
(
obj
.
fillintype
==
1
)
{
...
@@ -650,11 +650,13 @@ export default {
...
@@ -650,11 +650,13 @@ export default {
this
.
$refs
.
usercard
.
loadentry
(
this
.
entryModel
,
fillModel
,
recordList
);
this
.
$refs
.
usercard
.
loadentry
(
this
.
entryModel
,
fillModel
,
recordList
);
},
},
selfchecklistcheck
(
index
,
e
)
{
selfchecklistcheck
(
index
,
e
)
{
alert
(
e
)
this
.
recorddata
[
index
].
selfchecklist
.
checkstatus
=
e
;
this
.
recorddata
[
index
].
selfchecklist
.
checkstatus
=
e
;
this
.
recorddata
[
index
].
selfchecklist
.
fill_in_content
=
e
?
"1"
:
"0"
;
this
.
recorddata
[
index
].
selfchecklist
.
fill_in_content
=
e
?
"1"
:
"0"
;
},
},
selfchecklistinput
(
index
,
e
)
{
selfchecklistinput
(
index
,
e
)
{
this
.
recorddata
[
index
].
selfchecklist
.
fill_in_content
=
e
.
target
.
value
;
this
.
recorddata
[
index
].
selfchecklist
.
fill_in_content
=
e
},
},
mutualchecklistcheck
(
index
,
e
)
{
mutualchecklistcheck
(
index
,
e
)
{
...
@@ -662,7 +664,7 @@ export default {
...
@@ -662,7 +664,7 @@ export default {
this
.
recorddata
[
index
].
mutualchecklist
.
fill_in_content
=
e
?
"1"
:
"0"
;
this
.
recorddata
[
index
].
mutualchecklist
.
fill_in_content
=
e
?
"1"
:
"0"
;
},
},
mutualchecklistinput
(
index
,
e
)
{
mutualchecklistinput
(
index
,
e
)
{
this
.
recorddata
[
index
].
mutualchecklist
.
fill_in_content
=
e
.
target
.
value
;
this
.
recorddata
[
index
].
mutualchecklist
.
fill_in_content
=
e
},
},
seizurechecklistcheck
(
index
,
e
)
{
seizurechecklistcheck
(
index
,
e
)
{
this
.
recorddata
[
index
].
seizurechecklist
.
checkstatus
=
e
;
this
.
recorddata
[
index
].
seizurechecklist
.
checkstatus
=
e
;
...
@@ -676,7 +678,7 @@ export default {
...
@@ -676,7 +678,7 @@ export default {
this
.
$refs
.
sendCheck
.
loadentry
(
this
.
entryModel
);
this
.
$refs
.
sendCheck
.
loadentry
(
this
.
entryModel
);
},
},
selfchecklistinput
()
{},
SendCheckRecord
()
{
SendCheckRecord
()
{
this
.
sendCheckRecordModal
=
true
;
this
.
sendCheckRecordModal
=
true
;
...
...
pages/technology/details/routingqccard/index.vue
View file @
8e16cabf
...
@@ -200,7 +200,8 @@ export default {
...
@@ -200,7 +200,8 @@ export default {
attrs
:
{
oprate
:
"edit"
},
attrs
:
{
oprate
:
"edit"
},
on
:
{
click
:
()
=>
this
.
edit
(
params
.
row
.
id
)
}
on
:
{
click
:
()
=>
this
.
edit
(
params
.
row
.
id
)
}
},
},
this
.
headerStatus
==
4
||
this
.
headerStatus
==
0
?
"编辑"
:
""
'编辑'
// this.headerStatus == 4||this.headerStatus == 0 ? "编辑" : ""
),
),
h
(
h
(
"op"
,
"op"
,
...
...
pages/technology/index.vue
View file @
8e16cabf
...
@@ -309,7 +309,8 @@ export default {
...
@@ -309,7 +309,8 @@ export default {
attrs
:
{
oprate
:
"edit"
},
attrs
:
{
oprate
:
"edit"
},
on
:
{
click
:
()
=>
this
.
edit
(
params
.
row
)
}
on
:
{
click
:
()
=>
this
.
edit
(
params
.
row
)
}
},
},
params
.
row
.
approvalStatus
==
4
||
params
.
row
.
approvalStatus
==
0
?
"编辑"
:
""
'编辑'
// params.row.approvalStatus == 4||params.row.approvalStatus == 0 ? "编辑" : ""
),
),
h
(
h
(
"op"
,
"op"
,
...
...
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