From 9163474c8f8e58f9fd2b4e1d7a11d1629d8bafeb Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Fri, 24 Apr 2020 09:10:48 +0800
Subject: [PATCH] xiugairenwuzhuangtai
---
safesite/models.py | 2 +-
safesite/templates/checkjob.html | 41 ++++++++++-----------
safesite/templates/checkjobadd.html | 50 +++++++++++++-------------
safesite/templates/checkjobdetail.html | 2 +-
safesite/templates/checklistadd.html | 1 +
safesite/templates/medetail.html | 2 +-
safesite/views.py | 4 +--
7 files changed, 50 insertions(+), 52 deletions(-)
diff --git a/safesite/models.py b/safesite/models.py
index c1b88bde..4e4659f9 100644
--- a/safesite/models.py
+++ b/safesite/models.py
@@ -1272,4 +1272,4 @@ class Checkjob(models.Model):
pmpeople=models.ManyToManyField(User,related_name='bcfr',null=True)#被处罚人员
content=models.CharField(max_length=500,null=True)#处罚内容
yhtp = models.CharField(max_length=1000,null=True, blank=True)
- zghtp = models.CharField(max_length=1000,null=True, blank=True)
+ zghtp = models.CharField(max_length=1000,null=True, blank=True)
\ No newline at end of file
diff --git a/safesite/templates/checkjob.html b/safesite/templates/checkjob.html
index 394b1f0a..94692575 100644
--- a/safesite/templates/checkjob.html
+++ b/safesite/templates/checkjob.html
@@ -75,28 +75,28 @@
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:black;font-weight:bold'; break;
+ case 4: return 'color:blue;font-weight:bold'; break;
}}},
- {
- field: 'jobstate', title: '任务状态', width: 100, styler: function (value, row, index) {
- if (value == 1) {
- return 'background-color:yellow;';
- }
- else {
- return 'background-color:green;';
- }
- }, formatter: function (value, row, index) {
- if (value == 1) {
- return '可执行';
- }
- else {
- return '已过期'
- }
- }
- },
+ // {
+ // field: 'jobstate', title: '任务状态', width: 100, styler: function (value, row, index) {
+ // if (value == 1) {
+ // return 'background-color:yellow;';
+ // }
+ // else {
+ // return 'background-color:green;';
+ // }
+ // }, formatter: function (value, row, index) {
+ // if (value == 1) {
+ // return '可执行';
+ // }
+ // else {
+ // return '已过期'
+ // }
+ // }
+ //},
{ field: 'createdate', title: '创建时间', width: 100 },
{ field: 'yanshou', title: '验收时间', width: 100 },
//
@@ -113,10 +113,7 @@
$.get('api/checkproject?a=jobdetail&id=' + row.id, function (res) {
var data = res.data
console.log(data)
- if (data.jobstate == 2) {
- $.messager.alert('提示', '该任务已过期不能执行！');
- }
- else if (data.taskstate ==3) {
+ if (data.taskstate ==3) {
$.messager.alert('提示', '该任务已关闭不能执行！');
}
else if (data.taskstate ==2) {
diff --git a/safesite/templates/checkjobadd.html b/safesite/templates/checkjobadd.html
index 6e6f15f6..43abb302 100644
--- a/safesite/templates/checkjobadd.html
+++ b/safesite/templates/checkjobadd.html
@@ -38,13 +38,7 @@
-
- | 整改时间： |
-
-
- |
-
+
| 检查问题： |
@@ -72,27 +66,33 @@
-
-
-
+
+
| 需要整改： |
@@ -137,7 +137,7 @@
+ data-options="label:'经验总结:',multiline:true">
diff --git a/safesite/templates/checkjobdetail.html b/safesite/templates/checkjobdetail.html
index 2797e851..07ea2452 100644
--- a/safesite/templates/checkjobdetail.html
+++ b/safesite/templates/checkjobdetail.html
@@ -107,7 +107,7 @@
-->
- | 经验教训： |
+ 经验总结： |
{{content}} |
diff --git a/safesite/templates/checklistadd.html b/safesite/templates/checklistadd.html
index 254bf4c8..0a39052d 100644
--- a/safesite/templates/checklistadd.html
+++ b/safesite/templates/checklistadd.html
@@ -29,6 +29,7 @@
+
diff --git a/safesite/templates/medetail.html b/safesite/templates/medetail.html
index a40817bf..e04eeeeb 100644
--- a/safesite/templates/medetail.html
+++ b/safesite/templates/medetail.html
@@ -32,7 +32,7 @@
/>
-
diff --git a/safesite/views.py b/safesite/views.py
index 36db4135..6a9f60c9 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -7780,8 +7780,9 @@ def checkprojects(req):
elif a == 'listchuli':
- a = Checkjob.objects.filter(usecomp=Partment.objects.get(partid=companyid),taskstate=2,checktask__createuser__userid=userid).exclude(deletemark=0)
+ a = Checkjob.objects.filter(usecomp=Partment.objects.get(partid=companyid),taskstate=2,checktask__createuser__userid=userid).exclude(deletemark=0,yanshou=None)
total = a.count()
+
startnum, endnum = fenye(req)
a = a.order_by('-starttime')[startnum:endnum].values('id','checkname__name','checktask__checktaskname','jobstate','starttime','endtime','yanshou','checkquestion','zguser__username','zgtime','checktask__checktype__checktitle','checkname__username', 'taskstate','checktask__checktime','createuser__username','createdate')
@@ -7826,7 +7827,6 @@ def checkprojects(req):
zghtp = '?'.join(data['zghtp']) if 'zghtp' in data else []
obj = Checkjob.objects.get(id=req.GET.get('jobid'))
if data['checkquestion']:
-
obj.checkquestion = data['checkquestion']
obj.zgjg = data['zgjg']
obj.taskstate =int(data['taskstate'])