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
9f471fef
Commit
9f471fef
authored
Jun 19, 2020
by
周远喜
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'product' of
http://git.mes123.com/zhouyx/mes-ui
into product
parents
6b56d4c6
985840cc
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
35 additions
and
7 deletions
+35
-7
entryrecordfiles.vue
pages/implement/components/entryrecordfiles.vue
+16
-1
check.vue
pages/produce/execute/datafilling/check.vue
+1
-0
entryrecordfiles.vue
pages/produce/execute/datafilling/entryrecordfiles.vue
+16
-1
index.vue
pages/produce/execute/datafilling/index.vue
+1
-0
sendCheckRecord.vue
pages/produce/execute/datafilling/sendCheckRecord.vue
+1
-5
No files found.
pages/implement/components/entryrecordfiles.vue
View file @
9f471fef
...
...
@@ -70,7 +70,22 @@ export default {
render
:
(
h
,
params
)
=>
{
let
id
=
params
.
row
.
id
if
(
!
this
.
isedit
)
{
return
h
(
'div'
,
''
)
return
h
(
'A'
,
{
attrs
:
{
href
:
fileUrlDown
+
params
.
row
.
data_content2
,
target
:
'_blank'
},
props
:
{},
style
:
{
color
:
'#249E91'
,
marginRight
:
'5px'
,
cursor
:
'pointer'
}
},
'查看'
)
}
else
{
return
h
(
'div'
,
...
...
pages/produce/execute/datafilling/check.vue
View file @
9f471fef
...
...
@@ -214,6 +214,7 @@ export default {
ishavzj
:
true
,
board_ID
:
""
,
board_List
:
[],
productobj
:{
productstatus
:
-
1
},
usercardModal
:
false
,
sendCheckModal
:
false
,
entryrecorddataModal
:
false
,
...
...
pages/produce/execute/datafilling/entryrecordfiles.vue
View file @
9f471fef
...
...
@@ -70,7 +70,22 @@ export default {
render
:
(
h
,
params
)
=>
{
let
id
=
params
.
row
.
id
if
(
!
this
.
isedit
)
{
return
h
(
'div'
,
''
)
return
h
(
'A'
,
{
attrs
:
{
href
:
fileUrlDown
+
params
.
row
.
data_content2
,
target
:
'_blank'
},
props
:
{},
style
:
{
color
:
'#249E91'
,
marginRight
:
'5px'
,
cursor
:
'pointer'
}
},
'查看'
)
}
else
{
return
h
(
'div'
,
...
...
pages/produce/execute/datafilling/index.vue
View file @
9f471fef
...
...
@@ -246,6 +246,7 @@ export default {
ishavzj
:
true
,
board_ID
:
""
,
board_List
:
[],
productobj
:{
productstatus
:
-
1
},
usercardModal
:
false
,
sendCheckModal
:
false
,
entryrecorddataModal
:
false
,
...
...
pages/produce/execute/datafilling/sendCheckRecord.vue
View file @
9f471fef
...
...
@@ -42,11 +42,7 @@ export default {
width
:
'100'
,
key
:
'product_code'
},
{
title
:
'板号'
,
width
:
'100'
,
key
:
'board_code'
},
{
title
:
'送检检验员'
,
width
:
'150'
,
...
...
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