From 783a0cb6ce8845d64fb8ccef3feb39a8459be2a9 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 27 Sep 2019 17:54:26 +0800
Subject: [PATCH] xx

---
 safesite/templates/suggest.html | 14 ++++++++++++++
 safesite/views.py               |  9 +++++++++
 2 files changed, 23 insertions(+)

diff --git a/safesite/templates/suggest.html b/safesite/templates/suggest.html
index 74d3a1a3..3b58b915 100644
--- a/safesite/templates/suggest.html
+++ b/safesite/templates/suggest.html
@@ -94,6 +94,20 @@
             { field: 'dqxz', title: '当前现状', width: 200 },
             { field: 'jynr', title: '建议内容', width: 400 },
             { field: 'jyfk', title: '建议反馈', width: 400 },
+            {
+                field: 'accept', title: '建议状态', width: 80, styler: function (value, row, index) {
+                    switch (value) {
+                        case 1: return 'background-color:green;'; break;
+                        case 0: return 'background-color:yellow;'; break;
+                        
+                    }
+                }, formatter: function (value, row, index) {
+                    switch (value) {
+                        case 1: return '已采纳'; break;
+                        case 0: return '未采纳'; break;
+                    }
+                }
+            },
         ]]
     });
     function addjy(){
diff --git a/safesite/views.py b/safesite/views.py
index 60cc281a..b8325b6e 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -3593,6 +3593,15 @@ def apisuggest(req):
                 obj.save()
                 Suggestflow.objects.create(suggest=obj,user=User.objects.get(userid=userid),action='转交'+user.name+'评估')
                 return JsonResponse({"code":1})
+            elif 'accept' in data:
+                if data['accept'] == 'no':
+                    obj.jyzt = 4
+                    obj.todouser = None
+                    obj.jyfk = data['jyfk']
+                    obj.accept = 0
+                    obj.save()
+                    Suggestflow.objects.create(suggest=obj,user=User.objects.get(userid=userid),action='未采纳该建议')
+                    return JsonResponse({"code":1})
             else:
                 obj.jyzt = 4
                 obj.todouser = None