From fef0eb16371dc186658cd60326ba0593bce39abd Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 27 Aug 2021 10:40:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=AE=B5=E9=9D=9E=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/templates/checkjobadd.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/safesite/templates/checkjobadd.html b/safesite/templates/checkjobadd.html
index 2150cbaa..3d504146 100644
--- a/safesite/templates/checkjobadd.html
+++ b/safesite/templates/checkjobadd.html
@@ -34,14 +34,14 @@
                     <td>检查开始</td>
                     <td>
                         <input id="jctime" editable="false" name="jctime" class="easyui-datetimebox" style="width:480px"
-                               data-options="currentText:'今天',closeText:'关闭',showSeconds:false" required=true/>
+                               data-options="currentText:'今天',closeText:'关闭',showSeconds:false" />
                     </td>
                 </tr>
                 <tr>
                     <td>检查结束</td>
                     <td>
                         <input id="jctime2" editable="false" name="jctime2" class="easyui-datetimebox" style="width:480px"
-                               data-options="currentText:'今天',closeText:'关闭',showSeconds:false" required=true/>
+                               data-options="currentText:'今天',closeText:'关闭',showSeconds:false" />
                     </td>
                 </tr>
 

From 6286871195f34cdbffcc5c27f444fbc52c7a9c67 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 27 Aug 2021 12:20:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?pc=E7=AB=AF=E9=A1=B5=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/templates/checkjobadd.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/safesite/templates/checkjobadd.html b/safesite/templates/checkjobadd.html
index 3d504146..6e64b0c8 100644
--- a/safesite/templates/checkjobadd.html
+++ b/safesite/templates/checkjobadd.html
@@ -9,25 +9,25 @@
                 <tr>
                     <td>任务名称</td>
                     <td>
-                        <input id="checktask__checktaskname" class="easyui-textbox" name="checktaskname" style="width:480px" disabled>
+                        <input id="checktask__checktaskname" class="easyui-textbox" name="checktaskname" style="width:480px" readonly>
                     </td>
                 </tr>
                 <tr>
                     <td>检查人</td>
                     <td>
-                        <input id="checkname__name" class="easyui-textbox" name="checktabtitle" style="width:480px" disabled/>
+                        <input id="checkname__name" class="easyui-textbox" name="checktabtitle" style="width:480px" readonly/>
                     </td>
                 </tr>
                 <tr>
                     <td>检查地点</td>
                     <td>
-                        <input id="checkplace" class="easyui-textbox" name="checkplace" style="width:480px" disabled/>
+                        <input id="checkplace" class="easyui-textbox" name="checkplace" style="width:480px" readonly/>
                     </td>
                 </tr>
                 <tr>
                     <td>检查内容</td>
                     <td>
-                        <input id="checkcontent" class="easyui-textbox" name="checkcontent" style="width:480px;height:100px" data-options="multiline:true" disabled> 
+                        <input id="checkcontent" class="easyui-textbox" name="checkcontent" style="width:480px;height:100px" data-options="multiline:true" readonly> 
                     </td>
                 </tr>
                 <tr>

From 3431b467ff22b9c4a77e680aa0d84b686326786b Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 27 Aug 2021 16:36:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E8=A1=A8zgtime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/views.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/safesite/views.py b/safesite/views.py
index 30101abc..aa7b56e6 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)
@@ -8733,7 +8738,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