diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index fdfec64..ae74edf 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -172,7 +172,9 @@ export default {
     ModelScanned: '型号已扫',
     Pi_tip13: '请选择要提交的物料',
     Pi_tip15: '请确保交接数量等于需求数量',
-
+    Pi_tip16: '只能选择一个DN单',
+    Pi_tip17: '请选择一条DN单',
+    Pi_tip18: '请选中要移库的数据',
     //汇总交接
     Summary_Query: '汇总查询',
     Summary_Contain: '包含',
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 442985d..5ebec22 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -29,6 +29,9 @@ export default {
     operation: 'Operation',
     Pi_tip13: 'Please select the material to submit',
     Pi_tip15: 'Please ensure that the handover quantity is equal to the demand quantity',
+    Pi_tip16: 'You can only select one DN list',
+    Pi_tip17: 'Please select a dn list',
+    Pi_tip18: 'Please select the data to be moved',
     //版本更新
     updatePrompt: 'Update tips',
     Tip1: 'New version detected, update?',
diff --git a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
index d995803..f3edb94 100644
--- a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
+++ b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
@@ -159,16 +159,13 @@ export default class dnReceiptDom extends BasePage {
   //输入单号 查询数据
   async query() {
     if (!this.form.documentNo) {
-      uni.showToast({
-        icon: 'none',
-        title: this.$t('message.Commission_tips1') as any,
-      });
+      this.customToast(this.$t('message.Commission_tips1') as any);
       return;
     }
     await this.model.ImportQueryOrderInfo(this.form.documentNo.trim());
     if (model.code == '1') {
       uni.showToast({
-        icon: 'none',
+        icon: 'success',
         title: this.$t('message.successful') as any,
       });
       console.log('orderInInfoList', this.model.orderInInfoList);
@@ -264,33 +261,21 @@ export default class dnReceiptDom extends BasePage {
     // const count = this.totalLocation(this.LocationList);
     const count = parseFloat(this.every.requestAmount);
     if (this.receiptAmount == '' || !this.wl.value) {
-      uni.showToast({
-        icon: 'none',
-        title: this.$t('message.Commission_tips2') as any,
-      });
+      this.customToast(this.$t('message.Commission_tips2') as any);
       return;
     }
     if (parseFloat(this.receiptAmount) <= 0) {
-      uni.showToast({
-        icon: 'none',
-        title: this.$t('message.Commission_tips3') as any,
-      });
+      this.customToast(this.$t('message.Commission_tips3') as any);
       return;
     }
     if (parseFloat(this.receiptAmount) > count || parseFloat(this.receiptAmount) + parseFloat(this.every.receiptAmount) > count) {
-      uni.showToast({
-        icon: 'none',
-        title: this.$t('message.Commission_tips4') as any,
-      });
+      this.customToast(this.$t('message.Commission_tips4') as any);
       return;
     }
     let isTrue = true;
     this.DNReceivingList[this.everyIndex].wllist.forEach((item: any) => {
       if (item.wlCode == this.wl.label && item.receiptAmount == this.receiptAmount) {
-        uni.showToast({
-          icon: 'none',
-          title: this.$t('message.repeatedly') as any,
-        });
+        this.customToast(this.$t('message.repeatedly') as any);
         return (isTrue = false);
       }
     });
@@ -369,10 +354,7 @@ export default class dnReceiptDom extends BasePage {
   }
   async onSubmit() {
     if (this.LocationList.length === 0) {
-      uni.showToast({
-        icon: 'none',
-        title: this.$t('message.Commission_tips5') as any,
-      });
+      this.customToast(this.$t('message.Commission_tips5') as any);
       return null;
     }
     await this.model.submitOrderInEnter(this.DNReceivingList);
@@ -380,10 +362,7 @@ export default class dnReceiptDom extends BasePage {
   }
   async bill() {
     if (this.form.documentNo == '') {
-      uni.showToast({
-        icon: 'none',
-        title: this.$t('message._tips6') as any,
-      });
+      this.customToast(this.$t('message._tips6') as any);
       return;
     }
     let person = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
diff --git a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
index 7be13e8..bc1287e 100644
--- a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
+++ b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
@@ -168,16 +168,13 @@ export default class dnReceiptDom extends BasePage {
   //输入单号 查询数据
   async query() {
     if (!this.form.documentNo) {
-      uni.showToast({
-        icon: 'none',
-        title: this.$t('message.Commission_tips1') as any,
-      });
+      this.customToast(this.$t('message.Commission_tips1') as any);
       return;
     }
     await this.model.queryOrderInInfo(this.form.documentNo.trim());
     if (model.code == '1') {
       uni.showToast({
-        icon: 'none',
+        icon: 'success',
         title: this.$t('message.successful') as any,
       });
       console.log('orderInInfoList', this.model.orderInInfoList);
@@ -273,33 +270,21 @@ export default class dnReceiptDom extends BasePage {
     // const count = this.totalLocation(this.LocationList);
     const count = parseFloat(this.every.requestAmount);
     if (this.receiptAmount == '' || !this.wl.value) {
-      uni.showToast({
-        icon: 'none',
-        title: this.$t('message.Commission_tips2') as any,
-      });
+      this.customToast(this.$t('message.Commission_tips2') as any);
       return;
     }
     if (parseFloat(this.receiptAmount) <= 0) {
-      uni.showToast({
-        icon: 'none',
-        title: this.$t('message.Commission_tips3') as any,
-      });
+      this.customToast(this.$t('message.Commission_tips3') as any);
       return;
     }
     if (parseFloat(this.receiptAmount) > count || parseFloat(this.receiptAmount) + parseFloat(this.every.receiptAmount) > count) {
-      uni.showToast({
-        icon: 'none',
-        title: this.$t('message.Commission_tips4') as any,
-      });
+      this.customToast(this.$t('message.Commission_tips4') as any);
       return;
     }
     let isTrue = true;
     this.DNReceivingList[this.everyIndex].wllist.forEach((item: any) => {
       if (item.wlCode == this.wl.label && item.receiptAmount == this.receiptAmount) {
-        uni.showToast({
-          icon: 'none',
-          title: this.$t('message.repeatedly') as any,
-        });
+        this.customToast(this.$t('message.repeatedly') as any);
         return (isTrue = false);
       }
     });
@@ -378,10 +363,7 @@ export default class dnReceiptDom extends BasePage {
   }
   async onSubmit() {
     if (this.LocationList.length === 0) {
-      uni.showToast({
-        icon: 'none',
-        title: this.$t('message.Commission_tips5') as any,
-      });
+      this.customToast(this.$t('message.Commission_tips5') as any);
       return null;
     }
     await this.model.submitOrderInEnter(this.DNReceivingList);
@@ -389,10 +371,7 @@ export default class dnReceiptDom extends BasePage {
   }
   async bill() {
     if (this.form.documentNo == '') {
-      uni.showToast({
-        icon: 'none',
-        title: this.$t('message._tips6') as any,
-      });
+      this.customToast(this.$t('message._tips6') as any);
       return;
     }
     let person = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
diff --git a/src/pages/raw/ingoods/dnReturnGoods/Local-details.vue b/src/pages/raw/ingoods/dnReturnGoods/Local-details.vue
index 222b0d7..dcbcc87 100644
--- a/src/pages/raw/ingoods/dnReturnGoods/Local-details.vue
+++ b/src/pages/raw/ingoods/dnReturnGoods/Local-details.vue
@@ -49,11 +49,8 @@ export default class RawReceiptDetail extends BasePage {
   headers = headers;
   poNo: any = "";
   async generate() {
-    if (this.poNo == "") {
-      uni.showToast({
-        icon: "none",
-        title: this.$t("message._tips6") as any,
-      });
+    if (this.poNo == '') {
+      this.customToast(this.$t('message._tips6') as any);
       return;
     }
     let content = {
diff --git a/src/pages/raw/ingoods/dnReturnGoods/Location.vue b/src/pages/raw/ingoods/dnReturnGoods/Location.vue
index 1dac32b..aa958bc 100644
--- a/src/pages/raw/ingoods/dnReturnGoods/Location.vue
+++ b/src/pages/raw/ingoods/dnReturnGoods/Location.vue
@@ -4,78 +4,51 @@
       <view class="left">
         <u-icon class="icon" name="arrow-left" @click="index" />
       </view>
-      <view class="title">{{ $t("message.rawMenu_ReturnGoods") }}</view>
+      <view class="title">{{ $t('message.rawMenu_ReturnGoods') }}</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.dnReturnList"
-        :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.dnReturnList" :show-vert-border="false" @onCheck="handleRow"></wyb-table>
     </view>
     <!-- 列表展示数据 -->
     <view class="Exhibition">
       <view class="Exhibition-left">
-        <view class="Exhibition-left-title"
-          >{{ $t("message.return_Type") }}:</view
-        >
+        <view class="Exhibition-left-title">{{ $t('message.return_Type') }}:</view>
         <view class="Exhibition-left-data">{{ some.poType }}</view>
       </view>
       <view class="Exhibition-right">
-        <view class="Exhibition-right-title"
-          >{{ $t("message.po_ReturnGoodsQuantity") }}:</view
-        >
+        <view class="Exhibition-right-title">{{ $t('message.po_ReturnGoodsQuantity') }}:</view>
         <view class="Exhibition-right-data">{{ some.poAmount }}</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>
@@ -89,18 +62,16 @@
       <div class="container">
         <u-row>
           <u-col :span="4">
-            <u-button type="primary" class="appoint" @click="appoint">{{
-              $t("message.detailed")
-            }}</u-button>
+            <u-button type="primary" class="appoint" @click="appoint">{{ $t('message.detailed') }}</u-button>
           </u-col>
           <u-col :span="4">
             <u-button type="success" @click="onSubmit">
-              {{ $t("message.po_Submit") }}
+              {{ $t('message.po_Submit') }}
             </u-button>
           </u-col>
           <u-col :span="4">
             <u-button type="error" @click="onUpload">
-              {{ $t("message.po_Return") }}
+              {{ $t('message.po_Return') }}
             </u-button>
           </u-col>
         </u-row>
@@ -110,13 +81,13 @@
 </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 { 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';
 @Component({
   components: {
     jPicker,
@@ -126,26 +97,26 @@ export default class RawReceiptDetail extends BasePage {
   /**
    * 表单引用
    */
-  @Ref("form") readonly $form!: VForm;
-  @Ref("submitForm") readonly $submitForm!: VForm;
+  @Ref('form') readonly $form!: VForm;
+  @Ref('submitForm') readonly $submitForm!: VForm;
   submitForm = {
-    receiver: "",
-    receiverName: "",
-    password: "",
+    receiver: '',
+    receiverName: '',
+    password: '',
   };
   /**
    * 页面Module
    */
   model = model;
-  type = "text";
-  wlCode: any = "";
+  type = 'text';
+  wlCode: any = '';
   border = true;
   //添加库位和数量的列表
   LocationList: any = [];
   //库位
   Location: any = [];
   some: any = {};
-  qty: any = "";
+  qty: any = '';
   /**
    * 表单数据
    */
@@ -162,7 +133,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 },
     ],
   };
@@ -178,9 +149,7 @@ export default class RawReceiptDetail extends BasePage {
   headers = headers;
   //页面初始化
   async onReady() {
-    let means: any = JSON.parse(
-      localStorage.getItem("__GWMS_APP_STATE_DATA__") as any
-    );
+    let means: any = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
     let user: any = session.user;
     let content = {
       loginName: means.session.user.loginName,
@@ -191,7 +160,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);
     });
@@ -203,37 +172,25 @@ export default class RawReceiptDetail extends BasePage {
   //表格单选触发事件
   handleRow({ data }: any) {
     this.LocationList = [];
-    this.qty = "";
+    this.qty = '';
     this.some = data[0].lineData;
   }
   //添加触发事件
   Add() {
-    if (this.qty == "" || this.wlCode == "") {
-      uni.showToast({
-        icon: "none",
-        title: this.$t("message.Commission_tips2") as any,
-      });
+    if (this.qty == '' || this.wlCode == '') {
+     this.customToast(this.$t('message.Commission_tips2') as any);
       return;
     }
     if (parseFloat(this.qty) <= 0) {
-      uni.showToast({
-        icon: "none",
-        title: this.$t("message.Commission_tips3") as any,
-      });
+      this.customToast(this.$t('message.Commission_tips3') as any);
       return;
     }
     if (parseFloat(this.qty) > parseFloat(this.some.poAmount)) {
-      uni.showToast({
-        icon: "none",
-        title: this.$t("message.quantitys") as any,
-      });
+      this.customToast(this.$t('message.quantitys') as any);
       return;
     }
     if (this.some == {}) {
-      uni.showToast({
-        icon: "none",
-        title: this.$t("message.Commission_tips6") as any,
-      });
+      this.customToast(this.$t('message.Commission_tips6') as any);
       return;
     }
     let num: number = parseFloat(this.qty);
@@ -241,10 +198,7 @@ export default class RawReceiptDetail extends BasePage {
       num += parseFloat(item.qty);
     });
     if (num > parseFloat(this.some.poAmount)) {
-      uni.showToast({
-        icon: "none",
-        title: this.$t("message.dn_Tip2") as any,
-      });
+      this.customToast(this.$t('message.dn_Tip2') as any);
       return;
     }
     let arr = {
@@ -258,7 +212,7 @@ export default class RawReceiptDetail extends BasePage {
       nowAmount: this.qty,
     };
     this.some.list.push(TEM);
-    this.qty = "";
+    this.qty = '';
   }
   //删除某一项 触发事件
   deleteItem(index: any) {
@@ -272,15 +226,12 @@ export default class RawReceiptDetail extends BasePage {
    * 提交
    */
   async onSubmit() {
-    let num: number = 0;
+    let num = 0;
     this.some.list.forEach((item: any) => {
       num += parseFloat(item.nowAmount);
     });
     if (num != parseFloat(this.some.poAmount)) {
-      uni.showToast({
-        icon: "none",
-        title: this.$t("message.actual") as any,
-      });
+      this.customToast(this.$t('message.actual') as any);
       return;
     }
     await this.model.submit({
@@ -297,8 +248,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/ingoods/dnReturnGoods/index.vue b/src/pages/raw/ingoods/dnReturnGoods/index.vue
index 4d2beec..c08b63b 100644
--- a/src/pages/raw/ingoods/dnReturnGoods/index.vue
+++ b/src/pages/raw/ingoods/dnReturnGoods/index.vue
@@ -1,59 +1,33 @@
 <template>
   <view class="page-raw-receipt">
-    <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="index" />
       </view>
-      <view class="title">{{ $t("message.po_ReturnGoods") }}</view>
+      <view class="title">{{ $t('message.po_ReturnGoods') }}</view>
       <view class="right"></view>
     </view>
     <u-form class="form" ref="form" :model="form" label-width="180rpx">
-      <u-form-item
-        :required="true"
-        :label="this.$t('message.dn_OddNumbers')"
-        prop="documentNo"
-      >
-        <u-search
-          :placeholder="this.$t('message.dn_PleaseScan')"
-          v-model="form.documentNo"
-          @search="model.queryOrder"
-          :show-action="false"
-        ></u-search>
+      <u-form-item :required="true" :label="this.$t('message.dn_OddNumbers')" prop="documentNo">
+        <u-search :placeholder="this.$t('message.dn_PleaseScan')" v-model="form.documentNo" @search="model.queryOrder" :show-action="false"></u-search>
       </u-form-item>
       <u-form-item :label="$t('message.po_Supplier')">
-        <u-input
-          v-model="model.orderInInfo.supplyCode"
-          :placeholder="$t('message.po_PleaseInput')"
-        />
+        <u-input v-model="model.orderInInfo.supplyCode" :placeholder="$t('message.po_PleaseInput')" />
       </u-form-item>
       <u-form-item :label="$t('message.po_OrderType')">
-        <u-input
-          v-model="model.orderInInfo.poType"
-          :placeholder="$t('message.po_PleaseInput')"
-        />
+        <u-input v-model="model.orderInInfo.poType" :placeholder="$t('message.po_PleaseInput')" />
       </u-form-item>
       <u-form-item :label="$t('message.po_Location')">
-        <u-input
-          :disabled="true"
-          v-model="model.orderInInfo.wlCode"
-          placeholder=""
-        />
+        <u-input :disabled="true" v-model="model.orderInInfo.wlCode" placeholder="" />
       </u-form-item>
     </u-form>
     <view class="bottom-bar">
       <u-row class="button-bar">
         <u-col :span="6">
-          <u-button type="primary" @click="onSubmit">{{
-            $t("message.po_Continue")
-          }}</u-button>
+          <u-button type="primary" @click="onSubmit">{{ $t('message.po_Continue') }}</u-button>
         </u-col>
         <u-col :span="6">
-          <u-button type="error" @click="back">{{
-            $t("message.po_Return")
-          }}</u-button>
+          <u-button type="error" @click="back">{{ $t('message.po_Return') }}</u-button>
         </u-col>
       </u-row>
     </view>
@@ -61,10 +35,10 @@
 </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 { Component, Ref } from 'vue-property-decorator';
+import { BasePage } from '@/components/base/page';
+import { VForm, VFormRules } from 'vue/types/form';
+import model from './model';
 
 interface OptionType {
   label: string;
@@ -76,7 +50,7 @@ export default class dnReturnGoodsDom extends BasePage {
   /**
    * 表单引用
    */
-  @Ref("form") readonly $form!: VForm;
+  @Ref('form') readonly $form!: VForm;
 
   /**
    * 页面Module
@@ -95,13 +69,11 @@ export default class dnReturnGoodsDom extends BasePage {
   cboPlaceSelect = false;
 
   rules: VFormRules<any> = {
-    documentNo: [
-      { required: true, message: this.$t("message.dn_PleaseScan") as string },
-    ],
+    documentNo: [{ required: true, message: this.$t('message.dn_PleaseScan') as string }],
     // cboPlace: [{ required: true, message: '请选择sap库存地点' }],
   };
 
-  value = "";
+  value = '';
   show = false;
 
   // 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
@@ -112,9 +84,9 @@ export default class dnReturnGoodsDom extends BasePage {
     this.$form.resetFields();
     // this.model.orderInInfo.carNo = '';
     // this.model.orderInInfo.bookingTime = '';
-    this.model.orderInInfo.supplyCode = "";
-    this.model.orderInInfo.poType = "";
-    this.model.orderInInfo.location = "";
+    this.model.orderInInfo.supplyCode = '';
+    this.model.orderInInfo.poType = '';
+    this.model.orderInInfo.location = '';
   }
   back() {
     uni.navigateBack({ delta: 1 });
@@ -124,10 +96,7 @@ export default class dnReturnGoodsDom extends BasePage {
       if (!valid) return;
       console.log(1);
       if (this.model.orderInInfo == []) {
-        uni.showToast({
-          icon: "none",
-          title: this.$t("message.dn_PleaseScan") as string,
-        });
+        this.customToast(this.$t('message.dn_PleaseScan') as string);
         return;
       }
       this.toPage(this.page.raw.ingoods.dnReturnGoods.location);
@@ -138,8 +107,7 @@ export default class dnReturnGoodsDom extends BasePage {
 
 <style lang="scss" scoped>
 .page-raw-receipt {
-  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/raw/ingoods/poReceipt/detail.vue b/src/pages/raw/ingoods/poReceipt/detail.vue
index 6893bf3..b17c2cb 100644
--- a/src/pages/raw/ingoods/poReceipt/detail.vue
+++ b/src/pages/raw/ingoods/poReceipt/detail.vue
@@ -4,20 +4,11 @@
       <view class="left">
         <u-icon class="icon" name="arrow-left" @click="gohome" />
       </view>
-      <view class="title">{{ $t("message.po_Detailed") }}</view>
+      <view class="title">{{ $t('message.po_Detailed') }}</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.orderInInfoList"
-        :show-vert-border="false"
-      ></wyb-table>
+      <wyb-table class="table" ref="table" width="100%" enable-check="single" show-left-and-right-border :headers="headers" :contents="model.orderInInfoList" :show-vert-border="false"></wyb-table>
     </view>
     <view class="bottom-bar">
       <!-- <div class="extra">
@@ -59,29 +50,16 @@
       <div class="container">
         <u-row>
           <u-col :span="3">
-            <u-button
-              type="primary"
-              @click="model.checkAllOrderInInfoList(!model.isCheckedAll)"
-            >
-              {{
-                model.isCheckedAll
-                  ? this.$t("message.po_noSelectAll")
-                  : this.$t("message.po_SelectAll")
-              }}
+            <u-button type="primary" @click="model.checkAllOrderInInfoList(!model.isCheckedAll)">
+              {{ model.isCheckedAll ? this.$t('message.po_noSelectAll') : this.$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"
-              :loading="$wait.is('*submitOrderInEnter')"
-              @click="onSubmit"
-            >
-              {{ $t("message.po_Submit") }}
+            <u-button type="success" :loading="$wait.is('*submitOrderInEnter')" @click="onSubmit">
+              {{ $t('message.po_Submit') }}
             </u-button>
           </u-col>
           <!--          <u-col :span="3">-->
@@ -90,9 +68,7 @@
           <!--            </u-button>-->
           <!--          </u-col>-->
           <u-col :span="3">
-            <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>
       </div>
@@ -101,12 +77,12 @@
 </template>
 
 <script lang="ts">
-import { Component } from "vue-property-decorator";
-import { BasePage } from "@/components/base/page";
-import model from "./model";
-import { headers } from "./config";
-import jPicker from "@/components/J-Picker/jPicker.vue";
-import { session } from "@/store/modules/session";
+import { Component } from 'vue-property-decorator';
+import { BasePage } from '@/components/base/page';
+import model from './model';
+import { headers } from './config';
+import jPicker from '@/components/J-Picker/jPicker.vue';
+import { session } from '@/store/modules/session';
 // import { page } from '@/utils/page';
 // @Component
 @Component({
@@ -124,7 +100,7 @@ export default class RawReceiptDetail extends BasePage {
   /**
    * 库位
    */
-  locationCode = "";
+  locationCode = '';
 
   /**
    * 表头
@@ -133,9 +109,9 @@ export default class RawReceiptDetail extends BasePage {
   /**
    * 实际数量
    */
-  number = "";
+  number = '';
   //上个页面获取PO单号
-  poNo = "";
+  poNo = '';
   /**
    * 逐条修改
    */
@@ -143,46 +119,40 @@ export default class RawReceiptDetail extends BasePage {
   //页面初始化
   onShow() {
     this.model.queryLocation();
-    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.orderInInfoList[index] = ant;
     console.log(this.model.orderInInfoList);
-    this.poNo = JSON.parse(sessionStorage.getItem("poNo") as string);
-    sessionStorage.removeItem("material");
-    sessionStorage.removeItem("index");
+    this.poNo = JSON.parse(sessionStorage.getItem('poNo') as string);
+    sessionStorage.removeItem('material');
+    sessionStorage.removeItem('index');
   }
   //返回单号查询页面
   gohome() {
     this.toPage(this.page.raw.ingoods.poReceipt.index);
-    sessionStorage.removeItem("material");
-    sessionStorage.removeItem("index");
-    sessionStorage.removeItem("poNo");
+    sessionStorage.removeItem('material');
+    sessionStorage.removeItem('index');
+    sessionStorage.removeItem('poNo');
   }
   bookTypeChange(e: any) {
     this.locationCode = e.pickerName.value;
   }
   changeNumber() {
     if (!this.model.hasChecked) {
-      uni.showToast({
-        icon: "none",
-        title: this.$t("message.dn_Select") as string,
-      });
+      this.customToast(this.$t('message.dn_Select') as string);
       return;
     }
     //改变列表的值
     this.model.orderInInfoList.forEach((item: any) => {
-      console.log("item.checked", item.checked);
+      console.log('item.checked', item.checked);
       if (item.checked) {
         if (this.locationCode) {
           item.location = this.locationCode;
         }
         if (this.number > item.requestAmount) {
-          uni.showToast({
-            icon: "none",
-            title: this.$t("message.dn_Tip") as string,
-          });
+          this.customToast(this.$t('message.dn_Tip') as string);
           return;
-        } else if (this.number == "") {
+        } else if (this.number == '') {
           item.receiptAmount = item.requestAmount;
         } else {
           item.receiptAmount = this.number;
@@ -207,21 +177,18 @@ export default class RawReceiptDetail extends BasePage {
     });
     if (i > 1) {
       uni.showToast({
-        icon: "none",
-        title: "只能选择一个PO单" as string,
+        icon: 'none',
+        title: '只能选择一个PO单' as string,
       });
     } else if (i == 0) {
       uni.showToast({
-        icon: "none",
-        title: "请选择一个PO单" as string,
+        icon: 'none',
+        title: '请选择一个PO单' as string,
       });
     } else {
       let mater: number = selectStatus.indexOf(true);
-      sessionStorage.setItem(
-        "mater",
-        JSON.stringify(model.orderInInfoList[mater]) as string
-      );
-      sessionStorage.setItem("index", JSON.stringify(mater) as string);
+      sessionStorage.setItem('mater', JSON.stringify(model.orderInInfoList[mater]) as string);
+      sessionStorage.setItem('index', JSON.stringify(mater) as string);
       this.toPage(this.page.raw.ingoods.poReceipt.idetailed);
     }
   }
@@ -232,8 +199,8 @@ export default class RawReceiptDetail extends BasePage {
     //判断是否有数据
     if (this.model.orderInInfoList.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;
     }
@@ -245,31 +212,31 @@ export default class RawReceiptDetail extends BasePage {
       }
     });
     //判断选中的列表是否为空
-    if(checkData.length  == 0){
+    if (checkData.length == 0) {
       uni.showToast({
-        icon: "none",
+        icon: 'none',
         title: '请先选中要提交的数据' as string,
       });
-      return
+      return;
     }
     //判断选中的数据中 是否存在没分配库位的数据
-    let isTrue:boolean = true
-    checkData.forEach((item:any) => {
-      if(item.wllist == null || item.wllist.length == 0){
+    let isTrue: boolean = true;
+    checkData.forEach((item: any) => {
+      if (item.wllist == null || item.wllist.length == 0) {
         uni.showToast({
-        icon: "none",
-        title: '请确保所选数据都已分配库位' as string,
+          icon: 'none',
+          title: '请确保所选数据都已分配库位' as string,
         });
-        isTrue = false
+        isTrue = false;
         return;
       }
-    })
-    if(isTrue == true){
+    });
+    if (isTrue == true) {
       await this.model.submitOrderInEnter(checkData);
-      this.locationCode = "";
-      this.model.orderInInfo.supplyCode = "";
-      this.model.orderInInfo.poType = "";
-      this.model.orderInInfo.location = "";
+      this.locationCode = '';
+      this.model.orderInInfo.supplyCode = '';
+      this.model.orderInInfo.poType = '';
+      this.model.orderInInfo.location = '';
       this.model.queryOrderInInfo(this.poNo);
       await this.redirectTo(this.page.raw.ingoods.poReceipt.detail);
     }
@@ -282,8 +249,7 @@ export default class RawReceiptDetail extends BasePage {
 
 <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/warehouse/rowCollect/details.vue b/src/pages/raw/warehouse/rowCollect/details.vue
index 9009b11..34adc1f 100644
--- a/src/pages/raw/warehouse/rowCollect/details.vue
+++ b/src/pages/raw/warehouse/rowCollect/details.vue
@@ -69,10 +69,7 @@ export default class KanDanHandOverDetails extends BasePage {
       }
     });
     if (orderlist.length == 0) {
-      uni.showToast({
-        icon: 'none',
-        title: '请先选中要移库的数据' as any,
-      });
+      this.customToast(this.$t('message.Pi_tip18') as string);
       return;
     }
     orderlist.forEach((item: any) => {
diff --git a/src/pages/raw/warehouse/rowCollect/index.vue b/src/pages/raw/warehouse/rowCollect/index.vue
index 1f12565..c210d6f 100644
--- a/src/pages/raw/warehouse/rowCollect/index.vue
+++ b/src/pages/raw/warehouse/rowCollect/index.vue
@@ -75,14 +75,14 @@ export default class KanDanHandOver extends BasePage {
   //查询单号
   async query() {
     if (this.order3 === '') {
-      uni.showToast({ icon: 'none', title: this.$t('message.Commission_tips1') as string });
+      this.customToast(this.$t('message.Commission_tips1') as string);
       return;
     } else {
       await this.model.takeLYOrder({
         order3: this.order3,
       });
       if (this.model.code == '1') {
-        uni.showToast({ icon: 'none', title: this.$t('message.successful') as string });
+        uni.showToast({ icon: 'success', title: this.$t('message.successful') as string });
         this.model.orderInInfoList.forEach((item: any) => {
           item.fileNo = '';
           let arr: any = {
@@ -108,15 +108,15 @@ export default class KanDanHandOver extends BasePage {
   //提交
   async submit() {
     if (this.order3 === '') {
-      uni.showToast({ icon: 'none', title: this.$t('message.Commission_tips1') as string });
+      this.customToast(this.$t('message.Commission_tips1') as string);
       return;
     }
     if (!this.Some) {
-      uni.showToast({ icon: 'none', title: this.$t('message.Warehouse_Tip5') as string });
+      this.customToast(this.$t('message.Warehouse_Tip5') as string);
       return;
     }
     if (this.Some.fileNo == '' || this.Some.fileNo == null || this.Some.fileNo == undefined) {
-      uni.showToast({ icon: 'none', title: this.$t('message.fileNumber') as string });
+      this.customToast(this.$t('message.fileNumber') as string);
       return;
     }
     let orderlist = [];
@@ -126,7 +126,7 @@ export default class KanDanHandOver extends BasePage {
     orderlist.push(this.Some);
     await model.onTakeoutConfirm(orderlist);
     if (this.model.code == '1') {
-      uni.showToast({ icon: 'none', title: this.$t('message.success') as string });
+      uni.showToast({ icon: 'success', title: this.$t('message.success') as string });
       this.Some = {};
       this.Some.fileNo = ' ';
       this.wl = {};
diff --git a/src/pages/raw/warehouse/rowInventory/detail.vue b/src/pages/raw/warehouse/rowInventory/detail.vue
index 21cd306..8ce4577 100644
--- a/src/pages/raw/warehouse/rowInventory/detail.vue
+++ b/src/pages/raw/warehouse/rowInventory/detail.vue
@@ -4,20 +4,11 @@
       <view class="left">
         <u-icon class="icon" name="arrow-left" @click="gohome" />
       </view>
-      <view class="title">{{ $t("message.dn_Detailed") }}</view>
+      <view class="title">{{ $t('message.dn_Detailed') }}</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.orderInInfoList"
-        :show-vert-border="false"
-      ></wyb-table>
+      <wyb-table class="table" ref="table" width="100%" enable-check="single" show-left-and-right-border :headers="headers" :contents="model.orderInInfoList" :show-vert-border="false"></wyb-table>
     </view>
     <view class="bottom-bar">
       <!-- <div>
@@ -28,35 +19,20 @@
       <div class="container">
         <u-row>
           <u-col :span="3">
-            <u-button
-              type="warning"
-              @click="model.checkAllOrderInInfoList(!model.isCheckedAll)"
-            >
-              {{
-                model.isCheckedAll
-                  ? this.$t("message.po_noSelectAll")
-                  : this.$t("message.po_SelectAll")
-              }}
+            <u-button type="warning" @click="model.checkAllOrderInInfoList(!model.isCheckedAll)">
+              {{ model.isCheckedAll ? this.$t('message.po_noSelectAll') : this.$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"
-              :loading="$wait.is('*submitOrderInEnter')"
-              @click="onSubmit"
-            >
-              {{ $t("message.po_Submit") }}
+            <u-button type="success" :loading="$wait.is('*submitOrderInEnter')" @click="onSubmit">
+              {{ $t('message.po_Submit') }}
             </u-button>
           </u-col>
           <u-col :span="3">
-            <u-button type="error" @click="gohome">{{
-              $t("message.po_Return")
-            }}</u-button>
+            <u-button type="error" @click="gohome">{{ $t('message.po_Return') }}</u-button>
           </u-col>
         </u-row>
       </div>
@@ -66,13 +42,13 @@
 
 <script lang="ts">
 // inventory
-import { Component } from "vue-property-decorator";
-import { BasePage } from "@/components/base/page";
-import model from "./model";
-import { headers } from "./config";
-import jPicker from "@/components/J-Picker/jPicker.vue";
-import { session } from "@/store/modules/session";
-import { truncate } from "lodash";
+import { Component } from 'vue-property-decorator';
+import { BasePage } from '@/components/base/page';
+import model from './model';
+import { headers } from './config';
+import jPicker from '@/components/J-Picker/jPicker.vue';
+import { session } from '@/store/modules/session';
+import { truncate } from 'lodash';
 // @Component
 @Component({
   components: {
@@ -85,30 +61,30 @@ export default class RawReceiptDetail extends BasePage {
    */
   model = model;
   factoryCode = session.factoryCode;
-  locationCode = "";
+  locationCode = '';
   /**
    * 实际数量
    */
-  number = "";
+  number = '';
   /**
    * 表头
    */
   headers = headers;
-  dnNo = "";
+  dnNo = '';
   onShow() {
     this.model.queryLocation();
-    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.orderInInfoList[index] = ant;
-    this.dnNo = JSON.parse(sessionStorage.getItem("dnNo") as string);
-    sessionStorage.removeItem("material");
-    sessionStorage.removeItem("index");
+    this.dnNo = JSON.parse(sessionStorage.getItem('dnNo') as string);
+    sessionStorage.removeItem('material');
+    sessionStorage.removeItem('index');
   }
   gohome() {
     this.toPage(this.page.raw.ingoods.dnReceipt.index);
-    sessionStorage.removeItem("material");
-    sessionStorage.removeItem("index");
-    sessionStorage.removeItem("dnNo");
+    sessionStorage.removeItem('material');
+    sessionStorage.removeItem('index');
+    sessionStorage.removeItem('dnNo');
   }
   bookTypeChange(e: any) {
     this.locationCode = e.pickerName.value;
@@ -118,10 +94,7 @@ export default class RawReceiptDetail extends BasePage {
    */
   changeNumber() {
     if (!this.model.hasChecked) {
-      uni.showToast({
-        icon: "none",
-        title: this.$t("message.dn_Select") as string,
-      });
+      this.customToast(this.$t('message.dn_Select') as string);
       return;
     }
     //改变列表的值
@@ -131,18 +104,12 @@ export default class RawReceiptDetail extends BasePage {
           item.location = this.locationCode;
         }
         if (this.number > item.requestAmount) {
-          uni.showToast({
-            icon: "none",
-            title: this.$t("message.dn_Tip") as string,
-          });
+          this.customToast(this.$t('message.dn_Tip') as string);
           return;
-        } else if (this.number == "") {
+        } else if (this.number == '') {
           item.receiptAmount = item.requestAmount;
         } else if (this.number < item.requestAmount) {
-          uni.showToast({
-            icon: "none",
-            title: this.$t("message.dn_Tip3") as string,
-          });
+          this.customToast(this.$t('message.dn_Tip3') as string);
           item.receiptAmount = this.number;
         } else {
           item.receiptAmount = this.number;
@@ -165,22 +132,13 @@ export default class RawReceiptDetail extends BasePage {
       }
     });
     if (i > 1) {
-      uni.showToast({
-        icon: "none",
-        title: "只能选择一个DN单" as string,
-      });
+      this.customToast(this.$t('message.Pi_tip16') as string);
     } else if (i == 0) {
-      uni.showToast({
-        icon: "none",
-        title: "请选择一个DN单" as string,
-      });
+      this.customToast(this.$t('message.Pi_tip17') as string);
     } else {
       let mater: number = selectStatus.indexOf(true);
-      sessionStorage.setItem(
-        "mater",
-        JSON.stringify(model.orderInInfoList[mater]) as string
-      );
-      sessionStorage.setItem("index", JSON.stringify(mater) as string);
+      sessionStorage.setItem('mater', JSON.stringify(model.orderInInfoList[mater]) as string);
+      sessionStorage.setItem('index', JSON.stringify(mater) as string);
       this.redirectTo(this.page.raw.ingoods.dnReceipt.idetailed);
     }
   }
@@ -214,15 +172,15 @@ export default class RawReceiptDetail extends BasePage {
     //   return;
     // }
     await this.model.submitOrderInEnter();
-    this.locationCode = "";
+    this.locationCode = '';
     // setTimeout(() => {
     //   uni.navigateBack({ delta: 1 });
     // }, 2000);
-    this.model.orderInInfo.carNo = "";
-    this.model.orderInInfo.bookingTime = "";
-    this.model.orderInInfo.supplyCode = "";
-    this.model.orderInInfo.poType = "";
-    this.model.orderInInfo.location = "";
+    this.model.orderInInfo.carNo = '';
+    this.model.orderInInfo.bookingTime = '';
+    this.model.orderInInfo.supplyCode = '';
+    this.model.orderInInfo.poType = '';
+    this.model.orderInInfo.location = '';
     this.model.queryOrderInInfo(this.dnNo);
     // if (selectStatus[0]) {
     //   await this.model.submitOrderInEnter();
@@ -248,8 +206,7 @@ export default class RawReceiptDetail extends BasePage {
 
 <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/warehouse/rowInventory/index.vue b/src/pages/raw/warehouse/rowInventory/index.vue
index 2821d63..b20d323 100644
--- a/src/pages/raw/warehouse/rowInventory/index.vue
+++ b/src/pages/raw/warehouse/rowInventory/index.vue
@@ -1,72 +1,36 @@
 <template>
   <view class="page-raw-receipt">
-    <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.raw_Inventory") }}</view>
+      <view class="title">{{ $t('message.raw_Inventory') }}</view>
       <view class="right"></view>
     </view>
     <u-form class="form" ref="form" :model="form" label-width="180rpx">
-      <u-form-item
-        :required="true"
-        :label="$t('message.InventoryOrderNo')"
-        prop="pddNo"
-      >
-        <u-search
-          :placeholder="$t('message.InventoryPleaseScan')"
-          v-model="form.pddNo"
-          @search="model.rawMaterialInventoryCheckRaw"
-          :show-action="false"
-        ></u-search>
+      <u-form-item :required="true" :label="$t('message.InventoryOrderNo')" prop="pddNo">
+        <u-search :placeholder="$t('message.InventoryPleaseScan')" v-model="form.pddNo" @search="model.rawMaterialInventoryCheckRaw" :show-action="false"></u-search>
       </u-form-item>
-      <u-form-item
-        :label="$t('message.InventoryMaterielNo')"
-        prop="productCode"
-      >
-        <u-search
-          :placeholder="$t('message.po_PleaseInput')"
-          v-model="form.productCode"
-          @search="checkRawProductCode"
-          :show-action="false"
-        ></u-search>
+      <u-form-item :label="$t('message.InventoryMaterielNo')" prop="productCode">
+        <u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.productCode" @search="checkRawProductCode" :show-action="false"></u-search>
       </u-form-item>
-      <u-form-item
-        :label="$t('message.InventoryMateriel')"
-        prop="productDescZh"
-      >
-        <u-input
-          v-model="form.productDescZh"
-          :placeholder="$t('message.po_PleaseInput')"
-        />
+      <u-form-item :label="$t('message.InventoryMateriel')" prop="productDescZh">
+        <u-input v-model="form.productDescZh" :placeholder="$t('message.po_PleaseInput')" />
       </u-form-item>
       <u-form-item :label="$t('message.InventoryTotalNumber')" prop="spQty">
-        <u-input
-          v-model="form.spQty"
-          :placeholder="$t('message.po_PleaseInput')"
-          type="number"
-        />
+        <u-input v-model="form.spQty" :placeholder="$t('message.po_PleaseInput')" type="number" />
       </u-form-item>
     </u-form>
     <view class="bottom-bar">
       <u-row class="button-bar">
         <u-col :span="4">
-          <u-button type="primary" @click="checkRawCreateInfo">{{
-            $t("message.workArea_Confirm")
-          }}</u-button>
+          <u-button type="primary" @click="checkRawCreateInfo">{{ $t('message.workArea_Confirm') }}</u-button>
         </u-col>
         <u-col :span="4">
-          <u-button type="primary" @click="checkRawOrderComplete">{{
-            $t("message.InventoryFinish")
-          }}</u-button>
+          <u-button type="primary" @click="checkRawOrderComplete">{{ $t('message.InventoryFinish') }}</u-button>
         </u-col>
         <u-col :span="4">
-          <u-button type="error" @click="back">{{
-            $t("message.po_Return")
-          }}</u-button>
+          <u-button type="error" @click="back">{{ $t('message.po_Return') }}</u-button>
         </u-col>
       </u-row>
     </view>
@@ -74,10 +38,10 @@
 </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 { Component, Ref } from 'vue-property-decorator';
+import { BasePage } from '@/components/base/page';
+import { VForm, VFormRules } from 'vue/types/form';
+import model from './model';
 
 // interface OptionType {
 //   label: string;
@@ -89,7 +53,7 @@ export default class rawMaterialInventory extends BasePage {
   /**
    * 表单引用
    */
-  @Ref("form") readonly $form!: VForm;
+  @Ref('form') readonly $form!: VForm;
 
   /**
    * 页面Module
@@ -117,13 +81,11 @@ export default class rawMaterialInventory extends BasePage {
   cboPlaceSelect = false;
 
   rules: VFormRules<any> = {
-    pddNo: [
-      { required: true, message: this.$t("message.dn_PleaseScan") as string },
-    ],
+    pddNo: [{ required: true, message: this.$t('message.dn_PleaseScan') as string }],
     // cboPlace: [{ required: true, message: this.$t('message.Warehouse_Tip10') as string }],
   };
 
-  value = "";
+  value = '';
   show = false;
 
   // 扫描物料号检查
@@ -132,7 +94,7 @@ export default class rawMaterialInventory extends BasePage {
       productCode,
       pddNo: this.form.pddNo,
     });
-    console.log("result:::", result);
+    console.log('result:::', result);
     this.status = result.isState;
   }
   checkRawCreateInfo() {
@@ -153,11 +115,11 @@ export default class rawMaterialInventory extends BasePage {
     //this.model.queryLocation();
     //清空数据项
     this.$form.resetFields();
-    this.model.orderInInfo.carNo = "";
-    this.model.orderInInfo.bookingTime = "";
-    this.model.orderInInfo.supplyCode = "";
-    this.model.orderInInfo.poType = "";
-    this.model.orderInInfo.location = "";
+    this.model.orderInInfo.carNo = '';
+    this.model.orderInInfo.bookingTime = '';
+    this.model.orderInInfo.supplyCode = '';
+    this.model.orderInInfo.poType = '';
+    this.model.orderInInfo.location = '';
   }
   back() {
     uni.navigateBack({ delta: 1 });
@@ -166,10 +128,7 @@ export default class rawMaterialInventory extends BasePage {
     this.$form.validate((valid: boolean) => {
       if (!valid) return;
       if (!this.model.hasDnInfo) {
-        uni.showToast({
-          icon: "none",
-          title: this.$t("message.dn_PleaseScan") as string,
-        });
+        this.customToast(this.$t('message.dn_PleaseScan') as string);
         return;
       }
       // sessionStorage.setItem(
@@ -186,8 +145,7 @@ export default class rawMaterialInventory extends BasePage {
 
 <style lang="scss" scoped>
 .page-raw-receipt {
-  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/raw/warehouse/rowScrap/details.vue b/src/pages/raw/warehouse/rowScrap/details.vue
index e255647..c0f8dda 100644
--- a/src/pages/raw/warehouse/rowScrap/details.vue
+++ b/src/pages/raw/warehouse/rowScrap/details.vue
@@ -84,10 +84,7 @@ export default class KanDanHandOverDetails extends BasePage {
       }
     });
     if (orderlist.length == 0) {
-      uni.showToast({
-        icon: "none",
-        title: "请先选中要移库的数据" as any,
-      });
+      this.customToast(this.$t('message.Pi_tip18') as string);
       return;
     }
     orderlist.forEach((item: any) => {
diff --git a/src/pages/raw/warehouse/rowScrap/index.vue b/src/pages/raw/warehouse/rowScrap/index.vue
index eee8e86..7c9c1f4 100644
--- a/src/pages/raw/warehouse/rowScrap/index.vue
+++ b/src/pages/raw/warehouse/rowScrap/index.vue
@@ -79,14 +79,14 @@ export default class KanDanHandOver extends BasePage {
   //查询单号
   async query() {
     if (this.order3 === '') {
-      uni.showToast({ icon: 'none', title: this.$t('message.Commission_tips1') as string });
+      this.customToast(this.$t('message.Commission_tips1') as string);
       return;
     } else {
       await this.model.takeOrder({
         order3: this.order3,
       });
       if (this.model.code == '1') {
-        uni.showToast({ icon: 'none', title: this.$t('message.successful') as string });
+        uni.showToast({ icon: 'success', title: this.$t('message.successful') as string });
         this.model.orderInInfoList.forEach((item: any) => {
           item.fileNo = '';
           let arr: any = {
@@ -112,15 +112,15 @@ export default class KanDanHandOver extends BasePage {
   //提交
   async submit() {
     if (this.order3 === '') {
-      uni.showToast({ icon: 'none', title: this.$t('message.Commission_tips1') as string });
+     this.customToast(this.$t('message.Commission_tips1') as string);
       return;
     }
     if (!this.Some) {
-      uni.showToast({ icon: 'none', title: this.$t('message.Warehouse_Tip5') as string });
+      this.customToast(this.$t('message.Warehouse_Tip5') as string);
       return;
     }
     if (this.Some.fileNo == '' || this.Some.fileNo == null || this.Some.fileNo == undefined) {
-      uni.showToast({ icon: 'none', title: this.$t('message.fileNumber') as string });
+      this.customToast(this.$t('message.fileNumber') as string);
       return;
     }
     let orderlist = [];
@@ -130,7 +130,7 @@ export default class KanDanHandOver extends BasePage {
     orderlist.push(this.Some);
     await model.onTakeoutConfirm(orderlist);
     if (this.model.code == '1') {
-      uni.showToast({ icon: 'none', title: this.$t('message.success') as string });
+      uni.showToast({ icon: 'success', title: this.$t('message.success') as string });
       this.Some = {};
       this.Some.fileNo = ' ';
       this.wl = {};
diff --git a/src/pages/raw/warehouse/rowTransfer/details.vue b/src/pages/raw/warehouse/rowTransfer/details.vue
index fb45094..36fe550 100644
--- a/src/pages/raw/warehouse/rowTransfer/details.vue
+++ b/src/pages/raw/warehouse/rowTransfer/details.vue
@@ -91,10 +91,7 @@ export default class KanDanHandOverDetails extends BasePage {
       }
     });
     if (orderlist.length == 0) {
-      uni.showToast({
-        icon: 'none',
-        title: '请先选中要移库的数据' as any,
-      });
+      this.customToast(this.$t('message.Pi_tip18') as string);
       return;
     }
     orderlist.forEach((item: any) => {
diff --git a/src/pages/raw/warehouse/rowTransfer/index.vue b/src/pages/raw/warehouse/rowTransfer/index.vue
index 88a94af..f6e2be8 100644
--- a/src/pages/raw/warehouse/rowTransfer/index.vue
+++ b/src/pages/raw/warehouse/rowTransfer/index.vue
@@ -67,14 +67,14 @@ export default class KanDanHandOver extends BasePage {
   //查询单号
   async query() {
     if (this.order3 === '') {
-      uni.showToast({ icon: 'none', title: this.$t('message.Warehouse_Tip') as string });
+      this.customToast(this.$t('message.Warehouse_Tip') as string);
       return;
     } else {
       await this.model.takeYKOrder({
         order3: this.order3,
       });
       if (model.code == '1') {
-        uni.showToast({ icon: 'none', title: this.$t('message.successful') as string });
+        uni.showToast({ icon: 'success', title: this.$t('message.successful') as string });
         this.orderlist = model.materielList[0];
         this.NEWqty = model.materielList[0].qty;
       }
@@ -93,19 +93,19 @@ export default class KanDanHandOver extends BasePage {
   //提交数据
   async submit() {
     if (this.order3 == '') {
-      uni.showToast({ icon: 'none', title: this.$t('message.InventoryPleaseScan') as string });
+      this.customToast(this.$t('message.InventoryPleaseScan') as string);
       return;
     }
     if (this.orderlist.length == 0) {
-      uni.showToast({ icon: 'none', title: this.$t('message.Commission_tips6') as string });
+      this.customToast(this.$t('message.Commission_tips6') as string);
       return;
     }
     if (this.NEWqty == '' || parseFloat(this.NEWqty) == 0) {
-      uni.showToast({ icon: 'none', title: this.$t('message.PleaseQuantity') as string });
+      this.customToast(this.$t('message.PleaseQuantity') as string);
       return;
     }
     if (parseFloat(this.NEWqty) > parseFloat(this.orderlist.qty)) {
-      uni.showToast({ icon: 'none', title: this.$t('message.greater') as string });
+      this.customToast(this.$t('message.greater') as string);
       return;
     }
     this.orderlist.type = '1';
@@ -116,7 +116,7 @@ export default class KanDanHandOver extends BasePage {
     arr.push(this.orderlist);
     await model.onTakeoutConfirm(arr);
     if (model.code == '1') {
-      uni.showToast({ icon: 'none', title: this.$t('message.Warehouse_Tip9') as string });
+      this.customToast(this.$t('message.Warehouse_Tip9') as string);
       model.empty();
       setTimeout(() => {
         this.toPage(this.page.raw.warehouse.rowTransfer.index);