当前库位拣完，自动跳转下一个库位,操作页面返回默认进入获取任务页面、任务获取页面-开始作业自动获取最新拣货任务号填充

src/views/outbound/picking/components/ContainerNoInput.vue

@@ -16,7 +16,7 @@
           <div class="container-item-no">{{item}}</div>
         </div>
       </div>
-      <div class="completion" @click="completion(1)">手动补全</div>
+<!--      <div class="completion" @click="completion(1)">手动补全</div>-->
     </van-dialog>
   </div>
 </template>

src/views/outbound/picking/components/PickingNoInput.vue

@@ -21,9 +21,13 @@
   const pickingNoTrueFalseBy=ref(false)
   const pickingNoRef=ref(null)
   const pickingCode=ref('');
-  const show = () => {
+  const show = (code) => {
     pickingNoTrueFalseBy.value = true
-    pickingCode.value=''
+    if(code){
+      pickingCode.value=code
+    }else {
+      pickingCode.value=''
+    }
     setTimeout(()=>{
       pickingNoRef.value.focus()
     },300)

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

@@ -5,15 +5,17 @@
       left-arrow
       fixed
       placeholder
-      @click-left="goBack"
+      @click-left="onClickLeft"
     >
       <template #left>
         <van-icon name="arrow-left" size="25"  />
         <div style="color: #fff" >返回</div>
       </template>
       <template #right>
-        <div style="color: #fff" @click="onSelectMode({key:'picking'})">开始作业</div>
-        <van-icon name="list-switch" size="25"   @click="onClickRight" />
+        <div style="color: #fff;line-height: 46px "  @click="onSelectMode({key:'picking'})">开始作业</div>
+        <div style="padding:14px 0 12px 2px" @click="onClickRight" >
+          <van-icon name="list-switch" size="25"   />
+        </div>
       </template>
     </van-nav-bar>
 <!--    <van-pull-refresh v-model="loading" @refresh="onRefresh" style="min-height: 93.1vh;">-->
@@ -42,7 +44,7 @@
                  v-for="(location,index) in locationList"
                  :key="index"
                  @click="onLocation(index)">
-              <span>{{ location.location }}</span><span class="recommend" v-if="nextLocation==location.location && allPicking(location)!=='allActive'" >推荐</span>
+              <span>{{ location.location }}</span>
             </div>
           </div>
         </van-col>
@@ -544,11 +546,12 @@ const _setPickingDetail=(params,type)=>{
       nextLocation.value=''
       if(activeIndex.value<locationList.value.length-1){
         nextLocation.value=locationList.value[activeIndex.value+1].location
-        showNotify({
-          message: `当前库位商品已全部拣完，请扫描下一个库位${locationList.value[activeIndex.value+1].location}`,
-          duration: 5000,
-          type:'warning'
-        });
+        activeIndex.value+=1
+        // showNotify({
+        //   message: `当前库位商品已全部拣完，请扫描下一个库位${locationList.value[activeIndex.value+1].location}`,
+        //   duration: 5000,
+        //   type:'warning'
+        // });
       }
       if(type==2){
         const numberExist = list.every(({ expectedQuantity, quantity }) => expectedQuantity == quantity && quantity!=0); // 检查数量是否匹配
@@ -634,6 +637,9 @@ const actions = [
   // { name: '任务号作业' ,key:'picking'},
   { name: '检索条码' ,key:'inputBarcode'},
 ];
+const onClickLeft = () => {
+  router.push({name:'PickingTask'})
+};
 const onClickRight = () => {
   modeTrueFalseBy.value=true
 }

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

@@ -11,8 +11,10 @@
         <div style="color: #fff;height: 46px;padding-right:20px;line-height: 46px" @click="onClickLeft">返回</div>
       </template>
       <template #right>
-        <div style="color: #fff" @click="onClickRight">开始作业</div>
-        <van-icon name="list-switch" size="25"   @click="onClickRightIcon" />
+        <div style="color: #fff;line-height: 46px " @click="onClickRight">开始作业</div>
+        <div style="padding:14px 0 12px 2px" @click="onClickRightIcon" >
+          <van-icon name="list-switch" size="25"   />
+        </div>
       </template>
     </van-nav-bar>
     <van-pull-refresh v-model="loading" @refresh="onRefresh" style="min-height: 93.1vh;">
@@ -172,6 +174,7 @@ const BigPicking = defineAsyncComponent(() => import('@/views/outbound/picking/c
 const SelectOwner = defineAsyncComponent(() => import('@/views/outbound/picking/components/SelectOwner.vue'))
 import { closeLoading, showLoading } from '@/utils/loading'
 import { getTimeHours } from '@/utils/date'
+import { fetchPickingData } from '@/views/outbound/picking/list/hooks/list'
 const router = useRouter()
 const store = basicStore()
 const storeUser = useStore()
@@ -444,16 +447,20 @@ const createPicking = () => {
   })
 };
 const pickingNoInputRef=ref(null)
-const onClickRight = () => {
-  pickingNoInputRef.value?.show()
+const onClickRight = async () => {
+  showLoading()
+  const { pickingCode } = await fetchPickingData(warehouse)
+  closeLoading()
+  if(pickingCode!=null){
+    pickingNoInputRef.value?.show(pickingCode)
+  }else {
+    pickingNoInputRef.value?.show()
+  }
+
 };
 const route = useRoute()
 const onClickLeft = () => {
-  if(route.query.type=='picking'){
-    history.back();
-  }else {
-    goBack()
-  }
+  goBack()
 };
 
 //查看更多承运人