优化返回

src/utils/keydownListener.js

@@ -7,11 +7,11 @@ export function scanInit(callback) {
   enterCallback = callback
 }
 export function openListener() {
-  console.info('已开启键盘输入监听拦截')
+  // console.info('已开启键盘输入监听拦截')
   window.addEventListener('keydown', handler);
 }
 export function closeListener() {
-  console.info('已关闭键盘输入监听拦截')
+  // console.info('已关闭键盘输入监听拦截')
   window.removeEventListener('keydown', handler)
   if (typingTimer) {
     clearTimeout(typingTimer); // 清除防抖定时器

src/views/outbound/components/ContainerNoInput.vue

@@ -86,6 +86,7 @@ const show = async (code,type) => {
        font-size: 22px
        font-weight: bold
        border-bottom: 2px solid #0077ff
+       margin-top: 10px
      .completion
        text-align: right
        font-size: 12px

src/views/outbound/components/InputBarcode.vue

@@ -56,6 +56,7 @@ const show = async (code,type) => {
        font-size: 22px
        font-weight: bold
        border-bottom: 2px solid #0077ff
+       margin-top: 10px
      .completion
        text-align: right
        font-size: 12px

src/views/outbound/picking/list/index.vue

@@ -2,12 +2,14 @@
   <div class="container">
     <van-nav-bar
       title="拣货任务"
-      left-text="返回"
       left-arrow
       fixed
       placeholder
-      @click-left="back"
     >
+      <template #left>
+        <van-icon name="arrow-left" size="25"   @click="back" />
+        <div style="color: #fff" @click="back">返回</div>
+      </template>
       <template #right>
         <div style="color: #fff" @click="onSelectMode({key:'picking'})">开始作业</div>
         <van-icon name="list-switch" size="25"   @click="onClickRight" />
@@ -486,7 +488,7 @@ const pickingNoInputRef=ref(null)
 const inputBarcodeRef=ref(null)
 const onSelectMode=(value) => {
   if(value.key=='task'){
-    router.push('/picking-task')
+    router.push({name:'PickingTask',query:{type:'picking'}})
   }else if(value.key=='picking'){
     pickingNoInputRef.value?.show()
   }else if(value.key=='inputBarcode'){

src/views/outbound/picking/task/index.vue

@@ -2,12 +2,14 @@
   <div class="container">
     <van-nav-bar
       title="任务获取"
-      left-text="返回"
       left-arrow
       fixed
       placeholder
-      @click-left="back"
       >
+      <template #left>
+        <van-icon name="arrow-left" size="25"   @click="back" />
+        <div style="color: #fff" @click="onClickLeft">返回</div>
+      </template>
       <template #right>
         <div style="color: #fff" @click="onClickRight">开始作业</div>
         <van-icon name="list-switch" size="25"   @click="onClickRightIcon" />
@@ -136,7 +138,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { getTaskList } from '@/views/outbound/picking/task/hooks/task'
 import { computed, nextTick, ref } from 'vue'
 import { showDialog, showToast } from 'vant'
@@ -365,7 +367,7 @@ const createPicking = () => {
     carriers = [...new Set(checkedResult.value.map(item => item.carrier))];
   } else {
     orderNoList=model.value.matchedOrderNoList
-    carriers = subModel.value.carrier
+    carriers = subModel.value.carrierf
       ? splitStringIfExists(subModel.value.carrier)
       : splitStringIfExists(model.value.carrier);
   }
@@ -377,7 +379,7 @@ const createPicking = () => {
     uid: subModel.value.uid || undefined,
     orderNoList,
     count: counts,
-    uidMap:Object.keys(uidMap).length !== 0?uidMap:undefined,
+    // uidMap:Object.keys(uidMap).length !== 0?uidMap:undefined,
   }
   showLoading()
   createPickingTask(params).then(data => {
@@ -392,6 +394,16 @@ const pickingNoInputRef=ref(null)
 const onClickRight = () => {
   pickingNoInputRef.value?.show()
 };
+const route = useRoute()
+const onClickLeft = () => {
+  console.log(route.query.type,"route.query.code=")
+  if(route.query.type=='picking'){
+    history.back();
+  }else {
+    back()
+  }
+};
+
 //查看更多承运人
 const onMore= async (row)=>{
   const carrierArray = row.carrier.split(',').map(code => store.carrierMap[code] || code)