bug修复

src/views/admin/system/user/face-manage.vue

@@ -34,7 +34,7 @@
 				<el-button @click="dialogVisible = false">取 消</el-button>
 			</template>
 		</el-dialog>
-		<el-dialog v-model="uploadDialogVisible" :close-on-click-modal="false" :title="faceUploadTitle" width="30%" @close="uploadDialogClone">
+		<el-dialog v-model="uploadDialogVisible" :close-on-click-modal="false" :title="faceUploadTitle" width="30%" @close="uploadDialogClean">
 			<el-form v-loading="formLoading" ref="formRef" :model="formData" :rules="formRules" label-width="80px">
 				<el-form-item label="人脸" prop="uploadFace">
 					<upload-img v-model:image-url="formData.uploadFace" />
@@ -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()
 }

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;
 }
 </style>

src/views/home/navMenu/index.vue

@@ -4,7 +4,7 @@
 			<el-col :xs="8" :sm="6" :md="4" :lg="3" :xl="3" v-for="(item, index) in navMenuList" :key="index">
 				<div
 					:class="['nav-menu-item-top', item.id == currentActiveMenuId ? 'nav-menu-item-active' : '']"
-					@click="currentActiveMenuId = item.id"
+					@click="handleClickMenvLevel1(item)"
 				>
 					<el-image class="nav-menu-item-icon" :src="imageBaseUrl + item.menuPic" fit="cover" />
 					<div class="nav-menu-item-name">{{ $t(item.name) }}</div>
@@ -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

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

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<VxeTableInstance<any>>() // 可编辑表格ref
-const { check_status } = useDict("check_status")
 // 基本信息表单数据
 const baseDataForm = reactive<any>({
 	id: "",

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

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

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

src/views/wallet/wallet-recharge-apply/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
-			<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+			<el-form v-show="showSearch" ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 				<el-row>
 					<el-form-item style="width: 300px" label="用户" prop="userIds">
 						<select-user v-model="state.queryForm.userIds" placeholder="用户" />