From b481539c8cd70e95765c946fcc0b66615ac7c1c6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 28 三月 2025 15:43:54 +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/PrintCustomLabelSemi2.vue | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
index a0d3ae1..a6e3674 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
@@ -153,15 +153,7 @@
<template v-for="(item,id) in labelList">
<div id="entirety" >
- <div class="row1" v-if="item.heat_layout_id!=null">
- <span>{{ item.customer_name }}</span>
- <span>{{ item.order_id }}</span>
- <span v-if="item.process.includes('澶硅兌')||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="row6" v-else>
+ <div class="row1" v-if="item.customer_name!==undefined">
<span>{{ item.customer_name }}</span>
<span>{{ item.order_id }}</span>
<span v-if="item.process.includes('澶硅兌')||item.process.includes('澶瑰眰')">鑳剁墖</span>
@@ -171,7 +163,8 @@
</div>
- <div class="row2">
+
+ <div class="row2" v-if="item.customer_name!==undefined">
<span>{{item.project}}</span>
<span>{{ item.building_number }}</span>
<span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
@@ -195,7 +188,7 @@
</span>
{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}
</div>
- <div class="row5">
+ <div class="row5" v-if="item.customer_name!==undefined">
<span>{{item.glass_child}}</span>
<span>{{item.processing_note}}</span>
</div>
--
Gitblit v1.8.0