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