采摘发布调整

apps/AppInfo/models.py

@@ -459,8 +459,8 @@ class FarmList(models.Model):
 # 采摘发布
 class Pick_Pub(models.Model):
     farm = models.ForeignKey(FarmList, blank=True, null=True, verbose_name=u'所属农场',related_name='farms')
-    pick_s = models.DateTimeField(u'采摘开始', blank=True, null=True)
-    pick_e = models.DateTimeField(u'采摘结束', blank=True, null=True)
+    pick_s = models.CharField(u'采摘开始', max_length=20, blank=True, null=True)
+    pick_e = models.CharField(u'采摘结束',max_length=20, blank=True, null=True)
     name = models.CharField(u'采摘名称', max_length=20, blank=True, null=True)
     addr = models.CharField(u'种植地址', max_length=20, blank=True, null=True)
     scale = models.CharField(u'种植规模', max_length=20, blank=True, null=True)

apps/Equipment/views.py

@@ -1148,15 +1148,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]))
+        # 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=start_date,pick_e=end_date,ripe_time=ripe_time,
+                Pick_Pub.objects.filter(id=garden_id).update(pick_s=pick_s,pick_e=pick_e,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: