From 376899392985ab9a33032c134bac10f10d469a7c Mon Sep 17 00:00:00 2001
From: Mrking <782276617@qq.com>
Date: Sun, 12 Jan 2025 22:16:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=9F=E4=BA=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/oms/produceorder/ProduceOrderForm.vue    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue
index 4aba286..252e778 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue
@@ -328,10 +328,13 @@ const downpdf = async () => {
   formData.value.inspectionDateStr = formatDate(formData.value.inspectionDate,'YYYY-MM-DD')
   formData.value.deliverydateStr = formatDate(formData.value.deliverydate,'YYYY-MM-DD')
   const remarks = formData.value.remarks
+  const details = formData.value.details
   if(remarks){
     formData.value.remarksText =  formData.value.remarks + '\n' +formData.value.details
   }else {
-    formData.value.remarksText =  formData.value.details
+    if(details){
+      formData.value.remarksText = details
+    }
   }
   //formData.value.saleContractNo = formData.value.orderNo
 
@@ -376,10 +379,13 @@ const preview = async () => {
   formData.value.inspectionDateStr = formatDate(formData.value.inspectionDate,'YYYY-MM-DD')
   formData.value.deliverydateStr = formatDate(formData.value.deliverydate,'YYYY-MM-DD')
   const remarks = formData.value.remarks
+  const details = formData.value.remarks
   if(remarks){
     formData.value.remarksText =  formData.value.remarks + '\n' +formData.value.details
   }else {
-    formData.value.remarksText =  formData.value.details
+    if(details){
+      formData.value.remarksText = details
+    }
   }
   //formData.value.saleContractNo = formData.value.orderNo