@logwire/logwire-wms-pda-ui 3.3.4 → 3.5.0

package/src/views/wms/page/outbound/pick/alone/index.vue

@@ -10,8 +10,8 @@
     type="alone"
     :task-index="taskIndex"
     :pick-data="pickData"
-    :lack-confirm-fn="lackConfirm"
-    :abn-confirm-fn="abnConfirm"
+    :lack-confirm-fn="mixinAloneLackConfirm"
+    :abn-confirm-fn="mixinAloneAbnConfirm"
     :get-data="getData"
     @pickConfirm="pickConfirm"
   >
@@ -22,7 +22,7 @@
         type="card"
         animated
         v-model="tabActive"
-        @change="goTop"
+        @change="mixinAllGoTop"
       >
 
         <!-- 正在拣选 -->
@@ -55,12 +55,16 @@
 
             <!-- 库位 -->
             <lw-input
+              v-if="mixinNeedInputLoc"
               :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.xkcxzwcj','拣选库位')"
               v-model="locationCode.value"
               :get-focus.sync="locationCode.focus"
               required
               rule-key="location"
-              @confirm="locationCodeConfirm"
+              :create-rule="$lwScanRule.create('独立件拣选-拣选库位','LOCATION')"
+              :owner-id="nowPickData.ownerId"
+              :rule-serve-query="nowPickData"
+              @confirm="mixinAloneLocationCodeConfirm"
             />
 
             <!-- 托盘号 -->
@@ -71,7 +75,10 @@
               :get-focus.sync="lpn.focus"
               required
               rule-key="lpn"
-              @confirm="lpnConfirm"
+              :create-rule="$lwScanRule.create('独立件拣选-托盘号','LPN')"
+              :owner-id="nowPickData.ownerId"
+              :rule-serve-query="nowPickData"
+              @confirm="mixinAloneLpnConfirm"
             />
 
             <!-- 箱号 -->
@@ -83,12 +90,29 @@
               required
               rule-key="case"
               :create-rule="$lwScanRule.create('独立件拣选-箱号','CASE')"
-              @confirm="boxConfirm"
+              :owner-id="nowPickData.ownerId"
+              :rule-serve-query="nowPickData"
+              @confirm="mixinAloneBoxConfirm"
             />
 
+            <lw-input
+              v-if="mixinNeedInputSku"
+              :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.dzyhigll','商品号')"
+              v-model="sku.value"
+              :get-focus.sync="sku.focus"
+              :disabled="disabledSku"
+              :need-show-clear="!sn.list.length"
+              required
+              rule-key="skuCode"
+              :create-rule="$lwScanRule.create('独立件拣选-商品号','SKU')"
+              :owner-id="nowPickData.ownerId"
+              :rule-serve-query="nowPickData"
+              @confirm="skuConfirm"
+            />
             <!-- 需要SN -->
             <template v-if="nowPickData.needHandleSn">
               <lw-input
+                ref="snInp"
                 :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.ktwfjnre','序列号')"
                 v-model="sn.value"
                 :get-focus.sync="sn.focus"
@@ -96,50 +120,54 @@
                 auto-clear-val
                 input-over-blur
                 rule-key="sn"
-                @confirm="snConfirm"
+                :create-rule="$lwScanRule.create('独立件拣选-序列号','SN')"
+                :owner-id="nowPickData.ownerId"
+                :rule-serve-query="nowPickData"
+                @confirm="mixinAloneSnConfirm"
               />
               <lw-scan-data-list-module
+                row-type="sn"
+                row-id="alone"
+                total-type="sn"
+                total-type-id="alone"
                 class="lw-global-row"
                 v-model="sn.list"
               />
             </template>
-            <!-- 商品号 -->
+            <!-- 商品数量 -->
             <template v-else>
-              <lw-input
-                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.dzyhigll','商品号')"
-                v-model="sku.value"
-                :get-focus.sync="sku.focus"
-                required
-                rule-key="skuCode"
-                :create-rule="$lwScanRule.create('独立件拣选-商品号','SKU')"
-                @confirm="skuConfirm"
+
+              <!-- 当前扫描 -->
+              <lw-title-value-cell
+                :title="$lwLanguage.get('','当前扫描')"
+                :value="nowScanVal || '-'"
+                val-bold
               />
-              <lw-input
+
+              <lw-get-qty-by-type
+                v-if="showUomQty"
+                ref="qty"
                 :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.wrqohiqb','数量')"
-                v-model="qty.value"
-                :get-focus.sync="qty.focus"
-                required
-                :disabled="qty.disabled"
-                type="digit"
+                :owner-id="nowPickData.ownerId"
+                :sku-id="nowPickData.skuId"
                 @confirm="qtyConfirm"
               >
                 <template #button>
                   <lw-button
-                    v-if="!qty.disabled"
                     mini
                     round
                     @click="qtyConfirm"
                   >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.ursidwbt', '确认') }}
                   </lw-button>
                 </template>
-              </lw-input>
+              </lw-get-qty-by-type>
             </template>
 
 
             <lw-cut-card
               v-model="taskIndex"
               :length="pickData.pendingPickLineList.length"
-              :cut-start="cutStart"
+              :cut-start="mixinAloneCutStart"
               :cut-end="cutEnd"
             />
 
@@ -153,22 +181,14 @@
           name="wait"
         >
 
-          <div
-            v-for="(i,k) in pickData.allLineList"
+          <wait-pick-collapse-item
+            class="lw-global-animation-out"
+            v-for="(i,k) in pickData.waitPickList"
             :key="k"
-            :class="[
-              'lw-global-model-box',
-              'lw-global-animation-out',
-              i.pickStatus !== '300' ? 'lw-global-click-style' : ''
-              ]"
-            :style="{
-              animationDelay: 50 * k + 'ms',
-              background: i.pickStatus === '300' ? '#ddd' : ''
-            }"
-            @click="allPickClick(i)"
-          >
-            <sku-location-info :item="i"/>
-          </div>
+            :style="{animationDelay: 50 * k + 'ms'}"
+            :item="i"
+            @skuClick="mixinAllWaitPickSkuClick"
+          />
 
 
         </van-tab>
@@ -180,8 +200,8 @@
     <split-put-down
       v-model="splitPopup.show"
       :item="splitPopup.data.splitDownData"
-      @splitConfirm="splitConfirm"
-      @closed="splitOff"
+      @splitConfirm="mixinAloneSplitConfirm"
+      @closed="mixinAloneSplitOff"
     />
   </data-look-and-change>
 </template>
@@ -190,12 +210,12 @@
 import dataLookAndChange from './../components/dataLookAndChange/index.vue'
 import skuLocationInfo from './../components/skuLocationInfo/index.vue'
 import splitPutDown from './../components/splitPutDown/index.vue'
+import waitPickCollapseItem from './../components/waitPickCollapseItem.vue'
 import {all} from "../mixin/all";
 import {aloneAndNotAlone} from "../mixin/aloneAndNotAlone";
 import {
   projectQueryAlonePickData,
   projectWmsOutboundAlonePick,
-  projectWmsOutboundPickCheckSn,
 } from "../../../../api/outbound/pick/alone";
 
 export default {
@@ -203,76 +223,12 @@ export default {
   components: {
     dataLookAndChange,
     skuLocationInfo,
-    splitPutDown
+    splitPutDown,
+    waitPickCollapseItem,
   },
   mixins: [all, aloneAndNotAlone],
-  computed: {
-    // 是否有lpn
-    hasLpn() {
-      return !this.nowPickData.fromCase && this.nowPickData.fromLpn
-    },
-    nowPickData() {
-      if (this.pickData.pendingPickLineList && this.pickData.pendingPickLineList.length) {
-        return this.pickData.pendingPickLineList[this.taskIndex]
-      }
-      return {}
-    }
-  },
   data() {
-    return {
-
-      // 当前任务索引
-      taskIndex: 0,
-
-      // 拣选数据
-      pickData: {},
-
-      // 拣选库位
-      locationCode: {
-        value: '',
-        focus: false
-      },
-
-      // 托盘号
-      lpn: {
-        value: '',
-        focus: false
-      },
-
-      // 箱号
-      box: {
-        value: '',
-        focus: false
-      },
-
-      // 商品
-      sku: {
-        value: '',
-        focus: false
-      },
-
-      // 商品数量
-      qty: {
-        value: '',
-        focus: false,
-        disabled: false
-      },
-
-      // 序列号
-      sn: {
-        value: '',
-        focus: false,
-        list: []
-      },
-
-
-      // 拆板下架弹出层
-      splitPopup: {
-        show: false,
-        // 后端返回的全部数据
-        data: {},
-      },
-    }
+    return {}
   },
   mounted() {
     this.getData()
@@ -284,109 +240,54 @@ export default {
       projectQueryAlonePickData({
         pickId: this.$route.query.lwPickId
       }).then(res => {
-        this.pickData = this.formatData(res)
-        this.checkTaskIndex(this.pickData.pendingPickLineList.length)
+        this.mixinAloneFormatData(res)
+        this.mixinAllInitGetFocus()
       }).catch(() => history.go(-1))
     },
 
-    // 拣选库位确认
-    locationCodeConfirm() {
-      if (this.locationCodeCheck()) {
-        if (this.hasLpn) {
-          this.lpn.focus = true
-        } else if (this.nowPickData.fromCase) {
-          this.box.focus = true
-        } else {
-          this.skuOrSnFocus()
-        }
-      }
-    },
-    // 检查拣选库位
-    locationCodeCheck() {
-
-      return this.inputCheck({
-        key: 'locationCode',
-        checkVal: this.nowPickData.fromLocationCode,
-      })
-    },
-
-    // 托盘号确认
-    lpnConfirm() {
-      if (this.lpnCheck()) this.skuOrSnFocus()
-    },
-    // 托盘号校验
-    lpnCheck() {
-
-      if (!this.hasLpn) return true
-
-      return this.inputCheck({
-        key: 'lpn',
-        needCheck: false
-      })
-    },
-
-    // 箱号确认
-    boxConfirm() {
-      if (this.boxCheck()) this.skuOrSnFocus()
-    },
-    // 箱号校验
-    boxCheck() {
+    // 商品确认
+    skuConfirm(val, data) {
 
-      if (!this.nowPickData.fromCase) return true
+      if (!this.mixinAloneSkuCheck()) return
 
-      return this.inputCheck({
-        key: 'box',
-        needCheck: false
-      })
-    },
+      this.nowScanVal = this.sku.value
 
-    // 商品或者sn输入框获取焦点
-    skuOrSnFocus() {
+      // 判断是否需要sn
       if (this.nowPickData.needHandleSn) {
         this.sn.focus = true
-      } else {
-        this.sku.focus = true
+        this.sku.disabled = true
+        if (data.sn) {
+          this.sn.value = data.sn
+          this.$refs.snInp.confirm()
+        }
+        return
       }
-    },
 
-    // 商品确认
-    skuConfirm(val, data) {
-
-      if (!this.skuCheck()) return
+      const newQty = data.qty ? data.qty : this.nowPickData.uomQty
+      const {success, total} = this.mixinAloneCheckPickQtyByQty(newQty)
+      if (success) {
+        // 如果条码解析成功，并且能解析出数量就回填数量
+        this.$refs.qty.setQty(total)
 
-      // 如果条码解析成功，并且能解析出数量就回填数量，并禁用数量输入框
-      if (data.qty) {
-        this.qty.disabled = true
-        this.qty.value = data.qty
-        this.pickConfirm()
-        return
+        if (data.qty) {
+          this.sku.value = ''
+          this.sku.focus = true
+        } else {
+          this.$refs.qty.getFocus()
+        }
       }
 
-      this.qty.disabled = false
-      this.qty.value = this.nowPickData.uomQty
-      this.qty.focus = true
-    },
-    // 商品检查
-    skuCheck() {
-      return this.inputCheck({
-        key: 'sku',
-        checkVal: this.nowPickData.skuCode,
-      })
-    },
 
-    // 数量确认
-    qtyConfirm() {
-      if (this.qtyCheck()) this.pickConfirm()
     },
+
     // 数量校验
     qtyCheck() {
-      const qty = Number(this.qty.value || 0)
+      const qty = this.$refs.qty.getQty() || 0
       if (!qty) {
-        this.qty.focus = true
+        this.$refs.qty.getFocus()
         this.$lwShowErrorMsg(
           this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.jpjuedkd', '拣选数量不能为空，且应当是大于0的整数')
         )
-        this.qty.value = ''
         return false
       }
 
@@ -394,81 +295,46 @@ export default {
       const uomQty = Number(item.uomQty || 0)
 
       if (uomQty === 0) {
-        console.warn(this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.sjyimafr', '拣选最小单位数据异常，值为：'), uomQty)
+        console.warn('拣选最小单位数据异常，值为：', item.uomQty)
         return true
       }
 
       if (qty % item.uomQty !== 0) {
-        this.qty.focus = true
+        this.$refs.qty.getFocus()
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.sicaarrb', '拣选数量应当为') + item.uomLabel.top + this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.gqzzynli', '的倍数')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.sicaarrb', '拣选数量应当为{num}的倍数', {num: item.uomLabel})
         )
-        this.qty.value = ''
+        this.$refs.qty.clearInput()
         return false
       }
 
       const waitQty = Number(item.totalQty || 0) - Number(item.pickQty || 0)
       if (qty > waitQty) {
-        this.qty.focus = true
+        this.$refs.qty.getFocus()
         this.$lwShowErrorMsg(
           this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.ytdthflm', '拣选数量不能大于待拣量')
         )
-        this.qty.value = ''
+        this.$refs.qty.clearInput()
         return false
       }
 
       return true
     },
-
-    // 序列号确认
-    snConfirm(val, {data}) {
-      const item = this.nowPickData
-      projectWmsOutboundPickCheckSn({
-        ownerId: item.ownerId,
-        skuId: item.skuId,
-        sn: data.key,
-        qty: data.qty || 0
-      }).then(res => {
-        this.sn.list.unshift(res)
-        this.sn.focus = true
-
-        // 如果拣选量复核要求就自动提交
-        let qty = 0
-        this.sn.list.forEach(item => {
-          qty = qty + item.qty
-        })
-        if (qty === (item.totalQty - item.pickQty)) {
-          this.pickConfirm()
-        }
-
-      })
+    // 数量确认
+    qtyConfirm() {
+      if (this.qtyCheck()) this.pickConfirm()
     },
 
-    // 任务行切换前
-    cutStart() {
-      return this.checkInputVal(
-        ['locationCode', 'lpn', 'box', 'sku', 'qty', 'sn'],
-        !!this.sn.list.length
-      )
-
-    },
-    // 任务行切换后
+    // 切换后
     cutEnd() {
-      this.clearInputVal(
-        this.getCheckInputKeyArr(this.nowPickData.fromCase),
-        ['sku', 'qty', 'sn']
-      )
-      this.sn.list = []
+      this.mixinAloneCutEnd()
     },
 
+
     // 确认拣选
     async pickConfirm() {
-      // 库位、托盘号
-      if (!(
-        this.locationCodeCheck() &&
-        this.lpnCheck() &&
-        this.boxCheck()
-      )) return
+
+      if (!this.checkAllInput()) return
 
       const item = this.nowPickData
       let currentPickQty = 0
@@ -479,21 +345,20 @@ export default {
         if (!this.sn.list.length) {
           this.sn.focus = true
           this.$lwShowErrorMsg(
-            this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.gzosuwuw', '请扫描拣选商品的序列号')
+            this.$lwLanguage.get('', '序列号不能为空')
           )
           return
         }
 
         // 有列表数据就合计拣选数量
-        this.sn.list.forEach(item => {
-          currentPickQty = currentPickQty + item.qty
-        })
+        currentPickQty = this.sn.list.reduce((t, i) => i.qty + t, 0)
+
       } else {
         // 不校验sn就调用数量检查方法检查数量输入
         if (!this.qtyCheck()) return;
 
         // 校验通过拣选数量就是输入框数量
-        currentPickQty = this.qty.value
+        currentPickQty = this.$refs.qty.getQty()
       }
 
 
@@ -516,27 +381,8 @@ export default {
         actualPickCaseNum: this.box.value
       })
 
-      // 判断是否需要打印箱票
-      try {
-        await this.$refs.dataLookAndChange.print(res)
-      } catch (e) {
-        console.warn('独立件打印箱票失败：', e)
-      }
-
-      this.splitPopup.data = res
-
-      this.$lwToast.success(
-        this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.alone.wweaupol', '拣选成功')
-      )
-
-      // 是否需要拆板下架
-      if (res.needSplitDown) {
-        this.splitPopup.show = true
-        this.splitPopup.container.focus = true
-        return
-      }
 
-      this.splitOff()
+      await this.mixinAlonePickSuccessCheck(res)
     },
   }
 }