From a26e834d87b2f03dd7768fddb1c3ba946a08c314 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 05 七月 2024 18:20:25 +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 | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 995873f..270243e 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
@@ -10,6 +10,7 @@
let otherMoney = ref([])
let delivery = ref([])
let money = ref("")
+let otherMoneys = 0
let takeCare = "娉ㄦ剰:璇峰Ε鍠勪繚绠″ソ鎴戝徃鐨勭幓鐠冩灦锛屽鏈変涪澶辨垨鎹熷潖锛屾寜1500鍏冨彧璧斿伩銆傝阿璋㈤厤鍚�!"
let remark = "澶囨敞:鏈壒鐜荤拑涓轰紭绛夊悎鏍煎搧锛岃鍦ㄥ嵏璐ф椂,褰撻潰娑堢偣楠屾敹銆佸鏈夎川閲忛棶棰樺湪涓�鍛ㄥ唴涓庢湰鍏徃鑱旂郴,鍚﹀垯姒備笉璐熻矗锛�"
@@ -33,7 +34,9 @@
delivery.value=deepClone(res.data.delivery)
money.value=deepClone(res.data.money)
otherMoney.value=deepClone(res.data.otherMoney)
-
+ otherMoney.value.forEach(item => {
+ otherMoneys+=item.DeliveryDetailOtherMoney.monery
+ })
}else{
ElMessage.warning(res.msg)
router.push("/login")
@@ -157,7 +160,7 @@
<td>{{delivery.quantity}}</td>
<td>{{delivery.area}}</td>
<td></td>
- <td>{{delivery.money}}</td>
+ <td>{{delivery.money-otherMoneys}}</td>
<td></td>
</tr>
<tr class="day-in">
@@ -174,10 +177,10 @@
<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[0].alias}}</div>
- <div style="width: 25%">{{item.DeliveryDetailOtherMoney[0].price}}</div>
- <div style="width: 25%">{{item.DeliveryDetailOtherMoney[0].count}}</div>
- <div style="width: 25%">{{item.DeliveryDetailOtherMoney[0].monery}}</div>
+ <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>
</td>
<td style="text-align: left;border:none;font-size: 15px;" colspan="5">澶у啓閲戦: {{money}}</td>
--
Gitblit v1.8.0