From 15d764bd324118f13f1bd18a9120d77a2cb6388e Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Fri, 21 Jan 2022 16:53:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/lang/cn.ts                           |  4 ++--
 .../inbound/finishProductOffline/index.vue    |  2 +-
 .../product/outbound/stoOutbound/model.ts     |  2 +-
 src/pages/raw/handover/aggregating/config.ts  |  8 +++----
 src/pages/raw/handover/picking/config.ts      |  8 +++----
 .../raw/handover/returning/Time-filter.vue    | 23 ++++++++++++++++---
 src/utils/url.ts                              |  1 +
 7 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index deb26c9..5f434ae 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -161,7 +161,7 @@ export default {
     Pi_Station: '工位',
     Pi_FinishedProductModel: '成品型号',
     Pi_CurrentPickingQuantity: '本次拣配数量',
-    Pi_PickedQuantity: '已拣配数量',
+    Pi_PickedQuantity: '已拣',
     Pi_QuantityHandedOver: '已交接数量',
     Pi_distribution: '分配',
     successful: '查询成功',
@@ -180,7 +180,7 @@ export default {
     Summary_Result: '查询结果',
     Summary_SummaryAndHandover: '汇总交接',
     Summary_HandoverByOrder: '按单交接',
-    Summary_Number: '数量',
+    Summary_Number: '可退数量',
     Summary_Receiver: '接收人',
     Summary_Password: '口令',
     screen: '筛选',
diff --git a/src/pages/product/inbound/finishProductOffline/index.vue b/src/pages/product/inbound/finishProductOffline/index.vue
index acd1b32..13b2775 100644
--- a/src/pages/product/inbound/finishProductOffline/index.vue
+++ b/src/pages/product/inbound/finishProductOffline/index.vue
@@ -25,7 +25,7 @@
             <!--            ></u-select>-->
           </u-form-item>
           <u-form-item :label="this.$t('message.product_barCode')">
-            <u-search :placeholder="this.$t('message.po_PleaseInput')" v-model="form.barCode" @search="getBarcode" :focus="firstFocus" :show-action="false"></u-search>
+            <u-search :placeholder="this.$t('message.po_PleaseInput')" v-model="form.barCode" @search="getBarcode" :focus="firstFocus" maxlength="20" :show-action="false"></u-search>
           </u-form-item>
         </u-col>
         <u-col :span="12">
diff --git a/src/pages/product/outbound/stoOutbound/model.ts b/src/pages/product/outbound/stoOutbound/model.ts
index 55c81c5..0f570a9 100644
--- a/src/pages/product/outbound/stoOutbound/model.ts
+++ b/src/pages/product/outbound/stoOutbound/model.ts
@@ -102,7 +102,7 @@ export class ReturningModule extends VuexModule {
     });
     const materielList = result.data.map((item: any) => ({
       label: item.rowItem,
-      value: item.stoItem,
+      value: item.rowItem + '(' + item.materialCode + ')',
       ...item,
     }));
     console.log('materielList', materielList);
diff --git a/src/pages/raw/handover/aggregating/config.ts b/src/pages/raw/handover/aggregating/config.ts
index 91d0511..7c292cb 100644
--- a/src/pages/raw/handover/aggregating/config.ts
+++ b/src/pages/raw/handover/aggregating/config.ts
@@ -6,22 +6,22 @@ export const headers = [
   {
     label: vm.$t('message.Pi_OrderNo'),
     key: 'prdOrder',
-    width: 550,
+    width: 250,
   },
   {
     label: vm.$t('message.po_DemandQuantity'),
     key: 'amount', //需求数量
-    width: 550,
+    width: 255,
   },
   {
     label: vm.$t('message.Pi_materielNo'),
     key: 'materialCode', //物料号
-    width: 550,
+    width: 250,
   },
   {
     label: vm.$t('message.CommissionedMaterielDesc'),
     key: 'materialDesc', //物料描述
-    width: 550,
+    width: 300,
   },
 ];
 
diff --git a/src/pages/raw/handover/picking/config.ts b/src/pages/raw/handover/picking/config.ts
index 0b192f6..3253634 100644
--- a/src/pages/raw/handover/picking/config.ts
+++ b/src/pages/raw/handover/picking/config.ts
@@ -6,22 +6,22 @@ export const headers = [
   {
     label: vm.$t('message.Pi_OrderNo'),
     key: 'prdOrder', //订单号
-    width: 550,
+    width: 250,
   },
   {
     label: vm.$t('message.po_DemandQuantity'),
     key: 'amount', //需求数量
-    width: 550,
+    width: 255,
   },
   {
     label: vm.$t('message.Pi_materielNo'),
     key: 'materialCode', //物料号
-    width: 550,
+    width: 250,
   },
   {
     label: vm.$t('message.CommissionedMaterielDesc'),
     key: 'materialDesc', //物料描述
-    width: 550,
+    width: 300,
   },
 ];
 
diff --git a/src/pages/raw/handover/returning/Time-filter.vue b/src/pages/raw/handover/returning/Time-filter.vue
index 237a481..8024689 100644
--- a/src/pages/raw/handover/returning/Time-filter.vue
+++ b/src/pages/raw/handover/returning/Time-filter.vue
@@ -94,9 +94,26 @@ export default class returningDom extends BasePage {
       this.redirectTo(this.page.raw.handover.returning.index);
     }
   }
-  /**
-   * 上传
-   */
+  getNowFormatDate() {
+    var date = new Date();
+    var seperator1 = '-';
+    var year = date.getFullYear();
+    var month: any = date.getMonth() + 1;
+    var strDate: any = date.getDate();
+    if (month >= 1 && month <= 9) {
+      month = '0' + month;
+    }
+    if (strDate >= 0 && strDate <= 9) {
+      strDate = '0' + strDate;
+    }
+    var currentdate = year + seperator1 + month + seperator1 + strDate;
+    return currentdate;
+  }
+  async onReady() {
+    this.startMobile = this.getNowFormatDate();
+    this.endMobile = this.getNowFormatDate();
+    await this.onSubmit();
+  }
   async onSubmit() {
     if (this.startMobile == '' || this.endMobile == '') {
       uni.showToast({
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 925f8e0..67e7f66 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -193,6 +193,7 @@ export const url = {
     rowTransfer: {
       list: '/wmspda/fg/listByOrder',
       commit: '/wmspda/fg/confirmMove',
+      getMaterialByCode: '/wmspda/fg/getMaterialByCode',
       getCode: '/wmspda/fg/getCpMoveBatchNo',
       //查询明细
       queryListByMoveCode: '/wmspda/fg/queryListByMoveCode',