From ace95320b2520e9c16cf09b7673ca52935756e97 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 25 七月 2024 16:56:47 +0800
Subject: [PATCH] 补片返工审核添加编号字段，标签打印打印方式修改成和流程卡打印相同，补片同步修改，修改流程卡打印查询和不同配置流程卡打印方式，添加部分字段
---
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue
similarity index 92%
rename from north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi.vue
rename to north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue
index 8212be1..1f721b4 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue
@@ -26,13 +26,19 @@
printList: []
})
+let props = defineProps({
+ list:null,//鍕鹃�夌殑鏁版嵁
+ faceOrientation:null,//鍐呭闈�
+ type:null,//鏍囩妯℃澘
+ lableType:null//鏍囩绫诲瀷
+})
const {currentRoute} = useRouter()
const route = currentRoute.value
-data.value.printList = JSON.parse(route.query.printList)
-const type = route.query.type
-const faceOrientation = route.query.faceOrientation
-const lableType = route.query.lableType
+let type = props.type
+let faceOrientation = props.faceOrientation
+let lableType = props.lableType
+data.value.printList = JSON.parse(props.list)
onMounted(() => {
request.post(`/processCard/getSelectPrintCustomLabel/${type}/${lableType}`, data.value).then((res) => {
@@ -86,7 +92,6 @@
"{display:block;padding-top:1px}}";
//
content.innerHTML = el.outerHTML;
- // // console.log("el.outerHTML", el.outerHTML);
body.appendChild(style);
// 涓巗tyle鍏冪礌璁剧疆鐨勬牱寮忕浉閰嶅悎
@@ -101,7 +106,6 @@
</script>
<template>
- <el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>
<div id="print" :class="company.printLabel.className.semi.printFlowCardName()">
<div v-for="(item1,id) in lastList" :class="company.printLabel.className.semi.entiretyName()">
<div class="row4">{{ faceOrientation }}</div>
@@ -185,7 +189,7 @@
@page {
size: auto;
- margin: 2mm 2mm 0mm 2mm;
+ margin: 0mm 0mm 0mm 4mm;
}
--
Gitblit v1.8.0