From 4f82974fe7b235cade39ce40e899f69c30c19345 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Tue, 7 Apr 2020 09:55:03 +0800
Subject: [PATCH] shanchu

---
 safesite/templates/checklist.html  |  4 +--
 safesite/templates/checktable.html | 39 +++++++++++++++++++++++++++---
 safesite/views.py                  | 15 ++++++++++--
 3 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/safesite/templates/checklist.html b/safesite/templates/checklist.html
index 971afa1f..4c36c395 100644
--- a/safesite/templates/checklist.html
+++ b/safesite/templates/checklist.html
@@ -10,9 +10,9 @@
             {% if request|has_permission:'b_checklist_add' %}
             <a id="addtask" class="easyui-linkbutton" onclick="addcheckrw()" data-options="iconCls: 'fa-plus',plain:true">发布任务</a>
             {% endif %}
-
+            {% if request|has_permission:'b_checklist_del' %}
             <a id="delprg" class="easyui-linkbutton" onclick="deltask()" data-options="iconCls: 'fa-trash',plain:true">删除</a>
-
+            {% endif %}
             <a id="detailcheck" class="easyui-linkbutton" onclick="detailcheck()" data-options="iconCls: 'fa-info-circle',plain:true">详情</a>
         </div>
     </div>
diff --git a/safesite/templates/checktable.html b/safesite/templates/checktable.html
index 32e71353..708fb6e8 100644
--- a/safesite/templates/checktable.html
+++ b/safesite/templates/checktable.html
@@ -11,9 +11,9 @@
             {% if request|has_permission:'b_checktable_add' %}
             <a id="addtask" class="easyui-linkbutton" onclick="addtask()" data-options="iconCls: 'fa-plus',plain:true">新增</a>
             {% endif %}
-            <!--{% if request|has_permission:'b_checktable_del' %}
-            <a id="delprg" class="easyui-linkbutton" onclick="deltask()" data-options="iconCls: 'fa-trash',plain:true">删除</a>
-            {% endif %}-->
+            {% if request|has_permission:'b_checktable_del' %}
+            <a id="delprg" class="easyui-linkbutton" onclick="deltab()" data-options="iconCls: 'fa-trash',plain:true">删除</a>
+            {% endif %}
 
         </div>
     </div>
@@ -54,5 +54,38 @@
             opendg('修改检查内容','html/updchecktable/'+row.id)
         }
     }
+    function deltab() {
+         var row = $('#tasktab').datagrid('getSelected');
+        if (row) {
+            $.messager.confirm('提示', '确定删除吗?', function (r) {
+                if (r) {
+                    $.ajax({
+                        type: "GET",
+                        url: 'api/checkproject?a=deltab',
+                        data: { 'id': row.id },
+                        datatype: "json",
+                        beforeSend: function () { },
+                        success: function (data) {
+                            if (data.code == 1) {
+                                $("#tasktab").datagrid('reload');
+                            }
+                            else {
+                                $.messager.alert('提示', '你无权删除该条信息!');
+                            }
+                        },
+                        complete: function (XMLHttpRequest, textStatus) {
+                        },
+                        error: function () {
+                        }
+                    });
+                }
+            });
+
+        }
+        else {
+            $.messager.alert('提示', '请选择一行数据!');
+        }
+    }
+
     
 </script>
\ No newline at end of file
diff --git a/safesite/views.py b/safesite/views.py
index d360584a..76d00740 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -7908,7 +7908,7 @@ def checkprojects(req):
          obj.save()
          return JsonResponse({'code': 1})
     elif a=='checktablist':
-         projectlist = Checktable.objects.filter(usecomp__partid=companyid).values('id', 'checktitle')
+         projectlist = Checktable.objects.filter(usecomp__partid=companyid,deletemark=1).values('id', 'checktitle')
          return HttpResponse(transstr(projectlist,'id','checktitle'),content_type="application/json")
     elif a=='addchecklist':
          data = json.loads(req.body.decode('utf-8'))
@@ -8001,7 +8001,18 @@ def checkprojects(req):
         a.checkcontent = data['checkcontent']
         a.save()
         return JsonResponse({"code": 1})
-         
+    elif a == 'deltab':
+        id =req.GET.get('id')
+        a = Checktable.objects.get(id=id)
+        if a.createuser==User.objects.get(userid=userid):
+           a.deletemark=0
+           a.save()
+           return JsonResponse({"code":1})
+
+        else:
+            
+            return JsonResponse({"code":0})
+        
 
     elif a == 'checkjobdetail':
         id = req.GET.get('id')