From 950f97728193c796901e4d6b160d323eca9861c3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 十月 2025 16:58:26 +0800
Subject: [PATCH] 修改发货保存并审核功能
---
north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue | 200 ++++++-------------------------------------------
1 files changed, 26 insertions(+), 174 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue
index 09b4144..368cca0 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue
@@ -69,18 +69,14 @@
onMounted(()=>{
- console.log(props.deliveryId)
- /*if(props.deliveryId===null || props.deliveryId===undefined || props.deliveryId===''){
- return
- }
- form.value.deliveryId = props.deliveryId*/
+
if(route.query.deliveryID===null || route.query.deliveryID===undefined || route.query.deliveryID===''){
return
}
form.value.deliveryId=route.query.deliveryID
- request.post(`/Delivery/getSelectDeliveryPrinting`,form.value).then((res) => {
+ request.post(`/delivery/getSelectDeliveryPrinting`,form.value).then((res) => {
if(res.code==200){
produceList.value = deepClone(res.data.data)
delivery.value=deepClone(res.data.delivery)
@@ -91,6 +87,8 @@
router.push("/login")
}
})
+
+
})
@@ -107,13 +105,14 @@
<div>
<el-button @click="Printing" style="margin-top: -5px" id="searchButton" type="primary" >鎵撳嵃</el-button>
+
<div id="pis" style="width: 100%;height: 100%">
<div style="font-size: 30px;text-align: center;font-weight: bold;">甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�</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="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>
</div>
@@ -122,25 +121,25 @@
<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;font-size: 15px;font-weight: bold;" colspan="3">瀹㈡埛鍚嶇О锛�<span>{{delivery.customerName}}</span></th>
- <th style="text-align: left;border:none;font-size: 15px;font-weight: bold;" colspan="3">椤圭洰鍚嶇О锛�<span>{{delivery.project}}</span></th>
- <th style="text-align: left;border:none;font-size: 15px;font-weight: bold;" colspan="2">鑱旂郴浜猴細<span>{{delivery.contacts}}</span></th>
+ <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;font-size: 15px;font-weight: bold;" colspan="6">閫佽揣鍦板潃锛�<span>{{delivery.deliveryAddress}}</span></th>
- <th style="text-align: left;border:none;font-size: 15px;font-weight: bold;" colspan="2">鑱旂郴鐢佃瘽锛�<span>{{delivery.contactNumber}}</span></th>
+ <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>
</tr>
<tr>
- <th style="width: 6%;font-size: 15px;font-weight: bold;">搴忓彿</th>
- <th style="width: 20%;font-size: 15px;font-weight: bold;">妤煎眰缂栧彿</th>
- <th style="width: 20%;font-size: 15px;font-weight: bold;">瀹�(寮у害)*楂�</th>
- <th style="width: 10%;font-size: 15px;font-weight: bold;">鏁伴噺</th>
- <th style="width: 10%;font-size: 15px;font-weight: bold;">闈㈢Н</th>
- <th style="width: 10%;font-size: 15px;font-weight: bold;">鍗曚环</th>
- <th style="width: 12%;font-size: 15px;font-weight: bold;">閲戦</th>
- <th style="width: 12%;font-size: 15px;font-weight: bold;">鍔犲伐瑕佹眰</th>
+ <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>
<template v-for="(item, index) in produceList" :key="index" >
@@ -160,7 +159,7 @@
<td>{{items.money}}</td>
<td>{{items.processingNote}}</td>
</tr>
- <tr class="day-in">
+ <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>
@@ -217,6 +216,7 @@
</div>
</div>
+
</template>
<style>
@@ -228,6 +228,7 @@
margin-top:8mm;
}
+ /*#fen {page-break-after: always;}*/
}
#table1 tr{
height: 30px;
@@ -236,6 +237,7 @@
height: 30px;
border: 1px solid #d3dce6;
border-collapse: collapse;
+ font-size: 15px;
}
.day-in td{
text-align: center;
@@ -251,164 +253,14 @@
.el-overlay-dialog{
overflow-y: scroll;
}
-::-webkit-scrollbar {
+/*::-webkit-scrollbar {
display: none;
-}
+}*/
.bottom{
- font-size: 10px;
- font-weight: bold;
+ font-size: 12px;
}
</style>
-<!--
-<template>
-
- <div>
- <div id="pis" style="width: 100%;height: 100%">
- <div style="font-size: 35px;text-align: center;font-weight: bold;">甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�</div>
- <el-row :gutter="20">
- <el-col :span="6"><div></div></el-col>
- <el-col :span="12"><div style="font-size: 30px;text-align: center;font-weight: bold;">閿�鍞彂璐у崟</div></el-col>
- <el-col :span="6">
- <div style="font-size: 20px;display: flex;margin-top: 10px">
- <div style="font-weight: bold;">鍙戣揣鍗曞彿锛�</div>
- <div style="font-weight: bold;">{{delivery.deliveryId}}</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;font-size: 15px;font-weight: bold;" colspan="3">瀹㈡埛鍚嶇О锛歿{delivery.customerName}}</th>
- <th style="text-align: left;border:none;font-size: 15px;font-weight: bold;" colspan="3">椤圭洰鍚嶇О锛歿{delivery.project}}</th>
- <th style="text-align: left;border:none;font-size: 15px;font-weight: bold;" colspan="2">鑱旂郴浜猴細{{delivery.contacts}}</th>
-
- </tr>
- <tr>
- <th style="text-align: left;border:none;font-size: 15px;font-weight: bold;" colspan="6">閫佽揣鍦板潃锛歿{delivery.deliveryAddress}}</th>
- <th style="text-align: left;border:none;font-size: 15px;font-weight: bold;" colspan="2">鑱旂郴鐢佃瘽锛歿{delivery.contactNumber}}</th>
-
- </tr>
- <tr>
- <th style="width: 6%;font-size: 15px;font-weight: bold;">搴忓彿</th>
- <th style="width: 20%;font-size: 15px;font-weight: bold;">妤煎眰缂栧彿</th>
- <th style="width: 20%;font-size: 15px;font-weight: bold;">瀹�(寮у害)*楂�</th>
- <th style="width: 10%;font-size: 15px;font-weight: bold;">鏁伴噺</th>
- <th style="width: 10%;font-size: 15px;font-weight: bold;">闈㈢Н</th>
- <th style="width: 10%;font-size: 15px;font-weight: bold;">鍗曚环</th>
- <th style="width: 12%;font-size: 15px;font-weight: bold;">閲戦</th>
- <th style="width: 12%;font-size: 15px;font-weight: bold;">鍔犲伐瑕佹眰</th>
- </tr>
-
- <template v-for="(item, index) in produceList" :key="index" >
- <tr>
- <td style="font-size: 15px;font-weight: bold;" colspan="3">浜у搧鍚嶇О:{{item.DeliveryDetail.orderDetail.productName}}</td>
- <td style="font-size: 15px;font-weight: bold;" colspan="3">瀵规柟鍗曞彿:</td>
- <td style="font-size: 15px;font-weight: bold;" colspan="2">璁㈠崟缂栧彿:{{item.DeliveryDetail.orderDetail.orderId}}</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 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">
- <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: 15px">{{delivery.creator}}</span></div></el-col>
- <el-col :span="5"><div class="bottom">鍒跺崟鏃ユ湡锛�<span style="font-size: 15px">{{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 >
-#table1 tr{
- height: 30px;
-}
-#table1 th{
- height: 30px;
- border: 1px solid #d3dce6;
- border-collapse: collapse;
-}
-.day-in td{
- text-align: center;
-}
-#table1 td{
- border: 1px solid #d3dce6;
- border-collapse: collapse;
-}
-#deliveryPrinting .el-dialog__header{
- visibility:hidden
-}
-
-.el-overlay-dialog{
- overflow-y: scroll;
-}
-::-webkit-scrollbar {
- display: none;
-}
-.bottom{
- font-size: 20px;
- font-weight: bold;
-
-}
-
-</style>-->
--
Gitblit v1.8.0