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

Compare commits

base: licq:f5195b96c67bce7dbf97bd245c364830ce611f59
Branches Tags
licq:main
..
compare: licq:5c18dc405ece4c53fdcd2418f8a58bdc88e45607
Branches Tags
licq:main

No commits in common. "f5195b96c67bce7dbf97bd245c364830ce611f59" and "5c18dc405ece4c53fdcd2418f8a58bdc88e45607" have entirely different histories.
f5195b96c6 ... 5c18dc405e

6 changed files with 108 additions and 131 deletions
Show Stats Expand all files Collapse all files

2
mes-ui/mes-ui-admin-vue3/.vscode/settings.json vendored
View File

@ -86,7 +86,7 @@
"source.fixAll.eslint": "explicit" "source.fixAll.eslint": "explicit"
}, },
"[vue]": { "[vue]": {
"editor.defaultFormatter": "octref.vetur" "editor.defaultFormatter": "stylelint.vscode-stylelint"
}, },
"i18n-ally.localesPaths": ["src/locales"], "i18n-ally.localesPaths": ["src/locales"],
"i18n-ally.keystyle": "nested", "i18n-ally.keystyle": "nested",

2
mes-ui/mes-ui-admin-vue3/package.json
View File

@ -6,7 +6,7 @@
"private": false, "private": false,
"scripts": { "scripts": {
"i": "pnpm install", "i": "pnpm install",
"dev": "vite --mode dev", "dev": "vite --mode base",
"front": "vite --mode front", "front": "vite --mode front",
"ts:check": "vue-tsc --noEmit", "ts:check": "vue-tsc --noEmit",
"build:pro": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode pro", "build:pro": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode pro",

57
mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue
View File

@ -162,13 +162,13 @@ link type="primary" @click="editReceivingStatus(scope.row.id)"
<div class="print-header"> <div class="print-header">
<div class="order-info"> <div class="order-info">
<div style="display: flex;"> <div style="display: flex;">
<span style="width: 190px;white-space: nowrap;">订单编号：{{ printData.purchaseNo }}</span> <span style="width: 210px;">订单编号：{{ printData.purchaseNo }}</span>
<span style="margin-left:10px; width: 150px;">订单日期：{{ formatDate(printData.ordDate) }}</span> <span style="margin-left:20px; width: 170px;">订单日期：{{ formatDate(printData.ordDate) }}</span>
<span style="margin-left:10px;width: 220px;white-space: nowrap;">供应商：{{ printData.supplierName }}</span> <span style="margin-left:20px;width: 250px">供应商：{{ printData.supplierName }}</span>
</div> </div>
<div style="display: flex;"> <div style="display: flex;">
<span style="margin-left:10px;width: 100px">联系人：{{ printData.contactName }}</span> <span style="margin-left:20px;width: 110px">联系人：{{ printData.contactName }}</span>
<span style="margin-left:10px;width: 140px">电话：{{ printData.contactMobile }}</span> <span style="margin-left:20px;width: 150px">电话：{{ printData.contactMobile }}</span>
</div> </div>
</div> </div>
@ -493,10 +493,6 @@ function doPrint() {
<head> <head>
<title >采购单</title> <title >采购单</title>
<style> <style>
@page {
size: 241mm 140mm;
margin: 5mm;
}
body { body {
font-family: Arial, sans-serif; font-family: Arial, sans-serif;
margin: 10px; margin: 10px;
@ -511,7 +507,6 @@ function doPrint() {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
align-items: center; align-items: center;
padding-left:8px
} }
@ -520,47 +515,36 @@ function doPrint() {
} }
.stamp-info span{ .stamp-info span{
font-size: 12px !important; font-size: 15px !important;
} }
.order-info span{ .order-info span{
font-size: 12px !important; font-size: 15px !important;
} }
.print-table { .print-table {
width: 100%; width: 100%;
border-collapse: collapse; border-collapse: collapse;
margin-top: 10px; margin-top: 10px;
table-layout: fixed;
border: 2px solid #000 !important; /* 加粗外边框 */
} }
.print-table th, .print-table td { .print-table th, .print-table td {
border: 1px solid #000 !important; /* 使用黑色边框，更清晰 */ border: 1px solid #ddd;
padding: 2px 0px; padding: 5px;
text-align: center; text-align: center;
height: auto; height: 20px; /* 设置固定高度 */
min-height: 26px; line-height: 20px; /* 垂直居中 */
// line-height: 1.2;
word-wrap: break-word;
word-break: break-all;
vertical-align: center;
} }
.print-table th { .print-table th {
background-color: #f5f5f5; background-color: #f5f5f5;
font-weight: bold;
border: 1px solid #000 !important;
} }
/* 特别加强最后一列（备注列）的右边框 */ @media print {
.print-table th:last-child, body { margin: 0; }
.print-table td:last-child { .print-content {
border-right: 2px solid #000 !important; width: 100%;
white-space: normal !important; margin: 0;
word-wrap: break-word !important; padding: 10px;
word-break: break-all !important; }
overflow-wrap: break-word !important;
padding: 4px 2px;
} }
</style> </style>
</head> </head>
<body> <body>
@ -583,7 +567,6 @@ function limitTo20Chars(input) {
return input.length > 20 ? input.slice(0, 20) : input; return input.length > 20 ? input.slice(0, 20) : input;
} }
</script> </script>
<style scoped> <style scoped>
/* 打印样式 */ /* 打印样式 */
@media print { @media print {
@ -620,7 +603,7 @@ function limitTo20Chars(input) {
} }
.order-info span { .order-info span {
font-size: 12px !important; font-size: 15px !important;
margin-right: 10px !important; margin-right: 10px !important;
} }
.stamp-info { .stamp-info {
@ -628,7 +611,7 @@ function limitTo20Chars(input) {
} }
.stamp-info span{ .stamp-info span{
font-size: 12px !important; font-size: 15px !important;
} }
.print-table { .print-table {

57
mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/detail.vue
View File

@ -100,13 +100,13 @@
<div class="print-header"> <div class="print-header">
<div class="order-info"> <div class="order-info">
<div style="display: flex;"> <div style="display: flex;">
<span style="width: 200px;">订单编号：{{ printData.purchaseNo }}</span> <span style="width: 210px;">订单编号：{{ printData.purchaseNo }}</span>
<span style="margin-left:10px; width: 110px;">订单日期：{{ formatDate(printData.ordDate) }}</span> <span style="margin-left:20px; width: 170px;">订单日期：{{ formatDate(printData.ordDate) }}</span>
<span style="margin-left:10px;width: 210px; white-space: nowrap;">供应商：{{ printData.supplierName }}</span> <span style="margin-left:20px;width: 250px">供应商：{{ printData.supplierName }}</span>
</div> </div>
<div style="display: flex;"> <div style="display: flex;">
<span style="margin-left:10px;width: 100px">联系人：{{ printData.contactName }}</span> <span style="margin-left:20px;width: 110px">联系人：{{ printData.contactName }}</span>
<span style="margin-left:10px;width: 100px">电话：{{ printData.contactMobile }}</span> <span style="margin-left:20px;width: 150px">电话：{{ printData.contactMobile }}</span>
</div> </div>
</div> </div>
@ -326,10 +326,6 @@ function doPrint() {
<head> <head>
<title >采购单</title> <title >采购单</title>
<style> <style>
@page {
size: 241mm 140mm;
margin: 5mm;
}
body { body {
font-family: Arial, sans-serif; font-family: Arial, sans-serif;
margin: 10px; margin: 10px;
@ -344,7 +340,6 @@ function doPrint() {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
align-items: center; align-items: center;
padding-left:8px
} }
@ -353,47 +348,36 @@ function doPrint() {
} }
.stamp-info span{ .stamp-info span{
font-size: 12px !important; font-size: 15px !important;
} }
.order-info span{ .order-info span{
font-size: 12px !important; font-size: 15px !important;
} }
.print-table { .print-table {
width: 100%; width: 100%;
border-collapse: collapse; border-collapse: collapse;
margin-top: 10px; margin-top: 10px;
table-layout: fixed;
border: 2px solid #000 !important; /* 加粗外边框 */
} }
.print-table th, .print-table td { .print-table th, .print-table td {
border: 1px solid #000 !important; /* 使用黑色边框，更清晰 */ border: 1px solid #ddd;
padding: 2px 0px; padding: 5px;
text-align: center; text-align: center;
height: auto; height: 20px; /* 设置固定高度 */
min-height: 26px; line-height: 20px; /* 垂直居中 */
// line-height: 1.2;
word-wrap: break-word;
word-break: break-all;
vertical-align: center;
} }
.print-table th { .print-table th {
background-color: #f5f5f5; background-color: #f5f5f5;
font-weight: bold;
border: 1px solid #000 !important;
} }
/* 特别加强最后一列（备注列）的右边框 */ @media print {
.print-table th:last-child, body { margin: 0; }
.print-table td:last-child { .print-content {
border-right: 2px solid #000 !important; width: 100%;
white-space: normal !important; margin: 0;
word-wrap: break-word !important; padding: 10px;
word-break: break-all !important; }
overflow-wrap: break-word !important;
padding: 4px 2px;
} }
</style> </style>
</head> </head>
<body> <body>
@ -503,7 +487,7 @@ const getList = async () => {
} }
.order-info span { .order-info span {
font-size: 12px !important; font-size: 15px !important;
margin-right: 10px !important; margin-right: 10px !important;
} }
.stamp-info { .stamp-info {
@ -511,7 +495,7 @@ const getList = async () => {
} }
.stamp-info span{ .stamp-info span{
font-size: 12px !important; font-size: 15px !important;
} }
.print-table { .print-table {
@ -542,4 +526,3 @@ const getList = async () => {
</style> </style>

70
mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/managementdetail.vue
View File

@ -79,13 +79,13 @@
<div class="print-header"> <div class="print-header">
<div class="order-info"> <div class="order-info">
<div style="display: flex;"> <div style="display: flex;">
<span style="width: 200px;">订单编号：{{ printData.purchaseNo }}</span> <span style="width: 210px;">订单编号：{{ printData.purchaseNo }}</span>
<span style="margin-left:10px; width: 140px;">订单日期：{{ formatDate(printData.ordDate) }}</span> <span style="margin-left:20px; width: 170px;">订单日期：{{ formatDate(printData.ordDate) }}</span>
<span style="margin-left:10px;width: 220px">供应商：{{ printData.supplierName }}</span> <span style="margin-left:20px;width: 250px">供应商：{{ printData.supplierName }}</span>
</div> </div>
<div style="display: flex;"> <div style="display: flex;">
<span style="margin-left:10px;width: 100px">联系人：{{ printData.contactName }}</span> <span style="margin-left:20px;width: 110px">联系人：{{ printData.contactName }}</span>
<span style="margin-left:10px;width: 120px">电话：{{ printData.contactMobile }}</span> <span style="margin-left:20px;width: 150px">电话：{{ printData.contactMobile }}</span>
</div> </div>
</div> </div>
@ -152,17 +152,17 @@
</table> </table>
<div class="order-info" style="margin-top: 10px;border-bottom: 1px solid #ccc;padding-bottom: 10px;"> <div class="order-info" style="margin-top: 10px;border-bottom: 1px solid #ccc;padding-bottom: 10px;">
<div style="display: flex;width: 40%;"> <div style="display: flex;width: 40%;">
<span style="white-space: nowrap;">交货地址：{{ printData.deliveryAddress }}</span> <span >交货地址：{{ printData.deliveryAddress }}</span>
</div>
</div>
<div style="display: flex;width: 20%;justify-content: center;"> <div style="display: flex;width: 20%;justify-content: center;">
<span style="margin-left: 20px; width: 150px; white-space: nowrap;">审核：{{ printData.auditorName }}</span> <span style="margin-left:20px;width: 150px">审核：{{ printData.auditorName }}</span>
<span style="margin-left: 20px; width: 120px; white-space: nowrap;">签字区</span> <span style="margin-left:20px;width: 120px">签字区</span>
</div>
</div>
<div style="display: flex; width: 40%;justify-content: right;"> <div style="display: flex; width: 40%;justify-content: right;">
<span style="margin-left: 20px; width: 130px; white-space: nowrap;">接收人：{{ printData.username }}</span> <span style="margin-left:20px;width: 130px">接收人：{{ printData.username }}</span>
<span style="margin-left: 20px; width: 150px; white-space: nowrap;">电话：{{ printData.userMobile }}</span> <span style="margin-left:20px;width: 150px">电话：{{ printData.userMobile }}</span>
</div> </div>
</div> </div>
@ -302,10 +302,6 @@ function doPrint() {
<head> <head>
<title >采购单</title> <title >采购单</title>
<style> <style>
@page {
size: 241mm 140mm;
margin: 5mm;
}
body { body {
font-family: Arial, sans-serif; font-family: Arial, sans-serif;
margin: 10px; margin: 10px;
@ -320,7 +316,6 @@ function doPrint() {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
align-items: center; align-items: center;
padding-left:8px
} }
@ -329,47 +324,36 @@ function doPrint() {
} }
.stamp-info span{ .stamp-info span{
font-size: 12px !important; font-size: 15px !important;
} }
.order-info span{ .order-info span{
font-size: 12px !important; font-size: 15px !important;
} }
.print-table { .print-table {
width: 100%; width: 100%;
border-collapse: collapse; border-collapse: collapse;
margin-top: 10px; margin-top: 10px;
table-layout: fixed;
border: 2px solid #000 !important; /* 加粗外边框 */
} }
.print-table th, .print-table td { .print-table th, .print-table td {
border: 1px solid #000 !important; /* 使用黑色边框，更清晰 */ border: 1px solid #ddd;
padding: 2px 0px; padding: 5px;
text-align: center; text-align: center;
height: auto; height: 20px; /* 设置固定高度 */
min-height: 26px; line-height: 20px; /* 垂直居中 */
// line-height: 1.2;
word-wrap: break-word;
word-break: break-all;
vertical-align: center;
} }
.print-table th { .print-table th {
background-color: #f5f5f5; background-color: #f5f5f5;
font-weight: bold;
border: 1px solid #000 !important;
} }
/* 特别加强最后一列（备注列）的右边框 */ @media print {
.print-table th:last-child, body { margin: 0; }
.print-table td:last-child { .print-content {
border-right: 2px solid #000 !important; width: 100%;
white-space: normal !important; margin: 0;
word-wrap: break-word !important; padding: 10px;
word-break: break-all !important; }
overflow-wrap: break-word !important;
padding: 4px 2px;
} }
</style> </style>
</head> </head>
<body> <body>
@ -458,7 +442,7 @@ const getList = async () => {
} }
.order-info span { .order-info span {
font-size: 12px !important; font-size: 15px !important;
margin-right: 10px !important; margin-right: 10px !important;
} }
.stamp-info { .stamp-info {
@ -466,7 +450,7 @@ const getList = async () => {
} }
.stamp-info span{ .stamp-info span{
font-size: 12px !important; font-size: 15px !important;
} }
.print-table { .print-table {

41
mes-ui/mes-ui-admin-vue3/src/views/heli/storagein/detail.vue
View File

@ -273,10 +273,6 @@ function doPrint() {
<head> <head>
<title >入库单</title> <title >入库单</title>
<style> <style>
@page {
size: 241mm 140mm;
margin: 5mm;
}
body { body {
font-family: Arial, sans-serif; font-family: Arial, sans-serif;
margin: 10px; margin: 10px;
@ -316,11 +312,11 @@ function doPrint() {
} }
.print-table th, .print-table td { .print-table th, .print-table td {
border: 1px solid #000 !important; /* 使用黑色边框，更清晰 */ border: 1px solid #000 !important; /* 使用黑色边框，更清晰 */
padding: 2px 0px; padding: 4px;
text-align: center; text-align: center;
height: auto; height: auto;
min-height: 26px; min-height: 30px;
line-height: 1.2; line-height: 1.4;
word-wrap: break-word; word-wrap: break-word;
word-break: break-all; word-break: break-all;
vertical-align: top; vertical-align: top;
@ -340,6 +336,37 @@ function doPrint() {
overflow-wrap: break-word !important; overflow-wrap: break-word !important;
padding: 4px 2px; padding: 4px 2px;
} }
@media print {
body {
margin: 0;
-webkit-print-color-adjust: exact !important;
color-adjust: exact !important;
}
.print-content {
width: 100%;
margin: 0;
padding: 8px; /* 减少内边距，避免被裁剪 */
box-sizing: border-box;
}
.print-table {
page-break-inside: avoid;
border: 2px solid #000 !important;
width: 98% !important; /* 稍微减小宽度，避免右边框被裁剪 */
margin: 0 auto;
margin-top:10px
}
.print-table th, .print-table td {
border: 1px solid #000 !important;
-webkit-print-color-adjust: exact !important;
color-adjust: exact !important;
}
.print-table th:last-child,
.print-table td:last-child {
border-right: 2px solid #000 !important;
white-space: normal !important;
word-wrap: break-word !important;
}
}
</style> </style>
</head> </head>
<body> <body>