From 046ad0a35555a956877475859fe1542396d820dc Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Wed, 27 Apr 2022 18:01:36 +0800
Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E5=8E=9F=E6=9D=90=E6=96=99?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=89=A9=E6=96=99=E9=80=89=E6=8B=A9=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/raw/ingoods/dnReceipt/model.ts       |  2 +-
 src/pages/raw/warehouse/rowInventory/index.vue | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/pages/raw/ingoods/dnReceipt/model.ts b/src/pages/raw/ingoods/dnReceipt/model.ts
index 1515bff..ccc6456 100644
--- a/src/pages/raw/ingoods/dnReceipt/model.ts
+++ b/src/pages/raw/ingoods/dnReceipt/model.ts
@@ -235,7 +235,7 @@ export class ReceiptModule extends VuexModule {
    * @returns
    * @memberof ReceiptModule
    */
-  @Action({ commit: 'updateCheckedOrderInInfoListKw' })
+  @Action({ commit: 'updateCheckedOrderInInfo' })
   async queryByFactoryCodeAndWorkAreaCode(content: any) {
     const res = await http.post<LocationDetail>('wmspda/fg/queryByFactoryCodeAndWorkAreaCode', content);
     return res;
diff --git a/src/pages/raw/warehouse/rowInventory/index.vue b/src/pages/raw/warehouse/rowInventory/index.vue
index e6e084c..674482a 100644
--- a/src/pages/raw/warehouse/rowInventory/index.vue
+++ b/src/pages/raw/warehouse/rowInventory/index.vue
@@ -25,8 +25,7 @@
       </u-form-item>
       <!-- 物料号 -->
       <u-form-item :label="$t('message.po_MaterielNo')" prop="productDescZh">
-        <u-input v-model="productItem.productCode" type="select" @click="originWlSelect = true" :placeholder="$t('message.po_PleaseInput')" />
-        <u-select :confirm-text="$t('message.product_Confirm')" :cancel-text="$t('message.product_Cancel')" v-model="originWlSelect" :list="model.InventoryItemList" @confirm="onchange"></u-select>
+        <jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="onchange" showKey="value" valKey="value" :val="wl.value" class="search" :options="model.InventoryItemList" />
       </u-form-item>
       <!-- 物料名 -->
       <u-form-item :label="$t('message.InventoryMateriel')" prop="productDescZh">
@@ -62,7 +61,12 @@ import { Component, Ref } from 'vue-property-decorator';
 import { BasePage } from '@/components/base/page';
 import { VForm } from 'vue/types/form';
 import model from './model';
-@Component
+import jPicker from '@/components/J-Picker/jPicker.vue';
+@Component({
+  components: {
+    jPicker,
+  },
+})
 export default class rawMaterialInventory extends BasePage {
   @Ref('form') readonly $form!: VForm;
   model = model;
@@ -74,6 +78,7 @@ export default class rawMaterialInventory extends BasePage {
   productItem: any = {};
   allNum = 0;
   originWlSelect = false;
+  wl: any = {};
   // 页面初始化
   onReady() {
     this.empty();
@@ -104,12 +109,13 @@ export default class rawMaterialInventory extends BasePage {
         this.allNum += parseFloat(item.spQty);
       });
       this.productItem = this.model.InventoryList[0];
+      this.wl = this.model.InventoryItemList[0];
     }
   }
   //选择其中一条物料
   onchange(e: any) {
     this.model.InventoryList.forEach((item: any) => {
-      if (item.productCode == e[0].label) {
+      if (item.productCode == e.pickerName.label) {
         this.productItem = item;
       }
     });
@@ -180,13 +186,16 @@ export default class rawMaterialInventory extends BasePage {
     font-size: 34rpx;
     font-weight: 500;
     text-align: center;
+
     .title {
       flex: 3;
     }
+
     .left,
     .right {
       flex: 1;
     }
+
     .icon {
       display: flex;
       justify-content: center;
@@ -207,6 +216,7 @@ export default class rawMaterialInventory extends BasePage {
       line-height: 35rpx;
     }
   }
+
   .single-right {
     button {
       //margin-top: 15rpx;