|
|
@@ -2025,10 +2025,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)
|
|
|
@@ -2282,7 +2282,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
|