Browse Source

项目初始化

zhaohuanhuan 1 year ago
parent
commit
90cb9f4ea7

+ 52 - 8
src/views/outbound/components/ContainerNoInput.vue

@@ -10,9 +10,13 @@
                  @keydown.enter="onKeydown"
                  @keydown.enter="onKeydown"
                  clearable
                  clearable
                  placeholder="请扫描拣货容器号" />
                  placeholder="请扫描拣货容器号" />
-
-        <div @click="completion">手动补全</div>
-
+      <div class="container-list">
+        <div v-for="item in containerList" class="container-item" @click="completion(item)">
+          <div class="container-item-line" ></div>
+          <div class="container-item-no">{{item}}</div>
+        </div>
+      </div>
+      <div class="completion" @click="completion(1)">手动补全</div>
     </van-dialog>
     </van-dialog>
   </div>
   </div>
 </template>
 </template>
@@ -26,9 +30,9 @@ import { showToast } from 'vant'
   const containerCodeRef=ref(null)
   const containerCodeRef=ref(null)
   const containerCode=ref('');
   const containerCode=ref('');
   const scanType=ref(2)
   const scanType=ref(2)
-  const selectTask=ref([])
+  const containerList=ref([])
   const show = async (code,type,selectTask) => {
   const show = async (code,type,selectTask) => {
-    selectTask.value=selectTask
+    containerList.value = [...new Set(selectTask.flatMap(item => [item.container]))]
     containerNoTrueFalseBy.value = true
     containerNoTrueFalseBy.value = true
     containerCode.value=code
     containerCode.value=code
     scanType.value=type
     scanType.value=type
@@ -58,12 +62,16 @@ import { showToast } from 'vant'
         containerCodeRef.value.blur()
         containerCodeRef.value.blur()
       },300)
       },300)
     }
     }
-    const completion=()=>{
-      containerCode.value=`JH-${warehouse}-`
+    const completion=(item)=>{
+      if(item==1){
+        containerCode.value=`JH-${warehouse}-`
+      }else {
+        containerCode.value=item
+      }
       setTimeout(()=>{
       setTimeout(()=>{
         containerCodeRef.value?.focus()
         containerCodeRef.value?.focus()
       },200)
       },200)
-      console.log(selectTask.value,"selectTask")
+
     }
     }
     defineExpose({show})
     defineExpose({show})
 </script>
 </script>
@@ -73,4 +81,40 @@ import { showToast } from 'vant'
        font-size: 22px
        font-size: 22px
        font-weight: bold
        font-weight: bold
        border-bottom: 2px solid #0077ff
        border-bottom: 2px solid #0077ff
+     .completion
+       text-align: left
+       font-size: 12px
+       padding: 0 0 5px 10px
+       cursor: pointer
+       text-decoration: underline
+     .container-list
+       max-height: 100px
+       font-size: 12px
+       display: flex
+       padding: 5px 10px
+       justify-content: space-between
+       flex-wrap: wrap
+       overflow: auto
+       .container-item
+         width: 50%
+         display: flex
+         justify-items: center
+         align-items: center
+         padding: 2px 0
+         cursor: pointer
+         text-decoration: underline
+         .container-item-line
+           width: 5px
+           height: 5px
+           background: #0077ff
+           border-radius: 50%
+           margin-right: 5px
+         .container-item-no
+           flex: 1
+           text-align: left
+
+
+
+
+
 </style>
 </style>

+ 1 - 1
src/views/outbound/picking/list/index.vue

@@ -63,7 +63,7 @@
                          label="实拣数" placeholder="请输实拣数量"
                          label="实拣数" placeholder="请输实拣数量"
                           >
                           >
                 <template #button>
                 <template #button>
-                  <van-button size="mini" type="primary"  plain  @click="jump(item)"  :loading="jumpLoading"  loading-text="加载中...">跳过</van-button>
+                  <van-button v-if="item.productionDate!=null" size="mini" type="primary"  plain  @click="jump(item)"  :loading="jumpLoading"  loading-text="加载中...">跳过</van-button>
                 </template>
                 </template>
               </van-field>
               </van-field>
               <div class="wave">
               <div class="wave">