zcdsj
/
safesite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite

This commit is contained in:
caoqianming 2021-09-04 22:36:31 +08:00
parent 82c123ba76 3431b467ff
commit cd300971eb
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
safesite/templates/checkjobadd.html
View File

@ -9,39 +9,39 @@
<tr> <tr>
<td>任务名称</td> <td>任务名称</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> </td>
</tr> </tr>
<tr> <tr>
<td>检查人</td> <td>检查人</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> </td>
</tr> </tr>
<tr> <tr>
<td>检查地点</td> <td>检查地点</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> </td>
</tr> </tr>
<tr> <tr>
<td>检查内容</td> <td>检查内容</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> </td>
</tr> </tr>
<tr> <tr>
<td>检查开始</td> <td>检查开始</td>
<td> <td>
<input id="jctime" editable="false" name="jctime" class="easyui-datetimebox" style="width:480px" <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> </td>
</tr> </tr>
<tr> <tr>
<td>检查结束</td> <td>检查结束</td>
<td> <td>
<input id="jctime2" editable="false" name="jctime2" class="easyui-datetimebox" style="width:480px" <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> </td>
</tr> </tr>

7
safesite/views.py
View File

@ -4958,6 +4958,11 @@ def apisuggest(req):
# 特别操作 # 特别操作
def apitool(req): def apitool(req):
a = req.GET.get('a') 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': if a == 'correctgrouptype':
for company in Partment.objects.filter(iscompany=1): for company in Partment.objects.filter(iscompany=1):
users = User.objects.filter(usecomp = company) users = User.objects.filter(usecomp = company)
@ -8755,7 +8760,7 @@ def checkprojects(req):
obj.content=data['content'] obj.content=data['content']
obj.jctime = data['jctime'] if data.get('jctime', None) else obj.starttime 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.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: if yhtp:
obj.yhtp=yhtp obj.yhtp=yhtp
obj.zghtp=zghtp obj.zghtp=zghtp