修改配方修改1212

application/admin/controller/Dashboard.php

@@ -81,17 +81,17 @@ class Dashboard extends Backend
         $date = date('Y-m-d');
         $company_id = $_SESSION['think']['admin']['company_id'];//查询对应公司id
         //配方单
-        $formuladate = Db::name('formula')->where('company_id',$company_id)->where('date',"<",$date)->count();
+        $formuladate = Db::name('formula')->where('company_id',$company_id)->where('create',">",$date)->count();
         $this->view->assign('formuladate',$formuladate);
         $formula = Db::name('formula')->where('company_id',$company_id)->count();
         $this->view->assign('formula',$formula);
         //订单
-        $orderdate = Db::name('order')->where('company_id',$company_id)->where('date',"<",$date)->count();
+        $orderdate = Db::name('order')->where('company_id',$company_id)->where('create',">",$date)->count();
         $this->view->assign('orderdate',$orderdate);
         $order = Db::name('order')->where('company_id',$company_id)->count();
         $this->view->assign('order',$order);
         //库存
-        $stockdate = Db::name('stock')->where('company_id',$company_id)->where('create',"<",$date)->count();
+        $stockdate = Db::name('stock')->where('company_id',$company_id)->where('create',">",$date)->count();
         $this->view->assign('stockdate',$stockdate);
         $stock = Db::name('stock')->where('company_id',$company_id)->count();
         $this->view->assign('stock',$stock);
@@ -103,18 +103,6 @@ class Dashboard extends Backend
 
     public function ecDashboard(){
         $company_id = $_SESSION['think']['admin']['company_id'];//查询对应公司id
-//      $date = date('Y-m-d 23:59:59',strtotime("last Monday"));
-//      $date = date('Y-m-d',strtotime("-6 days"));
-//      $end = date('Y-m-d');
-//      $r = $this->getDateFromRange($date,$end);
-//      foreach ($r as $k=>$v){
-//            $orderdate = Db::name('order')->where('company_id',$company_id)->where('date',">",$v)->select();
-//            if ($orderdate) {
-//                return $orderdate;
-//            } else {
-//                return 0;
-//            }
-//        }
         /**
          * 查出此公司一周内每一天的订单数量，返回到前台
          * 1、组合日期数组

application/admin/controller/Formula.php

@@ -135,6 +135,7 @@ class Formula extends Backend
             $customer_id = Db::name('customer')->where('customer_name','in',$customer)->column('id');
             $usability = implode(',',$customer_id);
         }
+//        $order = Db::name('order')->order('desc id')->find();
         $params['usability'] = $usability;
         $params['create'] = date('Y-m-d H:i:s');
         $user_info = Session::get('admin');
@@ -215,17 +216,22 @@ class Formula extends Backend
         }
         if (false === $this->request->isPost()) {
             $ids = input('ids');
-            $order = Db::name('order')->field('user_name,examine,customer')->where('id',"=",$ids)->find();
+            $formula = Db::name('formula')->field('charge_name,examine_name')->where('id',"=",$ids)->find();
             //查询公司
-            $customer_name = Db::name('customer')->field('id,customer_name')->where('customer_name','=',$order['customer'])->find();
+            $user_info = Session::get('admin');
+            $map = [];
+            if ($user_info['id'] !== 1){
+                $map['company_id'] = $user_info['company_id'];
+            }
+            $customer_name = Db::name('customer')->field('id,customer_name')->where($map)->find();
             $this->assign('customer_name',$customer_name);
             $customer = Db::name('customer')->field('customer_name')->select();
             $this->assign('customer',$customer);
             //查询 经办 审核
             $jsdd = Db::name('personnel')->where('bid',"=",2)->where('position','=',"jsdd")->order('name desc')->select();
             $jssh = Db::name('personnel')->where('bid',"=",2)->where('position','=',"jssh")->order('name desc')->select();
-            $personnel_jsdd = Db::name('personnel')->where('name','=',$order['user_name'])->find();
-            $personnel_jssh = Db::name('personnel')->where('name','=',$order['examine'])->find();
+            $personnel_jsdd = Db::name('personnel')->where('name','=',$formula['charge_name'])->find();
+            $personnel_jssh = Db::name('personnel')->where('name','=',$formula['examine_name'])->find();
             $this->assign('jsdd',$jsdd);
             $this->assign('jssh',$jssh);
             $this->assign('personnel_jsdd',$personnel_jsdd);