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

apps/Equipment/views.py

@@ -1121,7 +1121,10 @@ class Farm_Choice(ListView):
         username = request.user.username
         print('username:',username)
         current_user = MyUser.objects.get(username=username)
-        farmlist = FarmList.objects.filter(user=current_user)
+        if current_user.is_staff == True:
+            farmlist = FarmList.objects.all()
+        else:
+            farmlist = FarmList.objects.filter(user=current_user)
         dat = []
         for i in farmlist:
             dat.append({"name":i.name})
@@ -2121,18 +2124,21 @@ class Garden_Manage_View(ListView):
                 print(e)
                 data="0"
         else:
-            try:      
+            try:
                 gardens=GardenArea.objects.get(id=gardenid)
-                FarmList.objects.create(
-                    name=name,
-                    farm_desc=farm_desc,
-                    area=area,
-                    curr_var=curr_var,
-                    farm_img=farm_img,
-                    user=current_user,
-                    garden=gardens
-                )
-                data="1"
+                if  FarmList.objects.filter(name=name,user=current_user) :
+                    data = "0"
+                else:
+                    FarmList.objects.create(
+                        name=name,
+                        farm_desc=farm_desc,
+                        area=area,
+                        curr_var=curr_var,
+                        farm_img=farm_img,
+                        user=current_user,
+                        garden=gardens
+                    )
+                    data="1"
             except Exception as e:
                 print(e)
                 data="0"
@@ -2311,7 +2317,7 @@ class Repertory_New(ListView):
         except Exception as e:
             print(e)
             art_list = ""
-        nums = art_list.count()
+        nums = len(art_list)
         page = int(request.GET.get('page'))
         art = art_list[(9*(page-1)):(page*9)]
         return render(request, 'backstageNet/production/repertoryNew.html', context={"art":art,"nums":nums})
@@ -2373,21 +2379,47 @@ class Repertory_New_View(ListView):
                     data = "0"
             return HttpResponse(data)
 
-
-
-
-#  销售管理
-class Sell_View(ListView):
+# 园区下地块
+class Sell_Land(ListView):
     def get(self,request):
         username = request.user.username
         print('username:',username)
+        data = []
         current_user = MyUser.objects.get(username=username)
         if current_user.is_superuser != True and current_user.is_staff != True:
-            farm_list = FarmList.objects.filter(garden__user=current_user)
+            farm_l = GardenArea.objects.filter(user=current_user)
         else:
-            farm_list = FarmList.objects.all()
-        nums = len(farm_list)
-        return render(request, 'backstageNet/production/sellManage.html', context={"farm_list":farm_list,"nums":nums})
+            farm_l = GardenArea.objects.all()
+        for i in farm_l:
+            print(i.id)
+            try:
+                farm_list  = FarmList.objects.get(garden=i.id)
+                # print(farm_list.name)
+                farm_list = farm_list.name
+            except:
+                farm_list = ''
+            data.append({"garden":i.name,"farm_name":farm_list})
+        data = json.dumps(data)
+        return HttpResponse(data)
+
+
+#  销售管理
+class Sell_View(ListView):
+    def get(self,request):
+        # username = request.user.username
+        # print('username:',username)
+        # current_user = MyUser.objects.get(username=username)
+        # if current_user.is_superuser != True and current_user.is_staff != True:
+        #     print("00000000000000")
+        #     farm_l = GardenArea.objects.filter(user=current_user)
+        # else:
+        #     print("iiiiiiiiiiiiiiii")
+        #     farm_l = GardenArea.objects.all()
+        # for i in farm_l:
+        #     farm_list  = FarmList.objects.get(garden=i.id)
+        # nums = len(farm_list)
+        # print("nums",nums)
+        return render(request, 'backstageNet/production/sellManage.html', context={})
     def post(self,request):
         username = request.user.username
         print('username:',username)