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/components/sd/delivery/PrintSheet1.vue | 153 ++------------------------------------
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue | 15 +--
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue | 11 +-
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue | 8 +
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 14 +-
5 files changed, 32 insertions(+), 169 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
index 03ae342..930f9f4 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
@@ -317,151 +317,7 @@
</table>
- <!-- <table border="1" >
- <thead>
- <tr class="title-s">
- <th colspan="13">
- <h1>
- {{company.companyName}}
- </h1>
- </th>
- </tr>
- <tr class="title-s">
- <th colspan="2"></th>
- <th colspan="5">
- <h3>閿�鍞彂璐у崟</h3>
- </th>
- <th colspan="2" style="text-align: left;">鍙戣揣鍗曞彿锛�<span>{{delivery.deliveryId}}</span></th>
- </tr>
- <tr>
- <th style="text-align: left;border:none;" colspan="4">瀹㈡埛鍚嶇О锛�<span>{{delivery.customerName}}</span></th>
- <th style="text-align: left;border:none;" colspan="3">椤圭洰鍚嶇О锛�<span>{{delivery.project}}</span></th>
- <th style="text-align: left;border:none;" colspan="2">鑱旂郴浜猴細<span>{{delivery.contacts}}</span></th>
- </tr>
- <tr>
- <th style="text-align: left;border:none;" colspan="7">閫佽揣鍦板潃锛�<span>{{delivery.deliveryAddress}}</span></th>
- <th style="text-align: left;border:none;" colspan="2">鑱旂郴鐢佃瘽锛�<span>{{delivery.contactNumber}}</span></th>
- </tr>
- <tr>
- <th style="width: 6%;">搴忓彿</th>
- <th style="width: 20%;">妤煎眰缂栧彿</th>
- <th style="width: 20%;" colspan="2">瀹絏楂�</th>
- <th style="width: 10%;">鏁伴噺</th>
- <th style="width: 10%;">闈㈢Н</th>
- <th style="width: 10%;">鍗曚环</th>
- <th style="width: 12%;">閲戦</th>
- <th style="width: 12%;" colspan="2">鍔犲伐瑕佹眰</th>
- </tr>
- </thead>
- <template v-for="(item, index) in produceList" :key="index" >
- <tr>
- <td style="font-size: 15px;text-align: left" colspan="4">浜у搧鍚嶇О:<span>{{item.DeliveryDetail.orderDetail.productName}}</span></td>
- <td style="font-size: 15px;text-align: left" colspan="3">瀵规柟鍗曞彿:</td>
- <td style="font-size: 15px;text-align: left" colspan="3">璁㈠崟缂栧彿:<span>{{item.DeliveryDetail.orderDetail.orderId}}</span></td>
- </tr>
-
- <tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1">
- <td>{{items.order_number}}</td>
- <td>{{items.buildingNumber}}</td>
- <td colspan="2" style="font-size: 15px;font-weight: bold;">{{items.width}}x{{items.height}}</td>
- <td>{{items.quantity}}</td>
- <td>{{items.area}}</td>
- <td>{{items.price}}</td>
- <td>{{items.money}}</td>
- <td colspan="2">{{items.processingNote}}</td>
- </tr>
- <tr class="day-in" >
- <td style="font-size: 15px;" colspan="4">灏忚:</td>
- <td>{{item.DeliveryDetail.quantity}}</td>
- <td>{{item.DeliveryDetail.area}}</td>
- <td></td>
- <td>{{item.DeliveryDetail.money}}</td>
- <td></td>
- </tr>
-
- </template>
- <tr class="day-in">
- <td style="font-size: 15px;" colspan="4">鍚堣:</td>
- <td>{{delivery.quantity}}</td>
- <td>{{delivery.area}}</td>
- <td></td>
- <td>{{delivery.money-otherMoneys-delivery.freight}}</td>
- <td></td>
- </tr>
- <tr class="day-in">
- <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6" colspan="4">
- <div style="display: flex;font-size: 10px;text-align: center;">
- <div style="width: 25%">鍔犲伐璐圭敤</div>
- <div style="width: 25%">鍗曚环</div>
- <div style="width: 25%">鏁伴噺</div>
- <div style="width: 25%">閲戦</div>
- </div>
- </td>
- <td style="text-align: left;border:none;font-size: 15px;" colspan="5">鎬婚噾棰�: {{delivery.money}}</td>
- </tr>
- <tr class="day-in">
- <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="4" >
- <div style="display: flex;font-size: 10px;text-align: center" v-for="(item, index2) in otherMoney" :key="index2">
- <div style="width: 25%">{{item.DeliveryDetailOtherMoney.alias}}</div>
- <div style="width: 25%">{{item.DeliveryDetailOtherMoney.price}}</div>
- <div style="width: 25%">{{item.DeliveryDetailOtherMoney.count}}</div>
- <div style="width: 25%">{{item.DeliveryDetailOtherMoney.monery}}</div>
- </div>
- <div style="display: flex;font-size: 10px;text-align: center" v-if="delivery.freight>0">
- <div style="width: 25%">杩愯垂</div>
- <div style="width: 25%">{{delivery.freightPrice}}</div>
- <div style="width: 25%">{{delivery.freightQuantity}}</div>
- <div style="width: 25%">{{delivery.freight}}</div>
- </div>
- </td>
- <td style="text-align: left;border:none;font-size: 15px;" colspan="5">澶у啓閲戦: {{money}}</td>
- </tr>
-
-
- <tfoot style="border: 0">
- <!– <el-row :gutter="24">
- <el-col :span="4"><div style="font-size: 12px" class="bottom">鍒跺崟鍛橈細{{data.order.creator}}<span style="font-size: 10px"></span></div></el-col>
- <el-col :span="6"><div style="font-size: 12px" class="bottom">鍒跺崟鏃ユ湡锛歿{data.order.createTime}}<span style="font-size: 10px"></span></div></el-col>
- <el-col :span="4"><div style="font-size: 12px" class="bottom">瀹℃牳鍛橈細{{data.order.verifier}}</div></el-col>
- <el-col :span="6"><div style="font-size: 12px" class="bottom">瀹℃牳鏃ユ湡锛歿{data.order.updateTime}}</div></el-col>
- <el-col :span="4"><div style="font-size: 12px" class="bottom">鎵撳嵃浜猴細{{username}}</div></el-col>
-
- </el-row>–>
- <tr class="day-in" style="border: 0;">
- <td colspan="9" style="border: 0;">
- <div style="display:flex;">
- <div style="width: 15%">鍒跺崟鍛橈細{{ delivery.creator }}</div>
- <div style="width: 25%">鍒跺崟鏃ユ湡锛歿{ delivery.createTime }}</div>
- <div style="width: 10%">鍙戣揣鍛橈細</div>
- <div style="width: 10%">鍙告満锛�</div>
- <div style="width: 15%">瀹㈡埛绛惧瓧锛�</div>
- <div style="width: 15%">绛炬敹鏃ユ湡锛�</div>
- </div>
-
-
- </td>
- </tr>
- <tr>
- <td colspan="9" style="border: 0;">
- <div style="display:flex;" class="bottom">鏋跺瓙 鍙�</div>
- <div style="display:flex;" class="bottom">
- {{takeCare}}
- </div>
-
- </td>
- </tr>
- <tr>
- <td colspan="9" style="border: 0;">
- <div style="display:flex;" class="bottom">
- {{remark}}
- </div>
-
- </td>
- </tr>
- </tfoot>
-
- </table>-->
</div>
@@ -474,11 +330,18 @@
<style scoped>
@media print {
@page {
- margin: 8mm 16mm 20mm 16mm !important;
+ margin: 12mm 10mm 20mm 10mm !important;
}
.pages {
page-break-after: always;
}
+
+ @page {
+ @top-right {
+ margin-top: 50px;
+ content: "绗� " counter(page) " 椤�"; /* 浣跨敤counter娣诲姞椤电爜 */
+ }
+ }
}
h1,h3{
left:0;
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
index 9c178ea..da9cfee 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
@@ -253,11 +253,17 @@
<style scoped>
@media print {
@page {
- margin: 8mm 16mm 20mm 16mm !important;
+ margin: 12mm 10mm 20mm 10mm !important;
}
.pages {
page-break-after: always;
}
+ @page {
+ @top-right {
+ margin-top: 50px;
+ content: "绗� " counter(page) " 椤�"; /* 浣跨敤counter娣诲姞椤电爜 */
+ }
+ }
}
h1,h3{
left:0;
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>
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 2ae9c9d..24d4451 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
@@ -46,6 +46,7 @@
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")
@@ -162,7 +163,7 @@
<!-- 鍗婃垚鍝佹爣绛�-->
<template v-for="(item,id) in labelList">
<div v-if="type!=='3'" id="entirety" >
- <div class="row1" >
+ <div v-if="item.customer_name!==undefined" 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>
@@ -186,7 +187,7 @@
{{JSON.parse(item.other_columns).S02}}={{item.quantity}}
</div>
<div class="row3" v-else>
- <span v-if="item.heat_layout_id!==undefined && company.showDeliveryCreator" style="font-size: 7pt;">
+ <span v-if="item.heat_layout_sort!==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">
@@ -194,12 +195,12 @@
</span>
{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}
</div>
- <div class="row5">
+ <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 class="row6">
+ <div v-if="item.customer_name!==undefined" class="row6">
<span>{{item.glass_child}}</span>
<span v-if="company.showDeliveryCreator" style="font-size: 10pt" >{{item.processing_note}}</span>
<span v-else style="font-size: 6pt">{{item.processing_note}}</span>
@@ -224,7 +225,7 @@
<span style="font-size: 8pt">{{ item.customer_name }}</span>
</div>
- <div class="row2" v-else>
+ <div class="row1" v-else>
<span style="font-size: 8pt">{{ item.customer_name }}</span>
</div>
<div class="row2" style="font-size: 8pt" >{{item.order_id}}
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index dc508ae..d324b3d 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -853,18 +853,18 @@
o.project,
od.building_number,
od.processing_note,
- ogd.child_width as width,
- ogd.child_height as height,
+ opd.o_width as width,
+ opd.o_height as height,
ogd.glass_child,
ogd.process,
e.type_name,
opd.stock_id,
opd.polys_id,
- od.quantity,
+ IFNULL(od.quantity,1) as quantity,
od.other_columns,
od.bend_radius,
- od.order_number as heat_layout_id,
- a.id as heat_layout_sort,
+ ifnull(od.order_number,0) as heat_layout_id,
+ ifnull(a.id,0) as heat_layout_sort,
od.product_name
from pp.optimize_detail opd
left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
@@ -912,7 +912,7 @@
left join sd.product p on od.product_id = p.id
left join sd.basic_glass_type e on e.type_id = p.type_id
left join sd.customer c on c.id = o.customer_id
- where opd.project_no = #{projectNo}
+ where opd.project_no = #{projectNo} and o.order_id is not null
order by opd.heat_layout_id, opd.heat_layout_sort desc
</select>
@@ -2790,7 +2790,7 @@
left join
(select (@row_number := @row_number + 1) as id,process_id as process_id from (select process_id from pp.optimize_detail tt where project_no =#{projectNo} group by process_id) tt,(select @row_number := 0) as t) a
on a.process_id=opd.process_id
- where opd.project_no = #{projectNo}
+ where opd.project_no = #{projectNo} and o.order_id is not null
group by order_id,od.order_number
order by ogd.child_width desc,ogd.child_height desc
</select>
--
Gitblit v1.8.0