From c3ceba1c253f1342ad8462eb6ab0d448d1339b1c Mon Sep 17 00:00:00 2001 From: "2090205686@qq.com" Date: Thu, 12 Jun 2025 15:04:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=BC=96=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: "", From 85d88da9f94d8bf55f7a9033d963a876be429fa8 Mon Sep 17 00:00:00 2001 From: "2090205686@qq.com" Date: Thu, 12 Jun 2025 16:30:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tableComponent.vue | 2 +- src/views/customer/customerCategory.vue | 2 +- src/views/customer/customerManage.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/tableComponent.vue b/src/components/tableComponent.vue index 7392864..7d6f66b 100644 --- a/src/components/tableComponent.vue +++ b/src/components/tableComponent.vue @@ -190,7 +190,7 @@ const props = defineProps({ // 自定义表头类名函数 headerCellClassName: { type: Function, - default: () => "", + default: () => "custom-header", }, // 自定义单元格类名函数 cellClassName: { diff --git a/src/views/customer/customerCategory.vue b/src/views/customer/customerCategory.vue index 9320a1b..6be82f2 100644 --- a/src/views/customer/customerCategory.vue +++ b/src/views/customer/customerCategory.vue @@ -233,7 +233,7 @@ const generateMockData = () => { "id|+1": 10000, nickname: () => generateFoodNickname(), //昵称 userName: "@cname", //姓名 - accountNumber: Mock.mock("@id").toString().slice(0, 10), //账号 + accountNumber: "@integer(1000000000, 9999999999)", //账号 phoneNumber: "@integer(13000000000, 18999999999)", //手机号 sex: '@pick(["男", "女"])', //性别 "userStatus|1": [0, 1], //0异常 1正常 diff --git a/src/views/customer/customerManage.vue b/src/views/customer/customerManage.vue index 597898a..1d7eebd 100644 --- a/src/views/customer/customerManage.vue +++ b/src/views/customer/customerManage.vue @@ -218,7 +218,7 @@ const generateMockData = () => { "id|+1": 10000, nickname: () => generateFoodNickname(), //昵称 userName: "@cname", //姓名 - accountNumber: Mock.mock("@id").toString().slice(0, 10), //账号 + accountNumber: "@integer(1000000000, 9999999999)", //账号 phoneNumber: "@integer(13000000000, 18999999999)", //手机号 sex: '@pick(["男", "女"])', //性别 "userStatus|1": [0, 1], //0异常 1正常 From a6344ce7f6bb6fb7eba202df97f8e043fac3db46 Mon Sep 17 00:00:00 2001 From: Xulinchuan <2026734208@qq.com> Date: Fri, 13 Jun 2025 09:44:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=93=81=E7=89=8C-?= =?UTF-8?q?=E5=93=81=E7=89=8C=E4=BD=BF=E7=94=A8=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/brand/index.js | 52 ++++++ src/components/myUploadImage.vue | 2 +- src/router/index.js | 24 +-- .../brand/informationManagement/index.vue | 13 +- src/views/brand/management/index.vue | 153 +++++++++++++++--- 5 files changed, 210 insertions(+), 34 deletions(-) diff --git a/src/api/brand/index.js b/src/api/brand/index.js index 91b5ce6..8044da9 100644 --- a/src/api/brand/index.js +++ b/src/api/brand/index.js @@ -39,6 +39,7 @@ export function getBrandInfo(id) { method: "get", }); } +//品牌启用停用 export function updateStatusBrand(data) { return request({ url: "brand/brandbase/updateStatus", @@ -79,3 +80,54 @@ export function applicationrenewalApprove(data) { data: data, }); } + +// 获取品牌使用管理列表 +export function brandUsingList(query) { + return request({ + url: "/brand/brandUsingSystem/page", + method: "get", + params: query, + }); +} +// 新增品牌使用 +export function addBrandUsing(data) { + return request({ + url: "/brand/brandUsingSystem/save", + method: "post", + data: data, + }); +} + +// 编辑品牌使用 +export function updateBrandUsing(data) { + return request({ + url: "/brand/brandUsingSystem/update", + method: "post", + data: data, + }); +} + +// 获取品牌使用管理详情（id） +export function getBrandUsing(id) { + return request({ + url: `/brand/brandUsingSystem/detail/${id}`, + method: "get", + }); +} + +// 删除品牌使用管理 +export function deleteBrandUsing(id) { + return request({ + url: '/brand/brandUsingSystem/del?ids=' + id, + method: "delete", + }); +} + +//品牌使用管理启用停用 +export function updateStatusBrandUsing(data) { + return request({ + url: "/brand/brandUsingSystem/enable", + method: "post", + data: data, + }); +} diff --git a/src/components/myUploadImage.vue b/src/components/myUploadImage.vue index fa885fb..91af40c 100644 --- a/src/components/myUploadImage.vue +++ b/src/components/myUploadImage.vue @@ -1,6 +1,6 @@