zhaohuanhuan 4 месяцев назад
Родитель
Сommit
a69a286c84

+ 31 - 4
src/views/haikang/putaway/dispatch/index.vue

@@ -21,6 +21,7 @@
         </div>
         <div class="code-input">
           <van-search
+            class="wall-input"
             v-model="wallNo"
             placeholder="请扫描分拨墙号"
             label="分拨墙号:"
@@ -33,6 +34,7 @@
           </van-search>
           <van-search
             ref="searchRef"
+            class="barcode-input"
             v-model="searchBarcode"
             placeholder="请扫描商品条码"
             @search="_handlerScan(searchBarcode)"
@@ -408,26 +410,51 @@ window.onRefresh = loadData
       .code-input
         ::v-deep(.van-search)
           padding: 0
+          height: 50px
+          display: flex
+          align-items: center
 
         ::v-deep(.van-search__label)
           font-size: 16px
+          height: 50px
+          display: flex
+          align-items: center
 
         ::v-deep(.van-search__field)
           border-bottom: 2px solid #efefef
+          height: 50px
+          display: flex
+          align-items: center
           font-size: 16px
+          line-height: 50px
+
+        ::v-deep(.van-field__control)
+          line-height: 50px
 
         ::v-deep(.van-search__content)
           background: #fff
+          height: 50px
+
+        .wall-input, .barcode-input, .code-bin
+          ::v-deep(.van-field__control)
+            display: flex
+            align-items: center
+            height: 50px
+
+        .wall-input, .barcode-input
+          ::v-deep(.van-field__control)
+            font-size: 16px
 
-        .search-input-barcode
-          ::v-deep(.van-search__field)
-            border-bottom: 2px solid #0077ff
-            z-index: 2
         .code-bin
           ::v-deep(.van-field__control)
             font-size: 20px
             color: #ff0d00
 
+        .search-input-barcode
+          ::v-deep(.van-search__field)
+            border-bottom: 2px solid #0077ff
+            z-index: 2
+
 
       .code-tips
         color: #ed6a0c

+ 21 - 5
src/views/haikang/putaway/putaway/index.vue

@@ -509,23 +509,39 @@ window.onRefresh = loadData
         font-weight: bold
     .putaway-input
       .code-input
-        ::v-deep(.van-cell)
+        :deep(.van-field)
+          min-height: 50px
+          display: flex
+          align-items: center
+        :deep(.van-field__body)
+          min-height: 50px
+          display: flex
+          align-items: center
+        :deep(.van-cell)
           padding: 5px 20px 0 20px
 
-        ::v-deep(.van-field__control)
+        :deep(.van-field__control)
           border-bottom: 2px solid #efefef
+          height: 50px
+          line-height: 50px
           font-size: 16px
+          display: flex
+          align-items: center
+        :deep(.van-field__button)
+          display: flex
+          align-items: center
+          height: 50px
 
-        ::v-deep(.van-field__label)
+        :deep(.van-field__label)
           width: unset
           font-size: 16px
 
         .search-input-barcode
-          ::v-deep(.van-field__control)
+          :deep(.van-field__control)
             border-bottom: 2px solid #0077ff
             z-index: 2
         .input-count
-          ::v-deep(.van-field__control)
+          :deep(.van-field__control)
             //line-height: 43px
 
 

+ 12 - 3
src/views/inbound/putaway/task/index.vue

@@ -588,19 +588,28 @@ window.onRefresh = loadData
     .barcode-input
       ::v-deep(.van-search)
         padding: 0
+        height: 50px
+        display: flex
+        align-items: center
 
       ::v-deep(.van-search__field)
         border-bottom: 2px solid #ffffff
+        display: flex
+        align-items: center
+        height: 50px
 
       ::v-deep(.van-search__content)
         background: #fff
+        display: flex
+        align-items: center
+        height: 50px
 
       ::v-deep(.van-field__control)
-        font-size: 15px
+        font-size: 16px
         font-weight: bold
 
       ::v-deep(.van-search__label)
-        font-size: 15px
+        font-size: 16px
         font-weight: bold
 
       .search-input-barcode
@@ -610,7 +619,7 @@ window.onRefresh = loadData
 
       .search-input-number
         ::v-deep(.van-field__control)
-          font-size: 18px
+          font-size: 16px
           font-weight: bold
           color: #ee0a25
 

+ 144 - 107
src/views/inbound/takeDelivery/task/index.vue

@@ -738,113 +738,150 @@ onUnmounted(() => {
 window.onRefresh = loadData
 
 </script>
-<style scoped lang="sass">
-.take-delivery
-  .take-info
-    padding: 6px 10px
-    background: linear-gradient(160deg, #cfe1ff 20%, white 50%, white 100%)
-    display: flex
-    flex-direction: column
-    text-align: left
-
-    .take-info-no
-      flex: 1
-
-      .info-no-title
-        font-size: 19px
-        font-width: 500
-        display: flex
-        justify-content: space-between
-        align-items: center
-
-      .info-no-tips
-        font-size: 14px
-        color: #666666
-        display: flex
-        justify-content: space-between
-        padding: 6px 0
-
-    .take-info-number
-      flex: 1
-      border-top: 1.5px solid #efefef
-      display: flex
-      justify-content: space-between
-      gap: 10px
-      color: #666
-      font-size: 14px
-      padding-top: 10px
-
-      .info-number-left
-        flex: 1
-        display: flex
-        justify-content: space-evenly
-        align-items: center
-
-        .number-left-box
-          flex: 1
-          display: flex
-          flex-direction: column
-          align-items: center
-
-          .left-box-title
-            font-size: 14px
-            font-weight: bold
-            color: #000
-            line-height: 34px
-
-      .info-number-right
-        width: 40%
-        text-align: center
-
-        .van-search
-          padding: 0
-
-  .take-barcode
-    margin-top: 10px
-    text-align: left
-    background: #FFFFFF
-
-    .barcode-input
-      ::v-deep(.van-search)
-        padding: 0
-
-      ::v-deep(.van-search__field)
-        border-bottom: 2px solid #ffffff
-
-      ::v-deep(.van-search__content)
-        background: #fff
-
-      ::v-deep(.van-field__control)
-        font-size: 15px
-        font-weight: bold
-
-      ::v-deep(.van-search__label)
-        font-size: 15px
-        font-weight: bold
-
-      .search-input-barcode
-        ::v-deep(.van-search__field)
-          border-bottom: 2px solid #0077ff
-          z-index: 2
-
-  .take-lot
-    text-align: left
-    margin-top: 5px
-
-    ::v-deep(.van-cell)
-      padding: 5px 8px
-
-    .take-lot-title
-      font-size: 15px
-      font-weight: bold
-      padding: 0 5px
-      border-left: 3px solid #1989fa
-      color: #333
-      margin-bottom: 3px
-
-
-  .take-button
-    padding: 20px
+<style scoped lang="scss">
+.take-delivery {
+  .take-info {
+    padding: 6px 10px;
+    background: linear-gradient(160deg, #cfe1ff 20%, white 50%, white 100%);
+    display: flex;
+    flex-direction: column;
+    text-align: left;
+
+    .take-info-no {
+      flex: 1;
+
+      .info-no-title {
+        font-size: 19px;
+        font-weight: 500;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+      }
+
+      .info-no-tips {
+        font-size: 14px;
+        color: #666666;
+        display: flex;
+        justify-content: space-between;
+        padding: 6px 0;
+      }
+    }
+
+    .take-info-number {
+      flex: 1;
+      border-top: 1.5px solid #efefef;
+      display: flex;
+      justify-content: space-between;
+      gap: 10px;
+      color: #666;
+      font-size: 14px;
+      padding-top: 10px;
+
+      .info-number-left {
+        flex: 1;
+        display: flex;
+        justify-content: space-evenly;
+        align-items: center;
+
+        .number-left-box {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+
+          .left-box-title {
+            font-size: 14px;
+            font-weight: bold;
+            color: #000;
+            line-height: 34px;
+          }
+        }
+      }
+
+      .info-number-right {
+        width: 40%;
+        text-align: center;
+
+        .van-search {
+          padding: 0;
+        }
+      }
+    }
+  }
+
+  .take-barcode {
+    margin-top: 10px;
+    text-align: left;
+    background: #ffffff;
+
+    .barcode-input {
+      height: 50px;
+
+      ::v-deep(.van-search) {
+        padding: 0;
+      }
+
+      ::v-deep(.van-search__field) {
+        border-bottom: 2px solid #ffffff;
+        height: 50px;
+        display: flex;
+        align-items: center;
+      }
+
+      ::v-deep(.van-search__content) {
+        background: #fff;
+        height: 50px;
+        display: flex;
+        align-items: center;
+      }
+
+      ::v-deep(.van-search__label) {
+        font-size: 16px;
+        font-weight: bold;
+        line-height: 50px;
+        height: 50px;
+        display: flex;
+        align-items: center;
+      }
 
+      ::v-deep(.van-field__control) {
+        font-size: 16px;
+        font-weight: bold;
+        height: 50px;
+        line-height: 50px;
+        display: flex;
+        align-items: center;
+      }
 
+      .search-input-barcode {
+        ::v-deep(.van-search__field) {
+          border-bottom: 2px solid #0077ff;
+          z-index: 2;
+        }
+      }
+    }
+  }
+
+  .take-lot {
+    text-align: left;
+    margin-top: 5px;
+
+    ::v-deep(.van-cell) {
+      padding: 5px 8px;
+    }
+
+    .take-lot-title {
+      font-size: 15px;
+      font-weight: bold;
+      padding: 0 5px;
+      border-left: 3px solid #1989fa;
+      color: #333;
+      margin-bottom: 3px;
+    }
+  }
+
+  .take-button {
+    padding: 20px;
+  }
+}
 </style>

+ 12 - 2
src/views/inventory/moveTask/down/index.vue

@@ -430,19 +430,29 @@ window.onRefresh = loadData
 
               ::v-deep(.van-search__field)
                 border-bottom: 2px solid #ffffff
+                height: 50px
 
               ::v-deep(.van-search__content)
                 background: #fff
 
               ::v-deep(.van-field__control)
-                font-size: 15px
+                font-size: 16px
+                line-height: 50px
 
               ::v-deep(.van-search__label)
-                font-size: 15px
+                font-size: 16px
+                line-height: 50px
+
+              ::v-deep(.van-field__body)
+                height: 50px
+                min-height: 50px
+                display: flex
+                align-items: center
 
               .search-input-barcode
                 ::v-deep(.van-search__field)
                   border-bottom: 2px solid #0077ff
+                  height: 50px
                   z-index: 2
 
         .take-button

+ 15 - 2
src/views/inventory/moveTask/putaway/index.vue

@@ -448,20 +448,33 @@ window.onRefresh = loadData
             background: #FFFFFF
 
             .barcode-input
+              height: 50px
               ::v-deep(.van-search)
                 padding: 0
 
               ::v-deep(.van-search__field)
+                min-height: 50px
                 border-bottom: 2px solid #ffffff
 
               ::v-deep(.van-search__content)
                 background: #fff
+                min-height: 50px
+                display: flex
+                align-items: center
+
+              ::v-deep(.van-field)
+                min-height: 50px
+                display: flex
+                align-items: center
 
               ::v-deep(.van-field__control)
-                font-size: 15px
+                font-size: 16px
+                min-height: 50px
+                line-height: 50px
 
               ::v-deep(.van-search__label)
-                font-size: 15px
+                font-size: 16px
+                line-height: 50px
 
               .search-input-barcode
                 ::v-deep(.van-search__field)

+ 19 - 7
src/views/inventory/transfer/index.vue

@@ -30,7 +30,7 @@
             label="商品条码"
             placeholder="请输入商品条码"
             clearable
-            :class="{ 'field-focused': scanType === 2 }"
+            :class="['barcode-field', { 'field-focused': scanType === 2 }]"
             @focus="scanType = 2"
             @keyup.enter="_handlerScan(productBarcode)"
             @input="onAsnCancel"
@@ -414,6 +414,8 @@ const onProductSelect = (product) => {
   }
 
   selectedProducts.value = product
+  productBarcode.value = product.barcode
+  oldProductBarcode.value = product.barcode
   // 选择商品时自动赋值移库数量
   transferQuantity.value = product.quantityAvailable
   sourceLocation.value = product.location
@@ -578,19 +580,19 @@ onUnmounted(() => {
 .search-section ::v-deep(.van-field__label) {
   font-weight: 600;
   color: #323233;
-  font-size: 14px;
-  line-height: 38px;
-  width: 65px;
+  font-size: 16px;
+  line-height: 50px;
+  width: 72px;
 }
 
 /* 基于scanType的动态高亮效果 */
 .search-section ::v-deep(.van-field__body) {
   border-bottom: 2px solid #e7eaf3;
-  height: 36px;
+  height: 50px;
 }
 
 .search-section ::v-deep(.van-field__control) {
-  font-size: 15px;
+  font-size: 18px;
   color: #323233;
   font-weight: 500;
 }
@@ -598,6 +600,7 @@ onUnmounted(() => {
 .search-section ::v-deep(.van-field__control::placeholder) {
   color: #c8c9cc;
   font-weight: 400;
+  font-size: 16px;
 }
 
 /* 基于scanType的动态高亮效果 */
@@ -605,7 +608,7 @@ onUnmounted(() => {
   border-bottom: 2px solid #1989fa;
   background: linear-gradient(to right, rgba(25, 137, 250, 0.02), rgba(25, 137, 250, 0.05));
   position: relative;
-  height: 36px;
+  height: 50px;
 }
 
 .field-focused ::v-deep(.van-field::after) {
@@ -629,6 +632,15 @@ onUnmounted(() => {
   font-weight: 600;
 }
 
+.barcode-field ::v-deep(.van-field__body) {
+  height: 48px;
+}
+
+.barcode-field ::v-deep(.van-field__control) {
+  font-size: 18px;
+  letter-spacing: 1px;
+}
+
 .active-color ::v-deep(.van-field__control) {
   color: orangered !important;
   font-weight: 600;

+ 17 - 2
src/views/outbound/check/activity/index.vue

@@ -632,26 +632,41 @@ window.onRefresh = loadData
         flex: 1
     .scan-barcode
       ::v-deep(.van-cell)
-        padding: 5px 15px 0 15px
+        padding: 0 15px
+        height: 50px
+        min-height: 50px
+        display: flex
+        align-items: center
+
+      ::v-deep(.van-field__body)
+        display: flex
+        align-items: center
+        height: 100%
 
       ::v-deep(.van-field__control)
         border-bottom: 2px solid #efefef
         font-size: 16px
+        line-height: 46px
 
       ::v-deep(.van-field__label)
         width: unset
         font-size: 16px
+        display: flex
+        align-items: center
       .input-barcode
         ::v-deep(.van-field__control)
           border-bottom: 2px solid #0077ff
+          line-height: 46px
           z-index: 2
       .success-input-barcode
         ::v-deep(.van-field__control)
           border-bottom: 2px solid #1ca600
+          line-height: 46px
           z-index: 2
       .error-input-barcode
         ::v-deep(.van-field__control)
           border-bottom: 2px solid #ff0000
+          line-height: 46px
           z-index: 2
     .order-detail
       margin-top: 2px
@@ -661,7 +676,7 @@ window.onRefresh = loadData
         display: flex
         justify-content: space-between
         margin: 0 15px
-        padding: 8px 0
+        padding: 3px 0
         border-bottom: 1px solid #eaeaeb
         .picking-code
           flex: 1

+ 8 - 1
src/views/outbound/check/large/index.vue

@@ -785,11 +785,16 @@ window.onRefresh = loadData
 
     .scan-barcode
       ::v-deep(.van-cell)
-        padding: 5px 15px 0 15px
+        padding: 0 15px
+        height: 50px
+        min-height: 50px
+        display: flex
+        align-items: center
 
       ::v-deep(.van-field__control)
         border-bottom: 2px solid #efefef
         font-size: 16px
+        line-height: 46px
 
       ::v-deep(.van-field__label)
         width: unset
@@ -799,6 +804,8 @@ window.onRefresh = loadData
         ::v-deep(.van-field__control)
           border-bottom: 2px solid #0077ff
           z-index: 2
+          font-size: 16px
+          line-height: 46px
 
     .order-detail
       margin-top: 2px

+ 136 - 87
src/views/outbound/check/moveStock/index.vue

@@ -456,91 +456,140 @@ onUnmounted(() => {
 window.onRefresh = loadData
 </script>
 
-<style lang="sass" scoped>
-.container
-  .move-stock
-    .code
-      background: #e9f4ff
-      box-sizing: border-box
-      padding: 8px 0
-    .code-title
-      display: flex
-      justify-content: space-between
-      padding: 0 15px 8px 15px
-    .code-input
-      ::v-deep(.van-search)
-        padding: 0
-      ::v-deep(.van-search__field)
-        border-bottom: 2px solid #ffffff
-      ::v-deep(.van-search__content)
-        background: #fff
-      .search-input-barcode
-        ::v-deep(.van-search__field)
-          border-bottom: 2px solid #0077ff
-          z-index: 2
-    .code-tips
-      color: #ed6a0c
-      flex: 1
-    .code-count
-      font-size: 16px
-      font-weight: bold
-      span
-        color: #0077ff
-    .nav-right
-      padding: 14px 0 12px 5px
-    .move-stock-list
-      width: 100%
-      overflow-y: auto
-      max-height: 280px
-      min-height: 100px
-      .move-button
-        background: #1989fa
-        color: #fff
-        width: 100%
-        height: 30px
-        font-size: 14px
-        line-height: 30px
-        font-weight: bold
-      .task-table,.task-table-bin,.task-table-box
-        width: 100%
-        table-layout: fixed
-        border-collapse: collapse
-        font-size: 13px
-      .task-table th,.task-table-bin th,.task-table td,.task-table-bin td,.task-table-box th,.task-table-box td
-        text-align: center
-        border: 1px solid #ccc
-        word-wrap: break-word
-        word-break: break-all
-      .task-table thead,.task-table-bin thead,.task-table-box thead
-        background-color: #3f8dff
-        position: sticky
-        top: 0
-        color: white
-        font-size: 13px
-      .task-table-bin thead
-        background-color: #3f8dff
-      .task-table-bin tbody
-        background: #cde7ff
-      .task-table tbody tr.pricking-active
-        background-color: #d6f9e7
-      .task-table tbody tr.stock-active
-        background-color: #fffadd
-      .task-table tbody tr.virtual-active
-        background-color: #cacaca
-.count-input
-  ::v-deep(.van-field__value)
-    border-bottom: 2px solid #0077ff
-    font-size: 16px
-.completion
-  text-align: right
-  font-size: 14px
-  line-height: 35px
-  color: #0077ff
-  padding: 0 10px
-  cursor: pointer
-  text-decoration: underline
-.tips
-  font-size: 13px
-  text-align: left
-  padding: 5px 15px
+<style scoped lang="scss">
+.container {
+  .move-stock {
+    .code {
+      background: #e9f4ff;
+      box-sizing: border-box;
+      padding: 8px 0;
+    }
+    .code-title {
+      display: flex;
+      justify-content: space-between;
+      padding: 0 15px 8px 15px;
+    }
+    .code-input {
+      ::v-deep(.van-search) {
+        padding: 0;
+        font-size: 16px;
+      }
+      ::v-deep(.van-search__field) {
+        border-bottom: 2px solid #ffffff;
+        height: 50px;
+        display: flex;
+        align-items: center;
+      }
+      ::v-deep(.van-search__content) {
+        background: #fff;
+        height: 50px;
+        display: flex;
+        align-items: center;
+      }
+      ::v-deep(.van-field__control) {
+        font-size: 16px;
+        height: 50px;
+        line-height: 50px;
+      }
+      .search-input-barcode {
+        ::v-deep(.van-search__field) {
+          border-bottom: 2px solid #0077ff;
+          z-index: 2;
+        }
+      }
+    }
+    .code-tips {
+      color: #ed6a0c;
+      flex: 1;
+    }
+    .code-count {
+      font-size: 16px;
+      font-weight: bold;
+      span {
+        color: #0077ff;
+      }
+    }
+    .nav-right {
+      padding: 14px 0 12px 5px;
+    }
+    .move-stock-list {
+      width: 100%;
+      overflow-y: auto;
+      max-height: 280px;
+      min-height: 100px;
+      .move-button {
+        background: #1989fa;
+        color: #fff;
+        width: 100%;
+        height: 30px;
+        font-size: 14px;
+        line-height: 30px;
+        font-weight: bold;
+      }
+      .task-table,
+      .task-table-bin,
+      .task-table-box {
+        width: 100%;
+        table-layout: fixed;
+        border-collapse: collapse;
+        font-size: 13px;
+      }
+      .task-table th,
+      .task-table-bin th,
+      .task-table td,
+      .task-table-bin td,
+      .task-table-box th,
+      .task-table-box td {
+        text-align: center;
+        border: 1px solid #ccc;
+        word-wrap: break-word;
+        word-break: break-all;
+      }
+      .task-table thead,
+      .task-table-bin thead,
+      .task-table-box thead {
+        background-color: #3f8dff;
+        position: sticky;
+        top: 0;
+        color: white;
+        font-size: 13px;
+      }
+      .task-table-bin thead {
+        background-color: #3f8dff;
+      }
+      .task-table-bin tbody {
+        background: #cde7ff;
+      }
+      .task-table tbody tr.pricking-active {
+        background-color: #d6f9e7;
+      }
+      .task-table tbody tr.stock-active {
+        background-color: #fffadd;
+      }
+      .task-table tbody tr.virtual-active {
+        background-color: #cacaca;
+      }
+    }
+  }
+}
+.count-input {
+  ::v-deep(.van-field__value) {
+    border-bottom: 2px solid #0077ff;
+    font-size: 16px;
+  }
+}
+.completion {
+  text-align: right;
+  font-size: 14px;
+  line-height: 35px;
+  color: #0077ff;
+  padding: 0 10px;
+  cursor: pointer;
+  text-decoration: underline;
+}
+.tips {
+  font-size: 13px;
+  text-align: left;
+  padding: 5px 15px;
+}
 </style>

+ 17 - 0
src/views/robot/putaway/index.vue

@@ -602,13 +602,30 @@ window.onRefresh = loadData
       .code-input
         ::v-deep(.van-search)
           padding: 0
+          height: 50px
+          display: flex
+          align-items: center
+
+        ::v-deep(.van-search__content)
+          height: 50px
+          display: flex
+          align-items: center
 
         ::v-deep(.van-search__label)
           font-size: 16px
+          line-height: 50px
 
         ::v-deep(.van-search__field)
           border-bottom: 2px solid #efefef
           font-size: 16px
+          height: 50px
+          display: flex
+          align-items: center
+
+        ::v-deep(.van-field__control)
+          font-size: 16px
+          height: 50px
+          line-height: 50px
 
         ::v-deep(.van-search__content)
           background: #fff

+ 21 - 8
src/views/robot/takeDelivery/task/index.vue

@@ -806,25 +806,38 @@ window.onRefresh = loadData
     background: #FFFFFF
 
     .barcode-input
-      ::v-deep(.van-search)
+      :deep(.van-search)
         padding: 0
+        height: 50px
+        display: flex
+        align-items: center
 
-      ::v-deep(.van-search__field)
+      :deep(.van-search__field)
         border-bottom: 2px solid #ffffff
+        height: 50px
+        display: flex
+        align-items: center
 
-      ::v-deep(.van-search__content)
+      :deep(.van-search__content)
         background: #fff
+        height: 50px
+        display: flex
+        align-items: center
 
-      ::v-deep(.van-field__control)
-        font-size: 15px
+      :deep(.van-field__control)
+        font-size: 16px
+        line-height: 50px
         font-weight: bold
 
-      ::v-deep(.van-search__label)
-        font-size: 15px
+      :deep(.van-search__label)
+        font-size: 16px
         font-weight: bold
+        line-height: 50px
+        display: flex
+        align-items: center
 
       .search-input-barcode
-        ::v-deep(.van-search__field)
+        :deep(.van-search__field)
           border-bottom: 2px solid #0077ff
           z-index: 2