order

@@ -38,7 +38,6 @@ class AdminOrderController extends AdminBaseController{
                 $item['time']=($item['end_time']-$item['start_time'])/3600;
                 $item['time']=($item['end_time']-$item['start_time'])/3600;
                 return $item;
                 return $item;
             });
             });
-        dump($data->toArray());
         $this->assign('data',$data);
         $this->assign('data',$data);
         return $this->fetch();
         return $this->fetch();
     }
     }

@@ -7,21 +7,22 @@
         <li><a href="{:url('AdminArticle/add')}">添加设备</a></li>
         <li><a href="{:url('AdminArticle/add')}">添加设备</a></li>
     </ul>
     </ul>
     <form class="well form-inline margin-top-20" method="post" action="{:url('AdminArticle/index')}">
     <form class="well form-inline margin-top-20" method="post" action="{:url('AdminArticle/index')}">
-        分类:
-        <select class="form-control" name="category" style="width: 140px;">
-            <option value='0'>全部</option>
-            {$category_tree|default=''}
-        </select> &nbsp;&nbsp;
-        时间:
-        <input type="text" class="form-control js-bootstrap-datetime" name="start_time"
-               value="{$start_time|default=''}"
-               style="width: 140px;" autocomplete="off">-
-        <input type="text" class="form-control js-bootstrap-datetime" name="end_time"
-               value="{$end_time|default=''}"
-               style="width: 140px;" autocomplete="off"> &nbsp; &nbsp;
-        关键字:
-        <input type="text" class="form-control" name="keyword" style="width: 200px;"
-               value="{$keyword|default=''}" placeholder="请输入关键字...">
+        订单号:
+        <input type="text" class="form-control" name="order_no" style="width: 200px;"
+               value="{$order_no|default=''}" placeholder="请输入关键字...">
+        所属医院:
+        <input type="text" class="form-control" name="hospital" style="width: 200px;"
+               value="{$hospital|default=''}" placeholder="请输入关键字...">
+        备注:
+        <input type="text" class="form-control" name="note" style="width: 200px;"
+               value="{$note|default=''}" placeholder="请输入关键字...">
+        设备编号:
+        <input type="text" class="form-control" name="start_number"
+               value="{$start_number|default=''}"
+               style="width: 80px;" autocomplete="off">-
+        <input type="text" class="form-control" name="end_number"
+               value="{$end_number|default=''}"
+               style="width: 80px;" autocomplete="off"> &nbsp; &nbsp;
         <input type="submit" class="btn btn-primary" value="搜索"/>
         <input type="submit" class="btn btn-primary" value="搜索"/>
         <a class="btn btn-danger" href="{:url('AdminArticle/index')}">清空</a>
         <a class="btn btn-danger" href="{:url('AdminArticle/index')}">清空</a>
     </form>
     </form>
@@ -35,7 +36,7 @@
             <thead>
             <thead>
             <tr>
             <tr>
                 <th width="50">ID</th>
                 <th width="50">ID</th>
-                <th>设备MAC地址</th>
+                <th>订单编号</th>
                 <th>设备锁编号</th>
                 <th>设备锁编号</th>
                 <th>所在医院</th>
                 <th>所在医院</th>
                 <th>开始使用时间</th>
                 <th>开始使用时间</th>
@@ -47,13 +48,13 @@
             <foreach name="data" item="vo">
             <foreach name="data" item="vo">
                 <tr>
                 <tr>
                     <td><b>{$vo.id}</b></td>
                     <td><b>{$vo.id}</b></td>
-                    <td>{$vo.mac_address}</td>
+                    <td>{$vo.order_no}</td>
                     <td>{$vo.serial_number}</td>
                     <td>{$vo.serial_number}</td>
                     <td>{$vo.hospital}</td>
                     <td>{$vo.hospital}</td>
                     <td>{:date('Y-m-d H:i:s',$vo.start_time)}</td>
                     <td>{:date('Y-m-d H:i:s',$vo.start_time)}</td>
-                    <td>{:date('Y-m-d H:i:s',$vo.end_time)}{:time()}</td>
-                    <td>{$vo.time}</td>
-                    <td>{$vo.price}</td>
+                    <td>{:date('Y-m-d H:i:s',$vo.end_time)}</td>
+                    <td>约{$vo.time}小时</td>
+                    <td>{$vo.price}元</td>
                 </tr>
                 </tr>
             </foreach>
             </foreach>
         </table>
         </table>