pull日志

safesite/migrations/0321_merge_20200311_1710.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.2.8 on 2020-03-11 17:10
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        #('safesite', '0316_auto_20200306_1444'),
+        #('safesite', '0320_auto_20200302_1402'),
+    ]
+
+    operations = [
+    ]

safesite/migrations/0321_remove_companyinfo_liaison_fax.py

@@ -1,17 +0,0 @@
-# Generated by Django 2.2.8 on 2020-03-02 14:03
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('safesite', '0320_auto_20200302_1402'),
-    ]
-
-    operations = [
-        # migrations.RemoveField(
-        #     model_name='companyinfo',
-        #     name='liaison_fax',
-        # ),
-    ]

safesite/models.py

@@ -1239,12 +1239,14 @@ class Checktask(models.Model):
     checktaskname=models.CharField(max_length=300)#任务名
     checktype=models.ForeignKey(Checktable,on_delete=models.CASCADE)#关联检查表
     checkname=models.ManyToManyField(User,related_name='jiancha')#检查人员
-    checktime= models.DateTimeField(null=True, blank=True)#检查时间
+    checktime= models.DateTimeField(null=True, blank=True)#任务首次执行时间
     checkplace=models.CharField(max_length=200)#检查地点
     createuser = models.ForeignKey(User,related_name='chuangjians',on_delete=models.CASCADE)#创建人
     createdate = models.DateTimeField(default = timezone.now)#创建时间
     usecomp = models.ForeignKey(Partment,related_name='taskscomp',on_delete=models.CASCADE,null=True,blank=True)#创建公司
     deletemark = models.IntegerField(default=1)#是否删除
+    tasktype = models.IntegerField(default=0)#任务执行频率（1每天，2每周，3每年，0）
+
 class Checkjob(models.Model):
     id=models.AutoField(primary_key=True)#主键
     checktask=models.ForeignKey(Checktask,on_delete=models.CASCADE)#关联任务表

safesite/templates/checkjobadd.html

@@ -74,7 +74,7 @@
                     <td>检查状态：</td>
                     <td>
 
-                        <input type="radio" name="taskstate" value="1" checked="true">正在检查</input>
+                        <input type="radio" name="taskstate" value="1" >正在检查</input>
                         <input type="radio" name="taskstate" value="2">检查完成</input>
                     </td>
                 </tr>
@@ -99,7 +99,12 @@
             $('#starttime').datetimebox('setValue', data.checktask__checktime)
             $('#checkcontent').textbox('setValue', data.checktask__checktype__checkcontent)
             $('#checkplace').textbox('setValue', data.checktask__checkplace)
-            
+            $('#checkquestion').textbox('setValue', data.checkquestion)
+             if (data.taskstate == 1) {
+                $("input[name='taskstate'][value=1]").attr("checked",true);
+             }
+            else
+               $("input[name='taskstate'][value=2]").attr("checked",true);
         });
     })
    

safesite/views.py

@@ -7756,7 +7756,7 @@ def checkprojects(req):
 
     elif a == 'jobdetail':
          obj = Checkjob.objects.filter(id=req.GET.get('id'))
-         obj = obj.values('checktask__checktaskname','zguser','checkplace','checktask__checktype__checkcontent','checkname__username','checktask__checktime')[0]
+         obj = obj.values('checktask__checktaskname','zguser','taskstate','checkquestion','checktask__checkplace','checktask__checktype__checkcontent','checkname__username','checktask__checktime')[0]
        
          return JsonResponse({'code': 1, 'data': obj})
     elif a == 'addjob':