From f00170ba5c201169d8a15874c80269f2f2585d44 Mon Sep 17 00:00:00 2001 From: weiwei Date: Mon, 17 Mar 2025 16:09:35 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/admin/system/user/face-manage.vue | 20 +++++++++++-------- src/views/canteenDailyDishes/index.vue | 2 ++ src/views/home/navMenu/index.vue | 12 +++++++++-- .../purchaseManagement/smErpCgBack/form.vue | 2 +- .../purchaseManagement/smErpCgDd/form.vue | 2 -- .../smErpCgInventory/form.vue | 2 +- .../retailManagement/smErpRetailBack/form.vue | 2 +- .../smErpRetailDelivery/form.vue | 2 +- .../wallet/wallet-recharge-apply/index.vue | 2 +- 9 files changed, 29 insertions(+), 17 deletions(-) diff --git a/src/views/admin/system/user/face-manage.vue b/src/views/admin/system/user/face-manage.vue index 3e98906..72239d0 100644 --- a/src/views/admin/system/user/face-manage.vue +++ b/src/views/admin/system/user/face-manage.vue @@ -34,7 +34,7 @@ 取 消 - + @@ -148,18 +148,22 @@ const submitFace = async () => { } try { const fc = faceUploadTitle.value == "上传人脸" ? userFaceApi.addObj : userFaceApi.putObj - await fc(pa) - useMessage().success("操作成功") - uploadDialogClone() - getDataList() - } catch (error) { - console.log(error) + const res = await fc(pa) + if (res.code === 0) { + useMessage().success("操作成功") + uploadDialogClean() + getDataList() + } else { + useMessage().error(res.msg || "操作失败") + } + } catch (error: any) { + useMessage().error(error) } finally { formLoading.value = false } } -const uploadDialogClone = () => { +const uploadDialogClean = () => { uploadDialogVisible.value = false resetForm() } diff --git a/src/views/canteenDailyDishes/index.vue b/src/views/canteenDailyDishes/index.vue index b7c9adf..e952628 100644 --- a/src/views/canteenDailyDishes/index.vue +++ b/src/views/canteenDailyDishes/index.vue @@ -300,6 +300,7 @@ const gridStyle = computed(() => { background: linear-gradient(-45deg, #4a88ff, #1d4ed8, #2563eb, #3b82f6); background-size: 200% 200%; -webkit-background-clip: text; + background-clip: text; -webkit-text-fill-color: transparent; animation: gradientBG 6s ease infinite; } @@ -426,6 +427,7 @@ const gridStyle = computed(() => { overflow-y: auto; scroll-behavior: smooth; scrollbar-width: none; + -webkit-scrollbar-width: none; -ms-overflow-style: none; } diff --git a/src/views/home/navMenu/index.vue b/src/views/home/navMenu/index.vue index 0076b38..6c76be4 100644 --- a/src/views/home/navMenu/index.vue +++ b/src/views/home/navMenu/index.vue @@ -4,7 +4,7 @@
{{ $t(item.name) }}
@@ -74,13 +74,14 @@ const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH const getNavMenuList = async () => { loading.value = true try { - const res = await menuApi.getAdminMenu().finally(() => (loading.value = false)) + const res = await menuApi.getAdminMenu() if (res.code == 0 && res.data.length > 0) { navMenuList.value = res.data } } catch (error) { navMenuList.value = [] ElMessage.error("加载错误") + } finally { loading.value = false } } @@ -96,6 +97,13 @@ const navMenuListBottom = computed(() => { } }) +// 点击一级菜单 +const handleClickMenvLevel1 = (item: any) => { + currentActiveMenuId.value = item.id + if (item.children && item.children.length > 0) return + router.push(item.path) +} + // 点击菜单项 const handleClickBottomMenu = (item: any) => { curLevel2ActiveMenuId.value = item.id diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue index a23c17d..cbc98f9 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue @@ -506,7 +506,7 @@ const submitData = async () => { // 清空填写的数据 返回 true const clearData = () => { for (const key in baseDataForm) { - if (key === "id" || key === "inventoryCode" || key === "inventoryDate") continue + if (key === "id" || key === "inventoryCode" || key === "inventoryDate" || key === "inventoryType" || key === "orderType") continue baseDataForm[key] = "" } state.insertedRowNumber = 0 diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue index d451aee..3838c82 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue @@ -180,7 +180,6 @@ import { Search } from "@element-plus/icons-vue" import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue" import linkCodeDialog from "/@/views/supermarketerp/components/linkCodeDialog.vue" import { displayPrice } from "/@/utils/formatMoney" -import { useDict } from "/@/hooks/dict" const router = useRouter() const route = useRoute() @@ -189,7 +188,6 @@ const erpSpuSelectDialogRef = ref() // 商品选择对话框ref const linkCgPlanDialogRef = ref() // 关联采购申请单对话框ref const baseDataFormRef = ref() // 基本数据表单ref const editableTableRef = ref>() // 可编辑表格ref -const { check_status } = useDict("check_status") // 基本信息表单数据 const baseDataForm = reactive({ id: "", diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue index 43e454a..a4540d1 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue @@ -513,7 +513,7 @@ const submitData = async () => { // 清空填写的数据 返回 true const clearData = () => { for (const key in baseDataForm) { - if (key === "id" || key === "inventoryCode" || key === "inventoryDate") continue + if (key === "id" || key === "inventoryCode" || key === "inventoryDate" || key === "inventoryType" || key === "orderType") continue baseDataForm[key] = "" } state.insertedRowNumber = 0 diff --git a/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue index 4378c03..21fd60e 100644 --- a/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue +++ b/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue @@ -553,7 +553,7 @@ const submitData = async () => { // 清空填写的数据 返回 true const clearData = () => { for (const key in baseDataForm) { - if (key === "id" || key === "inventoryCode" || key === "inventoryDate") continue + if (key === "id" || key === "inventoryCode" || key === "inventoryDate" || key === "inventoryType" || key === "orderType") continue baseDataForm[key] = "" } state.insertedRowNumber = 0 diff --git a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue index e77c0a9..1a9e71e 100644 --- a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue +++ b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue @@ -553,7 +553,7 @@ const submitData = async () => { // 清空填写的数据 返回 true const clearData = () => { for (const key in baseDataForm) { - if (key === "id" || key === "inventoryCode" || key === "inventoryDate") continue + if (key === "id" || key === "inventoryCode" || key === "inventoryDate" || key === "inventoryType" || key === "orderType") continue baseDataForm[key] = "" } state.insertedRowNumber = 0 diff --git a/src/views/wallet/wallet-recharge-apply/index.vue b/src/views/wallet/wallet-recharge-apply/index.vue index 9e3f9b4..870bc06 100644 --- a/src/views/wallet/wallet-recharge-apply/index.vue +++ b/src/views/wallet/wallet-recharge-apply/index.vue @@ -1,7 +1,7 @@