From 91a2e9ea757712e4080c7d9b62109159230b412c Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Tue, 21 Dec 2021 20:59:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=80=80=E6=96=99=20?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=A1=B5=E9=9D=A2=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/raw/commission/entrant/index.vue       |  6 +++++-
 src/pages/raw/commission/goOut/index.vue         |  4 +++-
 src/pages/raw/handover/returning/Time-filter.vue |  3 ++-
 src/pages/raw/handover/returning/config.ts       | 12 +++++++++++-
 src/pages/raw/handover/returning/index.vue       |  7 +++++++
 src/pages/raw/handover/returning/model.ts        |  3 +++
 6 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/pages/raw/commission/entrant/index.vue b/src/pages/raw/commission/entrant/index.vue
index 3efc057..2bb82a8 100644
--- a/src/pages/raw/commission/entrant/index.vue
+++ b/src/pages/raw/commission/entrant/index.vue
@@ -197,13 +197,17 @@ export default class dnReceiptDom extends BasePage {
       workArea: session.workareaCode,
     };
     let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
-    res.forEach((item: any) => {
+    console.log("res res",res[0]);
+    // 库位列表是undefined  委外入库、委外出库都是同样的问题
+    //guoshuang 修改 库位列表undefiend
+    res[0].forEach((item: any) => {
       let pickerName: any = {};
       pickerName.label = item.locationCode;
       pickerName.value = item.locationCode + "(" + item.sendSpot + ")";
       pickerName.sendSpot = item.sendSpot;
       this.Location.push(pickerName);
     });
+    console.log("库位列表",this.Location);
   }
   //输入单号 查询数据
   async query() {
diff --git a/src/pages/raw/commission/goOut/index.vue b/src/pages/raw/commission/goOut/index.vue
index 4cc5170..8c9d099 100644
--- a/src/pages/raw/commission/goOut/index.vue
+++ b/src/pages/raw/commission/goOut/index.vue
@@ -197,7 +197,9 @@ export default class dnReceiptDom extends BasePage {
       workArea: session.workareaCode,
     };
     let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
-    res.forEach((item: any) => {
+    //库位为undefined，打印的res信息格式为[[],[]],且里面两个arry相同
+    //guoshuang 修改 库位列表undefined
+    res[0].forEach((item: any) => {
       let pickerName: any = {};
       pickerName.label = item.locationCode;
       pickerName.value = item.locationCode + "(" + item.sendSpot + ")";
diff --git a/src/pages/raw/handover/returning/Time-filter.vue b/src/pages/raw/handover/returning/Time-filter.vue
index 8d1b643..1acf8e5 100644
--- a/src/pages/raw/handover/returning/Time-filter.vue
+++ b/src/pages/raw/handover/returning/Time-filter.vue
@@ -10,6 +10,7 @@
       <view class="title">{{ $t("message.screen") }}</view>
       <view class="right"></view>
     </view>
+    <!-- 开始时间 -->
     <view style="display: flex">
       <u-field
         style="background: white; border-radius: 10rpx"
@@ -75,7 +76,7 @@
         </u-col>
         <u-col :span="6">
           <u-button type="error" @click="back">{{
-            $t("message.po_Return")
+            $t("message.workArea_Confirm")
           }}</u-button>
         </u-col>
       </u-row>
diff --git a/src/pages/raw/handover/returning/config.ts b/src/pages/raw/handover/returning/config.ts
index 8e0f831..e6b4240 100644
--- a/src/pages/raw/handover/returning/config.ts
+++ b/src/pages/raw/handover/returning/config.ts
@@ -6,6 +6,16 @@ export const headers = [
   {
     label: vm.$t('message.InventoryOrderNo'),
     key: 'label',
-    width: 650,
+    width: 216,
+  },
+  {
+    label: vm.$t('message.InventoryMaterielNo'),
+    key: 'value',
+    width: 216,
+  },
+  {
+    label: "接收人",
+    key: 'sendSpot',
+    width: 216,
   },
 ];
diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue
index 7f2768c..b8adf4e 100644
--- a/src/pages/raw/handover/returning/index.vue
+++ b/src/pages/raw/handover/returning/index.vue
@@ -17,12 +17,14 @@
       :error-type="['toast']"
       label-width="150rpx"
     >
+    <!-- 工位 -->
       <u-form-item :label="this.$t('message.Pi_Station')">
         <u-input
           v-model="form.sendSpot"
           :placeholder="this.$t('message.po_PleaseInput')"
         />
       </u-form-item>
+      <!-- 订单号 -->
       <u-form-item
         :required="true"
         :label="this.$t('message.Pi_OrderNo')"
@@ -52,6 +54,7 @@
           :options="prdOrder"
         /> -->
       </u-form-item>
+      <!-- 物料号 -->
       <u-form-item
         :required="true"
         :label="this.$t('message.Pi_materielNo')"
@@ -71,6 +74,7 @@
           @confirm="materialConfirm"
         ></u-select>
       </u-form-item>
+      <!-- 库存 -->
       <view class="newly">
         <u-form-item :label="this.$t('message.po_Location')" style="width: 50%">
           <u-input
@@ -99,6 +103,7 @@
           />
         </u-form-item>
       </view>
+      <!-- 工厂 -->
       <u-row gutter="0">
         <u-col :span="7">
           <u-form-item
@@ -127,6 +132,7 @@
           </u-form-item>
         </u-col>
       </u-row>
+      <!-- 工位退料人 -->
       <u-form-item
         :required="true"
         :label="this.$t('message.return_OperatorName')"
@@ -138,6 +144,7 @@
           :placeholder="this.$t('message.po_PleaseInput')"
         />
       </u-form-item>
+      <!-- 口令 -->
       <u-form-item :label="this.$t('message.Summary_Password')">
         <u-input
           v-model="form.rfPwd"
diff --git a/src/pages/raw/handover/returning/model.ts b/src/pages/raw/handover/returning/model.ts
index beb2261..99ffb40 100644
--- a/src/pages/raw/handover/returning/model.ts
+++ b/src/pages/raw/handover/returning/model.ts
@@ -97,6 +97,9 @@ export class ReturningModule extends VuexModule {
       wkposCode: item.wkposCode,
       sendSpot: item.sendSpot,
     }));
+    //materielList 包含页面table想要展示的字段：sendSpot：接收人；value：物料号；label：订单号
+    console.log("时间查询物料列表", data);
+    console.log("时间查询物料名列表", materielList);
     const orderInInfo = data[0] || {};
     return { orderInInfo, materielList };
   }