优化扫码叫号
This commit is contained in:
parent
89b078daae
commit
105ad4ee52
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "vite-electron",
|
"name": "vite-electron",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "1.3.22",
|
"version": "1.3.24",
|
||||||
"main": "dist-electron/main.js",
|
"main": "dist-electron/main.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "chcp 65001 && vite",
|
"dev": "chcp 65001 && vite",
|
||||||
|
|
|
||||||
|
|
@ -281,11 +281,10 @@ async function getBarCode(e) {
|
||||||
} else {
|
} else {
|
||||||
console.log('条码不合法:' + code);
|
console.log('条码不合法:' + code);
|
||||||
try {
|
try {
|
||||||
if (!global.isCallNumber) return
|
if (!global.isCallNumber || !code.length) return
|
||||||
await scanSendMessage({
|
await scanSendMessage({
|
||||||
outNumber: code,
|
outNumber: code,
|
||||||
shopId: store.userInfo.shopId,
|
shopId: store.userInfo.shopId
|
||||||
// shopId: 4
|
|
||||||
})
|
})
|
||||||
ElMessage.success('叫号成功')
|
ElMessage.success('叫号成功')
|
||||||
leftMenuRef.value.updateCallNumber()
|
leftMenuRef.value.updateCallNumber()
|
||||||
|
|
@ -294,7 +293,7 @@ async function getBarCode(e) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log('code', code);
|
// console.log('code', code);
|
||||||
// 键入回车务必清空code值
|
// 键入回车务必清空code值
|
||||||
codeRef.value = ''
|
codeRef.value = ''
|
||||||
return false
|
return false
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,8 @@
|
||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
<div class="content">
|
<div class="content">
|
||||||
<el-input type="textarea" :rows="6" v-model="remark" placeholder="请输入备注"></el-input>
|
<el-input type="textarea" :rows="6" v-model="remark" placeholder="请输入备注" @focus="
|
||||||
|
global.updateData(false)" @blur="global.updateData(true)"></el-input>
|
||||||
</div>
|
</div>
|
||||||
<div class="footer_wrap">
|
<div class="footer_wrap">
|
||||||
<div class="btn">
|
<div class="btn">
|
||||||
|
|
@ -18,6 +19,8 @@
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref } from 'vue'
|
import { ref } from 'vue'
|
||||||
|
import { useGlobal } from '@/store/global.js'
|
||||||
|
const global = useGlobal()
|
||||||
const emit = defineEmits(['success'])
|
const emit = defineEmits(['success'])
|
||||||
|
|
||||||
const dialogVisible = ref(false)
|
const dialogVisible = ref(false)
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,8 @@
|
||||||
<div class="cart_wrap card">
|
<div class="cart_wrap card">
|
||||||
<div class="header">
|
<div class="header">
|
||||||
<div class="left">
|
<div class="left">
|
||||||
<el-input placeholder="搜索订单" v-model="tableData.proName"></el-input>
|
<el-input placeholder="搜索订单" v-model="tableData.proName" @focus="
|
||||||
|
global.updateData(false)" @blur="global.updateData(true)"></el-input>
|
||||||
<el-select v-model="tableData.status" placeholder="订单状态">
|
<el-select v-model="tableData.status" placeholder="订单状态">
|
||||||
<el-option v-for="item in statusList" :key="item.value" :value="item.value"
|
<el-option v-for="item in statusList" :key="item.value" :value="item.value"
|
||||||
:label="item.label"></el-option>
|
:label="item.label"></el-option>
|
||||||
|
|
@ -83,6 +84,9 @@ import refundDialog from './components/refundDialog.vue'
|
||||||
import { useUser } from "@/store/user.js"
|
import { useUser } from "@/store/user.js"
|
||||||
const store = useUser()
|
const store = useUser()
|
||||||
|
|
||||||
|
import { useGlobal } from '@/store/global.js'
|
||||||
|
const global = useGlobal()
|
||||||
|
|
||||||
const scanGroupRef = ref(null)
|
const scanGroupRef = ref(null)
|
||||||
const refundDialogRef = ref(null)
|
const refundDialogRef = ref(null)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -328,8 +328,18 @@ const onSlideChange = _.debounce(async function (e) {
|
||||||
currentGoodsIndex.value = e.activeIndex
|
currentGoodsIndex.value = e.activeIndex
|
||||||
}, 500)
|
}, 500)
|
||||||
|
|
||||||
|
// 订单已结算,清楚商品所有数字
|
||||||
|
function clearDot() {
|
||||||
|
goodsList.value.map(item => {
|
||||||
|
item.map(val => {
|
||||||
|
val.orderCount = 0
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
defineExpose({
|
defineExpose({
|
||||||
updateData
|
updateData,
|
||||||
|
clearDot
|
||||||
})
|
})
|
||||||
|
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
|
|
|
||||||
|
|
@ -368,6 +368,11 @@ async function createCodeAjax(type = "0") {
|
||||||
masterId.value = res.code;
|
masterId.value = res.code;
|
||||||
queryCartAjax();
|
queryCartAjax();
|
||||||
getLocalMemberInfo()
|
getLocalMemberInfo()
|
||||||
|
|
||||||
|
if (type == 1) {
|
||||||
|
// 结算订单 清楚商品所有红点
|
||||||
|
goodsRef.value.clearDot()
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error);
|
console.log(error);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,8 @@
|
||||||
<div class="orderbox_left">
|
<div class="orderbox_left">
|
||||||
<div class="demo_tabs" v-if="props.membershow == '0'">
|
<div class="demo_tabs" v-if="props.membershow == '0'">
|
||||||
<div class="demo_tabs_div">
|
<div class="demo_tabs_div">
|
||||||
<el-input v-model="tableData.phone" placeholder="请输入手机号" @input="inputChange" clearable />
|
<el-input v-model="tableData.phone" placeholder="请输入手机号" @input="inputChange" clearable @focus="
|
||||||
|
global.updateData(false)" @blur="global.updateData(true)" />
|
||||||
<el-button style="margin-left: 10px;" type="primary" @click="memberaddshow = true">添加</el-button>
|
<el-button style="margin-left: 10px;" type="primary" @click="memberaddshow = true">添加</el-button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -101,15 +102,18 @@
|
||||||
@open="membrform = { ...resetMembrform }">
|
@open="membrform = { ...resetMembrform }">
|
||||||
<el-form ref="formRef" :rules="rules" :model="membrform" label-width="70px" hide-required-asterisk>
|
<el-form ref="formRef" :rules="rules" :model="membrform" label-width="70px" hide-required-asterisk>
|
||||||
<el-form-item label="手机号" prop="phone">
|
<el-form-item label="手机号" prop="phone">
|
||||||
<el-input v-model="membrform.phone" />
|
<el-input v-model="membrform.phone" @focus="
|
||||||
|
global.updateData(false)" @blur="global.updateData(true)" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="昵称" prop="nickName">
|
<el-form-item label="昵称" prop="nickName">
|
||||||
<el-input v-model="membrform.nickName" />
|
<el-input v-model="membrform.nickName" @focus="
|
||||||
|
global.updateData(false)" @blur="global.updateData(true)" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="生日" prop="birthDay">
|
<el-form-item label="生日" prop="birthDay">
|
||||||
<el-col :span="11">
|
<el-col :span="11">
|
||||||
<el-date-picker v-model="membrform.birthDay" type="date" placeholder="请选择生日"
|
<el-date-picker v-model="membrform.birthDay" type="date" placeholder="请选择生日" style="width: 100%"
|
||||||
style="width: 100%" />
|
@focus="
|
||||||
|
global.updateData(false)" @blur="global.updateData(true)" />
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="性别" prop="sex">
|
<el-form-item label="性别" prop="sex">
|
||||||
|
|
@ -176,6 +180,9 @@ import { useRouter } from 'vue-router'
|
||||||
import useStorage from '@/utils/useStorage'
|
import useStorage from '@/utils/useStorage'
|
||||||
import userCharge from './components/userCharge.vue'
|
import userCharge from './components/userCharge.vue'
|
||||||
|
|
||||||
|
import { useGlobal } from '@/store/global.js'
|
||||||
|
const global = useGlobal()
|
||||||
|
|
||||||
const userChargeRef = ref(null)
|
const userChargeRef = ref(null)
|
||||||
|
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue