From 3e6c1616704d0ffd156fc93d17110808bd65a872 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Mon, 20 Dec 2021 11:51:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/lang/en.ts                              | 2 +-
 src/pages/raw/commission/entrant/index.vue       | 2 ++
 src/pages/raw/commission/goOut/index.vue         | 2 ++
 src/pages/raw/handover/returning/Time-filter.vue | 2 ++
 src/pages/raw/handover/returning/config.ts       | 6 +++---
 src/pages/raw/ingoods/dnReceipt/ImportDN.vue     | 4 ++--
 src/pages/raw/ingoods/dnReceipt/dnReceiving.vue  | 4 ++--
 src/pages/raw/warehouse/index.vue                | 4 ++--
 8 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 9c748c3..9c49e84 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -212,7 +212,7 @@ export default {
     RowCollectionAndBorrowing: "RAW cost center",
 
     // 原材料盘点
-    InventoryOrderNo: "单号",
+    InventoryOrderNo: "Order No",
     InventoryMaterielNo: "MAT code",
     InventoryMateriel: "MAT name",
     InventoryTotalNumber: "Total",
diff --git a/src/pages/raw/commission/entrant/index.vue b/src/pages/raw/commission/entrant/index.vue
index a36c8e8..3efc057 100644
--- a/src/pages/raw/commission/entrant/index.vue
+++ b/src/pages/raw/commission/entrant/index.vue
@@ -71,6 +71,7 @@
             $t("message.CommissionedCumulativeData")
           }}</view>
           <u-input
+           :placeholder="$t('message.po_PleaseInput')"
             v-model="every.receiptAmount"
             :type="type"
             :border="border"
@@ -99,6 +100,7 @@
             $t("message.CommissionedThisNumber")
           }}</view>
           <u-input
+           :placeholder="$t('message.po_PleaseInput')"
             v-model="nowAmount"
             :type="type"
             :border="border"
diff --git a/src/pages/raw/commission/goOut/index.vue b/src/pages/raw/commission/goOut/index.vue
index b447e24..8841edf 100644
--- a/src/pages/raw/commission/goOut/index.vue
+++ b/src/pages/raw/commission/goOut/index.vue
@@ -71,6 +71,7 @@
             $t("message.CommissionedCumulativeData")
           }}</view>
           <u-input
+          :placeholder="$t('message.po_PleaseInput')"
             v-model="every.outAmount"
             :type="type"
             :border="border"
@@ -99,6 +100,7 @@
             $t("message.CommissionedThisNumber")
           }}</view>
           <u-input
+          :placeholder="$t('message.po_PleaseInput')"
             v-model="nowAmount"
             :type="type"
             :border="border"
diff --git a/src/pages/raw/handover/returning/Time-filter.vue b/src/pages/raw/handover/returning/Time-filter.vue
index 4ffec57..e8e48e6 100644
--- a/src/pages/raw/handover/returning/Time-filter.vue
+++ b/src/pages/raw/handover/returning/Time-filter.vue
@@ -28,6 +28,7 @@
         $t("message.workArea_Selelct")
       }}</u-button>
     </view>
+    <!-- 结束时间 -->
     <view style="display: flex; margin-top: 20rpx">
       <u-field
         style="background: white; border-radius: 10rpx"
@@ -46,6 +47,7 @@
         $t("message.workArea_Selelct")
       }}</u-button>
     </view>
+    <!-- 表格 -->
     <view class="table-wrapper" style="margin-top: 10rpx">
       <wyb-table
         class="table"
diff --git a/src/pages/raw/handover/returning/config.ts b/src/pages/raw/handover/returning/config.ts
index 9021b43..8e0f831 100644
--- a/src/pages/raw/handover/returning/config.ts
+++ b/src/pages/raw/handover/returning/config.ts
@@ -1,11 +1,11 @@
 /**
  * 看单明细表格列
  */
-import vm from "@/main";
+import vm from '@/main';
 export const headers = [
   {
-    label: vm.$t("message.InventoryOrderNo"),
-    key: "label",
+    label: vm.$t('message.InventoryOrderNo'),
+    key: 'label',
     width: 650,
   },
 ];
diff --git a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
index 33df63f..c18f2d9 100644
--- a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
+++ b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
@@ -45,7 +45,7 @@
         </view>
         <view class="number-right">
           <view class="number-right-title">{{ $t('message.Cumulative') }}</view>
-          <u-input v-model="every.receiptAmount" :type="type" :border="border" class="input" disabled />
+          <u-input v-model="every.receiptAmount" :placeholder="$t('message.po_PleaseInput')" :type="type" :border="border" class="input" disabled />
         </view>
       </view>
       <!-- 库位 -->
@@ -56,7 +56,7 @@
         </view>
         <view class="library-right">
           <view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}</view>
-          <u-input v-model="receiptAmount" :type="type" :border="border" class="input" />
+          <u-input v-model="receiptAmount" :placeholder="$t('message.po_PleaseInput')" :type="type" :border="border" class="input" />
         </view>
       </view>
       <!-- 添加 -->
diff --git a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
index c5c792a..b4975ac 100644
--- a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
+++ b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
@@ -45,7 +45,7 @@
         </view>
         <view class="number-right">
           <view class="number-right-title">{{ $t('message.Cumulative') }}</view>
-          <u-input v-model="every.receiptAmount" :type="type" :border="border" class="input" disabled />
+          <u-input v-model="every.receiptAmount" :placeholder="$t('message.po_PleaseInput')" :type="type" :border="border" class="input" disabled />
         </view>
       </view>
       <!-- 库位 -->
@@ -56,7 +56,7 @@
         </view>
         <view class="library-right">
           <view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}</view>
-          <u-input v-model="receiptAmount" :type="type" :border="border" class="input" />
+          <u-input v-model="receiptAmount" :placeholder="$t('message.po_PleaseInput')" :type="type" :border="border" class="input" />
         </view>
       </view>
       <!-- 添加 -->
diff --git a/src/pages/raw/warehouse/index.vue b/src/pages/raw/warehouse/index.vue
index cb066b9..ea7c49f 100644
--- a/src/pages/raw/warehouse/index.vue
+++ b/src/pages/raw/warehouse/index.vue
@@ -27,12 +27,12 @@
             >
           </u-button>
         </u-col>
-        <u-col :span="12">
+        <!-- <u-col :span="12">
           <u-button @click="toPage(page.raw.warehouse.rowInventory.index)">
             <u-icon size="80" name="/static/icons/icon-14.png"></u-icon>
             <text class="name">4.{{ '原材料盘点' }}</text>
           </u-button>
-        </u-col>
+        </u-col> -->
         <!-- 
         <u-col :span="12">
           <u-button @click="toPage(page.raw.warehouse.rowScrap.index)">