bob
/
westdc-zf1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复订单处理中的逻辑错误，修改数据蓝中的相关文字说明

This commit is contained in:
wlx 2013-09-26 03:28:43 +00:00
parent 77efed4024
commit 19ac21f7c2
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/default/controllers/DataController.php
View File

@ -1903,16 +1903,22 @@ class DataController extends Zend_Controller_Action
if($v['status'] == 1) $showorders[] = $rows[$k]; if($v['status'] == 1) $showorders[] = $rows[$k];
break; break;
case 'offline2' : case 'offline2' :
if($v['status'] == 2) $showorders[] = $rows[$k]; if($v['status'] == 2)
{
$showorders[] = $rows[$k];
$this->view->offlineappid = $v['offlineappid']; $this->view->offlineappid = $v['offlineappid'];
$this->view->applicationform = $v['applicationform']; $this->view->applicationform = $v['applicationform'];
$this->view->offlineappstatus = $v['status']; $this->view->offlineappstatus = $v['status'];
}
break; break;
case 'offline3' : case 'offline3' :
if($v['status'] == 3 || $v['status'] == 4) $showorders[] = $rows[$k]; if($v['status'] == 3 || $v['status'] == 4)
{
$showorders[] = $rows[$k];
$this->view->offlineappid = $v['offlineappid']; $this->view->offlineappid = $v['offlineappid'];
$this->view->applicationform = $v['applicationform']; $this->view->applicationform = $v['applicationform'];
$this->view->offlineappstatus = $v['status']; $this->view->offlineappstatus = $v['status'];
}
break; break;
case 'offline4' : case 'offline4' :
if($v['status'] == 5) $showorders[] = $rows[$k]; if($v['status'] == 5) $showorders[] = $rows[$k];

25
application/default/views/scripts/data/order.phtml
View File

@ -27,36 +27,39 @@
?> ?>
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li id="Nav-order-offline1"><a href="/data/order/ac/offline1">未提交的申请<?= !empty($this->counts['offline1']) ? '<span class="badge badge-info">'.$this->counts['offline1'].'</span>':'' ?></a></li> <li id="Nav-order-offline1"><a href="/data/order/ac/offline1">未生成的申请<?= !empty($this->counts['offline1']) ? '<span class="badge badge-info">'.$this->counts['offline1'].'</span>':'' ?></a></li>
<li id="Nav-order-offline2"><a href="/data/order/ac/offline2">待受理的申请<?= !empty($this->counts['offline2']) ? '<span class="badge badge-info">'.$this->counts['offline2'].'</span>':'' ?></a></li> <li id="Nav-order-offline2"><a href="/data/order/ac/offline2">待提交的订单<?= !empty($this->counts['offline2']) ? '<span class="badge badge-info">'.$this->counts['offline2'].'</span>':'' ?></a></li>
<li id="Nav-order-offline3"><a href="/data/order/ac/offline3">待审批的申请<?= !empty($this->counts['offline3']) ? '<span class="badge badge-info">'.$this->counts['offline3'].'</span>':'' ?></a></li> <li id="Nav-order-offline3"><a href="/data/order/ac/offline3">待审批的订单<?= !empty($this->counts['offline3']) ? '<span class="badge badge-info">'.$this->counts['offline3'].'</span>':'' ?></a></li>
<li id="Nav-order-offline4"><a href="/data/order/ac/offline4">已通过的申请<?= !empty($this->counts['offline4']) ? '<span class="badge badge-info">'.$this->counts['offline4'].'</span>':'' ?></a></li> <li id="Nav-order-offline4"><a href="/data/order/ac/offline4">已通过的申请<?= !empty($this->counts['offline4']) ? '<span class="badge badge-info">'.$this->counts['offline4'].'</span>':'' ?></a></li>
<li id="Nav-order-online"><a href="/data/order/ac/online">在线数据<?= !empty($this->counts['onlineapp']) ? '<span class="badge badge-info">'.$this->counts['onlineapp'].'</span>':'' ?></a></li> <li id="Nav-order-online"><a href="/data/order/ac/online">在线数据<?= !empty($this->counts['onlineapp']) ? '<span class="badge badge-info">'.$this->counts['onlineapp'].'</span>':'' ?></a></li>
</ul> </ul>
<!-- content --> <!-- content -->
<?php if (!empty($this->paginator)) : ?> <?php if (!empty($this->paginator)) : ?>
<div class="pagenavi"><?= $this->paginator; ?></div> <div class="pagenavi"><?= $this->paginator; ?></div>
<?php if ($this->tabID=='order-offline2') { ?>
<div class="well alert alert-error">重要说明：完成一个订单需要三个步骤，即<strong>生成pdf</strong>、<strong>上传签字后的pdf</strong>、<strong>确认订单</strong>。请确保上传的pdf和当前订单中的数据相同，否则无法受理。若不相同，请重新生成、上传。</div>
<?php } ?>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<thead> <thead>
<th>时间</th> <th>时间</th>
<th>标题</th> <th>标题</th>
<th> <th>
<?php if ($this->tabID=='order-offline1') { <?php if ($this->tabID=='order-offline1') {
echo '<a class="btn btn-primary" href="/data/order/apply/all">提交所有数据</a>（一次最多5条）'; echo '<a class="btn btn-primary" href="/data/order/apply/all">全部放入订单</a>（最多5条）';
} elseif ($this->tabID=='order-offline2') { } elseif ($this->tabID=='order-offline2') {
if(count($this->paginator)) if(count($this->paginator))
{ {
echo '<a class="btn btn-primary" href="/data/order/pdf/1">生成PDF</a> '; echo '<a class="btn btn-primary" href="/data/order/pdf/1">生成pdf</a> ';
if($this->offlineappid >1) if($this->offlineappid >1)
{ {
if(empty($this->applicationform)) if(empty($this->applicationform))
{ {
echo '<a class="btn btn-primary" href="javascript:void(0);" onclick="upload.showUploadForm('.$this->offlineappid.');">上传申请表</a>'; echo '<a class="btn btn-primary" href="javascript:void(0);" onclick="upload.showUploadForm('.$this->offlineappid.');">上传pdf</a>';
} }
else else
{ {
echo '<a class="btn btn-warning" href="javascript:void(0);" onclick="upload.showUploadForm('.$this->offlineappid.');">重新上传申请表</a> echo '<a class="btn btn-warning" href="javascript:void(0);" onclick="upload.showUploadForm('.$this->offlineappid.');">重新上传pdf</a>
<a class="btn btn-success" href="/data/order/ac/commitapplicationform/?offlineappid='.$this->offlineappid.'">确认申请</a>'; <a class="btn btn-success" href="/data/order/ac/commitapplicationform/?offlineappid='.$this->offlineappid.'">确认订单</a>';
} }
} }
} }
@ -84,15 +87,15 @@ echo '通过时间';
<td> <td>
<?php <?php
if ($this->tabID=='order-offline1') { if ($this->tabID=='order-offline1') {
echo '<a href="/data/order/apply/'.$order['id'].'" class="btn btn-primary">提交</a> echo '<a href="/data/order/apply/'.$order['id'].'" class="btn btn-primary">放入订单</a>
<a href="/data/order/cancel/'.$order['id'].'" class="btn">取消</a>'; <a href="/data/order/cancel/'.$order['id'].'" class="btn">移除</a>';
} elseif ($this->tabID=='order-offline2') { } elseif ($this->tabID=='order-offline2') {
switch($order['status']) { switch($order['status']) {
case 2: case 2:
if(empty($order['applicationform'])) if(empty($order['applicationform']))
echo "请生成PDF申请表并上传".' <a class="btn" href="/data/order/cancel/'.$order['id'].'">取消</a>'; echo "请生成PDF申请表并上传".' <a class="btn" href="/data/order/cancel/'.$order['id'].'">取消</a>';
else else
echo '<span class="label label-success">PDF已上传,请确认提交申请</span>'; echo '<span class="label label-success">PDF已上传,请确认订单</span>';
break; break;
case 3: case 3:
echo '<span class="label label-success">申请表已上传</span>'; echo '<span class="label label-success">申请表已上传</span>';