diff --git a/application/module/Order/Order.php b/application/module/Order/Order.php index ef7cc4de..c60a23fb 100644 --- a/application/module/Order/Order.php +++ b/application/module/Order/Order.php @@ -306,7 +306,7 @@ class Order $pdf->template = $this->config->offline->template; $pdf->heihetemplate = $this->config->offline->heihetemplate; - $formData['project'].='['.$formData['project_title'].' | '.$formData['project_type'].' | '.$formData['project_id'].' | ' . $formData['leader'] . ' | ' .$formData['leadertitle']. ']'; + $formData['project'].='['.$formData['project_title'].' | '.$formData['project_type'].' | '.$formData['project_id'].' | ' . $formData['leader'] . ']'; $pdf->data = $formData; if (isset($formData['westdclist'])) $pdf->drawWestdc(); @@ -324,8 +324,8 @@ class Order //header("Content-Length: " . strlen($pdfstring)); echo $pdf->Output('westdc-data-apply.pdf','S'); }else{ - //$fn = $formData['realname'].date('YmdHis').".pdf"; - $fn = date('YmdHis').".pdf"; + $fn = $formData['realname'].date('YmdHis').".pdf"; + //$fn = date('YmdHis').".pdf"; $path = realpath($this->config->offline->savepath); $pdf->pdflink = $fn; @$pdf->Output($path.DIRECTORY_SEPARATOR.$fn, 'F'); diff --git a/application/module/Order/mount/PdfForm.php b/application/module/Order/mount/PdfForm.php index 058efb0c..62eb3dd4 100644 --- a/application/module/Order/mount/PdfForm.php +++ b/application/module/Order/mount/PdfForm.php @@ -115,11 +115,6 @@ class PdfForm implements \Order\listener\PdfFormEvents return "请填写项目负责人"; } - if(empty($formData['leadertitle'])) - { - return "请填写项目负责人职称"; - } - if(empty($formData['project'])) { return "请填写用途";