From f080d9ffc2c84e31ec2bb28e54f78002c002e320 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 24 Apr 2023 10:41:54 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=90=8C=E6=AD=A5=E8=B4=A7=E4=BD=8D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/InvSpaceManage.vue | 28 ++++++++++++++++----------
 src/views/system/dept/invWarehouse.vue |  5 ++++-
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/views/inventory/InvSpaceManage.vue b/src/views/inventory/InvSpaceManage.vue
index ae65222..a75c939 100644
--- a/src/views/inventory/InvSpaceManage.vue
+++ b/src/views/inventory/InvSpaceManage.vue
@@ -22,7 +22,6 @@
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column label="货位号" prop="code"></el-table-column>
       <el-table-column label="货位名称" prop="name"></el-table-column>
-      <el-table-column label="货位分类" prop="type"></el-table-column>
       <!--        <el-table-column label="所属仓库" prop="invStorageName" width="200"-->
       <!--                         show-overflow-tooltip></el-table-column>-->
       <!--        <el-table-column label="所属分库" prop="invSubStorageName"-->
@@ -68,10 +67,24 @@
       v-if="modifySpaceVisible"
     >
       <el-form :model="formData" :rules="rules" ref="formData" label-width="80px">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="code" label="仓库编码">
+              <el-input v-model="formData.invWarehouseCode" disabled auto-complete="off" style="width: 90%"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="name" label="仓库名称">
+              <el-input v-model="formData.invName" disabled auto-complete="off" style="width: 90%"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="11">
             <el-form-item prop="code" label="货位编码">
-              <el-input v-model="formData.code" auto-complete="off" style="width: 90%"
+              <el-input v-model="formData.code" disabled auto-complete="off" style="width: 90%"
                         placeholder="请输入货位编码" clearable></el-input>
             </el-form-item>
           </el-col>
@@ -83,12 +96,6 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="11">
-            <el-form-item prop="remark" label="货位分类">
-              <el-input v-model="formData.type" auto-complete="off" style="width: 90%"
-                        placeholder="请输入货位分类" clearable></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="11">
             <el-form-item prop="status" label="启用状态">
               <el-radio v-model="formData.status" :label="1">启用</el-radio>
@@ -171,13 +178,11 @@ export default {
         type: null,
         invStorageCode: this.invInfo.invStorageCode,
         invWarehouseCode: this.invInfo.invWarehouseCode,
+        invName: this.invInfo.invName,
         status: 1,
         remark: null
       },
       rules: {
-        code: [
-          {required: true, message: "请输入货位编码", trigger: "blur"}
-        ],
         name: [
           {required: true, message: "请输入货位名称", trigger: "blur"}
         ],
@@ -291,6 +296,7 @@ export default {
         type: null,
         invStorageCode: this.invInfo.invStorageCode,
         invWarehouseCode: this.invInfo.invWarehouseCode,
+        invName: this.invInfo.invName,
         status: 1,
         remark: null
       }
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index 390694a..4c2ddd7 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -474,6 +474,7 @@ export default {
       currentInvInfo: {
         invStorageCode: null,
         invWarehouseCode: null,
+        invName: null
       },
       sysList: [],
       sysSubList: [],
@@ -498,7 +499,8 @@ export default {
 
       this.currentInvInfo = {
         invStorageCode: null,
-        invWarehouseCode: null
+        invWarehouseCode: null,
+        invName: null
       };
     },
 
@@ -830,6 +832,7 @@ export default {
       this.currentInvInfo = {
         invStorageCode: row.parentId,
         invWarehouseCode: row.code,
+        invName: row.name,
         flag: row.id,
         page: 1
       };