From 29eed3b8fdbf26a4ab990799eb4e380662297c22 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sat, 27 Jul 2024 22:58:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20riskacttask=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B62?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/templates/riskactcheck.html | 13 ++++++++++++-
 safesite/templates/riskcheck.html    | 13 ++++++++++++-
 safesite/templates/taskdo.html       |  6 +++---
 safesite/views.py                    |  6 ++++++
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/safesite/templates/riskactcheck.html b/safesite/templates/riskactcheck.html
index 8e90d742..b672b366 100644
--- a/safesite/templates/riskactcheck.html
+++ b/safesite/templates/riskactcheck.html
@@ -10,15 +10,26 @@
         <label>排查部门</label>
         <input id="spcbm" name="pcbm" style="width:180px;"
         editable=false />
+        <label>排查人</label>
+        <input id="pcr" name="user__name" style="width:180px;" class="easyui-textbox"/>
         <label>起始时间</label><input name='qssj'  style="width:180px"
                             class="easyui-datebox" editable=false>
                             <label>结束时间</label><input name='jssj'  style="width:180px"
                             class="easyui-datebox" editable=false>
         <a  onclick="searchriskcheck()" class="easyui-linkbutton" data-options="iconCls: 'fa-search',plain:true">查询</a>
-        </form>
+        <a id="checkdetail" onclick="checkdetail()" class="easyui-linkbutton" data-options="iconCls: 'fa-info-circle',plain:true">查看详情</a>    
+    </form>
     </div>
 </div>
 <script>
+    function checkdetail(){
+        var row = $('#riskactchecktable').datagrid('getSelected');
+        if (row) {
+            var url = 'html/riskacttask/detail/' + row.id
+            opendg('查看详情',url,1000)
+        }
+        else { $.messager.alert('提示', '请选择一行数据!'); }
+    }
     $("#spcbm").combotree({
         url: 'parthandle?a=tree',
         editable: false,
diff --git a/safesite/templates/riskcheck.html b/safesite/templates/riskcheck.html
index ce04d1ac..07289e84 100644
--- a/safesite/templates/riskcheck.html
+++ b/safesite/templates/riskcheck.html
@@ -10,15 +10,26 @@
         <label>排查部门</label>
         <input id="spcbm" name="pcbm" style="width:180px;"
         editable=false />
+        <label>排查人</label>
+        <input id="pcr" name="user__name" style="width:180px;" class="easyui-textbox"/>
         <label>起始时间</label><input name='qssj'  style="width:180px"
                             class="easyui-datebox" editable=false>
                             <label>结束时间</label><input name='jssj'  style="width:180px"
                             class="easyui-datebox" editable=false>
         <a  onclick="searchriskcheck()" class="easyui-linkbutton" data-options="iconCls: 'fa-search',plain:true">查询</a>
-        </form>
+        <a id="checkdetail" onclick="checkdetail()" class="easyui-linkbutton" data-options="iconCls: 'fa-info-circle',plain:true">查看详情</a>
+    </form>
     </div>
 </div>
 <script>
+    function checkdetail(){
+        var row = $('#riskchecktable').datagrid('getSelected');
+        if (row) {
+            var url = 'html/riskacttask/detail/' + row.id
+            opendg('查看详情',url,1000)
+        }
+        else { $.messager.alert('提示', '请选择一行数据!'); }
+    }
     $("#spcbm").combotree({
         url: 'parthandle?a=tree',
         editable: false,
diff --git a/safesite/templates/taskdo.html b/safesite/templates/taskdo.html
index 8da4e524..51d1dcaf 100644
--- a/safesite/templates/taskdo.html
+++ b/safesite/templates/taskdo.html
@@ -14,10 +14,10 @@
             <form id='searchrisktaskff'>
         <label>执行人</label>
         <input id="zxr" name="user__name" style="width:180px;" class="easyui-textbox"/>
-        {% comment %} <label>起始时间</label><input name='qssj'  style="width:180px"
+        <label>起始时间</label><input name='qssj'  style="width:180px"
                             class="easyui-datebox" editable=false>
                             <label>结束时间</label><input name='jssj'  style="width:180px"
-                            class="easyui-datebox" editable=false> {% endcomment %}
+                            class="easyui-datebox" editable=false>
         <a  onclick="searchrisktask()" class="easyui-linkbutton" data-options="iconCls: 'fa-search',plain:true">查询</a>
         <a id="taskdodetail" onclick="taskdodetail()" class="easyui-linkbutton" data-options="iconCls: 'fa-info-circle',plain:true">查看详情</a>
         </form>
@@ -27,7 +27,7 @@
     function taskdodetail(){
         var row = $('#risktasktable').datagrid('getSelected');
         if (row) {
-            var url = 'html/taskdo/detail/' + row.id
+            var url = 'html/riskacttask/detail/' + row.id
             opendg('查看详情',url,1000)
         }
         else { $.messager.alert('提示', '请选择一行数据!'); }
diff --git a/safesite/views.py b/safesite/views.py
index 433445b6..2f1343a1 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -8384,6 +8384,10 @@ def apiriskacttask(req):
             objs = objs.filter(riskact=req.GET.get('riskact'))
         if req.GET.get('taskset'):
             objs = objs.filter(taskset=req.GET.get('taskset'))
+        if req.GET.get('qssj'):
+            objs = objs.filter(taskdo_gte=req.GET.get('qssj'))
+        if req.GET.get('jssj'):
+            objs = objs.filter(taskdo__lte=req.GET.get('jssj'))
         objs = objs.values('riskact__group__groupname', 'riskact__area__name',
             'riskact__type__dickeyname', 'riskact__id', 'riskact__group__groupid', 
             'riskact__name', 'riskact__level', 'riskact__tasktype', 'taskadd', 'taskexpire', 
@@ -8394,6 +8398,8 @@ def apiriskacttask(req):
         return HttpResponse(transjson(total, objs), content_type="application/json")
     elif a == 'listall':  # 全厂排查记录
         objs = RiskActTask.objects.filter(riskact__usecomp__partid=companyid).exclude(taskdo=None)
+        if req.GET.get('user__name'):
+            objs = objs.filter(user__name__contains=req.GET.get('user__name'))
         if req.GET.get('pcbm'):
             parts = getparts(req.GET.get('pcbm'))
             objs = objs.filter(user__ubelongpart__in=parts)