完成管理账号，完善菜单
This commit is contained in:
parent
a69a346804
commit
27ff2ff67d
|
|
@ -2,5 +2,6 @@
|
|||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
<mapping directory="$PROJECT_DIR$/bin" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
2
bin
2
bin
|
|
@ -1 +1 @@
|
|||
Subproject commit 2329fea1f84e829d3a703c60cfd8da9014766e91
|
||||
Subproject commit a69a346804bec6f22ca7e5bd7cf006997f7bdaa4
|
||||
|
|
@ -137,6 +137,7 @@ public class EmployeeController {
|
|||
//Long empId = (Long)request.getSession().getAttribute("employee");
|
||||
//employee.setUpdateTime(LocalDateTime.now());
|
||||
//employee.setUpdateUser(empId);
|
||||
employee.setPassword(DigestUtils.md5DigestAsHex(employee.getPassword().getBytes()));
|
||||
employeeService.updateById(employee);
|
||||
|
||||
return R.success("员工信息修改成功");
|
||||
|
|
|
|||
|
|
@ -133,6 +133,7 @@
|
|||
}
|
||||
this.menuList = this.generateMenuList();
|
||||
this.menuHandle(this.menuList.find(item => item.id === this.defAct), false); // 手动调用一次 menuHandle
|
||||
console.log("调用了create")
|
||||
this.closeLoading()
|
||||
},
|
||||
beforeDestroy() {
|
||||
|
|
@ -196,13 +197,19 @@
|
|||
goBack() {
|
||||
// window.location.href = 'javascript:history.go(-1)'
|
||||
const menu = this.menuList.find(item=>item.id===this.menuActived)
|
||||
console.log(menu.toString());
|
||||
console.log(this.menuActived);
|
||||
|
||||
// this.goBackFlag = false
|
||||
// this.headTitle = menu.name
|
||||
this.menuHandle(menu,false)
|
||||
},
|
||||
menuHandle(item, goBackFlag) {
|
||||
console.log('Before: menuActived', this.menuActived);
|
||||
this.loading = true
|
||||
this.menuActived = item.id
|
||||
console.log("调用了menuHandle()");
|
||||
console.log('After: menuActived', this.menuActived);
|
||||
this.iframeUrl = item.url
|
||||
this.headTitle = item.name
|
||||
this.goBackFlag = goBackFlag
|
||||
|
|
|
|||
|
|
@ -629,7 +629,7 @@
|
|||
goBack() {
|
||||
window.parent.menuHandle(
|
||||
{
|
||||
id: '5',
|
||||
id: '4',
|
||||
url: '/backend/page/combo/list.html',
|
||||
name: '套餐管理',
|
||||
},
|
||||
|
|
|
|||
|
|
@ -189,13 +189,13 @@
|
|||
addSetMeal (st) {
|
||||
if (st === 'add'){
|
||||
window.parent.menuHandle({
|
||||
id: '5',
|
||||
id: '4',
|
||||
url: '/backend/page/combo/add.html',
|
||||
name: '添加套餐'
|
||||
},true)
|
||||
} else {
|
||||
window.parent.menuHandle({
|
||||
id: '5',
|
||||
id: '4',
|
||||
url: '/backend/page/combo/add.html?id='+st,
|
||||
name: '修改套餐'
|
||||
},true)
|
||||
|
|
|
|||
|
|
@ -534,7 +534,7 @@
|
|||
|
||||
goBack(){
|
||||
window.parent.menuHandle({
|
||||
id: '4',
|
||||
id: '3',
|
||||
url: '/backend/page/food/list.html',
|
||||
name: '菜品管理'
|
||||
},false)
|
||||
|
|
|
|||
|
|
@ -184,13 +184,13 @@
|
|||
addFoodtype (st) {
|
||||
if (st === 'add'){
|
||||
window.parent.menuHandle({
|
||||
id: '4',
|
||||
id: '3',
|
||||
url: '/backend/page/food/add.html',
|
||||
name: '添加菜品'
|
||||
},true)
|
||||
} else {
|
||||
window.parent.menuHandle({
|
||||
id: '4',
|
||||
id: '3',
|
||||
url: '/backend/page/food/add.html?id='+st,
|
||||
name: '修改菜品'
|
||||
},true)
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@
|
|||
},
|
||||
goBack(){
|
||||
window.parent.menuHandle({
|
||||
id: '2',
|
||||
id: '6',
|
||||
url: '/backend/page/member/list.html',
|
||||
name: '员工管理'
|
||||
},false)
|
||||
|
|
|
|||
|
|
@ -158,13 +158,13 @@
|
|||
addMemberHandle (st) {
|
||||
if (st === 'add'){
|
||||
window.parent.menuHandle({
|
||||
id: '2',
|
||||
id: '6',
|
||||
url: '/backend/page/member/add.html',
|
||||
name: '添加员工'
|
||||
},true)
|
||||
} else {
|
||||
window.parent.menuHandle({
|
||||
id: '2',
|
||||
id: '6',
|
||||
url: '/backend/page/member/add.html?id='+st,
|
||||
name: '修改员工'
|
||||
},true)
|
||||
|
|
|
|||
|
|
@ -133,6 +133,7 @@
|
|||
}
|
||||
this.menuList = this.generateMenuList();
|
||||
this.menuHandle(this.menuList.find(item => item.id === this.defAct), false); // 手动调用一次 menuHandle
|
||||
console.log("调用了create")
|
||||
this.closeLoading()
|
||||
},
|
||||
beforeDestroy() {
|
||||
|
|
@ -196,13 +197,19 @@
|
|||
goBack() {
|
||||
// window.location.href = 'javascript:history.go(-1)'
|
||||
const menu = this.menuList.find(item=>item.id===this.menuActived)
|
||||
console.log(menu.toString());
|
||||
console.log(this.menuActived);
|
||||
|
||||
// this.goBackFlag = false
|
||||
// this.headTitle = menu.name
|
||||
this.menuHandle(menu,false)
|
||||
},
|
||||
menuHandle(item, goBackFlag) {
|
||||
console.log('Before: menuActived', this.menuActived);
|
||||
this.loading = true
|
||||
this.menuActived = item.id
|
||||
console.log("调用了menuHandle()");
|
||||
console.log('After: menuActived', this.menuActived);
|
||||
this.iframeUrl = item.url
|
||||
this.headTitle = item.name
|
||||
this.goBackFlag = goBackFlag
|
||||
|
|
|
|||
|
|
@ -629,7 +629,7 @@
|
|||
goBack() {
|
||||
window.parent.menuHandle(
|
||||
{
|
||||
id: '5',
|
||||
id: '4',
|
||||
url: '/backend/page/combo/list.html',
|
||||
name: '套餐管理',
|
||||
},
|
||||
|
|
|
|||
|
|
@ -189,13 +189,13 @@
|
|||
addSetMeal (st) {
|
||||
if (st === 'add'){
|
||||
window.parent.menuHandle({
|
||||
id: '5',
|
||||
id: '4',
|
||||
url: '/backend/page/combo/add.html',
|
||||
name: '添加套餐'
|
||||
},true)
|
||||
} else {
|
||||
window.parent.menuHandle({
|
||||
id: '5',
|
||||
id: '4',
|
||||
url: '/backend/page/combo/add.html?id='+st,
|
||||
name: '修改套餐'
|
||||
},true)
|
||||
|
|
|
|||
|
|
@ -534,7 +534,7 @@
|
|||
|
||||
goBack(){
|
||||
window.parent.menuHandle({
|
||||
id: '4',
|
||||
id: '3',
|
||||
url: '/backend/page/food/list.html',
|
||||
name: '菜品管理'
|
||||
},false)
|
||||
|
|
|
|||
|
|
@ -184,13 +184,13 @@
|
|||
addFoodtype (st) {
|
||||
if (st === 'add'){
|
||||
window.parent.menuHandle({
|
||||
id: '4',
|
||||
id: '3',
|
||||
url: '/backend/page/food/add.html',
|
||||
name: '添加菜品'
|
||||
},true)
|
||||
} else {
|
||||
window.parent.menuHandle({
|
||||
id: '4',
|
||||
id: '3',
|
||||
url: '/backend/page/food/add.html?id='+st,
|
||||
name: '修改菜品'
|
||||
},true)
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@
|
|||
},
|
||||
goBack(){
|
||||
window.parent.menuHandle({
|
||||
id: '2',
|
||||
id: '6',
|
||||
url: '/backend/page/member/list.html',
|
||||
name: '员工管理'
|
||||
},false)
|
||||
|
|
|
|||
|
|
@ -158,13 +158,13 @@
|
|||
addMemberHandle (st) {
|
||||
if (st === 'add'){
|
||||
window.parent.menuHandle({
|
||||
id: '2',
|
||||
id: '6',
|
||||
url: '/backend/page/member/add.html',
|
||||
name: '添加员工'
|
||||
},true)
|
||||
} else {
|
||||
window.parent.menuHandle({
|
||||
id: '2',
|
||||
id: '6',
|
||||
url: '/backend/page/member/add.html?id='+st,
|
||||
name: '修改员工'
|
||||
},true)
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue