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 ++------------------------------------------------
1 files changed, 8 insertions(+), 145 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;
--
Gitblit v1.8.0