Merge branch '250612_haikang'

src/views/haikang/boxReturn/boxReturn/index.vue

@@ -168,17 +168,21 @@ onUnmounted(() => {
       .barcode-input
         ::v-deep(.van-search)
           padding: 0
+          height: 60px
+
 
         ::v-deep(.van-search__field)
           border-bottom: 2px solid #ffffff
 
         ::v-deep(.van-search__content)
           background: #fff
+          align-items: center
 
         ::v-deep(.van-field__control)
           font-size: 15px
           font-weight: bold
 
+
         ::v-deep(.van-search__label)
           font-size: 15px
           font-weight: bold
@@ -187,6 +191,8 @@ onUnmounted(() => {
           ::v-deep(.van-search__field)
             border-bottom: 2px solid #0077ff
             z-index: 2
+            line-height: 58px
+            height: 60px
 
 
 </style>

src/views/haikang/putaway/putaway/index.vue

@@ -20,16 +20,12 @@
               autocomplete="off" readonly @click="setBarcodeInput(workBinNo,1)"></van-field>
             <van-field v-model="searchBarcode" placeholder="请扫描商品条码" label="商品条码：" left-icon="" readonly :class="[scanType===2?'search-input-barcode':'']"
               autocomplete="off" @click="setBarcodeInput(searchBarcode,2)"></van-field>
-            <van-field ref="countRef" v-model="count" type="number" placeholder="上架数量" label="上架数量：" left-icon="" autocomplete="off"
+            <van-field ref="countRef" @click="scanType=3" v-model="count" type="number" placeholder="上架数量" label="上架数量：" left-icon="" autocomplete="off"
                        :class="{'search-input-barcode': scanType === 3,'input-count': barcodeActive.qty}"  @keydown.enter="setPutaway(2)"
                        :max="barcodeActive.qty?barcodeActive.qty:10000"
             >
               <template #button>
-                <div style="display: flex; align-items: center;flex-direction: column;margin-left: 20px;color:#333" v-if="barcodeActive.qty">
-                  <div style="height: 20px;font-size: 12px">预计</div>
-                  <div style="font-size: 16px;font-weight: bold">{{ barcodeActive.qty ||0 }}
-                  </div>
-                </div>
+                <div v-if="barcodeActive.qty" style="color:#333;font-size: 14px;font-weight: bold">预计{{ barcodeActive.qty ||0 }}</div>
               </template>
             </van-field>
             <van-field v-model="searchLocation" placeholder="请扫描库位" label="上架库位：" left-icon="" readonly :class="[scanType===4?'search-input-barcode':'']"
@@ -220,7 +216,7 @@ const _handlerScan = (code) => {
         }, 300)
         scanType.value = 3
         count.value=1
-        countRef.value?.focus()
+        // countRef.value?.focus()
         tips.value = `请扫输入上架数量`
       scanError()
     } else {
@@ -274,7 +270,7 @@ const inputCheck=()=>{
     scanType.value = 3
     tips.value = `请输入上架数量`
     showNotify({ type: 'danger', duration: 3000, message: `请扫输入上架数量` })
-    countRef.value?.focus()
+    // countRef.value?.focus()
     scanError()
     return false
   }
@@ -289,7 +285,7 @@ const inputCheck=()=>{
     scanType.value = 3
     tips.value = `请输入上架数量`
     scanError()
-    countRef.value?.focus()
+    // countRef.value?.focus()
     showNotify({ type: 'danger', duration: 3000, message: `上架数量不能大于预计上架数量` })
     return false
   }
@@ -466,7 +462,7 @@ window.onRefresh = loadData
             z-index: 2
         .input-count
           ::v-deep(.van-field__control)
-            line-height: 43px
+            //line-height: 43px
 
 
     .putaway-button
@@ -506,7 +502,7 @@ window.onRefresh = loadData
               background: #fff
               align-items: center
               justify-content: center
-              padding: 15px 0
+              padding: 8px 0
               font-size: 14px
               color: #333
               position: relative