zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud

Browse Source
This commit is contained in:
dzc committed 2025-08-13 11:46:26 +08:00
2 parents 3df6a10126 6516b0490b
commit 3026bc8eee
17 files changed
+540 -183
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/api/canteen/canteenOnlineSpu.ts
+31 -24
View File
@@ -1,41 +1,48 @@
import request from "/@/utils/request"
export function fetchList(query?: Object) {
return request({
url: '/canteen/canteenOnlineSpu/page',
method: 'get',
params: query
})
return request({
url: "/canteen/canteenOnlineSpu/page",
method: "get",
params: query,
})
}
export function addObj(obj?: Object) {
return request({
url: '/canteen/canteenOnlineSpu',
method: 'post',
data: obj
})
return request({
url: "/canteen/canteenOnlineSpu",
method: "post",
data: obj,
})
}
export function getObj(id?: string) {
return request({
url: '/canteen/canteenOnlineSpu/' + id,
method: 'get'
})
return request({
url: "/canteen/canteenOnlineSpu/" + id,
method: "get",
})
}
export function delObjs(ids?: Object) {
return request({
url: '/canteen/canteenOnlineSpu',
method: 'delete',
data: ids
})
return request({
url: "/canteen/canteenOnlineSpu",
method: "delete",
data: ids,
})
}
export function putObj(obj?: Object) {
return request({
url: '/canteen/canteenOnlineSpu',
method: 'put',
data: obj
})
return request({
url: "/canteen/canteenOnlineSpu",
method: "put",
data: obj,
})
}
export function saveCanteenSpuBatch(obj?: Object) {
return request({
url: "/canteen/canteenOnlineSpu/saveCanteenSpuBatch",
method: "post",
data: obj,
})
}
src/views/admin/system/menu/index.vue
+61 -42
View File
@@ -1,7 +1,7 @@
<template>
<div class="layout-padding">
<div class="layout-padding-auto layout-padding-view">
<el-row shadow="hover" v-show="showSearch" class="ml10">
<el-row v-show="showSearch" class="ml10">
<el-form :inline="true" :model="state.queryForm" ref="queryRef">
<el-form-item :label="$t('sysmenu.name')" prop="menuName">
<el-input :placeholder="$t('sysmenu.inputNameTip')" clearable style="max-width: 180px" v-model="state.queryForm.menuName" />
@@ -23,19 +23,23 @@
v-model:showSearch="showSearch"
class="ml10"
style="float: right; margin-right: 20px"
@queryTable="getDataList"
@queryTable="query"
></right-toolbar>
</div>
</el-row>
<el-table
class="el-table"
ref="tableRef"
:data="state.dataList"
:data="tableList"
row-key="id"
style="width: 100%"
v-loading="state.loading"
border
:header-cell-style="tableStyle?.headerCellStyle"
:expand-row-keys="expandRowKeys"
lazy
:load="load"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
<el-table-column :label="$t('sysmenu.name')" fixed prop="name" align="left" show-overflow-tooltip min-width="200" />
<el-table-column :label="$t('sysmenu.sortOrder')" prop="sortOrder" align="center" show-overflow-tooltip />
@@ -86,7 +90,7 @@
</el-table-column>
</el-table>
</div>
<MenuDialog @refresh="query()" ref="menuDialogRef" />
<MenuDialog @refresh="query" ref="menuDialogRef" />
</div>
</template>
@@ -107,7 +111,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
createdIsNeed: false,
pageList: pageList,
queryForm: {
// parentId: -1,
parentId: "-1",
menuName: "",
},
isPage: false,
@@ -122,7 +126,7 @@ onMounted(async () => {
const expandRowKeys = computed(() => {
const list = state.dataList
const arr: any[] = []
list?.forEach((item) => {
list?.map((item) => {
if (item.children && item.children.length) {
arr.push(item.id)
}
@@ -130,21 +134,6 @@ const expandRowKeys = computed(() => {
return arr
})
// 根据类型判断是否有子节点
// const setHasChildren = (arr: any[]) => {
// arr.forEach((item) => {
// // 添加 hasChildren 属性
// item.hasChildren = item.menuType !== "1"
// })
// }
// const tableList = computed(() => {
// const list = state.dataList
// // if (Array.isArray(list)) {
// // setHasChildren(list)
// // }
// return list
// })
// 打开新增菜单弹窗
const onOpenAddMenu = (type?: string, row?: any) => {
menuDialogRef.value.openDialog(type, row)
@@ -159,35 +148,54 @@ const deleteMenuDisabled = (row: any) => {
return (row.children || []).length > 0
}
// 搜索事件
const query = () => {
state.dataList = []
state.queryForm.parentId = undefined
getDataList()
}
// 清空搜索条件
const resetQuery = () => {
queryRef.value.resetFields()
state.queryForm.parentId = "-1"
state.dataList = []
getDataList()
}
// const load = (row: any, treeNode: unknown, resolve: (date: any[]) => void) => {
// const param = {
// parentId: row.id,
// }
// pageList(param).then((res) => {
// const childrenList = res.data
// if (Array.isArray(childrenList)) {
// setHasChildren(childrenList)
// }
// if (childrenList && childrenList.length) {
// resolve(childrenList)
// }
// })
// }
const load = (row: any, treeNode: unknown, resolve: (date: any[]) => void) => {
const param = {
parentId: row.id,
}
pageList(param).then((res) => {
const childrenList = res.data
if (Array.isArray(childrenList)) {
setHasChildren(childrenList)
}
if (childrenList && childrenList.length) {
resolve(childrenList)
}
})
}
// 根据类型判断是否有子节点
const setHasChildren = (arr: any[]) => {
arr.forEach((item) => {
// 添加 hasChildren 属性
item.hasChildren = item.menuType !== "1"
})
}
const tableList = computed(() => {
const list = state.dataList
if (Array.isArray(list)) {
setHasChildren(list)
}
return list
})
const query = () => {
state.dataList = []
if (state.queryForm.menuName) {
state.queryForm.parentId = ""
} else {
state.queryForm.parentId = "-1"
}
getDataList()
}
// 删除操作
const handleDelete = async (row: any) => {
try {
@@ -205,3 +213,14 @@ const handleDelete = async (row: any) => {
}
}
</script>
<style scoped>
::v-deep(.el-table .el-table__row .cell) {
display: flex;
}
::v-deep(.el-table .el-table__row .cell .el-table__expand-icon .el-icon) {
width: 20px;
height: 20px;
font-size: 20px;
}
</style>
src/views/canteen/canteenCategory/form.vue
+1 -6
View File
@@ -10,12 +10,7 @@
<el-col :span="14" class="mb20">
<el-form-item label="餐段类型" prop="categoryType">
<el-select v-model="form.categoryType" placeholder="请选择餐段类型" multiple>
<el-option
:value="item.value"
:label="item.label"
v-for="(item, index) in daily_menu"
:key="index"
></el-option>
<el-option :value="item.value" :label="item.label" v-for="(item, index) in daily_menu" :key="index"></el-option>
</el-select>
</el-form-item>
</el-col>
src/views/canteen/canteenCategory/index.vue
+2 -2
View File
@@ -66,8 +66,8 @@
</template>
</el-table-column>
<el-table-column prop="sort" label="排序" show-overflow-tooltip min-width="100" />
<el-table-column prop="createBy" label="创建者" show-overflow-tooltip min-width="100" />
<el-table-column prop="updateBy" label="更新者" show-overflow-tooltip min-width="100" />
<!-- <el-table-column prop="createBy" label="创建者" show-overflow-tooltip min-width="100" /> -->
<!-- <el-table-column prop="updateBy" label="更新者" show-overflow-tooltip min-width="100" /> -->
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip min-width="160" />
<el-table-column label="操作" width="150" fixed="right">
<template #default="scope">
src/views/canteen/canteenInventoryRecords/select-dialog.vue
+33 -30
View File
@@ -1,13 +1,14 @@
<template>
<el-dialog v-model="dialogVisible" title="选择食材" width="80%" :close-on-click-modal="false" draggable @close="dialogVisible = false">
<el-row>
<el-form :model="queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataListAndSelect">
<el-form :model="queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList(true)">
<el-form-item label="食材名称" prop="name">
<el-input placeholder="请输入食材名称" v-model="queryForm.name" />
</el-form-item>
<el-form-item>
<el-button icon="search" type="primary" @click="getDataListAndSelect">查询</el-button>
<el-button icon="search" type="primary" @click="getDataList(true)">查询</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
<el-button icon="Refresh" @click="tableRef.clearSelection()">取消所有勾选</el-button>
</el-form-item>
</el-form>
</el-row>
@@ -17,11 +18,12 @@
:data="dataList"
v-loading="loading"
:row-key="(row:any) => row.id"
:reserve-selection="true"
@row-click="rowClick"
:row-style="{ cursor: 'pointer' }"
:cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle"
>
<el-table-column type="selection" width="40" fixed="left" align="center" />
<el-table-column type="selection" reserve-selection width="40" fixed="left" align="center" />
<el-table-column type="index" label="#" width="50" fixed="left" align="center" />
<el-table-column prop="name" label="食材名称" min-width="150px" align="center" show-overflow-tooltip />
<el-table-column prop="unit" label="单位" min-width="100px" align="center" show-overflow-tooltip />
@@ -73,28 +75,25 @@ const dataList = ref<any[]>([]) // 对话框多选表格数据
// 打开弹窗
const openDialog = () => {
dialogVisible.value = true
getDataListAndSelect()
getDataList(false)
}
// 获取食材数据并且勾选
const getDataListAndSelect = async () => {
// 获取商品数据并且勾选
const getDataList = async (isSearch = false) => {
if (isSearch) {
queryForm.current = 1
}
loading.value = true
try {
const { code, data } = await fetchErpMaterialPageList(queryForm)
if (code == 0) {
dataList.value = data.records.map((item: any) => ({ ...item, erpMaterialId: item.id }))
total.value = data.total
nextTick(() => {
const rowsToSelect = [
...props.selectedRows.filter((row) => dataList.value.some((item) => item.erpMaterialId === row.erpMaterialId)),
]
// 为匹配的行设置选中状态
rowsToSelect.forEach((row) => {
const targetRow = dataList.value.find((item) => item.erpMaterialId === row.erpMaterialId)
targetRow && tableRef.value?.toggleRowSelection(targetRow, true)
})
if (code === 0) {
dataList.value = data.records.map((item: any) => {
return {
...item,
erpMaterialId: item.id,
}
})
total.value = data.total
}
} catch (error) {
dataList.value = []
@@ -106,16 +105,16 @@ const getDataListAndSelect = async () => {
// 分页变化
const sizeChangeHandle = (val: number) => {
queryForm.size = val
getDataListAndSelect()
getDataList()
}
const currentChangeHandle = (val: number) => {
queryForm.current = val
getDataListAndSelect()
getDataList()
}
const resetQuery = () => {
queryRef.value?.resetFields()
getDataListAndSelect()
getDataList(true)
}
// 点击食材列表表格行
@@ -127,18 +126,22 @@ const rowClick = (row: any) => {
const dialogConfirm = () => {
const $table = tableRef.value
if ($table) {
// 获取所有选中的行，包括其他页面的选择
const currentSelectedRows = $table.getSelectionRows()
// 合并当前选中的行和之前已选的行（排除当前页面的行）
const allSelectedRows = [
...currentSelectedRows,
...props.selectedRows.filter((row) => !dataList.value.some((item) => item.erpMaterialId === row.erpMaterialId)),
]
dialogVisible.value = false
emit("getSelectedRows", allSelectedRows)
emit("getSelectedRows", currentSelectedRows)
}
}
const tableStyle = {
cellStyle: { textAlign: "center" },
headerCellStyle: {
textAlign: "center",
background: "var(--el-table-row-hover-bg-color)",
color: "var(--el-text-color-primary)",
},
}
defineExpose({
openDialog,
})
src/views/canteen/canteenOnlineCategory/form.vue
+16 -2
View File
@@ -12,6 +12,13 @@
<el-input v-model.trim="form.name" placeholder="请输入分类名称" />
</el-form-item>
</el-col>
<el-col :span="14" class="mb20">
<el-form-item label="餐段类型" prop="categoryType">
<el-select v-model="form.categoryType" placeholder="请选择餐段类型" multiple>
<el-option :value="item.value" :label="item.label" v-for="(item, index) in daily_menu" :key="index"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="分类图" prop="picUrl">
<upload-img v-model:imageUrl="form.picUrl" />
@@ -44,8 +51,11 @@
import { useMessage } from "/@/hooks/message"
import { getObj, addObj, putObj } from "/@/api/canteen/canteenOnlineCategory"
import { rule } from "/@/utils/validate"
import { useDict } from "/@/hooks/dict"
const emit = defineEmits(["refresh"])
const { daily_menu } = useDict("daily_menu")
// 定义变量内容
const dataFormRef = ref()
const visible = ref(false)
@@ -61,6 +71,7 @@ const form = reactive({
sort: 0,
status: "",
deptId: "",
categoryType: [],
})
// 定义校验规则
@@ -71,6 +82,7 @@ const dataRules = ref({
{ required: true, message: "分类排序不能为空", trigger: "blur" },
{ validator: rule.number, trigger: "blur" },
],
categoryType: [{ required: true, message: "餐段类型不能为空", trigger: "blur" }],
})
// 打开弹窗
@@ -95,7 +107,9 @@ const onSubmit = async () => {
try {
loading.value = true
form.id ? await putObj(form) : await addObj(form)
form.id
? await putObj({ ...form, categoryType: form.categoryType.join(",") })
: await addObj({ ...form, categoryType: form.categoryType.join(",") })
useMessage().success(form.id ? "修改成功" : "添加成功")
visible.value = false
emit("refresh")
@@ -112,7 +126,7 @@ const getcanteenOnlineCategoryData = (id: string) => {
loading.value = true
getObj(id)
.then((res: any) => {
Object.assign(form, res.data)
Object.assign(form, res.data, { categoryType: res.data.categoryType.split(",") })
})
.finally(() => {
loading.value = false
src/views/canteen/canteenOnlineCategory/index.vue
+9
View File
@@ -55,12 +55,18 @@
<el-table-column type="selection" width="40" align="center" />
<el-table-column type="index" label="#" width="40" />
<el-table-column prop="name" label="分类名称" show-overflow-tooltip />
<el-table-column prop="categoryType" label="餐段类型" show-overflow-tooltip width="180">
<template #default="scope">
<dict-tag :options="daily_menu" :value="scope.row.categoryType?.split(',')"></dict-tag>
</template>
</el-table-column>
<el-table-column prop="picUrl" label="分类图" show-overflow-tooltip>
<template #default="{ row }">
<preview-image :src="row.picUrl" />
</template>
</el-table-column>
<el-table-column prop="sort" label="分类排序" show-overflow-tooltip />
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip min-width="160" />
<!-- <el-table-column prop="status" label="开启状态" show-overflow-tooltip /> -->
<el-table-column label="操作" width="150">
<template #default="scope">
@@ -91,10 +97,13 @@
import { BasicTableProps, useTable } from "/@/hooks/table"
import { fetchList, delObjs } from "/@/api/canteen/canteenOnlineCategory"
import { useMessage, useMessageBox } from "/@/hooks/message"
import { useDict } from "/@/hooks/dict"
// 引入组件
const FormDialog = defineAsyncComponent(() => import("./form.vue"))
const { daily_menu } = useDict("daily_menu")
// 定义变量内容
const formDialogRef = ref()
// 搜索变量
src/views/canteen/canteenOnlineSpu/export-form.vue
+214
View File
@@ -0,0 +1,214 @@
<template>
<el-dialog
v-model="dialogVisible"
title="选择菜品"
width="80%"
:close-on-click-modal="false"
draggable
@close="dialogVisible = false"
fullscreen
>
<el-row>
<el-form :model="queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList(true)">
<el-form-item label="菜品名称" prop="name">
<el-input placeholder="请输入菜品名称" v-model="queryForm.name" />
</el-form-item>
<el-form-item label="菜品分类" prop="categoryId">
<select-ctcg v-model="queryForm.categoryId" style="width: 200px" />
</el-form-item>
<el-form-item>
<el-button icon="search" type="primary" @click="getDataList" v-auth="'canteen_canteenSpu_view'">查询</el-button>
<el-button icon="Refresh" @click="resetQuery" v-auth="'canteen_canteenSpu_view'">重置</el-button>
<el-button icon="Refresh" @click="tableRef.clearSelection()" v-auth="'canteen_canteenSpu_view'">取消所有勾选</el-button>
</el-form-item>
</el-form>
</el-row>
<el-table
ref="tableRef"
border
:data="dataList"
v-loading="loading"
:row-key="(row:any) => row.id"
@selection-change=""
:cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle"
>
<el-table-column reserve-selection type="selection" width="40" />
<el-table-column type="index" label="#" width="50" />
<el-table-column prop="name" label="菜品名称" width="120px" show-overflow-tooltip />
<el-table-column prop="categoryId" label="菜品分类" width="100px" show-overflow-tooltip>
<template #default="{ row }">
{{ categoryOptions?.find((item: any) => item?.id === row?.categoryId)?.name }}
</template>
</el-table-column>
<el-table-column prop="picUrl" label="菜品封面图" width="160px" show-overflow-tooltip>
<template #default="scope">
<preview-image :src="scope.row.picUrl" />
</template>
</el-table-column>
<!-- <el-table-column prop="sliderPicUrls" label="菜品轮播图" show-overflow-tooltip /> -->
<el-table-column prop="sort" label="排序字段" show-overflow-tooltip />
<el-table-column prop="status" label="上架状态" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="spu_status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column prop="isShow" label="是否在移动端显示" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="is_show" :value="scope.row.isShow"></dict-tag>
</template>
</el-table-column>
<el-table-column prop="price" label="菜品价格" show-overflow-tooltip>
<template #default="scope">
{{ displayPrice(scope.row.price) }}
</template>
</el-table-column>
<el-table-column prop="marketPrice" label="市场价" show-overflow-tooltip>
<template #default="scope">
{{ displayPrice(scope.row.marketPrice) }}
</template>
</el-table-column>
</el-table>
<pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
v-model:current-page="queryForm.current"
v-model:page-size="queryForm.size"
:total="total"
/>
<template #footer>
<div class="flex items-center w-1/3">
<div class="w-16 text-blue-600 text-base font-bold">商户：</div>
<select-mch v-model="merchantId" :apiParams="{ types: '1' }" />
</div>
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" @click="dialogConfirm" :disabled="loading">确认</el-button>
</template>
</el-dialog>
</template>
<script setup lang="ts">
import { ref } from "vue"
import { fetchList } from "/@/api/canteen/canteenSpu"
import { displayPrice } from "/@/utils/formatMoney"
import { useDict } from "/@/hooks/dict"
import { getAllSimple as getCanteenCategory } from "/@/api/canteen/canteenCategory"
import { useMessage } from "/@/hooks/message"
import { saveCanteenSpuBatch } from "/@/api/canteen/canteenOnlineSpu"
const emit = defineEmits(["refresh"])
const { spu_status, is_show } = useDict("spu_status", "is_show")
const queryRef = ref()
const tableRef = ref() // 对话框多选表格ref
const loading = ref(false) // 对话框多选表格loading
const dialogVisible = ref(false)
const queryForm = reactive<any>({
current: 1,
size: 10,
})
const total = ref<number>(0)
const dataList = ref<any[]>([]) // 对话框多选表格数据
const categoryOptions = ref<any>([]) // 菜品分类选项
const merchantId = ref<string>("")
onMounted(async () => {
try {
const res = await getCanteenCategory()
categoryOptions.value = res.data
} catch (error) {
categoryOptions.value = []
}
})
// 打开弹窗
const openDialog = async () => {
dialogVisible.value = true
merchantId.value = ""
getDataList(false)
}
// 获取商品数据并且勾选
const getDataList = async (isSearch = false) => {
if (isSearch) {
queryForm.current = 1
}
loading.value = true
try {
const { code, data } = await fetchList(queryForm)
if (code === 0) {
dataList.value = data.records
total.value = data.total
}
} catch (error) {
dataList.value = []
} finally {
loading.value = false
}
}
// 分页变化
const sizeChangeHandle = (val: number) => {
queryForm.size = val
getDataList()
}
const currentChangeHandle = (val: number) => {
queryForm.current = val
getDataList()
}
const resetQuery = () => {
queryRef.value?.resetFields()
getDataList(true)
}
// 商品选择对话框确认
const dialogConfirm = async () => {
if (!merchantId.value) return useMessage().error("请选择商户")
const $table = tableRef.value
if ($table) {
const currentSelectedRows = $table.getSelectionRows()
const items = currentSelectedRows.map((item: any) => {
return {
name: item.name,
linkSpuId: item.id,
categoryId: item.categoryId,
picUrl: item.picUrl,
sort: item.sort,
status: item.status,
price: item.price,
stock: item.stock,
}
})
try {
loading.value = true
const { code, msg } = await saveCanteenSpuBatch({ merchantId: merchantId.value, items })
if (code != 0) return useMessage().error(msg)
useMessage().success("保存成功")
dialogVisible.value = false
emit("refresh")
} catch (error) {
useMessage().error(error as string)
} finally {
loading.value = false
}
}
}
const tableStyle = {
cellStyle: { textAlign: "center" },
headerCellStyle: {
textAlign: "center",
background: "var(--el-table-row-hover-bg-color)",
color: "var(--el-text-color-primary)",
},
}
defineExpose({
openDialog,
})
</script>
src/views/canteen/canteenOnlineSpu/index.vue
+19 -8
View File
@@ -24,7 +24,16 @@
@click="formDialogRef.openDialog()"
v-auth="'canteen_canteenOnlineSpu_add'"
>
新 增
新增常驻菜品
</el-button>
<el-button
icon="folder-add"
type="primary"
class="ml10"
@click="exportFormDialogRef.openDialog()"
v-auth="'canteen_canteenOnlineSpu_add'"
>
导入每日菜品
</el-button>
<el-button
plain
@@ -79,11 +88,11 @@
{{ displayPrice(scope.row.price) }}
</template>
</el-table-column>
<!-- <el-table-column prop="marketPrice" label="市场价" show-overflow-tooltip min-width="100">-->
<!-- <template #default="scope">-->
<!-- {{ displayPrice(scope.row.marketPrice) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="marketPrice" label="市场价" show-overflow-tooltip min-width="100">-->
<!-- <template #default="scope">-->
<!-- {{ displayPrice(scope.row.marketPrice) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="stock" label="库存" show-overflow-tooltip min-width="100" />
<el-table-column prop="salesCount" label="商品销量" show-overflow-tooltip min-width="100" />
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip min-width="160" />
@@ -109,6 +118,8 @@
<!-- 编辑、新增 -->
<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
<!-- 关联每日菜品 -->
<export-form-dialog ref="exportFormDialogRef" @refresh="getDataList(false)" />
</div>
</template>
@@ -120,12 +131,13 @@ import { useDict } from "/@/hooks/dict"
import { displayPrice } from "/@/utils/formatMoney"
import { fetchList as getCanteenOnlineCategory } from "/@/api/canteen/canteenOnlineCategory"
// 引入组件
const FormDialog = defineAsyncComponent(() => import("./form.vue"))
const ExportFormDialog = defineAsyncComponent(() => import("./export-form.vue"))
const { spu_status } = useDict("spu_status")
// 定义变量内容
const formDialogRef = ref()
const exportFormDialogRef = ref()
// 搜索变量
const queryRef = ref()
const showSearch = ref(true)
@@ -147,7 +159,6 @@ onMounted(async () => {
}
})
// table hook
const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
// 清空搜索条件
src/views/canteen/canteenSpu/form.vue
+17 -17
View File
@@ -8,17 +8,17 @@
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="14" class="mb20">
<el-form-item label="商品名称" prop="name">
<el-input v-model.trim="form.name" placeholder="请输入商品名称" />
<el-form-item label="菜品名称" prop="name">
<el-input v-model.trim="form.name" placeholder="请输入菜品名称" />
</el-form-item>
</el-col>
<el-col :span="14" class="mb20">
<el-form-item label="商品分类" prop="categoryId">
<el-form-item label="菜品分类" prop="categoryId">
<select-ctcg v-model="form.categoryId" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="商品封面图" prop="picUrl">
<el-form-item label="菜品封面图" prop="picUrl">
<upload-img v-model:imageUrl="form.picUrl" />
</el-form-item>
</el-col>
@@ -30,7 +30,7 @@
</el-col>
<el-col :span="14" class="mb20">
<el-form-item label="商品状态" prop="status">
<el-form-item label="菜品状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="item.value" v-for="(item, index) in spu_status" border :key="index">{{ item.label }}</el-radio>
</el-radio-group>
@@ -38,8 +38,8 @@
</el-col>
<el-col :span="14" class="mb20">
<el-form-item label="商品价格" prop="price">
<el-input-number v-model="form.price" :min="0" :precision="2" placeholder="请输入商品价格" />
<el-form-item label="菜品价格" prop="price">
<el-input-number v-model="form.price" :min="0" :precision="2" placeholder="请输入菜品价格" />
</el-form-item>
</el-col>
@@ -74,8 +74,8 @@
<!-- </el-col>-->
<!-- <el-col :span="24" class="mb20">-->
<!-- <el-form-item label="商品详情" prop="description">-->
<!-- <editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>-->
<!-- <el-form-item label="菜品详情" prop="description">-->
<!-- <editor v-if="visible" v-model:get-html="form.description" placeholder="请输入菜品详情"></editor>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
@@ -131,24 +131,24 @@ const form = reactive({
// 定义校验规则
const dataRules = ref({
categoryId: [{ required: true, message: "商品分类不能为空", trigger: "blur" }],
categoryId: [{ required: true, message: "菜品分类不能为空", trigger: "blur" }],
merchantId: [{ required: true, message: "商户不能为空", trigger: "blur" }],
name: [{ required: true, message: "商品名称不能为空", trigger: "blur" }],
picUrl: [{ required: true, message: "商品封面图不能为空", trigger: "blur" }],
status: [{ required: true, message: "商品状态不能为空", trigger: "blur" }],
name: [{ required: true, message: "菜品名称不能为空", trigger: "blur" }],
picUrl: [{ required: true, message: "菜品封面图不能为空", trigger: "blur" }],
status: [{ required: true, message: "菜品状态不能为空", trigger: "blur" }],
sort: [{ validator: rule.number, trigger: "blur" }],
price: [
{ validator: rule.number, trigger: "blur" },
{ required: true, message: "商品状态不能为空", trigger: "blur" },
{ required: true, message: "菜品状态不能为空", trigger: "blur" },
],
marketPrice: [
{ validator: rule.number, trigger: "blur" },
{ required: true, message: "商品状态不能为空", trigger: "blur" },
{ required: true, message: "菜品状态不能为空", trigger: "blur" },
],
costPrice: [{ validator: rule.number, trigger: "blur" }],
stock: [
{ validator: rule.number, trigger: "blur" },
{ required: true, message: "商品状态不能为空", trigger: "blur" },
{ required: true, message: "菜品状态不能为空", trigger: "blur" },
],
giveIntegral: [{ validator: rule.number, trigger: "blur" }],
salesCount: [{ validator: rule.number, trigger: "blur" }],
@@ -205,7 +205,7 @@ const getcanteenSpuData = (id: string) => {
loading.value = false
})
}
const categoryList = ref<any>([]) // 商品分类树
const categoryList = ref<any>([]) // 菜品分类树
onMounted(async () => {
const data = await getAllSimple()
categoryList.value = data.data
src/views/canteen/canteenSpu/index.vue
+18 -18
View File
@@ -3,10 +3,10 @@
<div class="layout-padding-auto layout-padding-view">
<el-row v-show="showSearch">
<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
<el-form-item label="商品名称" prop="name">
<el-input placeholder="请输入商品名称" v-model="state.queryForm.name" />
<el-form-item label="菜品名称" prop="name">
<el-input placeholder="请输入菜品名称" v-model="state.queryForm.name" />
</el-form-item>
<el-form-item label="商品分类" prop="categoryId">
<el-form-item label="菜品分类" prop="categoryId">
<select-ctcg v-model="state.queryForm.categoryId" style="width: 200px" />
</el-form-item>
<el-form-item>
@@ -51,30 +51,30 @@
>
<el-table-column type="selection" width="40" align="center" />
<el-table-column type="index" label="#" width="50" />
<el-table-column prop="name" label="商品名称" width="120px" show-overflow-tooltip />
<el-table-column prop="categoryId" label="商品分类" width="100px" show-overflow-tooltip>
<el-table-column prop="name" label="菜品名称" width="120px" show-overflow-tooltip />
<el-table-column prop="categoryId" label="菜品分类" width="100px" show-overflow-tooltip>
<template #default="{ row }">
{{ categoryOptions?.find((item: any) => item?.id === row?.categoryId)?.name }}
</template>
</el-table-column>
<el-table-column prop="picUrl" label="商品封面图" align="center" width="160px" show-overflow-tooltip>
<el-table-column prop="picUrl" label="菜品封面图" align="center" width="160px" show-overflow-tooltip>
<template #default="scope">
<preview-image :src="scope.row.picUrl" />
</template>
</el-table-column>
<!-- <el-table-column prop="sliderPicUrls" label="商品轮播图" show-overflow-tooltip /> -->
<!-- <el-table-column prop="sliderPicUrls" label="菜品轮播图" show-overflow-tooltip /> -->
<el-table-column prop="sort" label="排序字段" show-overflow-tooltip />
<el-table-column prop="status" label="上架状态" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="spu_status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column prop="isShow" label="是否在移动端显示" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="is_show" :value="scope.row.isShow"></dict-tag>
</template>
</el-table-column>
<el-table-column prop="price" label="商品价格" show-overflow-tooltip>
<el-table-column prop="isShow" label="是否在移动端显示" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="is_show" :value="scope.row.isShow"></dict-tag>
</template>
</el-table-column>
<el-table-column prop="price" label="菜品价格" show-overflow-tooltip>
<template #default="scope">
{{ displayPrice(scope.row.price) }}
</template>
@@ -84,10 +84,10 @@
{{ displayPrice(scope.row.marketPrice) }}
</template>
</el-table-column>
<!-- <el-table-column prop="costPrice" label="成本价" show-overflow-tooltip />-->
<!-- <el-table-column prop="stock" label="库存" show-overflow-tooltip />-->
<!-- <el-table-column prop="costPrice" label="成本价" show-overflow-tooltip />-->
<!-- <el-table-column prop="stock" label="库存" show-overflow-tooltip />-->
<!-- <el-table-column prop="giveIntegral" label="赠送积分" show-overflow-tooltip /> -->
<!-- <el-table-column prop="salesCount" label="商品销量" show-overflow-tooltip />-->
<!-- <el-table-column prop="salesCount" label="菜品销量" show-overflow-tooltip />-->
<!-- <el-table-column prop="virtualSalesCount" label="虚拟销量" show-overflow-tooltip /> -->
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip min-width="160" />
<el-table-column label="操作" width="150" fixed="right">
@@ -126,7 +126,7 @@ import { getAllSimple as getCanteenCategory } from "/@/api/canteen/canteenCatego
// 引入组件
const FormDialog = defineAsyncComponent(() => import("./form.vue"))
const { spu_status,is_show } = useDict("spu_status","is_show")
const { spu_status, is_show } = useDict("spu_status", "is_show")
// 定义变量内容
const formDialogRef = ref()
// 搜索变量
@@ -135,7 +135,7 @@ const showSearch = ref(true)
// 多选变量
const selectObjs = ref([]) as any
const multiple = ref(true)
const categoryOptions = ref<any>([]) // 商品分类选项
const categoryOptions = ref<any>([]) // 菜品分类选项
const state: BasicTableProps = reactive<BasicTableProps>({
queryForm: {},
src/views/integrated/dp/index.vue
+9 -1
View File
@@ -148,7 +148,15 @@ function hasValidDescription(desc: string | undefined | null) {
onMounted(async () => {
const res = await getScreenNoticeList();
noticeList.value = Array.isArray(res.data) ? res.data : [];
// 过滤掉已过期的公告
const now = new Date();
noticeList.value = Array.isArray(res.data)
? res.data.filter((notice: any) => {
if (!notice.expireTime) return true; // 没有过期时间的公告始终显示
const expireDate = new Date(notice.expireTime);
return expireDate > now; // 只显示未过期的公告
})
: [];
// 获取失物招领数据
const lostRes = await getScreenLostAndFoundList();
src/views/integrated/notice/form.vue
+41 -1
View File
@@ -33,6 +33,21 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="过期时间" prop="expireTime">
<el-date-picker
v-model="form.expireTime"
type="datetime"
placeholder="请选择过期时间"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
:disabled-date="disabledDate"
:disabled-time="disabledTime"
clearable
/>
<div class="form-tip">设置过期时间后，公告将在到期后自动隐藏</div>
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="公告详情" prop="description">
@@ -76,10 +91,26 @@ const form = reactive({
picUrl: '',
isTop: '',
viewCount: '',
expireTime: '',
});
// 定义校验规则
const dataRules = ref({})
const dataRules = ref({
title: [{ required: true, message: '公告标题不能为空', trigger: 'blur' }],
isTop: [{ required: true, message: '请选择是否置顶', trigger: 'change' }],
status: [{ required: true, message: '请选择发布状态', trigger: 'change' }],
expireTime: [{ required: true, message: '请选择过期时间', trigger: 'change' }],
})
// 禁用过去的日期
const disabledDate = (time: Date) => {
return time.getTime() < Date.now() - 8.64e7; // 禁用今天之前的日期
}
// 禁用时间（可选，这里不做限制）
const disabledTime = () => {
return {}
}
// 打开弹窗
const openDialog = (id: string) => {
@@ -134,3 +165,12 @@ defineExpose({
openDialog
});
</script>
<style scoped>
.form-tip {
font-size: 12px;
color: #909399;
margin-top: 4px;
line-height: 1.4;
}
</style>
src/views/integrated/notice/index.vue
+24
View File
@@ -48,6 +48,15 @@
<dict-tag :options="is_top" :value="scope.row.isTop"></dict-tag>
</template>
</el-table-column>
<el-table-column prop="expireTime" label="过期时间" show-overflow-tooltip>
<template #default="scope">
<span v-if="scope.row.expireTime" :class="{ 'expired': isExpired(scope.row.expireTime) }">
{{ scope.row.expireTime }}
<el-tag v-if="isExpired(scope.row.expireTime)" type="danger" size="small">已过期</el-tag>
</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column prop="viewCount" label="浏览次数" show-overflow-tooltip/>
<el-table-column label="操作" width="150">
<template #default="scope">
@@ -121,6 +130,14 @@ const selectionChangHandle = (objs: { id: string }[]) => {
multiple.value = !objs.length;
};
// 判断公告是否已过期
const isExpired = (expireTime: string) => {
if (!expireTime) return false;
const expireDate = new Date(expireTime);
const now = new Date();
return expireDate < now;
};
// 删除操作
const handleDelete = async (ids: string[]) => {
try {
@@ -138,3 +155,10 @@ const handleDelete = async (ids: string[]) => {
}
};
</script>
<style scoped>
.expired {
color: #f56c6c;
text-decoration: line-through;
}
</style>
src/views/supermarketerp/components/select-dialog.vue
+21 -10
View File
@@ -14,6 +14,7 @@
<el-form-item>
<el-button icon="search" type="primary" @click="getDataList(true)">查询</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
<el-button icon="Refresh" @click="tableRef.clearSelection()">取消所有勾选</el-button>
</el-form-item>
</el-form>
</el-row>
@@ -23,20 +24,21 @@
:data="dataList"
v-loading="loading"
:row-key="(row:any) => row.id"
:reserve-selection="true"
@selection-change=""
:cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle"
>
<el-table-column type="selection" width="50" reserve-selection fixed="left" align="center" />
<el-table-column type="index" label="#" width="50" fixed="left" align="center" />
<el-table-column prop="productName" label="商品名称" min-width="150px" align="center" show-overflow-tooltip />
<el-table-column prop="picUrl" label="封面图" align="center" show-overflow-tooltip>
<el-table-column type="selection" width="50" reserve-selection fixed="left" />
<el-table-column type="index" label="#" width="50" fixed="left" />
<el-table-column prop="productName" label="商品名称" min-width="150px" show-overflow-tooltip />
<el-table-column prop="picUrl" label="封面图" show-overflow-tooltip>
<template #default="scope">
<preview-image @click.stop :src="scope.row.picUrl" />
</template>
</el-table-column>
<el-table-column prop="stock" label="库存" min-width="80px" align="center" show-overflow-tooltip />
<el-table-column prop="productCode" label="货号" min-width="100px" align="center" show-overflow-tooltip />
<el-table-column label="包装单位" min-width="300px" align="center">
<el-table-column prop="stock" label="库存" min-width="80px" show-overflow-tooltip />
<el-table-column prop="productCode" label="货号" min-width="100px" show-overflow-tooltip />
<el-table-column label="包装单位" min-width="300px">
<template #default="scope">
<div v-if="scope.row.erpUnitVos && scope.row.erpUnitVos.length > 0">
<div class="flex flex-wrap gap-2">
@@ -49,12 +51,12 @@
<div v-else class="text-gray-400">无包装单位</div>
</template>
</el-table-column>
<el-table-column prop="productNature" label="商品性质" show-overflow-tooltip align="center" width="150">
<el-table-column prop="productNature" label="商品性质" show-overflow-tooltip width="150">
<template #default="scope">
<dict-tag :options="supermarket_nature" :value="scope.row.productNature" />
</template>
</el-table-column>
<el-table-column prop="status" label="状态" min-width="100px" align="center" show-overflow-tooltip>
<el-table-column prop="status" label="状态" min-width="100px" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="status" :value="scope.row.status" />
</template>
@@ -174,6 +176,15 @@ onMounted(async () => {
// }
})
const tableStyle = {
cellStyle: { textAlign: "center" },
headerCellStyle: {
textAlign: "center",
background: "var(--el-table-row-hover-bg-color)",
color: "var(--el-text-color-primary)",
},
}
defineExpose({
openDialog,
})
src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue
+8 -1
View File
@@ -31,7 +31,14 @@
</el-row>
<el-row>
<div class="mb8" style="width: 100%">
<el-button icon="folder-add" type="primary" class="ml10" @click="create" v-auth="'supermarket_smErpInventoryRecords_add'">
<el-button
disabled
icon="folder-add"
type="primary"
class="ml10"
@click="create"
v-auth="'supermarket_smErpInventoryRecords_add'"
>
新 增
</el-button>
<el-button
src/views/supermarketerp/supermarketSpu/index.vue
+16 -21
View File
@@ -80,18 +80,18 @@
覆盖导入
</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="导入盘点数据" placement="top">
<el-button
plain
v-auth="'supermarket_supermarketSpu_import'"
class="ml10"
icon="upload-filled"
type="primary"
@click="excelUploadPd.show()"
>
盘点导入
</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="导入盘点数据" placement="top">
<el-button
plain
v-auth="'supermarket_supermarketSpu_import'"
class="ml10"
icon="upload-filled"
type="primary"
@click="excelUploadPd.show()"
>
盘点导入
</el-button>
</el-tooltip>
</div>
</el-row>
<el-table
@@ -135,7 +135,7 @@
</template>
</el-table-column> -->
<el-table-column prop="costPrice" label="成本单价(元)" show-overflow-tooltip width="120">
<template #default="{ row }">{{ row.costPrice }}</template>
<template #default="{ row }">{{ displayPrice(row.costPrice, "") }}</template>
</el-table-column>
<el-table-column prop="retailPrice" label="零售价(元)" show-overflow-tooltip width="120">
<template #default="{ row }">{{ displayPrice(row.retailPrice, "") }}</template>
@@ -190,20 +190,14 @@
@refreshDataList="refreshDataList"
/>
<upload-excel
<upload-excel-update
ref="excelUploadUpdateRef"
title="覆盖导入库存商品"
url="/supermarket/supermarketSpu/importNewUpdate"
@refreshDataList="refreshDataList"
/>
<upload-excel
ref="excelUploadPd"
title="导入库存盘点"
url="/supermarket/supermarketSpu/importPD"
@refreshDataList="refreshDataList"
/>
<upload-excel ref="excelUploadPd" title="导入库存盘点" url="/supermarket/supermarketSpu/importPD" @refreshDataList="refreshDataList" />
</div>
</template>
@@ -213,6 +207,7 @@ import { fetchList, delObjs, getSupermarketCategory, getSupermarketBrand } from
import { useMessage, useMessageBox } from "/@/hooks/message"
import { useDict } from "/@/hooks/dict"
import UploadExcel from "./components/upload-excel.vue"
import UploadExcelUpdate from "./components/upload-excel-update.vue"
import { displayPrice } from "/@/utils/formatMoney"
import { getSupplierSimpleAll } from "/@/api/supermarketerp/smErpSupplier"