From 8738b8e0f7cfa65732bfc0e40fa80e1ca3c7e27e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 19 十月 2024 08:07:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue b/UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue
index 9e204b5..35c3a2d 100644
--- a/UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue
+++ b/UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue
@@ -1,8 +1,7 @@
<script setup>
import request from "@/utils/request"
-import {ElDatePicker, ElMessage} from "element-plus"
-import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
-import {Search} from "@element-plus/icons-vue"
+import {ElMessage} from "element-plus"
+import {onMounted, ref} from "vue"
// import {useRouter} from 'vue-router'
// import {changeFilterEvent, filterChanged} from "@/hook"
// import {useI18n} from 'vue-i18n'
@@ -36,14 +35,15 @@
let props = defineProps({
printFlowCardId: null,
printLayer: null,
+ printGlassId: null,
})
onMounted(async () => {
- console.log(props.printFlowCardId,props.printLayer)
- const response = await request.post('/unLoadGlass/downGlassInfo/downGlassLabelPrint',{
- flowCardId:props.printFlowCardId,
- layer:props.printLayer
- });
+ const response = await request.post('/unLoadGlass/downGlassInfo/downGlassLabelPrint', {
+ flowCardId: props.printFlowCardId,
+ layer: props.printLayer,
+ glassId: props.printGlassId
+ });
if (response.code == 200) {
console.log("lastList.value",response.data)
lastList.value=response.data;
@@ -127,6 +127,7 @@
</div>
</div>
<div style="width: 20px" v-if="index%2===0"></div>
+ <div class="print-page" v-else></div>
</template>
</div>
@@ -152,10 +153,11 @@
#entirety{
text-align: center;
- width: 48%;
- height: 160px;
+ width: 46%;
+ height: 170px;
border: black 1px;
word-wrap: break-word;
+ margin-left: 10px;
}
.row1 {
@@ -192,7 +194,7 @@
height: 50px;
font-weight: bold;
font-size: 12pt;
- margin-left: 20px;
+ /* margin-left: 20px; */
}
.row5 span {
font-size: 12pt;
@@ -209,6 +211,9 @@
@media print {
+ .print-page {
+ page-break-after: always; /* 娣诲姞鍒嗛〉绗︼紝鍦ㄦ瘡涓猵rint-page div涔嬪悗鍒嗛〉 */
+ }
div {
page-break-inside: avoid;
}
--
Gitblit v1.8.0