@logwire/logwire-wms-pda-ui 1.1.17 → 1.2.0

package/src/components/page/outbound/pick/mixin/all.js

@@ -8,23 +8,23 @@ export const all = {
   methods: {
 
     // 输入框校验
-    inputCheck({key, checkVal}) {
+    inputCheck({key, checkVal, needCheck = true}) {
       const msg = {
         locationCode: {
-          nullMsg: this.$lwLanguage.get('', '拣选库位不能为空'),
-          checkMsg: this.$lwLanguage.get('', '当前库位与拣选库位不一致')
+          nullMsg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.all.locNull','拣选库位不能为空'),
+          checkMsg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.all.locErr','当前库位与拣选库位不一致')
         },
         lpn: {
-          nullMsg: this.$lwLanguage.get('', '托盘号不能为空'),
-          checkMsg: this.$lwLanguage.get('', '当前托盘号与拣选托盘号不一致')
+          nullMsg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.all.lpnNull','托盘号不能为空'),
+          checkMsg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.all.lpnErr','当前托盘号与拣选托盘号不一致')
         },
         box: {
-          nullMsg: this.$lwLanguage.get('', '箱号不能为空'),
-          checkMsg: this.$lwLanguage.get('', '当前箱号与拣选箱号不一致')
+          nullMsg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.all.boxNull','箱号不能为空'),
+          checkMsg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.all.boxErr','当前箱号与拣选箱号不一致')
         },
         sku: {
-          nullMsg: this.$lwLanguage.get('', '商品号不能为空'),
-          checkMsg: this.$lwLanguage.get('', '当前商品与商品不一致')
+          nullMsg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.all.skuNull','商品号不能为空'),
+          checkMsg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.all.skuErr','当前商品与商品不一致')
         },
       }
 
@@ -38,7 +38,7 @@ export const all = {
       }
 
       // 一致性判断
-      if (val !== checkVal) {
+      if (needCheck && val !== checkVal) {
         this[key].focus = true
         this.$lwShowErrorMsg(msg[key].checkMsg)
         this[key].value = ''
@@ -59,9 +59,7 @@ export const all = {
 
     // 校验当前索引是否满足未拣选的行数
     checkTaskIndex(length) {
-      if ((this.taskIndex + 1) > length) {
-        this.taskIndex = length - 1
-      }
+      this.taskIndex = this.$lwUtils.cutCardIndexCount(this.taskIndex, length)
       this.cutEnd()
     },
 
@@ -80,9 +78,9 @@ export const all = {
           need ||
           arr.some(item => !!this[item].value)
         ) {
-          this.$dialog.confirm({
-            title: this.$lwLanguage.get('', '警告'),
-            message: this.$lwLanguage.get('', '切换后当前输入数据将会被清空')
+          this.$lwDialog.confirm({
+            title: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.all.warn','警告'),
+            message: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.all.null','切换后当前输入数据将会被清空')
           }).then(() => res()).catch(() => err('用户取消'))
           return
         }

package/src/components/page/outbound/pick/mixin/aloneAndNotAlone.js

@@ -18,28 +18,28 @@ export const aloneAndNotAlone = {
       // 拣选单位中文翻译
       const uomLabel = {
         EA: {
-          top: this.$lwLanguage.get('','最小销售数'),
-          table: this.$lwLanguage.get('','最小销售')
+          top: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.min','最小销售数'),
+          table: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.minNum','最小销售')
         },
         IP: {
-          top: this.$lwLanguage.get('','内装数'),
-          table: this.$lwLanguage.get('','内装'),
+          top: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.inNum','内装数'),
+          table: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.in','内装'),
         },
         CS: {
-          top: this.$lwLanguage.get('','箱装数'),
-          table: this.$lwLanguage.get('','箱'),
+          top: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.boxNum','箱装数'),
+          table: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.box','箱'),
         },
         PL: {
-          top: this.$lwLanguage.get('','托装数'),
-          table: this.$lwLanguage.get('','托'),
+          top: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.lpnNum','托装数'),
+          table: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.lpn','托'),
         },
         LPN: {
-          top: this.$lwLanguage.get('','整托盘'),
-          table: this.$lwLanguage.get('','托'),
+          top: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.allLpn','整托盘'),
+          table: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.lpn','托'),
         },
         CASE: {
-          top: this.$lwLanguage.get('','整箱'),
-          table: this.$lwLanguage.get('','箱'),
+          top: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.allBox','整箱'),
+          table: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.box','箱'),
         }
       }
 
@@ -96,7 +96,7 @@ export const aloneAndNotAlone = {
         ...data
       }).then(()=>{
         this.$lwToast.success(
-            this.$lwLanguage.get('','操作成功')
+            this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.mixin.aloneAndNotAlone.success','操作成功')
         )
         this.splitPopup.show = false
       })

package/src/components/page/outbound/pick/notAlone/index.js

@@ -1,11 +1,11 @@
-/*
-* 出库拣选 - 非独立件
-* @author: 张文
-* @date  2022-06-20
-* */
-
-import lwOutboundPickNotAloneActionPage from "./index.vue";
-
-lwOutboundPickNotAloneActionPage.install = Vue => Vue.component(lwOutboundPickNotAloneActionPage.name, lwOutboundPickNotAloneActionPage)
-
-export default lwOutboundPickNotAloneActionPage
+/*
+* 出库拣选 - 非独立件
+* @author: 张文
+* @date  2022-06-20
+* */
+
+import lwOutboundPickNotAloneActionPage from "./index.vue";
+
+lwOutboundPickNotAloneActionPage.install = Vue => Vue.component(lwOutboundPickNotAloneActionPage.name, lwOutboundPickNotAloneActionPage)
+
+export default lwOutboundPickNotAloneActionPage

package/src/components/page/outbound/pick/notAlone/index.vue

@@ -23,7 +23,7 @@
       class="lw-global-model-box"
     >
       <lw-input
-        :title="$lwLanguage.get('','拣选容器号')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.unljebyh','拣选容器号')"
         v-model="container.value"
         :get-focus.sync="container.focus"
         :disabled="container.confirm"
@@ -37,8 +37,8 @@
             @click="containerBtnClick"
           >{{
             container.confirm ?
-            $lwLanguage.get('','切换容器') :
-            $lwLanguage.get('','确定')
+            $lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.txptjnap','切换容器') :
+            $lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.qfccyeko','确定')
           }}</lw-button>
         </template>
       </lw-input>
@@ -57,27 +57,27 @@
 
           <!-- 正在拣选 -->
           <van-tab
-            :title="$lwLanguage.get('','正在拣选')"
+            :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.sfecqvpr','正在拣选')"
             name="ing"
           >
             <div class="lw-global-model-box">
 
               <sku-location-info
-                :item="pickData.pendingPickLineList[taskIndex]"
+                :item="nowPickData"
                 wait-pick
               />
 
               <!-- 托盘号 -->
               <lw-title-value-cell
                 v-if="hasLpn"
-                :title="$lwLanguage.get('','托盘号')"
-                :value="pickData.pendingPickLineList[taskIndex].fromLpn"
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.gpsjuyqm','托盘号')"
+                :value="nowPickData.fromLpn"
                 val-bold
               />
 
               <!-- 库位 -->
               <lw-input
-                :title="$lwLanguage.get('','拣选库位')"
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.riqyoozc','拣选库位')"
                 v-model="locationCode.value"
                 :get-focus.sync="locationCode.focus"
                 required
@@ -88,7 +88,7 @@
               <!-- 托盘号 -->
               <lw-input
                 v-if="hasLpn"
-                :title="$lwLanguage.get('','托盘号')"
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.gpsjuyqm','托盘号')"
                 v-model="lpn.value"
                 :get-focus.sync="lpn.focus"
                 required
@@ -98,7 +98,7 @@
 
               <!-- 商品号 -->
               <lw-input
-                :title="$lwLanguage.get('','商品号')"
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.wunzopak','商品号')"
                 v-model="sku.value"
                 :get-focus.sync="sku.focus"
                 required
@@ -106,7 +106,7 @@
                 @confirm="skuConfirm"
               />
               <lw-input
-                :title="$lwLanguage.get('','数量')"
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.rwiwdjks','数量')"
                 v-model="qty.value"
                 :get-focus.sync="qty.focus"
                 required
@@ -119,7 +119,7 @@
                     mini
                     round
                     @click="qtyConfirm"
-                  >{{ $lwLanguage.get('','确认') }}</lw-button>
+                  >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.cwcxalqk','确认') }}</lw-button>
                 </template>
               </lw-input>
 
@@ -138,7 +138,7 @@
 
           <!-- 拣选明细行 -->
           <van-tab
-            :title="$lwLanguage.get('','拣选明细行')"
+            :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.gzyjrunq','拣选明细行')"
             name="wait"
           >
 
@@ -178,13 +178,13 @@
 
     <!-- 切换容器号弹框弹框 -->
     <lw-popup
-      :title="$lwLanguage.get('','切换容器')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.txptjnap','切换容器')"
       v-model="container.popup.show"
       @closed="container.popup.value=''"
     >
 
       <lw-input
-        :title="$lwLanguage.get('','新容器号')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.dqarkhkg','新容器号')"
         v-model="container.popup.value"
         :get-focus.sync="container.popup.focus"
         rule-key="cutContainer"
@@ -193,7 +193,7 @@
 
       <template #button>
         <lw-button @click="containerConfirm">
-          {{ $lwLanguage.get('','切换容器') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.txptjnap','切换容器') }}
         </lw-button>
       </template>
 
@@ -225,7 +225,15 @@ export default {
   computed:{
     // 是否有lpn
     hasLpn(){
-      return !!this.pickData.pendingPickLineList[this.taskIndex].fromLpn
+      return !!this.nowPickData.fromLpn
+    },
+
+    // 当前拣选数据
+    nowPickData(){
+      if (this.pickData.pendingPickLineList && this.pickData.pendingPickLineList.length){
+        return this.pickData.pendingPickLineList[this.taskIndex]
+      }
+      return {}
     }
   },
   data() {
@@ -313,7 +321,7 @@ export default {
         pickContainer: container
       }).then(()=>{
         this.$lwToast.success(
-          this.$lwLanguage.get('','容器绑定成功')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.atjhrrvp','容器绑定成功')
         )
         this.container.popup.show = false
         this.container.value = container
@@ -333,7 +341,7 @@ export default {
       }
 
       this.$lwShowErrorMsg(
-        this.$lwLanguage.get('','拣选容器号不能为空')
+        this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.jlnfibwb','拣选容器号不能为空')
       )
       return false
     },
@@ -364,7 +372,7 @@ export default {
 
       return this.inputCheck({
         key: 'locationCode',
-        checkVal: this.pickData.pendingPickLineList[this.taskIndex].fromLocationCode,
+        checkVal: this.nowPickData.fromLocationCode,
       })
     },
 
@@ -379,7 +387,8 @@ export default {
 
       return this.inputCheck({
         key: 'lpn',
-        checkVal: this.pickData.pendingPickLineList[this.taskIndex].fromLpn,
+        checkVal: this.nowPickData.fromLpn,
+        needCheck: false
       })
     },
 
@@ -394,7 +403,7 @@ export default {
         newQty = data.qty
       }
 
-      newQty = Number(this.pickData.pendingPickLineList[this.taskIndex].uomQty)
+      newQty = Number(this.nowPickData.uomQty)
       this.qty.value = Number(this.qty.value || 0) + newQty
       this.qty.focus = true
     },
@@ -402,7 +411,7 @@ export default {
     skuCheck(){
       return this.inputCheck({
         key: 'sku',
-        checkVal: this.pickData.pendingPickLineList[this.taskIndex].skuCode,
+        checkVal: this.nowPickData.skuCode,
       })
     },
 
@@ -416,24 +425,24 @@ export default {
       if (!qty){
         this.qty.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','拣选数量不能为空，且应当是大于0的整数')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.reczyytt','拣选数量不能为空，且应当是大于0的整数')
         )
         this.qty.value = ''
         return false
       }
 
-      const item = this.pickData.pendingPickLineList[this.taskIndex]
+      const item = this.nowPickData
       const uomQty = Number(item.uomQty || 0)
 
       if (uomQty === 0){
-        console.warn('拣选最小单位数据异常，值为：', uomQty)
+        console.warn(this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.jhatfwzc', '拣选最小单位数据异常，值为：'), uomQty)
         return true
       }
 
       if (qty%item.uomQty !== 0){
         this.qty.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','拣选数量应当为') + item.uomLabel.top + this.$lwLanguage.get('','的倍数')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.qlwquwbn','拣选数量应当为') + item.uomLabel.top + this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.ectkxfbd','的倍数')
         )
         this.qty.value = ''
         return false
@@ -443,7 +452,7 @@ export default {
       if (qty > waitQty){
         this.qty.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','拣选数量不能大于待拣量')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.priuzexu','拣选数量不能大于待拣量')
         )
         this.qty.value = ''
         return false
@@ -477,7 +486,7 @@ export default {
         this.qtyCheck()
       )) return
 
-      const item = this.pickData.pendingPickLineList[this.taskIndex]
+      const item = this.nowPickData
       projectWmsOutboundStandardPick({
         pickId: this.pickData.pickId,
         pickNo: this.pickData.pickNo,
@@ -502,7 +511,7 @@ export default {
         this.splitPopup.data = res
 
         this.$lwToast.success(
-          this.$lwLanguage.get('','拣选成功')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.notAlone.bxmfgbup','拣选成功')
         )
 
         // 是否需要拆板下架

package/src/components/page/outbound/pick/sow/index.js

@@ -0,0 +1,11 @@
+/*
+* 边拣边分
+* @author: 张文
+* @date: 2022-08-15
+* */
+
+import lwOutboundPickSowPage from "./index.vue";
+
+lwOutboundPickSowPage.install = Vue => Vue.component(lwOutboundPickSowPage.name, lwOutboundPickSowPage)
+
+export default lwOutboundPickSowPage