Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TF-MOM-WEB
Project
Project
Details
Activity
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
TFMOM
TF-MOM-WEB
Commits
2f93f6a0
Commit
2f93f6a0
authored
Mar 15, 2024
by
wangdanlei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调胶
parent
eef3a74b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
8 deletions
+27
-8
index.vue
...src/privateComponents/components/AssignCradInfo/index.vue
+7
-7
index.vue
...eComponents/components/DeploymentCardInfoSelect/index.vue
+20
-1
No files found.
applications/dee-mes/src/privateComponents/components/AssignCradInfo/index.vue
View file @
2f93f6a0
<
template
>
<div
class=
"AssignCradInfo"
>
<div
class=
"dee-form2 header"
>
<div
class=
"form-row-title"
>
详情
</div
>
<div
v-show=
"basicData.
appState==='deploy
ed'"
class=
"print-button"
@
click=
"print"
>
<div
class=
"form-row-title"
/
>
<div
v-show=
"basicData.
state==='Audit
ed'"
class=
"print-button"
@
click=
"print"
>
<img
src=
"/icons/c-print.png"
alt=
""
>
<span>
打印
</span>
</div>
...
...
@@ -54,8 +54,8 @@ export default {
}
}
else
if
(
val
.
subTypeName
===
'AssignCardLacquer'
)
{
this
.
cmpOptions
=
{
typeName
:
'AssignCard
Lacquer
'
,
layKey
:
'
assignCard
Info'
typeName
:
'AssignCard'
,
layKey
:
'
subpackage
Info'
}
}
else
{
this
.
cmpOptions
=
{
...
...
@@ -115,7 +115,7 @@ export default {
title
:
'漆料合格标签'
,
count
:
data
.
actualWeight
,
number
:
{
label
:
'编号'
,
value
:
data
.
cardNo
},
mark
:
{
label
:
'油漆牌号'
,
value
:
data
.
m
aterial
.
m
odelNo
},
mark
:
{
label
:
'油漆牌号'
,
value
:
data
.
modelNo
},
mixingUnit
:
{
label
:
'调配单位'
,
value
:
data
.
assignUnit
},
validity
:
{
label
:
'有效期'
,
...
...
@@ -148,7 +148,7 @@ export default {
number
:
{
label
:
'编号'
,
value
:
data
.
cardNo
},
mark
:
{
label
:
'阿洛丁牌号'
,
value
:
data
.
m
aterial
.
m
odelNo
value
:
data
.
modelNo
},
mixingUnit
:
{
label
:
'调配单位'
,
value
:
data
.
assignUnit
},
validity
:
{
...
...
@@ -182,7 +182,7 @@ export default {
title
:
'胶料合格标签'
,
count
:
data
.
actualWeight
,
number
:
{
label
:
'编号'
,
value
:
data
.
cardNo
},
mark
:
{
label
:
'牌号'
,
value
:
data
.
m
aterial
.
m
odelNo
},
mark
:
{
label
:
'牌号'
,
value
:
data
.
modelNo
},
mixingUnit
:
{
label
:
'合格证号'
,
value
:
data
.
certificateNo
...
...
applications/dee-mes/src/privateComponents/components/DeploymentCardInfoSelect/index.vue
View file @
2f93f6a0
...
...
@@ -291,6 +291,25 @@ export default {
}
else
{
this
.
$set
(
this
.
form
,
this
.
itemObj
.
attrKey
,
value
)
this
.
changeRequest
()
if
(
this
.
itemObj
.
attrKey
===
'spec'
)
{
this
.
setMixEndTime
()
}
}
},
setMixEndTime
()
{
if
(
this
.
form
.
mixStartTime
)
{
let
rawTime
=
Date
.
parse
(
this
.
form
.
mixStartTime
)
// 把时间转换成毫秒
const
addTime
=
(
!
this
.
form
.
spec
&&
this
.
form
.
spec
===
'/'
)
?
0
:
Number
(
this
.
form
.
spec
)
rawTime
=
rawTime
+
(
1000
*
60
*
60
*
addTime
)
// 增加3小时。
const
newsTime
=
new
Date
(
rawTime
)
// 时间重新格式化时间。
const
y
=
newsTime
.
getFullYear
()
const
m
=
(
newsTime
.
getMonth
()
+
1
)
<
10
?
'0'
+
(
newsTime
.
getMonth
()
+
1
)
:
(
newsTime
.
getMonth
()
+
1
)
const
d
=
newsTime
.
getDate
()
const
h
=
newsTime
.
getHours
()
<
10
?
'0'
+
newsTime
.
getHours
()
:
newsTime
.
getHours
()
const
m2
=
newsTime
.
getMinutes
()
<
10
?
'0'
+
newsTime
.
getMinutes
()
:
newsTime
.
getMinutes
()
const
s
=
newsTime
.
getSeconds
()
<
10
?
'0'
+
newsTime
.
getSeconds
()
:
newsTime
.
getSeconds
()
const
resultDate
=
y
+
'-'
+
m
+
'-'
+
d
+
' '
+
h
+
':'
+
m2
+
':'
+
s
this
.
$set
(
this
.
form
,
'mixEndTime'
,
resultDate
)
}
},
changeRequest
()
{
...
...
@@ -450,7 +469,7 @@ export default {
this
.
requestOp
=
res
.
items
.
content
.
map
(
item
=>
{
let
disabled
=
false
if
(
item
.
qualityPeriod
)
{
disabled
=
Date
.
parse
(
item
.
qualityPeriod
)
>
new
Date
().
getTime
(
)
disabled
=
new
Date
().
getTime
()
>
Date
.
parse
(
item
.
qualityPeriod
)
}
return
{
label
:
`
${
item
.
testNo
}
`
,
...
...
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