From 45ace0bcfa048e763118fcc3d174b7bf920bc00f Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 16 Dec 2020 15:36:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=88=E8=AF=BE=E4=BA=BA=E5=92=8C=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=A1=AB=E6=8A=A5=E4=BA=BA=E9=83=BD=E5=8F=AF=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=9F=B9=E8=AE=AD=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/templates/train.html | 2 +- safesite/views.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/safesite/templates/train.html b/safesite/templates/train.html index 2f7322bf..e48c7c55 100644 --- a/safesite/templates/train.html +++ b/safesite/templates/train.html @@ -222,7 +222,7 @@ var row = $('#pxtable').datagrid('getSelected'); if (row) { if (row.state == 0) { - if ($("#userindex").attr('userid') == row.submituser__userid) { + if ($("#userindex").attr('userid') == row.submituser__userid || $("#userindex").attr('userid') == row.lecturer__userid) { url = 'abtrain?trainid=' + row.trainid + '&a=accesstrain' opendg('评估培训', url) } else { $.messager.alert('提示', '非填报人不能评估!'); } diff --git a/safesite/views.py b/safesite/views.py index 4409f26f..e388aaed 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -3085,7 +3085,7 @@ def pxhandle(req): total = a.count() startnum, endnum = fenye(req) obj = a.order_by('-starttime')[startnum:endnum].values('trainnum', 'trainid', 'state', 'trainplace', 'starttime', - 'trainname', 'traintype__dickeyname', 'teacher', 'lecturer__name', 'submituser__name', 'submituser__userid') + 'trainname', 'traintype__dickeyname', 'teacher', 'lecturer__name', 'submituser__name', 'submituser__userid', 'lecturer__userid') return HttpResponse(transjson(total, obj), content_type="application/json") elif req.GET.get('a') == 'detailhtml': trainid = req.GET.get('trainid') @@ -3098,7 +3098,7 @@ def pxhandle(req): total = a.count() startnum, endnum = fenye(req) a = a[startnum:endnum].values('trainnum', 'trainid', 'state', 'trainplace', 'starttime', 'trainname', - 'traintype__dickeyname', 'teacher', 'lecturer__name', 'submituser__name', 'submituser__userid') + 'traintype__dickeyname', 'teacher', 'lecturer__name', 'submituser__name', 'submituser__userid', 'lecturer__userid') return HttpResponse(transjson(total, a), content_type="application/json") elif req.GET.get('a') == 'listtodo': userid = req.session['userid']