问题2

Application/Admin/Controller/OrderSController.class.php

@@ -47,6 +47,8 @@ class OrderSController extends AdminController
           $order_goods=M('orderGoods');
           $order_goods=M('orderGoods');
           foreach($list as $key=>$v){
           foreach($list as $key=>$v){
               $where2['order_id']=$v['id'];
               $where2['order_id']=$v['id'];
+              if(isset($_GET['group_id'])){$where2['group_id']=$_GET['group_id'];}
+
               $goods_list=$order_goods->where($where2)
               $goods_list=$order_goods->where($where2)
                   ->field('yi_order_goods.*,z_img,yi_goods.title g_title,goods_model,yi_auth_group.title')
                   ->field('yi_order_goods.*,z_img,yi_goods.title g_title,goods_model,yi_auth_group.title')
                   ->join('yi_goods on yi_order_goods.goods_id=yi_goods.id')
                   ->join('yi_goods on yi_order_goods.goods_id=yi_goods.id')
@@ -60,10 +62,16 @@ class OrderSController extends AdminController
           }
           }
       }
       }
       $this->meta_title='订单中心';
       $this->meta_title='订单中心';
+      //分仓账号
+        $sql = 'select id, title from yi_auth_group';
+        $group = $order->query($sql);
+
       $this->assign('list',$list)
       $this->assign('list',$list)
           ->assign('page',$show)//发送分页
           ->assign('page',$show)//发送分页
           ->assign('count',$count)
           ->assign('count',$count)
-          ->assign('time',$time);
+          ->assign('time',$time)
+          ->assign('formData',$_GET)
+          ->assign('groups', $group);
       $this->display();
       $this->display();
   }
   }
     //被删除订单
     //被删除订单
@@ -409,4 +417,4 @@ class OrderSController extends AdminController
             $this->error('删除失败！请稍后在试');
             $this->error('删除失败！请稍后在试');
         }
         }
     }
     }
-}
+}
\ No newline at end of file

Application/Admin/View/OrderS/index.html

@@ -15,6 +15,12 @@
         <div class="search-form fr cf">
         <div class="search-form fr cf">
             <div class="sleft">
             <div class="sleft">
                 <form method="post" action="__SELF__">
                 <form method="post" action="__SELF__">
+                    <select class="search-input" name="group_id" style="width: 90px;">
+                        <option value="">分仓账号</option>
+                        <volist name="groups" id="group">
+                            <option value="{$group.id}" <eq name="formData.group_id" value="$group.id"> selected</eq>>{$group.title}</option>
+                        </volist>
+                    </select>
                     <select class="search-input" name="is_shop" style="width: 90px;">
                     <select class="search-input" name="is_shop" style="width: 90px;">
                         <option value="">所有用户</option>
                         <option value="">所有用户</option>
                         <option value="0" <?php if($_GET['is_shop']==='0'){ echo 'selected';} ?>>普通用户</option>
                         <option value="0" <?php if($_GET['is_shop']==='0'){ echo 'selected';} ?>>普通用户</option>
@@ -201,4 +207,4 @@
             return aGET;
             return aGET;
         }
         }
     </script>
     </script>
-</block>
+</block>
\ No newline at end of file