From 9d536b489d5d802125b749342d9fb727eddf5021 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 10 Dec 2024 16:11:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/LabelForm/src/LabelForm.vue    |  6 +--
 .../SearchTable/src/SearchTable.vue           |  4 +-
 src/components/Table/src/Table.vue            |  2 +-
 src/locales/en-US.ts                          | 34 +++++++++++-
 src/locales/zh-CN.ts                          | 31 ++++++++++-
 .../purchasereceiptRequestMain/index.vue      |  6 +--
 .../supplierdeliverRequestMain/index.vue      |  8 +--
 .../supplierdeliverRequestMain/labelForm.vue  | 52 +++++++++----------
 .../supplierdeliverRequestMain.data.ts        |  8 +--
 9 files changed, 106 insertions(+), 45 deletions(-)

diff --git a/src/components/LabelForm/src/LabelForm.vue b/src/components/LabelForm/src/LabelForm.vue
index a51ca0c70..f4acd8cba 100644
--- a/src/components/LabelForm/src/LabelForm.vue
+++ b/src/components/LabelForm/src/LabelForm.vue
@@ -68,7 +68,7 @@
                                 1
                               )
                             "
-                            >移出</el-button
+                            >{{ t('ts.移出') }}</el-button
                           >
                         </template>
                       </el-table-column>
@@ -97,7 +97,7 @@
                     type="warning"
                     link
                     @click="removeT(scope.row, scope.$index, scope1.row, scope1.$index)"
-                    >移出</el-button
+                    >{{ t('ts.移出') }}</el-button
                   >
                 </template>
               </el-table-column>
@@ -143,7 +143,7 @@
                       @click="
                         removeX(scope.row, scope.$index, item, index, scope1.row, scope1.$index)
                       "
-                      >移出</el-button
+                      >{{ t('ts.移出') }}</el-button
                     >
                   </template>
                 </el-table-column>
diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index b32d0d271..1742328a6 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -39,8 +39,8 @@
     <template #footer>
       <div class="flex items-center">
         <slot :name="'selectionsActions'+formFieldRef" :selections="searchTableRef?searchTableRef.selections:[]"></slot>
-        <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-        <el-button @click="searchDialogVisible = false">取 消</el-button>
+        <el-button @click="submitForm" type="primary" :disabled="formLoading">{{ t(`ts.${'确 定'}`) }}</el-button>
+        <el-button @click="searchDialogVisible = false">{{ t(`ts.${'取 消'}`) }}</el-button>
 
         <slot name="actions"></slot>
       </div>
diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue
index e3499a988..6cf207ac3 100644
--- a/src/components/Table/src/Table.vue
+++ b/src/components/Table/src/Table.vue
@@ -423,7 +423,7 @@ export default defineComponent({
           }}
         </ElTable>
         {unref(getProps).selectionTotal ? (
-          <div class="mt-15px float-left" style='height:32px;line-height:32px'>已选{selections.value.length}条数据</div>
+          <div class="mt-15px float-left" style='height:32px;line-height:32px'>{t('ts.已选')}{selections.value.length}{t('ts.条数据')}</div>
         ):undefined}
         {unref(getProps).pagination ? (
           // update by 芋艿：保持和 Pagination 组件一致
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 5a40b7e19..f72b8b053 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1349,7 +1349,39 @@ export default {
     请选择日: 'Please select day',
     回调函明细: 'Details of callback letter',
     履历表: 'Resume',
-    更多: 'more'
+    更多: 'more',
+    要求到货时间: 'Request arrival time',
+    发货联系人姓名: 'Shipping contact name',
+    发货联系人电话: 'Shipping contact number',
+    申请发货数量: 'Application for shipment quantity',
+    发货批次: 'Batch of shipment',
+    在途数量: 'Number in transit',
+    空运: 'Air transport',
+    海运: 'Sea freight',
+    陆运: 'Land transport',
+    '请填写要货计划单号！':'Please fill in the requisition plan number!',
+    箱规格: 'Specification of case',
+    箱规格数量: 'Specifications and quantity of boxes',
+    托规格: 'Gauge of support',
+    托规格数量: 'Specification and quantity',
+    '重新生成标签后必须撕毁原标签，打印并粘贴新标签，如标签错误将拒绝收货！！': 'After regenerating the label, the original label must be torn, print and paste the new label, if the label is wrong, the goods will be rejected!!',
+    移出: 'Move out',
+    标签: 'Labels',
+    箱行号: 'Packing line number',
+    添加箱: 'Add box',
+    托行号: 'Trustee number',
+    箱个数: 'Number of bins',
+    添加托: 'Add a tray',
+    托个数: 'Number of brackets',
+    托数量: 'Quantity of consignment',
+    箱数量: 'Number of boxes',
+    已选: 'selected ',
+    条数据: ' data',
+    是否已读: 'Yes or no read',
+    采购订单类型: 'Purchase Order Type',
+    // 数量: '',
+    // 数量: '',
+    // 数量: '',
 
   },
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index fb1be92aa..c04c5a13e 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1347,7 +1347,36 @@ export default {
     请选择日: '请选择日',
     回调函明细: '回调函明细',
     履历表: '履历表',
-    更多: '更多'
+    更多: '更多',
+    要求到货时间: '要求到货时间',
+    发货联系人姓名: '发货联系人姓名',
+    发货联系人电话: '发货联系人电话',
+    申请发货数量: '申请发货数量',
+    发货批次: '发货批次',
+    在途数量: '在途数量',
+    空运: '空运',
+    海运: '海运',
+    陆运: '陆运',
+    '请填写要货计划单号！':'请填写要货计划单号！',
+    箱规格: '箱规格',
+    箱规格数量: '箱规格数量',
+    托规格: '托规格',
+    托规格数量: '托规格数量',
+    '重新生成标签后必须撕毁原标签，打印并粘贴新标签，如标签错误将拒绝收货！！': '重新生成标签后必须撕毁原标签，打印并粘贴新标签，如标签错误将拒绝收货！！',
+    移出: '移出',
+    标签: '标签',
+    箱行号: '箱行号',
+    添加箱: '添加箱',
+    托行号: '托行号',
+    箱个数: '箱个数',
+    添加托: '添加托',
+    托个数: '托个数',
+    托数量: '托数量',
+    箱数量: '箱数量',
+    已选: '已选 ',
+    条数据: ' 条数据',
+    是否已读: '是否已读d',
+    采购订单类型: '采购订单类型',
 
   },
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index 68090068d..995b51cce 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -497,11 +497,11 @@ const buttonTableClick = async (val, row) => {
     tableObject.loading = true
     ElMessageBox.confirm(
       `<div>
-    <strong style="color:red;font-size:18px">重新生成标签后必须撕毁原标签，打印并粘贴新标签，如标签错误将拒绝收货！！</strong>
+    <strong style="color:red;font-size:18px">${t(`ts.${'重新生成标签后必须撕毁原标签，打印并粘贴新标签，如标签错误将拒绝收货！！'}`)}</strong>
     <br>
-    <span>重新生成标签会删除上次生成的标签，是否确认继续？</span>
+    <span>${t(`ts.${'重新生成标签会删除上次生成的标签，是否确认继续？'}`)}</span>
     </div>`,
-      '提示',
+      t('ts.提示'),
       {
         confirmButtonText: t('ts.确 认'),
         cancelButtonText: t('ts.取 消'),
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 1333b3e35..bb821346e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -665,12 +665,12 @@ const buttonTableClick = async (val, row) => {
     tableObject.loading = true
     ElMessageBox.confirm(
       `<div>
-    <strong style="color:red;font-size:18px">重新生成标签后必须撕毁原标签，打印并粘贴新标签，如标签错误将拒绝收货！！</strong>
+    <strong style="color:red;font-size:18px">${t(`ts.${'重新生成标签后必须撕毁原标签，打印并粘贴新标签，如标签错误将拒绝收货！！'}`)}</strong>
     <br>
-    <span>重新生成标签会删除上次生成的标签，是否确认继续？</span>
+    <span>${t(`ts.${'重新生成标签会删除上次生成的标签，是否确认继续？'}`)}</span>
     </div>`,
-      '提示',
-      {
+      t('ts.提示'),
+    {
         confirmButtonText: t('ts.确 认'),
         cancelButtonText: t('ts.取 消'),
         dangerouslyUseHTMLString: true
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index 256066df1..ed0e39560 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="dialogTableVisible" title="标签" width="1100">
+  <el-dialog v-model="dialogTableVisible" :title="t('ts.标签')" width="1100">
     <div  v-loading="isLoading">
 <el-table
       :data="showTableData()"
@@ -31,12 +31,12 @@
                 <template #default="scope1">
                   <div style="margin-left: 150px; margin-top: -8px; margin-bottom: -8px">
                     <el-table :data="scope1.row.children" border style="width: 300px" row-key="id">
-                      <el-table-column label="箱行号" width="100" prop="xPoNumber" align="center">
+                      <el-table-column :label="t('ts.箱行号')" width="100" prop="xPoNumber" align="center">
                         <template #default="scope2">
                           {{ scope2.$index + 1 }}
                         </template>
                       </el-table-column>
-                      <el-table-column label="数量" width="100" prop="qtyTwo" align="center">
+                      <el-table-column :label="t('ts.数量')" width="100" prop="qtyTwo" align="center">
                         <template #default="scope2">
                           <el-input
                             v-model="scope2.row.qtyTwo"
@@ -44,7 +44,7 @@
                           />
                         </template>
                       </el-table-column>
-                      <el-table-column label="添加箱" width="100" prop="add" align="center">
+                      <el-table-column :label="t('ts.添加箱')" width="100" prop="add" align="center">
                         <template #header>
                           <el-button
                             type="primary"
@@ -68,7 +68,7 @@
                                 1
                               )
                             "
-                            >移出</el-button
+                            >{{ t('ts.移出') }}</el-button
                           >
                         </template>
                       </el-table-column>
@@ -76,12 +76,12 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column label="托行号" width="100" prop="tPoNumber" align="center">
+              <el-table-column :label="t('ts.托行号')" width="100" prop="tPoNumber" align="center">
                 <template #default="scope">
                   {{ scope.$index + 1 }}
                 </template>
               </el-table-column>
-              <el-table-column label="箱个数" width="100" prop="xNumber" align="center">
+              <el-table-column :label="t('ts.箱个数')" width="100" prop="xNumber" align="center">
                 <template #default="scope1">
                   <el-input
                     v-model="scope1.row.xNumber"
@@ -90,20 +90,20 @@
                   />
                 </template>
               </el-table-column>
-              <el-table-column label="数量" width="100" prop="qtyOne" align="center" />
-              <el-table-column label="操作" width="100" prop="action" align="center">
+              <el-table-column :label="t('ts.数量')" width="100" prop="qtyOne" align="center" />
+              <el-table-column :label="t('ts.操作')" width="100" prop="action" align="center">
                 <template #default="scope1">
                   <el-button
                     type="warning"
                     link
                     @click="removeT(scope.row, scope.$index, scope1.row, scope1.$index)"
-                    >移出</el-button
+                    >{{ t('ts.移出') }}</el-button
                   >
                 </template>
               </el-table-column>
-              <el-table-column label="添加托" width="100" prop="add" align="center">
+              <el-table-column :label="t('ts.添加托')" width="100" prop="add" align="center">
                 <template #header>
-                  <el-button type="primary" link @click="addT(scope.row)">添加托</el-button>
+                  <el-button type="primary" link @click="addT(scope.row)">{{t('ts.添加托')}}</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -114,12 +114,12 @@
           >
             <div v-for="(item, index) in scope.row.packageList" :key="index">
               <el-table :data="item.children" border style="width: 300px" row-key="id">
-                <el-table-column label="箱行号" width="100" prop="xPoNumber" align="center">
+                <el-table-column :label="t('ts.箱行号')" width="100" prop="xPoNumber" align="center">
                   <template #default="scope1">
                     {{ scope1.$index + 1 }}
                   </template>
                 </el-table-column>
-                <el-table-column label="数量" width="100" prop="qtyOne" align="center">
+                <el-table-column :label="t('ts.数量')" width="100" prop="qtyOne" align="center">
                   <template #default="scope1">
                     <el-input
                       v-model="scope1.row.qtyTwo"
@@ -127,13 +127,13 @@
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="添加箱" width="100" prop="add" align="center">
+                <el-table-column :label="t('ts.添加箱')" width="100" prop="add" align="center">
                   <template #header>
                     <el-button
                       type="primary"
                       link
                       @click="addX(scope.row, scope.$index, item, index)"
-                      >添加箱</el-button
+                      >{{t('ts.添加箱')}}</el-button
                     >
                   </template>
                   <template #default="scope1">
@@ -143,7 +143,7 @@
                       @click="
                         removeX(scope.row, scope.$index, item, index, scope1.row, scope1.$index)
                       "
-                      >移出</el-button
+                      >{{ t('ts.移出') }}</el-button
                     >
                   </template>
                 </el-table-column>
@@ -152,17 +152,17 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="物料代码" width="150" prop="itemCode" align="center" />
-      <el-table-column label="批次" width="150" prop="batch" align="center" />
-      <el-table-column label="数量" width="100" prop="qty" align="center" />
-      <el-table-column label="计量单位" width="100" prop="uom" align="center">
+      <el-table-column :label="t('ts.物料代码')" width="150" prop="itemCode" align="center" />
+      <el-table-column :label="t('ts.批次')" width="150" prop="batch" align="center" />
+      <el-table-column :label="t('ts.数量')" width="100" prop="qty" align="center" />
+      <el-table-column :label="t('ts.计量单位')" width="100" prop="uom" align="center">
         <template #default="scope"> {{ uomLabel(scope.row) }}</template>
       </el-table-column>
-      <el-table-column label="托个数" width="100" prop="allTuoQty" align="center" />
-      <el-table-column label="托规格" width="100" prop="secondPackUnit" align="center" />
-      <el-table-column label="托数量" width="100" prop="secondPackQty" align="center" />
-      <el-table-column label="箱规格" width="100" prop="packUnit" align="center" />
-      <el-table-column label="箱数量" width="100" prop="packQty" align="center" />
+      <el-table-column :label="t('ts.托个数')" width="100" prop="allTuoQty" align="center" />
+      <el-table-column :label="t('ts.托规格')" width="100" prop="secondPackUnit" align="center" />
+      <el-table-column :label="t('ts.托数量')" width="100" prop="secondPackQty" align="center" />
+      <el-table-column :label="t('ts.托数量')" width="100" prop="packUnit" align="center" />
+      <el-table-column :label="t('ts.托数量')" width="100" prop="packQty" align="center" />
     </el-table>
     <el-pagination
       v-show="tableData.length > 10"
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 6f9d5991a..d08f30be8 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1047,7 +1047,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
           {
             key: 'number',
             value: 'ppNumber',
-            message: '请填写要货计划单号！',
+            message: t(`ts.${'请填写要货计划单号！'}`),
             isMainValue: true
           },
           {
@@ -1081,7 +1081,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         {
           key: 'number',
           value: 'ppNumber',
-          message: '请填写要货计划单号！',
+          message: t(`ts.${'请填写要货计划单号！'}`),
           isMainValue: true
         },
         {
@@ -1468,7 +1468,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
           {
             key: 'number',
             value: 'ppNumber',
-            message: '请填写要货计划单号！',
+            message: t(`ts.${'请填写要货计划单号！'}`),
             isMainValue: true
           },
           {
@@ -1492,7 +1492,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
         {
           key: 'number',
           value: 'ppNumber',
-          message: '请填写要货计划单号！',
+          message: t(`ts.${'请填写要货计划单号！'}`),
           isMainValue: true
         },
         {