From fcf7609a66c1bc481a32f9cbcc7f7bceb3be1f36 Mon Sep 17 00:00:00 2001 From: weiwei Date: Tue, 12 Aug 2025 16:57:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BA=BF=E4=B8=8A=E9=A2=84=E8=AE=A2?= =?UTF-8?q?=E8=8F=9C=E5=93=81=E6=94=AF=E6=8C=81=E4=BB=8E=E6=AF=8F=E6=97=A5?= =?UTF-8?q?=E8=8F=9C=E5=93=81=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/canteen/canteenCategory/index.vue | 4 +- .../canteen/canteenOnlineSpu/export-form.vue | 191 ++++++++++++++++++ src/views/canteen/canteenOnlineSpu/index.vue | 21 +- src/views/canteen/canteenSpu/form.vue | 34 ++-- src/views/canteen/canteenSpu/index.vue | 36 ++-- .../components/select-dialog.vue | 29 ++- .../smErpRetailBack/index.vue | 9 +- .../supermarketerp/supermarketSpu/index.vue | 11 +- 8 files changed, 284 insertions(+), 51 deletions(-) create mode 100644 src/views/canteen/canteenOnlineSpu/export-form.vue diff --git a/src/views/canteen/canteenCategory/index.vue b/src/views/canteen/canteenCategory/index.vue index d6883ef..e67f37e 100644 --- a/src/views/canteen/canteenCategory/index.vue +++ b/src/views/canteen/canteenCategory/index.vue @@ -66,8 +66,8 @@ - - + + @@ -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,9 +159,12 @@ onMounted(async () => { } }) -// table hook const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state) +const getSelectedRows = (selectRows: any) => { + console.log(selectRows) +} + // 清空搜索条件 const resetQuery = () => { // 清空搜索条件 diff --git a/src/views/canteen/canteenSpu/form.vue b/src/views/canteen/canteenSpu/form.vue index c089607..60f17b9 100644 --- a/src/views/canteen/canteenSpu/form.vue +++ b/src/views/canteen/canteenSpu/form.vue @@ -8,17 +8,17 @@ - - + + - + - + @@ -30,7 +30,7 @@ - + {{ item.label }} @@ -38,8 +38,8 @@ - - + + @@ -74,8 +74,8 @@ - - + + @@ -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([]) // 商品分类树 +const categoryList = ref([]) // 菜品分类树 onMounted(async () => { const data = await getAllSimple() categoryList.value = data.data diff --git a/src/views/canteen/canteenSpu/index.vue b/src/views/canteen/canteenSpu/index.vue index d65384f..644c506 100644 --- a/src/views/canteen/canteenSpu/index.vue +++ b/src/views/canteen/canteenSpu/index.vue @@ -3,10 +3,10 @@
- - + + - + @@ -51,30 +51,30 @@ > - - + + - + - + - - - - + + + + @@ -84,10 +84,10 @@ {{ displayPrice(scope.row.marketPrice) }} - - + + - + @@ -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([]) // 商品分类选项 +const categoryOptions = ref([]) // 菜品分类选项 const state: BasicTableProps = reactive({ queryForm: {}, diff --git a/src/views/supermarketerp/components/select-dialog.vue b/src/views/supermarketerp/components/select-dialog.vue index ae2ea7d..f704570 100644 --- a/src/views/supermarketerp/components/select-dialog.vue +++ b/src/views/supermarketerp/components/select-dialog.vue @@ -25,18 +25,20 @@ :row-key="(row:any) => row.id" :reserve-selection="true" @selection-change="" + :cell-style="tableStyle.cellStyle" + :header-cell-style="tableStyle.headerCellStyle" > - - - - + + + + - - - + + + - + - + @@ -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, }) diff --git a/src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue b/src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue index 149641e..443823b 100644 --- a/src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue +++ b/src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue @@ -31,7 +31,14 @@
- + 新 增 + ~盘点导入~
- + +
@@ -193,6 +201,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"