From 2c98be64470f8298d3083ce337b0ffb948bee5f7 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 09 六月 2025 16:45:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue
index 1cc3f5a..dcea140 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelTwo.vue
@@ -75,12 +75,14 @@
}
})
labelList = a
+
+ props.lastList.length = 0;
for (let i = 0; i < list.value.length; i++) {
let count = list.value[i].data.length
for (let j = 0; j < count; j++) {
- // for (let k = 0; k < list.value[i].data[j].quantity; k++) {
+ for (let k = 0; k < list.value[i].data[j].quantity; k++) {
props.lastList.push(list.value[i].data[j])
- // }
+ }
}
}
} else {
@@ -168,16 +170,20 @@
</script>
<template>
- <div id="print" :class="company.printLabel.className.semi.printFlowCardName()">
- <div v-for="(item1,id) in props.lastList" :class="company.printLabel.className.semi.entiretyName()">
+ <div id="print" class="printFlowCard_semi">
+
+ <template v-for="(item1,id) in props.lastList">
+ <div class="entirety_semi">
<div class="row4">{{ faceOrientation }}</div>
- <div v-for="(item,id) in labelList" :class="company.printLabel.className.semi.contentRowName()">
+ <div v-for="(item,id) in labelList" class="contentRow">
<div contenteditable="true" v-if="item1[item.name] != null && item1[item.name] !== ''" class="row1" @input="updateProductName($event, id,index)">{{ 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 v-if="(id + 1) % 2 === 0" class="pagebreak"></div>
- </div>
+ </div>
+ <div v-if="(id + 1) % 2 === 0" class="pagebreak"></div>
+ </template>
+
</div>
--
Gitblit v1.8.0