diff --git a/src/api/canteen/canteenCategory.ts b/src/api/canteen/canteenCategory.ts
index dbe27ae..9b5f113 100644
--- a/src/api/canteen/canteenCategory.ts
+++ b/src/api/canteen/canteenCategory.ts
@@ -39,11 +39,10 @@ export function putObj(obj?: Object) {
})
}
-export function getAllSimple(query?: Object) {
+export function getAllSimple() {
return request({
url: '/canteen/canteenCategory/getAllSimple',
method: 'get',
- params: query
})
}
diff --git a/src/api/supermarket/supermarketAuxiliaryCode.ts b/src/api/supermarket/supermarketAuxiliaryCode.ts
new file mode 100644
index 0000000..7a20590
--- /dev/null
+++ b/src/api/supermarket/supermarketAuxiliaryCode.ts
@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+ return request({
+ url: '/supermarket/supermarketAuxiliaryCode/page',
+ method: 'get',
+ params: query
+ })
+}
+
+export function addObj(obj?: Object) {
+ return request({
+ url: '/supermarket/supermarketAuxiliaryCode',
+ method: 'post',
+ data: obj
+ })
+}
+
+export function getObj(id?: string) {
+ return request({
+ url: '/supermarket/supermarketAuxiliaryCode/' + id,
+ method: 'get'
+ })
+}
+
+export function delObjs(ids?: Object) {
+ return request({
+ url: '/supermarket/supermarketAuxiliaryCode',
+ method: 'delete',
+ data: ids
+ })
+}
+
+export function putObj(obj?: Object) {
+ return request({
+ url: '/supermarket/supermarketAuxiliaryCode',
+ method: 'put',
+ data: obj
+ })
+}
+
diff --git a/src/api/supermarket/supermarketBrand.ts b/src/api/supermarket/supermarketBrand.ts
new file mode 100644
index 0000000..d7d5b6b
--- /dev/null
+++ b/src/api/supermarket/supermarketBrand.ts
@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+ return request({
+ url: '/supermarket/supermarketBrand/page',
+ method: 'get',
+ params: query
+ })
+}
+
+export function addObj(obj?: Object) {
+ return request({
+ url: '/supermarket/supermarketBrand',
+ method: 'post',
+ data: obj
+ })
+}
+
+export function getObj(id?: string) {
+ return request({
+ url: '/supermarket/supermarketBrand/' + id,
+ method: 'get'
+ })
+}
+
+export function delObjs(ids?: Object) {
+ return request({
+ url: '/supermarket/supermarketBrand',
+ method: 'delete',
+ data: ids
+ })
+}
+
+export function putObj(obj?: Object) {
+ return request({
+ url: '/supermarket/supermarketBrand',
+ method: 'put',
+ data: obj
+ })
+}
+
diff --git a/src/api/supermarket/supermarketSpu.ts b/src/api/supermarket/supermarketSpu.ts
new file mode 100644
index 0000000..22c1aa6
--- /dev/null
+++ b/src/api/supermarket/supermarketSpu.ts
@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+ return request({
+ url: '/supermarket/supermarketSpu/page',
+ method: 'get',
+ params: query
+ })
+}
+
+export function addObj(obj?: Object) {
+ return request({
+ url: '/supermarket/supermarketSpu',
+ method: 'post',
+ data: obj
+ })
+}
+
+export function getObj(id?: string) {
+ return request({
+ url: '/supermarket/supermarketSpu/' + id,
+ method: 'get'
+ })
+}
+
+export function delObjs(ids?: Object) {
+ return request({
+ url: '/supermarket/supermarketSpu',
+ method: 'delete',
+ data: ids
+ })
+}
+
+export function putObj(obj?: Object) {
+ return request({
+ url: '/supermarket/supermarketSpu',
+ method: 'put',
+ data: obj
+ })
+}
+
diff --git a/src/views/canteen/canteenCategory/form.vue b/src/views/canteen/canteenCategory/form.vue
index 955063d..ad333f8 100644
--- a/src/views/canteen/canteenCategory/form.vue
+++ b/src/views/canteen/canteenCategory/form.vue
@@ -9,7 +9,13 @@
-
+
+
+
+
+
+
+
@@ -52,7 +58,7 @@ const dataFormRef = ref();
const visible = ref(false)
const loading = ref(false)
// 定义字典
-
+const { daily_menu } = useDict('daily_menu')
// 提交表单数据
const form = reactive({
id:'',
@@ -64,13 +70,14 @@ const form = reactive({
creator: '',
updater: '',
deleted: '',
- systemType: '',
deptId: '',
+ categoryType: '',
});
// 定义校验规则
const dataRules = ref({
name: [{required: true, message: '分类名称不能为空', trigger: 'blur'}],
+ categoryType: [{required: true, message: '餐段类型不能为空', trigger: 'blur'}],
sort: [{required: true, message: '分类排序不能为空', trigger: 'blur'}],
})
diff --git a/src/views/canteen/canteenCategory/index.vue b/src/views/canteen/canteenCategory/index.vue
index e23bffc..3da8798 100644
--- a/src/views/canteen/canteenCategory/index.vue
+++ b/src/views/canteen/canteenCategory/index.vue
@@ -36,6 +36,11 @@
+
+
+
+
+
@@ -66,7 +71,7 @@ import { useDict } from '/@/hooks/dict';
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
// 定义查询字典
-
+const { daily_menu } = useDict('daily_menu')
// 定义变量内容
const formDialogRef = ref()
// 搜索变量
diff --git a/src/views/canteen/canteenSpu/form.vue b/src/views/canteen/canteenSpu/form.vue
index a401417..2047269 100644
--- a/src/views/canteen/canteenSpu/form.vue
+++ b/src/views/canteen/canteenSpu/form.vue
@@ -196,10 +196,7 @@ const getcanteenSpuData = (id: string) => {
};
const categoryList = ref([]); // 商品分类树
onMounted(async () => {
- const params = {
- systemType: 2,
- };
- const data = await getAllSimple(params);
+ const data = await getAllSimple();
categoryList.value = data.data;
});
// 暴露变量
diff --git a/src/views/canteen/merchantInfo/form.vue b/src/views/canteen/merchantInfo/form.vue
index 7907c81..36dd031 100644
--- a/src/views/canteen/merchantInfo/form.vue
+++ b/src/views/canteen/merchantInfo/form.vue
@@ -34,20 +34,20 @@
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
+
diff --git a/src/views/supermarket/supermarketAuxiliaryCode/form.vue b/src/views/supermarket/supermarketAuxiliaryCode/form.vue
new file mode 100644
index 0000000..5930122
--- /dev/null
+++ b/src/views/supermarket/supermarketAuxiliaryCode/form.vue
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/supermarket/supermarketAuxiliaryCode/index.vue b/src/views/supermarket/supermarketAuxiliaryCode/index.vue
new file mode 100644
index 0000000..18c03ef
--- /dev/null
+++ b/src/views/supermarket/supermarketAuxiliaryCode/index.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
+ 查询
+
+ 重置
+
+
+
+
+
+
+ 新 增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+ 重置
+
+
+
+
+
+
+ 新 增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+ 重置
+
+
+
+
+
+
+ 新 增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+