From 2ccf23d2b41e94a7e94cd6a0ed34d007af6b77a0 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Tue, 26 Dec 2023 10:47:52 +0800
Subject: [PATCH] =?UTF-8?q?wms=E9=87=87=E8=B4=AD=E6=94=B6=E8=8E=B7po,?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93po=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/wms/Raw/PurchaseWHPO/index.vue | 37 ++++++++++++++++++++----
 src/pages/wms/Raw/PurchaseWHPO/model.ts  | 11 ++++++-
 src/pages/wms/Raw/ReceivePO/index.vue    | 37 +++++++++++++++++++++---
 src/pages/wms/Raw/ReceivePO/model.ts     | 11 ++++++-
 4 files changed, 85 insertions(+), 11 deletions(-)

diff --git a/src/pages/wms/Raw/PurchaseWHPO/index.vue b/src/pages/wms/Raw/PurchaseWHPO/index.vue
index 75069dd..0051f7b 100644
--- a/src/pages/wms/Raw/PurchaseWHPO/index.vue
+++ b/src/pages/wms/Raw/PurchaseWHPO/index.vue
@@ -20,7 +20,8 @@
       </view>
       <!-- 订单 -->
       <u-form-item label="物料编码">
-        <u-input :border="true" v-model="materialCode" placeholder="" @confirm="query" style="overflow: hidden" />
+        <jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="aimWl.value" :options="materilist" />
+        <!-- <u-input :border="true" v-model="materialCode" placeholder="" @confirm="query" style="overflow: hidden" /> -->
       </u-form-item>
       <!-- 机台 -->
       <!-- <u-form-item>
@@ -40,7 +41,7 @@
         <u-form style="margin-top: 10rpx" class="form2">
           <view class="list">
             <view class="righttitle">
-              <view class="boder-icon-top zhuangtai" data-state="0">{{ item.activeFlag == 0 ? '未入库' : item.activeFlag == 1 ? '正在入库' : '收货入库' }}</view>
+              <view class="boder-icon-top zhuangtai" data-state="0">{{ item.userDefined1 == 1 ? '未入库' : '已入库' }}</view>
             </view>
             <view class="row-list">
               <view class="list-item"> 入库单号: </view>
@@ -134,6 +135,10 @@ import { BasePage } from '@/components/base/page';
 import jPicker from '@/components/J-Picker/jPicker.vue';
 import model from './model';
 import { session } from '@/store/modules/session';
+interface OptionType {
+  label: string;
+  value: string;
+}
 @Component({
   components: {
     jPicker,
@@ -144,6 +149,8 @@ export default class PurchaseWHPO extends BasePage {
   list: any = [];
   show = false;
   form3: any = {};
+  aimWl = {} as OptionType;
+  materilist = [];
   // remove: any = {};
   // async onReady() {
   //   await this.model.queryLocation();
@@ -231,13 +238,21 @@ export default class PurchaseWHPO extends BasePage {
       });
       return;
     }
+    this.aimWl = {} as OptionType;
     let query = {
       poNo: this.orderNo,
-      materialCode: this.materialCode,
+      materialCode: this.aimWl.value ? this.aimWl.value : '',
       factoryCode: session.FactoryCode,
     };
     await this.model.PurchaseOrderWarehousingPda(query);
-    this.list = model.orderNoItemList;
+    this.materilist = model.orderNoItemList;
+    this.list = [];
+    if (this.materilist.length) {
+      this.aimWl = this.materilist[0];
+      this.list.push(this.materilist[0]);
+    } else {
+      this.aimWl = {} as OptionType;
+    }
   }
   //提单按钮
   async tidan() {
@@ -250,7 +265,7 @@ export default class PurchaseWHPO extends BasePage {
     }
     let query = {
       poNo: this.orderNo,
-      materialCode: this.materialCode,
+      materialCode: this.aimWl.value ? this.aimWl.value : '',
       factoryCode: session.FactoryCode,
     };
     await this.model.PurchaseOrderWarehousingPda(query);
@@ -280,6 +295,18 @@ export default class PurchaseWHPO extends BasePage {
       },
     });
   }
+  bookTypeChange(e: any) {
+    this.aimWl = e.pickerName;
+    this.list = [];
+    this.materilist.forEach((item) => {
+      if (e.pickerName.value == item.materialCode) {
+        this.list.push(item);
+      }
+    });
+    //
+    //this.queryinformation();
+    //this.getlist();
+  }
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/pages/wms/Raw/PurchaseWHPO/model.ts b/src/pages/wms/Raw/PurchaseWHPO/model.ts
index 977d00f..ab2dd94 100644
--- a/src/pages/wms/Raw/PurchaseWHPO/model.ts
+++ b/src/pages/wms/Raw/PurchaseWHPO/model.ts
@@ -16,7 +16,16 @@ export class PurchaseWHPO extends VuexModule {
   @MutationAction
   async PurchaseOrderWarehousingPda(data: any) {
     const result: any = await http.post(url.lanjuwms.raw.PurchaseWHPO.PurchaseOrderWarehousingPda, data);
-    const orderNoItemList = result.data;
+    let orderNoItemList: any = [];
+    if (result.data.length) {
+      orderNoItemList = result.data.map((item: any) => ({
+        label: item.materialDesc,
+        value: item.materialCode,
+        ...item,
+      }));
+    } else {
+      orderNoItemList = [];
+    }
     return { orderNoItemList };
   }
   SubmitCode: any = '';
diff --git a/src/pages/wms/Raw/ReceivePO/index.vue b/src/pages/wms/Raw/ReceivePO/index.vue
index 96aac88..5de20b0 100644
--- a/src/pages/wms/Raw/ReceivePO/index.vue
+++ b/src/pages/wms/Raw/ReceivePO/index.vue
@@ -20,7 +20,8 @@
       </view>
       <!-- 订单 -->
       <u-form-item label="物料编码">
-        <u-input :border="true" v-model="materialCode" placeholder="" @confirm="query" style="overflow: hidden" />
+        <!-- <u-input :border="true" v-model="materialCode" placeholder="" @confirm="query" style="overflow: hidden" /> -->
+        <jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="aimWl.value" :options="materilist" />
       </u-form-item>
       <!-- 机台 -->
       <!-- <u-form-item>
@@ -122,6 +123,10 @@ import { BasePage } from '@/components/base/page';
 import jPicker from '@/components/J-Picker/jPicker.vue';
 import model from './model';
 import { session } from '@/store/modules/session';
+interface OptionType {
+  label: string;
+  value: string;
+}
 @Component({
   components: {
     jPicker,
@@ -133,6 +138,8 @@ export default class receivePO extends BasePage {
   whList: any = [];
   show = false;
   form3: any = {};
+  aimWl = {} as OptionType;
+  materilist = [];
   productCodeTypeList: any = {};
   moren = '选择仓库';
   // remove: any = {};
@@ -255,13 +262,23 @@ export default class receivePO extends BasePage {
       });
       return;
     }
+    this.aimWl = {} as OptionType;
     let query = {
       procureCode: this.procureCode,
-      materialCode: this.materialCode,
+      materialCode: this.aimWl.value ? this.aimWl.value : '',
+      //this.materialCode,
       factoryCode: session.FactoryCode,
     };
     await this.model.PurchaseOrderPda(query);
-    this.list = model.orderNoItemList;
+    this.materilist = model.orderNoItemList;
+    this.list = [];
+    if (this.materilist.length) {
+      this.aimWl = this.materilist[0];
+      this.list.push(this.materilist[0]);
+    } else {
+      this.aimWl = {} as OptionType;
+    }
+    //this.list = model.orderNoItemList;
   }
   //提单按钮
   async tidan() {
@@ -280,7 +297,7 @@ export default class receivePO extends BasePage {
     if (model.sapPurchasecode == '200') {
       let query = {
         procureCode: this.procureCode,
-        materialCode: this.materialCode,
+        materialCode: this.aimWl.value ? this.aimWl.value : '',
         factoryCode: session.FactoryCode,
       };
       await this.model.PurchaseOrderPda(query);
@@ -334,6 +351,18 @@ export default class receivePO extends BasePage {
     //   await this.query();
     // }
   }
+  bookTypeChange(e: any) {
+    this.aimWl = e.pickerName;
+    this.list = [];
+    this.materilist.forEach((item) => {
+      if (e.pickerName.value == item.materialCode) {
+        this.list.push(item);
+      }
+    });
+    //
+    //this.queryinformation();
+    //this.getlist();
+  }
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/pages/wms/Raw/ReceivePO/model.ts b/src/pages/wms/Raw/ReceivePO/model.ts
index a63d851..11fe790 100644
--- a/src/pages/wms/Raw/ReceivePO/model.ts
+++ b/src/pages/wms/Raw/ReceivePO/model.ts
@@ -16,7 +16,16 @@ export class receivePO extends VuexModule {
   @MutationAction
   async PurchaseOrderPda(data: any) {
     const result: any = await http.post(url.lanjuwms.raw.ReceivePO.PurchaseOrderPda, data);
-    const orderNoItemList = result.data;
+    let orderNoItemList: any = [];
+    if (result.data.length) {
+      orderNoItemList = result.data.map((item: any) => ({
+        label: item.materialDesc,
+        value: item.materialCode,
+        ...item,
+      }));
+    } else {
+      orderNoItemList = [];
+    }
     return { orderNoItemList };
   }
   sapPurchasecode: any = '';