From e54c109907a2a995b4153f5ba9a4975113c31968 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Thu, 10 Sep 2020 22:54:06 +0800
Subject: [PATCH] taskdo

---
 safesite/templates/taskdo.html | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/safesite/templates/taskdo.html b/safesite/templates/taskdo.html
index 0ac2c9ec..45f083d6 100644
--- a/safesite/templates/taskdo.html
+++ b/safesite/templates/taskdo.html
@@ -26,11 +26,15 @@
             { field: 'taskadd', title: '任务开始时间', width: 80 },
             { field: 'taskexpire', title: '任务过期时间', width: 80 },
             { field: 'usable', title: '任务状态', width: 80, formatter: function (value, row, index) {
-                    switch (value) {
-                        case 0: return '过期'; break;
-                        case 1: return '可用'; break;
-                        case 2: return '作废'; break;
-                    }
+                if(value==1){
+                    return '可用'
+                }else if (value==0&&row.taskdo==null){
+                    return '过期'
+                }else if(value==0&&row.taskdo!=null){
+                    return ''
+                }else if(value==2){
+                    return '作废'
+                }
                 }, styler: function (value, row, index) {
                     switch (value) {
                         case 1: return 'color:white;background-color:green'; break;