From 7884e6d9a054f410901d52e93da17445e776b158 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Sat, 22 Jan 2022 18:14:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A7=94=E5=A4=96=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=8F=B7=E5=8E=BB=E9=99=A4=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/raw/commission/entrant/index.vue | 6 +++---
 src/pages/raw/commission/goOut/index.vue   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/raw/commission/entrant/index.vue b/src/pages/raw/commission/entrant/index.vue
index c80a24d..2e0c403 100644
--- a/src/pages/raw/commission/entrant/index.vue
+++ b/src/pages/raw/commission/entrant/index.vue
@@ -3,7 +3,7 @@
     <!-- 头部 -->
     <view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
       <view class="left">
-        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
+        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
       </view>
       <view class="title">{{ $t('message.CommissionEntrant') }}</view>
       <view class="right"></view>
@@ -13,7 +13,7 @@
       <view class="single">
         <view class="single-left">
           <view>{{ $t('message.CommissionedSingleNumber') }}</view>
-          <u-search :placeholder="$t('message.InventoryPleaseScan')" v-model="form.documentNo" @search="query" :show-action="false"></u-search>
+          <u-search :placeholder="$t('message.InventoryPleaseScan')" v-model.trim="form.documentNo" @search="query" :show-action="false"></u-search>
         </view>
         <view class="single-right">
           <u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button>
@@ -84,7 +84,7 @@
           <u-button type="primary" @click="onSubmit">{{ $t('message.product_Upload') }}</u-button>
         </u-col>
         <u-col :span="4">
-          <u-button type="error" @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button>
+          <u-button type="error" @click="uni.navigateBack({})">{{ $t('message.po_Return') }}</u-button>
         </u-col>
       </u-row>
     </view>
diff --git a/src/pages/raw/commission/goOut/index.vue b/src/pages/raw/commission/goOut/index.vue
index 3e99fcc..2eeaad2 100644
--- a/src/pages/raw/commission/goOut/index.vue
+++ b/src/pages/raw/commission/goOut/index.vue
@@ -13,7 +13,7 @@
       <view class="single">
         <view class="single-left">
           <view>{{ $t('message.CommissionedSingleNumber') }}</view>
-          <u-search :placeholder="$t('message.InventoryPleaseScan')" v-model="form.documentNo" @search="query" :show-action="false"></u-search>
+          <u-search :placeholder="$t('message.InventoryPleaseScan')" v-model.trim="form.documentNo" @search="query" :show-action="false"></u-search>
         </view>
         <view class="single-right">
           <u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button>
@@ -82,7 +82,7 @@ import { Component, Ref } from 'vue-property-decorator';
 import { BasePage } from '@/components/base/page';
 import jPicker from '@/components/J-Picker/jPicker.vue';
 import { session } from '@/store/modules/session';
-import {  detailHeader } from './config';
+import { detailHeader } from './config';
 import model from './model';
 @Component({
   components: {

From 620ee65dc2327aa63f8a8ba6ecde0267f5ed6119 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Sun, 23 Jan 2022 11:49:07 +0800
Subject: [PATCH 2/2] =?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/product/warehouse/LocationInventory/index.vue | 2 +-
 src/pages/product/warehouse/MaterialInventory/index.vue | 2 +-
 src/pages/raw/handover/aggregating/index.vue            | 2 +-
 src/pages/raw/handover/virtual/index.vue                | 1 -
 src/pages/raw/ingoods/dnReceipt/ImportDN.vue            | 4 ++--
 src/pages/raw/ingoods/dnReceipt/dnReceiving.vue         | 4 ++--
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/pages/product/warehouse/LocationInventory/index.vue b/src/pages/product/warehouse/LocationInventory/index.vue
index 147187d..1f86bbe 100644
--- a/src/pages/product/warehouse/LocationInventory/index.vue
+++ b/src/pages/product/warehouse/LocationInventory/index.vue
@@ -253,7 +253,7 @@ export default class ProductCheckReceipt extends BasePage {
         view {
           width: 110rpx;
           height: 100%;
-          line-height: 100rpx;
+          //line-height: 100rpx;
         }
       }
       .single-right {
diff --git a/src/pages/product/warehouse/MaterialInventory/index.vue b/src/pages/product/warehouse/MaterialInventory/index.vue
index 68d2344..db76eb1 100644
--- a/src/pages/product/warehouse/MaterialInventory/index.vue
+++ b/src/pages/product/warehouse/MaterialInventory/index.vue
@@ -262,7 +262,7 @@ export default class ProductCheckReceipt extends BasePage {
         view {
           width: 110rpx;
           height: 100%;
-          line-height: 100rpx;
+          //line-height: 100rpx;
         }
       }
       .single-right {
diff --git a/src/pages/raw/handover/aggregating/index.vue b/src/pages/raw/handover/aggregating/index.vue
index ff8153c..79274b0 100644
--- a/src/pages/raw/handover/aggregating/index.vue
+++ b/src/pages/raw/handover/aggregating/index.vue
@@ -114,7 +114,7 @@
         </u-col> -->
         <u-col :span="12">
           <u-form-item label-width="120rpx" :label="$t('message.po_MaterielNo')">
-            <u-input v-model="form.materialCodeList" :placeholder="$t('message.po_PleaseInput')" style="margin-left: 12px" />
+            <u-input v-model="form.materialCodeList" :placeholder="$t('message.po_PleaseInput')" />
           </u-form-item>
         </u-col>
       </u-row>
diff --git a/src/pages/raw/handover/virtual/index.vue b/src/pages/raw/handover/virtual/index.vue
index acd7507..b1e5e16 100644
--- a/src/pages/raw/handover/virtual/index.vue
+++ b/src/pages/raw/handover/virtual/index.vue
@@ -124,7 +124,6 @@
             <u-input
               v-model="form.materialCodeList"
               :placeholder="this.$t('message.po_PleaseInput')"
-              style="margin-left: 12px"
             />
           </u-form-item>
         </u-col>
diff --git a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
index e99ff29..83e1c89 100644
--- a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
+++ b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
@@ -44,11 +44,11 @@
       <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 />
+          <u-input v-model="every.requestAmount" placeholder=" " :type="type" :border="border" class="input" disabled style="padding: '0'" />
         </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 />
+          <u-input v-model="every.receiptAmount" placeholder="" :type="type" :border="border" class="input" disabled style="padding: '0'" />
         </view>
       </view>
       <!-- 库位 -->
diff --git a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
index cf98bcc..7e00fca 100644
--- a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
+++ b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
@@ -44,11 +44,11 @@
       <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 />
+          <u-input v-model="every.requestAmount" placeholder=" " :type="type" :border="border" class="input" disabled style="padding: '0'" />
         </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 />
+          <u-input v-model="every.receiptAmount" placeholder="" :type="type" :border="border" class="input" disabled style="padding: '0'" />
           <!-- <u-input v-model="allNum" :placeholder="$t('message.po_PleaseInput')" :type="type" :border="border" class="input" disabled /> -->
         </view>
       </view>