diff --git a/src/api/base/canteen.js b/src/api/base/canteen.js
new file mode 100644
index 00000000..b3862be1
--- /dev/null
+++ b/src/api/base/canteen.js
@@ -0,0 +1,95 @@
+import request from '@/utils/request'
+
+// export function listData(query) {
+// return request({
+// url: '/system/dict/data/list',
+// method: 'get',
+// params: query
+// })
+// }
+
+// export function getDicts(dictType) {
+// return request({
+// url: '/system/dict/data/type/' + dictType,
+// method: 'get'
+// })
+// }
+
+// 查询食堂列表
+export function getPageCanteenApi(data) {
+ return request({
+ url: '/smart-canteen/api/v2/alloc/canteen/page-canteen',
+ method: 'post',
+ headers: {
+ "merchant-id":"378915229716713472",
+ },
+ data: data
+ })
+}
+// 新增食堂
+export function addCanteenApi(data) {
+ return request({
+ url: '/smart-canteen/api/v2/alloc/canteen/add-canteen',
+ method: 'post',
+ headers: {
+ "merchant-id":"378915229716713472",
+ },
+ data: data
+ })
+}
+
+
+
+
+
+// 查询食堂标签列表(分页)
+export function getCanteenLabelApi(data) {
+ return request({
+ url: '/smart-canteen/api/v2/alloc/label/page',
+ method: 'post',
+ headers: {
+ "merchant-id":"378915229716713472",
+ },
+ data: data
+ })
+}
+// 人员职位职称查询
+export function queryAllCustJobApi(data) {
+ return request({
+ url: '/smart-canteen/custJob/queryAllCustJob',
+ method: 'post',
+ headers: {
+ "merchant-id":"378915229716713472",
+ },
+ data: data
+ })
+}
+// 分页查询人员及职位信息
+export function queryCustJobPageApi(data) {
+ return request({
+ url: '/smart-canteen/custInfo/page-cust-job-info',
+ method: 'post',
+ headers: {
+ "merchant-id":"378915229716713472",
+ },
+ data: data
+ })
+}
+
+
+
+
+
+
+// 查询餐次时段列表
+export function getMealtimeListApi(data) {
+ return request({
+ url: '/smart-canteen/api/v2/alloc/mealtime/list-by-param',
+ method: 'post',
+ headers: {
+ "merchant-id":"378915229716713472",
+ },
+ data: data
+ })
+}
+
\ No newline at end of file
diff --git a/src/api/system/upload.js b/src/api/system/upload.js
new file mode 100644
index 00000000..51205b70
--- /dev/null
+++ b/src/api/system/upload.js
@@ -0,0 +1,88 @@
+import request from '@/utils/request'
+//资源图片上传
+export function imgUpLoad(param){
+ const formData = new FormData()
+ formData.append('file', param.file)
+ formData.append('fileType', param.type)
+ return request({
+ url: '/system/sys/file/upload',
+ method: 'post',
+ data: formData,
+ header:'multipart/form-data'
+ })
+ }
+
+ export function imgUpLoadTwo(param){
+ const formData = new FormData()
+ formData.append('file', param.file)
+ formData.append('fileType', param.type)
+ return request({
+ url: '/file/upload',
+ method: 'post',
+ data: formData,
+ header:'multipart/form-data'
+ })
+ }
+
+ export function imgUpLoadThree(param){
+ const formData = new FormData()
+ param.forEach(item => {
+ formData.append('files', item)
+ })
+ // formData.append('files', param)
+ return request({
+ url: '/file/uploadFiles',
+ method: 'post',
+ data: formData,
+ header:'multipart/form-data'
+ })
+ }
+
+
+//资源文件上传
+export function fileUpLoad(param){
+ const formData = new FormData()
+ formData.append('file', param.file)
+ return request({
+ url: '/system/sys/file/upload',
+ method: 'post',
+ data: formData,
+ })
+ }
+
+// excel文件上传
+export function excelUpLoad(param){
+ const formData = new FormData()
+ formData.append('file', param.file)
+ return request({
+ url: '/material/base/maPartType/readExcel',
+ method: 'post',
+ data: formData,
+ })
+}
+
+// excel文件下载
+export function downloadExcel(param){
+ return request({
+ url: '/material/base/maPartType/downLoad',
+ method: 'post',
+ param
+ })
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/base/canteen/index.vue b/src/views/base/canteen/index.vue
index e69de29b..2b37957d 100644
--- a/src/views/base/canteen/index.vue
+++ b/src/views/base/canteen/index.vue
@@ -0,0 +1,759 @@
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 休息
+ 营业
+
+
+
+
+
+ {{ scope.row.startBusinessTime }}-{{ scope.row.endBusinessTime }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+ ![]()
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+ 未开启
+
+
+
+
+
+
+ 休息
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 支付设置
+
+
+
+
+ 配送设置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 休息
+ 营业
+
+
+
+
+
+ {{ scope.row.startBusinessTime }}-{{ scope.row.endBusinessTime }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+ ![]()
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+ 未开启
+
+
+
+
+
+
+ 休息
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 休息
+ 营业
+
+
+
+
+
+ {{ scope.row.startBusinessTime }}-{{ scope.row.endBusinessTime }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+ ![]()
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+ 未开启
+
+
+
+
+
+
+ 休息
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+