From 61622fa309313f40cf2c0a14fd8bcde3a4f775ad Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Sat, 22 Jan 2022 09:19:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/raw/handover/feeding/Location.vue   |  1 +
 .../raw/ingoods/dnReceipt/dnReceiving.vue     | 82 +++++++++----------
 2 files changed, 38 insertions(+), 45 deletions(-)

diff --git a/src/pages/raw/handover/feeding/Location.vue b/src/pages/raw/handover/feeding/Location.vue
index dc6ff20..93ce7d4 100644
--- a/src/pages/raw/handover/feeding/Location.vue
+++ b/src/pages/raw/handover/feeding/Location.vue
@@ -131,6 +131,7 @@ export default class RawReceiptDetail extends BasePage {
   };
   form2 = {
     operatorPass: '', // 接收人
+    rfPwd:''
   };
   /**
    * 表单校验
diff --git a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
index 7be13e8..917965e 100644
--- a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
+++ b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
@@ -44,11 +44,12 @@
       <view class="number">
         <view class="number-left">
           <view class="number-left-title">{{ $t('message.DemandQuantity') }}</view>
-          <u-input v-model="every.requestAmount" placeholder=" " :type="type" :border="border" class="input" :disabled="true" />
+          <u-input v-model="every.requestAmount" placeholder=" " :type="type" :border="border" class="input" disabled />
         </view>
         <view class="number-right">
           <view class="number-right-title">{{ $t('message.Cumulative') }}</view>
-          <u-input v-model="every.receiptAmount" placeholder="" :type="type" :border="border" class="input" :disabled="true" style="background-color: #f4f5f5" />
+          <u-input v-model="every.receiptAmount" :placeholder="$t('message.po_PleaseInput')" :type="type" :border="border" class="input" disabled />
+          <!-- <u-input v-model="allNum" :placeholder="$t('message.po_PleaseInput')" :type="type" :border="border" class="input" disabled /> -->
         </view>
       </view>
       <!-- 库位 -->
@@ -59,7 +60,7 @@
         </view>
         <view class="library-right">
           <view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}</view>
-          <u-input v-model="receiptAmount" :placeholder="$t('message.po_PleaseInput')" type="number" :border="border" class="input" />
+          <u-input v-model="receiptAmount" :placeholder="$t('message.po_PleaseInput')" :type="type" :border="border" class="input" />
         </view>
       </view>
       <!-- 添加 -->
@@ -129,15 +130,6 @@ export default class dnReceiptDom extends BasePage {
   poNo: any = null;
   // 需求数量
   requestAmount: number = null;
-  //receiptAmount = (this.receiptAmount.match(/\d+(.\d{0,2})?/) || [''])[0];
-  async onReady() {
-    // this.model.DNReceivingList = [];
-    this.resetForm();
-    //this.initLocation();
-  }
-  input() {
-    this.receiptAmount = (this.receiptAmount.match(/\d+(.\d{0,2})?/) || [''])[0];
-  }
   // 页面初始化
   // 页面需要清空仓库，因此需要复用该方法
   async initLocation(condition): Promise<LocationDetail[]> {
@@ -561,39 +553,39 @@ export default class dnReceiptDom extends BasePage {
         }
       }
     }
-    // .library {
-    //   width: 100%;
-    //   height: 100rpx;
-    //   display: flex;
-    //   .library-left {
-    //     width: 50%;
-    //     height: 100%;
-    //     display: flex;
-    //     view {
-    //       width: 100rpx;
-    //       line-height: 100rpx;
-    //     }
-    //     .search {
-    //       padding-left: 30px;
-    //     }
-    //   }
-    //   .library-right {
-    //     width: 50%;
-    //     height: 100%;
-    //     display: flex;
-    //     .library-right-title {
-    //       width: 120rpx;
-    //       height: 100%;
-    //       line-height: 100rpx;
-    //     }
-    //     .input {
-    //       width: 200rpx;
-    //       height: 70rpx;
-    //       margin-top: 15rpx;
-    //       margin-left: 15rpx;
-    //     }
-    //   }
-    // }
+    .library {
+      width: 100%;
+      height: 100rpx;
+      display: flex;
+      .library-left {
+        width: 50%;
+        height: 100%;
+        display: flex;
+        view {
+          width: 100rpx;
+          line-height: 100rpx;
+        }
+        .search {
+          padding-left: 20px;
+        }
+      }
+      .library-right {
+        width: 50%;
+        height: 100%;
+        display: flex;
+        .library-right-title {
+          width: 120rpx;
+          height: 100%;
+          padding-left: 4px;
+          line-height: 100rpx;
+        }
+        .input {
+          width: 200rpx;
+          height: 70rpx;
+          margin-top: 15rpx;
+        }
+      }
+    }
     .add {
       width: 100%;
       height: 100rpx;