From c3ceba1c253f1342ad8462eb6ab0d448d1339b1c Mon Sep 17 00:00:00 2001
From: "2090205686@qq.com" <guoyongchao666>
Date: Thu, 12 Jun 2025 15:04:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/goods/goodsCategory/index.vue | 58 ++++++++++++-------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/src/views/goods/goodsCategory/index.vue b/src/views/goods/goodsCategory/index.vue
index ee1653b..7dcd167 100644
--- a/src/views/goods/goodsCategory/index.vue
+++ b/src/views/goods/goodsCategory/index.vue
@@ -147,7 +147,6 @@ const onSubmit = () => {
     ElMessage.warning("请选择开始日期！");
     return;
   }
-  console.log(formInline);
   loadData();
 };
 const resetForm = () => {
@@ -268,12 +267,24 @@ const enableAndDisable = async (row, num) => {
     tableLoading.value = false;
   }
 };
-// 编辑操作
-const handleEdit = (row) => {
-  nowClickRow.value = row;
-  console.log("要编辑的行:", row);
-  dialogTitle.value = "编辑分类";
+// 添加分类
+const addCategory = () => {
+  dialogTitle.value = "添加分类";
+  getGoodTypeList();
+  Object.assign(dialogForm, { // 保持响应性，手动清空字段
+    id: "",
+    type: 1,
+    name: "",
+    level: "",
+    parentId: "",
+    status: "1",
+  });
   dialogFormVisible.value = true;
+};
+// 编辑操作
+const handleEdit = async (row) => {
+  nowClickRow.value = row;
+  dialogTitle.value = "编辑分类";
   getGoodTypeList();
   dialogForm.id = row.id;
   dialogForm.type = row.type;
@@ -281,15 +292,16 @@ const handleEdit = (row) => {
   dialogForm.level = row.level;
   dialogForm.parentId = row.parentId;
   dialogForm.status = row.status?.toString() ?? '1';
+
+  dialogForm.selectedNode = findNodeById(goodsOptions.value, row.parentId);
+  dialogFormVisible.value = true;
 };
 // 删除操作
 const handleDelete = (row) => {
-  console.log("要删除的行:", row);
   deleteGoods(row.id);
 };
 // 批量删除
 const batchDelete = () => {
-  console.log("要删除的行:", selectedIds.value);
   deleteGoods(selectedIds.value.join(","));
 };
 const deleteGoods = async (ids) => {
@@ -371,22 +383,22 @@ const onSaveCategory = () => {
       try {
         proxy.$modal.loading("正在保存...");
         let param = { ...dialogForm };
-        param.level = dialogForm.selectedNode.level;
-        param.type = dialogForm.selectedNode.type;
+        param.level = dialogForm.selectedNode.level ?? "";
+        param.type = dialogForm.selectedNode.type ?? "";
         let response;
-        if (dialogTitle.value == "编辑分类") {
-          response = await categoryEdit(param);
-        } else {
+        if (dialogTitle.value == "添加分类") {
           response = await categoryAdd(param);
+        } else {
+          response = await categoryEdit(param);
         }
         proxy.$modal.closeLoading();
         if (response.code == 200) {
           cancelDialog();
           onSubmit();
-          if (dialogTitle.value == "编辑分类") {
-            ElMessage.success("编辑成功!");
-          } else {
+          if (dialogTitle.value == "添加分类") {
             ElMessage.success("添加成功!");
+          } else {
+            ElMessage.success("编辑成功!");
           }
         } else {
           ElMessage.error(response.msg);
@@ -397,20 +409,6 @@ const onSaveCategory = () => {
     }
   });
 };
-// 添加分类
-const addCategory = () => {
-  dialogTitle.value = "添加分类";
-  getGoodTypeList();
-  Object.assign(dialogForm, { // 保持响应性，手动清空字段
-    id: "",
-    type: 1,
-    name: "",
-    level: "",
-    parentId: "",
-    status: "1",
-  });
-  dialogFormVisible.value = true;
-};
 const cancelDialog = () => {
   Object.assign(dialogForm, { // 保持响应性，手动清空字段
     id: "",