Merge branch 'master' of /data/git/tiantian2

app/Http/Controllers/Admin/ProjectController.php

@@ -67,7 +67,7 @@ class ProjectController extends CommonController
             }]);
         }])->find($id);
 
-        $data = (new Bed())->where("project_id", $id)->with(["project", "building", "area", "room"])->paginate(10);
+        $data = (new Bed())->where("project_id", $id)->orderBy("id","desc")->with(["project", "building", "area", "room"])->paginate(10);
 
         return view($this->bladePath . ".beds", compact("project", "data"));
     }

resources/views/admin/project/beds.blade.php

@@ -305,6 +305,18 @@
             $("#model-form").modal("hide");
             $.post(url, data, function (res) {
                 if (res.status) {
+                    console.log(res);
+                    if (res.data.room_id) {
+                        $("#data-table tbody").prepend('<tr data-type="bed">\n' +
+                            '                                <td>'+res.data.name+'</td>\n' +
+                            '                                <td>'+res.data.room_id+'</td>\n' +
+                            '                                <td>'+res.data.project_id+'</td>\n' +
+                            '                                <td>'+res.data.building_id+'</td>\n' +
+                            '                                <td>'+res.data.area_id+'</td>\n' +
+                            '                                <td>&nbsp;</td>\n' +
+                            '                            </tr>');
+                        return;
+                    }
                     window.location.reload();
                 } else {
                     alertError(res.msg);