Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app

src/i18n/lang/cn.ts

@@ -420,7 +420,7 @@ export default {
     Warehouse_Tip6: '请选择物料',
     Warehouse_Tip7: '盘点未完成，确定继续吗',
     selectCode: '请先选择编码',
-    standard:'条码不规范',
+    standard: '条码长度必须是20位',
     Warehouse_Tip8: '请输入成本中心',
     Warehouse_Tip9: '操作成功',
     DocumentNumber: '文件号',

src/i18n/lang/en.ts

@@ -68,7 +68,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',
@@ -250,7 +250,7 @@ export default {
     ModelName: 'Model name',
     ModelScanned: 'Model scanned',
     selectCode: 'Please select code first',
-    DocumentNumber: 'Document number',
+    DocumentNumber: 'File number',
     closure: 'Close',
 
     // 委外-入库

src/pages/product/warehouse/LocationInventory/index.vue

@@ -11,7 +11,7 @@
       <!-- 盘点单号 -->
       <view class="single">
         <view class="single-left">
-          <view>{{ $t('message.code') }}</view>
+          <view style="padding-top: 27rpx">{{ $t('message.code') }}</view>
           <u-search :placeholder="$t('message.Commission_tips1')" v-model.trim="form.pddNo" @search="query" :show-action="false"></u-search>
         </view>
         <view class="single-right">
@@ -97,7 +97,11 @@ export default class ProductCheckReceipt extends BasePage {
     };
     await this.model.queryScrapList(param);
     if (this.model.code == '1') {
-      this.customToast(this.$t('message.product_Tip8') as string);
+      //this.customToast(this.$t('message.product_Tip8') as string);
+      uni.showToast({
+        icon: 'success',
+        title: this.$t('message.product_Tip8') as string,
+      });
       let num = 0;
       this.model.modelList.forEach((item: any) => {
         num += item.spQty;
@@ -143,7 +147,11 @@ export default class ProductCheckReceipt extends BasePage {
     };
     await this.model.getProductCode(params);
     if (this.model.code == '1') {
-      this.customToast(this.$t('message.product_Tip8') as string);
+      //this.customToast(this.$t('message.product_Tip8') as string);
+      uni.showToast({
+        icon: 'success',
+        title: this.$t('message.product_Tip8') as string,
+      });
       this.total += 1;
       this.model.modelList.forEach((item: any) => {
         if (item.locCode == this.wl.value) {
@@ -264,7 +272,7 @@ export default class ProductCheckReceipt extends BasePage {
         view {
           width: 110rpx;
           height: 100%;
-          line-height: 100rpx;
+          line-height: 35rpx;
         }
       }
       .single-right {

src/pages/product/warehouse/MaterialInventory/index.vue

@@ -11,7 +11,7 @@
       <!-- 盘点单号 -->
       <view class="single">
         <view class="single-left">
-          <view>{{ $t('message.code') }}</view>
+          <view style="padding-top: 27rpx">{{ $t('message.code') }}</view>
           <u-search :placeholder="$t('message.Commission_tips1')" v-model.trim="form.pddNo" @search="query" :show-action="false"></u-search>
         </view>
         <view class="single-right">
@@ -105,7 +105,11 @@ export default class ProductCheckReceipt extends BasePage {
     };
     await this.model.queryScrapList(param);
     if (this.model.code == '1') {
-      this.customToast(this.$t('message.product_Tip8') as string);
+      //this.customToast(this.$t('message.product_Tip8') as string);
+      uni.showToast({
+        icon: 'success',
+        title: this.$t('message.product_Tip8') as string,
+      });
       let num = 0;
       this.model.modelList.forEach((item: any) => {
         num += parseFloat(item.spQty);
@@ -152,7 +156,11 @@ export default class ProductCheckReceipt extends BasePage {
     };
     await this.model.getProductCode(params);
     if (this.model.code == '1') {
-      this.customToast(this.$t('message.product_Tip8') as string);
+      //this.customToast(this.$t('message.product_Tip8') as string);
+      uni.showToast({
+        icon: 'success',
+        title: this.$t('message.product_Tip8') as string,
+      });
       this.total += 1;
       this.model.modelList.forEach((item: any) => {
         if (item.productCode == this.wl.value) {
@@ -262,7 +270,7 @@ export default class ProductCheckReceipt extends BasePage {
         view {
           width: 110rpx;
           height: 100%;
-          line-height: 100rpx;
+          line-height: 35rpx;
         }
       }
       .single-right {

src/pages/product/warehouse/wholeCollect/index.vue

@@ -115,7 +115,11 @@ export default class ProductCheckReceipt extends BasePage {
     };
     await this.model.queryScrapList(param);
     if (this.model.code == '1') {
-      this.customToast(this.$t('message.product_Tip8') as string);
+      //this.customToast(this.$t('message.product_Tip8') as string);
+      uni.showToast({
+        icon: 'success',
+        title: this.$t('message.product_Tip8') as string,
+      });
       this.wl.value = this.model.choiceCodeList[0].value;
       this.Some = this.model.recordsList[0];
     }
@@ -204,10 +208,12 @@ export default class ProductCheckReceipt extends BasePage {
         content: this.$t('message.Commission_tips8') as string,
         confirmText: this.$t('message.workArea_Confirm') as string,
         cancelText: this.$t('message.Cancel') as string,
-        success: function (res) {
+        success: (res: any) => {
           if (res.confirm) {
+            //debugger;
+            console.log("////111111");
             this.model.close(this.form.order3);
-            if (this.model.code == '1') {
+            if (model.code == '1') {
               uni.showToast({
                 icon: 'success',
                 title: this.$t('message.success') as string,

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;
   /**
@@ -125,7 +126,11 @@ export default class productCheckReceipt extends BasePage {
     }
     await this.model.getProductCode(this.form.pddNo);
     if (model.code == '1') {
-      this.customToast(this.$t('message.product_Tip8') as string);
+      //this.customToast(this.$t('message.product_Tip8') as string);
+      uni.showToast({
+        icon: 'success',
+        title: this.$t('message.product_Tip8') as string,
+      });
       // 获取选择库位的集合
       const storeList = [];
       storeList.push(this.model.WlListaa[0]);

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: '',
@@ -226,9 +227,9 @@ export default class productCheckReceipt extends BasePage {
         content: this.$t('message.Commission_tips8') as string,
         confirmText: this.$t('message.workArea_Confirm') as string,
         cancelText: this.$t('message.Cancel') as string,
-        success: function (res) {
+        success: (res: any) => {
           if (res.confirm) {
-            this.model.close(this.form.order3);
+            model.close(this.form.order3);
             if (this.model.code == '1') {
               uni.showToast({
                 icon: 'success',

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', //库位

src/pages/raw/commission/goOut/index.vue

@@ -169,7 +169,7 @@ export default class dnReceiptDom extends BasePage {
   //输入单号 查询数据
   async query() {
     this.list = [];
-    this.wlCode = '';
+    //this.wlCode = '';
     this.nowAmount = '';
     this.every = '';
     this.materialList = [];

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;
   /**
    * 表头
    */

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;
   /**
    * 表头
    */

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;
   /**
    * 表头
    */

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>

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;
   /**
    * 表头
    */

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;
   /**
    * 表单数据
    */

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;
   /**
    * 表头
    */

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;
   /**
    * 表头
    */

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();

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 = [];

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 = [];
   //查询单号