手持-活动单复核优化

src/utils/request.ts

@@ -1,7 +1,7 @@
 // src/utils/resquest.ts
 import axios from 'axios'
 import { useStore } from '../store/modules/user'
-import { showDialog, showFailToast, showNotify, showToast } from 'vant'
+import { showDialog, showNotify, showToast } from 'vant'
 // @ts-ignore
 import router from '@/router'
 const store = useStore()
@@ -67,9 +67,9 @@ service.interceptors.response.use(
   (error:any) => {
     if (error.code === 'ECONNABORTED') {
       // 请求超时处理
-      showFailToast({ duration: 5000, message: '请求超时，请稍后重试！', wordBreak: 'break-word' });
+      showNotify({duration:5000,message:'请求超时，请稍后重试！'})
     }else if(error.code === 'ERR_NETWORK'){
-      showFailToast({duration:5000,message:'网络开小车了, 请稍后重试！',wordBreak:'break-word'})
+      showNotify({duration:5000,message:'网络开小车了, 请稍后重试！'})
     } else {
       showNotify({
         message: error.message,

src/views/outbound/check/activity/index.vue

@@ -46,8 +46,8 @@
             <div  style="text-decoration: underline;color: #0077ff">设置打印机<van-icon name="edit" color="#0077ff"/> </div>
           </div>
           <div class="picking-order-count ">
-            <div>待复核单：
-              <span style="color: #333;font-weight: bold;font-size: 18px" v-if="orderMap.dataGroup">{{Object.keys(orderMap.dataGroup).length ||0}}</span>
+            <div>已复核数/总复核数：
+              <span style="color: #333;font-weight: bold;font-size: 18px" v-if="orderMap.dataGroup">{{ successNumber }}/{{Object.keys(orderMap.dataGroup).length ||0}}</span>
               <span v-else>0</span>
             </div>
             <div>取消单：
@@ -308,7 +308,7 @@ const endCheck=()=>{
     return
   }
   const lastNumber=Object.keys(orderMap.value.dataGroup).length
-  if (!totalWeight.value && lastNumber>0) {
+  if (totalWeight.value<=0 && lastNumber>0) {
     tips.value = '请输入重量';
     scanError()
     showNotify({ type: 'warning', duration: 3000, message: '请输入重量' });
@@ -378,7 +378,7 @@ const packingRequests = async (startIndex = 0, lastNumber) => {
     errorNumber.value+=1
     tips.value=error.message
     if(startIndex>0){
-      reversePickingRef.value.show(successNumber.value,errorNumber.value,orderMap.value.cancelGroup,orderMap.value.freezeGroup)
+      reversePickingRef.value.show(successNumber.value,orderMap.value.cancelGroup.length-successNumber.value,orderMap.value.cancelGroup,orderMap.value.freezeGroup)
     }
     scanError()
   } finally {
@@ -436,6 +436,7 @@ const setBarcode = (code) => {
       matchBarcodeList.value=[]
       scanBarcode.value=''
       totalWeight.value=''
+      successNumber.value=0
     }
   }).catch(err => {
     scanError()

src/views/outbound/check/components/ReversePicking.vue

@@ -49,7 +49,7 @@ const beforeClose = (action) =>
         _reversePicking()
         resolve(true)
         return
-      }else if(freezeCount.value>0 || cancelCount.value>0){
+      }else if(freezeCount.value>0 || cancelCount.value>0 || errorCount.value>0 ) {
         emit('loadData')
         resolve(true)
         return