From 19ac21f7c2342cf2bdd713e9fe9c67484b98d872 Mon Sep 17 00:00:00 2001 From: wlx Date: Thu, 26 Sep 2013 03:28:43 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E5=A4=84?= =?UTF-8?q?=E7=90=86=E4=B8=AD=E7=9A=84=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E8=93=9D=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E7=9B=B8=E5=85=B3=E6=96=87=E5=AD=97=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../default/controllers/DataController.php | 22 +++++++++------ .../default/views/scripts/data/order.phtml | 27 ++++++++++--------- 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/application/default/controllers/DataController.php b/application/default/controllers/DataController.php index adc82c78..19cfd834 100755 --- a/application/default/controllers/DataController.php +++ b/application/default/controllers/DataController.php @@ -1903,16 +1903,22 @@ class DataController extends Zend_Controller_Action if($v['status'] == 1) $showorders[] = $rows[$k]; break; case 'offline2' : - if($v['status'] == 2) $showorders[] = $rows[$k]; - $this->view->offlineappid = $v['offlineappid']; - $this->view->applicationform = $v['applicationform']; - $this->view->offlineappstatus = $v['status']; + if($v['status'] == 2) + { + $showorders[] = $rows[$k]; + $this->view->offlineappid = $v['offlineappid']; + $this->view->applicationform = $v['applicationform']; + $this->view->offlineappstatus = $v['status']; + } break; case 'offline3' : - if($v['status'] == 3 || $v['status'] == 4) $showorders[] = $rows[$k]; - $this->view->offlineappid = $v['offlineappid']; - $this->view->applicationform = $v['applicationform']; - $this->view->offlineappstatus = $v['status']; + if($v['status'] == 3 || $v['status'] == 4) + { + $showorders[] = $rows[$k]; + $this->view->offlineappid = $v['offlineappid']; + $this->view->applicationform = $v['applicationform']; + $this->view->offlineappstatus = $v['status']; + } break; case 'offline4' : if($v['status'] == 5) $showorders[] = $rows[$k]; diff --git a/application/default/views/scripts/data/order.phtml b/application/default/views/scripts/data/order.phtml index bf2750b7..d92b5724 100644 --- a/application/default/views/scripts/data/order.phtml +++ b/application/default/views/scripts/data/order.phtml @@ -27,36 +27,39 @@ ?> paginator)) : ?> -
paginator; ?>
+
paginator; ?>
+tabID=='order-offline2') { ?> +
重要说明：完成一个订单需要三个步骤，即生成pdf、上传签字后的pdf、确认订单。请确保上传的pdf和当前订单中的数据相同，否则无法受理。若不相同，请重新生成、上传。
+
时间 标题 tabID=='order-offline1') { -echo '提交所有数据（一次最多5条）'; +echo '全部放入订单（最多5条）'; } elseif ($this->tabID=='order-offline2') { if(count($this->paginator)) { - echo '生成PDF '; + echo '生成pdf '; if($this->offlineappid >1) { if(empty($this->applicationform)) { - echo '上传申请表'; + echo '上传pdf'; } else { - echo '重新上传申请表 - 确认申请'; + echo '重新上传pdf + 确认订单'; } } } @@ -84,15 +87,15 @@ echo '通过时间'; tabID=='order-offline1') { - echo '提交 - 取消'; + echo '放入订单 + 移除'; } elseif ($this->tabID=='order-offline2') { switch($order['status']) { case 2: if(empty($order['applicationform'])) echo "请生成PDF申请表并上传".' 取消'; else - echo 'PDF已上传,请确认提交申请'; + echo 'PDF已上传,请确认订单'; break; case 3: echo '申请表已上传';