From 88eb3e8415f2ef49805277d7c5c40b1e8d8ec74e Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Wed, 11 Mar 2020 17:15:16 +0800
Subject: [PATCH] =?UTF-8?q?pull=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
safesite/migrations/0321_merge_20200311_1710.py | 14 ++++++++++++++
.../0321_remove_companyinfo_liaison_fax.py | 17 -----------------
safesite/models.py | 4 +++-
safesite/templates/checkjobadd.html | 9 +++++++--
safesite/views.py | 2 +-
5 files changed, 25 insertions(+), 21 deletions(-)
create mode 100644 safesite/migrations/0321_merge_20200311_1710.py
delete mode 100644 safesite/migrations/0321_remove_companyinfo_liaison_fax.py
diff --git a/safesite/migrations/0321_merge_20200311_1710.py b/safesite/migrations/0321_merge_20200311_1710.py
new file mode 100644
index 00000000..39473c71
--- /dev/null
+++ b/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 = [
+ ]
diff --git a/safesite/migrations/0321_remove_companyinfo_liaison_fax.py b/safesite/migrations/0321_remove_companyinfo_liaison_fax.py
deleted file mode 100644
index e8c720f5..00000000
--- a/safesite/migrations/0321_remove_companyinfo_liaison_fax.py
+++ /dev/null
@@ -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',
- # ),
- ]
diff --git a/safesite/models.py b/safesite/models.py
index f978b2a7..35ba06da 100644
--- a/safesite/models.py
+++ b/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)#关联任务表
diff --git a/safesite/templates/checkjobadd.html b/safesite/templates/checkjobadd.html
index 8966d4f9..a35b1d24 100644
--- a/safesite/templates/checkjobadd.html
+++ b/safesite/templates/checkjobadd.html
@@ -74,7 +74,7 @@
| 检查状态： |
- 正在检查
+ 正在检查
检查完成
|
@@ -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);
});
})
diff --git a/safesite/views.py b/safesite/views.py
index 83b8dee8..6b9acfa2 100644
--- a/safesite/views.py
+++ b/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':