From cd7694ec739e433ac220ae038669aff4150331dc Mon Sep 17 00:00:00 2001
From: Apple <>
Date: Wed, 8 Jun 2022 10:30:56 +0800
Subject: [PATCH] =?UTF-8?q?v1=5F2=5F5key=E6=89=B9=E6=AC=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=BB=9F=E8=AE=A1=E5=AD=97=E6=AE=B5=E5=92=8C=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E7=BB=9F=E8=AE=A1=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/plan/key/detail/list.js | 17 ++++++++++++-----
 src/pages/plan/key/list.js        | 22 ++++++++++++++++++----
 src/pages/plan/list/list.js       | 22 ++++++++++++++++++----
 3 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/src/pages/plan/key/detail/list.js b/src/pages/plan/key/detail/list.js
index f0da339b..354f8f4d 100644
--- a/src/pages/plan/key/detail/list.js
+++ b/src/pages/plan/key/detail/list.js
@@ -407,40 +407,47 @@ export default class acclist extends React.Component {
         width: "auto",
       },
       {
-        title: "总发放条数",
+        title: "发放总数",
         prop: "total",
         name: "total",
         width: "auto",
         type: "normal",
       },
       {
-        title: "剩余条数",
+        title: "剩余总数",
         prop: "residue",
         name: "residue",
         width: "auto",
         type: "normal",
       },
       {
-        title: "已使用条数",
+        title: "使用总数",
         name: "usage",
         prop: "usage",
         type: "normal",
         width: "auto",
       },
       {
-        title: "已过期条数",
+        title: "失效总数",
         name: "overdue",
         prop: "overdue",
         type: "normal",
         width: "auto",
       },
       {
-        title: "已作废条数",
+        title: "作废总数",
         name: "invalid",
         prop: "invalid",
         type: "normal",
         width: "auto",
       },
+      {
+        title: "已完结总数",
+        name: "end",
+        prop: "end",
+        type: "normal",
+        width: "auto",
+      },
       {
         title: "更新时间",
         name: "update_time",
diff --git a/src/pages/plan/key/list.js b/src/pages/plan/key/list.js
index 74066613..5f600264 100644
--- a/src/pages/plan/key/list.js
+++ b/src/pages/plan/key/list.js
@@ -95,7 +95,7 @@ const Column = [
     width: "100px",
   },
   {
-    title: "发放key总数",
+    title: "发放key码总数",
     name: "grant",
     type: "normal",
     prop: "grant",
@@ -109,26 +109,40 @@ const Column = [
     width: "120px",
   },
   {
-    title: "已使用key总数",
+    title: "使用key码总数",
     name: "usage",
     type: "normal",
     prop: "usage",
     width: "120px",
   },
   {
-    title: "已作废key总数",
+    title: "作废key码总数",
     name: "invalid",
     type: "normal",
     prop: "invalid",
     width: "120px",
   },
   {
-    title: "沉默总数",
+    title: "可用key码总数",
     name: "silent",
     type: "normal",
     prop: "silent",
     width: "140px",
   },
+  {
+    title: "失效key码总数",
+    name: "overdue",
+    type: "normal",
+    prop: "overdue",
+    width: "140px",
+  },
+  {
+    title: "完结key码总数",
+    name: "end",
+    type: "normal",
+    prop: "end",
+    width: "140px",
+  },
   // {
   //   title: "发放总价(预估)",
   //   name: "grant_total",
diff --git a/src/pages/plan/list/list.js b/src/pages/plan/list/list.js
index 37a39f6d..c6dd3cae 100644
--- a/src/pages/plan/list/list.js
+++ b/src/pages/plan/list/list.js
@@ -610,7 +610,7 @@ export default class acclist extends React.Component {
         width: "auto",
       },
       {
-        title: "发放key总数",
+        title: "发放key码总数",
         name: "grant",
         type: "normal",
         prop: "grant",
@@ -624,26 +624,40 @@ export default class acclist extends React.Component {
         width: "auto",
       },
       {
-        title: "已使用总数",
+        title: "使用key码总数",
         name: "usage",
         type: "normal",
         prop: "usage",
         width: "auto",
       },
       {
-        title: "已作废key总数",
+        title: "失效key码总数",
+        name: "overdue",
+        type: "normal",
+        prop: "overdue",
+        width: "auto",
+      },
+      {
+        title: "作废key码总数",
         name: "invalid",
         type: "normal",
         prop: "invalid",
         width: "auto",
       },
       {
-        title: "沉默总数",
+        title: "可用key码总数",
         name: "silent",
         type: "normal",
         prop: "silent",
         width: "auto",
       },
+      {
+        title: "完结key码总数",
+        name: "end",
+        type: "normal",
+        prop: "end",
+        width: "auto",
+      },
       // {
       //   title: "发放总价(预估)",
       //   name: "grant_total",