From 3a06ce5786fb65f4a015a18b82e867b288a60032 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 08 一月 2025 17:13:02 +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/PrintSheet2.vue | 57 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 33 insertions(+), 24 deletions(-)
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 ecba09d..4d2c397 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
@@ -15,7 +15,7 @@
let remark = company.deliveryRemark
-
+let produceList2 = ref([])
let props = defineProps({
deliveryId:null
})
@@ -30,15 +30,19 @@
request.post(`/delivery/getSelectDeliveryPrinting`,form.value).then((res) => {
if(res.code==200){
- produceList.value = deepClone(res.data.data)
- delivery.value=deepClone(res.data.delivery)
- money.value=deepClone(res.data.money)
- otherMoney.value=deepClone(res.data.otherMoney)
- otherMoney.value.forEach(item => {
- if(item.DeliveryDetailOtherMoney.monery!=null){
- otherMoneys+=item.DeliveryDetailOtherMoney.monery
- }
- })
+ produceList.value = deepClone(res.data)
+ for(let i=0;i<produceList.value.length;i++){
+ let produceList1= ({
+ data:null,
+ delivery:null,
+ })
+ produceList1.data=produceList.value[i].data
+ produceList1.delivery=produceList.value[i].delivery
+
+
+ produceList2.value.push(produceList1)
+ }
+
}else{
ElMessage.warning(res.msg)
router.push("/login")
@@ -95,7 +99,7 @@
<template>
<div id="sheet">
- <table >
+ <table class="pages" v-for="(itme1, index) in produceList2" :key="index" >
<thead>
<tr class="title-s">
<th colspan="9">
@@ -110,16 +114,16 @@
<th colspan="5" style="width: 40%;">
<h3>閿�鍞彂璐у崟</h3>
</th>
- <th colspan="2" style="width: 30%;text-align: left;">鍙戣揣鍗曞彿锛�<span>{{delivery.deliveryId}}</span></th>
+ <th colspan="2" style="width: 30%;text-align: left;">鍙戣揣鍗曞彿锛�<span>{{itme1.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>
+ <th style="text-align: left;border:none;" colspan="4">瀹㈡埛鍚嶇О锛�<span>{{itme1.delivery.customerName}}</span></th>
+ <th style="text-align: left;border:none;" colspan="3">椤圭洰鍚嶇О锛�<span>{{itme1.delivery.project}}</span></th>
+ <th style="text-align: left;border:none;" colspan="2">鑱旂郴浜猴細<span>{{itme1.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>
+ <th style="text-align: left;border:none;" colspan="7">閫佽揣鍦板潃锛�<span>{{itme1.delivery.deliveryAddress}}</span></th>
+ <th style="text-align: left;border:none;" colspan="2">鑱旂郴鐢佃瘽锛�<span>{{itme1.delivery.contactNumber}}</span></th>
</tr>
@@ -127,7 +131,7 @@
<tr style="border-style: none">
<td colspan="9" style="border-style: none">
<table style="border-style: none;width: 100%;height: 100%">
- <template v-for="(item, index) in produceList" :key="index" >
+ <template v-for="(item, index) in itme1.data" :key="index" >
<thead>
<tr v-if="index===0">
<th style="width: 6%;">搴忓彿</th>
@@ -164,8 +168,8 @@
</template>
<tr class="day-in">
<td style="font-size: 15px;" colspan="4">鍚堣:</td>
- <td>{{delivery.quantity}}</td>
- <td>{{delivery.area}}</td>
+ <td>{{itme1.delivery.quantity}}</td>
+ <td>{{itme1.delivery.area}}</td>
</tr>
@@ -181,8 +185,8 @@
<tr class="day-in" style="border: 0;" v-if="company.showDeliveryCreator">
<td colspan="9" style="border: 0;">
<div style="display:flex;;text-align: left" class="bottom">
- <div style="width: 15%">鍒跺崟鍛橈細{{ delivery.creator }}</div>
- <div style="width: 25%">鍒跺崟鏃ユ湡锛歿{ delivery.createTime }}</div>
+ <div style="width: 15%">鍒跺崟鍛橈細{{ itme1.delivery.creator }}</div>
+ <div style="width: 25%">鍒跺崟鏃ユ湡锛歿{ itme1.delivery.createTime }}</div>
<div style="width: 10%">鍙戣揣鍛橈細</div>
<div style="width: 10%">鍙告満锛�</div>
<div style="width: 15%">瀹㈡埛绛惧瓧锛�</div>
@@ -219,8 +223,8 @@
<tr class="day-in" style="border: 0;" v-if="!company.showDeliveryCreator">
<td colspan="9" style="border: 0;">
<div style="display:flex;;text-align: left" class="bottom">
- <div style="width: 15%">鍒跺崟鍛橈細{{ delivery.creator }}</div>
- <div style="width: 25%">鍒跺崟鏃ユ湡锛歿{ delivery.createTime }}</div>
+ <div style="width: 15%">鍒跺崟鍛橈細{{ itme1.delivery.creator }}</div>
+ <div style="width: 25%">鍒跺崟鏃ユ湡锛歿{ itme1.delivery.createTime }}</div>
<div style="width: 10%">鍙戣揣鍛橈細</div>
<div style="width: 10%">鍙告満锛�</div>
<div style="width: 15%">瀹㈡埛绛惧瓧锛�</div>
@@ -246,7 +250,12 @@
<style scoped>
+@media print {
+ .pages {
+ page-break-after: always;
+ }
+}
h1,h3{
left:0;
right:0;
--
Gitblit v1.8.0