Przeglądaj źródła

盲收提示优化

zhaohuanhuan 1 rok temu
rodzic
commit
33b3c9255a

+ 1 - 1
src/views/inbound/blindCollection/components/BarcodeCount.vue

@@ -34,7 +34,7 @@ const show = async (code) => {
   const  beforeClose=  (action) =>
     new Promise(async (resolve) => {
       if (action === 'confirm') {
-        if (count.value == '') {
+        if (count.value === '') {
           showToast('请输入数量')
           return resolve(false)
         }

+ 31 - 7
src/views/inbound/blindCollection/task/index.vue

@@ -6,6 +6,7 @@
       fixed
       placeholder
       @click-left="onClickLeft"
+      z-index="100"
     >
       <template #left>
         <van-icon name="arrow-left" size="25" />
@@ -424,8 +425,8 @@ const setBarcodeCount=(count)=>{
 // 重新清点数据
 const resetDataRef=ref(null)
 const _resetData=()=>{
-  if(newOneData.value.qty===0){
-    showToast('暂无数据,不支持重新清点!!!')
+  if(newOneData.value.barcode===''){
+    showToast('暂无数据,不支持重新清点!!')
   }else {
     resetDataRef.value?.show()
   }
@@ -493,11 +494,24 @@ const resetNewBin = () => {
     });
 };
 const onClickLeft = () => {
-  history.back()
+  if(newOneData.value.barcode!==''){
+    showConfirmDialog({
+      title: '温馨提示',
+      message:
+        '是否提交盲收任务?',
+    })
+      .then(() => {
+        _submitBoxCacheData()
+      }).catch(() => {
+      history.back()
+    })
+  }else {
+    history.back()
+  }
 }
 const onClickRight = () => {
-  if(newOneData.value.qty===0){
-    showToast('暂无数据,不支持提交任务!!!')
+  if(newOneData.value.barcode===''){
+    showToast('暂无数据,不支持提交任务!!')
     return
   }
   const {code,ownerCode}=taskInfo.value
@@ -505,16 +519,26 @@ const onClickRight = () => {
     showToast({duration:5000,message:'当前还有缓存数据未进行装箱,请先装箱!'})
     return
   }
+  showConfirmDialog({
+    title: '温馨提示',
+    message:
+      '您正在进行盲收任务提交,是否继续?',
+    })
+    .then(() => {
+      _submitBoxCacheData()
+    })
+}
+const _submitBoxCacheData=()=>{
+  const {code,ownerCode}=taskInfo.value
   const data={code,ownerCode}
   submitBoxCacheData(data).then(res=>{
     scanSuccess()
     showToast('数据提交成功,将进入盲收首页')
     localStorage.removeItem(`task_${taskInfo.value.code}`);
-    onClickLeft()
+    history.back()
   }).catch(() => {
     scanError()
   })
-
 }
 </script>
 <style scoped lang="sass">