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

apps/AppInfo/models.py

@@ -570,7 +570,7 @@ class Warning_His(models.Model):
 
 # 民宿表
 class Hotel_Info(models.Model):
-    name = models.CharField(u'民宿名字', max_length=20, blank=True, null=True)
+    name = models.CharField(u'民宿名字', max_length=200, blank=True, null=True)
     price = models.CharField(u'民宿价格', max_length=20, blank=True, null=True)
     intro = models.CharField(u'民宿简介',max_length=255, null=True, blank=True)
     addr = models.CharField(u'民宿地址',max_length=255, null=True, blank=True)

apps/Equipment/views.py

@@ -2027,10 +2027,10 @@ class Park_Land(ListView):
         data = []
         if current_user.is_superuser != True and current_user.is_staff != True:
             #用户
-            art_list = FarmList.objects.filter(user=current_user)
+            art_list = GardenArea.objects.filter(user=current_user)
         else:
             #管理员
-            art_list = FarmList.objects.all()
+            art_list = GardenArea.objects.all()
         for i in art_list:
             data.append({"name":i.name,"id":i.id})
         data = json.dumps(data)
@@ -2284,7 +2284,18 @@ class Garden_User_New(ListView):
 #  库存新建
 class Repertory_View(ListView):
     def get(self,request):
-        return render(request, 'backstageNet/production/repertoryManage.html', context={})
+        # page = request.GET.get("page")
+        username = request.user.username
+        print('username:',username)
+        current_user = MyUser.objects.get(username=username)
+        data = []
+        if current_user.is_superuser != True and current_user.is_staff != True:
+            #用户
+            art_list = GardenArea.objects.filter(user=current_user)
+        else:
+            #管理员
+            art_list = GardenArea.objects.all()
+        return render(request, 'backstageNet/production/repertoryManage.html', context={"art_list":art_list})
     def post(self,request):
         uid = request.user.id
         #库存id