Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/public/lang/en-US.js

@@ -6346,7 +6346,7 @@ const LANG_EN_US = {
             info18: "'s application",
             info19: "Can't find this teacher's information",
             info20: 'This user has already been invited!',
-            info21: 'The invited user has already joined the school!',
+            info21: 'The user has already joined the school!',
             noIdCol: 'There is no id column in the imported form, please check the form data! ',
             spaceTips1: 'Please set the size of space allocated per person',
             spaceTips2: 'Please select the teacher title for which space is to be allocated',
@@ -6435,7 +6435,7 @@ const LANG_EN_US = {
                 download: 'Download Sample',
                 upload: 'Import List',
                 search: 'Search Teacher',
-                sendInvite: 'Send Invitation',
+                sendInvite: 'Add',
                 backHome: 'Search Again'
             },
             content: '<span>Please enter <span class="point">phone number</span>, <span class="point">ID</span>, or <span class="point">email</span> to search</span>',
@@ -6566,12 +6566,12 @@ const LANG_EN_US = {
         importTips5: "3. email: Teacher's email, optional",
         importTips6: "4. tmdid: Teacher's user ID, optional",
         importTips7: '5. note: Note about the teacher, optional',
-        importTips8: "Note: Only if the imported teacher's user ID, cell phone, or email has already registered a TEAM Model account will the system automatically invite the teacher to join the school.",
+        importTips8: "Note: Only if the imported teacher's user ID, cell phone, or email has already registered a TEAM Model account will the system automatically add the teacher to join the school.",
         importTips9: 'Select or drag files to this area to import',
         impText: 'Invalid Data (No name)：',
         impText1: 'No. of imported：',
         impText2: 'No. of only name is imported：',
-        impText3: 'No. of auto-invite by system：',
+        impText3: 'No. of auto-added by system：',
         impText4: 'Re-import',
         impText5: 'Confirm Import',
         impText6: 'Imported successfully',

TEAMModelOS/ClientApp/public/lang/zh-TW.js

@@ -6339,15 +6339,15 @@ const LANG_ZH_TW = {
             info10: '的教師申請',
             info11: '搜尋不能為空白',
             info12: '已對所有成員送出邀請',
-            info13: '已對',
-            info14: '送出邀請',
+            info13: '已將',
+            info14: '加入學校',
             info15: '您的 Excel 沒資料',
             info16: '核准教師申請',
             info17: '請問您確定要核准',
             info18: '的教師申請',
             info19: '找不到此教師的資料',
-            info20: '用戶已被邀請，請勿重複邀請！',
-            info21: '邀請對象已加入學校！無法再次邀請！',
+            info20: '對象已加入學校！無法再次加入！',
+            info21: '對象已加入學校！無法再次加入！',
             noIdCol: '匯入表格沒有id欄位，請檢查表格數據！ ',
             spaceTips1: '請設定每人分配的空間大小',
             spaceTips2: '請選擇需要分配空間的教師職稱',
@@ -6436,7 +6436,7 @@ const LANG_ZH_TW = {
                 download: '下載範本',
                 upload: '匯入名單',
                 search: '搜尋教師',
-                sendInvite: '發送邀請',
+                sendInvite: '加入教師',
                 backHome: '重新檢索'
             },
             content: '<span>請輸入<span class="point">手機號碼</span>、<span class="point">醍摩豆用戶編號</span>或<span class="point">電子信箱</span>等資訊進行搜尋</span>',
@@ -6567,12 +6567,12 @@ const LANG_ZH_TW = {
         importTips5: '3. email: 教師電子信箱，選填；',
         importTips6: '4. tmdid: 教師用戶編號，選填；',
         importTips7: '5. note: 教師備註內容，選填；',
-        importTips8: '溫馨提示：匯入的教師用戶編號，或者匯入的手機或信箱已註冊醍摩豆帳號(注意：必須先完成註冊，才可以使用註冊對應的手機或信箱進行匯入)，系統會自動邀請教師加入學校。',
+        importTips8: '溫馨提示：匯入的教師用戶編號，或者匯入的手機或信箱已註冊醍摩豆帳號(注意：必須先完成註冊，才可以使用註冊對應的手機或信箱進行匯入)，系統會自動將教師加入學校。',
         importTips9: '點擊或者拖移文件匯入',
         impText: '無效數據（沒有名字）：',
         impText1: '匯入總人數：',
         impText2: '僅匯入姓名：',
-        impText3: '系統將自動邀請：',
+        impText3: '系統將自動加入：',
         impText4: '重新匯入',
         impText5: '確認匯入',
         impText6: '匯入成功',

TEAMModelOS/ClientApp/src/view/auth/Serial.vue

@@ -589,21 +589,24 @@ export default {
             let data = this._.cloneDeep(this.serial)
             let timestamp = Date.now()
             data.forEach(item => {
-                //未啟用
-                if (item.regDate == 0 || item.expireStatus == "") {
-                    item.es = 1
-                }
                 //已到期
-                else if (item.endDate != 0 && (item.expireStatus == "F" || item.endDate * 1000 < timestamp)) {
+                if (item.expireStatus == "F" || (item.endDate > 0 && item.endDate * 1000 < timestamp)) {
                     item.es = 2
                 }
-                //可使用
-                else if (item.endDate != 0 && (item.expireStatus == "S" || item.expireStatus == "A")) {
-                    item.es = 3
+                //未啟用
+                else if (item.expireStatus == "" || item.regDate == 0) {
+                    item.es = 1
                 }
-                //永久授權
-                else if (item.expireStatus == "A" && item.endDate == 0) {
-                    item.es = 4
+                //可使用、永久授權
+                else if (item.expireStatus == "S" || item.expireStatus == "A") {
+                    //永久授權
+                    if (item.endDate == 0) {
+                        item.es = 4
+                    }
+                    //可使用
+                    else {
+                        item.es = 3
+                    }
                 }
                 item.deviceBound.forEach(d => {
                     d.serial = item.serial