From 8901bf1bb921692a60fcf91372b0bed3817b6083 Mon Sep 17 00:00:00 2001
From: WUSIJIAN <13825895+wsj0228@user.noreply.gitee.com>
Date: Fri, 30 Jan 2026 11:02:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=93=E5=BA=93=E3=80=81?=
 =?UTF-8?q?=E5=BA=93=E5=8C=BA=E5=92=8C=E5=BA=93=E4=BD=8D=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9A=84=E7=8A=B6=E6=80=81=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91,=E7=BB=9F=E4=B8=80=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=80=BC=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83=E5=B0=86enabled/d?=
 =?UTF-8?q?isabled=E6=94=B9=E4=B8=BAenable/disable,=E4=BF=AE=E6=94=B9updat?=
 =?UTF-8?q?eWarehouseStatus=E3=80=81updateZoneStatus=E5=92=8CupdateLocatio?=
 =?UTF-8?q?nStatus=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=B0=86id=E4=BB=8E=E6=95=B0=E7=BB=84=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2,=E5=9C=A8=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=AD=E5=B0=86=E7=8A=B6=E6=80=81=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3=E6=94=B9=E4=B8=BA=E6=A0=87=E7=AD=BE=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=B9=B6=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=94=AF=E6=8C=81=E7=A9=BA=E9=97=B2/?=
 =?UTF-8?q?=E5=8D=A0=E7=94=A8/=E9=94=81=E5=AE=9A/=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E5=9B=9B=E7=A7=8D=E7=8A=B6=E6=80=81,=E5=9C=A8=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E8=A1=A8=E5=8D=95=E4=B8=AD=E6=B7=BB=E5=8A=A0=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E9=80=89=E6=8B=A9=E9=A1=B9,=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E5=9C=A8=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=A4=87=E7=94=A8?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=9C=B0=E5=9D=80=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 src/api/assets/location/index.ts              |  2 +-
 src/api/assets/warehouse/index.ts             |  2 +-
 src/api/assets/zone/index.ts                  |  2 +-
 .../location/component/editLocation.vue       | 16 +++++
 src/views/assets/location/index.vue           | 61 +++++++++++--------
 src/views/assets/warehouse/index.vue          | 10 +--
 src/views/assets/zone/index.vue               | 10 +--
 8 files changed, 67 insertions(+), 38 deletions(-)

diff --git a/.env.development b/.env.development
index 219bbb7..e19c133 100644
--- a/.env.development
+++ b/.env.development
@@ -5,13 +5,13 @@ ENV = 'development'
 # 后端服务地址配置
 # 切换环境时，修改下面两个地址的 IP 即可
 # 当前环境: 192.168.3.11(本地开发地址)
+# 当前环境: 192.168.3.94(本地开发地址)王楠
 # 备用环境: 192.168.3.200(服务器地址)
 # ============================================================
 
 # 主服务地址（端口8808）
 # 用途: 系统管理、用户认证、权限控制、模块开通等原有功能
 VITE_API_URL = 'http://192.168.3.200:8808/'
-
 # 新功能服务地址（端口8000）
 # 用途: 资产管理、分类、SKU、订单等新业务模块
 VITE_NEW_API_URL = 'http://192.168.3.200:8000/'
diff --git a/src/api/assets/location/index.ts b/src/api/assets/location/index.ts
index 49c8840..65040c6 100644
--- a/src/api/assets/location/index.ts
+++ b/src/api/assets/location/index.ts
@@ -68,7 +68,7 @@ export function deleteLocation(id: string) {
 }
 
 // 更新库位状态
-export function updateLocationStatus(data: { id: string[]; status: string }) {
+export function updateLocationStatus(data: { id: string; status: string }) {
 	return newService({
 		url: '/assets/location/updateLocationStatus',
 		method: 'put',
diff --git a/src/api/assets/warehouse/index.ts b/src/api/assets/warehouse/index.ts
index 361a1ec..a6c6d6a 100644
--- a/src/api/assets/warehouse/index.ts
+++ b/src/api/assets/warehouse/index.ts
@@ -66,7 +66,7 @@ export function deleteWarehouse(id: string) {
 }
 
 // 更新仓库状态
-export function updateWarehouseStatus(data: { id: string[]; status: string }) {
+export function updateWarehouseStatus(data: { id: string; status: string }) {
 	return newService({
 		url: '/assets/warehouse/updateWarehouseStatus',
 		method: 'put',
diff --git a/src/api/assets/zone/index.ts b/src/api/assets/zone/index.ts
index b7f5c7f..982053b 100644
--- a/src/api/assets/zone/index.ts
+++ b/src/api/assets/zone/index.ts
@@ -67,7 +67,7 @@ export function deleteZone(id: string) {
 }
 
 // 更新库区状态
-export function updateZoneStatus(data: { id: string[]; status: string }) {
+export function updateZoneStatus(data: { id: string; status: string }) {
 	return newService({
 		url: '/assets/zone/updateZoneStatus',
 		method: 'put',
diff --git a/src/views/assets/location/component/editLocation.vue b/src/views/assets/location/component/editLocation.vue
index 8679bfc..4b30456 100644
--- a/src/views/assets/location/component/editLocation.vue
+++ b/src/views/assets/location/component/editLocation.vue
@@ -46,6 +46,18 @@
 						</el-select>
 					</el-form-item>
 				</el-col>
+				<el-col :span="12">
+					<el-form-item label="状态" prop="status">
+						<el-select v-model="ruleForm.status" placeholder="请选择状态" clearable style="width: 100%">
+							<el-option label="空闲" value="idle" />
+							<el-option label="占用" value="occupied" />
+							<el-option label="锁定" value="locked" />
+							<el-option label="维护" value="maintenance" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
 				<el-col :span="12">
 					<el-form-item label="最大容量" prop="maxCapacity">
 						<el-input-number v-model="ruleForm.maxCapacity" :min="0" placeholder="请输入最大容量" style="width: 100%" />
@@ -106,6 +118,7 @@ const ruleForm = reactive({
 	locationType: '',
 	warehouseId: '',
 	zoneId: '',
+	status: 'idle',
 	maxCapacity: 0,
 	remark: '',
 });
@@ -137,6 +150,7 @@ const resetForm = () => {
 	ruleForm.locationType = '';
 	ruleForm.warehouseId = '';
 	ruleForm.zoneId = '';
+	ruleForm.status = 'idle';
 	ruleForm.maxCapacity = 0;
 	ruleForm.remark = '';
 };
@@ -156,6 +170,7 @@ const openDialog = async (row?: any) => {
 			ruleForm.locationType = data.locationType || '';
 			ruleForm.warehouseId = data.warehouseId || '';
 			ruleForm.zoneId = data.zoneId || '';
+			ruleForm.status = data.status || 'idle';
 			ruleForm.maxCapacity = data.maxCapacity || 0;
 			ruleForm.remark = data.remark || '';
 		} catch (error) {
@@ -188,6 +203,7 @@ const onSubmit = async () => {
 					locationType: ruleForm.locationType,
 					warehouseId: ruleForm.warehouseId,
 					zoneId: ruleForm.zoneId,
+					status: ruleForm.status,
 					maxCapacity: ruleForm.maxCapacity,
 					remark: ruleForm.remark,
 				};
diff --git a/src/views/assets/location/index.vue b/src/views/assets/location/index.vue
index 7c91642..1aebabf 100644
--- a/src/views/assets/location/index.vue
+++ b/src/views/assets/location/index.vue
@@ -19,8 +19,10 @@
 						</el-form-item>
 						<el-form-item label="状态">
 							<el-select size="default" v-model="tableData.param.status" placeholder="请选择状态" clearable style="width: 120px">
-								<el-option label="启用" value="enabled" />
-								<el-option label="禁用" value="disabled" />
+								<el-option label="空闲" value="idle" />
+								<el-option label="占用" value="occupied" />
+								<el-option label="锁定" value="locked" />
+								<el-option label="维护" value="maintenance" />
 							</el-select>
 						</el-form-item>
 						<el-form-item>
@@ -47,15 +49,9 @@
 					<el-table-column prop="warehouseName" label="所属仓库" width="150" show-overflow-tooltip />
 					<el-table-column prop="zoneName" label="所属库区" width="150" show-overflow-tooltip />
 					<el-table-column prop="maxCapacity" label="最大容量" width="100" align="center" />
-					<el-table-column prop="status" label="状态" width="80" align="center">
+					<el-table-column prop="status" label="状态" width="100" align="center">
 						<template #default="scope">
-							<el-switch
-								v-model="scope.row.statusEnabled"
-								inline-prompt
-								active-text="启"
-								inactive-text="停"
-								@change="onStatusChange(scope.row)"
-							/>
+							<el-tag :type="getStatusTagType(scope.row.status)">{{ getStatusText(scope.row.status) }}</el-tag>
 						</template>
 					</el-table-column>
 					<el-table-column prop="createdAt" label="创建时间" width="170" show-overflow-tooltip />
@@ -96,7 +92,7 @@ export default {
 <script setup lang="ts">
 import { ref, reactive, computed, onMounted } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
-import { listLocations, deleteLocation, updateLocationStatus } from '/@/api/assets/location';
+import { listLocations, deleteLocation } from '/@/api/assets/location';
 import { listWarehouses } from '/@/api/assets/warehouse';
 import { listZones } from '/@/api/assets/zone';
 import EditLocation from './component/editLocation.vue';
@@ -173,8 +169,7 @@ const getLocationList = async () => {
 			...item,
 			warehouseName: item.warehouseName || warehouseMap.get(item.warehouseId) || '',
 			zoneName: item.zoneName || zoneMap.get(item.zoneId) || '',
-			statusEnabled: item.status === 'enabled',
-		}));
+					}));
 		tableData.total = res.data?.total || 0;
 	} catch (error) {
 		console.error('获取库位列表失败:', error);
@@ -203,17 +198,35 @@ const onEdit = (row: any) => {
 	editLocationRef.value.openDialog(row);
 };
 
-// 状态切换
-const onStatusChange = async (row: any) => {
-	const newStatus = row.statusEnabled ? 'enabled' : 'disabled';
-	const statusText = row.statusEnabled ? '启用' : '禁用';
-	try {
-		await updateLocationStatus({ id: [row.id], status: newStatus });
-		ElMessage.success(`${statusText}成功`);
-	} catch (error) {
-		console.error('状态更新失败:', error);
-		// 失败时恢复原状态
-		row.statusEnabled = !row.statusEnabled;
+// 获取状态标签类型
+const getStatusTagType = (status: string) => {
+	switch (status) {
+		case 'idle':
+			return 'success';
+		case 'occupied':
+			return 'warning';
+		case 'locked':
+			return 'danger';
+		case 'maintenance':
+			return 'info';
+		default:
+			return 'info';
+	}
+};
+
+// 获取状态文本
+const getStatusText = (status: string) => {
+	switch (status) {
+		case 'idle':
+			return '空闲';
+		case 'occupied':
+			return '占用';
+		case 'locked':
+			return '锁定';
+		case 'maintenance':
+			return '维护';
+		default:
+			return status;
 	}
 };
 
diff --git a/src/views/assets/warehouse/index.vue b/src/views/assets/warehouse/index.vue
index 84f69b0..7cc4313 100644
--- a/src/views/assets/warehouse/index.vue
+++ b/src/views/assets/warehouse/index.vue
@@ -9,8 +9,8 @@
 						</el-form-item>
 						<el-form-item label="状态">
 							<el-select size="default" v-model="tableData.param.status" placeholder="请选择状态" clearable style="width: 120px">
-								<el-option label="启用" value="enabled" />
-								<el-option label="禁用" value="disabled" />
+								<el-option label="启用" value="enable" />
+								<el-option label="禁用" value="disable" />
 							</el-select>
 						</el-form-item>
 						<el-form-item>
@@ -116,7 +116,7 @@ const getWarehouseList = async () => {
 		// 添加 statusEnabled 字段用于开关组件
 		tableData.data = list.map((item: any) => ({
 			...item,
-			statusEnabled: item.status === 'enabled' || item.status === '1' || item.status === 1,
+			statusEnabled: item.status === 'enable' || item.status === '1' || item.status === 1,
 		}));
 		tableData.total = res.data?.total || 0;
 	} catch (error) {
@@ -146,10 +146,10 @@ const onEdit = (row: any) => {
 
 // 状态切换
 const onStatusChange = async (row: any) => {
-	const newStatus = row.statusEnabled ? 'enabled' : 'disabled';
+	const newStatus = row.statusEnabled ? 'enable' : 'disable';
 	const statusText = row.statusEnabled ? '启用' : '禁用';
 	try {
-		await updateWarehouseStatus({ id: [row.id], status: newStatus });
+		await updateWarehouseStatus({ id: row.id, status: newStatus });
 		ElMessage.success(`${statusText}成功`);
 	} catch (error) {
 		console.error('状态更新失败:', error);
diff --git a/src/views/assets/zone/index.vue b/src/views/assets/zone/index.vue
index 96c347b..a1432db 100644
--- a/src/views/assets/zone/index.vue
+++ b/src/views/assets/zone/index.vue
@@ -14,8 +14,8 @@
 						</el-form-item>
 						<el-form-item label="状态">
 							<el-select size="default" v-model="tableData.param.status" placeholder="请选择状态" clearable style="width: 120px">
-								<el-option label="启用" value="enabled" />
-								<el-option label="禁用" value="disabled" />
+								<el-option label="启用" value="enable" />
+								<el-option label="禁用" value="disable" />
 							</el-select>
 						</el-form-item>
 						<el-form-item>
@@ -138,7 +138,7 @@ const getZoneList = async () => {
 		tableData.data = list.map((item: any) => ({
 			...item,
 			warehouseName: item.warehouseName || warehouseMap.get(item.warehouseId) || '',
-			statusEnabled: item.status === 'enabled',
+			statusEnabled: item.status === 'enable',
 		}));
 		tableData.total = res.data?.total || 0;
 	} catch (error) {
@@ -169,10 +169,10 @@ const onEdit = (row: any) => {
 
 // 状态切换
 const onStatusChange = async (row: any) => {
-	const newStatus = row.statusEnabled ? 'enabled' : 'disabled';
+	const newStatus = row.statusEnabled ? 'enable' : 'disable';
 	const statusText = row.statusEnabled ? '启用' : '禁用';
 	try {
-		await updateZoneStatus({ id: [row.id], status: newStatus });
+		await updateZoneStatus({ id: row.id, status: newStatus });
 		ElMessage.success(`${statusText}成功`);
 	} catch (error) {
 		console.error('状态更新失败:', error);