From 3e881ec267c7ece3598ce12b41d93c120fedb323 Mon Sep 17 00:00:00 2001
From: Li Jianxuan <la5c@qq.com>
Date: Thu, 5 Sep 2013 09:14:00 +0000
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E8=81=8C=E7=A7=B0=E7=9A=84=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/module/Order/Order.php         | 6 +++---
 application/module/Order/mount/PdfForm.php | 5 -----
 2 files changed, 3 insertions(+), 8 deletions(-)

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 "请填写用途";