licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: licq:cc43aebb5799f5e1adad2677b4be2687901ba656
Branches Tags
licq:main
..
compare: licq:18ea9e07834fc8009275529ab57151221f84d8ac
Branches Tags
licq:main

No commits in common. "cc43aebb5799f5e1adad2677b4be2687901ba656" and "18ea9e07834fc8009275529ab57151221f84d8ac" have entirely different histories.
cc43aebb57 ... 18ea9e0783

6 changed files with 14 additions and 20 deletions
Show Stats Expand all files Collapse all files

13
mes-ui/mes-ui-admin-vue3/src/views/heli/plan/printDialog.vue
View File

@ -86,18 +86,15 @@ const open = async ( vals) => {
(qrCodeElement.innerHTML += (qrCodeElement.innerHTML +=
`<div style="width: 90mm; height: 60mm; box-sizing: border-box; font-family: monospace; position: relative; background-color: white; color: black;"> `<div style="width: 90mm; height: 60mm; box-sizing: border-box; font-family: monospace; position: relative; background-color: white; color: black;">
<div style="font-size: 11px; margin-bottom: 1mm;"> <div style="font-size: 11px; margin-bottom: 1mm;">
<span style="display: inline-block; width: 100%;font-weight: 700; border-bottom: 1px solid black; padding-bottom: 0.2mm;">${item.code}</span> <span style="display: inline-block; width: 100%;font-weight: 700; border-bottom: 1px solid black;margin-left: 2mm; padding-bottom: 0.2mm;">${item.code}</span>
</div> </div>
<div style="display: flex; align-items: center;"> <div style="display: flex; align-items: center;">
<span style="white-space: nowrap; ">名 称：</span> <span style="white-space: nowrap;margin-left: 2mm ">名 称：</span>
<span style="flex-grow: 1; border-bottom: 1px solid black; margin-left: -1.2mm; padding-bottom: 0.2mm;">${item.name}</span> <span style="flex-grow: 1; border-bottom: 1px solid black; height: 2em; margin-left: 1mm;">${item.name}</span>
</div> </div>
<div style="display: flex; position: absolute; bottom: 2mm; left: 0.1mm; right: 2mm; height: 34mm;"> <div style="display: flex; position: absolute; bottom: 2mm; left: 2mm; right: 2mm; height: 34mm;">
<div style="display: flex; flex-direction: column; justify-content: center; align-items: flex-start; width: 13mm; margin-right: 1mm;"> <div style="display: flex; flex-direction: column; justify-content: center; align-items: flex-start; width: 13mm; margin-right: 1mm;">
<div style="display: flex; align-items: center;"> <span style="font-size: 11px; margin-bottom: 0.5mm; margin-top:2mm; white-space: nowrap;">数 量：${item.amount}</span>
<span style="white-space: nowrap; margin-right: 1mm;">数 量：</span>
<span style="font-size: 11px; margin-bottom: 0.5mm;white-space: nowrap;margin-left: -2.3mm;">${item.amount}</span>
</div>
<span style="font-size: 5px; line-height: 1; margin-top: auto; white-space: nowrap;">${formattedDate}</span> <span style="font-size: 5px; line-height: 1; margin-top: auto; white-space: nowrap;">${formattedDate}</span>
</div> </div>
<div style="width: 34mm; height: 34mm; margin-left: auto; display: flex; align-items: flex-end; justify-content: flex-end;"> <div style="width: 34mm; height: 34mm; margin-left: auto; display: flex; align-items: flex-end; justify-content: flex-end;">

2
mes-ui/mes-ui-admin-vue3/src/views/heli/plan/printFinalDialog.vue
View File

@ -135,7 +135,7 @@ const onPrint = () => {
white-space: nowrap; white-space: nowrap;
} }
.timestamp { .timestamp {
font-size: 12px; font-size: 10px;
line-height: 1; line-height: 1;
margin-left: 0.5mm; margin-left: 0.5mm;
margin-top: auto; margin-top: auto;

11
mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/printDialog.vue
View File

@ -106,20 +106,17 @@ const open = async (bomCode, vals) => {
const qrCodeElement = document.getElementById('qrCodeContainer') const qrCodeElement = document.getElementById('qrCodeContainer')
if (qrCodeElement) { if (qrCodeElement) {
(qrCodeElement.innerHTML += (qrCodeElement.innerHTML +=
`<div style="width: 90mm; height: 60mm; box-sizing: border-box; font-family: monospace; position: relative; background-color: white; color: black;"> `<div style="width: 90mm; height: 60mm; padding: 2mm; box-sizing: border-box; font-family: monospace; position: relative; background-color: white; color: black;">
<div style="font-size: 11px; margin-bottom: 1mm;"> <div style="font-size: 11px; margin-bottom: 1mm;">
<span style="display: inline-block; width: 100%;font-weight: 700; border-bottom: 1px solid black; padding-bottom: 0.2mm;">${item.code}</span> <span style="display: inline-block; width: 100%;font-weight: 700; border-bottom: 1px solid black; padding-bottom: 0.2mm;">${item.code}</span>
</div> </div>
<div style="display: flex; align-items: center;"> <div style="display: flex; align-items: center;">
<span style="white-space: nowrap; margin-right: 1mm;">名 称：</span> <span style="white-space: nowrap; margin-right: 1mm;">名 称：</span>
<span style="flex-grow: 1; border-bottom: 1px solid black; margin-left: -2.5mm;padding-bottom: 0.2mm;">${item.name}</span> <span style="flex-grow: 1; border-bottom: 1px solid black; height: 2em; margin-left: 1mm;">${item.name}</span>
</div> </div>
<div style="display: flex; position: absolute; bottom: 2mm; left: 0.1mm; right: 2mm; height: 34mm;"> <div style="display: flex; position: absolute; bottom: 2mm; left: 2mm; right: 2mm; height: 34mm;">
<div style="display: flex; flex-direction: column; justify-content: center; align-items: flex-start; width: 13mm; margin-right: 1mm;"> <div style="display: flex; flex-direction: column; justify-content: center; align-items: flex-start; width: 13mm; margin-right: 1mm;">
<div style="display: flex; align-items: center;"> <span style="font-size: 11px; margin-bottom: 0.5mm; margin-top:2mm; white-space: nowrap;">数 量：${item.amount}</span>
<span style="white-space: nowrap; margin-right: 1mm;">数 量：</span>
<span style="font-size: 11px; margin-bottom: 0.5mm;white-space: nowrap;margin-left: -2.3mm;">${item.amount}</span>
</div>
<span style="font-size: 5px; line-height: 1; margin-top: auto; white-space: nowrap;">${formattedDate}</span> <span style="font-size: 5px; line-height: 1; margin-top: auto; white-space: nowrap;">${formattedDate}</span>
</div> </div>
<div style="width: 34mm; height: 34mm; margin-left: auto; display: flex; align-items: flex-end; justify-content: flex-end;"> <div style="width: 34mm; height: 34mm; margin-left: auto; display: flex; align-items: flex-end; justify-content: flex-end;">

2
mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/printFinalDialog.vue
View File

@ -130,7 +130,7 @@ const onPrint = () => {
white-space: nowrap; white-space: nowrap;
} }
.timestamp { .timestamp {
font-size: 12px; font-size: 10px;
line-height: 1; line-height: 1;
margin-left: 0.5mm; margin-left: 0.5mm;
margin-top: auto; margin-top: auto;

4
mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/printDialog.vue
View File

@ -86,11 +86,11 @@ const open = async (vals) => {
(qrCodeElement.innerHTML += (qrCodeElement.innerHTML +=
`<div style="width: 90mm; height: 60mm; padding: 2mm; box-sizing: border-box; font-family: monospace; position: relative; background-color: white; color: black;"> `<div style="width: 90mm; height: 60mm; padding: 2mm; box-sizing: border-box; font-family: monospace; position: relative; background-color: white; color: black;">
<div style="font-size: 11px; margin-bottom: 1mm;"> <div style="font-size: 11px; margin-bottom: 1mm;">
<span style="display: inline-block; width: 100%; border-bottom: 1px solid black; padding-bottom: 0.2mm;">物料编码:${item.code}</span> <span style="display: inline-block; width: 100%; border-bottom: 1px solid black; padding-bottom: 0.2mm;">物料编码：${item.code}</span>
</div> </div>
<div style="display: flex; align-items: center;"> <div style="display: flex; align-items: center;">
<span style="white-space: nowrap; margin-right: 1mm;">简 称：</span> <span style="white-space: nowrap; margin-right: 1mm;">简 称：</span>
<span style="flex-grow: 1; border-bottom: 1px solid black; margin-left: -1mm;padding-bottom: 0.2mm;">${item.name}</span> <span style="flex-grow: 1; border-bottom: 1px solid black; height: 2em; margin-left: -1mm;">${item.name}</span>
</div> </div>
<div style="display: flex; position: absolute; bottom: 2mm; left: 2mm; right: 2mm; height: 34mm;"> <div style="display: flex; position: absolute; bottom: 2mm; left: 2mm; right: 2mm; height: 34mm;">
<div style="display: flex; flex-direction: column; justify-content: center; align-items: flex-start; width: 13mm; margin-right: 1mm;"> <div style="display: flex; flex-direction: column; justify-content: center; align-items: flex-start; width: 13mm; margin-right: 1mm;">

2
mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/printFinalDialog.vue
View File

@ -151,7 +151,7 @@ const onPrint = () => {
line-height: 1.2; line-height: 1.2;
} }
.timestamp { .timestamp {
font-size: 12px; font-size: 10px;
line-height: 1; line-height: 1;
margin-left: 0.5mm; margin-left: 0.5mm;
margin-top: auto; margin-top: auto;