diff --git a/safesite/templates/checkjobadd.html b/safesite/templates/checkjobadd.html index 2150cbaa..6e64b0c8 100644 --- a/safesite/templates/checkjobadd.html +++ b/safesite/templates/checkjobadd.html @@ -9,39 +9,39 @@ 任务名称 - + 检查人 - + 检查地点 - + 检查内容 - + 检查开始 + data-options="currentText:'今天',closeText:'关闭',showSeconds:false" /> 检查结束 + data-options="currentText:'今天',closeText:'关闭',showSeconds:false" /> diff --git a/safesite/views.py b/safesite/views.py index 1bffdbaf..c38c0ffe 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -4958,6 +4958,11 @@ def apisuggest(req): # 特别操作 def apitool(req): a = req.GET.get('a') + # if a == 'correctjobjctime': + # for i in Checkjob.objects.all(): + # if i.jctime2 is None: + # i.jctime2 = i.endtime + # i.save() if a == 'correctgrouptype': for company in Partment.objects.filter(iscompany=1): users = User.objects.filter(usecomp = company) @@ -8755,7 +8760,7 @@ def checkprojects(req): obj.content=data['content'] obj.jctime = data['jctime'] if data.get('jctime', None) else obj.starttime obj.jctime2 = data['jctime2'] if data.get('jctime2', None) else obj.endtime - obj.zgtime = data['zgtime'] + obj.zgtime = data['zgtime'] if data.get('zgtime', None) else None if yhtp: obj.yhtp=yhtp obj.zghtp=zghtp