Merge branch 'master' of http://39.104.94.153:3000/yf_zd/second

apps/Equipment/views.py

@@ -1820,26 +1820,14 @@ class Farm_Check_List(ListView):
     def post(self,request):
         art_id = request.POST.get('id')
         req = request.POST.get('req')
-        art_obj = Pick_Pub.objects.filter(id=art_id)
-        # 编辑
-        if req == "edit":
-            data = []
-            for i in art_obj:
-                data.append({
-                    "id":i.id,
-                    "name":i.name,
-                    "company":i.company,
-                    "pick_img":i.pick_img,
-                    "time": i.upl_time,
-                    "farm":i.farm.name
-                    })
+        art_obj = GardenArea.objects.filter(id=art_id)
         #删除
-        elif req == "del":
+        if req == "del":
             art_obj.delete()
             data = "1"
         #审核通过
         elif req == "check":
-            art_obj = Pick_Pub.objects.get(id=art_id)
+            art_obj = GardenArea.objects.get(id=art_id)
             art_obj.hidden = True
             art_obj.save()
             data = "1"