From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整
---
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue
index 1f721b4..1309298 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue
@@ -30,7 +30,9 @@
list:null,//鍕鹃�夌殑鏁版嵁
faceOrientation:null,//鍐呭闈�
type:null,//鏍囩妯℃澘
- lableType:null//鏍囩绫诲瀷
+ lableType:null,//鏍囩绫诲瀷
+ titleList:null,//鏍囬
+ switch:null//鍒ゆ柇鏄惁涓烘柊鎵撳嵃
})
const {currentRoute} = useRouter()
@@ -38,8 +40,8 @@
let type = props.type
let faceOrientation = props.faceOrientation
let lableType = props.lableType
+let switchType = props.switch
data.value.printList = JSON.parse(props.list)
-
onMounted(() => {
request.post(`/processCard/getSelectPrintCustomLabel/${type}/${lableType}`, data.value).then((res) => {
if (res.code == 200) {
@@ -48,7 +50,11 @@
list.value = deepClone(res.data.data)
const data = produceList.value[0].value
dataList = JSON.parse(`[${data}]`);
- labelList = dataList[0]
+ if (switchType===true){
+ labelList = props.titleList
+ }else {
+ labelList = dataList[0]
+ }
for (let i = 0; i < list.value.length; i++) {
let count= list.value[i].data.length
for (let j = 0; j < count; j++) {
@@ -59,7 +65,6 @@
}
} else {
ElMessage.warning(res.msg)
- router.push("/login")
}
})
@@ -109,10 +114,9 @@
<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>
- <div v-for="(item,id) in labelList" :class="company.printLabel.className.semi.contentRowName()">
- <div v-if="item.title==null" class="row1">{{ item.title }}</div>
- <div v-else class="row1">{{ item.title }}:</div>
- <div class="row2">{{ item1[item.name] }}</div>
+ <div v-for="(item,id) in labelList" :class="company.printLabel.className.semi.contentRowName()">
+ <div contenteditable="true" v-if="item1[item.name] != null && item1[item.name] !== ''" class="row1" >{{ item.title }}锛歿{ item1[item.name] }}</div>
+<!-- <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row2">{{ item1[item.name] }}</div>-->
</div>
<div v-html="company.printLabel.customSemi(item1)"></div>
</div>
@@ -128,7 +132,7 @@
body{
overflow: hidden;
- font-family: 'Microsoft YaHei', '寰蒋闆呴粦', sans-serif;
+ font-family: Arial;
}
@@ -173,27 +177,26 @@
}
.contentRow .row1{
- width: 30%;
- font-weight: bolder;
+ width: 100%;
}
.entirety_semi .row4{
- font-weight: bolder;
text-align: right;
}
.contentRow .row1,.contentRow .row2{
text-align: left;
- font-weight: bolder;
}
-@page {
- size: auto;
- margin: 0mm 0mm 0mm 4mm;
-}
@media print {
+ @page {
+ size: auto;
+ margin: 0mm 0mm 0mm 4mm;
+
+ }
+
div {
page-break-inside: avoid;
}
--
Gitblit v1.8.0