From d77b87accd1690491f60beab86d9c654e370f05d Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 30 Aug 2023 14:35:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-=E8=B4=A7?=
 =?UTF-8?q?=E4=BD=8D=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/location/index.vue | 49 +++++++++++++-------------------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/src/views/wms/location/index.vue b/src/views/wms/location/index.vue
index 6e6075f..49caf48 100644
--- a/src/views/wms/location/index.vue
+++ b/src/views/wms/location/index.vue
@@ -88,9 +88,7 @@
         label="序号">
       </el-table-column>
 			<el-table-column label="仓库编码" align="center" prop="warehouseCode" />
-			<el-table-column label="仓库名称" align="center" prop="warehouseName" />
 			<el-table-column label="库区编码" align="center" prop="areaCode" />
-			<el-table-column label="库区名称" align="center" prop="areaDesc" />
 			<el-table-column label="货位编码" align="center" prop="locationCode" />
 			<el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="创建时间" align="center" prop="createTime"/>
@@ -128,38 +126,24 @@
 		/>
 
 		<!-- 添加或修改货位管理对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="100px">
-				<el-row :gutter="10" class="mb8">
-                    <el-col :span="12">
 						<el-form-item label="仓库编码" prop="warehouseCode">
-					       <el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
+					    <el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" style="width:300px"/>
 				        </el-form-item>
-                        <el-form-item label="仓库名称" prop="locationCode">
-                     		<el-input v-model="form.locationCode" placeholder="请输入仓库编码" />
-                     	</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-						<el-form-item label="库区编码" prop="areaCode">
-							<el-input v-model="form.areaCode" placeholder="请输入库区编码" />
+					  <el-form-item label="库区编码" prop="areaCode">
+							<el-input v-model="form.areaCode" placeholder="请输入库区编码" style="width:300px"/>
 						</el-form-item>
-						<el-form-item label="库区名称" prop="warehouseCode">
-					       <el-input v-model="form.warehouseCode" placeholder="请输入库区名称" />
-				        </el-form-item>
-                    </el-col>
-                </el-row>
-				<el-row :gutter="10" class="mb8">
-                    <el-col :span="12">
-                        <el-form-item label="货位编码" prop="locationCode">
-							<el-input v-model="form.locationCode" placeholder="请输入货位编码" />
-						</el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-						<el-form-item label="是否启用" prop="activeFlag">
-							<el-input v-model="form.activeFlag" placeholder="请输入是否启用" />
+						</el-col>
+						 </el-row>
+               <el-form-item label="货位编码" prop="locationCode">
+							<el-input v-model="form.locationCode" placeholder="请输入货位编码" style="width:300px"/>
 						</el-form-item>
-                    </el-col>
-                </el-row>
+					  <el-form-item label="是否启用" prop="activeFlag" >
+              <el-select v-model="form.activeFlag" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:300px">
+                <el-option v-for="item in options" :key="item.activeFlag" :label="item.label" :value="item.activeFlag"></el-option>
+              </el-select>
+            </el-form-item>
 				                        <!-- <el-form-item label="上架顺序" prop="shelfOrder">
                             <el-input v-model="form.shelfOrder" placeholder="请输入上架顺序" />
                         </el-form-item> -->
@@ -385,6 +369,13 @@ export default {
 				factoryCode: null,
 				syntozk: null
 			},
+				options: [{
+          activeFlag: "1",
+          label: '是'
+        }, {
+          activeFlag: "0",
+          label: '否'
+        }],
 			// 表单参数
 			form: {},
 			// 表单校验