From 7e40e937bb2520cb1800f12dffd227f72352a7ce Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Wed, 22 May 2024 16:44:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E7=BF=BB=E8=AF=91+b?=
 =?UTF-8?q?ug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  1 +
 index.html                                    |  2 +-
 src/components/TableForm/src/TableForm.vue    |  2 +-
 src/components/UploadFile/src/UploadFile.vue  |  4 ++--
 src/hooks/web/useTitle.ts                     |  3 ++-
 src/layout/components/Footer/src/Footer.vue   |  3 ++-
 src/locales/en-US.ts                          | 22 +++++++++++++++++--
 src/locales/zh-CN.ts                          | 22 +++++++++++++++++--
 src/main.ts                                   |  6 +++++
 src/views/login/components/LoginForm.vue      |  2 +-
 src/views/login/login.vue                     |  4 ++--
 .../purchasereceiptJobMain.data.ts            |  2 +-
 12 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 7787e8e4a..c9ab210f8 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@
 form: {
     labelMessage: '信息提示说明！！！',
     componentProps: {
+      enterSearch: true, //可输入回车  对应绑定事件：@onEnter="onEnter"
       isSearchList: true, // 开启查询弹窗
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
diff --git a/index.html b/index.html
index b558105c9..847a1533b 100644
--- a/index.html
+++ b/index.html
@@ -138,7 +138,7 @@
         <div class="app-loading-wrap">
           <div class="app-loading-title">
             <img src="/src/assets/imgs/logo_white.png" class="app-loading-logo" alt="Logo" />
-            <div class="app-loading-title">%VITE_APP_TITLE%</div>
+            <div class="app-loading-title" id="app-loading-title">%VITE_APP_TITLE%</div>
           </div>
           <div class="app-loading-item">
             <div class="app-loading-outter"></div>
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 61242caf5..2de165246 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -64,7 +64,7 @@
               v-model="row[headerItem.field]"
               clearable
               :type="headerItem?.tableForm?.inputType"
-              :placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label"
+              :placeholder="t(`ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}`)"
               :disabled="headerItem?.tableForm?.disabled ? true: headerItem?.tableForm?.isInpuFocusShow ? true : false" 
               style="flex:1" 
               @blur="inputStringBlur(headerItem.field, row[headerItem.field], row)"
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index bf3cc4895..f952d235e 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -23,10 +23,10 @@
       <el-button type="primary"><Icon icon="ep:upload-filled" />{{ title }}</el-button>
       <template v-if="isShowTip" #tip>
         <div style="font-size: 8px;margin-top: 10px;line-height: initial;">
-          大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
+          {{t('ts.大小不超过')}} <b style="color: #f56c6c">{{ fileSize }}MB</b>
         </div>
         <div style="font-size: 8px;line-height: initial;">
-          格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b> 的文件
+          {{ t('ts.格式为') }} <b style="color: #f56c6c">{{ fileType.join('/') }}</b> {{ t('ts.的文件') }}
         </div>
       </template>
       <template  v-if="!isShowFile" #file >
diff --git a/src/hooks/web/useTitle.ts b/src/hooks/web/useTitle.ts
index 020a9b771..e531855ec 100644
--- a/src/hooks/web/useTitle.ts
+++ b/src/hooks/web/useTitle.ts
@@ -1,6 +1,7 @@
 import { watch, ref } from 'vue'
 import { isString } from '@/utils/is'
 import { useAppStoreWithOut } from '@/store/modules/app'
+const { t } = useI18n() // 国际化
 
 const appStore = useAppStoreWithOut()
 
@@ -14,7 +15,7 @@ export const useTitle = (newTitle?: string) => {
     title,
     (n, o) => {
       if (isString(n) && n !== o && document) {
-        document.title = n
+        document.title = n.replace(import.meta.env.VITE_APP_TITLE,t(`ts.${import.meta.env.VITE_APP_TITLE}`))
       }
     },
     { immediate: true }
diff --git a/src/layout/components/Footer/src/Footer.vue b/src/layout/components/Footer/src/Footer.vue
index c350e38af..bf29e4851 100644
--- a/src/layout/components/Footer/src/Footer.vue
+++ b/src/layout/components/Footer/src/Footer.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import { useAppStore } from '@/store/modules/app'
 import { useDesign } from '@/hooks/web/useDesign'
+const { t } = useI18n()
 
 // eslint-disable-next-line vue/no-reserved-component-names
 defineOptions({ name: 'Footer' })
@@ -19,6 +20,6 @@ const title = computed(() => appStore.getTitle)
     :class="prefixCls"
     class="h-[var(--app-footer-height)] bg-[var(--app-content-bg-color)] text-center leading-[var(--app-footer-height)] text-[var(--el-text-color-placeholder)] dark:bg-[var(--el-bg-color)]"
   >
-    <p style="font-size: 14px">Copyright ©2022-{{ title }}</p>
+    <p style="font-size: 14px">Copyright ©2022-{{ t(`ts.${title}`) }}</p>
   </div>
 </template>
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index ff7a39a2d..f3ab4f8b1 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1063,7 +1063,6 @@ export default {
     采购价格审批人:'Purchasing price approver',
     供应商发货单号:'Supplier\'s invoice number',
     加载中:'loading',
-    请输入备注:'Please enter remarks',
     '正在上传文件，请稍候':'Please wait while uploading files',
     上传成功:'upload successful',
     上传文件数量不能超过:'The number of uploaded files cannot exceed',
@@ -1084,7 +1083,26 @@ export default {
     开票日历管理:'Invoicing calendar management',
     描述:'description',
     批量删除:'Batch delete',
-    查看质检报告:'Check the quality inspection report'
+    查看质检报告:'Check the quality inspection report',
+    长春:'ChangChun',
+    成都:'ChengDu',
+    富维海拉智慧工厂管理平台:'HELLR Smart Factory Management Platform',
+    采购未收货记录:'Purchase unreceived record',
+    请选择要货计划单号:'Please select the desired shipment tracking number',
+    大小不超过:'Not more in size',
+    格式为:'File in',
+    的文件:'format',
+    接收:'Receive',
+    请输入批次:'Please input batch',
+    请输入供应商批次:'Please input the supplier batch',
+    选择日期:'Option Date',
+    请输入备注:'Please input comment',
+  // 格式为…的文件:The format is... File of
+    请输入包装规格1:'Please input package specification1',
+    请输入包装数量1:'Please input package quantity1',
+    请输入包装规格2:'Please input package specification2',
+    请输入包装数量2:'Please input package quantity2',
+    提交审批:'submit for approval'
 
 
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index d94a53c99..4dbc07161 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1063,7 +1063,6 @@ export default {
     采购价格审批人:'采购价格审批人',
     供应商发货单号:'供应商发货单号',
     加载中:'加载中',
-    请输入备注:'请输入备注',
     '正在上传文件，请稍候':'正在上传文件，请稍候...',
     上传成功:'上传成功',
     上传文件数量不能超过:'上传文件数量不能超过',
@@ -1084,7 +1083,26 @@ export default {
     开票日历管理:'开票日历管理',
     描述:'描述',
     批量删除:'批量删除',
-    查看质检报告:'查看质检报告'
+    查看质检报告:'查看质检报告',
+    长春:'长春',
+    成都:'成都',
+    富维海拉智慧工厂管理平台:'富维海拉智慧工厂管理平台',
+    采购未收货记录:'采购未收货记录',
+    请选择要货计划单号:'请选择要货计划单号',
+    大小不超过:'大小不超过',
+    格式为:'格式为',
+    的文件:'的文件',
+    接收:'接收',
+    请输入批次:'请输入批次',
+    请输入供应商批次:'请输入供应商批次',
+    选择日期:'选择日期',
+    请输入备注:'请输入备注',
+  // 格式为…的文件:The format is... File of
+    请输入包装规格1:'请输入包装规格1',
+    请输入包装数量1:'请输入包装数量1',
+    请输入包装规格2:'请输入包装规格2',
+    请输入包装数量2:'请输入包装数量2',
+    提交审批:'提交审批'
 
 
 
diff --git a/src/main.ts b/src/main.ts
index 5ba59e543..c8c5c34d5 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -43,6 +43,7 @@ import Logger from '@/utils/Logger'
 import VueDOMPurifyHTML from 'vue-dompurify-html' // 解决v-html 的安全隐患
 
 import DataVVue3 from '@kjgl77/datav-vue3'
+import { useLocaleStore } from '@/store/modules/locale'
 
 // 创建实例
 const setupAll = async () => {
@@ -70,6 +71,11 @@ const setupAll = async () => {
   app.mount('#app')
   app.config.warnHandler = () => null;
 }
+// 多语言相关
+const localeStore = useLocaleStore()
+if(localeStore&&localeStore.currentLocale&&localeStore.currentLocale.lang.indexOf('en')>-1&&document.querySelector('#app-loading-title')){
+  document.querySelector('#app-loading-title').innerHTML = 'HELLR Smart Factory Management Platform' // 富维海拉智慧工厂管理平台
+}
 
 setupAll()
 
diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index 67607c1dc..2c2c33fd7 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -15,7 +15,7 @@
             <el-option
               v-for="item in tenantArray"
               :key="item"
-              :label="item"
+              :label="t(`ts.${item}`)"
               :value="item"
             />
           </el-select>
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index 1969c440f..0f15a8299 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -10,7 +10,7 @@
         <!-- 左上角的 logo + 系统标题 -->
         <div class="relative flex items-center ">
           <img alt="" class="mr-10px w-144px h-36px" src="@/assets/imgs/logo_white.png" />
-          <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
+          <span class="text-20px font-bold">{{ t(`ts.${underlineToHump(appStore.getTitle)}`) }}</span>
         </div>
         <!-- 左边的背景图 + 欢迎语 -->
         <div class="h-[calc(100%-60px)] flex items-center justify-center">
@@ -34,7 +34,7 @@
         >
           <div class="flex items-center at-2xl:hidden at-xl:hidden">
             <img alt="" class="mr-10px w-144px h-36px" src="@/assets/imgs/logo_white.png" />
-            <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
+            <span class="text-20px font-bold">{{ t(`ts.${underlineToHump(appStore.getTitle)}`) }}</span>
           </div>
           <div class="flex items-center justify-end space-x-10px">
             <!-- <ThemeSwitch /> -->
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
index 7463ebd68..817ab2e94 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -609,7 +609,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 120,
+      width: 180,
       fixed: 'right'
     },
   },