From 87699282a31bfcbe6578dccfb6b3d81f2e344f9d Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Tue, 7 Dec 2021 17:43:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=20=E5=A4=9A=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/lang/cn.ts                              |  6 ++++++
 src/i18n/lang/en.ts                              |  6 ++++++
 src/pages/raw/handover/picking/ByOrder.vue       | 10 +++++-----
 src/pages/raw/handover/picking/BySummary.vue     |  8 ++++----
 src/pages/raw/handover/picking/index.vue         |  2 +-
 src/pages/raw/handover/returning/Time-filter.vue | 16 ++++++++++------
 src/pages/raw/handover/returning/index.vue       |  2 +-
 7 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index 6305fc8..a55e812 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -237,6 +237,12 @@ export default {
     Commission_tips3: "请输入大于0的数量",
     Commission_tips4: "不能大于需求数量",
     Commission_tips5: "请确保所选物料已分配库位",
+    Commission_tips6: "请先选择一个物料",
+    Commission_tips7: "请选择正确的库位",
+    endtime: "请选择结束时间",
+    end: "结束时间",
+    starttime: "请选择开始时间",
+    start: "开始时间",
     _tips5: "请选择相同库位",
     _tips6: "请先输入要查询的单号",
     //移库
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 8d1437a..0690b96 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -239,6 +239,12 @@ export default {
     Commission_tips4: "Cannot be greater than the required quantity",
     Commission_tips5:
       "Please ensure that the selected material has been assigned a location",
+    Commission_tips6: "Please select a material first",
+    Commission_tips7: "Please select the correct location",
+    endtime: "Please select an end time",
+    end: "End time",
+    starttime: "Please select an start time",
+    start: "start time",
     _tips5: "Please select the same location",
     _tips6: "Please enter the order number to query first",
 
diff --git a/src/pages/raw/handover/picking/ByOrder.vue b/src/pages/raw/handover/picking/ByOrder.vue
index aeec991..f0a0f05 100644
--- a/src/pages/raw/handover/picking/ByOrder.vue
+++ b/src/pages/raw/handover/picking/ByOrder.vue
@@ -201,21 +201,21 @@ export default class RawReceiptDetail extends BasePage {
     if (this.qty == "" || this.wlCode == "") {
       uni.showToast({
         icon: "none",
-        title: "请输入正确的库位和数量" as any,
+        title: this.$t("message.Commission_tips2") as any,
       });
       return;
     }
     if (parseFloat(this.qty) <= 0) {
       uni.showToast({
         icon: "none",
-        title: "请输入大于0的数量" as any,
+        title: this.$t("message.Commission_tips3") as any,
       });
       return;
     }
     if (this.some == {}) {
       uni.showToast({
         icon: "none",
-        title: "请先选择一个物料" as any,
+        title: this.$t("message.Commission_tips6") as any,
       });
       return;
     }
@@ -225,7 +225,7 @@ export default class RawReceiptDetail extends BasePage {
         if (this.wlCode.sendSpot != item.Code) {
           uni.showToast({
             icon: "none",
-            title: "请选择正确的库位" as any,
+            title: this.$t("message.Commission_tips7") as any,
           });
           return (isTrue = false);
         }
@@ -326,7 +326,7 @@ export default class RawReceiptDetail extends BasePage {
     if (this.some == {} || this.some.prdOrder == null) {
       uni.showToast({
         icon: "none",
-        title: "请先选择一条物料" as any,
+        title: this.$t("message.Commission_tips6") as any,
       });
       return;
     }
diff --git a/src/pages/raw/handover/picking/BySummary.vue b/src/pages/raw/handover/picking/BySummary.vue
index 63dceb2..d58694a 100644
--- a/src/pages/raw/handover/picking/BySummary.vue
+++ b/src/pages/raw/handover/picking/BySummary.vue
@@ -204,21 +204,21 @@ export default class RawReceiptDetail extends BasePage {
     if (this.qty == "" || this.wlCode == "") {
       uni.showToast({
         icon: "none",
-        title: "请输入正确的库位和数量" as any,
+        title: this.$t("message.Commission_tips2") as any,
       });
       return;
     }
     if (parseFloat(this.qty) <= 0) {
       uni.showToast({
         icon: "none",
-        title: "请输入大于0的数量" as any,
+        title: this.$t("message.Commission_tips3") as any,
       });
       return;
     }
     if (this.some == {}) {
       uni.showToast({
         icon: "none",
-        title: "请先选择一个物料" as any,
+        title: this.$t("message.Commission_tips6") as any,
       });
       return;
     }
@@ -228,7 +228,7 @@ export default class RawReceiptDetail extends BasePage {
         if (this.wlCode.sendSpot != item.Code) {
           uni.showToast({
             icon: "none",
-            title: "请选择正确的库位" as any,
+            title: this.$t("message.Commission_tips7") as any,
           });
           return (isTrue = false);
         }
diff --git a/src/pages/raw/handover/picking/index.vue b/src/pages/raw/handover/picking/index.vue
index ece6da5..73215e4 100644
--- a/src/pages/raw/handover/picking/index.vue
+++ b/src/pages/raw/handover/picking/index.vue
@@ -248,7 +248,7 @@ export default class pickingDom extends BasePage {
   }
 
   /**
-   * 定单查询
+   * 订单查询
    */
   onQuery() {
     this.$form.validate(async (valid: boolean) => {
diff --git a/src/pages/raw/handover/returning/Time-filter.vue b/src/pages/raw/handover/returning/Time-filter.vue
index 87c710d..4ffec57 100644
--- a/src/pages/raw/handover/returning/Time-filter.vue
+++ b/src/pages/raw/handover/returning/Time-filter.vue
@@ -14,8 +14,8 @@
       <u-field
         style="background: white; border-radius: 10rpx"
         v-model="startMobile"
-        placeholder="请选择开始时间"
-        label="开始时间:"
+        :placeholder="$t('message.starttime')"
+        :label="$t('message.start')"
       >
       </u-field>
       <u-picker
@@ -24,14 +24,16 @@
         mode="time"
         @confirm="startConfirm"
       ></u-picker>
-      <u-button @click="startShow = true" type="primary">选择</u-button>
+      <u-button @click="startShow = true" type="primary">{{
+        $t("message.workArea_Selelct")
+      }}</u-button>
     </view>
     <view style="display: flex; margin-top: 20rpx">
       <u-field
         style="background: white; border-radius: 10rpx"
         v-model="endMobile"
-        placeholder="请选择结束时间"
-        label="结束时间:"
+        :placeholder="$t('message.endtime')"
+        :label="$t('message.end')"
       >
       </u-field>
       <u-picker
@@ -40,7 +42,9 @@
         mode="time"
         @confirm="endConfirm"
       ></u-picker>
-      <u-button @click="endShow = true" type="primary">选择</u-button>
+      <u-button @click="endShow = true" type="primary">{{
+        $t("message.workArea_Selelct")
+      }}</u-button>
     </view>
     <view class="table-wrapper" style="margin-top: 10rpx">
       <wyb-table
diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue
index a9744a5..3cb3524 100644
--- a/src/pages/raw/handover/returning/index.vue
+++ b/src/pages/raw/handover/returning/index.vue
@@ -39,7 +39,7 @@
           style="margin-left: 10rpx"
           type="primary"
           @click="screen"
-          >筛选</u-button
+          >{{ $t("message.screen") }}</u-button
         >
         <!-- <jPicker
           sureColor="#ff0000"