From a7cc9c3be58bccd868bc8c12ed57c2b90fedc6b8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 05 十二月 2024 17:02:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue
index 545f964..8ea010b 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue
@@ -39,8 +39,9 @@
productIdData.value=deepClone(res.data.data)
produceList.value = deepClone(res.data.data)
- console.log(produceList.value)
+
delivery.value=deepClone(res.data.delivery)
+ console.log(delivery.value)
money.value=deepClone(res.data.money)
produceList.value.forEach(item => {
sumMoney+=item.DeliveryDetail.grossAmount
@@ -293,6 +294,15 @@
<el-row :gutter="20" style="margin-top: 20px;" v-if="company.showDeliveryCreator">
<el-col :span="24"><div class="bottom">{{remark}}</div></el-col>
</el-row>
+ <el-row :gutter="20" style="margin-top: 20px;" v-if="!company.showDeliveryCreator">
+<!-- <el-input
+ v-model=""
+ autosize
+ type="textarea"
+ placeholder="Please input"
+ />-->
+ <el-col :span="24"><div class="bottom">{{delivery.processingNote}}</div></el-col>
+ </el-row>
<el-dialog v-model="dialogVisible" style="width: 40%;height: 20%;margin-top: 10%" >
<el-select v-model="selectedValues" style="width: 100%" @change="handleChange" multiple placeholder="璇烽�夋嫨">
--
Gitblit v1.8.0