盲收修改扫码方式

src/api/blind/index.ts

@@ -51,7 +51,7 @@ export function setBlindTaskMode(data:any) {
  */
 export function checkBlindBarcode(params:checkBlindBarcodeType) {
   return request({
-    url: 'api/entryOrder/app/blind/checkBarcode',
+    url: 'api/entryOrder/app/blind/checkBarcodeIgnoreCase',
     method: 'get',
     params
   })

src/views/inbound/blindCollection/components/ResetData.vue

@@ -41,7 +41,7 @@ const show = async () => {
     new Promise(async (resolve) => {
       if (action === 'confirm') {
         if (bin.value == '') {
-          showToast(`请输入${props.value.modeTypeName}!!!`)
+          showToast(`请输入${props.modeTypeName}!!!`)
           return resolve(false)
         }
         emit('resetData', bin.value,'bin')

src/views/inbound/blindCollection/components/TaskList.vue

@@ -5,6 +5,7 @@
       title="任务中心"
       close-on-click-action
       @cancel="taskTrueFalseBy=false"
+      :round="false"
     >
       <div class="task-content">
       <table  class="task-table">
@@ -97,6 +98,8 @@ defineExpose({show})
       font-size: 14px
     .task-table tbody tr.odd-row
       background-color: #e4f2ff
+    .task-table ::v-deep(.van-button)
+      border-radius: 0
 
 
 

src/views/inbound/blindCollection/mode/index.vue

@@ -35,7 +35,7 @@
               <div class="select-item-tips">步骤：扫描条码->进行装箱</div>
             </div>
             <div class="right">
-              <van-button type="primary" round size="small">选择</van-button>
+              <van-button type="primary"  size="small">选择</van-button>
             </div>
           </div>
           <div class="select-item"  @click="onSelect(1)">
@@ -45,7 +45,7 @@
               <div class="select-item-tips">步骤：扫描条码->分配格口</div>
             </div>
             <div class="right">
-              <van-button type="primary" round size="small"> 选择</van-button>
+              <van-button type="primary"  size="small"> 选择</van-button>
             </div>
           </div>
           <div class="select-item"  @click="onSelect(5)">
@@ -55,7 +55,7 @@
               <div class="select-item-tips">步骤：扫描箱号->扫描条码->分配格口</div>
             </div>
             <div class="right">
-              <van-button type="primary" round size="small"> 选择</van-button>
+              <van-button type="primary"  size="small"> 选择</van-button>
             </div>
           </div>
         </div>
@@ -90,7 +90,7 @@ onMounted(() => {
 try {
   getHeader()
 }catch (error) {
-
+  router.push('/login')
 }
 onUnmounted(() => {
   closeListener()
@@ -224,7 +224,7 @@ const onClickRight = () => {
 <style scoped lang="sass">
 .mode
   .mode-input-box
-    padding: 10px
+    padding: 10px 5px
     .mode-input-text
       font-size: 18px
       font-weight: bold
@@ -234,18 +234,16 @@ const onClickRight = () => {
       background: #eff0f2
       padding: 10px 20px
       font-size: 20px
-      border-radius: 20px
       border: 2px solid #0077ff
       font-weight: 500
   .mode-select
-    padding: 10px
+    padding: 10px 5px
     .select-list
       margin-top: 10px
       text-align: left
       .select-item
         padding: 6px 10px
         background: #ffffff
-        border-radius: 16px
         display: flex
         justify-content: space-between
         align-items: center
@@ -261,6 +259,8 @@ const onClickRight = () => {
         .right
           width: 20%
           text-align: right
+          ::v-deep(.van-button)
+            border-radius: 0
         .select-item-title
           font-size: 18px
           font-weight: bold

src/views/inbound/blindCollection/task/hooks/barcodeIsData.ts

@@ -1,12 +1,15 @@
+
+// @ts-ignore
+import { barcodeToUpperCase } from '@/utils/dataType'
 export function barcodeIsData (str:string, data1:any,data2:any){
   for (let item of data1) {
-    if (item.barcode === str) {
-      return true;
+    if (barcodeToUpperCase(item.barcode) === barcodeToUpperCase(str)) {
+      return item;
     }
   }
   for (let item of data2) {
-    if (item.barcode === str) {
-      return true;
+    if (barcodeToUpperCase(item.barcode) === barcodeToUpperCase(str)) {
+      return item;
     }
   }
   return false;

src/views/inbound/blindCollection/task/index.vue

@@ -16,7 +16,6 @@
       </template>
     </van-nav-bar>
     <div class="blind-task-list">
-      <van-cell-group inset>
         <van-field label-width="70" center class="select" v-model="taskInfo.ownerName" readonly    >
           <template #label>
             <van-button size="small" plain type="danger" @click="_resetData" >重新清点</van-button>
@@ -26,8 +25,8 @@
           <tbody>
           <tr style="border-bottom: 1px solid #ebedf0">
             <td width="70px" style="border-right: 1px solid #ebedf0" >箱号</td>
-            <td width="120px" style="border-right: 1px solid #ebedf0;word-break: break-all" >{{ preBoxNo || '--'}}
-<!--              <van-icon v-if="preBoxNo" name="edit" color="#0077aa" />-->
+            <td width="120px" style="border-right: 1px solid #ebedf0;word-break: break-all" @click="setBoxBarcode">{{ preBoxNo || '--'}}
+              <van-icon v-if="preBoxNo" name="edit" color="#0077aa" />
             </td>
             <td>
               <van-field  label-width="70" :class="focusType===5?'box-input':'select'" ref="boxNoRef" v-model="boxNo"
@@ -40,16 +39,15 @@
             <td width="70px" style="border-right: 1px solid #ebedf0" >条码</td>
             <td width="120px" style="border-right: 1px solid #ebedf0;word-break: break-all" >{{ preBarcode || '--' }}</td>
             <td>
-              <van-field  label-width="70" :class="focusType===1?'box-input':'select'" ref="barcodeRef" v-model="barcode"
-                 @focus="onFocus(1)" @blur="onFocus(0)" placeholder="请扫描条码" clearable
-                 @keydown.enter="_checkBarcode" autocomplete="off" />
+              <van-field  label-width="70" :class="focusType===1?'box-input':'select'"  readonly  v-model="boxBarcode"
+                 @focus="onFocus(1)" @blur="onFocus(0)" placeholder="请直接扫描条码" clearable
+                          @click="setBarcodeInput" />
             </td>
           </tr>
           </tbody>
         </table>
-        <van-field v-if="modeType!==5" label-width="70" :class="focusType===1?'input':'select'" ref="barcodeRef" v-model="barcode"
-                   label="条码" @focus="onFocus(1)" @blur="onFocus(0)" placeholder="请扫描条码" clearable
-                   @keydown.enter="_checkBarcode" autocomplete="off" />
+        <van-field v-if="modeType!==5" label-width="70" :class="focusType===1?'input':'select'" ref="barcodeRef" readonly  v-model="inputBarcode"
+                   label="条码" placeholder="请直接扫描条码" @click="setBarcodeInput"  />
         <van-grid clickable :column-num="2" v-if="modeType!==3">
           <van-grid-item icon="home-o" text="数量">
             <template #icon>
@@ -58,7 +56,7 @@
           </van-grid-item>
           <van-grid-item  v-if="modeType===0 ">
             <template #default>
-              <van-button  type="primary" @click="_setBoxBarcode" >装&nbsp;&nbsp;箱</van-button>
+              <van-button  type="primary" @click="_setPacking" >装&nbsp;&nbsp;箱</van-button>
             </template>
           </van-grid-item>
           <van-grid-item text="格口" v-else>
@@ -72,12 +70,9 @@
             <van-button size="mini" type="danger" plain @click="resetNewBin" >取 消</van-button>
           </template>
         </van-field>
-
-      </van-cell-group>
     </div>
     <div class="blind-task-table" >
-      <van-cell-group inset v-if="modeType===5">
-        <div style="display: flex">
+        <div style="display: flex" v-if="modeType===5">
           <div style="flex: 1">
             <table class="task-table-box" >
               <thead>
@@ -115,9 +110,7 @@
             </table>
           </div>
         </div>
-      </van-cell-group>
-        <van-cell-group inset v-else>
-        <table class="task-table">
+        <table class="task-table" v-else>
           <thead>
           <tr>
             <th width="120px" >商品条码</th>
@@ -135,7 +128,7 @@
               <van-button plain size="mini" type="primary" @click="_setBarcodeCount(item)">修改数量</van-button>
             </td>
           </tr>
-          <tr v-for="(item, index) in dataList" :key="index" :class="{'odd-row': Number(index+localData.length) % 2 !== 0}">
+          <tr v-for="(item, index) in route.query.typeCode==='1'?binList:dataList" :key="index" :class="{'odd-row': Number(index+localData.length) % 2 !== 0}">
             <td>{{ item.barcode }}</td>
             <td>{{ modeType === 0 ? item.cartonCode : item.latticeCode }}</td>
             <td>{{ item.qty }}</td>
@@ -145,11 +138,11 @@
           </tr>
           </tbody>
         </table>
-      </van-cell-group>
     </div>
     <barcode-count ref="barcodeCountRef" @setBarcodeCount="setBarcodeCount" />
     <van-back-top right="15vw" bottom="10vh" />
     <reset-data ref="resetDataRef" :modeTypeName="modeTypeName" :binData="dataList" @resetData="onResetData" />
+    <input-barcode ref="inputBarcodeRef" @setBarcode="_handlerScan"  />
   </div>
 </template>
 <script setup>
@@ -161,21 +154,25 @@ import {
   setBoxBarcodeCount,
   setBoxCacheData, submitBoxCacheData,
 } from '@/api/blind/index.ts'
-import { computed, onMounted, ref } from 'vue'
+import { computed, nextTick, onMounted, onUnmounted, ref } from 'vue'
 import { playVoiceBin, scanError, scanSuccess } from '@/utils/android'
 import BarcodeCount from '@/views/inbound/blindCollection/components/BarcodeCount.vue'
+import InputBarcode from '@/views/outbound/picking/components/InputBarcode.vue'
 import ResetData from '@/views/inbound/blindCollection/components/ResetData.vue'
 import { closeDialog, showConfirmDialog, showDialog, showToast } from 'vant'
 import { barcodeIsData } from '@/views/inbound/blindCollection/task/hooks/barcodeIsData'
 import { closeLoading, showLoading } from '@/utils/loading'
 import { binData } from '@/views/inbound/blindCollection/task/hooks/binData'
+import { closeListener, openListener, scanInit } from '@/utils/keydownListener'
 const route = useRoute()
 //箱号
 const boxNo = ref('')
 //上一个箱号
 const preBoxNo = ref('')
 //条码
-const barcode = ref('')
+const inputBarcode = ref('')
+//条码
+const boxBarcode = ref('')
 //上一个条码
 const preBarcode=ref('')
 const focusType = ref(0)
@@ -187,6 +184,7 @@ const modeMap={
 const modeType = Number(route.query.typeCode)
 const modeTypeName=modeType===0?'箱号':'格口'
 const barcodeRef = ref(null)
+const inputBarcodeRef=ref(null)
 const boxNoRef = ref(null)
 //按箱清点+分货数据
 const dataList=ref([])
@@ -230,44 +228,70 @@ const getTaskInfo = async (taskNo) => {
     dataList.value = boxResponse.data;
   }
 }
+onUnmounted(() => {
+  closeListener()
+})
 onMounted(() => {
+  openListener()
   getTaskInfo(route.query.code)
+  setTimeout(() => {
+    scanInit(_handlerScan)
+  },300)
   if(modeType===5){
     focusType.value=5
     boxNoRef.value?.focus()
-  }else {
-    barcodeRef.value?.focus()
   }
 })
+const setBoxCode=ref(false)
+const setBoxBarcode=()=>{
+  setBoxCode.value=true
+  inputBarcodeRef.value?.show(boxNo.value,'请扫描箱号')
+}
+const _setBoxBarcode=(code)=>{
+  preBoxNo.value=code
+  setBoxCode.value=false
+}
 // 验证箱号
 const scanBox=()=>{
   if (boxNo.value === '') return;
   preBoxNo.value=boxNo.value
   boxNo.value=''
-  barcodeRef.value?.focus()
+  boxNoRef.value?.blur()
+}
+//设置条码
+const setBarcodeInput=()=>{
+  inputBarcodeRef.value?.show(undefined,'扫描商品条码')
+}
+const _handlerScan=(code)=>{
+  if(setBoxCode.value){
+    _setBoxBarcode(code)
+  }else {
+    inputBarcode.value=code.trim()
+    _checkBarcode()
+  }
+
 }
 // 验证条码
 const _checkBarcode = () => {
   const { warehouseCode, ownerCode } = taskInfo.value;
-  preBarcode.value = barcode.value;
-  barcode.value=''
-  if (preBarcode.value === '') return
-  // 检查条码是否存在列表里
-  const isBarcodeEmpty = barcodeIsData(preBarcode.value, localData.value, dataList.value);
+  preBarcode.value=inputBarcode.value
+  if(inputBarcode.value==='') return
+  const isBarcodeEmpty = barcodeIsData(inputBarcode.value, localData.value, dataList.value);
   // 条码存在列表里设置数据
   if (isBarcodeEmpty) {
-    setBarcode(preBarcode.value);
+    setBarcode(isBarcodeEmpty.barcode);
   } else {
     const params = {
       warehouse: warehouseCode,
       ownerCode,
-      barcode:preBarcode.value
+      barcode:inputBarcode.value
     };
     checkBlindBarcode(params).then(res=>{
       if(res.data){
-        setBarcode(preBarcode.value)
+        setBarcode(res.data.barCode)
       }
     }).catch((err)=>{
+      inputBarcode.value=''
       scanError();
     })
   }
@@ -275,7 +299,7 @@ const _checkBarcode = () => {
 };
 // 设置条码的处理
 const setBarcode = (curBarcode) => {
-  barcode.value = '';
+  inputBarcode.value=''
   const { code } = taskInfo.value;
   switch (modeType) {
     case 5:
@@ -327,7 +351,7 @@ const setLocalData=(barCode,type)=>{
 }
 
 //装箱
-const _setBoxBarcode=()=>{
+const _setPacking=()=>{
   const data=loadLocalData(taskInfo.value.code)
   if(data.length===0) {
     showToast({duration:5000,message:'当前无需要装箱数据'})
@@ -391,7 +415,6 @@ const setBarcodeCount=(count)=>{
     setBoxBarcodeCount(data).then(res=>{
       dataList.value = res.data
       scanSuccess()
-      barcodeRef.value?.focus();
     }).catch(() => {
       scanError()
     })
@@ -428,7 +451,6 @@ const onResetData = (bin, type) => {
       if(modeType===5){
         boxNoRef.value?.focus()
       }else {
-        barcodeRef.value?.focus();
       }
 
     })
@@ -463,7 +485,6 @@ const resetNewBin = () => {
         }else {
           localStorage.removeItem(`task_${taskInfo.value.code}`);
         }
-        barcodeRef.value?.focus()
       } else {
         const bin = modeType === 0 ? cartonCode : latticeCode;
         onResetData(bin, 'bin');
@@ -498,8 +519,10 @@ const onClickRight = () => {
 </script>
 <style scoped lang="sass">
 .blind-task-list
-  padding: 10px 0
+  padding-bottom: 10px
   font-size: 14px
+  ::v-deep(.van-button)
+    border-radius: 0
   .select
     padding: 10px 15px
   .box-input
@@ -556,4 +579,6 @@ const onClickRight = () => {
     background: #ffe9d8
   .task-table tbody tr.odd-row
     background-color: #e4f2ff
+  .task-table ::v-deep(.van-button)
+    border-radius: 0
 </style>

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

@@ -2,14 +2,15 @@
   <div class="container-no-container">
     <van-dialog v-model:show="barcodeTrueFalseBy"
                 :beforeClose="beforeClose"
-                title="检索条码"
+                :title="title"
                 show-cancel-button>
       <van-field class="code-input"
                  v-model="barcode"
                  ref="barcodeRef"
                  @keydown.enter="onKeydown"
                  clearable
-                 placeholder="请扫描条码" />
+                 autocomplete="off"
+                 :placeholder="title" />
     </van-dialog>
   </div>
 </template>
@@ -22,8 +23,11 @@ import { showToast } from 'vant'
   const barcodeTrueFalseBy=ref(false)
   const barcodeRef=ref(null)
   const barcode=ref('');
-
-const show = async (code,type) => {
+  const title=ref('请扫描条码')
+const show = async (code,desc) => {
+    if(desc!==undefined){
+      title.value=desc
+    }
     barcodeTrueFalseBy.value = true
     barcode.value=code
     setTimeout(()=>{
@@ -35,8 +39,8 @@ const show = async (code,type) => {
   const  beforeClose=  (action) =>
     new Promise(async (resolve) => {
       if (action === 'confirm') {
-        if (barcode.value == '') {
-          showToast('请扫描条码')
+        if (barcode.value === '' || barcode.value==undefined) {
+          showToast(title.value)
           return resolve(false)
         }
         emit('setBarcode', barcode.value)
@@ -45,7 +49,7 @@ const show = async (code,type) => {
     });
     const onKeydown=()=>{
       setTimeout(()=>{
-        barcodeRef.value.blur()
+        barcodeRef.value?.blur()
       },300)
     }
     defineExpose({show})