From 6ee6b158412285da92f038c7c1a7e806531a4363 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Tue, 21 Dec 2021 11:26:16 +0800
Subject: [PATCH] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=20=E6=8B=A3=E9=85=8D?=
 =?UTF-8?q?=E5=A4=9A=E9=A1=B5=E9=9D=A2=E8=BF=94=E5=9B=9E=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20=20=E9=A1=B5=E9=9D=A2=E4=B8=8D=E9=BB=98=E8=AE=A4=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=B7=A5=E5=8E=82=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/raw/commission/goOut/index.vue         |  3 +++
 src/pages/raw/handover/aggregating/index.vue     |  3 ++-
 src/pages/raw/handover/feeding/index.vue         |  3 ++-
 src/pages/raw/handover/picking/ByOrder.vue       |  2 +-
 src/pages/raw/handover/picking/index.vue         | 12 ++++++++----
 src/pages/raw/handover/picking/result.vue        |  2 +-
 src/pages/raw/handover/returning/Time-filter.vue |  4 ++++
 src/pages/raw/handover/virtual/index.vue         |  3 ++-
 8 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/pages/raw/commission/goOut/index.vue b/src/pages/raw/commission/goOut/index.vue
index 8841edf..4cc5170 100644
--- a/src/pages/raw/commission/goOut/index.vue
+++ b/src/pages/raw/commission/goOut/index.vue
@@ -459,6 +459,9 @@ export default class dnReceiptDom extends BasePage {
           width: 100rpx;
           line-height: 100rpx;
         }
+        .search {
+          text-align: center;
+        }
       }
       .library-right {
         width: 50%;
diff --git a/src/pages/raw/handover/aggregating/index.vue b/src/pages/raw/handover/aggregating/index.vue
index 1b893a0..1673cf3 100644
--- a/src/pages/raw/handover/aggregating/index.vue
+++ b/src/pages/raw/handover/aggregating/index.vue
@@ -271,7 +271,8 @@ export default class Aggregating extends BasePage {
   async onReady() {
     this.$form.setRules(this.rules);
     model.clearProOrderList();
-    this.form.sapFactoryCode = session.factoryCode;
+    //guoshuang 注掉 解决打开页面默认显示工厂号
+   // this.form.sapFactoryCode = session.factoryCode;
   }
 
   /**
diff --git a/src/pages/raw/handover/feeding/index.vue b/src/pages/raw/handover/feeding/index.vue
index 0e9aae7..7ebad27 100644
--- a/src/pages/raw/handover/feeding/index.vue
+++ b/src/pages/raw/handover/feeding/index.vue
@@ -119,7 +119,8 @@ export default class feedingDom extends BasePage {
   // 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
   onReady() {
     this.$form.setRules(this.rules);
-    this.form.sapFactoryCode = session.factoryCode;
+    //guoshuang 注掉 解决打开页面默认显示工厂号
+    //this.form.sapFactoryCode = session.factoryCode;
   }
 
   /**
diff --git a/src/pages/raw/handover/picking/ByOrder.vue b/src/pages/raw/handover/picking/ByOrder.vue
index a29ea8d..8b3b143 100644
--- a/src/pages/raw/handover/picking/ByOrder.vue
+++ b/src/pages/raw/handover/picking/ByOrder.vue
@@ -105,7 +105,7 @@
             </u-button>
           </u-col>
           <u-col :span="4">
-            <u-button type="error" @click="onUpload">
+            <u-button type="error" @click="index">
               {{ $t("message.po_Return") }}
             </u-button>
           </u-col>
diff --git a/src/pages/raw/handover/picking/index.vue b/src/pages/raw/handover/picking/index.vue
index 94484f0..d5025ee 100644
--- a/src/pages/raw/handover/picking/index.vue
+++ b/src/pages/raw/handover/picking/index.vue
@@ -5,7 +5,7 @@
       :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="index" />
       </view>
       <view class="title">{{ $t("message.Pi_PickingQuery") }}</view>
       <view class="right"></view>
@@ -19,18 +19,21 @@
     >
       <u-row align="top">
         <u-col :span="12">
+          <!-- mMRP -->
           <u-form-item :required="true" label="MRP" prop="mrpCodeRegion">
             <u-input
               v-model="form.mrpCodeRegion"
               :placeholder="this.$t('message.po_PleaseInput')"
             />
           </u-form-item>
+          <!-- 订单号 -->
           <u-form-item :label="this.$t('message.Pi_OrderNo')">
             <u-input
               v-model="form.prdOrderFrom"
               :placeholder="this.$t('message.po_PleaseInput')"
             />
           </u-form-item>
+          <!-- 工厂 -->
           <u-form-item
             :required="true"
             :label="this.$t('message.Pi_factory')"
@@ -41,6 +44,7 @@
               :placeholder="this.$t('message.po_PleaseInput')"
             />
           </u-form-item>
+          <!-- 物料号 -->
           <u-form-item :label="this.$t('message.Pi_materielNo')">
             <u-input
               v-model="form.materialCodeList"
@@ -78,7 +82,7 @@
           }}</u-button>
         </u-col>
         <u-col :span="3">
-          <u-button type="error" @click="uni.navigateBack()">{{
+          <u-button type="error" @click="index">{{
             $t("message.po_Return")
           }}</u-button>
         </u-col>
@@ -118,7 +122,6 @@ export default class pickingDom extends BasePage {
    * 表头
    */
   headers = headers;
-
   /**
    * 表单数据
    */
@@ -201,7 +204,8 @@ export default class pickingDom extends BasePage {
   onReady() {
     this.$form.setRules(this.rules);
     model.clearProOrderList();
-    this.form.sapFactoryCode = session.factoryCode;
+    // guoshuang 注掉，解决打开页面有默认工厂号
+   // this.form.sapFactoryCode = session.factoryCode;
   }
 
   /**
diff --git a/src/pages/raw/handover/picking/result.vue b/src/pages/raw/handover/picking/result.vue
index 92c12fc..89e24e6 100644
--- a/src/pages/raw/handover/picking/result.vue
+++ b/src/pages/raw/handover/picking/result.vue
@@ -32,7 +32,7 @@
             </u-button>
           </u-col>
           <u-col :span="4">
-            <u-button type="error" @click="uni.navigateBack()">{{
+            <u-button type="error" @click="index">{{
               $t("message.po_Return")
             }}</u-button>
           </u-col>
diff --git a/src/pages/raw/handover/returning/Time-filter.vue b/src/pages/raw/handover/returning/Time-filter.vue
index e8e48e6..8d1b643 100644
--- a/src/pages/raw/handover/returning/Time-filter.vue
+++ b/src/pages/raw/handover/returning/Time-filter.vue
@@ -19,6 +19,8 @@
       >
       </u-field>
       <u-picker
+       :confirm-text="this.$t('message.product_Confirm')"
+       :cancel-text="this.$t('message.product_Cancel')"
         v-model="startShow"
         :params="startParams"
         mode="time"
@@ -38,6 +40,8 @@
       >
       </u-field>
       <u-picker
+       :confirm-text="this.$t('message.product_Confirm')"
+       :cancel-text="this.$t('message.product_Cancel')"
         v-model="endShow"
         :params="endParams"
         mode="time"
diff --git a/src/pages/raw/handover/virtual/index.vue b/src/pages/raw/handover/virtual/index.vue
index e3c3dc5..6a8e480 100644
--- a/src/pages/raw/handover/virtual/index.vue
+++ b/src/pages/raw/handover/virtual/index.vue
@@ -264,7 +264,8 @@ export default class Virtual extends BasePage {
   async onReady() {
     this.$form.setRules(this.rules);
     model.clearProOrderList();
-    this.form.sapFactoryCode = session.factoryCode;
+    //guoshuang 注掉 解决打开页面默认显示工厂号
+    //this.form.sapFactoryCode = session.factoryCode;
   }
 
   /**