修改 拣配多页面返回问题 页面不默认显示工厂号

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%;

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;
   }
 
   /**

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;
   }
 
   /**

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>

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;
   }
 
   /**

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>

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"

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;
   }
 
   /**