diff --git a/src/api/canteen/canteenOnlineSpu.ts b/src/api/canteen/canteenOnlineSpu.ts index fc63d22..35d14d3 100644 --- a/src/api/canteen/canteenOnlineSpu.ts +++ b/src/api/canteen/canteenOnlineSpu.ts @@ -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, + }) +} diff --git a/src/views/canteen/canteenCategory/form.vue b/src/views/canteen/canteenCategory/form.vue index fa647d3..7fc0de3 100644 --- a/src/views/canteen/canteenCategory/form.vue +++ b/src/views/canteen/canteenCategory/form.vue @@ -10,12 +10,7 @@ - + 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 @@ - - + + - - + + - + @@ -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..51b410c 100644 --- a/src/views/supermarketerp/components/select-dialog.vue +++ b/src/views/supermarketerp/components/select-dialog.vue @@ -23,20 +23,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" > - - - - + + + + - - - + + + - + - + @@ -174,6 +175,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 @@
- + 新 增 - - - 盘点导入 - - + + + 盘点导入 + +
- - - + @@ -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"