fix ticket #300.
This commit is contained in:
parent
a545410365
commit
a9853df64c
|
@ -183,7 +183,7 @@ class Admin_DownController extends Zend_Controller_Action
|
||||||
//if
|
//if
|
||||||
}//reset
|
}//reset
|
||||||
|
|
||||||
$select="select distinct(o.*) from offlineapp o
|
$select="select distinct(o.*),d.status as datastatus from offlineapp o
|
||||||
left join dataorder d on o.id=d.offlineappid";
|
left join dataorder d on o.id=d.offlineappid";
|
||||||
if ($status==4)
|
if ($status==4)
|
||||||
$select.=" where o.ts_approved is null
|
$select.=" where o.ts_approved is null
|
||||||
|
|
|
@ -56,7 +56,7 @@
|
||||||
<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><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><?= date('Y-m-d',strtotime($item['ts_created'])); ?></td>
|
||||||
<td>
|
<td>
|
||||||
<?php if ($item['status']==3) : ?>
|
<?php if ($item['datastatus']==3) : ?>
|
||||||
<a href="/admin/down/offlineapp/start/<?= $item['id']; ?>" onclick="return confirm('确定收到该申请?')">收到</a>
|
<a href="/admin/down/offlineapp/start/<?= $item['id']; ?>" onclick="return confirm('确定收到该申请?')">收到</a>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<a href="/admin/down/offlineapp/finish/<?= $item['id']; ?>" onclick="return confirm('确定确定通过该申请?')">通过</a>
|
<a href="/admin/down/offlineapp/finish/<?= $item['id']; ?>" onclick="return confirm('确定确定通过该申请?')">通过</a>
|
||||||
|
|
Loading…
Reference in New Issue