|
|
@@ -2,11 +2,14 @@
|
|
|
<template>
|
|
|
<div class="box-return">
|
|
|
<van-nav-bar
|
|
|
- title="海康-入库/解绑" left-arrow fixed placeholder @click-left="goBack">
|
|
|
+ title="海康-入库/解绑" left-arrow fixed placeholder @click-left="goBack" @click-right="onConfirm()">
|
|
|
<template #left>
|
|
|
<van-icon name="arrow-left" size="25" />
|
|
|
<div style="color: #fff">返回</div>
|
|
|
</template>
|
|
|
+ <template #right>
|
|
|
+ <div style="color: #fff">确认</div>
|
|
|
+ </template>
|
|
|
</van-nav-bar>
|
|
|
<div class="box-return-content">
|
|
|
<div class="content-tips">
|
|
|
@@ -53,7 +56,7 @@ import { onMounted, onUnmounted, ref } from 'vue'
|
|
|
import { getHeader, goBack, scanError, scanSuccess } from '@/utils/android'
|
|
|
import { closeListener, openListener, scanInit } from '@/utils/keydownListener'
|
|
|
import { barcodeToUpperCase } from '@/utils/dataType'
|
|
|
-import { showNotify } from 'vant'
|
|
|
+import { showConfirmDialog, showNotify } from 'vant'
|
|
|
import { boxAndStationUnbindTask, createHikBoxInboundTask } from '@/api/haikang'
|
|
|
import { useStore } from '@/store/modules/user'
|
|
|
import { closeLoading, showLoading } from '@/utils/loading'
|
|
|
@@ -81,26 +84,43 @@ const _handlerScan = (code) => {
|
|
|
scanType.value=2
|
|
|
tips.value='请扫描工作站台'
|
|
|
}else {
|
|
|
+ scanBox.value=''
|
|
|
tips.value='请扫描海康料箱'
|
|
|
showNotify({ type: 'danger', duration: 3000, message:'请扫描海康料箱' })
|
|
|
}
|
|
|
}else if(scanType.value == 2){
|
|
|
- if(!scanBox.value){
|
|
|
- tips.value='请先扫描料箱编号'
|
|
|
- scanType.value=1
|
|
|
- showNotify({ type: 'danger', duration: 3000, message:'请先扫描料箱编号' })
|
|
|
- return
|
|
|
- }
|
|
|
if(code){
|
|
|
scanStation.value = barcodeToUpperCase(code)
|
|
|
- if(active.value==1){
|
|
|
- _createHikBoxInboundTask()
|
|
|
- }else {
|
|
|
- _boxAndStationUnbindTask()
|
|
|
- }
|
|
|
+ onConfirm()
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+const onConfirm=()=>{
|
|
|
+ if(!scanBox.value){
|
|
|
+ tips.value='请先扫描料箱编号'
|
|
|
+ scanType.value=1
|
|
|
+ showNotify({ type: 'danger', duration: 3000, message:'请先扫描料箱编号' })
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if(!scanStation.value){
|
|
|
+ tips.value='请先扫描站点'
|
|
|
+ scanType.value=2
|
|
|
+ showNotify({ type: 'danger', duration: 3000, message:'请先扫描站点' })
|
|
|
+ return
|
|
|
+ }
|
|
|
+ const message=active.value==1?'您正在进行入库操作是否继续':'您正在进行解绑操作是否继续'
|
|
|
+ showConfirmDialog({
|
|
|
+ title: '温馨提示',
|
|
|
+ message,
|
|
|
+ keyboardEnabled:false
|
|
|
+ }).then(() => {
|
|
|
+ if(active.value==1){
|
|
|
+ _createHikBoxInboundTask()
|
|
|
+ }else {
|
|
|
+ _boxAndStationUnbindTask()
|
|
|
+ }
|
|
|
+ }).catch(() => {})
|
|
|
+}
|
|
|
const _createHikBoxInboundTask=()=>{
|
|
|
const data={
|
|
|
warehouse,
|