diff --git a/safesite/models.py b/safesite/models.py index 26be5e9c..a445e5e1 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -899,7 +899,7 @@ class Trainuser(models.Model): # 培训人员记录 checked = models.IntegerField(default=0) qdsj = models.DateTimeField(null=True, blank=True) jsqd = models.DateTimeField(verbose_name='结束签到时间',null=True,blank=True) - isnew = models.IntegerField(default=0) + isnew = models.IntegerField(default=0, verbose_name='是否新参加') opinion = models.TextField('建议想法', null=True, blank=True) score = models.IntegerField('评价总体打分', null=True, blank=True) @@ -1381,7 +1381,8 @@ class Checkjob(models.Model): checkname=models.ForeignKey(User,related_name='jianchas',on_delete=models.CASCADE)#检查人员 checkquestion=models.TextField(null=True)#检查发现的问题 zgtime=models.DateTimeField(null=True, blank=True)#整改时间 - jctime=models.DateTimeField(null=True, blank=True)#检查时间 + jctime=models.DateTimeField(null=True, blank=True)#检查开始时间 + jctim2 = models.DateTimeField('检查结束时间', null=True, blank=True) zguser=models.ForeignKey(User,on_delete=models.CASCADE,null=True,)#整改人 createuser = models.ForeignKey(User,related_name='chuangjian',on_delete=models.CASCADE,null=True)#创建人 createdate = models.DateTimeField(default = timezone.now)#创建时间 diff --git a/safesite/templates/checkjobadd.html b/safesite/templates/checkjobadd.html index 39f2c54e..f3b7492a 100644 --- a/safesite/templates/checkjobadd.html +++ b/safesite/templates/checkjobadd.html @@ -31,13 +31,19 @@