diff --git a/src/api/dish/menu.js b/src/api/dish/menu.js index 925b9a3d..bba30763 100644 --- a/src/api/dish/menu.js +++ b/src/api/dish/menu.js @@ -55,6 +55,29 @@ export function getStallByCanteenApi(data) { data: data }) } +// 用户范围 +export function getmkteffectiveApi(data) { + return request({ + url: '/smart-canteen/api/v1/mkteffective/page', + method: 'get', + headers: { + "merchant-id":"378915229716713472", + }, + params: data + }) +} + +// 菜品列表 +export function getDishesByTypePageApi(data) { + return request({ + url: '/smart-canteen/api/v2/menudishes/type/dishes/list/page', + method: 'post', + headers: { + "merchant-id":"378915229716713472", + }, + data: data + }) +} // 获取当前菜谱 export function getCurrentRecipeListApi(data) { @@ -66,7 +89,7 @@ export function getCurrentRecipeListApi(data) { }, data: data }) - } +} // 获取所有菜谱-分页 export function getPageRecipeListApi(data) { return request({ @@ -77,10 +100,19 @@ export function getPageRecipeListApi(data) { }, data: data }) - } - - - +} + +//菜谱-新增 +export function addMenuRecipeApi(data) { + return request({ + url: '/smart-canteen/api/v2/menurecipe/add', + method: 'post', + headers: { + "merchant-id":"378915229716713472", + }, + data: data + }) +} diff --git a/src/router/index.js b/src/router/index.js index 93d46ca6..2c4d2e4a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -87,6 +87,20 @@ export const constantRoutes = [ meta: { title: '个人中心', icon: 'user' } } ] + }, + { + path: '/dish', + component: Layout, + hidden: true, + redirect: 'noredirect', + children: [ + { + path: 'menuDetail', + component: () => import('@/views/dish/menu/detail'), + name: 'MenuDetail', + meta: { title: '菜谱详情', icon: '' } + } + ] } ] diff --git a/src/views/dish/menu/detail.vue b/src/views/dish/menu/detail.vue new file mode 100644 index 00000000..b4ef5cc8 --- /dev/null +++ b/src/views/dish/menu/detail.vue @@ -0,0 +1,841 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/views/dish/menu/index.vue b/src/views/dish/menu/index.vue index 0156b32e..719f17a2 100644 --- a/src/views/dish/menu/index.vue +++ b/src/views/dish/menu/index.vue @@ -45,13 +45,13 @@ - + 搜索 @@ -133,20 +133,7 @@ :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" - /> - - - - - - - - -
- 确 定 - 取 消 -
- + /> @@ -190,25 +177,7 @@ daysList:[], treeAreaOptions:[], canteenOptions:[], - stallOptions:[], - - - - - - - // 弹出层标题 - title: "", - // 是否显示弹出层 - open: false, - // 表单参数 - form: {}, - // 表单校验 - rules: { - name: [ - { required: true, message: "名称不能为空", trigger: "blur" } - ] - } + stallOptions:[] }; }, created() { @@ -296,7 +265,7 @@ handleCanteenChange(e){ console.log(this.queryParams.canteenIds) let param= { - canteenIdList:this.queryParams.canteenIds||[this.baseForm.canteenId] + canteenIdList:this.queryParams.canteenIds } getStallByCanteenApi(param).then((response) => { this.stallOptions=response||[] @@ -314,7 +283,7 @@ pageNum: 1, pageSize: 10, key:"2", - applyDate:"", + applyDate:this.daysList[0].data, areaIds: [], canteenIds: [], stallIds: [], @@ -341,38 +310,29 @@ this.loading = false; }); } - }, - - - - - - + }, /** 新增按钮操作 */ handleAdd() { - this.reset(); - this.open = true; - this.title = "新增"; + this.$router.push({ path: "/dish/menuDetail" }); }, /** 修改按钮操作 */ - handleUpdate(row) { - this.reset(); - this.form = Object.assign({}, row) - this.open = true; - this.title = "修改"+this.activeLabel; + handleUpdate(row) { + // this.form = Object.assign({}, row) + }, - // 取消按钮 - cancel() { - this.open = false; - this.reset(); + /** 删除按钮操作 */ + handleDelete(row) { + console.log(row) + var that = this + this.$modal.confirm('是否确认删除数据项？').then(function() { + // return removeMenuDishesSuitApi(row.suitId) + }).then(() => { + this.getList(); + this.$modal.msgSuccess("删除成功"); + }).catch(() => {}); }, - // 表单重置 - reset() { - this.form = {}; - this.resetForm("form"); - }, /** 提交按钮 */ submitForm: function() { this.$refs["form"].validate(valid => { @@ -393,17 +353,7 @@ } }); }, - /** 删除按钮操作 */ - handleDelete(row) { - console.log(row) - var that = this - this.$modal.confirm('是否确认删除数据项？').then(function() { - // return removeMenuDishesSuitApi(row.suitId) - }).then(() => { - this.getList(); - this.$modal.msgSuccess("删除成功"); - }).catch(() => {}); - }, + } }; diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 2cf51e5d..b3ba816f 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -195,17 +195,30 @@ - - + + + + 展开/折叠 全选/全不选 @@ -376,7 +389,7 @@ export default { roleSort: [ { required: true, message: '角色顺序不能为空', trigger: 'blur' } ], - areaId: [ + areaIds: [ { required: true, message: '所属区域不能为空', trigger: 'change' } ], } @@ -406,7 +419,7 @@ export default { }, handleAreaChange(e){ console.log(e) - console.log(this.form.areaId) + console.log(this.form.areaIds) }, /** 查询菜单树结构 */ getMenuTreeselect() { @@ -484,7 +497,7 @@ export default { status: '0', menuIds: [], deptIds: [], - areaId: undefined, + areaIds: [], menuCheckStrictly: true, deptCheckStrictly: true, remark: undefined