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 '申请表已上传';
|