From c6f04012cfcc8eaeabb5df1791f0b7982d40ff3f Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Wed, 16 Feb 2022 18:06:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E8=BE=93=E5=85=A5=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=8A=A0=E8=BE=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/lang/cn.ts                              |  2 +-
 src/i18n/lang/en.ts                              |  2 +-
 .../product/warehouse/wholeLnventory/index.vue   |  3 ++-
 src/pages/product/warehouse/wholeScrap/index.vue |  3 ++-
 .../product/warehouse/wholeTransfer/config.ts    |  8 ++++----
 src/pages/raw/handover/aggregating/index.vue     |  9 +++++----
 src/pages/raw/handover/aggregating/order.vue     |  6 +++---
 src/pages/raw/handover/aggregating/summary.vue   |  6 +++---
 src/pages/raw/handover/feeding/Location.vue      |  4 ++--
 src/pages/raw/handover/picking/index.vue         |  8 ++++----
 src/pages/raw/handover/returning/index.vue       |  7 ++++---
 src/pages/raw/handover/virtual/index.vue         | 10 +++++-----
 src/pages/raw/handover/virtual/summary.vue       |  8 ++++----
 src/pages/raw/warehouse/rowCollect/index.vue     | 16 ++++++++--------
 src/pages/raw/warehouse/rowScrap/index.vue       |  3 ++-
 src/pages/raw/warehouse/rowTransfer/index.vue    |  3 ++-
 16 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index 7a89606..0f0bf0b 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -419,7 +419,7 @@ export default {
     Warehouse_Tip6: '请选择物料',
     Warehouse_Tip7: '盘点未完成，确定继续吗',
     selectCode: '请先选择编码',
-    standard:'条码不规范',
+    standard: '条码长度必须是20位',
     Warehouse_Tip8: '请输入成本中心',
     Warehouse_Tip9: '操作成功',
     DocumentNumber: '文件号',
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 1f3cd91..e8ba97b 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -67,7 +67,7 @@ export default {
     LBWK: 'List is empty',
     CommissionedDetails:'detail',
     closing:'Confirm closing order?',
-    standard:'Non standard barcode',
+    standard:'FG barcode length must be 20',
     rawMenu_InTheLibrary: 'RAW WH',
     rawMenu_ReturnGoods: 'Return',
     rawMenu_SignOut: 'Sign out',
diff --git a/src/pages/product/warehouse/wholeLnventory/index.vue b/src/pages/product/warehouse/wholeLnventory/index.vue
index 236052d..2b9e7f9 100644
--- a/src/pages/product/warehouse/wholeLnventory/index.vue
+++ b/src/pages/product/warehouse/wholeLnventory/index.vue
@@ -31,7 +31,7 @@
         <!-- 总数 -->
         <u-col :span="6">
           <u-form-item :label="$t('message.Warehouse_TotalNumber')" label-width="80rpx">
-            <u-input v-model="form.ypQty" :placeholder="$t('message.po_PleaseInput')" type="number" />
+            <u-input v-model="form.ypQty" :border="border" :placeholder="$t('message.po_PleaseInput')" type="number" />
           </u-form-item>
         </u-col>
       </u-row>
@@ -87,6 +87,7 @@ export default class productCheckReceipt extends BasePage {
    * 页面Module
    */
   model = model;
+  border = true;
   aaa: number = null;
   bbb: number = null;
   /**
diff --git a/src/pages/product/warehouse/wholeScrap/index.vue b/src/pages/product/warehouse/wholeScrap/index.vue
index da36be8..8513226 100644
--- a/src/pages/product/warehouse/wholeScrap/index.vue
+++ b/src/pages/product/warehouse/wholeScrap/index.vue
@@ -45,7 +45,7 @@
       </u-form-item>
       <!-- 文件号 -->
       <u-form-item :label="$t('message.DocumentNumber')">
-        <u-input v-model="Some.fileNo" :placeholder="$t('message.fileNumber')" />
+        <u-input v-model="Some.fileNo" :border="border" :placeholder="$t('message.fileNumber')" />
       </u-form-item>
       <!-- 已扫 -->
       <u-form-item :label="$t('message.product_Swept')">
@@ -96,6 +96,7 @@ import { session } from '@/store/modules/session';
 export default class productCheckReceipt extends BasePage {
   @Ref('form') readonly $form!: VForm;
   model = model;
+  border = true;
   form = {
     productCode: '',
     order3: '',
diff --git a/src/pages/product/warehouse/wholeTransfer/config.ts b/src/pages/product/warehouse/wholeTransfer/config.ts
index f03cd17..264f19d 100644
--- a/src/pages/product/warehouse/wholeTransfer/config.ts
+++ b/src/pages/product/warehouse/wholeTransfer/config.ts
@@ -197,10 +197,10 @@ export const Headers = [
     key: 'materialCode', //产品编码
     width: 300,
   },
-  {
-    label: vm.$t('message.Access_type'),
-    key: 'oiType', //出入类型
-  },
+  // {
+  //   label: vm.$t('message.Access_type'),
+  //   key: 'oiType', //出入类型
+  // },
   {
     label: vm.$t('message.product_Location'),
     key: 'wlToCode', //库位
diff --git a/src/pages/raw/handover/aggregating/index.vue b/src/pages/raw/handover/aggregating/index.vue
index 79274b0..7ff0f4c 100644
--- a/src/pages/raw/handover/aggregating/index.vue
+++ b/src/pages/raw/handover/aggregating/index.vue
@@ -11,7 +11,7 @@
       <u-row>
         <u-col :span="12">
           <u-form-item :required="true" label-width="120rpx" label="MRP" prop="mrpScope">
-            <u-input v-model="form.mrpScope" :placeholder="$t('message.po_PleaseInput')" />
+            <u-input v-model="form.mrpScope" :border="border" :placeholder="$t('message.po_PleaseInput')" />
           </u-form-item>
         </u-col>
         <!-- <u-col :span="6">
@@ -41,12 +41,12 @@
         </u-col>
         <u-col :span="6">
           <u-form-item label-width="120rpx" :label="$t('message.Pi_OrderNo')">
-            <u-input v-model="form.orderNoStart" :placeholder="$t('message.po_PleaseInput')" />
+            <u-input v-model="form.orderNoStart" :border="border" :placeholder="$t('message.po_PleaseInput')" />
           </u-form-item>
         </u-col>
         <u-col :span="6">
           <u-form-item label-width="120rpx" :label="$t('message.Summary_To')">
-            <u-input v-model="form.orderNoEnd" :placeholder="$t('message.po_PleaseInput')" />
+            <u-input v-model="form.orderNoEnd" :border="border" :placeholder="$t('message.po_PleaseInput')" />
           </u-form-item>
         </u-col>
         <!-- <u-col :span="6">
@@ -114,7 +114,7 @@
         </u-col> -->
         <u-col :span="12">
           <u-form-item label-width="120rpx" :label="$t('message.po_MaterielNo')">
-            <u-input v-model="form.materialCodeList" :placeholder="$t('message.po_PleaseInput')" />
+            <u-input v-model="form.materialCodeList" :border="border" :placeholder="$t('message.po_PleaseInput')" />
           </u-form-item>
         </u-col>
       </u-row>
@@ -162,6 +162,7 @@ export default class Aggregating extends BasePage {
    * 页面Module
    */
   model = model;
+  border = true;
   /**
    * 表头
    */
diff --git a/src/pages/raw/handover/aggregating/order.vue b/src/pages/raw/handover/aggregating/order.vue
index 90211d8..2ee3fd9 100644
--- a/src/pages/raw/handover/aggregating/order.vue
+++ b/src/pages/raw/handover/aggregating/order.vue
@@ -25,12 +25,12 @@
           <u-row class="bottom-info">
             <u-col :span="6">
               <u-form-item prop="receiverName" :label="$t('message.Summary_Receiver')" label-width="120rpx">
-                <u-input v-model="submitForm.receiverName" @confirm="onReceiverConfirm" :placeholder="$t('message.po_PleaseInput')" />
+                <u-input v-model="submitForm.receiverName" :border="border" @confirm="onReceiverConfirm" :placeholder="$t('message.po_PleaseInput')" />
               </u-form-item>
             </u-col>
             <u-col :span="6">
               <u-form-item prop="password" :label="$t('message.Summary_Password')">
-                <u-input type="password" v-model="submitForm.password" :placeholder="$t('message.po_PleaseInput')" />
+                <u-input type="password" v-model="submitForm.password" :border="border" :placeholder="$t('message.po_PleaseInput')" />
               </u-form-item>
             </u-col>
           </u-row>
@@ -83,7 +83,7 @@ export default class AggregatingOrder extends BasePage {
    * 页面Module
    */
   model = model;
-
+  border = true;
   /**
    * 表头
    */
diff --git a/src/pages/raw/handover/aggregating/summary.vue b/src/pages/raw/handover/aggregating/summary.vue
index 6269ab2..629195f 100644
--- a/src/pages/raw/handover/aggregating/summary.vue
+++ b/src/pages/raw/handover/aggregating/summary.vue
@@ -25,12 +25,12 @@
           <u-row class="bottom-info">
             <u-col :span="6">
               <u-form-item prop="receiverName" :label="$t('message.Summary_Receiver')" label-width="120rpx">
-                <u-input v-model="submitForm.receiverName" @confirm="onReceiverConfirm" :placeholder="$t('message.po_PleaseInput')" />
+                <u-input v-model="submitForm.receiverName" :border="border" @confirm="onReceiverConfirm" :placeholder="$t('message.po_PleaseInput')" />
               </u-form-item>
             </u-col>
             <u-col :span="6">
               <u-form-item prop="password" :label="$t('message.Summary_Password')">
-                <u-input type="password" v-model="submitForm.password" :placeholder="$t('message.po_PleaseInput')" />
+                <u-input type="password" v-model="submitForm.password" :border="border" :placeholder="$t('message.po_PleaseInput')" />
               </u-form-item>
             </u-col>
           </u-row>
@@ -83,7 +83,7 @@ export default class AggregatingSummary extends BasePage {
    * 页面Module
    */
   model = model;
-
+  border = true;
   /**
    * 表头
    */
diff --git a/src/pages/raw/handover/feeding/Location.vue b/src/pages/raw/handover/feeding/Location.vue
index 6ba1e29..e3bfb8a 100644
--- a/src/pages/raw/handover/feeding/Location.vue
+++ b/src/pages/raw/handover/feeding/Location.vue
@@ -83,12 +83,12 @@
         <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-input v-model="operatorName" :border="border" @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" :border="border" type="password" :placeholder="$t('message.po_PleaseInput')" />
             </u-form-item>
           </u-col>
         </u-row>
diff --git a/src/pages/raw/handover/picking/index.vue b/src/pages/raw/handover/picking/index.vue
index 66e7f30..3439aa9 100644
--- a/src/pages/raw/handover/picking/index.vue
+++ b/src/pages/raw/handover/picking/index.vue
@@ -12,11 +12,11 @@
         <u-col :span="12">
           <!-- MRP -->
           <u-form-item :required="true" label="MRP" prop="mrpCodeRegion">
-            <u-input v-model="form.mrpCodeRegion" :placeholder="$t('message.po_PleaseInput')" />
+            <u-input v-model="form.mrpCodeRegion" :border="border" :placeholder="$t('message.po_PleaseInput')" />
           </u-form-item>
           <!-- 订单号 -->
           <u-form-item :label="$t('message.Pi_OrderNo')">
-            <u-input v-model="form.prdOrderFrom" :placeholder="$t('message.po_PleaseInput')" />
+            <u-input v-model="form.prdOrderFrom" :border="border" :placeholder="$t('message.po_PleaseInput')" />
           </u-form-item>
           <!-- 工厂 -->
           <u-form-item :required="true" :label="$t('message.Pi_factory')" prop="sapFactoryCode">
@@ -24,7 +24,7 @@
           </u-form-item>
           <!-- 物料号 -->
           <u-form-item :label="$t('message.Pi_materielNo')">
-            <u-input v-model="form.materialCodeList" style="padding-left: 14px" :placeholder="$t('message.po_PleaseInput')" />
+            <u-input v-model="form.materialCodeList" :border="border" style="padding-left: 14px" :placeholder="$t('message.po_PleaseInput')" />
           </u-form-item>
         </u-col>
         <u-col :span="12">
@@ -76,7 +76,7 @@ export default class pickingDom extends BasePage {
    * 页面Module
    */
   model = model;
-
+  border = true;
   /**
    * 表头
    */
diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue
index 94ab20c..c8305d0 100644
--- a/src/pages/raw/handover/returning/index.vue
+++ b/src/pages/raw/handover/returning/index.vue
@@ -54,17 +54,17 @@
         </u-col>
         <u-col :span="6">
           <u-form-item :required="true" :label="$t('message.Summary_Number')" prop="amount" label-width="80rpx">
-            <u-input v-model="form.amount" type="number" :placeholder="$t('message.po_PleaseInput')" style="margin-left: 12px" />
+            <u-input v-model="form.amount" :border="border" type="number" :placeholder="$t('message.po_PleaseInput')" style="margin-left: 12px" />
           </u-form-item>
         </u-col>
       </u-row>
       <!-- 工位退料人 -->
       <u-form-item :required="true" :label="$t('message.return_OperatorName')" prop="operator">
-        <u-input v-model="form.operator" :placeholder="$t('message.po_PleaseInput')" />
+        <u-input v-model="form.operator" :border="border" :placeholder="$t('message.po_PleaseInput')" />
       </u-form-item>
       <!-- 口令 -->
       <u-form-item :label="$t('message.Summary_Password')">
-        <u-input v-model="form.rfPwd" type="password" :placeholder="$t('message.po_PleaseInput')" />
+        <u-input v-model="form.rfPwd" :border="border" type="password" :placeholder="$t('message.po_PleaseInput')" />
       </u-form-item>
     </u-form>
     <view class="bottom-bar">
@@ -104,6 +104,7 @@ export default class returningDom extends BasePage {
    * 页面Module
    */
   model = model;
+  border = true;
   /**
    * 表单数据
    */
diff --git a/src/pages/raw/handover/virtual/index.vue b/src/pages/raw/handover/virtual/index.vue
index cddb2f7..2b895b7 100644
--- a/src/pages/raw/handover/virtual/index.vue
+++ b/src/pages/raw/handover/virtual/index.vue
@@ -12,7 +12,7 @@
         <!-- MRP -->
         <u-col :span="12">
           <u-form-item :required="true" label-width="120rpx" label="MRP" prop="mrpScope">
-            <u-input v-model="form.mrpScope" :placeholder="this.$t('message.po_PleaseInput')" />
+            <u-input v-model="form.mrpScope" :border="border" :placeholder="this.$t('message.po_PleaseInput')" />
           </u-form-item>
         </u-col>
         <!-- <u-col :span="6">
@@ -50,12 +50,12 @@
         <!-- 订单号 -->
         <u-col :span="6">
           <u-form-item label-width="120rpx" :label="this.$t('message.Pi_OrderNo')">
-            <u-input v-model="form.orderNoStart" :placeholder="this.$t('message.po_PleaseInput')" />
+            <u-input v-model="form.orderNoStart" :border="border" :placeholder="this.$t('message.po_PleaseInput')" />
           </u-form-item>
         </u-col>
         <u-col :span="6">
           <u-form-item label-width="120rpx" :label="this.$t('message.Summary_To')">
-            <u-input v-model="form.orderNoEnd" :placeholder="this.$t('message.po_PleaseInput')" />
+            <u-input v-model="form.orderNoEnd" :border="border" :placeholder="this.$t('message.po_PleaseInput')" />
           </u-form-item>
         </u-col>
         <!-- <u-col :span="6">
@@ -122,7 +122,7 @@
         <u-col :span="12">
           <u-form-item label-width="120rpx" :label="this.$t('message.po_MaterielNo')">
             <u-input
-              v-model="form.materialCodeList"
+              v-model="form.materialCodeList" :border="border"
               :placeholder="this.$t('message.po_PleaseInput')"
             />
           </u-form-item>
@@ -186,7 +186,7 @@ export default class Virtual extends BasePage {
    * 页面Module
    */
   model = model;
-
+  border = true;
   /**
    * 表头
    */
diff --git a/src/pages/raw/handover/virtual/summary.vue b/src/pages/raw/handover/virtual/summary.vue
index 6ff8f0a..05d925c 100644
--- a/src/pages/raw/handover/virtual/summary.vue
+++ b/src/pages/raw/handover/virtual/summary.vue
@@ -21,7 +21,7 @@
             </u-col> -->
             <u-col :span="12">
               <u-form-item prop="amount" :label="$t('message.Pi_HandoverQuantity')" label-width="240rpx">
-                <u-input type="number" v-model="amountForm.amount" :placeholder="$t('message.po_PleaseInput')" />
+                <u-input type="number" v-model="amountForm.amount" :border="border" :placeholder="$t('message.po_PleaseInput')" />
               </u-form-item>
             </u-col>
           </u-row>
@@ -30,12 +30,12 @@
           <u-row class="bottom-info">
             <u-col :span="6">
               <u-form-item prop="receiverName" :label="$t('message.Summary_Receiver')" label-width="120rpx">
-                <u-input v-model="submitForm.receiverName" @confirm="onReceiverConfirm" :placeholder="$t('message.po_PleaseInput')" />
+                <u-input v-model="submitForm.receiverName" :border="border" @confirm="onReceiverConfirm" :placeholder="$t('message.po_PleaseInput')" />
               </u-form-item>
             </u-col>
             <u-col :span="6">
               <u-form-item prop="password" :label="$t('message.Summary_Password')">
-                <u-input type="password" v-model="submitForm.password" :placeholder="$t('message.po_PleaseInput')" />
+                <u-input type="password" v-model="submitForm.password" :border="border" :placeholder="$t('message.po_PleaseInput')" />
               </u-form-item>
             </u-col>
           </u-row>
@@ -83,7 +83,7 @@ export default class VirtualSummary extends BasePage {
    * 页面Module
    */
   model = model;
-
+  border = true;
   /**
    * 表头
    */
diff --git a/src/pages/raw/warehouse/rowCollect/index.vue b/src/pages/raw/warehouse/rowCollect/index.vue
index 332d72a..15f3aec 100644
--- a/src/pages/raw/warehouse/rowCollect/index.vue
+++ b/src/pages/raw/warehouse/rowCollect/index.vue
@@ -39,9 +39,9 @@
         <u-input :disabled="true" v-model="Some.costCenter" placeholder="" />
       </u-form-item>
       <!-- 文件号 -->
-      <u-form-item :label="$t('message.DocumentNumber')">
+      <!-- <u-form-item :label="$t('message.DocumentNumber')">
         <u-input v-model="Some.fileNo" placeholder="" />
-      </u-form-item>
+      </u-form-item> -->
       <u-row class="button-bar">
         <u-col :span="6">
           <u-button type="error" @click="uni.navigateBack({})">{{ $t('message.po_Return') }}</u-button>
@@ -84,7 +84,7 @@ export default class KanDanHandOver extends BasePage {
       if (this.model.code == '1') {
         uni.showToast({ icon: 'success', title: this.$t('message.successful') as string });
         this.model.orderInInfoList.forEach((item: any) => {
-          item.fileNo = '';
+          //item.fileNo = '';
           let arr: any = {
             label: item.productCode,
             value: item.productCode,
@@ -115,10 +115,10 @@ export default class KanDanHandOver extends BasePage {
       this.customToast(this.$t('message.Warehouse_Tip5') as string);
       return;
     }
-    if (this.Some.fileNo == '' || this.Some.fileNo == null || this.Some.fileNo == undefined) {
-      this.customToast(this.$t('message.fileNumber') as string);
-      return;
-    }
+    // if (this.Some.fileNo == '' || this.Some.fileNo == null || this.Some.fileNo == undefined) {
+    //   this.customToast(this.$t('message.fileNumber') as string);
+    //   return;
+    // }
     let orderlist = [];
     this.Some.type = '1';
     this.Some.keepBy = session.loginName;
@@ -128,7 +128,7 @@ export default class KanDanHandOver extends BasePage {
     if (this.model.code == '1') {
       uni.showToast({ icon: 'success', title: this.$t('message.success') as string });
       this.Some = {};
-      this.Some.fileNo = ' ';
+      //this.Some.fileNo = ' ';
       this.wl = {};
       this.MaterialList = [];
       this.query();
diff --git a/src/pages/raw/warehouse/rowScrap/index.vue b/src/pages/raw/warehouse/rowScrap/index.vue
index 0a7ac43..557f7b1 100644
--- a/src/pages/raw/warehouse/rowScrap/index.vue
+++ b/src/pages/raw/warehouse/rowScrap/index.vue
@@ -44,7 +44,7 @@
       </u-form-item>
       <!-- 文件号 -->
       <u-form-item :label="$t('message.DocumentNumber')">
-        <u-input v-model="Some.fileNo" placeholder="" />
+        <u-input v-model="Some.fileNo" :border="border" :placeholder="$t('message.fileNumber')" />
       </u-form-item>
       <u-row class="button-bar">
         <u-col :span="6">
@@ -73,6 +73,7 @@ export default class KanDanHandOver extends BasePage {
   //单号
   order3 = '';
   model = model;
+  border = true;
   wl: any = {};
   Some: any = {};
   MaterialList: any = [];
diff --git a/src/pages/raw/warehouse/rowTransfer/index.vue b/src/pages/raw/warehouse/rowTransfer/index.vue
index c993c8c..2fae48f 100644
--- a/src/pages/raw/warehouse/rowTransfer/index.vue
+++ b/src/pages/raw/warehouse/rowTransfer/index.vue
@@ -35,7 +35,7 @@
       </u-form-item>
       <!-- 本次数量 -->
       <u-form-item :label="$t('message.CommissionedThisNumber')">
-        <u-input v-model="NEWqty" placeholder="" type="number" />
+        <u-input v-model="NEWqty" :border="border" placeholder="" type="number" />
       </u-form-item>
     </u-form>
     <view class="bottom-bar">
@@ -62,6 +62,7 @@ export default class KanDanHandOver extends BasePage {
   order3 = '';
   NEWqty = '';
   model = model;
+  border = true;
   materialCodeSelect = false;
   orderlist: any = [];
   //查询单号