czg_team
/
management
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

排队bug修改

This commit is contained in:
duan 2024-09-23 14:03:56 +08:00
parent 899fd4b93d
commit 5db9cc69a3
3 changed files with 124 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/api/shop.js
View File

@ -573,6 +573,17 @@ export function tbPlussShopStaff(data) {
});
}
export function tbShopPermissionlist(params) {
return request({
url: `/api/tbShopPermission/list`,
method: "get",
params
});
}
/**
* 通过id获取员工信息
* @returns
@ -603,6 +614,13 @@ export function callRecord(params) {
params
});
}
export function callTablecall(data) {
return request({
url: `/callTable/call`,
method: 'post',
data
});
}
// 删除桌型
export function callTabledelete(data) {
return request({

18
src/views/lineUp/index.vue
View File

@ -19,7 +19,7 @@
</li>
</ul>
<div class="buttonstyle">
<el-button type="primary" @click="dialogVisibles = true">取号</el-button>
<el-button type="primary" @click="dialogVisibles = true; phone = ''">取号</el-button>
<el-button plain type="primary" @click="toUrl">叫号记录</el-button>
</div>
</div>
@ -84,7 +84,7 @@
</template>
<script>
import { callTable, callTablequeue, callTableput, callTabletakeNumber } from '@/api/shop'
import { callTable, callTablequeue, callTableput, callTabletakeNumber ,callTablecall} from '@/api/shop'
export default {
data() {
return {
@ -131,9 +131,15 @@ export default {
}
},
profilepicture(d) {
this.dialogVisible = true
this.profilepictureInfo = d
async profilepicture(d) {
let res = await callTablecall({
shopId: localStorage.getItem('shopId'),
callQueueId: d.id
})
if (res) {
this.dialogVisible = true
this.profilepictureInfo = d
}
},
gettypeevent(d) {
this.selecttopType = d
@ -155,7 +161,7 @@ export default {
} else if (value == 2) {
const res = await callTableput({
shopId: localStorage.getItem('shopId'),
state: 1,
state: 2,
callQueueId: this.profilepictureInfo.id
})
if (res) {

142
src/views/shop/components/addStaff.vue
View File

@ -1,49 +1,79 @@
<template>
<el-dialog :title="title" :visible.sync="dialogVisible" @open="reset">
<el-dialog :title="title" top="80px" :visible.sync="dialogVisible" @open="reset">
<h3 style="color: #3F9EFF;">
基本信息设置
</h3>
<el-form ref="form" :model="form" :rules="rules" label-width="140px" label-position="left">
<el-form-item label="员工姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入员工姓名" />
</el-form-item>
<el-form-item label="员工编号" prop="code">
<el-input v-model="form.code" placeholder="请输入员工编号" />
</el-form-item>
<el-form-item label="手机号" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号" />
</el-form-item>
<el-form-item label="员工账号" prop="account">
<el-input v-model="form.account" placeholder="请输入员工账号，建议使用手机号" />
</el-form-item>
<el-form-item label="登录密码">
<el-input type="password" v-model="form.password" placeholder="请输入登录密码，不填默认123456" />
</el-form-item>
<el-form-item label="优惠类型">
<el-radio-group v-model="form.discountType" @change="form.maxDiscountAmount = 0">
<el-radio-button label="1">折扣</el-radio-button>
<el-radio-button label="0">金额</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="最大优惠金额" v-if="form.discountType == 0">
<el-input-number v-model="form.maxDiscountAmount" controls-position="right" :min="0" :max="100000"
:step="0.1" style="width: 200px;"></el-input-number>
</el-form-item>
<el-form-item label="最低优惠折扣" v-if="form.discountType == 1">
<el-input-number v-model="form.maxDiscountAmount" controls-position="right" :min="0" :max="0.99"
:step="0.1" style="width: 200px;"></el-input-number>
</el-form-item>
<el-form-item label="角色" prop="roleId">
<el-select v-model="form.roleId" placeholder="请选择角色">
<el-option :label="item.name" :value="item.id" v-for="item in roles" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="允许登录PC桌面端">
<el-switch v-model="form.isPc" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
<el-form-item label="允许登录管理端">
<el-switch v-model="form.isManage" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
<el-form-item label="是否启用">
<el-switch v-model="form.status" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
<el-row>
<el-col :span="10">
<el-form-item label="员工姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入员工姓名" />
</el-form-item>
</el-col>
<el-col :span="4">&nbsp;</el-col>
<el-col :span="10">
<el-form-item label="员工编号" prop="code">
<el-input v-model="form.code" placeholder="请输入员工编号" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="手机号" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号" />
</el-form-item>
</el-col>
<el-col :span="4">&nbsp;</el-col>
<el-col :span="10"> <el-form-item label="员工账号" prop="account">
<el-input v-model="form.account" placeholder="请输入员工账号，建议使用手机号" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10"> <el-form-item label="登录密码">
<el-input type="password" v-model="form.password" placeholder="请输入登录密码，不填默认123456" />
</el-form-item>
</el-col>
<el-col :span="4">&nbsp;</el-col>
<el-col :span="10">
<el-form-item label="优惠类型">
<el-radio-group v-model="form.discountType" @change="form.maxDiscountAmount = 0">
<el-radio-button label="1">折扣</el-radio-button>
<el-radio-button label="0">金额</el-radio-button>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="最大优惠金额" v-if="form.discountType == 0">
<el-input-number v-model="form.maxDiscountAmount" controls-position="right" :min="0"
:max="100000" :step="0.1" style="width: 200px;"></el-input-number>
</el-form-item>
<el-form-item label="最低优惠折扣" v-if="form.discountType == 1">
<el-input-number v-model="form.maxDiscountAmount" controls-position="right" :min="0" :max="0.99"
:step="0.1" style="width: 200px;"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="4">&nbsp;</el-col>
<el-col :span="10">
<el-form-item label="角色" prop="roleId">
<el-select v-model="form.roleId" placeholder="请选择角色">
<el-option :label="item.name" :value="item.id" v-for="item in roles"
:key="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<h3 style="color: #3F9EFF;">
员工权限设置
</h3>
<div v-for="item in form.permissions" :key="item.id">
<h4>{{ item.label }}</h4>
<el-checkbox v-for="ele in item.children" :true-label="1" :false-label="0" v-model="ele.hasPermission"
:key="ele.id" :label="ele.label"></el-checkbox>
</div>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
@ -53,7 +83,7 @@
</template>
<script>
import { tbPlussShopStaff, rolesGet, tbPlussShopStaffDetail } from '@/api/shop.js'
import { tbPlussShopStaff, rolesGet, tbPlussShopStaffDetail, tbShopPermissionlist } from '@/api/shop.js'
export default {
data() {
return {
@ -71,7 +101,8 @@ export default {
isManage: 1,
roleId: '',
phone: '',
password: ''
password: '',
checkList: ['选中且禁用', '复选框 A']
},
resetForm: '',
rules: {
@ -126,6 +157,7 @@ export default {
return this.form.id ? '编辑员工' : '添加员工'
}
},
mounted() {
this.resetForm = { ...this.form }
this.rolesGet()
@ -137,6 +169,9 @@ export default {
if (valid) {
try {
this.loading = true
if (this.form.id) {
this.form.staff_id = this.form.id
}
await tbPlussShopStaff(this.form)
this.loading = false
this.$emit('success')
@ -174,9 +209,15 @@ export default {
// this.form = { ...row }
this.tbPlussShopStaffDetail(row.id)
} else {
this.reset()
// this.reset()
this.getList()
}
},
// 获取员工信息
async getList() {
const res = await tbShopPermissionlist()
this.$set(this.form,'permissions',res)
},
// 通过id获取员工信息
async tbPlussShopStaffDetail(id) {
try {
@ -188,4 +229,9 @@ export default {
}
}
}
</script>
</script>
<style>
el-dialog {
padding-top: 6vh !important;
}
</style>