From 8639e4eae5fb86ea37c65897db8571fae44c376c Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 26 Aug 2021 22:43:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=97=B6=E9=97=B4=E6=AE=B5?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0386_auto_20210826_2018.py | 29 +++++++++ .../migrations/0387_auto_20210826_2028.py | 18 ++++++ safesite/models.py | 2 +- safesite/templates/checkjob.html | 27 ++++----- safesite/templates/checkjobadd.html | 5 +- safesite/templates/checkjobdetail.html | 59 ++++++++++++------- safesite/views.py | 14 +++-- 7 files changed, 111 insertions(+), 43 deletions(-) create mode 100644 safesite/migrations/0386_auto_20210826_2018.py create mode 100644 safesite/migrations/0387_auto_20210826_2028.py diff --git a/safesite/migrations/0386_auto_20210826_2018.py b/safesite/migrations/0386_auto_20210826_2018.py new file mode 100644 index 00000000..b60c449e --- /dev/null +++ b/safesite/migrations/0386_auto_20210826_2018.py @@ -0,0 +1,29 @@ +# Generated by Django 2.2.8 on 2021-08-26 20:18 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0385_contingencyplan_createby'), + ] + + operations = [ + migrations.AddField( + model_name='checkjob', + name='jctim2', + field=models.DateTimeField(blank=True, null=True, verbose_name='检查结束时间'), + ), + migrations.AlterField( + model_name='examtestdetail', + name='examtest', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='detail_examtest', to='safesite.ExamTest'), + ), + migrations.AlterField( + model_name='trainuser', + name='isnew', + field=models.IntegerField(default=0, verbose_name='是否新参加'), + ), + ] diff --git a/safesite/migrations/0387_auto_20210826_2028.py b/safesite/migrations/0387_auto_20210826_2028.py new file mode 100644 index 00000000..dd2ed14b --- /dev/null +++ b/safesite/migrations/0387_auto_20210826_2028.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.8 on 2021-08-26 20:28 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0386_auto_20210826_2018'), + ] + + operations = [ + migrations.RenameField( + model_name='checkjob', + old_name='jctim2', + new_name='jctime2', + ), + ] diff --git a/safesite/models.py b/safesite/models.py index a445e5e1..846c877d 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -1382,7 +1382,7 @@ class Checkjob(models.Model): checkquestion=models.TextField(null=True)#检查发现的问题 zgtime=models.DateTimeField(null=True, blank=True)#整改时间 jctime=models.DateTimeField(null=True, blank=True)#检查开始时间 - jctim2 = models.DateTimeField('检查结束时间', null=True, blank=True) + jctime2 = 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/checkjob.html b/safesite/templates/checkjob.html index 240a40b1..87726acc 100644 --- a/safesite/templates/checkjob.html +++ b/safesite/templates/checkjob.html @@ -16,12 +16,14 @@ {% if request|has_permission:'b_checkjob_add' %} 执行任务 {% endif %} - - 删除 - {% if request|has_permission:'b_checkjob_detail' %} - 详情 + 验收详情 {% endif %} + {% if request|has_permission:'b_checkjob_del' %} + 删除 + {% endif %} + + @@ -76,21 +78,20 @@ { field: 'starttime', title: '任务开始时间', width: 100 }, { field: 'endtime', title: '任务结束时间', width: 100 }, { - field: 'taskstate', title: '检查状态', width: 100, formatter: function (value, row, index) { + field: 'taskstate', title: '工作状态', width: 100, formatter: function (value, row, index) { switch (value) { case 1: return '正在整改中'; break; case 2: return '已整改完成'; break; case 3: return '任务关闭'; break; - case 4: return '未执行'; break; + case 4: return '待执行'; break; } }, styler: function (value, row, index) { switch (value) { - - case 1: return 'color:green;font-weight:bold'; break; - case 2: return 'color:red;font-weight:bold'; break; - case 3: return 'color:yellow;font-weight:bold'; break; - case 4: return 'color:blue;font-weight:bold'; break; + case 1: return 'color:red;font-weight:bold'; break; + case 2: return 'color:darkblue;font-weight:bold'; break; + case 3: return 'color:green;font-weight:bold'; break; + case 4: return 'color:orange;font-weight:bold'; break; }}}, @@ -100,9 +101,7 @@ { field: 'yanshou', title: '验收时间', width: 100 }, // //{ field: 'zguser__name', title: '整改人', width: 100 }, - //{ field: 'zgtime', title: '整改时间', width: 100 }, - - + //{ field: 'zgtime', title: '整改时间', width: 100 }, ]] }); diff --git a/safesite/templates/checkjobadd.html b/safesite/templates/checkjobadd.html index 6a2ad301..2150cbaa 100644 --- a/safesite/templates/checkjobadd.html +++ b/safesite/templates/checkjobadd.html @@ -125,7 +125,7 @@ - 检查状态 + 工作状态 已整改完成 @@ -174,6 +174,7 @@ $('#zgjg').textbox('setValue', data.zgjg) $('#content').textbox('setValue', data.content) $('#jctime').datetimebox('setValue', data.jctime) + $('#jctime2').datetimebox('setValue', data.jctime2) $('#zgtime').datetimebox('setValue', data.zgtime) var yhtp = data.yhtp; @@ -398,7 +399,7 @@ if (data.code == 1) { $('#jobtab').datagrid('reload'); $("#dd").dialog("close"); - } else { $.messager.alert('提示', '失败!'); } + } else { $.messager.alert('提示', data.msg); } $('#submitb').linkbutton('enable'); }, }); diff --git a/safesite/templates/checkjobdetail.html b/safesite/templates/checkjobdetail.html index 3c7668f6..589804fe 100644 --- a/safesite/templates/checkjobdetail.html +++ b/safesite/templates/checkjobdetail.html @@ -2,16 +2,18 @@