From 82a5de6d2ec80b45660149c84be28734032562f6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 11 十月 2024 15:21:53 +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/PrintCustomLabel1.vue | 258 +++++++++++++++++++++++----------------------------
1 files changed, 115 insertions(+), 143 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue
index 0295f60..10b0e38 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue
@@ -18,7 +18,7 @@
let titleList = ref([])
let dataList = ref([])
let list = ref([])
-let lastList = ref([])
+let lastList=ref([])
let filterData = ref({})
@@ -33,40 +33,63 @@
const type = route.query.type
const faceOrientation = route.query.faceOrientation
const lableType = route.query.lableType
+const printType=route.query.printType
onMounted(() => {
- request.post(`/processCard/getSelectPrintCustomLabel/${type}`, data.value).then((res) => {
- if (res.code == 200) {
-
- produceList.value = deepClone(res.data.title)
- list.value = deepClone(res.data.data)
- const data = produceList.value[0].value
- dataList = JSON.parse(`[${data}]`);
- 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++) {
- for (let k = 0; k < list.value[i].data[j].quantity; k++) {
- lastList.value.push(list.value[i].data[j])
- }
+ console.log(printType)
+ if(printType==1){
+ request.post(`/processCard/getSelectPrintCustomLabel/${type}/1`, data.value).then((res) => {
+ if (res.code == 200) {
+ produceList.value = deepClone(res.data.title)
+ list.value = deepClone(res.data.data)
+ const data = produceList.value[0].value
+ dataList = JSON.parse(`[${data}]`);
+ 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++) {
+ for (let k = 0; k < list.value[i].data[j].quantity; k++){
+ lastList.value.push(list.value[i].data[j])
}
}
- } else {
- ElMessage.warning(res.msg)
- router.push("/login")
}
- })
+ } else {
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ })
+ }else if(printType==2){
+ request.post(`/processCard/getSelectPrintCustomLabelDetails/${type}/1`, data.value).then((res) => {
+ if (res.code == 200) {
+ produceList.value = deepClone(res.data.title)
+ list.value = deepClone(res.data.data)
+ const data = produceList.value[0].value
+ dataList = JSON.parse(`[${data}]`);
- }
-)
+ 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++) {
+ for (let k = 0; k < list.value[i].data[j].quantity; k++) {
+ lastList.value.push(list.value[i].data[j])
+ }
+ }
+ }
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+ }
+})
// 鎵撳嵃鏂规硶
const printFlowCard = () => {
// 闇�瑕佹墦鍗扮殑灞�閮ㄥ尯鍩熻祴浜�"print-wrap"鐨刬d
- let el = document.getElementById("print");
+ let el = document.getElementById("printFlowCard");
let doc = document;
let body = doc.body || doc.getElementsByTagName("body")[0];
let printId = "print-" + Date.now();
@@ -80,7 +103,11 @@
style.innerHTML =
"body>#" +
printId +
- "{display:none}@media print{body>:not(#" +
+ "{display:none}@media print{" +
+ "@page {" +
+ " size: auto; " +
+ " margin: 12mm 4mm 2mm 6mm; " +
+ " }body>:not(#" +
printId +
"){display:none !important}body>#" +
printId +
@@ -104,20 +131,20 @@
<template>
<el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>
<div id="printFlowCard" >
- <div id="entirety" v-for="(item,id) in labelList" >
- <div class="row1">{{ item.customer_name }}</div>
+ <div id="entirety" v-for="(item,id) in lastList" >
+ <div class="row1">
+ <span>{{ item.customerAbbreviation }}</span>
+ <span>{{ item.orderId }}</span>
+ </div>
<div class="row2">
- <span>{{ item.order_id }}</span>
- <span>{{ item.type_name }}</span>
+ <span>{{ item.project }}</span>
+ <span>{{ item.buildingNumber }}</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.building_number }}</span>
- </div>
- <div class="row6">
- <span>{{item.glass_child}}</span>
- <span>{{item.processing_note}}</span>
+ <span>{{item.filmNumber}}</span>
+ <span>{{ item.processingNote }}</span>
</div>
</div>
</div>
@@ -130,141 +157,86 @@
padding: 0;
}
-body {
- font-weight: bolder;
- overflow: hidden;
-}
-
#printButton {
- margin-top: -20px;
+ /*margin-top: -20px;*/
width: 100px;
}
-/*鎴�*/
-.printFlowCard_finished {
- /*
- font-family: 'Microsoft YaHei', '寰蒋闆呴粦', sans-serif;
- */
+#printFlowCard {
+ justify-content: left;
flex-wrap: wrap;
- font-size: 12pt;
- display: flex;
- flex-direction: column;
+ margin-left: 5px;
+
}
-
-/*鎴�*/
-.entirety_finished {
- display: flex;
+#entirety{
+ margin-top: 15px;
text-align: center;
- flex-direction: column;
- margin-left: 10px;
- width: 100%;
- height: 100%;
-
+ width: 337px;
+ height: 120px;
}
-/*div{
- font-family: 'Microsoft YaHei', '寰蒋闆呴粦', sans-serif;
-}*/
+.row1 {
+ font-size: 12pt;
+ font-weight: bold;
+ height: 25px;
+}
+
+.row2 {
+ font-size: 12pt;
+ font-weight: bold;
+ height: 25px;
+}
+span {
+ font-size: 15pt;
+ font-weight: bold;
+}
.row3 {
- text-align: center;
- font-weight: bolder;
- font-size: 22px;
- /*display: flex;
- justify-content:space-evenly;*/
-}
-
-.row3 label {
- font-size: 22px;
- margin-top: 28px;
-}
-
-.contentRow {
- font-weight: bolder;
- display: flex;
- text-align: center;
- width: 100%;
-}
-
-label {
- font-weight: bolder;
- /*font-family: 'Microsoft YaHei', '寰蒋闆呴粦', sans-serif;*/
-}
-
-.contentRow .row1 {
- width: 30%;
+ margin-top: -5px;
+ height: 30px;
+ font-size: 22pt;
font-weight: bolder;
}
-.entirety_finished .row4 {
- font-weight: bolder;
- text-align: right;
- margin-right: 10px;
-}
-
-.contentRow .row1, .contentRow .row2 {
+.row5 {
text-align: left;
- font-weight: bolder;
+ height: 25px;
+ font-weight: bold;
+ font-size: 15pt;
+ margin-left: 40px;
+}
+.row1 span{
+ font-size: 17pt;
+}
+
+.row2 span{
+ font-size: 17pt;
+}
+
+.row5 span{
+ font-size: 17pt;
+}
+
+.row6 {
+ height: 15px;
+ font-weight: bold;
+ font-size: 8pt;
}
-@page {
- size: auto; /* auto is the initial value */
- margin: 13mm 4mm 0mm 6mm; /* this affects the margin in the printer settings */
-}
+
+
@media print {
div {
page-break-inside: avoid;
}
+ @page {
+ size: auto; /* auto is the initial value */
+ margin: 12mm 4mm 2mm 6mm; /* this affects the margin in the printer settings */
- .entirety_finished {
- page-break-before: always;
}
-
-}
-
-.printFlowCard_finished1 {
- flex-wrap: wrap;
- font-size: 8pt;
- display: flex;
- flex-direction: column;
-}
-
-
-/*鎴�*/
-.entirety_finished1 {
- display: flex;
- text-align: center;
- flex-direction: column;
- margin-left: 10px;
- width: 337px;
- height: 120px;
-
-}
-
-.contentRow1 {
- font-weight: bolder;
- display: flex;
- text-align: center;
- width: 100%;
-}
-
-.contentRow1 .row1 {
- width: 30%;
- font-weight: bolder;
-}
-
-.entirety_finished1 .row4 {
- font-weight: bolder;
- text-align: right;
- margin-right: 10px;
-}
-
-.contentRow1 .row1, .contentRow1 .row2 {
- text-align: left;
- font-weight: bolder;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0