Skip to content

T
TF-MOM-WEB
Commit e032bcc9 authored by jingnan's avatar jingnan 👀
Browse files
Options

胶漆打印标签样式修改

parent a1c927a1
Show whitespace changes
Inline Side-by-side
Showing with 582 additions and 613 deletions
applications/dee-mes/src/privateComponents/components/AssignCradInfo/index.vue
View file @ e032bcc9
......@@ -253,7 +253,7 @@ export default {
},
deployment: { label: '发料员', value: data.creator.userName },
inspector: {
label: '检验',
label: '检验员',
value: data.checker
}
}
......
applications/dee-mes/src/privateComponents/components/AssignCradInfo/printConfigAlodine.vue
View file @ e032bcc9
......@@ -7,8 +7,8 @@
style="
border: 2px solid #222;
box-sizing: border-box;
font-weight: 500;
font-size: 36px;
font-weight: 400;
font-size: 50px;
"
>
<div style="border-bottom: 2px solid #222">
......@@ -36,7 +36,7 @@
text-align: center;
box-sizing: border-box;
border-right: 2px solid #222;
font-size: 40px;
font-size: 54px;
"
>
{{ item.title }}
......@@ -59,7 +59,6 @@
display: inline-block;
box-sizing: border-box;
padding-left: 10px;
font-size: 36px;
"
>
{{ item.number.value }}
......@@ -95,7 +94,6 @@
line-height: 76px;
box-sizing: border-box;
padding-left: 10px;
font-size: 36px;
"
>
{{ item.mark.value }}
......@@ -131,7 +129,6 @@
display: inline-block;
box-sizing: border-box;
padding-left: 10px;
font-size: 36px;
"
>
{{ item.mixingUnit.value }}
......@@ -139,7 +136,7 @@
</div>
<!-- 第四行 -->
<div
style="height: 76px; box-sizing: border-box; "
style="height: 76px; box-sizing: border-box; border-bottom: 2px solid #222; "
>
<div
style="
......@@ -161,7 +158,6 @@
line-height: 76px;
padding-left: 10px;
vertical-align: top;
border-right: 2px solid #222;
box-sizing: border-box;
"
>
......@@ -175,6 +171,7 @@
display: inline-block;
width: 14%;
border-right: 2px solid #222;
border-left: 2px solid #222;
text-align: center;
box-sizing: border-box;
"
......@@ -192,35 +189,14 @@
{{ item.count.value }}
</div>
</div>
</div>
<!-- 二维码 -->
<div
style="
display: inline-block;
padding: 38px 50px;
width: 29%;
box-sizing: border-box;
"
>
<vue-qr
style="height:236px;"
:size="config.width"
:margin="0"
:text="item.text"
:qid="index.toString()"
/>
</div>
</div>
<!-- 施工期 -->
<!-- 第五行 -->
<div
style="height: 120px; box-sizing: border-box"
>
<div
style="
display: inline-block;
width: 21%;
width:30%;
border-right: 2px solid #222;
text-align: center;
line-height: 120px;
......@@ -233,7 +209,7 @@
<div
style="
display: inline-block;
width: 79%;
width: 69%;
line-height: 60px;
vertical-align: top;
"
......@@ -294,13 +270,12 @@
</div>
</div>
</div>
<!-- 第六行 -->
<div
style="
font-size: 36px;
vertical-align: middle;
display: flex;
align-items: center;
font-weight: 500;
height: 76px;
border-top: 2px solid #222;
box-sizing: border-box;
......@@ -347,13 +322,12 @@
</div>
</div>
</div>
<!-- 第七行 -->
<div
style="
font-size: 36px;
vertical-align: middle;
display: flex;
align-items: center;
font-weight: 500;
height: 76px;
border-top: 2px solid #222;
box-sizing: border-box;
......@@ -380,6 +354,26 @@
</div>
</div>
</div>
<!-- 二维码 -->
<div
style="
display: inline-block;
padding: 38px 50px;
width: 29%;
box-sizing: border-box;
"
>
<vue-qr
style="height:500px;"
:size="config.width"
:margin="0"
:text="item.text"
:qid="index.toString()"
/>
</div>
</div>
</div>
<div
style="font-size: 34px;
"
......
applications/dee-mes/src/privateComponents/components/AssignCradInfo/printConfigPaint.vue
View file @ e032bcc9
......@@ -7,8 +7,7 @@
style="
border: 2px solid #222;
box-sizing: border-box;
font-weight: 500;
font-size: 36px;
font-size: 50px;
"
>
<div style="border-bottom: 2px solid #222">
......@@ -37,7 +36,7 @@
text-align: center;
box-sizing: border-box;
border-right: 2px solid #222;
font-size: 40px;
font-size: 54px;
"
>
{{ item.title }}
......@@ -60,7 +59,7 @@
display: inline-block;
box-sizing: border-box;
padding-left: 10px;
font-size: 36px;
"
>
{{ item.number.value }}
......@@ -97,13 +96,14 @@
line-height: 80px;
box-sizing: border-box;
padding-left: 10px;
font-size: 36px;
"
>
{{ item.standard.value }}
</div>
</div>
<!-- 第三行 -->
<div
style="
height: 80px;
......@@ -132,13 +132,13 @@
display: inline-block;
box-sizing: border-box;
padding-left: 10px;
font-size: 36px;
"
>
{{ item.mark.value }}
</div>
</div>
<!-- 合格证号 -->
<!-- 第四行 -->
<div
style="height: 80px; box-sizing: border-box; border-bottom: 2px solid #222 "
>
......@@ -158,7 +158,7 @@
<div
style="
display: inline-block;
width: 30%;
width: 40%;
line-height: 80px;
padding-left: 10px;
vertical-align: top;
......@@ -193,8 +193,9 @@
{{ item.count.value }}
</div>
</div>
<!-- 第五行 -->
<div
style="height: 60px; line-height: 60px;"
style="height: 60px; line-height: 60px; border-bottom: 2px solid #222;"
>
<!-- 混合开始时间 -->
<div
......@@ -219,26 +220,6 @@
{{ item.mixStartTime.value }}
</div>
</div>
</div>
<!-- 二维码 -->
<div
style="
display: inline-block;
padding: 38px 50px;
width: 29%;
box-sizing: border-box;
"
>
<vue-qr
style="height:300px;"
:size="config.width"
:margin="0"
:text="item.text"
:qid="index.toString()"
/>
</div>
</div>
<div
v-if="item.remainingConstructionPeriod"
style="height: 40px; border-bottom: 2px solid #222"
......@@ -249,7 +230,7 @@
display: inline-block;
border-right: 2px solid #222;
line-height: 40px;
width: 24%;
width: 30%;
text-align: center;
box-sizing: border-box;
"
......@@ -259,7 +240,7 @@
<div
style="
display: inline-block;
width: 59%;
width: 69%;
box-sizing: border-box;
padding-left: 10px;
"
......@@ -276,7 +257,7 @@
<div
style="
display: inline-block;
width: 21%;
width: 30%;
border-right: 2px solid #222;
text-align: center;
line-height: 120px;
......@@ -289,7 +270,7 @@
<div
style="
display: inline-block;
width: 79%;
width: 69%;
line-height: 60px;
vertical-align: top;
"
......@@ -354,7 +335,7 @@
<!--解冻及施工期 -->
<div
v-if="item.remainingConstructionPeriod"
style="width: 100%; height: 40px; font-size: 36px;"
style="width: 100%; height: 40px; "
>
<div
style="
......@@ -390,11 +371,9 @@
<!-- -->
<div
style="
font-size: 36px;
vertical-align: middle;
display: flex;
align-items: center;
font-weight: 500;
height: 80px;
border-top: 2px solid #222;
box-sizing: border-box;
......@@ -442,6 +421,26 @@
</div>
</div>
</div>
<!-- 二维码 -->
<div
style="
display: inline-block;
padding: 38px 50px;
width: 29%;
box-sizing: border-box;
"
>
<vue-qr
style="height:500px;"
:size="config.width"
:margin="0"
:text="item.text"
:qid="index.toString()"
/>
</div>
</div>
</div>
<div
style="font-size: 34px;
"
......
applications/dee-mes/src/privateComponents/components/AssignCradInfo/printTagLacquer.vue
View file @ e032bcc9
......@@ -7,8 +7,7 @@
style="
border: 2px solid #222;
box-sizing: border-box;
font-weight: 500;
font-size: 36px;
font-size: 50px;
"
>
<div style="border-bottom: 2px solid #222">
......@@ -36,7 +35,7 @@
text-align: center;
box-sizing: border-box;
border-right: 2px solid #222;
font-size: 40px;
font-size: 54px;
"
>
{{ item.title }}
......@@ -59,7 +58,6 @@
display: inline-block;
box-sizing: border-box;
padding-left: 10px;
font-size: 36px;
"
>
{{ item.number.value }}
......@@ -95,13 +93,13 @@
line-height: 90px;
box-sizing: border-box;
padding-left: 10px;
font-size: 36px;
"
>
{{ item.standard.value }}
</div>
</div>
<!-- 第三行 -->
<div
style="
height: 90px;
......@@ -130,15 +128,14 @@
display: inline-block;
box-sizing: border-box;
padding-left: 10px;
font-size: 36px;
"
>
{{ item.mark.value }}
</div>
</div>
<!-- 合格证号 -->
<!-- 第四行 -->
<div
style="height: 90px; box-sizing: border-box; "
style="height: 90px; box-sizing: border-box; border-bottom: 2px solid #222; "
>
<div
style="
......@@ -156,7 +153,7 @@
<div
style="
display: inline-block;
width: 30%;
width: 40%;
line-height: 90px;
padding-left: 10px;
vertical-align: top;
......@@ -191,37 +188,6 @@
{{ item.count.value }}
</div>
</div>
<!-- <div
style="
height: 90px;
display: flex;
align-items: center;
border-top: 2px solid #222;
border-botoom: 2px solid #222;
"
> -->
<!-- 牌号 -->
</div>
<!-- 二维码 -->
<div
style="
display: inline-block;
padding: 38px 50px;
width: 29%;
box-sizing: border-box;
"
>
<vue-qr
style="height:300px;"
:size="config.width"
:margin="0"
:text="item.text"
:qid="index.toString()"
/>
</div>
</div>
<div
v-if="item.remainingConstructionPeriod"
style="height: 40px; border-bottom: 2px solid #222"
......@@ -232,7 +198,7 @@
display: inline-block;
border-right: 2px solid #222;
line-height: 40px;
width: 24%;
width: 30%;
text-align: center;
box-sizing: border-box;
"
......@@ -242,7 +208,7 @@
<div
style="
display: inline-block;
width: 59%;
width: 69%;
box-sizing: border-box;
padding-left: 10px;
"
......@@ -259,7 +225,7 @@
<div
style="
display: inline-block;
width: 24%;
width: 30%;
border-right: 2px solid #222;
text-align: center;
box-sizing: border-box;
......@@ -270,7 +236,7 @@
<div
style="
display: inline-block;
width: 76%;
width: 69%;
box-sizing: border-box;
padding-left: 10px;
"
......@@ -287,7 +253,7 @@
<div
style="
display: inline-block;
width: 21%;
width: 30%;
border-right: 2px solid #222;
text-align: center;
line-height: 120px;
......@@ -300,7 +266,7 @@
<div
style="
display: inline-block;
width: 79%;
width: 69%;
line-height: 60px;
vertical-align: top;
"
......@@ -365,7 +331,7 @@
<!--解冻及施工期 -->
<div
v-if="item.remainingConstructionPeriod"
style="width: 100%; height: 40px; font-size: 36px;"
style="width: 100%; height: 40px; "
>
<div
style="
......@@ -397,15 +363,11 @@
</div>
</div>
<!-- 4 -->
<!-- -->
<div
style="
font-size: 36px;
vertical-align: middle;
display: flex;
align-items: center;
font-weight: 500;
height: 90px;
border-top: 2px solid #222;
box-sizing: border-box;
......@@ -452,6 +414,27 @@
</div>
</div>
</div>
</div>
<!-- 二维码 -->
<div
style="
display: inline-block;
padding: 38px 50px;
width: 29%;
box-sizing: border-box;
"
>
<vue-qr
style="height:500px;"
:size="config.width"
:margin="0"
:text="item.text"
:qid="index.toString()"
/>
</div>
</div>
</div>
<div
style="font-size: 34px;
......
applications/dee-mes/src/privateComponents/components/LacquerFreeze/printTag.vue
View file @ e032bcc9
......@@ -7,8 +7,7 @@
style="
border: 2px solid #222;
box-sizing: border-box;
font-weight: 500;
font-size: 36px;
font-size: 50px;
"
>
<div style="border-bottom: 2px solid #222">
......@@ -16,7 +15,7 @@
style="
display: inline-block;
border-right: 2px solid #222;
width: 75%;
width: 70%;
vertical-align: top;
"
>
......@@ -36,7 +35,7 @@
text-align: center;
box-sizing: border-box;
border-right: 2px solid #222;
font-size: 40px;
font-size: 54px;
"
>
{{ item.title }}
......@@ -46,7 +45,7 @@
style="
display: inline-block;
vertical-align: top;
width: 14%;
width: 10%;
border-right: 2px solid #222;
text-align: center;
box-sizing: border-box;
......@@ -59,7 +58,6 @@
display: inline-block;
box-sizing: border-box;
padding-left: 10px;
font-size: 36px;
"
>
{{ item.number.value }}
......@@ -95,13 +93,13 @@
line-height: 60px;
box-sizing: border-box;
padding-left: 10px;
font-size: 36px;
"
>
{{ item.standard.value }}
</div>
</div>
<!-- 第三行 -->
<div
style="
height: 60px;
......@@ -130,15 +128,14 @@
display: inline-block;
box-sizing: border-box;
padding-left: 10px;
font-size: 36px;
"
>
{{ item.mark.value }}
</div>
</div>
<!-- 合格证号 -->
<!-- 第四行 -->
<div
style="height: 60px; box-sizing: border-box; "
style="height: 60px; box-sizing: border-box; border-bottom: 2px solid #222 "
>
<div
style="
......@@ -156,7 +153,7 @@
<div
style="
display: inline-block;
width: 30%;
width: 40%;
line-height: 60px;
padding-left: 10px;
vertical-align: top;
......@@ -191,35 +188,16 @@
{{ item.weight }}
</div>
</div>
</div>
<!-- 二维码 -->
<div
style="
display: inline-block;
padding: 20px 50px;
box-sizing: border-box;
"
>
<vue-qr
style="height:236px;"
:size="config.width"
:margin="0"
:text="item.text"
:qid="index.toString()"
/>
</div>
</div>
<div
v-if="item.remainingConstructionPeriod"
style="height: 60px; border-bottom: 2px solid #222"
style="height: 60px; line-height: 60px; box-sizing: border-box; border-bottom: 2px solid #222"
>
<!-- 剩余施工期 -->
<div
style="
display: inline-block;
border-right: 2px solid #222;
line-height: 60px;
width: 21%;
width: 28%;
text-align: center;
box-sizing: border-box;
"
......@@ -229,7 +207,6 @@
<div
style="
display: inline-block;
width: 59%;
box-sizing: border-box;
padding-left: 10px;
"
......@@ -246,7 +223,7 @@
<div
style="
display: inline-block;
width: 21%;
width: 28%;
border-right: 2px solid #222;
text-align: center;
box-sizing: border-box;
......@@ -257,7 +234,6 @@
<div
style="
display: inline-block;
width: 76%;
box-sizing: border-box;
padding-left: 10px;
"
......@@ -274,7 +250,7 @@
<div
style="
display: inline-block;
width: 21%;
width: 28%;
border-right: 2px solid #222;
text-align: center;
line-height: 120px;
......@@ -287,7 +263,7 @@
<div
style="
display: inline-block;
width: 79%;
width: 71%;
line-height: 60px;
vertical-align: top;
"
......@@ -352,14 +328,14 @@
<!--解冻及施工期 -->
<div
v-if="item.remainingConstructionPeriod"
style="width: 100%; height: 120px; line-height:120px; font-size: 36px;"
style="width: 100%; height: 120px; line-height:120px; "
>
<div
style="
display: inline-block;
text-align: center;
vertical-align: top;
width: 21%;
width: 28%;
border-right: 2px solid #222;
box-sizing: border-box;
"
......@@ -369,7 +345,7 @@
<div
style="
display: inline-block;
width: 79%;
width: 71%;
line-height: 60px;
vertical-align: top;
"
......@@ -436,11 +412,9 @@
<!-- -->
<div
style="
font-size: 36px;
vertical-align: middle;
display: flex;
align-items: center;
font-weight: 500;
height: 60px;
border-top: 2px solid #222;
box-sizing: border-box;
......@@ -488,6 +462,25 @@
</div>
</div>
</div>
<!-- 二维码 -->
<div
style="
display: inline-block;
padding: 20px 50px;
box-sizing: border-box;
"
>
<vue-qr
style="height:500px;"
:size="config.width"
:margin="0"
:text="item.text"
:qid="index.toString()"
/>
</div>
</div>
</div>
<div
style="font-size: 34px;
"
......
applications/dee-mes/src/privateComponents/components/LacquerFreeze/subpackagePrint.vue
View file @ e032bcc9
......@@ -148,7 +148,7 @@ export default {
},
deployment: { label: '发料员', value: data.creator.userName },
inspector: {
label: '检验',
label: '检验员',
value: data.assignCard.checker
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment