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 252e778..eb7621e 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,13 +328,12 @@ 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 + const details = formData.value.details || '' + debugger if(remarks){ - formData.value.remarksText = formData.value.remarks + '\n' +formData.value.details + formData.value.remarksText = remarks + '\n' +details }else { - if(details){ formData.value.remarksText = details - } } //formData.value.saleContractNo = formData.value.orderNo @@ -381,11 +380,9 @@ const preview = async () => { const remarks = formData.value.remarks const details = formData.value.remarks if(remarks){ - formData.value.remarksText = formData.value.remarks + '\n' +formData.value.details + formData.value.remarksText = remarks + '\n' +details }else { - if(details){ formData.value.remarksText = details - } } //formData.value.saleContractNo = formData.value.orderNo