From 7fddccd74edcafbe08b1b873ff0a5d7c23f225eb Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Fri, 12 May 2023 14:19:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=89=E7=89=A9=E8=B5=84?=
 =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E7=AA=97=E5=8F=A3=E5=9C=A8=E6=B8=85=E9=99=A4?=
 =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E8=B4=A7=E4=BD=8D=E5=90=8E=E4=BB=8D=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=88=90=E5=8A=9F=E6=89=AB=E5=85=A5=E6=9D=A1=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/InvProductPlaceModify.vue | 62 +++++++++++++++----
 .../purApply/pureApplyDetailDialog.vue        |  3 +-
 2 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/src/views/inventory/InvProductPlaceModify.vue b/src/views/inventory/InvProductPlaceModify.vue
index 941dc701..0380c2f9 100644
--- a/src/views/inventory/InvProductPlaceModify.vue
+++ b/src/views/inventory/InvProductPlaceModify.vue
@@ -35,19 +35,35 @@
         </el-form-item>
       </el-col>
       <el-col :span="10">
-        <el-form-item class="query-form-item" label="上架货位:">
-          <el-autocomplete
-            v-model="formData.invSpaceName"
-            :disabled="list.length > 0"
-            :fetch-suggestions="querySearchAsync"
-            placeholder="请输入内容"
-            ref="spaceInputRef"
-            @select="handleSelect"
-            @keypress.enter.native="spaceEnterKey($event)"
-            clearable
-            style="width: 90%"
-          ></el-autocomplete>
+        <el-form-item label="上架货位:">
+          <el-select v-model="formData.invSpaceName" placeholder="请选择上架货位"
+                     @change="updateInvSpaceCode"
+                     :disabled="list.length > 0"
+                     :fetch-suggestions="querySearchAsync"
+                     ref="spaceInputRef"
+                     @select="handleSelect"
+                     @keypress.enter.native="spaceEnterKey($event)"
+                     style="width: 90%"
+                     clearable
+          >
+            <el-option v-for="item in spaceList" :key="item.id"
+                       :label="item.name" :value="item.id"/>
+          </el-select>
         </el-form-item>
+
+        <!--        <el-form-item class="query-form-item" label="上架货位:">-->
+        <!--          <el-autocomplete-->
+        <!--            v-model="formData.invSpaceName"-->
+        <!--            :disabled="list.length > 0"-->
+        <!--            :fetch-suggestions="querySearchAsync"-->
+        <!--            placeholder="请输入内容"-->
+        <!--            ref="spaceInputRef"-->
+        <!--            @select="handleSelect"-->
+        <!--            @keypress.enter.native="spaceEnterKey($event)"-->
+        <!--            style="width: 90%"-->
+        <!--            clearable-->
+        <!--          ></el-autocomplete>-->
+        <!--        </el-form-item>-->
       </el-col>
     </el-row>
 
@@ -170,6 +186,7 @@ export default {
         invSpaceName: null,
         code: null,
       },
+      //spaceList: [{id: 1, name: '货位1'}, {id: 2, name: '货位2'}, {id: 3, name: '货位3'}],
       orderId: null,
       list: [],
       codeArray: [],
@@ -191,6 +208,7 @@ export default {
         return;
       }
       if (this.list.length === 0) {
+        //this.$message.error(this.formData.invSpaceCode);
         this.$message.error("请录入需要上架的物资数据");
         return;
       }
@@ -225,6 +243,24 @@ export default {
         .catch(() => {
         });
     },
+    updateInvSpaceCode() {
+      // 根据所选的货位名称，更新对应的货位编码
+      const selectedSpace = this.spaceList.find(space => space.id === this.formData.invSpaceName);
+      this.formData.invSpaceCode = selectedSpace ? selectedSpace.code : null;
+      //this.$message.error(this.formData.invSpaceCode);
+      // if (selectedSpace) {
+      //   this.formData.invSpaceCode = selectedSpace.id
+      //   // if (this.formData.invSpaceCode == 1656491192791773184) {
+      //   //   this.formData.invSpaceCode = '0010';
+      //   // } else if (this.formData.invSpaceCode == 1656491242624299008) {
+      //   //   this.formData.invSpaceCode = '0011';
+      //   // } else if (this.formData.invSpaceCode == 1656491284529590272) {
+      //   //   this.formData.invSpaceCode = '0012';
+      //   // }
+      // } else {
+      //   this.formData.invSpaceCode = null
+      // }
+    },
     clearFormData() {
       //清空表单数据
       this.formData = {
@@ -362,6 +398,8 @@ export default {
     },
   },
   created() {
+    this.$watch('$store.getters.locInvCode', this.getSpaceList); // 监听库位编码变化并调用getSpaceList方法
+    this.$watch('formData.invCode', this.getSpaceList); // 监听所属仓库编码变化并调用getSpaceList方法
     this.getInvList();
   },
   mounted() {
diff --git a/src/views/purchase/purApply/pureApplyDetailDialog.vue b/src/views/purchase/purApply/pureApplyDetailDialog.vue
index b41c015f..1b336e91 100644
--- a/src/views/purchase/purApply/pureApplyDetailDialog.vue
+++ b/src/views/purchase/purApply/pureApplyDetailDialog.vue
@@ -238,6 +238,7 @@ export default {
       purApplyProducts,
     },
     methods: {
+      //审核界面弹出按钮
         saveOrder(status) {
             let tip = "";
             if (status == "3") {
@@ -264,7 +265,7 @@ export default {
         submitFunction(status) {
             this.loading = true;
             this.formData.status = status;
-            auditOrder(this.formData)
+            auditOrder(this.formData)//更新方法接口路径
                 .then(response => {
                     this.loading = false;
                     if (response.code === 20000) {