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

fix ticket #300

This commit is contained in:
wlx 2012-02-16 03:54:15 +00:00
parent 8204c92b44
commit 04cb80a906
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
application/admin/controllers/DownController.php
View File

@ -184,15 +184,15 @@ class Admin_DownController extends Zend_Controller_Action
}//reset
$select="select distinct(o.*) from offlineapp o
left join dataorder d on o.id=d.offlineappid
where o.ts_approved is null
and o.pdflink is not null ";
left join dataorder d on o.id=d.offlineappid";
if ($status==4)
$select.=" and d.status=4";
$select.=" where o.ts_approved is null
and o.pdflink is not null and d.status=4";
elseif ($status==-1)
$select.=" and d.status=-1";
$select.=" where o.pdflink is not null and o.status=-1";
else
$select.=" and d.status in (3,4)";
$select.=" where o.ts_approved is null
and o.pdflink is not null and d.status in (3,4)";
$select.=" order by o.ts_created desc";
$rs=$this->db->query($select);
$rows=$rs->fetchAll();

2
application/admin/views/scripts/down/offlineapp.phtml
View File

@ -55,7 +55,9 @@
<td><textarea readonly="readonly" style="width:300px;height:100px;border:none;font-size:12px;<?php if($autoindex%2 == 0) echo 'background:#CCCCCC;'; else echo 'background:#FFF;'; ?>"><?= $item['datalist']; ?></textarea></td>
<td><?= date('Y-m-d',strtotime($item['ts_created'])); ?></td>
<td>
<?php if ($item[status]==3) : ?>
<a href="/admin/down/offlineapp/start/<?= $item['id']; ?>" onclick="return confirm('确定收到该申请?')">收到</a>
<?php endif; ?>
<a href="/admin/down/offlineapp/finish/<?= $item['id']; ?>" onclick="return confirm('确定确定通过该申请?')">通过</a>
<a href="/admin/down/offlineapp/cancel/<?= $item['id']; ?>" onclick="return confirm('确定将此记录删除?')">删除</a>
<a href="/admin/down/offlineapp/deny/<?= $item['id']; ?>" onclick="return confirm('确定拒绝该申请？')">拒绝</a>