From f2e930064cdf8eccadebcb593c79fe73bdc308a1 Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Tue, 28 Dec 2021 17:59:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=20=E6=88=90=E5=93=81=E5=87=BA=E5=BA=93=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outbound/stoOutbound/DN-delivergoods.vue  | 199 +++++++-----------
 .../product/outbound/stoOutbound/model.ts     |  61 ++----
 .../warehouse/wholeTransfer/Local-details.vue |  60 ++----
 src/pages/raw/handover/feeding/Location.vue   | 175 ++++++---------
 src/pages/raw/handover/picking/index.vue      |  21 +-
 src/pages/raw/handover/picking/order.vue      | 107 ++++------
 .../raw/handover/returning/Time-filter.vue    |   4 +-
 src/pages/raw/handover/returning/index.vue    |  36 ++--
 8 files changed, 254 insertions(+), 409 deletions(-)

diff --git a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
index 871ccd0..a99d942 100644
--- a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
+++ b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
@@ -1,122 +1,63 @@
 <template>
   <view class="page-raw-returning">
-    <view
-      class="header"
-      :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }"
-    >
+    <view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
       <view class="left">
         <u-icon class="icon" name="arrow-left" @click="back" />
       </view>
-      <view class="title">{{ $t("message.deliver") }}</view>
+      <view class="title">{{ $t('message.deliver') }}</view>
       <view class="right"></view>
     </view>
-    <u-form
-      class="form"
-      ref="form"
-      :model="form"
-      :error-type="['toast']"
-      label-width="150rpx"
-    >
-      <u-form-item
-        :required="true"
-        :label="$t('message.dn_OddNumbers')"
-        prop="orderNo"
-      >
-        <u-search
-          :placeholder="$t('message.Commission_tips1')"
-          v-model="form.orderNo"
-          @search="model.findProdInfoByDN"
-          :show-action="false"
-        ></u-search>
+    <u-form class="form" ref="form" :model="form" :error-type="['toast']" label-width="150rpx">
+      <!-- 单号查询 -->
+      <u-form-item :required="true" :label="$t('message.dn_OddNumbers')" prop="orderNo">
+        <u-search :placeholder="$t('message.Commission_tips1')" v-model="form.orderNo" @search="query" :show-action="false"></u-search>
       </u-form-item>
       <u-form-item :label="$t('message.product_TotalNumber')">
-        <u-input
-          v-model="model.orderInInfo.stoAmount"
-          :placeholder="$t('message.po_PleaseInput')"
-        />
+        <u-input v-model="model.orderInInfo.stoAmount" :placeholder="$t('message.po_PleaseInput')" />
       </u-form-item>
-      <u-form-item :required="true" :label="$t('message.product_FGCode')">
-        <u-input
-          v-model="form.productCode"
-          type="select"
-          @click="materialCodeSelect = true"
-          :placeholder="$t('message.po_PleaseInput')"
-        />
-        <u-select
-          :confirm-text="$t('message.product_Confirm')"
-          :cancel-text="$t('message.product_Cancel')"
-          v-model="materialCodeSelect"
-          :list="model.materielList"
-          @confirm="materialConfirm"
-        ></u-select>
+      <!-- 行项目 -->
+      <u-form-item :required="true" :label="$t('message.Line')">
+        <u-input v-model="form.rowItem" type="select" @click="materialCodeSelect = true" :placeholder="$t('message.po_PleaseInput')" />
+        <u-select :confirm-text="$t('message.product_Confirm')" :cancel-text="$t('message.product_Cancel')" v-model="materialCodeSelect" :list="model.materielList" @confirm="materialConfirm"></u-select>
       </u-form-item>
       <u-form-item :label="$t('message.product_FGDes')">
         <u-input :disabled="true" v-model="form.productDescZh" placeholder="" />
       </u-form-item>
-      <u-form-item :label="$t('message.Line')">
-        <u-input :disabled="true" v-model="form.rowItem" placeholder="" />
+      <!-- 成品编码 -->
+      <u-form-item :label="$t('message.product_FGCode')">
+        <u-input :disabled="true" v-model="form.productCode" placeholder="" />
       </u-form-item>
       <u-row gutter="0">
         <u-col :span="6">
           <u-form-item :label="$t('message.product_MaterilTotalNumber')">
-            <u-input
-              v-model="form.orderAmount"
-              :placeholder="$t('message.po_PleaseInput')"
-            />
+            <u-input v-model="form.orderAmount" :placeholder="$t('message.po_PleaseInput')" />
           </u-form-item>
         </u-col>
         <u-col :span="6">
           <u-form-item :label="$t('message.product_Swept')" label-width="80rpx">
-            <u-input
-              v-model="form.scanAmount"
-              :placeholder="$t('message.po_PleaseInput')"
-            />
+            <u-input v-model="form.scanAmount" :placeholder="$t('message.po_PleaseInput')" />
           </u-form-item>
         </u-col>
       </u-row>
       <u-form-item :label="$t('message.product_BarCode')">
-        <u-search
-          :placeholder="$t('message.po_PleaseInput')"
-          v-model="form.barCode"
-          @search="onSubmit"
-          :focus="firstFocus"
-          :show-action="false"
-        ></u-search>
+        <u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.barCode" @search="onSubmit" :focus="firstFocus" :show-action="false"></u-search>
       </u-form-item>
       <u-col :span="12">
         <view class="table-wrapper">
-          <wyb-table
-            class="table"
-            ref="table"
-            width="100%"
-            enable-check="multiple"
-            show-left-and-right-border
-            :headers="headers"
-            :contents="materialList"
-            :show-vert-border="false"
-            @onCheck="onCheck"
-          ></wyb-table>
+          <wyb-table class="table" ref="table" width="100%" enable-check="multiple" show-left-and-right-border :headers="headers" :contents="materialList" :show-vert-border="false" @onCheck="onCheck"></wyb-table>
         </view>
       </u-col>
     </u-form>
     <view class="bottom-bar">
       <u-row class="button-bar">
         <u-col :span="4">
-          <u-button
-            type="warning"
-            @click="toPage(page.product.outbound.stoOutboundDetail)"
-            >{{ $t("message.detailed") }}</u-button
-          >
+          <u-button type="warning" @click="toPage(page.product.outbound.stoOutboundDetail)">{{ $t('message.detailed') }}</u-button>
         </u-col>
         <u-col :span="4">
-          <u-button type="error" @click="resetHandle">{{
-            $t("message.product_Empty")
-          }}</u-button>
+          <u-button type="error" @click="resetHandle">{{ $t('message.product_Empty') }}</u-button>
         </u-col>
         <u-col :span="4">
-          <u-button type="primary" @click="onOk">{{
-            $t("message.po_Submit")
-          }}</u-button>
+          <u-button type="primary" @click="onOk">{{ $t('message.po_Submit') }}</u-button>
         </u-col>
         <!--        <u-col :span="3">-->
         <!--          <u-button type="success" @click="uni.navigateBack()">重提</u-button>-->
@@ -127,22 +68,22 @@
 </template>
 
 <script lang="ts">
-import { Component, Ref } from "vue-property-decorator";
-import { BasePage } from "@/components/base/page";
-import { VForm, VFormRules } from "vue/types/form";
-import model from "./model";
-import { session } from "@/store/modules/session";
-import { headers } from "./config";
+import { Component, Ref } from 'vue-property-decorator';
+import { BasePage } from '@/components/base/page';
+import { VForm, VFormRules } from 'vue/types/form';
+import model from './model';
+import { session } from '@/store/modules/session';
+import { headers } from './config';
 @Component
 export default class stoOutboundDom extends BasePage {
   /**
    * 表单引用
    */
-  @Ref("form") readonly $form!: VForm;
+  @Ref('form') readonly $form!: VForm;
   /**
    * 表格引用
    */
-  @Ref("table") readonly $table: any;
+  @Ref('table') readonly $table: any;
 
   /**
    * 页面Module
@@ -165,12 +106,12 @@ export default class stoOutboundDom extends BasePage {
     dockName: null, // 月台类型name
     orderNo: null,
     qty: 0,
-    orderAmount: "",
-    productCode: "", // 物料类型name
-    productDescZh: "",
+    orderAmount: '',
+    productCode: '', // 物料类型name
+    productDescZh: '',
     scanAmount: 0,
-    rowItem: "",
-    barCode: "",
+    rowItem: '',
+    barCode: '',
   };
   materialList: any = []; //物料列表
   //被选中的表格数据
@@ -178,7 +119,7 @@ export default class stoOutboundDom extends BasePage {
   /**
    * 工位退料人名称
    */
-  operatorName = "";
+  operatorName = '';
   /**
    * 退料类型选择
    */
@@ -189,9 +130,7 @@ export default class stoOutboundDom extends BasePage {
    * 表单验证规则
    */
   rules: VFormRules<any> = {
-    orderNo: [
-      { required: true, message: this.$t("message.product_Tip4") as string },
-    ],
+    orderNo: [{ required: true, message: this.$t('message.product_Tip4') as string }],
   };
 
   // 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
@@ -200,7 +139,7 @@ export default class stoOutboundDom extends BasePage {
     model.queryReturningTypeList();
   }
   onCheck(e: any) {
-    console.log("e.data", e.data);
+    console.log('e.data', e.data);
     this.selectMaterielList = [];
     e.data.forEach((line: any) => {
       const { lineData: item } = line;
@@ -208,14 +147,35 @@ export default class stoOutboundDom extends BasePage {
     });
   }
   back() {
-    this.form.barCode = "";
+    this.form.barCode = '';
     this.model.orderInInfo.stoAmount = 0;
     this.selectMaterielList = [];
     uni.navigateBack({ delta: 1 });
     this.$table.onEmpty();
   }
+  async query() {
+    if (!this.form.orderNo) {
+      uni.showToast({
+        icon: 'none',
+        title: this.$t('message.Commission_tips1') as any,
+      });
+      return;
+    }
+    await this.model.findProdInfoByDN(this.form.orderNo);
+    if (model.DNcode == '1') {
+      uni.showToast({
+        icon: 'none',
+        title: this.$t('message.successful') as any,
+      });
+      this.form.productCode = this.model.materielList[0].materialCode;
+      this.form.productDescZh = this.model.materielList[0].materialDesc;
+      this.form.rowItem = this.model.materielList[0].rowItem;
+      this.form.orderAmount = this.model.materielList[0].orderAmount;
+      this.form.scanAmount = parseFloat(this.model.materielList[0].outAmount);
+    }
+  }
   materialConfirm(v: any) {
-    console.log("v[0].value", v[0]);
+    console.log('v[0].value', v[0]);
     // this.form.productCode = v[0].value;
     // this.model.materielList.forEach((item: any) => {
     //   if (v[0].value == item.stoItem) {
@@ -227,8 +187,8 @@ export default class stoOutboundDom extends BasePage {
     //   }
     // });
     this.model.materielList.forEach((item: any) => {
-      if (v[0].label == item.materialCode) {
-        console.log("item", item);
+      if (v[0].label == item.rowItem) {
+        console.log('item', item);
         this.form.productCode = item.materialCode;
         this.form.productDescZh = item.materialDesc;
         this.form.rowItem = item.rowItem;
@@ -237,7 +197,7 @@ export default class stoOutboundDom extends BasePage {
         return;
       }
     });
-    console.log("this.form", this.form);
+    console.log('this.form', this.form);
   }
   /**
    * 清空
@@ -269,8 +229,8 @@ export default class stoOutboundDom extends BasePage {
       // }
       if (parseInt(this.form.orderAmount) <= this.form.scanAmount) {
         uni.showToast({
-          icon: "none",
-          title: this.$t("message.product_Tip6") as string,
+          icon: 'none',
+          title: this.$t('message.product_Tip6') as string,
         });
         return;
       }
@@ -297,7 +257,7 @@ export default class stoOutboundDom extends BasePage {
           factoryCode: session.factoryCode,
         };
         const res = await this.model.getMaterialByCode(list);
-        console.log("fanhui", res);
+        console.log('fanhui', res);
         // if (res.barcode) {
         //   // this.materialList.push(res);
         //   this.form.scanAmount = res.scanAmount;
@@ -309,7 +269,7 @@ export default class stoOutboundDom extends BasePage {
         } else {
           let flag = 0;
           for (let i = 0; i < this.materialList.length; i++) {
-            console.log("11111", this.materialList[i]);
+            console.log('11111', this.materialList[i]);
             if (this.form.barCode == this.materialList[i].barcode) {
               flag = 1;
               break;
@@ -322,8 +282,8 @@ export default class stoOutboundDom extends BasePage {
             this.$table.onCheckAllTap();
           } else {
             uni.showToast({
-              icon: "none",
-              title: this.$t("message.product_Tip7") as string,
+              icon: 'none',
+              title: this.$t('message.product_Tip7') as string,
             });
           }
         }
@@ -331,7 +291,7 @@ export default class stoOutboundDom extends BasePage {
     });
     const item = {
       ...this.form,
-      barCode: String(""),
+      barCode: String(''),
     };
     this.firstFocus = false;
     setTimeout(() => {
@@ -369,23 +329,23 @@ export default class stoOutboundDom extends BasePage {
       // this.$form.resetFields();
       // // this.form.barCode = '';
       // this.selectMaterielList = [];
-      console.log("aaaaaaa", this.model);
-      if (this.model.code == "1") {
+      console.log('aaaaaaa', this.model);
+      if (this.model.code == '1') {
         this.materialList = [];
         // this.model.materielList = [];
         this.$table.onCheckAllTap();
-        uni.showToast({ icon: "success", title: "success" });
+        uni.showToast({ icon: 'success', title: 'success' });
       }
     });
-    this.form.barCode = "";
-    this.form.productCode = "";
+    this.form.barCode = '';
+    this.form.productCode = '';
     model.orderInInfo.stoAmount = 0;
     // this.form.orderNo = null;
     this.form.scanAmount = 0;
-    this.form.orderAmount = "";
-    this.form.productDescZh = "";
+    this.form.orderAmount = '';
+    this.form.productDescZh = '';
     this.selectMaterielList = [];
-    (this.form.rowItem = ""), this.$table.onEmpty();
+    (this.form.rowItem = ''), this.$table.onEmpty();
   }
   // }
 }
@@ -393,8 +353,7 @@ export default class stoOutboundDom extends BasePage {
 
 <style lang="scss" scoped>
 .page-raw-returning {
-  background: #f2f2f2
-    linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
+  background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
   background-size: 100% 600rpx;
   padding: 118rpx 30rpx 162rpx;
   min-height: 100%;
diff --git a/src/pages/product/outbound/stoOutbound/model.ts b/src/pages/product/outbound/stoOutbound/model.ts
index bf35924..3135c3e 100644
--- a/src/pages/product/outbound/stoOutbound/model.ts
+++ b/src/pages/product/outbound/stoOutbound/model.ts
@@ -1,14 +1,8 @@
-import {
-  Action,
-  getModule,
-  Module,
-  MutationAction,
-  VuexModule,
-} from "vuex-module-decorators";
-import store from "@/store";
-import http from "@/utils/request";
-import { url } from "@/utils/url";
-import { session } from "@/store/modules/session";
+import { Action, getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
+import store from '@/store';
+import http from '@/utils/request';
+import { url } from '@/utils/url';
+import { session } from '@/store/modules/session';
 // import vm from '@/main';
 
 class OrderInInfo {
@@ -23,7 +17,7 @@ class OrderInInfo {
   namespaced: true,
   dynamic: true,
   store,
-  name: "product.outbound.stoOutbound",
+  name: 'product.outbound.stoOutbound',
 })
 export class ReturningModule extends VuexModule {
   /**
@@ -42,7 +36,8 @@ export class ReturningModule extends VuexModule {
    */
   orderInInfo: OrderInInfo = new OrderInInfo();
   //记账按钮的code码
-  code = "";
+  code = '';
+  DNcode: any = '';
   /**
    * 查询月台列表
    */
@@ -81,7 +76,7 @@ export class ReturningModule extends VuexModule {
       value: item.stoItem,
       ...item,
     }));
-    console.log("materielList", materielList);
+    console.log('materielList', materielList);
     if (result.data.records[0]) {
       result.data.records[0].stoAmount = stoAmount;
     }
@@ -94,26 +89,28 @@ export class ReturningModule extends VuexModule {
    */
   @MutationAction
   async findProdInfoByDN(nxOutCode: string) {
-    const result = await http.post(url.outbound.stoOutbound.findProdInfoByDN, {
+    const result: any = await http.post(url.outbound.stoOutbound.findProdInfoByDN, {
       nxOutCode,
       loginName: session.loginName,
       factoryCode: session.factoryCode,
     });
+    console.log('resule>>>>>>>>>>>>>>>>>>>>>>>', result);
     let stoAmount = 0;
+    const DNcode = result.code;
     result.data.forEach((item: any) => {
       stoAmount += item.orderAmount;
     });
     const materielList = result.data.map((item: any) => ({
-      label: item.materialCode,
+      label: item.rowItem,
       value: item.stoItem,
       ...item,
     }));
-    console.log("materielList", materielList);
+    console.log('materielList', materielList);
     if (result.data[0]) {
       result.data[0].stoAmount = stoAmount;
     }
     const orderInInfo = result.data[0] || {};
-    return { orderInInfo, materielList };
+    return { orderInInfo, materielList, DNcode };
   }
 
   /**
@@ -126,15 +123,12 @@ export class ReturningModule extends VuexModule {
       loginName: session.loginName,
     };
     let oneMaterielDetail: any = {};
-    const { data }: any = await http.post(
-      url.outbound.stoOutbound.checkScan,
-      obj
-    );
-    console.log("shneme a ", data.records);
+    const { data }: any = await http.post(url.outbound.stoOutbound.checkScan, obj);
+    console.log('shneme a ', data.records);
     oneMaterielDetail = data.records[0];
     data.records[0].materialCode = list[0].productCode;
     data.records[0].materialDesc = list[0].productDescZh;
-    console.log("aaaaa", oneMaterielDetail);
+    console.log('aaaaa', oneMaterielDetail);
     return oneMaterielDetail;
   }
   /**
@@ -143,10 +137,7 @@ export class ReturningModule extends VuexModule {
   @Action
   async getMaterialByCode(list: any = {}) {
     let oneMaterielDetail: any = {};
-    const { data }: any = await http.post(
-      url.outbound.stoOutbound.getMaterialByCode,
-      list
-    );
+    const { data }: any = await http.post(url.outbound.stoOutbound.getMaterialByCode, list);
     oneMaterielDetail = data.records[0];
     return oneMaterielDetail;
   }
@@ -156,11 +147,8 @@ export class ReturningModule extends VuexModule {
    */
   @MutationAction
   async confirm(list: any[]) {
-    const { code, data } = await http.post(
-      url.outbound.stoOutbound.Bookkeeping,
-      list
-    );
-    console.log("res数据", data, code);
+    const { code, data } = await http.post(url.outbound.stoOutbound.Bookkeeping, list);
+    console.log('res数据', data, code);
     // if (code == '1') {
     //   uni.showToast({ icon: 'success', title: msg });
     // } else {
@@ -175,11 +163,8 @@ export class ReturningModule extends VuexModule {
    */
   @MutationAction
   async confirmMove(list: any[]) {
-    const { code, data } = await http.post(
-      url.outbound.stoOutbound.Bookkeeping,
-      list
-    );
-    console.log("res数据", data, code);
+    const { code, data } = await http.post(url.outbound.stoOutbound.Bookkeeping, list);
+    console.log('res数据', data, code);
     // if (code == '1') {
     //   uni.showToast({ icon: 'success', title: msg });
     // } else {
diff --git a/src/pages/product/warehouse/wholeTransfer/Local-details.vue b/src/pages/product/warehouse/wholeTransfer/Local-details.vue
index c5c1734..06ed252 100644
--- a/src/pages/product/warehouse/wholeTransfer/Local-details.vue
+++ b/src/pages/product/warehouse/wholeTransfer/Local-details.vue
@@ -2,63 +2,43 @@
   <view class="page-receipt-detail">
     <view class="header">
       <view class="left">
-        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
+        <u-icon class="icon" name="arrow-left" @click="go" />
       </view>
-      <view class="title">{{ $t("message.Pi_QueryResults") }}</view>
+      <view class="title">{{ $t('message.Pi_QueryResults') }}</view>
       <view class="right"></view>
     </view>
-    <u-form
-      class="form"
-      ref="form"
-      style="padding-left: 30px"
-      label-width="180rpx"
-    >
+    <u-form class="form" ref="form" style="padding-left: 30px" label-width="180rpx">
       <u-form-item :label="$t('message.Transfer')">
         <u-input v-model="cpRef4" placeholder="" class="Transfer" />
-        <u-button
-          type="primary"
-          style="height: 60rpx; margin-left: 20rpx"
-          @click="generate"
-          >{{ $t("message.Query") }}</u-button
-        >
+        <u-button type="primary" style="height: 60rpx; margin-left: 20rpx" @click="generate">{{ $t('message.Query') }}</u-button>
       </u-form-item>
     </u-form>
     <view class="table-wrapper">
-      <wyb-table
-        class="table"
-        ref="table"
-        width="100%"
-        show-left-and-right-border
-        :headers="headers"
-        :contents="detailedList"
-        :show-vert-border="false"
-      ></wyb-table>
+      <wyb-table class="table" ref="table" width="100%" show-left-and-right-border :headers="headers" :contents="detailedList" :show-vert-border="false"></wyb-table>
     </view>
   </view>
 </template>
 <script lang="ts">
-import { Component } from "vue-property-decorator";
-import { BasePage } from "@/components/base/page";
-import { Headers } from "./config";
-import model from "./model";
+import { Component } from 'vue-property-decorator';
+import { BasePage } from '@/components/base/page';
+import { Headers } from './config';
+import model from './model';
 
 @Component
 export default class RawReceiptDetail extends BasePage {
   model = model;
   headers = Headers;
-  cpRef4: any = "";
+  cpRef4: any = '';
   detailedList: any = [];
   async generate() {
-    if (this.cpRef4 == "") {
+    if (this.cpRef4 == '') {
       uni.showToast({
-        icon: "none",
-        title: this.$t("message._tips6") as any,
+        icon: 'none',
+        title: this.$t('message._tips6') as any,
       });
       return;
     }
-    let person = JSON.parse(
-      localStorage.getItem("__GWMS_APP_STATE_DATA__") as any
-    );
+    let person = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
     let content = {
       loginName: person.session.user.loginName,
       cpRef4: this.cpRef4,
@@ -66,20 +46,22 @@ export default class RawReceiptDetail extends BasePage {
     await this.model.querydetaildlist(content);
     let arr = this.model.detailedList;
     arr.forEach((item: any) => {
-      if (item.oiType == 10 || item.oiType == "10") {
-        item.oiType = this.$t("message.enter");
+      if (item.oiType == 10 || item.oiType == '10') {
+        item.oiType = this.$t('message.enter');
       } else {
-        item.oiType = this.$t("message.Out");
+        item.oiType = this.$t('message.Out');
       }
     });
     this.detailedList = arr;
   }
+  go() {
+    this.redirectTo(this.page.product.warehouse.wholeTransfer.index);
+  }
 }
 </script>
 <style lang="scss" scoped>
 .page-receipt-detail {
-  background: #f2f2f2
-    linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
+  background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
   background-size: 100% 600rpx;
   padding: 30rpx;
   min-height: 100%;
diff --git a/src/pages/raw/handover/feeding/Location.vue b/src/pages/raw/handover/feeding/Location.vue
index 7b69e6e..a7d7a44 100644
--- a/src/pages/raw/handover/feeding/Location.vue
+++ b/src/pages/raw/handover/feeding/Location.vue
@@ -5,78 +5,51 @@
         <u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
       </view>
       <!-- <view class="title">{{ $t("message.Pi_ByOrderPicking") }}</view> -->
-      <view class="title">{{ $t("message.FillingMaterials") }}</view>
+      <view class="title">{{ $t('message.FillingMaterials') }}</view>
       <view class="right"></view>
     </view>
     <view class="table-wrapper">
-      <wyb-table
-        class="table"
-        ref="table"
-        width="100%"
-        enable-check="single"
-        show-left-and-right-border
-        :headers="headers"
-        :contents="model.blDetailList"
-        :show-vert-border="false"
-        @onCheck="handleRow"
-      ></wyb-table>
+      <wyb-table class="table" ref="table" width="100%" enable-check="single" show-left-and-right-border :headers="headers" :contents="model.blDetailList" :show-vert-border="false" @onCheck="handleRow"></wyb-table>
     </view>
     <!-- 列表展示数据 -->
     <view class="Exhibition">
       <view class="Exhibition-left">
-        <view class="Exhibition-left-title"
-          >{{ $t("message.Pi_Station") }}:</view
-        >
+        <view class="Exhibition-left-title">{{ $t('message.Pi_Station') }}:</view>
         <view class="Exhibition-left-data">{{ some.sendSpot }}</view>
       </view>
       <view class="Exhibition-right">
-        <view class="Exhibition-right-title"
-          >{{ $t("message.Pi_PickedQuantity") }}:</view
-        >
+        <view class="Exhibition-right-title">{{ $t('message.Pi_PickedQuantity') }}:</view>
         <view class="Exhibition-right-data">{{ some.totalFillAmount }}</view>
       </view>
     </view>
     <!-- 添加库位 -->
     <view class="library">
       <view class="library-left">
-        <view>{{ $t("message.CommissionedLocation") }}</view>
-        <jPicker
-          sureColor="#ff0000"
-          style="width: 230rpx"
-          @bindpicker="LocationChoice"
-          showKey="value"
-          valKey="value"
-          :val="wlCode"
-          class="search"
-          :options="Location"
-        />
+        <view>{{ $t('message.CommissionedLocation') }}</view>
+        <jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode" class="search" :options="Location" />
       </view>
       <view class="library-right">
-        <view class="library-right-title">{{
-          $t("message.CommissionedThisNumber")
-        }}</view>
+        <view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}</view>
         <u-input v-model="qty" :type="type" :border="border" class="input" />
       </view>
     </view>
     <!-- 添加 -->
     <view class="add">
-      <u-button type="primary" @click="Add">{{
-        $t("message.product_add")
-      }}</u-button>
+      <u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
     </view>
     <!-- 表格 -->
     <u-table class="library-table">
       <u-tr class="u-tr">
-        <u-th class="u-th">{{ $t("message.product_Location") }}</u-th>
-        <u-th class="u-th">{{ $t("message.product_Number") }}</u-th>
-        <u-th class="u-th">{{ $t("message.operation") }}</u-th>
+        <u-th class="u-th">{{ $t('message.product_Location') }}</u-th>
+        <u-th class="u-th">{{ $t('message.product_Number') }}</u-th>
+        <u-th class="u-th">{{ $t('message.operation') }}</u-th>
       </u-tr>
       <u-tr class="u-tr" v-for="(item, index) in LocationList" :key="index">
         <u-td class="u-td">{{ item.wlCode }}</u-td>
         <u-td class="u-td">{{ item.qty }}</u-td>
         <u-td class="u-td">
           <div class="u-td" @click="deleteItem(index)">
-            {{ $t("message.product_Delete") }}
+            {{ $t('message.product_Delete') }}
           </div>
         </u-td>
       </u-tr>
@@ -87,33 +60,16 @@
           <u-row class="bottom-info"> </u-row>
         </u-form>
       </div>
-      <u-form
-        ref="form2"
-        :model="form2"
-        :error-type="['toast']"
-        style="background: rgb(242, 242, 242)"
-      >
+      <u-form ref="form2" :model="form2" :error-type="['toast']" style="background: rgb(242, 242, 242)">
         <u-row class="bottom-info">
           <u-col :span="6">
-            <u-form-item
-              prop="operatorPass"
-              :label="$t('message.Summary_Receiver')"
-              label-width="120rpx"
-            >
-              <u-input
-                v-model="operatorName"
-                @confirm="onOperatorConfirm"
-                :placeholder="$t('message.po_PleaseInput')"
-              />
+            <u-form-item prop="operatorPass" :label="$t('message.Summary_Receiver')" label-width="120rpx">
+              <u-input v-model="operatorName" @confirm="onOperatorConfirm" :placeholder="$t('message.po_PleaseInput')" />
             </u-form-item>
           </u-col>
           <u-col :span="6">
             <u-form-item prop="rfPwd" :label="$t('message.Summary_Password')">
-              <u-input
-                v-model="form2.rfPwd"
-                type="password"
-                :placeholder="$t('message.po_PleaseInput')"
-              />
+              <u-input v-model="form2.rfPwd" type="password" :placeholder="$t('message.po_PleaseInput')" />
             </u-form-item>
           </u-col>
         </u-row>
@@ -121,18 +77,16 @@
       <div class="container">
         <u-row>
           <u-col :span="4">
-            <u-button type="primary" class="appoint" @click="bill">{{
-              $t("message.Feeding_ReplenishmentDetails")
-            }}</u-button>
+            <u-button type="primary" class="appoint" @click="bill">{{ $t('message.Feeding_ReplenishmentDetails') }}</u-button>
           </u-col>
           <u-col :span="4">
             <u-button type="success" @click="onSubmit">
-              {{ $t("message.product_Upload") }}
+              {{ $t('message.product_Upload') }}
             </u-button>
           </u-col>
           <u-col :span="4">
             <u-button type="error" @click="uni.navigateBack()">
-              {{ $t("message.po_Return") }}
+              {{ $t('message.po_Return') }}
             </u-button>
           </u-col>
         </u-row>
@@ -142,14 +96,14 @@
 </template>
 
 <script lang="ts">
-import { Component, Ref } from "vue-property-decorator";
-import { BasePage } from "@/components/base/page";
-import model from "./model";
-import { session } from "@/store/modules/session";
-import { VForm, VFormRules } from "vue/types/form";
-import jPicker from "@/components/J-Picker/jPicker.vue";
-import { headers } from "./config";
-import { auth } from "@/store/modules/auth";
+import { Component, Ref } from 'vue-property-decorator';
+import { BasePage } from '@/components/base/page';
+import model from './model';
+import { session } from '@/store/modules/session';
+import { VForm, VFormRules } from 'vue/types/form';
+import jPicker from '@/components/J-Picker/jPicker.vue';
+import { headers } from './config';
+import { auth } from '@/store/modules/auth';
 @Component({
   components: {
     jPicker,
@@ -159,29 +113,29 @@ export default class RawReceiptDetail extends BasePage {
   /**
    * 表单引用
    */
-  @Ref("form") readonly $form!: VForm;
-  @Ref("submitForm") readonly $submitForm!: VForm;
-  @Ref("form2") readonly $form2!: VForm;
+  @Ref('form') readonly $form!: VForm;
+  @Ref('submitForm') readonly $submitForm!: VForm;
+  @Ref('form2') readonly $form2!: VForm;
   submitForm = {
-    receiver: "",
-    receiverName: "",
-    password: "",
+    receiver: '',
+    receiverName: '',
+    password: '',
   };
   /**
    * 页面Module
    */
   model = model;
-  type = "text";
-  wlCode: any = "";
+  type = 'text';
+  wlCode: any = '';
   border = true;
-  operatorName = "";
+  operatorName = '';
   //添加库位和数量的列表
   LocationList: any = [];
   //库位
   Location: any = [];
   someIndex: number = 0;
   some: any = {};
-  qty: any = "";
+  qty: any = '';
   /**
    * 表单数据
    */
@@ -190,13 +144,13 @@ export default class RawReceiptDetail extends BasePage {
     amount: null,
   };
   form2 = {
-    operatorPass: "", // 接收人
+    operatorPass: '', // 接收人
   };
   /**
    * 表单校验
    */
   rules: VFormRules<any> = {
-    amount: [{ required: true, message: this.$t("message.Pi_tip1") as string }],
+    amount: [{ required: true, message: this.$t('message.Pi_tip1') as string }],
   };
 
   /**
@@ -217,8 +171,8 @@ export default class RawReceiptDetail extends BasePage {
       this.form2.operatorPass = loginName;
       this.operatorName = userName;
     } catch {
-      this.form2.operatorPass = "";
-      this.operatorName = "";
+      this.form2.operatorPass = '';
+      this.operatorName = '';
     }
   }
   handleRow({ data }: any) {
@@ -227,24 +181,24 @@ export default class RawReceiptDetail extends BasePage {
     this.model.blDetailList[this.someIndex].wlList = [];
   }
   Add() {
-    if (this.qty == "" || this.wlCode == "") {
+    if (this.qty == '' || this.wlCode == '') {
       uni.showToast({
-        icon: "none",
-        title: "请输入正确的库位和数量" as any,
+        icon: 'none',
+        title: this.$t('message.AppendMateriel1') as string,
       });
       return;
     }
     if (parseFloat(this.qty) <= 0) {
       uni.showToast({
-        icon: "none",
-        title: "请输入大于0的数量" as any,
+        icon: 'none',
+        title: this.$t('message.AppendMateriel2') as string,
       });
       return;
     }
     if (parseFloat(this.qty) > model.blDetailList[this.someIndex].amount) {
       uni.showToast({
-        icon: "none",
-        title: "不能大于需求数量，请重新输入" as any,
+        icon: 'none',
+        title: this.$t('message.AppendMateriel3') as string,
       });
       return;
     }
@@ -254,8 +208,8 @@ export default class RawReceiptDetail extends BasePage {
     });
     if (num > this.model.blDetailList[this.someIndex].amount) {
       uni.showToast({
-        icon: "none",
-        title: "不能大于需求数量，请重新输入" as any,
+        icon: 'none',
+        title: this.$t('message.AppendMateriel3') as string,
       });
       return;
     }
@@ -264,8 +218,8 @@ export default class RawReceiptDetail extends BasePage {
       this.LocationList.forEach((item: any) => {
         if (this.wlCode.sendSpot != item.Code) {
           uni.showToast({
-            icon: "none",
-            title: "请选择正确的库位" as any,
+            icon: 'none',
+            title: this.$t('message.AppendMateriel4') as string,
           });
           return (isTrue = false);
         }
@@ -273,8 +227,8 @@ export default class RawReceiptDetail extends BasePage {
     }
     if (this.some == {}) {
       uni.showToast({
-        icon: "none",
-        title: "请先选择一个物料" as any,
+        icon: 'none',
+        title: this.$t('message.AppendMateriel5') as string,
       });
       return;
     }
@@ -291,7 +245,7 @@ export default class RawReceiptDetail extends BasePage {
       TEM.wlCode = this.wlCode.label;
       TEM.qty = this.qty;
       this.model.blDetailList[this.someIndex].wlList.push(TEM);
-      this.qty = "";
+      this.qty = '';
       this.business();
     }
   }
@@ -308,10 +262,8 @@ export default class RawReceiptDetail extends BasePage {
     this.model.blDetailList[this.someIndex].fillAmount = num;
   }
   async onShow() {
-    let means: any = JSON.parse(
-      localStorage.getItem("__GWMS_APP_STATE_DATA__") as any
-    );
-    let sendSpot = JSON.parse(localStorage.getItem("sendSpot") as any);
+    let means: any = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
+    let sendSpot = JSON.parse(localStorage.getItem('sendSpot') as any);
     let content = {
       loginName: means.session.user.loginName,
       sendSpot: sendSpot,
@@ -322,7 +274,7 @@ export default class RawReceiptDetail extends BasePage {
     res.forEach((item: any) => {
       let pickerName: any = {};
       pickerName.label = item.locationCode;
-      pickerName.value = item.locationCode + "(" + item.sendSpot + ")";
+      pickerName.value = item.locationCode + '(' + item.sendSpot + ')';
       pickerName.sendSpot = item.sendSpot;
       this.Location.push(pickerName);
     });
@@ -334,14 +286,12 @@ export default class RawReceiptDetail extends BasePage {
   async bill() {
     if (this.some == {} || this.some.prdOrder == null) {
       uni.showToast({
-        icon: "none",
-        title: "请先选择一条物料" as any,
+        icon: 'none',
+        title: this.$t('message.Commission_tips6') as string,
       });
       return;
     }
-    let person = JSON.parse(
-      localStorage.getItem("__GWMS_APP_STATE_DATA__") as any
-    );
+    let person = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
     let content = {
       loginName: person.session.user.loginName,
       prdOrder: this.some.prdOrder,
@@ -364,8 +314,7 @@ export default class RawReceiptDetail extends BasePage {
 
 <style lang="scss" scoped>
 .page-picking-order {
-  background: #f2f2f2
-    linear-gradient(0deg, #311818 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
+  background: #f2f2f2 linear-gradient(0deg, #311818 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
   background-size: 100% 600rpx;
   padding: 30rpx;
   min-height: 100%;
diff --git a/src/pages/raw/handover/picking/index.vue b/src/pages/raw/handover/picking/index.vue
index c39f3f2..c29010d 100644
--- a/src/pages/raw/handover/picking/index.vue
+++ b/src/pages/raw/handover/picking/index.vue
@@ -2,7 +2,7 @@
   <view class="page-raw-receipt">
     <view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
       <view class="left">
-        <u-icon class="icon" name="arrow-left" @click="index" />
+        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
       </view>
       <view class="title">{{ $t('message.Pi_PickingQuery') }}</view>
       <view class="right"></view>
@@ -12,19 +12,19 @@
         <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-input v-model="form.mrpCodeRegion" :placeholder="$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 :label="$t('message.Pi_OrderNo')">
+            <u-input v-model="form.prdOrderFrom" :placeholder="$t('message.po_PleaseInput')" />
           </u-form-item>
           <!-- 工厂 -->
-          <u-form-item :required="true" :label="this.$t('message.Pi_factory')" prop="sapFactoryCode">
-            <u-input v-model="form.sapFactoryCode" :placeholder="this.$t('message.po_PleaseInput')" />
+          <u-form-item :required="true" :label="$t('message.Pi_factory')" prop="sapFactoryCode">
+            <u-input v-model="form.sapFactoryCode" :placeholder="$t('message.po_PleaseInput')" />
           </u-form-item>
           <!-- 物料号 -->
-          <u-form-item :label="this.$t('message.Pi_materielNo')">
-            <u-input v-model="form.materialCodeList" style="padding-left: 14px" :placeholder="this.$t('message.po_PleaseInput')" />
+          <u-form-item :label="$t('message.Pi_materielNo')">
+            <u-input v-model="form.materialCodeList" style="padding-left: 14px" :placeholder="$t('message.po_PleaseInput')" />
           </u-form-item>
         </u-col>
         <u-col :span="12">
@@ -43,7 +43,7 @@
           <u-button type="success" @click="onOk">{{ $t('message.dn_Confirm') }}</u-button>
         </u-col>
         <u-col :span="3">
-          <u-button type="error" @click="index">{{ $t('message.po_Return') }}</u-button>
+          <u-button type="error" @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button>
         </u-col>
       </u-row>
     </view>
@@ -152,9 +152,6 @@ export default class pickingDom extends BasePage {
     }
     return params;
   }
-  index() {
-    this.toPage(this.page.raw.index);
-  }
   // 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
   onReady() {
     this.$form.setRules(this.rules);
diff --git a/src/pages/raw/handover/picking/order.vue b/src/pages/raw/handover/picking/order.vue
index f5a58ea..98f8e56 100644
--- a/src/pages/raw/handover/picking/order.vue
+++ b/src/pages/raw/handover/picking/order.vue
@@ -4,20 +4,11 @@
       <view class="left">
         <u-icon class="icon" name="arrow-left" @click="index" />
       </view>
-      <view class="title">{{ $t("message.Pi_ByOrderPicking") }}</view>
+      <view class="title">{{ $t('message.Pi_ByOrderPicking') }}</view>
       <view class="right"></view>
     </view>
     <view class="table-wrapper">
-      <wyb-table
-        class="table"
-        ref="table"
-        width="100%"
-        enable-check="multiple"
-        show-left-and-right-border
-        :headers="headers"
-        :contents="model.proOrderResultList"
-        :show-vert-border="false"
-      ></wyb-table>
+      <wyb-table class="table" ref="table" width="100%" enable-check="multiple" show-left-and-right-border :headers="headers" :contents="model.proOrderResultList" :show-vert-border="false"></wyb-table>
     </view>
     <view class="bottom-bar">
       <div class="extra">
@@ -61,34 +52,21 @@
       <div class="container">
         <u-row>
           <u-col :span="3">
-            <u-button
-              type="primary"
-              @click="
-                model.checkAllProOrderResultList(
-                  !model.isProOrderResultCheckedAll
-                )
-              "
-            >
-              {{
-                model.isAggregateCheckedAll
-                  ? this.$t("message.po_noSelectAll")
-                  : this.$t("message.po_SelectAll")
-              }}
+            <u-button type="primary" @click="model.checkAllProOrderResultList(!model.isProOrderResultCheckedAll)">
+              {{ model.isAggregateCheckedAll ? $t('message.po_noSelectAll') : $t('message.po_SelectAll') }}
             </u-button>
           </u-col>
           <u-col :span="3">
-            <u-button type="primary" class="appoint" @click="appoint">{{
-              $t("message.Pi_distribution")
-            }}</u-button>
+            <u-button type="primary" class="appoint" @click="appoint">{{ $t('message.Pi_distribution') }}</u-button>
           </u-col>
           <u-col :span="3">
             <u-button type="success" @click="onSubmit">
-              {{ $t("message.dn_Confirm") }}
+              {{ $t('message.dn_Confirm') }}
             </u-button>
           </u-col>
           <u-col :span="3">
             <u-button type="error" @click="onUpload">
-              {{ $t("message.po_Submit") }}
+              {{ $t('message.po_Submit') }}
             </u-button>
           </u-col>
         </u-row>
@@ -98,18 +76,18 @@
 </template>
 
 <script lang="ts">
-import { Component, Ref } from "vue-property-decorator";
-import { BasePage } from "@/components/base/page";
-import model from "./model";
-import { orderHeaders } from "./config";
-import { VForm, VFormRules } from "vue/types/form";
+import { Component, Ref } from 'vue-property-decorator';
+import { BasePage } from '@/components/base/page';
+import model from './model';
+import { orderHeaders } from './config';
+import { VForm, VFormRules } from 'vue/types/form';
 
 @Component
 export default class RawReceiptDetail extends BasePage {
   /**
    * 表单引用
    */
-  @Ref("form") readonly $form!: VForm;
+  @Ref('form') readonly $form!: VForm;
 
   /**
    * 页面Module
@@ -132,7 +110,7 @@ export default class RawReceiptDetail extends BasePage {
   rules: VFormRules<any> = {
     // locationCode: [{ required: true, message: '请选择库存地点！' }],
     amount: [
-      { required: true, message: this.$t("message.Pi_tip1") as string },
+      { required: true, message: this.$t('message.Pi_tip1') as string },
       // { type: 'integer', min: 1, transform: Number, message: this.$t('message.Pi_tip2') as string },
     ],
   };
@@ -152,11 +130,11 @@ export default class RawReceiptDetail extends BasePage {
     this.model.proOrderResultList.forEach((item: any) => {
       item.currentAmount = 0;
     });
-    let ant: any = JSON.parse(sessionStorage.getItem("material") as string);
-    let index: any = JSON.parse(sessionStorage.getItem("index") as string);
+    let ant: any = JSON.parse(sessionStorage.getItem('material') as string);
+    let index: any = JSON.parse(sessionStorage.getItem('index') as string);
     this.model.proOrderResultList[index] = ant;
-    sessionStorage.removeItem("material");
-    sessionStorage.removeItem("index");
+    sessionStorage.removeItem('material');
+    sessionStorage.removeItem('index');
   }
   appoint() {
     let selectStatus = model.proOrderResultList.map((item) => {
@@ -174,21 +152,18 @@ export default class RawReceiptDetail extends BasePage {
     });
     if (i > 1) {
       uni.showToast({
-        icon: "none",
-        title: "只能选择一条物料" as string,
+        icon: 'none',
+        title: '只能选择一条物料' as string,
       });
     } else if (i == 0) {
       uni.showToast({
-        icon: "none",
-        title: "请选择一条物料" as string,
+        icon: 'none',
+        title: this.$t('message.AppendMateriel5') as string,
       });
     } else {
       let mater: number = selectStatus.indexOf(true);
-      sessionStorage.setItem(
-        "mater",
-        JSON.stringify(model.proOrderResultList[mater]) as string
-      );
-      sessionStorage.setItem("index", JSON.stringify(mater) as string);
+      sessionStorage.setItem('mater', JSON.stringify(model.proOrderResultList[mater]) as string);
+      sessionStorage.setItem('index', JSON.stringify(mater) as string);
       this.toPage(this.page.raw.handover.picking.idetailed);
     }
   }
@@ -199,8 +174,8 @@ export default class RawReceiptDetail extends BasePage {
     //判断是否有数据
     if (this.model.proOrderResultUploadList.length === 0) {
       uni.showToast({
-        icon: "none",
-        title: this.$t("message.Pi_tip4") as string,
+        icon: 'none',
+        title: this.$t('message.Pi_tip4') as string,
       });
       return;
     }
@@ -214,8 +189,8 @@ export default class RawReceiptDetail extends BasePage {
     //判断选中的列表是否为空
     if (checkData.length == 0) {
       uni.showToast({
-        icon: "none",
-        title: "请先选中要提交的数据" as string,
+        icon: 'none',
+        title: '请先选中要提交的数据' as string,
       });
       return;
     }
@@ -223,8 +198,8 @@ export default class RawReceiptDetail extends BasePage {
     checkData.forEach((item: any) => {
       if (item.wlList == null || item.wlList.length == 0) {
         uni.showToast({
-          icon: "none",
-          title: "请确保所选数据都已分配库位" as string,
+          icon: 'none',
+          title: '请确保所选数据都已分配库位' as string,
         });
         return;
       }
@@ -238,35 +213,34 @@ export default class RawReceiptDetail extends BasePage {
   async onSubmit() {
     if (!this.model.hasProOrderResultChecked) {
       uni.showToast({
-        icon: "none",
-        title: this.$t("message.Pi_tip7") as string,
+        icon: 'none',
+        title: this.$t('message.Pi_tip7') as string,
       });
       return;
     }
     this.$form.validate((valid) => {
       if (!valid) return;
       const list = this.model.checkedProOrderResultList;
-      const needLocationCode =
-        list.findIndex((_: any) => !_.currentWkposCode) > -1;
-      console.log("needLocationCode", needLocationCode);
+      const needLocationCode = list.findIndex((_: any) => !_.currentWkposCode) > -1;
+      console.log('needLocationCode', needLocationCode);
       // if (needLocationCode && !this.form.locationCode) {
       //   uni.showToast({ icon: 'none', title: this.$t('message.Pi_tip6') as string });
       //   return;
       // }
       const amount = Number(this.form.amount);
 
-      if (amount <= 0 || amount.toString().split(".")[1].length > 3) {
+      if (amount <= 0 || amount.toString().split('.')[1].length > 3) {
         uni.showToast({
-          icon: "none",
-          title: this.$t("message.Pi_tip2") as string,
+          icon: 'none',
+          title: this.$t('message.Pi_tip2') as string,
         });
         return;
       }
       for (const item of list) {
         if (amount + item.totalMoAmount > item.amount) {
           uni.showToast({
-            icon: "none",
-            title: this.$t("message.Pi_tip6") as string,
+            icon: 'none',
+            title: this.$t('message.Pi_tip6') as string,
           });
           return;
         }
@@ -280,8 +254,7 @@ export default class RawReceiptDetail extends BasePage {
 
 <style lang="scss" scoped>
 .page-picking-order {
-  background: #f2f2f2
-    linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
+  background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
   background-size: 100% 600rpx;
   padding: 30rpx;
   min-height: 100%;
diff --git a/src/pages/raw/handover/returning/Time-filter.vue b/src/pages/raw/handover/returning/Time-filter.vue
index bfd1bae..237a481 100644
--- a/src/pages/raw/handover/returning/Time-filter.vue
+++ b/src/pages/raw/handover/returning/Time-filter.vue
@@ -10,13 +10,13 @@
     <!-- 开始时间 -->
     <view style="display: flex">
       <u-field style="background: white; border-radius: 10rpx" v-model="startMobile" :placeholder="$t('message.starttime')" :label="$t('message.start')"> </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" @confirm="startConfirm"></u-picker>
+      <u-picker :confirm-text="$t('message.product_Confirm')" :cancel-text="$t('message.product_Cancel')" v-model="startShow" :params="startParams" mode="time" @confirm="startConfirm"></u-picker>
       <u-button @click="startShow = true" type="primary">{{ $t('message.workArea_Selelct') }}</u-button>
     </view>
     <!-- 结束时间 -->
     <view style="display: flex; margin-top: 20rpx">
       <u-field style="background: white; border-radius: 10rpx" v-model="endMobile" :placeholder="$t('message.endtime')" :label="$t('message.end')"> </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" @confirm="endConfirm"></u-picker>
+      <u-picker :confirm-text="$t('message.product_Confirm')" :cancel-text="$t('message.product_Cancel')" v-model="endShow" :params="endParams" mode="time" @confirm="endConfirm"></u-picker>
       <u-button @click="endShow = true" type="primary">{{ $t('message.workArea_Selelct') }}</u-button>
     </view>
     <!-- 表格 -->
diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue
index bc2ec0c..dffa84c 100644
--- a/src/pages/raw/handover/returning/index.vue
+++ b/src/pages/raw/handover/returning/index.vue
@@ -9,8 +9,8 @@
     </view>
     <u-form class="form" ref="form" :model="form" :error-type="['toast']" label-width="150rpx">
       <!-- 订单号 -->
-      <u-form-item :required="true" :label="this.$t('message.Pi_OrderNo')" prop="prdOrder">
-        <u-search :placeholder="this.$t('message.po_PleaseInput')" v-model="form.prdOrder" @search="model.queryOrderInInfo" :show-action="false"></u-search>
+      <u-form-item :required="true" :label="$t('message.Pi_OrderNo')" prop="prdOrder">
+        <u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.prdOrder" @search="model.queryOrderInInfo" :show-action="false"></u-search>
         <u-button size="mini" style="margin-left: 10rpx" type="primary" @click="screen">{{ $t('message.screen') }}</u-button>
         <!-- <jPicker
           sureColor="#ff0000"
@@ -24,20 +24,20 @@
         /> -->
       </u-form-item>
       <!-- 物料号 -->
-      <u-form-item :required="true" :label="this.$t('message.Pi_materielNo')" prop="wlName">
-        <u-input v-model="form.wlName" type="select" @click="materialCodeSelect = true" :placeholder="this.$t('message.po_PleaseInput')" />
-        <u-select :confirm-text="this.$t('message.product_Confirm')" :cancel-text="this.$t('message.product_Cancel')" v-model="materialCodeSelect" :list="model.materielList" @confirm="materialConfirm"></u-select>
+      <u-form-item :required="true" :label="$t('message.Pi_materielNo')" prop="wlName">
+        <u-input v-model="form.wlName" type="select" @click="materialCodeSelect = true" :placeholder="$t('message.po_PleaseInput')" />
+        <u-select :confirm-text="$t('message.product_Confirm')" :cancel-text="$t('message.product_Cancel')" v-model="materialCodeSelect" :list="model.materielList" @confirm="materialConfirm"></u-select>
       </u-form-item>
       <!-- 工位 -->
-      <u-form-item :label="this.$t('message.Pi_Station')">
-        <u-input v-model="form.sendSpot" :placeholder="this.$t('message.po_PleaseInput')" />
+      <u-form-item :label="$t('message.Pi_Station')">
+        <u-input v-model="form.sendSpot" :placeholder="$t('message.po_PleaseInput')" />
       </u-form-item>
       <!-- 库存 -->
       <view class="newly">
-        <u-form-item :label="this.$t('message.po_Location')" style="width: 50%">
-          <u-input v-model="form.wkposCode" @blur="cnoso" :placeholder="this.$t('message.po_PleaseInput')" />
+        <u-form-item :label="$t('message.po_Location')" style="width: 50%">
+          <u-input v-model="form.wkposCode" @blur="cnoso" :placeholder="$t('message.po_PleaseInput')" />
         </u-form-item>
-        <u-form-item :label="this.$t('message.product_Location')" style="width: 50%; margin-top: 16rpx">
+        <u-form-item :label="$t('message.product_Location')" style="width: 50%; margin-top: 16rpx">
           <!-- <u-input
             v-model="form.wkposCode"
             :placeholder="this.$t('message.po_PleaseInput')"
@@ -48,23 +48,23 @@
       <!-- 工厂 -->
       <u-row gutter="0">
         <u-col :span="7">
-          <u-form-item :label="this.$t('message.Pi_factory')" prop="sapFactoryCode">
+          <u-form-item :label="$t('message.Pi_factory')" prop="sapFactoryCode">
             <u-input :disabled="true" v-model="model.orderInInfo.sapFactoryCode" placeholder="" />
           </u-form-item>
         </u-col>
         <u-col :span="5">
-          <u-form-item :required="true" :label="this.$t('message.Summary_Number')" prop="amount" label-width="80rpx">
-            <u-input v-model="form.amount" :placeholder="this.$t('message.po_PleaseInput')" style="margin-left: 12px" />
+          <u-form-item :required="true" :label="$t('message.Summary_Number')" prop="amount" label-width="80rpx">
+            <u-input v-model="form.amount" :placeholder="$t('message.po_PleaseInput')" style="margin-left: 12px" />
           </u-form-item>
         </u-col>
       </u-row>
       <!-- 工位退料人 -->
-      <u-form-item :required="true" :label="this.$t('message.return_OperatorName')" prop="operator">
-        <u-input v-model="operatorName" @confirm="onOperatorConfirm" :placeholder="this.$t('message.po_PleaseInput')" />
+      <u-form-item :required="true" :label="$t('message.return_OperatorName')" prop="operator">
+        <u-input v-model="operatorName" @confirm="onOperatorConfirm" :placeholder="$t('message.po_PleaseInput')" />
       </u-form-item>
       <!-- 口令 -->
-      <u-form-item :label="this.$t('message.Summary_Password')">
-        <u-input v-model="form.rfPwd" type="password" :placeholder="this.$t('message.po_PleaseInput')" />
+      <u-form-item :label="$t('message.Summary_Password')">
+        <u-input v-model="form.rfPwd" type="password" :placeholder="$t('message.po_PleaseInput')" />
       </u-form-item>
     </u-form>
     <view class="bottom-bar">
@@ -162,7 +162,7 @@ export default class returningDom extends BasePage {
     let means: any = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
     let sendSpot = JSON.parse(localStorage.getItem('sendSpot') as any);
     if (JSON.parse(sessionStorage.getItem('data') as any)) {
-      this.data = JSON.parse(sessionStorage.getItem('data') as any)
+      this.data = JSON.parse(sessionStorage.getItem('data') as any);
       this.form.prdOrder = this.data.label;
       this.form.wlName = this.data.value;
       this.form.sendSpot = this.data.sendSpot;