From edc227277159601c5cb86829f1c5ce14cf7903a4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 24 九月 2024 10:12:55 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue | 152 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 104 insertions(+), 48 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
index 0e51d94..143dfd5 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
@@ -12,8 +12,12 @@
let router = useRouter()
let produceList = ref([])
let labelList = ref([])
-let list = ref([])
let projectNo = ref([])
+let type = ref([])
+let orderId = ref([])
+const data = ref({
+ printList: []
+})
@@ -21,31 +25,42 @@
const {currentRoute} = useRouter()
const route = currentRoute.value
projectNo.value = route.query.projectNo
+type.value = route.query.type
onMounted(() => {
-
- request.post(`/processCard/getSelectPrintLabel/${projectNo.value}`).then((res) => {
- if (res.code == 200) {
- console.log(res.data.data)
- produceList.value = deepClone(res.data.data)
-
- /*for (let i = 0; i < produceList.value.length; i++) {
- let count= produceList.value[i].data.length
- for (let j = 0; j < count; j++) {
- for (let k = 0; k < produceList.value[i].data[j].quantity; k++){
- labelList.value.push(produceList.value[i].data[j])
- }
-
-
+ if(projectNo.value!=null){
+ request.post(`/processCard/getSelectPrintLabel/${projectNo.value}/${type.value}`).then((res) => {
+ if (res.code == 200) {
+ labelList.value = deepClone(res.data.data)
+ } else {
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ })
+ }else{
+ data.value.printList = JSON.parse(route.query.printList)
+ request.post(`/processCard/getSelectPrintLabel1`,data.value).then((res) => {
+ if (res.code == 200) {
+ produceList.value = deepClone(res.data.data)
+ for (let i = 0; i < produceList.value.length; i++) {
+ let count= produceList.value[i].data.length
+ for (let j = 0; j < count; j++) {
+ for (let k = 0; k < produceList.value[i].data[j].quantity; k++){
+ labelList.value.push(produceList.value[i].data[j])
}
- }
- console.log(labelList.value)*/
- } else {
- ElMessage.warning(res.msg)
- router.push("/login")
- }
- })
- }
+
+ }
+ }
+ } else {
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ })
+ }
+
+
+
+}
)
@@ -69,7 +84,11 @@
style.innerHTML =
"body>#" +
printId +
- "{display:none}@media print{body>:not(#" +
+ "{display:none}@media print{" +
+ "@page {" +
+ " size: auto; " +
+ " margin: 13mm 4mm 0mm 4mm; " +
+ " }body>:not(#" +
printId +
"){display:none !important}body>#" +
printId +
@@ -111,19 +130,28 @@
</div>
</div>
</div>-->
- <div id="entirety" v-for="(item,id) in produceList" >
- <div class="row1">{{ item.customer_name }}</div>
- <div class="row2">
- <span>{{ item.order_id }}</span>
- <span>{{ item.type_name }}</span>
+ <div id="entirety" v-for="(item,id) in labelList" >
+ <div class="row1">
+
+ <div class="cell" v-if="item.heat_layout_id!=null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
+ <span>{{ item.customer_name }}</span>
+ <span>{{ item.order_id }}</span>
+ <span v-if="item.process.includes('澶硅兌')">鑳剁墖</span>
+ <span v-else-if="item.process.includes('涓┖')">涓┖</span>
+ <span v-else-if="item.process.includes('鐧惧彾')">鐧惧彾</span>
+ <span v-else></span>
+
</div>
- <div class="row3">{{item.width}}*{{item.height}}={{item.quantity}}</div>
+
+ <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
+ <div class="row3" v-else>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</div>
<div class="row5">
- <span>{{item.project}}</span>
+ <span>{{item.project}}</span>
<span>{{ item.building_number }}</span>
+ <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
</div>
<div class="row6">
- <span>{{item.glass_child}}</span>
+ <span>{{item.glass_child}}</span>
<span>{{item.processing_note}}</span>
</div>
</div>
@@ -147,63 +175,91 @@
justify-content: left;
flex-wrap: wrap;
margin-left: 5px;
- margin-top: 15px;
}
#entirety{
text-align: center;
- width: 195px;
+ width: 180px;
height: 87px;
margin-bottom: 10px;
+ margin-right: 5px;
+ overflow: hidden;
+ white-space: nowrap;
}
.row1 {
font-size: 8pt;
font-weight: bold;
- height: 16px;
+ height: 20px;
+}
+.row1 span {
+ font-size: 10pt;
+ font-weight: bold;
}
.row2 {
font-size: 8pt;
font-weight: bold;
- height: 16px;
+ height: 20px;
}
span {
- font-size: 8pt;
+ font-size: 10pt;
font-weight: bold;
}
+
+
+
+
+
+
+
.row3 {
margin-top: -5px;
- height: 19px;
- font-size: 12pt;
+ height: 25px;
+ font-size: 15pt;
font-weight: bolder;
}
.row5 {
- height: 15px;
+ height: 20px;
font-weight: bold;
font-size: 8pt;
+}
+.row5 span {
+ font-size: 10pt;
+ font-weight: bold;
}
.row6 {
- height: 15px;
+ height: 20px;
font-weight: bold;
font-size: 8pt;
}
-
-
-
-@page {
- size: auto; /* auto is the initial value */
- margin: 7mm 2mm 2mm 0mm /* this affects the margin in the printer settings */
-
+.row6 span {
+ font-size: 10pt;
+ font-weight: bold;
}
+.cell{
+ position: absolute;
+ font-weight: bold;
+ margin-left: 5px;
+ margin-top: 0px;
+}
+
+
+
+
@media print {
div {
page-break-inside: avoid;
}
+ @page {
+ size: auto; /* auto is the initial value */
+ margin: 13mm 4mm 0mm 4mm; /* this affects the margin in the printer settings */
+
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0