From 646adc483a971f7ce469ad6aa739094478d52a0b Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Tue, 22 Feb 2022 15:23:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/lang/en.ts                           |  2 +-
 .../product/warehouse/wholeCollect/index.vue  |  2 +-
 .../product/warehouse/wholeTransfer/config.ts |  8 +++-
 .../product/warehouse/wholeTransfer/index.vue | 41 ++++++++++++++++---
 4 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 1f51648..568ef5e 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -229,7 +229,7 @@ export default {
     CollectionAndBorrowing: 'FG cost center',
     Inventory: 'FG PSV',
     raw_Inventory: 'Raw Inventory',
-    Transfer: 'Library Code',
+    Transfer: 'Code',
     generate: 'Generate',
 
     RowWarehouse: 'RAW WH',
diff --git a/src/pages/product/warehouse/wholeCollect/index.vue b/src/pages/product/warehouse/wholeCollect/index.vue
index de78a51..c8d2f7f 100644
--- a/src/pages/product/warehouse/wholeCollect/index.vue
+++ b/src/pages/product/warehouse/wholeCollect/index.vue
@@ -213,7 +213,7 @@ export default class ProductCheckReceipt extends BasePage {
             //debugger;
             console.log("////111111");
             this.model.close(this.form.order3);
-            if (model.code == '1') {
+            if (this.model.code == '1') {
               uni.showToast({
                 icon: 'success',
                 title: this.$t('message.success') as string,
diff --git a/src/pages/product/warehouse/wholeTransfer/config.ts b/src/pages/product/warehouse/wholeTransfer/config.ts
index 264f19d..be213a0 100644
--- a/src/pages/product/warehouse/wholeTransfer/config.ts
+++ b/src/pages/product/warehouse/wholeTransfer/config.ts
@@ -201,8 +201,14 @@ export const Headers = [
   //   label: vm.$t('message.Access_type'),
   //   key: 'oiType', //出入类型
   // },
+  //源库位
   {
-    label: vm.$t('message.product_Location'),
+    label: vm.$t('message.SourceLocation'),
+    key: 'wlFromCode',
+    width: 300,
+  },
+  {
+    label: vm.$t('message.Warehouse_TargetLocation'),
     key: 'wlToCode', //库位
   },
 ];
diff --git a/src/pages/product/warehouse/wholeTransfer/index.vue b/src/pages/product/warehouse/wholeTransfer/index.vue
index f8c9f36..dfe4046 100644
--- a/src/pages/product/warehouse/wholeTransfer/index.vue
+++ b/src/pages/product/warehouse/wholeTransfer/index.vue
@@ -9,11 +9,20 @@
     </view>
     <u-form class="form" ref="form" :model="form" label-width="180rpx">
       <!-- 移库码 -->
-      <u-form-item :label="$t('message.Transfer')">
+      <view class="single">
+        <view class="single-left">
+          <view>{{ $t('message.Transfer') }}</view>
+          <u-search :placeholder="$t('message.barcode')" class="Transfer" v-model.trim="userDefined4" @search="QueryHistory" :show-action="false"></u-search>
+        </view>
+        <view class="single-right">
+          <u-button type="primary" style="height: 60rpx; width: 140rpx" @click="generate">{{ $t('message.generate') }}</u-button>
+        </view>
+      </view>
+      <!-- <u-form-item :label="$t('message.Transfer')">
         <!-- <u-input v-model="userDefined4" placeholder="" class="Transfer" /> -->
-        <u-search :placeholder="$t('message.barcode')" class="Transfer" v-model.trim="userDefined4" @search="QueryHistory" :show-action="false"></u-search>
-        <u-button type="primary" style="height: 60rpx; margin-left: 20rpx" @click="generate">{{ $t('message.generate') }}</u-button>
-      </u-form-item>
+        <!-- <u-search :placeholder="$t('message.barcode')" class="Transfer" v-model.trim="userDefined4" @search="QueryHistory" :show-action="false"></u-search>
+        <u-button type="primary" style="height: 60rpx; margin-left: 20rpx; width: 160rpx" @click="generate">{{ $t('message.generate') }}</u-button>
+      </u-form-item> --> 
       <!-- 总数 -->
       <u-form-item :label="$t('message.Warehouse_TotalNumber')">
         <u-input :disabled="true" v-model="allNum" placeholder="" />
@@ -279,12 +288,34 @@ export default class productCheckReceipt extends BasePage {
       padding: 30rpx 0;
       line-height: 35rpx;
       .Transfer {
-        width: 180rpx;
+        width: 280rpx;
         height: 64rpx;
         background: rgb(242, 242, 242);
         border-radius: 110rpx;
       }
     }
+    .single {
+      width: 100%;
+      height: 100rpx;
+      display: flex;
+      .single-left {
+        width: 80%;
+        height: 100%;
+        display: flex;
+        view {
+          width: 170rpx;
+          height: 100%;
+          line-height: 100rpx;
+        }
+      }
+      .single-right {
+        button {
+          margin-top: 15rpx;
+          width: 140rpx;
+          height: 70rpx;
+        }
+      }
+    }
   }
 
   .bottom-bar {