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
167a92b4
Commit
167a92b4
authored
Mar 18, 2024
by
wangdanlei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调胶
parent
81090bc0
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
168 additions
and
106 deletions
+168
-106
index.vue
...src/privateComponents/components/AssignCradInfo/index.vue
+15
-6
printTag.vue
.../privateComponents/components/AssignCradInfo/printTag.vue
+44
-13
index.vue
...eComponents/components/DeploymentCardInfoSelect/index.vue
+67
-60
printTag.vue
...c/privateComponents/components/LacquerFreeze/printTag.vue
+2
-1
subpackagePrint.vue
...teComponents/components/LacquerFreeze/subpackagePrint.vue
+4
-7
index.vue
...ivateComponents/components/MutualAttachmentList/index.vue
+36
-19
No files found.
applications/dee-mes/src/privateComponents/components/AssignCradInfo/index.vue
View file @
167a92b4
...
...
@@ -39,7 +39,8 @@ export default {
width
:
260
,
prints
:
[]
},
loading
:
false
loading
:
false
,
form
:
{}
}
},
watch
:
{
...
...
@@ -69,6 +70,7 @@ export default {
methods
:
{
// 打印
print
()
{
this
.
form
=
this
.
$children
[
0
].
$children
[
0
].
form
this
.
loading
=
true
const
params
=
{
'pageFrom'
:
1
,
...
...
@@ -179,12 +181,19 @@ export default {
this
.
printConfig
.
prints
=
[
{
text
:
data
.
cardNo
,
title
:
'
胶料
合格标签'
,
title
:
'
密封剂
合格标签'
,
count
:
data
.
actualWeight
,
number
:
{
label
:
'编号'
,
value
:
data
.
cardNo
},
mark
:
{
label
:
'牌号'
,
value
:
data
.
modelNo
},
standard
:
{
label
:
'材料规范'
,
value
:
this
.
form
.
standard
},
mark
:
{
label
:
'材料标识/牌号'
,
value
:
data
.
modelNo
+
'-'
+
data
.
spec
+
'/'
+
data
.
realityMark
},
mixingUnit
:
{
label
:
'合格证号'
,
label
:
'合格证
编
号'
,
value
:
data
.
certificateNo
},
validity
:
{
...
...
@@ -200,9 +209,9 @@ export default {
}
}
},
deployment
:
{
label
:
'
调配
员'
,
value
:
data
.
creator
.
userName
},
deployment
:
{
label
:
'
发料
员'
,
value
:
data
.
creator
.
userName
},
inspector
:
{
label
:
'检验
员
'
,
label
:
'检验'
,
value
:
data
.
checker
}
}
...
...
applications/dee-mes/src/privateComponents/components/AssignCradInfo/printTag.vue
View file @
167a92b4
<
template
>
<section
ref=
"print"
class=
"print"
>
<section
class=
"prinaa"
>
<section>
<div
v-for=
"(item, index) in config.prints"
:key=
"index"
...
...
@@ -48,7 +48,7 @@
padding-left: 20px;
"
>
数
量
<span
style=
"padding-left: 20px"
>
{{
item
.
count
}}
</span>
重
量
<span
style=
"padding-left: 20px"
>
{{
item
.
count
}}
</span>
</div>
</div>
<div
...
...
@@ -95,7 +95,7 @@
border-botoom: 2px solid #222;
"
>
<!--
牌号
-->
<!--
材料规范
-->
<div
style=
"
line-height: 76px;
...
...
@@ -107,7 +107,7 @@
box-sizing: border-box;
"
>
{{
item
.
mark
.
label
}}
{{
item
.
standard
.
label
}}
</div>
<div
style=
"
...
...
@@ -118,31 +118,32 @@
font-size: 25px;
"
>
{{
item
.
mark
.
value
}}
{{
item
.
standard
.
value
}}
</div>
</div>
<div
style=
"
height: 76px;
border-top: 2px solid #222;
border-botoom: 2px solid #222;
display: flex;
align-items: center;
border-top: 2px solid #222;
border-botoom: 2px solid #222;
"
>
<!--
合格证
号 -->
<!--
牌
号 -->
<div
style=
"
display: inline-block;
line-height: 76px;
vertical-align: top;
display: inline-block;
width: 40%;
border-right: 2px solid #222;
text-align: center;
box-sizing: border-box;
"
>
{{
item
.
m
ixingUnit
.
label
}}
{{
item
.
m
ark
.
label
}}
</div>
<div
style=
"
...
...
@@ -153,7 +154,7 @@
font-size: 25px;
"
>
{{
item
.
m
ixingUnit
.
value
}}
{{
item
.
m
ark
.
value
}}
</div>
</div>
</div>
...
...
@@ -230,7 +231,35 @@
{{
item
.
ineffectiveTime
.
value
}}
</div>
</div>
<!-- 合格证号 -->
<div
style=
"height: 80px; box-sizing: border-box; border-bottom: 2px solid #222;"
>
<div
style=
"
line-height: 76px;
vertical-align: top;
display: inline-block;
width: 24%;
border-right: 2px solid #222;
text-align: center;
box-sizing: border-box;
"
>
{{
item
.
mixingUnit
.
label
}}
</div>
<div
style=
"
display: inline-block;
width: 69%;
line-height: 80px;
padding-left: 10px;
vertical-align: top;
"
>
{{
item
.
mixingUnit
.
value
}}
</div>
</div>
<!-- 施工期 -->
<div
v-if=
"!item.remainingConstructionPeriod"
...
...
@@ -353,6 +382,7 @@
align-items: center;
font-weight: lighter;
border-top: 2px solid #222;
border-bottom: 2px solid #222
"
>
<!-- 调配员 -->
...
...
@@ -374,6 +404,7 @@
</div>
</div>
</div>
<div>
B330319B
</div>
</div>
</section>
</section>
...
...
@@ -425,7 +456,7 @@ export default {
doc
.
write
(
`
<style>
div{
}
</style>
`
)
...
...
applications/dee-mes/src/privateComponents/components/DeploymentCardInfoSelect/index.vue
View file @
167a92b4
...
...
@@ -119,10 +119,10 @@ export default {
})
}
this
.
isEdit
=
this
.
form
.
modelNo
&&
this
.
form
.
spec
&&
this
.
form
.
realityMark
if
(
this
.
isEdit
)
{
this
.
editInit
()
}
else
{
if
(
this
.
basicData
.
setAttrs
)
{
this
.
initFn
()
}
else
{
this
.
editInit
()
}
}
},
...
...
@@ -162,7 +162,7 @@ export default {
'value'
:
this
.
form
.
spec
||
''
}
]
this
.
setOptions
(
this
.
itemObj
.
attrKey
,
params
)
this
.
setOptions
(
'spec'
,
params
)
}
}
if
(
this
.
itemObj
.
attrKey
===
'realityMark'
)
{
...
...
@@ -185,7 +185,7 @@ export default {
}
]
this
.
$set
(
this
.
form
,
'realityMark'
,
''
)
this
.
setOptions
(
this
.
itemObj
.
attrKey
,
params
)
this
.
setOptions
(
'realityMark'
,
params
)
}
}
},
...
...
@@ -196,16 +196,21 @@ export default {
'fieldName'
:
'modelNo'
,
'operator'
:
'LIKE'
,
'value'
:
''
},
{
'fieldName'
:
'subTypeName'
,
'operator'
:
'EQ'
,
'value'
:
'ShellacCardLacquer'
}
]
this
.
setOptions
(
'modelNo'
,
params
)
}
if
(
this
.
itemObj
.
attrKey
===
'spec'
)
{
if
(
this
.
itemObj
.
attrKey
===
'spec'
&&
this
.
basicData
.
modelNo
)
{
const
params
=
[
{
'fieldName'
:
'modelNo'
,
'operator'
:
'LIKE'
,
'value'
:
this
.
form
.
modelNo
'value'
:
this
.
basicData
.
modelNo
},
{
'fieldName'
:
'spec'
,
...
...
@@ -213,19 +218,19 @@ export default {
'value'
:
''
}
]
this
.
setOptions
(
this
.
itemObj
.
attrKey
,
params
)
this
.
setOptions
(
'spec'
,
params
)
}
if
(
this
.
itemObj
.
attrKey
===
'realityMark'
)
{
if
(
this
.
itemObj
.
attrKey
===
'realityMark'
&&
this
.
basicData
.
spec
)
{
const
params
=
[
{
'fieldName'
:
'modelNo'
,
'operator'
:
'LIKE'
,
'value'
:
this
.
form
.
modelNo
'value'
:
this
.
basicData
.
modelNo
},
{
'fieldName'
:
'spec'
,
'operator'
:
'LIKE'
,
'value'
:
this
.
form
.
spec
'value'
:
this
.
basicData
.
spec
},
{
'fieldName'
:
'realityMark'
,
...
...
@@ -233,9 +238,9 @@ export default {
'value'
:
''
}
]
this
.
setOptions
(
this
.
itemObj
.
attrKey
,
params
)
this
.
setOptions
(
'realityMark'
,
params
)
}
this
.
requestShellacDeploy
()
this
.
requestShellacDeploy
(
this
.
basicData
.
modelNo
,
this
.
basicData
.
spec
,
this
.
basicData
.
realityMark
)
},
async
setOptions
(
key
,
params
)
{
await
this
.
requestOptions
(
key
,
params
)
...
...
@@ -353,58 +358,60 @@ export default {
this
.
setOptions
(
'realityMark'
,
params
)
}
if
(
this
.
itemObj
.
attrKey
===
'realityMark'
)
{
this
.
requestShellacDeploy
()
this
.
requestShellacDeploy
(
this
.
form
.
modelNo
,
this
.
form
.
spec
,
this
.
form
.
realityMark
)
}
},
requestShellacDeploy
()
{
const
params
=
{
'searchItems'
:
{
'items'
:
[
{
'fieldName'
:
'modelNo'
,
'operator'
:
'LIKE'
,
'value'
:
this
.
form
.
modelNo
},
{
'fieldName'
:
'spec'
,
'operator'
:
'LIKE'
,
'value'
:
this
.
form
.
spec
},
requestShellacDeploy
(
modelNo
,
spec
,
realityMark
)
{
if
(
modelNo
&&
spec
&&
realityMark
)
{
const
params
=
{
'searchItems'
:
{
'items'
:
[
{
'fieldName'
:
'modelNo'
,
'operator'
:
'LIKE'
,
'value'
:
modelNo
},
{
'fieldName'
:
'spec'
,
'operator'
:
'LIKE'
,
'value'
:
spec
},
{
'fieldName'
:
'realityMark'
,
'operator'
:
'LIKE'
,
'value'
:
realityMark
}
],
'operator'
:
'AND'
},
'openProps'
:
[],
'sortItem'
:
[
{
'fieldName'
:
'realityMark'
,
'operator'
:
'LIKE'
,
'value'
:
this
.
form
.
realityMark
'fieldName'
:
'modifyTime'
,
'sortOrder'
:
'desc'
}
],
'operator'
:
'AND'
},
'openProps'
:
[],
'sortItem'
:
[
{
'fieldName'
:
'modifyTime'
,
'sortOrder'
:
'desc'
}
]
}
post
(
`/ShellacDeploy/search`
,
params
)
.
then
(
res
=>
{
if
(
res
.
code
===
0
)
{
this
.
$set
(
this
.
form
,
'standard'
,
res
.
items
.
content
[
0
].
standard
)
this
.
$set
(
this
.
form
,
'matching'
,
res
.
items
.
content
[
0
].
matching
)
this
.
$set
(
this
.
form
,
'theoreticalTemperature'
,
res
.
items
.
content
[
0
].
temperature
)
this
.
$set
(
this
.
form
,
'humidity'
,
res
.
items
.
content
[
0
].
humidity
)
this
.
$set
(
this
.
form
,
'component'
,
res
.
items
.
content
[
0
].
component
)
this
.
$set
(
this
.
form
,
'shellacDeployId'
,
res
.
items
.
content
[
0
].
id
)
this
.
$set
(
this
.
form
,
'storeUp'
,
res
.
items
.
content
[
0
].
storeUp
)
this
.
$set
(
this
.
form
,
'storeUpTo'
,
res
.
items
.
content
[
0
].
storeUpTo
)
if
(
this
.
form
.
validityStart
&&
this
.
form
.
freeTemperature
)
{
const
date
=
new
Date
(
this
.
form
.
validityStart
)
const
data
=
this
.
form
.
freeTemperature
===
'-24'
?
(
this
.
form
.
storeUp
?
Number
(
this
.
form
.
storeUp
)
:
21
)
:
(
this
.
form
.
storeUp
?
Number
(
this
.
form
.
storeUpTo
)
:
30
)
date
.
setDate
(
date
.
getDate
()
+
data
)
this
.
$set
(
this
.
form
,
'validityEnd'
,
this
.
$utils
.
dateFormat
(
date
.
toISOString
()))
]
}
post
(
`/ShellacDeploy/search`
,
params
)
.
then
(
res
=>
{
if
(
res
.
code
===
0
)
{
this
.
$set
(
this
.
form
,
'standard'
,
res
.
items
.
content
[
0
].
standard
)
this
.
$set
(
this
.
form
,
'matching'
,
res
.
items
.
content
[
0
].
matching
)
this
.
$set
(
this
.
form
,
'theoreticalTemperature'
,
res
.
items
.
content
[
0
].
temperature
)
this
.
$set
(
this
.
form
,
'humidity'
,
res
.
items
.
content
[
0
].
humidity
)
this
.
$set
(
this
.
form
,
'component'
,
res
.
items
.
content
[
0
].
component
)
this
.
$set
(
this
.
form
,
'shellacDeployId'
,
res
.
items
.
content
[
0
].
id
)
this
.
$set
(
this
.
form
,
'storeUp'
,
res
.
items
.
content
[
0
].
storeUp
)
this
.
$set
(
this
.
form
,
'storeUpTo'
,
res
.
items
.
content
[
0
].
storeUpTo
)
if
(
this
.
form
.
validityStart
&&
this
.
form
.
freeTemperature
)
{
const
date
=
new
Date
(
this
.
form
.
validityStart
)
const
data
=
this
.
form
.
freeTemperature
===
'-24'
?
(
this
.
form
.
storeUp
?
Number
(
this
.
form
.
storeUp
)
:
21
)
:
(
this
.
form
.
storeUp
?
Number
(
this
.
form
.
storeUpTo
)
:
30
)
date
.
setDate
(
date
.
getDate
()
+
data
)
this
.
$set
(
this
.
form
,
'validityEnd'
,
this
.
$utils
.
dateFormat
(
date
.
toISOString
()))
}
}
}
})
}
)
}
},
remoteMethod
(
query
)
{
if
(
query
&&
query
.
length
>=
2
)
{
...
...
applications/dee-mes/src/privateComponents/components/LacquerFreeze/printTag.vue
View file @
167a92b4
...
...
@@ -374,11 +374,11 @@
style=
"
font-size: 25px;
vertical-align: middle;
display: block;
display: flex;
align-items: center;
font-weight: lighter;
border-top: 2px solid #222;
border-bottom: 2px solid #222
"
>
<!-- 调配员 -->
...
...
@@ -400,6 +400,7 @@
</div>
</div>
</div>
<div>
B330320
</div>
</div>
</section>
</section>
...
...
applications/dee-mes/src/privateComponents/components/LacquerFreeze/subpackagePrint.vue
View file @
167a92b4
...
...
@@ -44,7 +44,7 @@ export default {
eventFunc
()
{
this
.
selectedData
=
this
.
$utils
.
findByNameVnode
(
this
,
'DeeAsTable'
).
selectedData
if
(
this
.
selectedData
.
length
)
{
let
state
=
true
/*
let state = true
this.selectedData.forEach(item => {
if (item.state !== 'Audited') {
state = false
...
...
@@ -54,7 +54,8 @@ export default {
this.$utils.showMessageWarning('勾选数据中存在状态为未审核的数据!')
} else {
this.print()
}
}*/
this
.
print
()
}
},
print
()
{
...
...
@@ -112,13 +113,9 @@ export default {
title
:
'密封剂冷冻标签'
,
weight
:
data
.
weight
,
number
:
{
label
:
'编号'
,
value
:
data
.
itemNo
},
modelNo
:
{
label
:
'材料规范'
,
value
:
data
.
assignCard
.
modelNo
},
mark
:
{
label
:
'材料标识/牌号'
,
value
:
data
.
assignCard
.
modelNo
value
:
data
.
assignCard
.
modelNo
+
'-'
+
data
.
assignCard
.
spec
+
'/'
+
data
.
assignCard
.
realityMark
},
mixingUnit
:
{
label
:
'合格证编号'
,
...
...
applications/dee-mes/src/privateComponents/components/MutualAttachmentList/index.vue
View file @
167a92b4
<
template
>
<div>
<dee-as-com
:lay-config=
"layConfig"
:lay-config=
"
{
typeName: 'ExtSupportingItem',
layKey: 'lacquerList'
}"
@tableToolHandler="tableToolHandler"
@row-click="onRowClick"
@selectionChange="selectionChange($event)"
/>
<dee-drawer
width=
"60%"
title=
"创建调胶调配记录卡
"
:title=
"title
"
:dialog-visible=
"drawer"
@
handleClose=
"handleClose"
>
<dee-as-com
:lay-config=
"
{
typeName: 'AssignCard',
layKey: 'defaultCreate'
}"
:lay-config=
"layConfig"
:basic-data=
"
{ ...basicData,setAttrs:setAttrs }"
/>
</dee-drawer>
...
...
@@ -51,6 +51,8 @@ export default {
return
{
drawer
:
false
,
dialogVisible
:
false
,
subTypeName
:
''
,
title
:
''
,
evenList
:
[
{
even
:
'row-click'
,
...
...
@@ -105,10 +107,19 @@ export default {
},
computed
:
{
layConfig
()
{
return
{
typeName
:
'ExtSupportingItem'
,
layKey
:
'lacquerList'
if
(
this
.
subTypeName
===
'AssignCardLacquer'
)
{
return
{
typeName
:
'AssignCard'
,
layKey
:
'defaultCreate'
}
}
if
(
this
.
subTypeName
===
'AssignCardPaint'
)
{
return
{
typeName
:
'AssignCard'
,
layKey
:
'assignCardPaintEdit'
}
}
return
{}
}
},
mounted
()
{
...
...
@@ -122,37 +133,43 @@ export default {
},
tableToolHandler
(
e
)
{
if
(
e
&&
e
.
key
&&
e
.
key
.
btnValue
)
{
let
typ
e
let
nam
e
const
{
btnValue
}
=
e
.
key
switch
(
btnValue
)
{
case
'addMix'
:
type
=
'AssignCardLacquer'
case
'deploymentCardCreate'
:
this
.
subTypeName
=
'AssignCardLacquer'
// 调胶调配卡
name
=
'调胶调配'
this
.
title
=
'创建调胶调配记录卡'
break
case
'addPaint'
:
type
=
'AssignCardPaint'
case
'paintAdjustmentCreate'
:
this
.
subTypeName
=
'AssignCardPaint'
// 调漆调配卡
name
=
'胶漆调配'
this
.
title
=
'创建调漆调配记录卡'
break
case
'addAlodine'
:
type
=
'AssignCardAlodine'
case
'addAlodine'
:
this
.
subTypeName
=
'AssignCardAlodine'
// 阿洛丁调配卡
this
.
title
=
'创建阿洛丁调配记录卡'
name
=
'阿洛丁调配'
break
}
if
(
e
.
el
.
selectedData
.
length
===
0
)
{
this
.
$utils
.
showConfirm
(
`确定不关联
胶漆调配
申请创建调配卡吗, 是否继续?`
,
`确定不关联
${
name
}
申请创建调配卡吗, 是否继续?`
,
'提示'
,
'warning'
,
'确定'
,
'取消'
,
()
=>
{
if
(
btnValue
===
'deploymentCardCreate'
)
{
if
(
[
'AssignCardLacquer'
,
'AssignCardPaint'
].
includes
(
this
.
subTypeName
)
)
{
this
.
productArea
=
''
this
.
dialogVisible
=
true
}
else
{
this
.
adjustCardCreate
(
e
,
t
yp
e
)
this
.
adjustCardCreate
(
e
,
t
his
.
subTypeNam
e
)
}
}
)
}
else
{
if
(
btnValue
===
'deploymentCardCreate'
)
{
if
(
[
'AssignCardLacquer'
,
'AssignCardPaint'
].
includes
(
this
.
subTypeName
)
)
{
this
.
dataCheck
()
}
else
{
this
.
adjustCardCreate
(
e
,
t
yp
e
)
this
.
adjustCardCreate
(
e
,
t
his
.
subTypeNam
e
)
}
}
}
...
...
@@ -190,7 +207,7 @@ export default {
save
()
{
const
params
=
{
'dxClassName'
:
'com.yonde.tf.mom.common.vo.schedule.AssignCardVO'
,
'subTypeName'
:
'AssignCardLacquer'
,
'subTypeName'
:
this
.
subTypeName
,
'operator'
:
'ADD'
,
productArea
:
this
.
productArea
}
...
...
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