From dfbeed08392f0b7dd9e93d7337ba12526d45d2c8 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 15 Apr 2025 19:13:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E8=83=BD=E6=9F=9C=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82=E9=94=99=E8=AF=AF=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hard/hard-door-manager/goods-putaway.vue  | 18 ++++++-----
 src/views/hard/hard-door-manager/index.vue    | 30 ++++++++++++-------
 .../hard/hard-door-manager/info-setting.vue   | 15 ++++++++--
 .../hard/hard-door-manager/volume-setting.vue | 16 ++++++----
 4 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/src/views/hard/hard-door-manager/goods-putaway.vue b/src/views/hard/hard-door-manager/goods-putaway.vue
index 6035688..72e897d 100644
--- a/src/views/hard/hard-door-manager/goods-putaway.vue
+++ b/src/views/hard/hard-door-manager/goods-putaway.vue
@@ -120,14 +120,18 @@ const openDialog = (cabinetItemId: string) => {
 // 点击上架
 const clickPutaway = async (row: any) => {
 	if (!row.id) return useMessage().error("商品id不存在")
-	const res = await hardSpu.putaway({ id: curCabinetItemId.value, hardSpuId: row.id })
-	if (res.code == 0) {
-		useMessage().success("上架成功")
-		emit("refreshCabinet")
-		visible.value = false
-		return
+	try {
+		const res = await hardSpu.putaway({ id: curCabinetItemId.value, hardSpuId: row.id })
+		if (res.code == 0) {
+			useMessage().success("上架成功")
+			emit("refreshCabinet")
+			visible.value = false
+		} else {
+			useMessage().error(res.msg || "上架失败")
+		}
+	} catch (error: any) {
+		useMessage().error(error.msg)
 	}
-	useMessage().error("上架失败")
 }
 
 defineExpose({
diff --git a/src/views/hard/hard-door-manager/index.vue b/src/views/hard/hard-door-manager/index.vue
index 8fceb77..79bdc7f 100644
--- a/src/views/hard/hard-door-manager/index.vue
+++ b/src/views/hard/hard-door-manager/index.vue
@@ -218,22 +218,32 @@ const getDetail = async () => {
 	const id = query.id as unknown as any
 	if (!id) return useMessage().error("设备id不存在")
 	state.hardId = id
-	const { data } = await hardDoorManager.getByHardId({ hardId: state.hardId })
-	if (data) {
-		state.deviceDetail = { ...data, cabinetList: JSON.parse(data.cabinetList) }
+	try {
+		const res = await hardDoorManager.getByHardId({ hardId: state.hardId })
+		if (res.code == 0) {
+			state.deviceDetail = res.data
+		}
+	} catch (error: any) {
+		useMessage().error(error.msg)
 	}
 }
 
-// 获取柜子物品
+// 获取货柜物品
 const getCabinet = async (cabinetIndex: number = 0) => {
 	if (!state.hardId) return useMessage().error("设备id不存在")
 	if (!state.deviceDetail.cabinetList?.length) return useMessage().error("设备空间不存在")
-	const { data } = await getByCabinetNo({
-		hardId: state.hardId,
-		cabinetNo: state.deviceDetail.cabinetList[cabinetIndex].cabinetNo,
-	})
-	if (data) {
-		state.cabinetData = data
+	try {
+		const res = await getByCabinetNo({
+			hardId: state.hardId,
+			cabinetNo: state.deviceDetail.cabinetList[cabinetIndex].cabinetNo,
+		})
+		if (res.code == 0) {
+			state.cabinetData = res.data
+		} else {
+			useMessage().error(res.msg || "获取货柜物品失败")
+		}
+	} catch (error: any) {
+		useMessage().error(error.msg)
 	}
 }
 
diff --git a/src/views/hard/hard-door-manager/info-setting.vue b/src/views/hard/hard-door-manager/info-setting.vue
index c03088a..0685578 100644
--- a/src/views/hard/hard-door-manager/info-setting.vue
+++ b/src/views/hard/hard-door-manager/info-setting.vue
@@ -49,8 +49,17 @@ const openDialog = async (hardId: string) => {
 	form.hardId = hardId
 	dataFormRef.value?.resetFields()
 	if (hardId) {
-		const res = await hardDoorManager.getByHardId({ hardId: hardId })
-		Object.assign(form, res.data)
+		loading.value = true
+		try {
+			const res = await hardDoorManager.getByHardId({ hardId: hardId })
+			if (res.code == 0) {
+				Object.assign(form, res.data)
+			}
+		} catch (error: any) {
+			useMessage().error(error.msg)
+		} finally {
+			loading.value = false
+		}
 	}
 }
 
@@ -67,6 +76,8 @@ const onSubmit = async () => {
 			useMessage().success("保存成功")
 			visible.value = false
 			emit("refreshInfo")
+		} else {
+			useMessage().error(res.msg || "保存失败")
 		}
 	} catch (err: any) {
 		useMessage().error(err.msg)
diff --git a/src/views/hard/hard-door-manager/volume-setting.vue b/src/views/hard/hard-door-manager/volume-setting.vue
index 54c274a..2f06eef 100644
--- a/src/views/hard/hard-door-manager/volume-setting.vue
+++ b/src/views/hard/hard-door-manager/volume-setting.vue
@@ -57,12 +57,16 @@ const onSubmit = async () => {
 
 	try {
 		loading.value = true
-		await changeVolume(form)
-		useMessage().success("保存成功")
-		visible.value = false
-		emit("refreshVolume", form)
-	} catch (err: any) {
-		useMessage().error(err.msg)
+		const res = await changeVolume(form)
+		if (res.code == 0) {
+			useMessage().success("保存成功")
+			visible.value = false
+			emit("refreshVolume", form)
+		} else {
+			useMessage().error(res.msg || "保存失败")
+		}
+	} catch (error: any) {
+		useMessage().error(error.msg)
 	} finally {
 		loading.value = false
 	}