diff --git a/application/models/order/Manager/Offlineapp.php b/application/models/order/Manager/Offlineapp.php index 1262301e..3b01191d 100644 --- a/application/models/order/Manager/Offlineapp.php +++ b/application/models/order/Manager/Offlineapp.php @@ -45,6 +45,19 @@ class Offlineapp //接收 public function receive($id) { + if(empty($id) || !is_numeric($id)) + { + return "参数错误"; + } + + $data = array( + + ); + $sql="update dataorder set status=4,ts_received=now() where id=?"; + $rs = $this->db->query($sql,array($id)); + $row = $rs->fetch(); + + } diff --git a/application/models/order/Order.php b/application/models/order/Order.php index 5d2ba4a1..606aab2a 100644 --- a/application/models/order/Order.php +++ b/application/models/order/Order.php @@ -268,7 +268,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['project'].='['.$formData['project_title'].' | '.$formData['project_type'].' | '.$formData['project_id'].' | ' . $formData['leader'] . ' | ' .$formData['leadertitle']. ']'; $pdf->data = $formData; if (isset($formData['westdclist'])) $pdf->drawWestdc(); diff --git a/application/models/order/mount/PdfForm.php b/application/models/order/mount/PdfForm.php index bdf39446..058efb0c 100644 --- a/application/models/order/mount/PdfForm.php +++ b/application/models/order/mount/PdfForm.php @@ -110,6 +110,16 @@ class PdfForm implements \Order\listener\PdfFormEvents return "请填写项目标题"; } + if(empty($formData['leader'])) + { + return "请填写项目负责人"; + } + + if(empty($formData['leadertitle'])) + { + return "请填写项目负责人职称"; + } + if(empty($formData['project'])) { return "请填写用途"; diff --git a/application/models/order/mount/PdfOperate.php b/application/models/order/mount/PdfOperate.php index affe3b47..7d49fdf1 100644 --- a/application/models/order/mount/PdfOperate.php +++ b/application/models/order/mount/PdfOperate.php @@ -46,6 +46,7 @@ class PdfOperate implements \Order\listener\PdfEvents $formData['username'] = $formData['realname']; unset($formData['realname']); unset($formData['save']); + if ($row) { $s = $dbh->update($this->tbl_offlineapp,$formData," id={$row['id']} "); return $s;