diff --git a/http/yskApi/http.js b/http/yskApi/http.js index 18047f6..3fbf409 100644 --- a/http/yskApi/http.js +++ b/http/yskApi/http.js @@ -99,7 +99,8 @@ function commonsProcess(showLoading, httpReqCallback) { // if(bodyData.code == 500){ // 密码已过期， 直接跳转到更改密码页面 // uni.redirectTo({url: '/pages/login/index'}) // } - return Promise.reject(bodyData) + return bodyData + // return Promise.reject(bodyData) } // 加密数据 diff --git a/http/yskApi/requestAll.js b/http/yskApi/requestAll.js index 6e39d31..0698f91 100644 --- a/http/yskApi/requestAll.js +++ b/http/yskApi/requestAll.js @@ -18,6 +18,21 @@ export function dateProduct(params) { params }) } +// 是否开启 +export function updateStatus(data) { + return request({ + url: `/api/tbPlussShopStaff/updateStatus`, + method: "put", + data + }); +} +// 编辑 +export function tbPlussShopStaffDetail(id) { + return request({ + url: `/api/tbPlussShopStaff/${id}`, + method: "get" + }); +} // 桌型列表 export function callTable(params) { return request({ @@ -66,4 +81,41 @@ export function callTablecall(data) { method: 'post', data }); +} +// 获取员工列表 +export function rolesGet() { + return request({ + url: `/api/tbPlussShopStaff`, + method: "get" + }); +} +// 删除员工 +export function shopStaffDelete(data) { + return request({ + url: `/api/tbPlussShopStaff`, + method: "delete", + data + }); +} +// 新增员工获取权限 +export function tbShopPermissionList() { + return request({ + url: `/api/tbShopPermission/list`, + method: "get" + }); +} + +// 获取角色权限 +export function getroles() { + return request({ + url: `/api/roles`, + method: "get" + }); +} +export function tbPlussShopStaff(data) { + return request({ + url: `/api/tbPlussShopStaff`, + method: data.id ? "put" : "post", + data + }); } \ No newline at end of file diff --git a/pageDevice/staffManage/staffManage.vue b/pageDevice/staffManage/staffManage.vue index fea1dec..abaa125 100644 --- a/pageDevice/staffManage/staffManage.vue +++ b/pageDevice/staffManage/staffManage.vue @@ -15,7 +15,8 @@ - + @@ -23,87 +24,104 @@ + \ No newline at end of file diff --git a/pageLineUp/callRecord.vue b/pageLineUp/callRecord.vue index 9a7b52a..63dc228 100644 --- a/pageLineUp/callRecord.vue +++ b/pageLineUp/callRecord.vue @@ -70,7 +70,6 @@ page: 1, size: 9999 }).then((res) => { - console.log(res, '调试1') datas.list = res.records }) } diff --git a/pageLineUp/index.vue b/pageLineUp/index.vue index 60e6d5a..0d6b917 100644 --- a/pageLineUp/index.vue +++ b/pageLineUp/index.vue @@ -46,7 +46,20 @@ + @confirm="dialogConfirm(1)" @close="dialogConfirm(2)"> + + + 正在叫号请稍后 + + + 已发送至用户 + + + 用户未订阅消息 + + + @@ -129,7 +142,10 @@ // 顶部全部\大桌选择 selecttopType: '', // 选中拨号的id - dialId: "" + dialId: "", + // 拨号是否订阅 + profilepicturedata: "" + }) onMounted(() => { getList() @@ -215,17 +231,7 @@ datas.showtowData = res datas.phone = '' getList() - // 取号成功 - // getrefs.ctx.$refs.uToastRef.show({ - // type: 'default', - // title: '默认主题', - // message: "取号成功", - // iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/default.png', - // complete() { - // datas.phone = '' - // getList() - // } - // }); + } }) @@ -240,8 +246,8 @@ callTablecall({ shopId: uni.getStorageSync('shopId'), callQueueId: item.id - }).then(() => { - // datas.msgType = type + }).then((res) => { + datas.profilepicturedata = res getrefs.ctx.$refs.alertDialog.open() }) diff --git a/pageStaff/addstaff.vue b/pageStaff/addstaff.vue new file mode 100644 index 0000000..fb412b5 --- /dev/null +++ b/pageStaff/addstaff.vue @@ -0,0 +1,261 @@ + + + + + \ No newline at end of file diff --git a/pageStaff/index.vue b/pageStaff/index.vue new file mode 100644 index 0000000..b8e8201 --- /dev/null +++ b/pageStaff/index.vue @@ -0,0 +1,166 @@ + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index a901fac..54eefce 100644 --- a/pages.json +++ b/pages.json @@ -1204,22 +1204,20 @@ { "root": "pagesOrder", "pages": [{ - "pageId": "PAGES_ORDER_INDEX", - "path" : "index/index", - "style" : + "pageId": "PAGES_ORDER_INDEX", + "path": "index/index", + "style": { + "navigationBarTitleText": "订单管理" + } + }, { - "navigationBarTitleText" : "订单管理" + "pageId": "PAGES_ORDER_DETAIL", + "path": "detail/detail", + "style": { + "navigationBarTitleText": "订单详情" + } } - }, - { - "pageId": "PAGES_ORDER_DETAIL", - "path" : "detail/detail", - "style" : - { - "navigationBarTitleText" : "订单详情" - } - } - + ] }, { @@ -1264,16 +1262,30 @@ "style": { "navigationBarTitleText": "排队" } - },{ + }, { "pageId": "PAGES_CALLRE_CORD", "path": "callRecord", "style": { "navigationBarTitleText": "叫号记录" } - } - ] + }] + }, + { + "root": "pageStaff", + "pages": [{ + "pageId": "PAGES_STAFF", + "path": "index", + "style": { + "navigationBarTitleText": "员工管理" + } + }, { + "pageId": "PAGES_ADD_STAFF", + "path": "addstaff", + "style": { + "navigationBarTitleText": "新增员工" + } + }] }, - { "root": "pageConsumables", "pages": [{ diff --git a/pages/index/index.vue b/pages/index/index.vue index dc078f9..354c9f2 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -66,6 +66,10 @@ title: '用户管理', icon: '/static/indexImg/icon-user.svg', pageUrl: 'PAGES_USER_CONTROL', + },{ + title: '员工管理', + icon: '/static/indexImg/icon-staff.svg', + pageUrl: 'PAGES_STAFF' }, { title: '桌台',