From ac431442f4db9a52b7020088a570f822d40582d8 Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Tue, 31 Oct 2023 11:29:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=82=E5=B8=B8=E6=89=98?=
 =?UTF-8?q?=E7=9B=98=E5=A4=84=E7=90=86=E9=A1=B5=E9=9D=A2=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/mes/Pallethandling/index.vue | 16 +++++++++-------
 src/pages/mes/Pallethandling/model.ts  |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/pages/mes/Pallethandling/index.vue b/src/pages/mes/Pallethandling/index.vue
index ad4ac92..d79d1e4 100644
--- a/src/pages/mes/Pallethandling/index.vue
+++ b/src/pages/mes/Pallethandling/index.vue
@@ -31,14 +31,14 @@
       <u-form-item label="规格:">
         <u-input :disabled="true" v-model="orderNoItemList.productSpc" placeholder="" style="overflow: hidden" />
       </u-form-item>
-      <u-form-item label="起始缓存区:">
+      <u-form-item label="起始区域类型:">
         <jPicker sureColor="#ff0000" :moren="moren" @bindpicker="selectProductlocCode" showKey="label" valKey="value" :val="productCodelocList.value" :options="model.locList" />
       </u-form-item>
 
       <u-form-item label="起始位置:">
         <jPicker sureColor="#ff0000" :moren="morenStart" @bindpicker="selectProductCode" showKey="label" valKey="value" :val="productCodeList.value" :options="model.DictList" />
       </u-form-item>
-      <u-form-item label="目的缓存区:">
+      <u-form-item label="目的区域类型:">
         <jPicker sureColor="#ff0000" :moren="moren" @bindpicker="selectProductlocCode2" showKey="label" valKey="value" :val="productDestinationList.value" :options="model.locList" />
       </u-form-item>
       <u-form-item label="目的地点:">
@@ -86,7 +86,7 @@ import jPicker from '@/components/J-Picker/jPicker.vue';
 })
 export default class ChangePalletNew extends BasePage {
   model = model;
-  moren = '选择缓存区';
+  moren = '选择区域类型';
   morenStart = '选择起始位置';
   Destination = '选择目的地点';
   shouciFocus = true;
@@ -155,6 +155,7 @@ export default class ChangePalletNew extends BasePage {
     });
   }
   async onsubmit() {
+    console.log(this.productCodeList.value == '' || this.productCodeList.value == undefined, this.productCodeList.value);
     if (this.orderNo == '' || this.orderNo.length == 0) {
       (this.$refs.uToast as any).show({
         title: '请输入nficl',
@@ -169,9 +170,9 @@ export default class ChangePalletNew extends BasePage {
       });
       return;
     }
-    if (this.productCodelocList.value == '' || this.productCodelocList.value == undefined) {
+    if (this.productCodelocList.value < 0) {
       (this.$refs.uToast as any).show({
-        title: '请选择起始缓存区',
+        title: '请选择起始区域',
         type: 'default',
       });
       return;
@@ -183,9 +184,9 @@ export default class ChangePalletNew extends BasePage {
       });
       return;
     }
-    if (this.productDestinationList.value == '' || this.productDestinationList.value == undefined) {
+    if (this.productCodelocList.value < 0) {
       (this.$refs.uToast as any).show({
-        title: '请选择目的缓存区',
+        title: '请选择目的区域',
         type: 'default',
       });
       return;
@@ -220,6 +221,7 @@ export default class ChangePalletNew extends BasePage {
       sourceAddress: this.productCodeList.value,
       //productionState: this.productCodeList.value,
     };
+
     await this.model.palletInforUpdate(params);
     if (model.SubmitCode == 200) {
       this.uni.showToast({ title: '成功' });
diff --git a/src/pages/mes/Pallethandling/model.ts b/src/pages/mes/Pallethandling/model.ts
index 66a5dba..6a1c8f2 100644
--- a/src/pages/mes/Pallethandling/model.ts
+++ b/src/pages/mes/Pallethandling/model.ts
@@ -45,7 +45,7 @@ export class ChangePalletNew extends VuexModule {
     if (DictListoild) {
       const Destination = DictListoild.map((item: any) => ({
         label: item.location,
-        value: item.type,
+        value: item.location,
       }));
       return { Destination };
     }
@@ -59,7 +59,7 @@ export class ChangePalletNew extends VuexModule {
     if (DictListoild) {
       const DictList = DictListoild.map((item: any) => ({
         label: item.location,
-        value: item.type,
+        value: item.location,
       }));
       return { DictList };
     }