From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue | 201 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 190 insertions(+), 11 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 8706999..e930fca 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
@@ -15,6 +15,7 @@
let labelList = ref([])
let projectNo = ref([])
let type = ref([])
+let printStyle = ref([])
let orderId = ref([])
const data = ref({
printList: []
@@ -29,6 +30,7 @@
const printType=route.query.printType
projectNo.value = route.query.projectNo
type.value = route.query.type
+printStyle.value = route.query.printStyle
@@ -46,7 +48,6 @@
request.post(`/processCard/getSelectPrintLabel/${projectNo.value}/${type.value}`).then((res) => {
if (res.code == 200) {
labelList.value = deepClone(res.data.data)
- console.log(res.data.data)
} else {
ElMessage.warning(res.msg)
router.push("/login")
@@ -161,8 +162,8 @@
<el-input v-if="!company.showDeliveryCreator" v-model="remarks" style="background-color: transparent;border: none;margin-top: -20px;width: 100px"/>
<div id="printFlowCard" >
<!-- 鍗婃垚鍝佹爣绛�-->
- <template v-for="(item,id) in labelList">
- <div v-if="type!=='3'" id="entirety" >
+ <template v-if="type!=='3'&&printStyle==='1'" v-for="(item,id) in labelList">
+ <div id="entirety" >
<div class="row1" >
<!--閽㈠寲鐗堝浘搴忓彿锛岄挗鍖栫増鍥鹃噷鐨勯『搴�-->
<!-- <div class="cell" v-if="item.heat_layout_id!==undefined">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>-->
@@ -222,8 +223,8 @@
<!--鎴愬搧鍚嶇О-->
- <template v-if="type==='3'" v-for="(item,id) in labelList">
- <div v-if="type==='3'" id="entirety" v-for="n in item.quantity" >
+ <template v-if="type==='3'&&printStyle==='1'" v-for="(item,id) in labelList">
+ <div id="entirety" v-for="n in item.quantity" >
<div class="row1" v-if="item.heat_layout_id!=null">
@@ -265,6 +266,114 @@
</div>
</div>
<div class="element-to-break-after" v-if="(id+1)%44==0"></div>
+ </template>
+
+
+
+
+
+
+
+ <template v-if="type!=='3'&&printStyle==='2'" v-for="(item,id) in labelList">
+ <div id="entirety1" >
+
+ <div class="row1" >
+ <!--閽㈠寲鐗堝浘搴忓彿锛岄挗鍖栫増鍥鹃噷鐨勯『搴�-->
+ <!-- <div class="cell" v-if="item.heat_layout_id!==undefined">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>-->
+ <span >{{ item.customer_name }}</span>
+
+ <template v-if="company.showDeliveryCreator">
+ <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>
+ </template>
+
+ <!--stock_id 鐗堝浘-->
+ <!-- <div class="cell1" v-if="item.stock_id!=undefined">{{ item.stock_id+'/'+item.polys_id }}</div>-->
+
+ </div>
+ <div v-if="item.customer_name!==undefined" class="row9">
+ <span v-if="company.showDeliveryCreator">{{ item.order_id }}</span>
+ <span v-if="!company.showDeliveryCreator">{{ item.process_id }}</span>
+ </div>
+ <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">
+ <span v-if="item.heat_layout_id!==undefined && company.showDeliveryCreator" style="font-size: 7pt;">
+ ({{ item.stock_id }}) {{ item.heat_layout_id }}/{{ item.heat_layout_sort }}
+ </span>
+ <span v-if="item.stock_id!==undefined && !company.showDeliveryCreator" style="font-size: 7pt">
+ {{ item.stock_id }}/{{ item.polys_id }}
+ </span>
+ {{JSON.parse(item.other_columns).S02}}={{item.quantity}}
+ </div>
+ <div class="row3" v-else>
+ <span v-if="item.heat_layout_sort!==undefined && company.showDeliveryCreator" >
+ ({{ item.stock_id }}) {{ item.heat_layout_id }}/{{ item.heat_layout_sort }}
+ </span>
+ <span v-if="item.stock_id!==undefined && !company.showDeliveryCreator" >
+ {{ item.stock_id }}/{{ item.polys_id }}
+ </span>
+ {{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}
+ </div>
+ <div v-if="item.customer_name!==undefined" class="row5">
+ <span>{{item.project}}</span>
+ <span>{{item.building_number?item.building_number.replace(/\r|\n|\s/g,''):''}}</span>
+ <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
+ </div>
+ <div v-if="item.customer_name!==undefined" class="row6">
+ <span>{{item.glass_child}}</span>
+ <span v-if="company.showDeliveryCreator" style="font-size: 8pt" >{{item.processing_note}}</span>
+ <span v-else style="font-size: 8pt"></span>
+
+ <br v-if="!company.showDeliveryCreator" />
+ <span v-if="!company.showDeliveryCreator" style="font-size: 8pt;margin-top: -10px">{{item.product_name}}</span>
+ </div>
+ </div>
+ <div class="element-to-break-after" v-if="(id+1)%18==0"></div>
+ </template>
+
+
+
+ <template v-if="type==='3'&&printStyle==='2'" v-for="(item,id) in labelList">
+ <div id="entirety1" v-for="n in item.quantity" >
+
+ <div class="row1" v-if="item.heat_layout_id!=null">
+ <span>{{ item.customer_name }}</span>
+ </div>
+ <div class="row1" v-else>
+ <span >{{ item.customer_name }}</span>
+ </div>
+ <div class="row2" >
+ <span > {{item.order_id}}</span>
+ <span >{{ remarks }}</span>
+ </div>
+ <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">
+ <span v-if="item.heat_layout_id!==null && company.showDeliveryCreator" >
+ ({{ item.stock_id }}) {{ item.heat_layout_id }}/{{ item.heat_layout_sort }}
+ </span>
+ <span v-if="item.stock_id!==null && !company.showDeliveryCreator" >
+ {{ item.stock_id }}/{{ item.polys_id }}
+ </span>
+ {{JSON.parse(item.other_columns).S02}}={{item.quantity}}
+ </div>
+ <div class="row3" v-else>
+ <span v-if="item.heat_layout_id!==null && company.showDeliveryCreator" >
+ ({{ item.stock_id }}) {{ item.heat_layout_id }}/{{ item.heat_layout_sort }}
+ </span>
+ <span v-if="item.stock_id!==null && !company.showDeliveryCreator" >
+ {{ item.stock_id }}/{{ item.polys_id }}
+ </span>
+ {{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}
+ </div>
+
+ <div class="row5">
+ <span style="white-space: pre-wrap;">{{ item.building_number?item.building_number.replace(/\r|\n|\s/g,''):'' }}</span>
+ <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
+ </div>
+ <div class="row6">
+ <span style="font-size: 10pt">{{item.glass_child}}</span>
+ </div>
+ </div>
</template>
</div>
@@ -324,12 +433,6 @@
}
-
-
-
-
-
-
.row3 {
margin-top: -5px;
height: 18px;
@@ -386,6 +489,82 @@
}
+#entirety1{
+ text-align: center;
+ width: 240px;
+ height: 170px;
+ margin-bottom: 7px;
+ margin-right: 5px;
+ overflow: hidden;
+ white-space: nowrap;
+}
+
+
+#entirety1 .row1 {
+ font-weight: bold;
+ height: 30px;
+}
+#entirety1 .row1 span {
+ font-size: 15pt;
+ font-weight: bold;
+}
+#entirety1 .row2 span {
+ font-size: 12pt;
+ font-weight: bold;
+}
+
+#entirety1 .row2 {
+ font-weight: bold;
+ height: 30px;
+}
+
+
+
+#entirety1 .row3 {
+ margin-top: -5px;
+ height: 36px;
+ font-size: 25px;
+ font-weight: bolder;
+}
+
+#entirety1 .row3 span {
+ font-size: 15px;
+}
+
+#entirety1 .row9 {
+ margin-top: -15px;
+ height: 40px;
+ font-size: 18pt;
+ font-weight: bolder;
+}
+
+#entirety1 .row9 span {
+ font-size: 15pt;
+ font-weight: bold;
+}
+
+#entirety1 .row5 {
+ height: 30px;
+ font-weight: bold;
+ font-size: 6pt;
+}
+#entirety1 .row5 span {
+ font-size: 15pt;
+ font-weight: bold;
+}
+
+#entirety1 .row6 {
+ margin-top: -10px;
+ height: 50px;
+ font-weight: bold;
+ font-size: 18px;
+}
+#entirety1 .row6 span {
+ white-space: normal;
+ font-size: 16px;
+ font-weight: bold;
+}
+
--
Gitblit v1.8.0