From c024de9c26c184062a5ddc9fdcb04d99d7353c91 Mon Sep 17 00:00:00 2001
From: yujw <yujianwei@kehaida.com>
Date: Wed, 26 Jan 2022 14:36:27 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/raw/handover/returning/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue
index de28ee1..28c0cd0 100644
--- a/src/pages/raw/handover/returning/index.vue
+++ b/src/pages/raw/handover/returning/index.vue
@@ -120,7 +120,7 @@ export default class returningDom extends BasePage {
     materialCode: null, // 物料类型code
     wlName: '', // 物料类型name
     wlCode: '',
-    totalBackAmount:'1',
+    totalBackAmount: '0',
   };
   prdOrder: any = [];
   wlCode: any = '';
@@ -167,7 +167,7 @@ export default class returningDom extends BasePage {
       this.form.prdOrder = this.data.label;
       this.form.wlName = this.data.value;
       this.form.sendSpot = this.data.sendSpot;
-      this.form.amount = this.data.amount;
+      // this.form.amount = this.data.amount;
     }
 
     if (this.form.prdOrder != null) {
@@ -204,9 +204,9 @@ export default class returningDom extends BasePage {
     this.form.wlName = v[0].label;
     this.model.materielList.forEach((item: any) => {
       if (this.form.materialCode == item.label) {
-        this.form.amount = item.amount;
+        // this.form.amount = item.amount;
         this.form.sendSpot = item.sendSpot;
-        this.form.totalBackAmount = item.totalBackAmount
+        this.form.totalBackAmount = item.totalBackAmount;
         // this.form.wkposCode = item.wkposCode;
       }
     });

From e5ee435eeb798a21131862b3c2666e606a3ac5c3 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Wed, 26 Jan 2022 14:41:20 +0800
Subject: [PATCH 2/3] =?UTF-8?q?po=E9=80=80=E8=B4=A7=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/lang/en.ts                              | 8 ++++----
 src/pages/raw/handover/feeding/Location.vue      | 4 ++--
 src/pages/raw/ingoods/dnReturnGoods/Location.vue | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 9922c36..5cb29e8 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -69,14 +69,14 @@ export default {
     //po收货
     po_ReceivingGoods: 'PO receive',
     po_ReturnGoods: 'DN return',
-    returned: 'Quantity to be returned',
-    returneds: 'Quantity to be returned',
+    returned: 'Return Quantity',
+    returneds: 'Return Quantity',
     quantity: 'Cumulative return quantity',
-    materials:'Please return all materials',
+    materials: 'Please return all materials',
     po_OddNumbers: 'PO No',
     po_Supplier: 'Supplier',
     po_OrderType: 'Order type',
-    po_Location: 'Loc',
+    po_Location: 'Inventory',
     po_PleaseScan: 'Please scan PO',
     po_PleaseScanMATcode: 'Please scan MAT barcode',
     PleaseScan: 'Please scan',
diff --git a/src/pages/raw/handover/feeding/Location.vue b/src/pages/raw/handover/feeding/Location.vue
index 431a9af..b8f8f0f 100644
--- a/src/pages/raw/handover/feeding/Location.vue
+++ b/src/pages/raw/handover/feeding/Location.vue
@@ -479,7 +479,7 @@ export default class RawReceiptDetail extends BasePage {
         height: 100%;
         display: flex;
         view {
-          width: 140rpx;
+          width: 145rpx;
           line-height: 100rpx;
         }
         .search{
@@ -496,7 +496,7 @@ export default class RawReceiptDetail extends BasePage {
         height: 100%;
         display: flex;
         .material-right-title {
-          width: 140rpx;
+          width: 145rpx;
           height: 100%;
           line-height: 100rpx;
         }
diff --git a/src/pages/raw/ingoods/dnReturnGoods/Location.vue b/src/pages/raw/ingoods/dnReturnGoods/Location.vue
index 2d6bf7b..2c739bd 100644
--- a/src/pages/raw/ingoods/dnReturnGoods/Location.vue
+++ b/src/pages/raw/ingoods/dnReturnGoods/Location.vue
@@ -35,7 +35,7 @@
       <!-- 应退数量 -->
       <view class="material">
         <view class="material-right">
-          <view class="material-right-title">{{ $t('message.returneds') }}:</view>
+          <view class="material-right-title" style="width: 260rpx">{{ $t('message.returneds') }}:</view>
           <view class="material-right-code" style="overflow: hidden">{{ some.poAmount }}</view>
         </view>
       </view>
@@ -391,7 +391,7 @@ export default class RawReceiptDetail extends BasePage {
         height: 100%;
         display: flex;
         view {
-          width: 100rpx;
+          width: 145rpx;
           line-height: 100rpx;
         }
         .search{
@@ -408,7 +408,7 @@ export default class RawReceiptDetail extends BasePage {
         height: 100%;
         display: flex;
         .material-right-title {
-          width: 120rpx;
+          width: 160rpx;
           height: 100%;
           line-height: 100rpx;
         }

From 6c91fe3b237aefc70f5bec3c9b1dac027146c07c Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Wed, 26 Jan 2022 15:21:22 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/lang/en.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 785fccb..961fd77 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -69,8 +69,8 @@ export default {
     //po收货
     po_ReceivingGoods: 'PO receive',
     po_ReturnGoods: 'DN return',
-    returned: 'Return Quantity',
-    returneds: 'Return Quantity',
+    returned: 'Return Qty',
+    returneds: 'Return Qty',
     Closed: 'Closed',
     quantity: 'Cumulative return quantity',
     materials: 'Please return all materials',