bl-common-vue3 3.8.98 → 3.8.102

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bl-common-vue3",
-  "version": "3.8.98",
+  "version": "3.8.102",
   "main": "index.js",
   "module": "index.js",
   "description": "bailing vue3 common components lib",

package/src/components/ApprovalDetail/index.vue

@@ -443,7 +443,7 @@
       v-if="detail.dealerHandle || detail.approverHandle || detail.revoke == 1">
       <a-space size="small">
         <a-button
-          v-if="detail.dealerHandle"
+          v-if="detail.dealerHandle && !collapseApprovalActions"
           type="primary"
           key="deal"
           :size="isAllButton ? 'small' : 'default'"
@@ -457,7 +457,7 @@
 
         <template v-if="detail.approverHandle">
           <a-button
-            v-if="canAddSign"
+            v-if="canAddSign && !collapseApprovalActions"
             type="primary"
             ghost
             :size="isAllButton ? 'small' : 'default'"
@@ -468,7 +468,7 @@
             {{ $t("ApprovalDetail.index.931943-2") }}
           </a-button>
           <a-button
-            v-if="detail?.process_now > 1"
+            v-if="detail?.process_now > 1 && !collapseApprovalActions"
             type="default"
             :size="isAllButton ? 'small' : 'default'"
             :loading="submitLoading"
@@ -480,7 +480,7 @@
           </a-button>
 
           <a-button
-            v-if="canEdit"
+            v-if="canEdit && !collapseApprovalActions"
             type="primary"
             key="edit"
             :size="isAllButton ? 'small' : 'default'"
@@ -545,7 +545,7 @@
           ghost
           key="urging"
           :size="isAllButton ? 'small' : 'default'"
-          v-if="detail.revoke == 1"
+          v-if="detail.revoke == 1 && !collapseApprovalActions"
           @click="ApprovalUrging">
           <template #icon>
             <BellOutlined />
@@ -557,13 +557,81 @@
           :loading="submitLoading"
           key="revoke"
           :size="isAllButton ? 'small' : 'default'"
-          v-if="detail.revoke == 1"
+          v-if="detail.revoke == 1 && !collapseApprovalActions"
           @click="revokeApproval">
           <template #icon>
             <UndoOutlined />
           </template>
           {{ $t("ApprovalDetail.index.931943-20") }}
         </a-button>
+
+        <a-dropdown
+          v-if="collapseApprovalActions && moreApprovalActions.length"
+          :trigger="['click']"
+          placement="topRight">
+          <a-button type="primary" ghost :size="isAllButton ? 'small' : 'default'">
+            {{ $t("common.button.more") }}
+            <DownOutlined />
+          </a-button>
+          <template #overlay>
+            <a-menu>
+              <a-menu-item
+                v-if="detail.dealerHandle"
+                key="deal"
+                :disabled="submitLoading"
+                @click="approvalForm('agree')">
+                <template #icon>
+                  <CheckOutlined />
+                </template>
+                {{ $t("ApprovalDetail.index.931943-14") }}
+              </a-menu-item>
+              <a-menu-item
+                v-if="canAddSign"
+                key="addSign"
+                @click="handleAddSign">
+                <template #icon>
+                  <PlusCircleOutlined />
+                </template>
+                {{ $t("ApprovalDetail.index.931943-2") }}
+              </a-menu-item>
+              <a-menu-item
+                v-if="detail?.process_now > 1"
+                key="back"
+                :disabled="submitLoading"
+                @click="handleMore(2)">
+                <template #icon>
+                  <RollbackOutlined />
+                </template>
+                {{ $t("ApprovalDetail.index.931943-15") }}
+              </a-menu-item>
+              <a-menu-item v-if="canEdit" key="edit" @click="editFormInfo">
+                <template #icon>
+                  <FormOutlined />
+                </template>
+                {{ $t("ApprovalDetail.index.931943-16") }}
+              </a-menu-item>
+              <a-menu-item
+                v-if="detail.revoke == 1"
+                key="urging"
+                @click="ApprovalUrging">
+                <template #icon>
+                  <BellOutlined />
+                </template>
+                {{ $t("ApprovalDetail.index.931943-19") }}
+              </a-menu-item>
+              <a-menu-item
+                v-if="detail.revoke == 1"
+                key="revoke"
+                :disabled="submitLoading"
+                @click="revokeApproval">
+                <template #icon>
+                  <UndoOutlined />
+                </template>
+                {{ $t("ApprovalDetail.index.931943-20") }}
+              </a-menu-item>
+            </a-menu>
+          </template>
+        </a-dropdown>
       </a-space>
     </div>
   </div>
@@ -618,6 +686,7 @@ import {
   RollbackOutlined,
   FormOutlined,
   PlusCircleOutlined,
+  DownOutlined,
 } from "@ant-design/icons-vue";
 import { message } from "ant-design-vue";
 import moment from "moment";
@@ -672,6 +741,7 @@ export default defineComponent({
     FormOutlined,
     AddSignModal,
     BlPopover,
+    DownOutlined,
     "a-timeline": Timeline,
   },
   directives: {
@@ -1231,6 +1301,40 @@ export default defineComponent({
       return false;
     });
 
+    const moreApprovalActions = computed(() => {
+      const list = [];
+      if (state.detail?.dealerHandle) {
+        list.push("deal");
+      }
+      if (state.detail?.approverHandle) {
+        if (canAddSign.value) {
+          list.push("addSign");
+        }
+        if (state.detail?.process_now > 1) {
+          list.push("back");
+        }
+        if (canEdit.value) {
+          list.push("edit");
+        }
+      }
+      if (state.detail?.revoke == 1) {
+        list.push("urging", "revoke");
+      }
+      return list;
+    });
+
+    const approvalActionCount = computed(() => {
+      let count = moreApprovalActions.value.length;
+      if (state.detail?.approverHandle) {
+        count += 2;
+      }
+      return count;
+    });
+
+    const collapseApprovalActions = computed(() => {
+      return state.detail?.approverHandle && approvalActionCount.value > 4;
+    });
+
     const handleRequest = (emitObj) => {
       emit("request", emitObj);
     };
@@ -1300,6 +1404,8 @@ export default defineComponent({
       handleAddSign,
       handleAddSignSuccess,
       canAddSign,
+      moreApprovalActions,
+      collapseApprovalActions,
       handleRequest,
       detailRef,
       isAllButton,

package/src/locale/commonLocale/en.js

@@ -17,8 +17,8 @@ export default {
   "common.button.confirm": "Confirm",
   "common.button.submit": "Submit",
   "common.button.whole": "All",
-  "common.tenant.lower": "tenant",
-  "common.tenant.cap": "Tenant",
+  "common.tenant.lower": "customer",
+  "common.tenant.cap": "Customer",
   "common.action.collapse": "Collapse",
   "common.action.expand": "Expand",
   "common.switch.enabled": "Enabled",

package/src/locale/commonLocale/ja-JP.js

@@ -17,8 +17,8 @@ export default {
   "common.button.confirm": "確認",
   "common.button.submit": "送信",
   "common.button.whole": "すべて",
-  "common.tenant.lower": "入居者",
-  "common.tenant.cap": "入居者",
+  "common.tenant.lower": "顧客",
+  "common.tenant.cap": "顧客",
   "common.action.collapse": "折りたたむ",
   "common.action.expand": "展開",
   "common.switch.enabled": "有効",

package/src/locale/lang/en.js

@@ -1,12 +1,12 @@
-import antdEnUS from 'ant-design-vue/es/locale-provider/en_US'
-import momentEU from 'moment/locale/eu'
-
-const components = {
-  antLocale: antdEnUS,
-  momentName: 'eu',
-  momentLocale: momentEU
-}
-
-export default {
-  ...components,
-}
+import antdEnUS from 'ant-design-vue/es/locale-provider/en_US'
+import momentEN from 'moment/locale/en';
+
+const components = {
+  antLocale: antdEnUS,
+  momentName: 'en',
+  momentLocale: momentEN
+}
+
+export default {
+  ...components,
+}

package/src/locale/local/cht.json

@@ -17,7 +17,7 @@
   "CustomTable.index.074786-18": "擴充欄位",
   "CustomTable.index.074786-19": "清單設定",
   "CustomTable.index.074786-22": "匯入檔案",
-  "CustomTable.index.074786-31": "匯出成功，請等待檔案生成",
+  "CustomTable.index.074786-31": "匯出成功，請等待檔案產生",
   "CustomTable.index.074786-32": "共{0}筆",
   "modules.AddAttachments.831666-0": "新增{0}",
   "modules.AddAttachments.831666-1": "{0}名稱",
@@ -27,7 +27,7 @@
   "modules.AddAttachments.831666-5": "資料夾",
   "modules.AddAttachments.831666-6": "檔案",
   "modules.AddAttachments.831666-7": "新增成功",
-  "modules.MultipleAddAttachments.414571-0": "批量上傳",
+  "modules.MultipleAddAttachments.414571-0": "批次上傳",
   "modules.MultipleAddAttachments.414571-1": "線上預覽",
   "modules.MultipleAddAttachments.414571-2": "您確定取消嗎？",
   "modules.MultipleAddAttachments.414571-3": "請選擇檔案並等待上傳完成後儲存！",
@@ -39,13 +39,13 @@
   "AttachmentInfo.index.559728-1": "新增附件",
   "AttachmentInfo.index.559728-2": "新增資料夾",
   "AttachmentInfo.index.559728-3": "上傳檔案",
-  "AttachmentInfo.index.559728-4": "批量上傳",
+  "AttachmentInfo.index.559728-4": "批次上傳",
   "AttachmentInfo.index.559728-5": "線上預覽",
   "AttachmentInfo.index.559728-6": "置頂",
   "AttachmentInfo.index.559728-7": "下載",
   "AttachmentInfo.index.559728-8": "首頁",
   "AttachmentInfo.index.559728-9": "置頂成功",
-  "AttachmentInfo.index.559728-10": "未返回檔案路徑，無法下載",
+  "AttachmentInfo.index.559728-10": "未取得檔案路徑，無法下載",
   "AttachmentInfo.index.559728-11": "確認刪除此檔案或資料夾（刪除資料夾則該資料夾目錄下的檔案將全部刪除）？",
   "AttachmentInfo.index.559728-12": "刪除成功",
   "AttachmentInfo.index.559728-13": "檔名",
@@ -58,7 +58,7 @@
   "BlTextTranslationModal.index.007091-1": "請輸入預設名稱",
   "BlTextTranslationModal.index.007091-2": "請輸入{0}",
   "BlTextTranslationModal.index.007091-3": "新增其他語種版本",
-  "BlTextTranslationModal.index.007091-4": "在機構端或使用者端檢視此欄位時，系統會依目前設定的語言顯示內容。若該語言的名稱為空，則顯示預設名稱。",
+  "BlTextTranslationModal.index.007091-4": "在管理端或一般使用者端檢視此欄位時，系統會依目前設定的語言顯示內容。若該語言的名稱為空，則顯示預設名稱。",
   "CheckedHousingResources.index.396661-0": "{0}名稱",
   "CheckedHousingResources.index.396661-1": "租賃面積",
   "CheckedHousingResources.index.396661-2": "總面積",
@@ -83,7 +83,7 @@
   "ChooseBuildings.index.297751-0": "全選",
   "ChooseBuildings.index.297751-1": "部分樓層",
   "ChooseBuildings.index.297751-2": "全部樓層",
-  "ChooseBuildings.index.297751-3": "該案場下暫未新增棟別",
+  "ChooseBuildings.index.297751-3": "此案場尚未新增棟別",
   "ChooseBuildings.index.297751-4": "棟別清單",
   "ChooseBuildings.index.297751-5": "集合清單",
   "ChooseBuildings.index.297751-6": "案場清單",
@@ -92,8 +92,8 @@
   "ChooseHousingResources.index.643917-1": "不能跨案場選擇{0}！",
   "ChooseHousingResources.index.643917-2": "不能跨棟別選擇{0}！",
   "ChooseHousingResources.index.643917-3": "不能跨樓層選擇{0}！",
-  "ChooseHousingResources.index.643917-4": "當前{0}可租面積為0，請選擇其他{1}",
-  "ChooseHousingResources.index.643917-5": "未查找到該{0}",
+  "ChooseHousingResources.index.643917-4": "目前{0}可租面積為0，請選擇其他{1}",
+  "ChooseHousingResources.index.643917-5": "找不到該{0}",
   "ChooseOrgMember.index.484656-0": "全選",
   "ChooseOrgMember.index.484656-1": "尚未啟用",
   "ChooseOrgMember.index.484656-2": "目前沒有資料",
@@ -111,23 +111,23 @@
   "ChooseOrgMember.index.484656-15": "請選擇至少{0}個部門！",
   "ChooseOrgMember.index.484656-16": "您最多只能選擇{0}個部門！",
   "ChoosePropertyResources.index.108367-0": "不能跨公司選擇資產！",
-  "ChoosePropertyResources.index.108367-1": "當前資產已出售，請選擇其他資產",
-  "ChoosePropertyResources.index.108367-2": "當前資產已出租，請選擇其他資產",
-  "ChoosePropertyResources.index.108367-3": "當前資產可租面積為0，請選擇其他資產",
-  "ChoosePropertyResources.index.108367-4": "未查找到該資產",
-  "ColumnSetting.index.391089-0": "列設定",
-  "ColumnSetting.index.391089-1": "恢復預設",
-  "ColumnSetting.index.391089-2": "列名稱",
+  "ChoosePropertyResources.index.108367-1": "目前資產已出售，請選擇其他資產",
+  "ChoosePropertyResources.index.108367-2": "目前資產已出租，請選擇其他資產",
+  "ChoosePropertyResources.index.108367-3": "目前資產可租面積為0，請選擇其他資產",
+  "ChoosePropertyResources.index.108367-4": "找不到該資產",
+  "ColumnSetting.index.391089-0": "欄位設定",
+  "ColumnSetting.index.391089-1": "還原預設值",
+  "ColumnSetting.index.391089-2": "欄位名稱",
   "ColumnSetting.index.391089-3": "寬度",
   "ColumnSetting.index.391089-5": "固定",
   "ColumnSetting.index.391089-6": "排序",
-  "ColumnSetting.index.391089-7": "至少保留一項表格列",
-  "ColumnSetting.index.391089-9": "是否確認要恢復預設？",
+  "ColumnSetting.index.391089-7": "至少保留一個表格欄位",
+  "ColumnSetting.index.391089-9": "確定要還原預設值嗎？",
   "ColumnSetting.index.391089-10": "無",
   "ColumnSetting.index.391089-11": "左",
   "ColumnSetting.index.391089-12": "右",
-  "CustomColumns.index.325309-0": "自訂顯示",
-  "CustomColumns.index.325309-1": "恢復預設",
+  "CustomColumns.index.325309-0": "自訂欄位顯示",
+  "CustomColumns.index.325309-1": "還原預設值",
   "CustomImport.index.951685-0": "範本下載",
   "CustomImport.index.951685-1": "點選或將檔案拖曳到此處上傳",
   "CustomImport.index.951685-2": "支援副檔名：{0}",
@@ -139,16 +139,16 @@
   "CustomImport.index.951685-9": "匯入成功",
   "DepartmentPositionForm.index.147974-0": "請選擇人員",
   "DepartmentPositionForm.index.147974-1": "部門：",
-  "DepartmentPositionForm.index.147974-3": "崗位：",
-  "DepartmentPositionModal.index.405695-0": "選擇部門/崗位",
-  "DepartmentPositionModal.index.405695-1": "由於人員可能因離職、請假、調動等原因頻繁變動，因此系統不採取直接選擇人員的方式，而是採用部門＋崗位的雙重設定。日後只要新進員工隸屬於該部門的該崗位，系統就會自動選取，無須手動選擇人員。",
+  "DepartmentPositionForm.index.147974-3": "職位：",
+  "DepartmentPositionModal.index.405695-0": "選擇部門/職位",
+  "DepartmentPositionModal.index.405695-1": "人員可能因離職、請假或調職等原因頻繁變動，因此系統採用部門＋職位的雙重設定，無須直接選擇人員。日後只要新進員工隸屬於該部門及職位，系統就會自動選取。",
   "DepartmentPositionModal.index.405695-2": "選擇部門",
-  "DepartmentPositionModal.index.405695-3": "選擇崗位",
-  "DepartmentPositionModal.index.405695-4": "暫無崗位，請先新增崗位",
+  "DepartmentPositionModal.index.405695-3": "選擇職位",
+  "DepartmentPositionModal.index.405695-4": "尚無職位，請先新增職位",
   "DepartmentPositionModal.index.405695-5": "人員預覽：",
-  "DepartmentPositionModal.index.405695-6": "清單顯示目前的人員狀況。之後若部門或崗位的人員有新增、調動、離職等變動，系統取得的人員資料也會自動更新。",
-  "DepartmentPositionModal.index.405695-7": "暫無人員預覽",
-  "DepartmentPositionModal.index.405695-8": "請選擇部門和崗位",
+  "DepartmentPositionModal.index.405695-6": "清單顯示目前的人員狀況。之後若部門或職位的人員有新增、調職或離職等變動，系統取得的人員資料也會自動更新。",
+  "DepartmentPositionModal.index.405695-7": "尚無人員可預覽",
+  "DepartmentPositionModal.index.405695-8": "請選擇部門和職位",
   "utils.constant.921180-0": "預設",
   "utils.constant.921180-1": "主要",
   "utils.constant.921180-2": "成功",
@@ -162,7 +162,7 @@
   "components.AddDictionary.031362-4": "請輸入字典鍵值",
   "components.AddDictionary.031362-5": "樣式屬性",
   "components.AddDictionary.031362-6": "請輸入樣式屬性",
-  "components.AddDictionary.031362-7": "回顯樣式",
+  "components.AddDictionary.031362-7": "顯示樣式",
   "components.AddDictionary.031362-11": "停用",
   "components.AddDictionary.031362-12": "編輯成功！",
   "components.AddDictionary.031362-13": "新增成功！",
@@ -173,7 +173,7 @@
   "DictionarySetting.index.757488-5": "字典鍵值",
   "ExportComponents.index.921182-0": "資料匯出進度",
   "ExportComponents.index.921182-1": "正在匯出資料，請耐心等待，請勿關閉視窗…",
-  "ExportComponents.index.921182-2": "匯出成功，請等待檔案生成",
+  "ExportComponents.index.921182-2": "匯出成功，請等待檔案產生",
   "components.ExtraManageEdit.301828-0": "欄位名稱",
   "components.ExtraManageEdit.301828-1": "欄位排序",
   "components.ExtraManageEdit.301828-2": "數字越大越靠前",
@@ -195,9 +195,9 @@
   "IDCardReader.index.325162-1": "重新讀取",
   "IDCardReader.index.325162-2": "開始讀取",
   "IDCardReader.index.325162-3": "正在讀取中，請稍等",
-  "IDCardReader.index.325162-4": "請勿移動證件或斷開設備",
+  "IDCardReader.index.325162-4": "請勿移動證件或中斷裝置連線",
   "IDCardReader.index.325162-5": "證件類型",
-  "IDCardReader.index.325162-6": "中國居民身份證",
+  "IDCardReader.index.325162-6": "中國居民身分證",
   "IDCardReader.index.325162-7": "外國人永久居留證",
   "IDCardReader.index.325162-8": "臺灣居住證",
   "IDCardReader.index.325162-9": "港澳居住證",
@@ -217,12 +217,12 @@
   "IDCardReader.index.325162-23": "裝置連線失敗，請檢查裝置或聯絡管理員",
   "IDCardReader.index.325162-24": "瀏覽器版本過舊，不支援此讀卡機",
   "IDCardReader.index.325162-25": "讀取成功",
-  "IDCardReader.index.325162-26": "讀卡器未連接",
+  "IDCardReader.index.325162-26": "讀卡機未連接",
   "ImportFile.index.452353-0": "點選或將檔案拖曳到此處上傳",
   "ImportFile.index.452353-1": "支援副檔名：{0}",
   "ImportFile.index.452353-2": "範本下載",
   "ImportFile.index.452353-3": "匯入檔案",
-  "ImportFile.index.452353-4": "下載成功，請等待檔案生成",
+  "ImportFile.index.452353-4": "下載成功，請等待檔案產生",
   "ImportFile.index.452353-5": "請先上傳檔案！",
   "ImportFile.index.452353-6": "上傳成功！",
   "ImportFile.index.452353-7": "上傳失敗！",
@@ -263,14 +263,14 @@
   "LinkLibrary.MiniList.891083-6": "確定刪除嗎？",
   "LinkLibrary.MiniList.891083-7": "刪除成功",
   "PaySetting.index.371659-0": "{0}付款設定",
-  "PaySetting.index.371659-1": "啟用的支付",
+  "PaySetting.index.371659-1": "已啟用的付款方式",
   "PaySetting.index.371659-3": "請選擇使用環境",
   "PaySetting.index.371659-4": "請選擇已啟用的付款設定",
   "PaySetting.index.371659-5": "請先選擇使用環境",
-  "PaySetting.index.371659-6": "確認取消新增當前項？",
+  "PaySetting.index.371659-6": "確定取消新增此項？",
   "PaySetting.index.371659-7": "使用環境",
   "PaySetting.index.371659-8": "付款名稱",
-  "PaySetting.index.371659-10": "應用棟別",
+  "PaySetting.index.371659-10": "適用棟別",
   "PaySetting.index.371659-11": "請選擇使用環境和付款設定名稱！",
   "PaySetting.index.371659-12": "新增成功！",
   "PaySetting.index.371659-15": "刪除成功！",
@@ -280,7 +280,7 @@
   "PhotoUpload.index.983369-3": "您的瀏覽器不支援此功能，請更換瀏覽器或升級至最新版本",
   "PreviewImg.index.468831-0": "圖片預覽",
   "QrcodeModal.index.612016-0": "點選下載",
-  "QrcodeModal.index.612016-1": "二維碼",
+  "QrcodeModal.index.612016-1": "QR Code",
   "SelectProperty.index.178533-0": "選擇資產",
   "SelectProperty.index.178533-1": "新增資產",
   "SelectProperty.index.178533-2": "資產編碼",
@@ -297,7 +297,7 @@
   "SelectProperty.index.178533-13": "請輸入型號",
   "SelectProperty.index.178533-16": "共計{0}項",
   "SelectProperty.index.178533-17": "已選中{0}項",
-  "SelectProperty.index.178533-18": "設備序號",
+  "SelectProperty.index.178533-18": "裝置序號",
   "TenantComponent.index.898342-0": "可直接輸入名稱搜尋",
   "UserDetail.index.833219-0": "部門",
   "UserDetail.index.833219-1": "直屬上級",
@@ -327,7 +327,7 @@
   "ViewPropertyList.index.954882-2": "資產名稱",
   "ViewPropertyList.index.954882-3": "品牌",
   "ViewPropertyList.index.954882-4": "型號",
-  "ViewPropertyList.index.954882-5": "設備序號",
+  "ViewPropertyList.index.954882-5": "裝置序號",
   "ViewPropertyList.index.954882-6": "購置金額",
   "ViewPropertyList.index.954882-7": "含稅",
   "ViewPropertyList.index.954882-8": "元",
@@ -344,7 +344,7 @@
   "components.ExtraManageEdit.249040-8": "選擇日期類型",
   "components.ExtraManageEdit.249040-9": "選項內容",
   "components.ExtraManageEdit.249040-10": "新增選項",
-  "components.ExtraManageEdit.249040-11": "最多可以選擇的項目數",
+  "components.ExtraManageEdit.249040-11": "最多可選的選項數",
   "components.ExtraManageEdit.249040-12": "最大允許上傳個數",
   "components.ExtraManageEdit.249040-13": "日期",
   "components.ExtraManageEdit.249040-14": "日期+時間",
@@ -367,7 +367,7 @@
   "ExtraManage.index.338036-1": "請輸入欄位名稱",
   "ExtraManage.index.845270-7": "所屬案場",
   "modules.ExtraManageEdit.828230-5": "不選擇為通用",
-  "ExtraFieldsItem.index.243488-0": "點擊或拖拽上傳",
+  "ExtraFieldsItem.index.243488-0": "點選或拖曳上傳",
   "ExtraFieldsItem.index.243488-1": "已超過最大選擇數量",
   "CustomTable.index.675298-0": "審批流設定",
   "CustomTable.index.675298-1": "名稱",
@@ -381,12 +381,12 @@
   "VisitorPage.index.924333-1": "留空則支援所有檔案格式；多個格式請用半形逗號分隔，例如：.doc,.docx,.pdf,.jpg,.jpeg,.png,.xls,.xlsx,.rar,.zip,.gif",
   "ExtraFieldsItem.index.831918-0": "選擇附件",
   "ExtraFieldsItem.index.831918-1": "僅支援10MB以內",
-  "components.ImportResult.699608-0": "導入結果",
-  "components.ImportResult.699608-1": "導入出錯",
-  "components.ImportResult.699608-2": "導入成功",
+  "components.ImportResult.699608-0": "匯入結果",
+  "components.ImportResult.699608-1": "匯入錯誤",
+  "components.ImportResult.699608-2": "匯入成功",
   "components.ImportResult.699608-3": "成功筆數：",
   "components.ImportResult.699608-4": "失敗筆數：",
-  "components.ImportResult.699608-5": "下載導入結果",
+  "components.ImportResult.699608-5": "下載匯入結果",
   "village.translate.292926-0": "資料移轉",
   "village.translate.292926-1": "資料移轉至",
   "village.translate.292926-2": "選擇公司",
@@ -423,7 +423,7 @@
   "ApprovalDetail.index.931943-18": "拒絕",
   "ApprovalDetail.index.931943-19": "催辦",
   "ApprovalDetail.index.931943-20": "撤銷",
-  "ApprovalDetail.index.931943-21": "確認撤銷當前審批嗎？",
+  "ApprovalDetail.index.931943-21": "確定撤銷目前的審批嗎？",
   "ApprovalDetail.index.931943-22": "撤銷成功！",
   "ApprovalDetail.index.931943-23": "催辦成功！",
   "ApprovalDetail.index.931943-24": "已提交",
@@ -439,7 +439,7 @@
   "modules.ApprovalSendBack.587880-1": "退回到",
   "modules.ApprovalSendBack.587880-2": "退回原因",
   "modules.ApprovalSendBack.587880-3": "請填寫退回原因",
-  "modules.ApprovalMentionUser.268217-0": "無搜索結果",
+  "modules.ApprovalMentionUser.268217-0": "沒有搜尋結果",
   "modules.ApprovalAddComment.585618-0": "新增評論，可",
   "modules.ApprovalAddComment.585618-1": "相關人員",
   "modules.ApprovalAddComment.585618-2": "傳送",
@@ -484,24 +484,24 @@
   "CustomImport.index.683631-0": "請匯入範本",
   "CheckedHousingResources.index.885448-0": "房源類型",
   "CheckedHousingResources.index.885448-1": "經營品牌",
-  "CheckedHousingResources.index.885448-2": "店鋪名稱",
+  "CheckedHousingResources.index.885448-2": "店舖名稱",
   "CheckedHousingResources.index.074796-0": "選擇品牌",
-  "BlMobileAnnexUpload.index-0": "查看二維碼",
-  "BlMobileAnnexUpload.index-1": "手機掃碼上傳",
-  "QrcodeModal.index.612016-3": "點擊複製",
+  "BlMobileAnnexUpload.index-0": "查看 QR Code",
+  "BlMobileAnnexUpload.index-1": "使用手機掃碼上傳",
+  "QrcodeModal.index.612016-3": "點選複製",
   "PhotoUpload.index.983369-4": "手機拍照",
   "modules.ListFieldModal.082665-0": "選項內容不能為空",
   "CheckedHousingResources.index.863384-0": "單價",
   "CheckedHousingResources.index.863384-1": "綁定人員",
   "TenantComponent.index.794262-0": "{0}已被綁定，請勿重複綁定",
-  "company.user.485542-0": "暫未分配角色",
+  "company.user.485542-0": "尚未指派角色",
   "company.user.485542-1": "團員",
   "company.user.485542-2": "黨員",
   "company.user.485542-3": "預備黨員",
   "company.user.485542-4": "無黨派人士",
   "company.user.485542-5": "群眾",
-  "UserDetail.index.833210-0": "無權查看該人員資訊",
-  "UserDetail.index.833210-1": "發起聊天",
+  "UserDetail.index.833210-0": "您沒有權限查看此人員資訊",
+  "UserDetail.index.833210-1": "開始聊天",
   "BlChat.createChatBtn.23456-0": "發起討論",
   "ColumnSetting.index.875911-0": "儲存為共用設定",
   "ColumnSetting.index.875911-1": "清單顯示優先順序：個人設定 > 共用範本 > 系統預設",
@@ -509,10 +509,10 @@
   "villageIotInfo.index.885385-0": "系統內建欄位，無法操作",
   "ApprovalDetail.index.683625-0": "第三方審批",
   "ApprovalDetail.index.683625-1": "第三方",
-  "ApprovalDetail.index.683625-2": "您可以代替目前的使用者完成審批。完成後，頁面會將您顯示為此流程節點的代理人。",
+  "ApprovalDetail.index.683625-2": "您可以代替目前的審批人完成審批。完成後，頁面會將您顯示為此流程節點的代理人。",
   "ApprovalDetail.index.683625-3": "審批需要手寫簽名，但系統尚未記錄您的簽名。首次使用請前往行動裝置完成審批和手寫簽名！",
   "DepartmentUser.index.555981-0": "清除選項",
 	"DepartmentUser.index.555981-1": "展開",
 	"DepartmentUser.index.555981-2": "收起",
-  "BlMobileAnnexUpload.index.676543-0": "該二維碼十五分鐘內有效"
+  "BlMobileAnnexUpload.index.676543-0": "此 QR Code 於 15 分鐘內有效"
 }

package/src/locale/local/en.json

@@ -58,7 +58,7 @@
   "BlTextTranslationModal.index.007091-1": "Please enter the default name",
   "BlTextTranslationModal.index.007091-2": "Please enter {0}",
   "BlTextTranslationModal.index.007091-3": "Add other language versions",
-  "BlTextTranslationModal.index.007091-4": "This field uses the current language. If its translation is empty, the default name is shown.",
+  "BlTextTranslationModal.index.007091-4": "In the admin portal or user app, this field uses the current language. If its translation is empty, the default name is shown.",
   "CheckedHousingResources.index.396661-0": "{0} name",
   "CheckedHousingResources.index.396661-1": "Rental area",
   "CheckedHousingResources.index.396661-2": "Total area",
@@ -134,7 +134,7 @@
   "CustomImport.index.951685-4": "Import error",
   "CustomImport.index.951685-5": "Number of errors: {0}",
   "CustomImport.index.951685-6": "Download the result file to find import errors",
-  "CustomImport.index.951685-7": "Download document",
+  "CustomImport.index.951685-7": "Download file",
   "CustomImport.index.951685-8": "Back",
   "CustomImport.index.951685-9": "Imported",
   "DepartmentPositionForm.index.147974-0": "Please select staff",
@@ -194,7 +194,7 @@
   "IDCardReader.index.325162-0": "ID reader",
   "IDCardReader.index.325162-1": "Read again",
   "IDCardReader.index.325162-2": "Start reading",
-  "IDCardReader.index.325162-3": "Reading in progress, please wait",
+  "IDCardReader.index.325162-3": "Reading...",
   "IDCardReader.index.325162-4": "Do not move the ID or disconnect the reader",
   "IDCardReader.index.325162-5": "ID type",
   "IDCardReader.index.325162-6": "Chinese Resident Identity Card",
@@ -216,7 +216,7 @@
   "IDCardReader.index.325162-22": "Reader connected. Click the button above to read the ID",
   "IDCardReader.index.325162-23": "Connection failed. Check the reader or contact an administrator",
   "IDCardReader.index.325162-24": "Your browser is too old to support this card reader",
-  "IDCardReader.index.325162-25": "ID read successfully",
+  "IDCardReader.index.325162-25": "ID read",
   "IDCardReader.index.325162-26": "Card reader not connected",
   "ImportFile.index.452353-0": "Click or drag the file here to upload",
   "ImportFile.index.452353-1": "Supported extensions: {0}",
@@ -309,7 +309,7 @@
   "ViewEnergyList.index.921424-1": "To bind another meter, add it in the relevant meter app and bind it to a room.",
   "ViewEnergyList.index.921424-3": "Read meter",
   "ViewEnergyList.index.921424-4": "Meter reading",
-  "ViewEnergyList.index.921424-6": "Are you sure to reset this {0}?",
+  "ViewEnergyList.index.921424-6": "Reset this {0}?",
   "ViewEnergyList.index.921424-8": "Reminder",
   "ViewEnergyList.index.921424-9": "No utility price standard is linked. Add one for this location before reading the meter",
   "ViewEnergyList.index.921424-10": "Got it",
@@ -487,7 +487,7 @@
   "CheckedHousingResources.index.885448-2": "Shop name",
   "CheckedHousingResources.index.074796-0": "Select brand",
   "BlMobileAnnexUpload.index-0": "View QR code",
-  "BlMobileAnnexUpload.index-1": "Scan to upload via mobile",
+  "BlMobileAnnexUpload.index-1": "Scan with your phone to upload",
   "QrcodeModal.index.612016-3": "Copy",
   "PhotoUpload.index.983369-4": "Take photo with phone",
   "modules.ListFieldModal.082665-0": "Option content is required",
@@ -509,7 +509,7 @@
   "villageIotInfo.index.885385-0": "Built-in system field. It cannot be changed",
   "ApprovalDetail.index.683625-0": "Third-party approval",
   "ApprovalDetail.index.683625-1": "Third-party",
-  "ApprovalDetail.index.683625-2": "You can approve for the current user. You will be shown as the delegate for this step.",
+  "ApprovalDetail.index.683625-2": "You can approve on behalf of the current approver. You will be shown as the delegate for this step.",
   "ApprovalDetail.index.683625-3": "A handwritten signature is required. Use the mobile app for your first approval to save your signature.",
   "DepartmentUser.index.555981-0": "Clear selection",
   "DepartmentUser.index.555981-1": "Expand",