From 93b80ffb7f7ffc02bc414271b8ebeac82be6bcb9 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 11 十一月 2024 16:29:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue | 137 ++++++++++++++++++++++++++++++++-------------
1 files changed, 97 insertions(+), 40 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 2f2eed2..3dd92c3 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
@@ -24,8 +24,12 @@
const {currentRoute} = useRouter()
const route = currentRoute.value
+const printType=route.query.printType
projectNo.value = route.query.projectNo
type.value = route.query.type
+
+
+
onMounted(() => {
if(projectNo.value!=null){
request.post(`/processCard/getSelectPrintLabel/${projectNo.value}/${type.value}`).then((res) => {
@@ -37,25 +41,47 @@
}
})
}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])
+ if (printType == 1) {
+ 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])
+ }
+
+
}
-
-
}
+ } else {
+ ElMessage.warning(res.msg)
+ router.push("/login")
}
- } else {
- ElMessage.warning(res.msg)
- router.push("/login")
- }
- })
+ })
+ }else if(printType==2){
+ data.value.printList = JSON.parse(route.query.printList)
+ request.post(`/processCard/getSelectPrintLabelDetails`, 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])
+ }
+
+ }
+ }
+ } else {
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ })
+ }
+
}
@@ -131,26 +157,38 @@
</div>
</div>-->
<div id="entirety" v-for="(item,id) in labelList" >
- <div class="row1">
- <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="row1" v-if="item.heat_layout_id!=null">
- <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>
- <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
- </div>
- <div class="row6">
- <span>{{item.glass_child}}</span>
- <span>{{item.processing_note}}</span>
- </div>
+ <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 class="cell1" v-if="item.stock_id!=null">{{ item.stock_id }}</div>
+
+ </div>
+ <div class="row2" v-else>
+ <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" 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>
+ <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
+ </div>
+ <div class="row6">
+ <span>{{item.glass_child}}</span>
+ <span>{{item.processing_note}}</span>
+ </div>
</div>
</div>
@@ -176,10 +214,12 @@
#entirety{
text-align: center;
- width: 185px;
+ width: 180px;
height: 87px;
margin-bottom: 10px;
+ margin-right: 5px;
overflow: hidden;
+ white-space: nowrap;
}
.row1 {
@@ -188,7 +228,11 @@
height: 20px;
}
.row1 span {
- font-size: 8pt;
+ font-size: 10pt;
+ font-weight: bold;
+}
+.row2 span {
+ font-size: 12pt;
font-weight: bold;
}
@@ -212,7 +256,7 @@
.row3 {
margin-top: -5px;
height: 25px;
- font-size: 15pt;
+ font-size: 17pt;
font-weight: bolder;
}
@@ -222,7 +266,7 @@
font-size: 8pt;
}
.row5 span {
- font-size: 10pt;
+ font-size: 12pt;
font-weight: bold;
}
@@ -232,9 +276,22 @@
font-size: 8pt;
}
.row6 span {
- font-size: 10pt;
+ font-size: 12pt;
font-weight: bold;
}
+.cell{
+ position: absolute;
+ font-weight: bold;
+ margin-left: 5px;
+ margin-top: 0px;
+}
+
+.cell1{
+ position: absolute;
+ font-weight: bold;
+ margin-left: 158px;
+ margin-top: -21px;
+}
--
Gitblit v1.8.0