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
b8d5d9d6
Commit
b8d5d9d6
authored
Mar 20, 2024
by
jingnan
👀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
胶漆打印标签修改
parent
5dd15632
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1392 additions
and
232 deletions
+1392
-232
index.vue
...src/privateComponents/components/AssignCradInfo/index.vue
+68
-26
printConfigAlodine.vue
...mponents/components/AssignCradInfo/printConfigAlodine.vue
+457
-0
printConfigPaint.vue
...Components/components/AssignCradInfo/printConfigPaint.vue
+519
-0
printTagLacquer.vue
...eComponents/components/AssignCradInfo/printTagLacquer.vue
+149
-97
printTag.vue
...c/privateComponents/components/LacquerFreeze/printTag.vue
+199
-109
No files found.
applications/dee-mes/src/privateComponents/components/AssignCradInfo/index.vue
View file @
b8d5d9d6
...
...
@@ -13,17 +13,23 @@
:lay-config=
"cmpOptions"
:basic-data=
"basicData"
/>
<PrintTag
ref=
"print"
:config=
"printConfig"
/>
<PrintTagLacquer
ref=
"printConfigLacquer"
:config=
"printConfigLacquer"
/>
<PrintConfigPaint
ref=
"printConfigPaint"
:config=
"printConfigPaint"
/>
<PrintConfigAlodine
ref=
"printConfigAlodine"
:config=
"printConfigAlodine"
/>
</div>
</
template
>
<
script
>
import
PrintTag
from
'./printTag'
import
PrintTagLacquer
from
'./printTagLacquer'
import
PrintConfigPaint
from
'./printConfigPaint'
import
PrintConfigAlodine
from
'./printConfigAlodine'
import
{
post
}
from
'@/utils/http'
export
default
{
name
:
'AssignCradInfo'
,
componentName
:
'调配卡详情'
,
components
:
{
PrintTag
PrintTagLacquer
,
PrintConfigPaint
,
PrintConfigAlodine
},
props
:
{
basicData
:
{
...
...
@@ -34,7 +40,17 @@ export default {
data
()
{
return
{
cmpOptions
:
{},
printConfig
:
{
printConfigLacquer
:
{
visible
:
false
,
width
:
260
,
prints
:
[]
},
printConfigPaint
:
{
visible
:
false
,
width
:
260
,
prints
:
[]
},
printConfigAlodine
:
{
visible
:
false
,
width
:
260
,
prints
:
[]
...
...
@@ -50,8 +66,8 @@ export default {
handler
:
function
(
val
)
{
if
(
val
.
subTypeName
===
'AssignCardAlodine'
)
{
this
.
cmpOptions
=
{
typeName
:
'AssignCard
Alodine
'
,
layKey
:
'assignCard
Info
'
typeName
:
'AssignCard'
,
layKey
:
'assignCard
AlodineDetailView
'
}
}
else
if
(
val
.
subTypeName
===
'AssignCardLacquer'
)
{
this
.
cmpOptions
=
{
...
...
@@ -103,24 +119,36 @@ export default {
post
(
'/AssignCard/qualification'
,
params
)
.
then
((
res
)
=>
{
var
data
=
res
.
items
.
content
[
0
]
this
.
printConfig
=
Object
.
assign
({},
this
.
printConfig
,
{
visible
:
true
})
var
b
=
data
.
validityEnd
&&
data
.
validityEnd
.
split
(
':'
)
||
[]
b
.
pop
()
if
(
data
.
subTypeName
===
'AssignCardPaint'
)
{
if
(
data
.
subTypeName
===
'AssignCardPaint'
)
{
// 调漆
this
.
printConfigPaint
=
Object
.
assign
({},
this
.
printConfigPaint
,
{
visible
:
true
})
const
a
=
data
.
validityStart
&&
data
.
validityStart
.
split
(
':'
)
||
[]
a
.
pop
()
this
.
printConfig
.
prints
=
[
this
.
printConfig
Paint
.
prints
=
[
{
text
:
data
.
cardNo
,
title
:
'漆料合格标签'
,
count
:
data
.
actualWeight
,
count
:
{
label
:
'领取量'
,
value
:
data
.
actualWeight
}
,
number
:
{
label
:
'编号'
,
value
:
data
.
cardNo
},
mark
:
{
label
:
'油漆牌号'
,
value
:
data
.
modelNo
},
mixingUnit
:
{
label
:
'调配单位'
,
value
:
data
.
assignUnit
},
standard
:
{
label
:
'材料规范'
,
value
:
this
.
form
.
standard
},
mark
:
{
label
:
'材料标识/牌号'
,
value
:
data
.
modelNo
+
'/'
+
data
.
realityMark
},
mixingUnit
:
{
label
:
'合格证编号'
,
value
:
data
.
certificateNo
},
// mark: { label: '油漆牌号', value: data.modelNo },
mixStartTime
:
{
label
:
'混合开始时间'
,
value
:
data
.
mixStartTime
},
validity
:
{
label
:
'有效期'
,
label
:
'
漆料施工
有效期'
,
value
:
{
start
:
{
label
:
'始'
,
...
...
@@ -132,27 +160,35 @@ export default {
}
}
},
deployment
:
{
label
:
'
调配
员'
,
value
:
data
.
creator
.
userName
},
deployment
:
{
label
:
'
发料
员'
,
value
:
data
.
creator
.
userName
},
inspector
:
{
label
:
'检验员'
,
value
:
data
.
checker
}
}
]
}
else
if
(
data
.
subTypeName
===
'AssignCardAlodine'
)
{
this
.
$refs
.
printConfigPaint
.
print
()
}
else
if
(
data
.
subTypeName
===
'AssignCardAlodine'
)
{
// 阿洛丁
this
.
printConfigAlodine
=
Object
.
assign
({},
this
.
printConfigAlodine
,
{
visible
:
true
})
const
c
=
(
data
.
assignTime
&&
data
.
assignTime
.
split
(
':'
))
||
[]
c
.
pop
()
this
.
printConfig
.
prints
=
[
this
.
printConfig
Alodine
.
prints
=
[
{
text
:
data
.
cardNo
,
title
:
'阿洛丁刷涂合格标签'
,
count
:
data
.
assignTotalAmount
,
count
:
{
label
:
'领取量'
,
value
:
data
.
assignTotalAmount
}
,
number
:
{
label
:
'编号'
,
value
:
data
.
cardNo
},
mark
:
{
label
:
'阿洛丁牌号'
,
value
:
data
.
modelNo
},
mixingUnit
:
{
label
:
'调配单位'
,
value
:
data
.
assignUnit
},
mixingUnit
:
{
label
:
'合格证编号'
,
value
:
data
.
certificateNo
},
receiveDate
:
{
label
:
'领取日期'
,
value
:
data
.
assignUnit
||
'xxxx-xx-xx hh:mm'
},
validity
:
{
label
:
'有效期'
,
value
:
{
...
...
@@ -166,23 +202,29 @@ export default {
}
}
},
deployment
:
{
label
:
'
调配
员'
,
value
:
data
.
creator
.
userName
},
deployment
:
{
label
:
'
发料
员'
,
value
:
data
.
creator
.
userName
},
inspector
:
{
label
:
'检验员'
,
value
:
data
.
checker
}
},
remark
:
{
label
:
'备注'
,
value
:
data
.
realityMark
}
}
]
}
else
if
(
data
.
subTypeName
===
'AssignCardLacquer'
)
{
this
.
$refs
.
printConfigAlodine
.
print
()
}
else
if
(
data
.
subTypeName
===
'AssignCardLacquer'
)
{
// 调胶
this
.
printConfigLacquer
=
Object
.
assign
({},
this
.
printConfigLacquer
,
{
visible
:
true
})
const
d
=
(
data
.
mixStartTime
&&
data
.
mixStartTime
.
split
(
':'
))
||
[]
d
.
pop
()
const
e
=
(
data
.
mixEndTime
&&
data
.
mixEndTime
.
split
(
':'
))
||
[]
e
.
pop
()
this
.
printConfig
.
prints
=
[
this
.
printConfig
Lacquer
.
prints
=
[
{
text
:
data
.
cardNo
,
title
:
'密封剂合格标签'
,
count
:
data
.
actualWeight
,
count
:
{
label
:
'重量'
,
value
:
data
.
actualWeight
}
,
number
:
{
label
:
'编号'
,
value
:
data
.
cardNo
},
standard
:
{
label
:
'材料规范'
,
...
...
@@ -216,8 +258,8 @@ export default {
}
}
]
this
.
$refs
.
printConfigLacquer
.
print
()
}
this
.
$refs
.
print
.
print
()
})
.
catch
((
err
)
=>
console
.
log
(
err
))
...
...
applications/dee-mes/src/privateComponents/components/AssignCradInfo/printConfigAlodine.vue
0 → 100644
View file @
b8d5d9d6
This diff is collapsed.
Click to expand it.
applications/dee-mes/src/privateComponents/components/AssignCradInfo/printConfigPaint.vue
0 → 100644
View file @
b8d5d9d6
This diff is collapsed.
Click to expand it.
applications/dee-mes/src/privateComponents/components/AssignCradInfo/printTag.vue
→
applications/dee-mes/src/privateComponents/components/AssignCradInfo/printTag
Lacquer
.vue
View file @
b8d5d9d6
This diff is collapsed.
Click to expand it.
applications/dee-mes/src/privateComponents/components/LacquerFreeze/printTag.vue
View file @
b8d5d9d6
This diff is collapsed.
Click to expand it.
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