From 03ca27e589775840ae821b1e66549f06c8dd3692 Mon Sep 17 00:00:00 2001
From: Li Jianxuan <la5c@qq.com>
Date: Wed, 11 Sep 2013 03:56:13 +0000
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BA=86=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BE=85=E5=A4=84=E7=90=86=E7=94=B3=E8=AF=B7=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/views/scripts/data/order.phtml    | 29 +++++++++++++------
 .../default/views/scripts/heihe/view.phtml    |  2 ++
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/application/default/views/scripts/data/order.phtml b/application/default/views/scripts/data/order.phtml
index cf397f22..bf2750b7 100644
--- a/application/default/views/scripts/data/order.phtml
+++ b/application/default/views/scripts/data/order.phtml
@@ -27,9 +27,9 @@
         	 ?>
 <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-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-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-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-online"><a href="/data/order/ac/online">在线数据<?= !empty($this->counts['onlineapp']) ? '<span class="badge badge-info">'.$this->counts['onlineapp'].'</span>':'' ?></a></li>
 </ul>    	
@@ -46,12 +46,19 @@ echo '<a class="btn btn-primary" href="/data/order/apply/all">提交所有数据
 } elseif	($this->tabID=='order-offline2') {
 	if(count($this->paginator))
 	{
-	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>';
-	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> 
-				<a class="btn btn-success" href="/data/order/ac/commitapplicationform/?offlineappid='.$this->offlineappid.'">确认申请</a>';
+		echo '<a class="btn btn-primary" href="/data/order/pdf/1">生成PDF</a> ';
+		if($this->offlineappid >1)
+		{
+			if(empty($this->applicationform))
+			{
+				echo '<a class="btn btn-primary" href="javascript:void(0);" onclick="upload.showUploadForm('.$this->offlineappid.');">上传申请表</a>';
+			}
+			else
+			{
+				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>';
+			}
+		}
 	}
 } elseif	($this->tabID=='order-offline3') {
 	if(count($this->paginator))
@@ -68,7 +75,11 @@ echo '通过时间';
 		<tbody>
 <?php foreach($this->paginator as $order) : ?>
 		<tr>
+        	<?php if($order['status'] < 4) { ?>
 			<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>
 <?php
diff --git a/application/default/views/scripts/heihe/view.phtml b/application/default/views/scripts/heihe/view.phtml
index 07d8a47c..8e7e7a33 100755
--- a/application/default/views/scripts/heihe/view.phtml
+++ b/application/default/views/scripts/heihe/view.phtml
@@ -373,9 +373,11 @@ endforeach;
     	放入数据篮
     	</a>
     <?php endif;endif; ?>
+    <!-- 
     <a href="javascript:void(0);" onclick="method.like('<?php echo $md->uuid; ?>',this)" class="btn btn-block" title="喜欢此数据可以将它放到收藏夹中下次浏览">
     	收藏此数据
     </a>
+    -->
     </div>
     
     </div>