工点，订单状态接口修改

app/Http/Controllers/Api/mini/DeviceController.php

@@ -33,6 +33,7 @@ class DeviceController extends BaseController
         return json_decode(json_encode($items));
     }
 
+    //设备三级联动
     public function getThreeLevel(Request $request)
     {
         if($request->input('type') == 'drop_menu') {

app/Http/Controllers/Api/mini/InnerDeviceController.php

@@ -74,8 +74,10 @@ class InnerDeviceController extends BaseController
             $stat_items = $this->getStat($items);
         }
 
-        if($request->input('free')) {
-            $free_id = Option::get('inner_devices', 'status', 'free', 'id');
+
+        $status_field = $request->input('status');
+        if($status_field) {
+            $free_id = Option::get('inner_devices', 'status', $status_field, 'id');
             $items = $items->where('status', $free_id);
         }
 

app/Http/Controllers/Api/mini/OrderController.php

@@ -213,11 +213,24 @@ class OrderController extends BaseController
         return $this->success();
     }
 
+    //订单列表
     public function get(Request $request)
     {
         $user = Auth::guard('mini')->user();
+        $project_role = $user->getTopRole();
+        if($project_role) {
+            $project_role->rights = $project_role->getRights();
+        }
+        //判断是否有租赁查看权限
+        if($project_role->rights['rentView'] == true){
+            $items = $this->model->join('users', 'orders.user_id', '=', 'users.id')->where('status','!=',4)->select('orders.*', 'users.id as user_id', 'users.name');
+        } else {
+            $items = $this->model->join('users', 'orders.user_id', '=', 'users.id')->select('orders.*', 'users.id as user_id', 'users.name');
+        }
+
+        //取对应项目的工点
         $level = $user->getLevel($request->input('project_id'));
-        $items = $this->model->join('users', 'orders.user_id', '=', 'users.id')->select('orders.*', 'users.id as user_id', 'users.name');
+
         $search_items = [
             ['project_id', $request->input('project_id')],
             ['level', '>=', $level]

app/Http/Controllers/Api/mini/ProjectController.php

@@ -85,6 +85,7 @@ class ProjectController extends BaseController
         return $this->success(['msg' => '创建成功', 'data' => $items->items()]);
     }
 
+    //获取项目总数
     public function getTotal()
     {
         $user = Auth::guard('mini')->user();
@@ -92,6 +93,7 @@ class ProjectController extends BaseController
         return $this->success(['msg' => '操作成功', 'data' => $total]);
     }
 
+    //项目列表
     public function getAll(Request $request)
     {
         if($request->input('type') == 'drop_menu') {
@@ -111,7 +113,7 @@ class ProjectController extends BaseController
             $items = $items->whereIn('id', $project_ids);
         }
         $items = $items->get();
-        return $this->success(['msg' => '创建成功', 'data' => $items]);
+        return $this->success(['msg' => 'ok', 'data' => $items]);
     }
 
     public function detail(Request $request)

app/Http/Controllers/Api/mini/RentTypeController.php

@@ -14,6 +14,7 @@ class RentTypeController extends BaseController
         $this->model = new RentType();
     }
 
+    //租赁类型
     public function get(Request $request)
     {
         if($request->input('type') == 'drop_menu') {

app/Http/Controllers/Api/mini/WorkPointController.php

@@ -19,6 +19,7 @@ class WorkPointController extends BaseController
         $this->model = new WorkPoint();
     }
 
+    //工作点位列表
     public function get(Request $request)
     {
         $items = $this->model;