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
c796b76e
Commit
c796b76e
authored
Jun 02, 2020
by
仇晓婷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工单执行
parent
3349e51b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
1002 additions
and
192 deletions
+1002
-192
entryrecordMovie.vue
pages/produce/execute/datafilling/entryrecordMovie.vue
+266
-0
entryrecorddata.vue
pages/produce/execute/datafilling/entryrecorddata.vue
+129
-131
entryrecordfiles.vue
pages/produce/execute/datafilling/entryrecordfiles.vue
+282
-0
index.vue
pages/produce/execute/datafilling/index.vue
+192
-56
sendCheckRecord.vue
pages/produce/execute/datafilling/sendCheckRecord.vue
+127
-0
usercard.vue
pages/produce/execute/datafilling/usercard.vue
+6
-5
No files found.
pages/produce/execute/datafilling/entryrecordMovie.vue
0 → 100644
View file @
c796b76e
<
template
>
<div
class=
"new_box"
style=
"overflow: hidden;"
>
<div
v-if=
"isedit"
class=
"photo"
>
<imgUploadFile
class=
"tphoto"
ref=
"refmovieFile1"
v-model=
"imgName"
:parms=
"entryMovieparms"
files
@
on-change=
"ok"
/>
</div>
<div
class=
"table"
>
<Table
stripe
ref=
"table"
border
:columns=
"moviecolumn"
:data=
"moviedata"
class=
"tableCommon"
></Table>
</div>
</div>
</
template
>
<
script
>
import
service
from
'@/plugins/request'
import
QS
from
'querystring'
export
default
{
name
:
'entryrecordMovie'
,
components
:
{},
data
()
{
return
{
datasearch
:
{
ids
:
0
,
MaxResultCount
:
10
,
SkipCount
:
0
},
entryMovieparms
:
'app=orderexecutequalitydataPhoto&eid=1&name=orderexecutequalitydataPhoto'
,
imgName
:
''
,
photoStyle
:
null
,
//传照片box样式
newModel
:
false
,
isedit
:
true
,
ids
:
[],
datafrom
:
{
id
:
0
,
record_id
:
0
,
dispatch_id
:
0
,
execute_id
:
0
,
order_id
:
''
,
qc_card_id
:
0
,
fill_in_user_type
:
0
,
movie_type
:
0
,
movie_name
:
''
,
movie_path
:
''
,
data_desc
:
''
},
moviedata
:
[],
moviecolumn
:
[
// { title: '', key: 'organizType1', type: 'expand',width:'60'},
{
title
:
'序号'
,
type
:
'index'
,
width
:
'100'
,
align
:
'center'
},
{
title
:
'名称'
,
key
:
'movie_name'
},
{
title
:
'操作'
,
key
:
'id'
,
align
:
'center'
,
render
:
(
h
,
params
)
=>
{
let
id
=
params
.
row
.
id
if
(
!
this
.
isedit
)
{
h
(
'div'
,
{
class
:
'icon_box'
},
[
h
(
'A'
,
{
attrs
:
{
href
:
fileUrlDown
+
params
.
row
.
movie_path
,
target
:
'_blank'
},
props
:
{},
style
:
{
color
:
'#249E91'
,
marginRight
:
'5px'
,
cursor
:
'pointer'
}
},
'查看'
)
]
)
}
return
h
(
'div'
,
{
class
:
'icon_box'
},
[
h
(
'A'
,
{
attrs
:
{
href
:
fileUrlDown
+
params
.
row
.
movie_path
,
target
:
'_blank'
},
props
:
{},
style
:
{
color
:
'#249E91'
,
marginRight
:
'5px'
,
cursor
:
'pointer'
}
},
'查看'
),
h
(
'span'
,
{
class
:
'del_icon'
,
attrs
:
{
title
:
'删除'
},
on
:
{
click
:
()
=>
{
this
.
deleteFun
(
params
)
}
}
},
'删除'
)
]
)
}
}
]
}
},
mounted
()
{},
watch
:
{
imgName
(
newName
,
oldName
)
{
if
(
newName
!=
''
)
{
let
obj
=
JSON
.
parse
(
newName
)
}
}
},
methods
:
{
loadpage
(
params
,
product_code
,
board_code
,
isedit
)
{
this
.
isedit
=
isedit
;(
this
.
datafrom
.
dispatch_id
=
params
.
dispatch_id
),
(
this
.
datafrom
.
execute_id
=
params
.
execute_id
),
(
this
.
datafrom
.
order_id
=
params
.
order_id
),
(
this
.
datafrom
.
qc_card_id
=
params
.
qc_card_id
),
(
this
.
datafrom
.
data_type
=
1
)
if
(
params
.
movieid
!=
''
)
{
this
.
ids
=
params
.
movieid
.
split
(
','
)
}
this
.
datafrom
.
product_code
=
product_code
this
.
datafrom
.
board_code
=
board_code
this
.
loaddata
()
},
loaddata
()
{
this
.
datasearch
.
ids
=
this
.
ids
.
join
(
','
)
var
url
=
`
${
PlanUrl
}
/orderexecutequalitymovie/getlist?`
+
QS
.
stringify
(
this
.
datasearch
)
service
.
get
(
`
${
url
}
`
).
then
((
response
)
=>
{
if
(
response
.
result
!=
null
)
{
this
.
moviedata
=
response
.
result
}
})
},
ok
(
files
)
{
if
(
files
==
''
)
{
return
}
let
obj
=
JSON
.
parse
(
files
)
this
.
datafrom
.
movie_name
=
obj
[
0
].
fileName
this
.
datafrom
.
movie_path
=
obj
[
0
].
filePath
var
url
=
`
${
PlanUrl
}
/orderexecutequalitymovie/createorupdate`
service
.
post
(
`
${
url
}
`
,
{
orderExecuteQualityMovie
:
this
.
datafrom
}
)
.
then
((
response
)
=>
{
if
(
response
.
success
)
{
this
.
$Message
.
success
(
'保存成功'
)
this
.
ids
.
push
(
response
.
result
.
id
)
this
.
moviedata
.
push
(
response
.
result
)
this
.
cleardata
()
this
.
$emit
(
'bindPhotoid'
,
this
.
datafrom
.
qc_card_id
,
this
.
ids
.
join
(
','
)
)
//this.loaddata()
}
})
.
catch
((
error
)
=>
{
this
.
$Message
.
error
(
'保存失败'
)
})
},
cancel
()
{
this
.
cleardata
()
},
cleardata
()
{
this
.
datafrom
.
id
=
0
this
.
datafrom
.
movie_name
=
''
this
.
datafrom
.
movie_path
=
''
},
editFun
(
params
)
{
this
.
datafrom
=
params
.
row
this
.
newModel
=
true
},
deleteFun
(
params
)
{
let
id
=
params
.
row
.
id
this
.
$Modal
.
confirm
({
title
:
'提示'
,
content
:
'确定要删除当前行?'
,
onOk
:
()
=>
{
var
url
=
`
${
PlanUrl
}
/orderexecutequalitymovie/delete?id=`
+
params
.
row
.
id
+
'&record_id='
+
params
.
row
.
record_id
service
.
delete
(
`
${
url
}
`
)
.
then
((
response
)
=>
{
if
(
response
.
success
)
{
this
.
$Message
.
success
(
'删除成功'
)
this
.
ids
.
splice
(
this
.
ids
.
indexOf
(
params
.
row
.
id
),
1
)
this
.
moviedata
.
splice
(
this
.
moviedata
.
indexOf
(
params
.
row
),
1
)
// this.loaddata()
this
.
$emit
(
'bindPhotoid'
,
this
.
datafrom
.
qc_card_id
,
this
.
ids
.
join
(
','
)
)
}
else
{
this
.
$Message
.
error
(
'删除失败'
)
}
})
.
catch
((
error
)
=>
{
this
.
$Message
.
error
(
'删除失败'
)
})
},
onCancel
:
()
=>
{}
})
}
}
}
</
script
>
\ No newline at end of file
pages/produce/execute/datafilling/entryrecorddata.vue
View file @
c796b76e
This diff is collapsed.
Click to expand it.
pages/produce/execute/datafilling/entryrecordfiles.vue
0 → 100644
View file @
c796b76e
<
template
>
<div
class=
"new_box"
>
<div
v-if=
"isedit"
>
<inputFile
class=
"tphoto"
ref=
"refmovieFile1"
v-model=
"imgName"
:parms=
"entryMovieparms"
files
@
on-change=
"ok"
/>
</div>
<div
>
<Table
stripe
ref=
"table"
border
:columns=
"moviecolumn"
:data=
"moviedata"
class=
"tableCommon"
></Table>
</div>
</div>
</
template
>
<
script
>
import
service
from
'@/plugins/request'
import
QS
from
'querystring'
export
default
{
name
:
'entryrecordfiles'
,
components
:
{},
data
()
{
return
{
datasearch
:
{
ids
:
0
,
MaxResultCount
:
10
,
SkipCount
:
0
},
entryMovieparms
:
'app=orderexecutequalitydatafile&eid=1&name=orderexecutequalitydatafile'
,
imgName
:
''
,
photoStyle
:
null
,
//传照片box样式
newModel
:
false
,
ids
:
[],
isedit
:
false
,
datafrom
:
{
id
:
0
,
record_id
:
0
,
dispatch_id
:
0
,
execute_id
:
0
,
order_id
:
''
,
qc_card_id
:
0
,
fill_in_user_type
:
0
,
data_type
:
3
,
data_content1
:
''
,
data_content2
:
''
,
data_content3
:
''
,
data_content4
:
''
,
product_code
:
''
,
board_code
:
''
},
moviedata
:
[],
moviecolumn
:
[
// { title: '', key: 'organizType1', type: 'expand',width:'60'},
{
title
:
'序号'
,
type
:
'index'
,
width
:
'100'
,
align
:
'center'
},
{
title
:
'名称'
,
key
:
'data_content1'
},
{
title
:
'操作'
,
key
:
'id'
,
align
:
'center'
,
render
:
(
h
,
params
)
=>
{
let
id
=
params
.
row
.
id
if
(
!
this
.
isedit
)
{
return
h
(
'div'
,
''
)
}
else
{
return
h
(
'div'
,
{
class
:
'icon_box'
},
[
h
(
'A'
,
{
attrs
:
{
href
:
fileUrlDown
+
params
.
row
.
data_content2
,
target
:
'_blank'
},
props
:
{},
style
:
{
color
:
'#249E91'
,
marginRight
:
'5px'
,
cursor
:
'pointer'
}
},
'查看'
),
h
(
'span'
,
{
class
:
'del_icon'
,
attrs
:
{
title
:
'删除'
},
on
:
{
click
:
()
=>
{
this
.
deleteFun
(
params
)
}
}
},
'删除'
)
]
)
}
}
}
]
}
},
mounted
()
{},
watch
:
{
imgName
(
newName
,
oldName
)
{
if
(
newName
!=
''
)
{
let
obj
=
JSON
.
parse
(
newName
)
}
}
},
methods
:
{
loadpage
(
params
,
fill_in_user_type
,
product_code
,
board_code
,
isedit
)
{
this
.
isedit
=
isedit
;
;(
this
.
datafrom
.
dispatch_id
=
params
.
dispatch_id
),
(
this
.
datafrom
.
execute_id
=
params
.
execute_id
),
(
this
.
datafrom
.
order_id
=
params
.
order_id
),
(
this
.
datafrom
.
qc_card_id
=
params
.
qc_card_id
),
(
this
.
datafrom
.
fill_in_user_type
=
fill_in_user_type
),
(
this
.
datafrom
.
data_type
=
3
)
this
.
ids
=
[]
if
(
fill_in_user_type
==
1
&&
params
.
selfchecklist
!=
null
&&
params
.
selfchecklist
.
fill_in_content
!=
null
&&
params
.
selfchecklist
.
fill_in_content
!=
''
)
{
this
.
ids
=
params
.
selfchecklist
.
fill_in_content
.
split
(
','
)
this
.
datafrom
.
record_id
=
params
.
selfchecklist
.
record_id
==
null
?
0
:
params
.
selfchecklist
.
record_id
}
else
if
(
fill_in_user_type
==
2
&&
params
.
mutualchecklist
!=
null
&&
params
.
mutualchecklist
.
fill_in_content
!=
null
&&
params
.
mutualchecklist
.
fill_in_content
!=
''
)
{
this
.
ids
=
params
.
mutualchecklist
.
fill_in_content
.
split
(
','
)
this
.
datafrom
.
record_id
=
params
.
mutualchecklist
.
record_id
==
null
?
0
:
params
.
mutualchecklist
.
record_id
}
else
if
(
fill_in_user_type
==
3
&&
params
.
seizurechecklist
!=
null
&&
params
.
seizurechecklist
.
fill_in_content
!=
null
&&
params
.
seizurechecklist
.
fill_in_content
!=
''
)
{
this
.
ids
=
params
.
seizurechecklist
.
fill_in_content
.
split
(
','
)
this
.
datafrom
.
record_id
=
params
.
seizurechecklist
.
record_id
==
null
?
0
:
params
.
seizurechecklist
.
record_id
}
this
.
datafrom
.
product_code
=
product_code
this
.
datafrom
.
board_code
=
board_code
this
.
loaddata
()
},
loaddata
()
{
this
.
datasearch
.
ids
=
this
.
ids
.
join
(
','
)
this
.
moviedata
=
[]
var
url
=
`
${
PlanUrl
}
/orderexecutequalitydata/getlist?`
+
QS
.
stringify
(
this
.
datasearch
)
service
.
get
(
`
${
url
}
`
).
then
((
response
)
=>
{
if
(
response
.
result
!=
null
)
{
this
.
moviedata
=
response
.
result
}
})
},
ok
(
files
)
{
if
(
files
==
''
)
{
return
}
let
obj
=
JSON
.
parse
(
files
)
this
.
datafrom
.
data_content1
=
obj
[
0
].
fileName
this
.
datafrom
.
data_content2
=
obj
[
0
].
filePath
var
url
=
`
${
PlanUrl
}
/orderexecutequalitydata/createorupdate`
service
.
post
(
`
${
url
}
`
,
{
OrderExecuteQualityData
:
this
.
datafrom
}
)
.
then
((
response
)
=>
{
if
(
response
.
success
)
{
this
.
$Message
.
success
(
'保存成功'
)
this
.
ids
.
push
(
response
.
result
.
id
)
this
.
moviedata
.
push
(
response
.
result
)
this
.
cleardata
()
this
.
$emit
(
'binddataid'
,
this
.
datafrom
.
qc_card_id
,
this
.
datafrom
.
fill_in_user_type
,
this
.
ids
.
join
(
','
)
)
//this.loaddata()
}
})
.
catch
((
error
)
=>
{
this
.
$Message
.
error
(
'保存失败'
)
})
},
cancel
()
{
this
.
cleardata
()
},
cleardata
()
{
this
.
datafrom
.
id
=
0
this
.
datafrom
.
data_content1
=
''
this
.
datafrom
.
data_content2
=
''
},
editFun
(
params
)
{
this
.
datafrom
=
params
.
row
this
.
newModel
=
true
},
deleteFun
(
params
)
{
let
id
=
params
.
row
.
id
this
.
$Modal
.
confirm
({
title
:
'提示'
,
content
:
'确定要删除当前行?'
,
onOk
:
()
=>
{
var
url
=
`
${
PlanUrl
}
/orderexecutequalitydata/delete?id=`
+
params
.
row
.
id
+
'&record_id='
+
params
.
row
.
record_id
service
.
delete
(
`
${
url
}
`
)
.
then
((
response
)
=>
{
if
(
response
.
success
)
{
this
.
$Message
.
success
(
'删除成功'
)
this
.
ids
.
splice
(
this
.
ids
.
indexOf
(
params
.
row
.
id
),
1
)
this
.
moviedata
.
splice
(
this
.
moviedata
.
indexOf
(
params
.
row
),
1
)
// this.loaddata()
this
.
$emit
(
'binddataid'
,
this
.
datafrom
.
qc_card_id
,
this
.
datafrom
.
fill_in_user_type
,
this
.
ids
.
join
(
','
)
)
}
else
{
this
.
$Message
.
error
(
'删除失败'
)
}
})
.
catch
((
error
)
=>
{
this
.
$Message
.
error
(
'删除失败'
)
})
},
onCancel
:
()
=>
{}
})
}
}
}
</
script
>
\ No newline at end of file
pages/produce/execute/datafilling/index.vue
View file @
c796b76e
This diff is collapsed.
Click to expand it.
pages/produce/execute/datafilling/sendCheckRecord.vue
0 → 100644
View file @
c796b76e
<
template
>
<div
class=
"new_box"
>
<Table
stripe
ref=
"table"
border
:columns=
"moviecolumn"
:data=
"moviedata"
class=
"tableCommon"
></Table>
<Page
:total=
"datatotal"
:current=
"pageindex"
:page-size=
"pagesize"
@
on-change=
"onPageChanged"
@
on-page-size-change=
"onPagesizeChanged"
show-sizer
class=
"pt10 pl10"
show-elevator
show-total
/>
</div>
</
template
>
<
script
>
import
service
from
'@/plugins/request'
import
QS
from
'querystring'
export
default
{
name
:
'sendCheckRecord'
,
components
:
{},
data
()
{
return
{
pageindex
:
1
,
pagesize
:
10
,
datatotal
:
0
,
datasearch
:
{
dispatch_id
:
0
,
MaxResultCount
:
10
,
SkipCount
:
0
},
moviedata
:
[],
moviecolumn
:
[
// { title: '', key: 'organizType1', type: 'expand',width:'60'},
{
title
:
'序号'
,
type
:
'index'
,
width
:
'100'
,
align
:
'center'
},
{
title
:
'产品号'
,
width
:
'100'
,
key
:
'product_code'
},
{
title
:
'板号'
,
width
:
'100'
,
key
:
'board_code'
},
{
title
:
'送检检验员'
,
width
:
'150'
,
key
:
'checkerNames'
},
{
title
:
'送检时间'
,
width
:
'180'
,
key
:
'creationTime'
},
{
title
:
'状态'
,
key
:
'check_Status'
,
align
:
'center'
,
width
:
'120'
,
render
:
(
h
,
params
)
=>
{
let
desc
=
''
if
(
params
.
row
.
check_Status
==
1
)
{
desc
=
'待检验'
}
else
if
(
params
.
row
.
check_Status
==
2
)
{
desc
=
'检验成功'
}
else
if
(
params
.
row
.
check_Status
==
3
)
{
desc
=
'检验打回'
}
return
h
(
'div'
,
desc
)
}
},
{
title
:
'检验员'
,
width
:
'100'
,
key
:
'checkName'
},
{
title
:
'检验时间'
,
width
:
'180'
,
key
:
'check_time'
},
{
title
:
'备注'
,
key
:
'check_Result'
}
]
}
},
mounted
()
{},
methods
:
{
load
(
dispatch_id
)
{
console
.
log
(
dispatch_id
)
this
.
datasearch
.
dispatch_id
=
dispatch_id
this
.
loaddata
()
},
loaddata
()
{
this
.
datasearch
.
SkipCount
=
(
this
.
pageindex
-
1
)
*
this
.
datasearch
.
MaxResultCount
var
url
=
`
${
PlanUrl
}
/ordercheckresult/getpaged?`
+
QS
.
stringify
(
this
.
datasearch
)
service
.
get
(
`
${
url
}
`
).
then
((
response
)
=>
{
if
(
response
.
result
!=
null
)
{
this
.
moviedata
=
response
.
result
.
items
this
.
datatotal
=
response
.
result
.
totalCount
}
})
},
onPageChanged
(
page_index
)
{
this
.
pageindex
=
page_index
this
.
loaddata
()
},
onPagesizeChanged
(
page_size
)
{
this
.
pagesize
=
page_size
this
.
loaddata
()
}
}
}
</
script
>
\ No newline at end of file
pages/produce/execute/datafilling/usercard.vue
View file @
c796b76e
...
...
@@ -120,8 +120,9 @@ export default {
.
then
(
response
=>
{
if
(
response
.
success
)
{
this
.
$Message
.
success
(
"保存成功"
);
this
.
$parent
.
$parent
.
loadproduct
();
this
.
$parent
.
$parent
.
usercardModal
=
false
;
// this.$parent.loadproduct();
// this.$parent.$parent.usercardModal = false;
this
.
$emit
(
'on-ok'
)
}
})
.
catch
(
error
=>
{
...
...
@@ -133,7 +134,6 @@ export default {
},
handleClose
()
{},
loadentry
(
entryModel
,
fillModel
,
recordList
)
{
this
.
user
.
dispatch_id
=
entryModel
.
id
;
this
.
user
.
execute_id
=
entryModel
.
executeId
;
this
.
user
.
order_id
=
entryModel
.
order_id
;
...
...
@@ -160,7 +160,7 @@ export default {
// }
this
.
product_ID
.
push
(
fillModel
.
product_ID
);
alert
(
this
.
product_ID
);
// this.board_ID.push(fillModel.board_ID);
if
(
fillModel
.
fill_in_user_type
==
1
||
...
...
@@ -182,6 +182,7 @@ export default {
},
peoductAllOnchange
(
e
)
{
if
(
e
)
{
this
.
product_ID
=
[];
for
(
let
i
=
0
;
i
<
this
.
product_List
.
length
;
i
++
)
{
let
obj
=
this
.
product_List
[
i
];
this
.
product_ID
.
push
(
obj
.
value
);
...
...
@@ -192,7 +193,7 @@ export default {
}
},
productonchange
(
e
)
{},
getCurrentUser
(
e
)
{
if
(
e
)
{
console
.
log
(
this
.
$store
.
state
.
admin
.
user
.
info
);
...
...
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