From cba0b2eecbbf49b91865434173a590754c74ef43 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 26 六月 2024 14:57:03 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue | 245 ++++++++++++++++++++++++------------------------
1 files changed, 124 insertions(+), 121 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 7a3437a..7087253 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
@@ -86,146 +86,149 @@
});
</script>
-
<template>
+ <div id="sheet">
+ <table border="1" >
+ <tr class="title-s">
+ <th colspan="13">
+ <h1>
+ {{company.companyName}}
+ </h1>
+ </th>
+ </tr>
- <div>
+ <tr class="title-s">
+ <th colspan="2"></th>
+ <th colspan="5">
+ <h3>閿�鍞彂璐у崟</h3>
+ </th>
+ <th colspan="2" style="text-align: left;font-weight: bold;">鍙戣揣鍗曞彿锛�<span>{{delivery.deliveryId}}</span></th>
+ </tr>
+ <tr>
+ <th style="text-align: left;border:none;font-weight: bold;" colspan="4">瀹㈡埛鍚嶇О锛�<span>{{delivery.customerName}}</span></th>
+ <th style="text-align: left;border:none;font-weight: bold;" colspan="3">椤圭洰鍚嶇О锛�<span>{{delivery.project}}</span></th>
+ <th style="text-align: left;border:none;font-weight: bold;" colspan="2">鑱旂郴浜猴細<span>{{delivery.contacts}}</span></th>
+ </tr>
+ <tr>
+ <th style="text-align: left;border:none;font-weight: bold;" colspan="7">閫佽揣鍦板潃锛�<span>{{delivery.deliveryAddress}}</span></th>
+ <th style="text-align: left;border:none;font-weight: bold;" colspan="2">鑱旂郴鐢佃瘽锛�<span>{{delivery.contactNumber}}</span></th>
+ </tr>
+ <tr>
+ <th style="width: 6%;font-weight: bold;">搴忓彿</th>
+ <th style="width: 20%;font-weight: bold;">妤煎眰缂栧彿</th>
+ <th style="width: 20%;font-weight: bold;" colspan="2">瀹�(寮у害)*楂�</th>
+ <th style="width: 10%;font-weight: bold;">鏁伴噺</th>
+ <th style="width: 10%;font-weight: bold;">闈㈢Н</th>
+ <th style="width: 10%;font-weight: bold;">鍗曚环</th>
+ <th style="width: 12%;font-weight: bold;">閲戦</th>
+ <th style="width: 12%;font-weight: bold;" colspan="2">鍔犲伐瑕佹眰</th>
+ </tr>
+ <template v-for="(item, index) in produceList" :key="index" >
+ <tr>
+ <td style="font-size: 15px;font-weight: bold;text-align: left" colspan="4">浜у搧鍚嶇О:<span>{{item.DeliveryDetail.productName}}</span></td>
+ <td style="font-size: 15px;font-weight: bold;text-align: left" colspan="3">瀵规柟鍗曞彿:</td>
+ <td style="font-size: 15px;font-weight: bold;text-align: left" colspan="3">璁㈠崟缂栧彿:<span>{{item.DeliveryDetail.orderId}}</span></td>
+ </tr>
- <div id="sheet" style="width: 100%;height: 100%">
- <div style="font-size: 30px;text-align: center;font-weight: bold;">{{company.companyName}}</div>
- <el-row :gutter="20">
- <el-col :span="7"><div></div></el-col>
- <el-col :span="10"><div style="font-size: 25px;text-align: center;font-weight: bold;">閿�鍞彂璐у崟</div></el-col>
- <el-col :span="7">
- <div style="display: flex;margin-top: 10px;">
- <div style="font-weight: bold;font-size: 15px">鍙戣揣鍗曞彿锛�</div>
- <div style="font-weight: bold;font-size: 15px">{{delivery.deliveryId}}</div>
+ <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;font-weight: bold;" 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;font-weight: bold;" colspan="4">鍚堣:</td>
+ <td>{{delivery.quantity}}</td>
+ <td>{{delivery.area}}</td>
+ <td></td>
+ <td>{{delivery.money}}</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;">
+ <div>鍔犲伐璐圭敤</div>
+ <div style="margin-left: 20%">鍗曚环</div>
+ <div style="margin-left: 20%">鏁伴噺</div>
+ <div style="margin-left: 20%">閲戦</div>
</div>
- </el-col>
- </el-row>
- <div style="border: 1px solid #d3dce6;border-collapse: collapse;width: 100%;height: 100%;">
- <table id="table1" style="border: 1px solid #d3dce6;border-collapse: collapse;width: 100%;height: 100%;">
- <tr>
- <th style="text-align: left;border:none;" colspan="3">瀹㈡埛鍚嶇О锛�<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="6">閫佽揣鍦板潃锛�<span>{{delivery.deliveryAddress}}</span></th>
- <th style="text-align: left;border:none;" colspan="2">鑱旂郴鐢佃瘽锛�<span>{{delivery.contactNumber}}</span></th>
+ </td>
+ <td style="text-align: left;border:none;font-size: 15px;font-weight: bold;" 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"></td>
+ <td style="text-align: left;border:none;font-size: 15px;font-weight: bold;" colspan="5">澶у啓閲戦: {{money}}</td>
+ </tr>
- </tr>
- <tr>
- <th style="width: 6%;">搴忓彿</th>
- <th style="width: 20%;">妤煎眰缂栧彿</th>
- <th style="width: 20%;">瀹�(寮у害)*楂�</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%;">鍔犲伐瑕佹眰</th>
- </tr>
+ </table>
+ <el-row :gutter="20">
+ <el-col :span="4"><div class="bottom">鍒跺崟鍛橈細<span style="font-size: 10px">{{delivery.creator}}</span></div></el-col>
+ <el-col :span="4"><div class="bottom">鍒跺崟鏃ユ湡锛�<span style="font-size: 10px">{{delivery.createTime}}</span></div></el-col>
+ <el-col :span="4"><div class="bottom">鍙戣揣鍛橈細</div></el-col>
+ <el-col :span="3"><div class="bottom">鍙告満锛�</div></el-col>
+ <el-col :span="4"><div class="bottom">瀹㈡埛绛惧瓧锛�</div></el-col>
+ <el-col :span="4"><div class="bottom">绛炬敹鏃ユ湡锛�</div></el-col>
- <template v-for="(item, index) in produceList" :key="index" >
- <tr>
- <td style="font-size: 15px;font-weight: bold;" colspan="3">浜у搧鍚嶇О:<span>{{item.DeliveryDetail.orderDetail.productName}}</span></td>
- <td style="font-size: 15px;font-weight: bold;" colspan="3">瀵规柟鍗曞彿:</td>
- <td style="font-size: 15px;font-weight: bold;" colspan="2">璁㈠崟缂栧彿:<span>{{item.DeliveryDetail.orderDetail.orderId}}</span></td>
- </tr>
+ </el-row>
+ <el-row :gutter="20" style="margin-top: 20px;">
+ <el-col :span="4"><div class="bottom">鏋跺瓙 鍙�</div></el-col>
+ <el-col :span="20"><div class="bottom">{{takeCare}}</div></el-col>
+ </el-row>
+ <el-row :gutter="20" style="margin-top: 20px;">
+ <el-col :span="24"><div class="bottom">{{remark}}</div></el-col>
+ </el-row>
- <tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1">
- <td>{{items.order_number}}</td>
- <td>{{items.buildingNumber}}</td>
- <td 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>{{items.processingNote}}</td>
- </tr>
- <tr class="day-in" >
- <td style="font-size: 15px;font-weight: bold;" colspan="3">灏忚:</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;font-weight: bold;" colspan="3">鍚堣:</td>
- <td>{{delivery.quantity}}</td>
- <td>{{delivery.area}}</td>
- <td></td>
- <td>{{delivery.money}}</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="3">
- <div style="display: flex;font-size: 10px;">
- <div>鍔犲伐璐圭敤</div>
- <div style="margin-left: 20%">鍗曚环</div>
- <div style="margin-left: 20%">鏁伴噺</div>
- <div style="margin-left: 20%">閲戦</div>
- </div>
-
- </td>
- <td style="text-align: left;border:none;font-size: 15px;font-weight: bold;" 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="3"></td>
- <td style="text-align: left;border:none;font-size: 15px;font-weight: bold;" colspan="5">澶у啓閲戦: {{money}}</td>
- </tr>
- </table>
- </div>
- <el-row :gutter="20">
- <el-col :span="3"><div class="bottom">鍒跺崟鍛橈細<span style="font-size: 10px">{{delivery.creator}}</span></div></el-col>
- <el-col :span="5"><div class="bottom">鍒跺崟鏃ユ湡锛�<span style="font-size: 10px">{{delivery.createTime}}</span></div></el-col>
- <el-col :span="4"><div class="bottom">鍙戣揣鍛橈細</div></el-col>
- <el-col :span="4"><div class="bottom">鍙告満锛�</div></el-col>
- <el-col :span="4"><div class="bottom">瀹㈡埛绛惧瓧锛�</div></el-col>
- <el-col :span="4"><div class="bottom">绛炬敹鏃ユ湡锛�</div></el-col>
-
- </el-row>
- <el-row :gutter="20" style="margin-top: 20px;">
- <el-col :span="3"><div class="bottom">鏋跺瓙 鍙�</div></el-col>
- <el-col :span="21"><div class="bottom">{{takeCare}}</div></el-col>
- </el-row>
- <el-row :gutter="20" style="margin-top: 20px;">
- <el-col :span="24"><div class="bottom">{{remark}}</div></el-col>
- </el-row>
-
-
-
- </div>
</div>
+
</template>
+
+
+
<style scoped>
-#sheet{
+h1,h3{
+ left:0;
+ right:0;
+ top:0;
+ bottom:0;
+ margin:auto;
}
-#table1 tr{
- height: 30px;
+h1{
+ font-size: 1.5rem;
}
-#table1 th{
- height: 30px;
- border: 1px solid #d3dce6;
+h3{
+ font-size: 1.2rem;
+ font-weight: bolder;
+}
+
+
+table{
border-collapse: collapse;
- font-size: 15px;
- font-weight: bold;
-}
-.day-in td{
+ width: 100%;
text-align: center;
}
-#table1 td{
- border: 1px solid #d3dce6;
- border-collapse: collapse;
+tr,td,th{
+ border: 1px solid black;
}
-#deliveryPrinting .el-dialog__header{
- visibility:hidden
+
+th,.no-change-row {
+ white-space: nowrap;
}
.title-1{
--
Gitblit v1.8.0