|
|
@@ -1129,11 +1129,15 @@ class Garden_Pub(ListView):
|
|
|
pick_img = request.POST.get('img_url')
|
|
|
garden_id = request.POST.get('id')
|
|
|
print("garden_id:",garden_id)
|
|
|
+ begindate = re.findall(r"\d+\.?\d*", pick_s)
|
|
|
+ enddate = re.findall(r"\d+\.?\d*", pick_e)
|
|
|
+ start_date = datetime.date(int(begindate[0]), int(begindate[1]), int(begindate[2]))
|
|
|
+ end_date = datetime.date(int(enddate[0]), int(enddate[1]), int(enddate[2]))
|
|
|
# 编辑更新
|
|
|
if garden_id:
|
|
|
if Pick_Pub.objects.filter(id=garden_id).exists():
|
|
|
farm_obj = FarmList.objects.get(name=farm)
|
|
|
- Pick_Pub.objects.filter(id=garden_id).update(pick_s=pick_s,pick_e=pick_s,ripe_time=ripe_time,
|
|
|
+ Pick_Pub.objects.filter(id=garden_id).update(pick_s=start_date,pick_e=end_date,ripe_time=ripe_time,
|
|
|
scale=scale,addr=addr,farm=farm_obj,name=name,company=company,pick_img=pick_img,upl_time=time)
|
|
|
data = "1"
|
|
|
else:
|
