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

注释了数据收藏功能，修复待处理申请中的逻辑错误

This commit is contained in:
Li Jianxuan 2013-09-11 03:56:13 +00:00
parent b63ab17ab3
commit 03ca27e589
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,9 +27,9 @@
?> ?>
<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>
@ -45,14 +45,21 @@
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> ';
if($this->offlineappid >1)
{ {
if(empty($this->applicationform)) if(empty($this->applicationform))
echo '<a class="btn btn-primary" href="/data/order/pdf/1">生成PDF</a> <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.');">上传申请表</a>';
}
else else
echo '<a class="btn btn-primary" href="/data/order/pdf/1">生成PDF</a> {
<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.');">重新上传申请表</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>';
} }
}
}
} elseif ($this->tabID=='order-offline3') { } elseif ($this->tabID=='order-offline3') {
if(count($this->paginator)) if(count($this->paginator))
{ {
@ -68,7 +75,11 @@ echo '通过时间';
<tbody> <tbody>
<?php foreach($this->paginator as $order) : ?> <?php foreach($this->paginator as $order) : ?>
<tr> <tr>
<?php if($order['status'] < 4) { ?>
<td><?php echo date('Y-m-d H:i:s',strtotime($order['ts_created'])); ?></td> <td><?php echo date('Y-m-d H:i:s',strtotime($order['ts_created'])); ?></td>
<?php }else{ ?>
<td><?php echo date('Y-m-d H:i:s',strtotime($order['ts_received'])); ?></td>
<?php } ?>
<td><a href="/data/<?php echo $order['uuid']; ?>"><?php echo $order['title']; ?></a></td> <td><a href="/data/<?php echo $order['uuid']; ?>"><?php echo $order['title']; ?></a></td>
<td> <td>
<?php <?php

2
application/default/views/scripts/heihe/view.phtml
View File

@ -373,9 +373,11 @@ endforeach;
放入数据篮 放入数据篮
</a> </a>
<?php endif;endif; ?> <?php endif;endif; ?>
<!--
<a href="javascript:void(0);" onclick="method.like('<?php echo $md->uuid; ?>',this)" class="btn btn-block" title="喜欢此数据可以将它放到收藏夹中下次浏览"> <a href="javascript:void(0);" onclick="method.like('<?php echo $md->uuid; ?>',this)" class="btn btn-block" title="喜欢此数据可以将它放到收藏夹中下次浏览">
收藏此数据 收藏此数据
</a> </a>
-->
</div> </div>
</div> </div>