● 订单列表：新增4个字段，包括订单ID，需求工点，设备数量，订单总金额，备注

app/Http/Controllers/Admin/OrderController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;
 
 use App\Models\Option;
 use App\Models\Order;
+use App\Models\OrderDevice;
 use App\Models\Project;
 use Illuminate\Http\Request;
 
@@ -58,7 +59,22 @@ class OrderController extends BaseController
         $items = $items->paginate();
 
         foreach($items as $item) {
+            $item->order_id = $item->id ? $item->id : '';
             $item->project_name = $item->project ? $item->project->name : '';
+            $item->work_point = $item->work_point_id ? $item->workpoints?($item->workpoints->name ? $item->workpoints->name : '') :'': '';
+//            dd($item->workpoints);
+            //方法区
+            $order = OrderDevice::where('order_id',$item->order_id)->get()->toArray();
+            $order_num = count($order);
+            $total_price = 0;
+            foreach ($order as $value)
+            {
+                $one_price = ($value['quantity']*$value['price'])/100;
+                $total_price += $one_price;
+            }
+            $item->order_num = $item->id ? $order_num : '';
+            $item->total_price = $item->id ? $total_price : '';
+            $item->remark = $item->remark ? $item->remark : '';
             $item->user_name = $item->user ? $item->user->name : '';
             $item->status_name = $item->getStatusName();
             $item->option = Option::find($item->status);

app/Models/Order.php

@@ -35,7 +35,10 @@ class Order extends BaseModel
     {
         return $this->belongsTo('App\Models\WorkPoint', 'work_point_id');
     }
-
+    public function workpoints()
+    {
+        return $this->hasOne(WorkPoint::class, 'id','work_point_id');
+    }
     public function devices()
     {
         return $this->belongsToMany('App\Models\Device', 'order_devices', 'order_id', 'device_id')->withPivot('name', 'quantity', 'price', 'start_date', 'end_date', 'id');

resources/views/admin/orders/index.blade.php

@@ -85,11 +85,16 @@
                     url: '{{ $pre_uri }}' + 'get',
                     cellMinWidth: 80,
                     cols: [[
+                        { field: 'order_id', title: '订单id', align: 'center' },
                         { field: 'order_number', title: '订单号', align: 'center' },
-                        { field: 'project_name', title: '项目', align: 'center' },
-                        { field: 'type_name', title: '类型', align: 'center' },
+                        { field: 'project_name', title: '在用项目', align: 'center' },
+                        { field: 'work_point', title: '所在工点', align: 'center' },
+                        { field: 'type_name', title: '订单类型', align: 'center' },
+                        { field: 'order_num', title: '设备数量', align: 'center' },
+                        { field: 'total_price', title: '订单总金额', align: 'center' },
                         { field: 'user_name', title: '提交人', align: 'center' },
                         { field: 'status_name', title: '状态', align: 'center' },
+                        { field: 'remark', title: '订单备注', align: 'center' },
                         { field: 'created_at', title: '创建时间', align: 'center' },
                         // { title: '操作', align:'center', toolbar: '#sg-table-bar' }
                     ]],