From f993306c3ad2bc53c549022d7553ec554b1463ec Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 5 Mar 2025 14:52:18 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=A3=9F=E5=A0=82=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/base/canteen.js | 95 +++++
src/views/base/canteen/index.vue | 578 +++++++++++++++++++++++++++++++
src/views/base/canteen/temp.vue | 323 +++++++++++++++++
src/views/base/stall/index.vue | 323 +++++++++++++++++
4 files changed, 1319 insertions(+)
create mode 100644 src/api/base/canteen.js
create mode 100644 src/views/base/canteen/temp.vue
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/views/base/canteen/index.vue b/src/views/base/canteen/index.vue
index e69de29b..7ae390c9 100644
--- a/src/views/base/canteen/index.vue
+++ b/src/views/base/canteen/index.vue
@@ -0,0 +1,578 @@
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 休息
+ 营业
+
+
+
+
+
+ {{ scope.row.startBusinessTime }}-{{ scope.row.endBusinessTime }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+ 未开启
+
+
+
+
+
+
+ 休息
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ (baseForm.capacity=v.replace(/[^\d]/g,''))"/>
+
+
+
+
+
+
+
+
+
+
+
+ (baseForm.capacity=v.replace(/[^\d]/g,''))"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/base/canteen/temp.vue b/src/views/base/canteen/temp.vue
new file mode 100644
index 00000000..bf28e6ca
--- /dev/null
+++ b/src/views/base/canteen/temp.vue
@@ -0,0 +1,323 @@
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 休息
+ 营业
+
+
+
+
+
+ {{ scope.row.startBusinessTime }}-{{ scope.row.endBusinessTime }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+ 未开启
+
+
+
+
+
+
+ 休息
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/base/stall/index.vue b/src/views/base/stall/index.vue
index e69de29b..bf28e6ca 100644
--- a/src/views/base/stall/index.vue
+++ b/src/views/base/stall/index.vue
@@ -0,0 +1,323 @@
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 休息
+ 营业
+
+
+
+
+
+ {{ scope.row.startBusinessTime }}-{{ scope.row.endBusinessTime }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+ 详情
+
+
+
+
+ 未开启
+
+
+
+
+
+
+ 休息
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From d4e8ec788408a1dee3f5cb2202cdd838ad606359 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 5 Mar 2025 14:53:08 +0800
Subject: [PATCH 2/4] =?UTF-8?q?ip=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
vue.config.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/vue.config.js b/vue.config.js
index 0e8fec24..53e92da1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,7 +36,8 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.2.209:38080`,
- target: `http://192.168.2.76:38080`,
+ // target: `http://192.168.0.61:58080`,
+ target: `http://192.168.0.44:58085`,
// target: `http://192.168.0.244:18877`,
changeOrigin: true,
pathRewrite: {
From db41f94803f5bac21cf14166d0985c548741bd77 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 5 Mar 2025 15:21:18 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=A3=9F=E5=A0=82=E7=AE=A1=E7=90=862?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/system/upload.js | 88 ++++++++++++++++
src/views/base/canteen/index.vue | 172 +++++++++++++++++++++++--------
2 files changed, 216 insertions(+), 44 deletions(-)
create mode 100644 src/api/system/upload.js
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 7ae390c9..968b3465 100644
--- a/src/views/base/canteen/index.vue
+++ b/src/views/base/canteen/index.vue
@@ -261,12 +261,24 @@
-
-
+ :http-request="
+ (obj) => imgUpLoad(obj, 'fileUrl')
+ "
+ action="#"
+ :limit="1"
+ :file-list="fileList"
+ :show-file-list="true"
+ list-type="picture-card"
+ accept=".png, .jpg, .jpeg"
+ :on-success="handleAvatarSuccess"
+ :class="{ disabled: uploadDisabled }"
+ :on-preview="handlePictureCardPreview"
+ :on-remove="handleRemove"
+ >
+
+
@@ -274,11 +286,20 @@
-
+
+ 支付设置
+
+
-
+
+ 配送设置
+
+
-
+
+
+
+