@logwire/logwire-wms-pda-ui 1.1.19 → 3.1.0

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

@@ -6,107 +6,30 @@
 <template>
   <div>
 
-    <lw-nav-bar :title="$lwLanguage.get('','执行拣选')"/>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.gmmvhnxt','执行拣选')"/>
 
     <!-- 页主体 -->
     <div class="lw-global-page-box">
 
       <!-- 头部数据看板 -->
-      <div
-        class="lw-global-model-box"
-        style="border-radius: 10px 10px 0 0"
-      >
-        <div class="lw-global-flex-start">
-
-          <img
-            :src="require('./../../../../../../assets/img/taskOrder.png')"
-            alt=""
-            style="width: 50px;"
-          >
-
-          <div style="margin-left: 10px">
-            <div class="lw-global-value-bold" style="font-size: 16px">{{ pickData.pickNo }}</div>
-
-            <!-- 捆包类型 -->
-            <lw-tag
-              v-if="pickData.pickPackTypeLabel"
-              style="margin-left: 0"
-              plain
-              round
-            >{{ pickData.pickPackTypeLabel }}</lw-tag>
-            <!-- 拣选方式 -->
-            <lw-tag
-              v-if="pickData.pickMethodLabel"
-              type="warning"
-              plain
-              round
-            >{{ pickMethod }}</lw-tag>
-          </div>
-
-        </div>
-      </div>
-      <lw-data-look-bg type="not">
-
-        <!-- 计划量 -->
-        <div>
-          <div>{{ pickData.totalQty || 0 }}</div>
-          <div class="lw-data-look-bg-title">
-            {{ $lwLanguage.get('','计划量') }}
-          </div>
-        </div>
-
-        <!-- 已拣量 -->
-        <div>
-          <div>{{ pickData.pickQty || 0 }}</div>
-          <div class="lw-data-look-bg-title">
-            {{ $lwLanguage.get('','已拣量') }}
-          </div>
-        </div>
-
-        <!-- 待拣量 -->
-        <div>
-          <div>{{ pickData.waitPickQty || 0 }}</div>
-          <div class="lw-data-look-bg-title">
-            {{ $lwLanguage.get('','待拣量') }}
-          </div>
-        </div>
-
-        <!-- 异常量 -->
-        <div class="lw-data-last-item">
-          <div>{{ pickData.abnormalQty || 0 }}</div>
-          <div class="lw-data-look-bg-title">
-            {{ $lwLanguage.get('','异常量') }}
-          </div>
-        </div>
-
-      </lw-data-look-bg>
-      <div
-        class="lw-global-model-box"
-        style="border-radius: 0 0 10px 10px;margin-bottom: 10px"
+      <task-info
+        :item="pickData"
       >
-        <!--进度条-->
-        <van-progress
-          style="margin: 5px 0"
-          stroke-width="8"
-          :percentage="percentage"
-          color="linear-gradient(90deg, #FF8E8F 0%, #C5000A 100%)"
-        />
-
         <div style="margin-top: 15px">
           <lw-tag
             v-if="pickData.allocationOrder"
             type="danger"
             round
             plain
-          >{{ $lwLanguage.get('','调拨出库') }}</lw-tag>
+          >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.tflazism','调拨出库') }}</lw-tag>
           <lw-tag
             v-if="pickData.multiInOne"
             round
             plain
-          >{{ $lwLanguage.get('','多件一票') }}</lw-tag>
+          >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.jzgvyidm','多件一票') }}</lw-tag>
         </div>
         <slot name="look-bottom"></slot>
-      </div>
+      </task-info>
 
       <!-- 业务自定义 -->
       <slot></slot>
@@ -120,24 +43,24 @@
     >
       <div style="text-align: center;">
         <div class="lw-global-value-bold">A00001</div>
-        <div class="lw-global-title">{{ $lwLanguage.get('','已打印出库票') }}</div>
+        <div class="lw-global-title">{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.czojjcua','已打印出库票') }}</div>
       </div>
 
       <div style="text-align: center;">
         <div class="lw-global-value-bold">2</div>
-        <div class="lw-global-title">最小销售数</div>
+        <div class="lw-global-title">{{$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.xuaisfpz', '最小销售数')}}</div>
       </div>
 
       <div style="text-align: center;">
         <div class="lw-global-value-bold-red">4</div>
-        <div class="lw-global-title">{{ $lwLanguage.get('','商品数') }}</div>
+        <div class="lw-global-title">{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.rzgcodrm','商品数') }}</div>
       </div>
 
       <lw-button
         style="flex-shrink: 0"
         mini
         round
-      >{{ $lwLanguage.get('','补打票') }}</lw-button>
+      >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.jladlkga','补打票') }}</lw-button>
 
     </div>
 
@@ -147,23 +70,23 @@
       <lw-button
         type="last"
         @click="lackBtn"
-      >{{ $lwLanguage.get('','拣选缺货') }}</lw-button>
+      >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.odduxuax','拣选缺货') }}</lw-button>
 
       <lw-button
         type="normal"
         plain
         @click="abnBtn"
-      >{{ $lwLanguage.get('','异常') }}</lw-button>
+      >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.wrhgkhxs','异常') }}</lw-button>
 
       <lw-button
         @click="confirmBtn"
-      >{{ $lwLanguage.get('','确认拣选') }}</lw-button>
+      >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.ubkjkecw','确认拣选') }}</lw-button>
 
     </lw-bottom-bar>
 
-    <!-- 多零件选择 -->
+    <!-- 多商品选择 -->
     <lw-popup
-      :title="$lwLanguage.get('','选择商品')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.kvpwvbms','选择商品')"
       v-model="skuSelectPopup.show"
     >
 
@@ -190,7 +113,7 @@
 
     <!-- 拣选缺货 -->
     <lw-popup
-      :title="$lwLanguage.get('','拣选缺货')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.odduxuax','拣选缺货')"
       v-model="lackPopup.show"
     >
 
@@ -218,7 +141,7 @@
         <div class="lw-global-flex-between lw-global-row">
 
           <lw-title-value-cell
-            :title="$lwLanguage.get('','拣选库位')"
+            :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.jphugkrl','拣选库位')"
             :value="lackPopup.skuInfo.fromLocationCode"
             val-bold
             :is-row="false"
@@ -226,7 +149,7 @@
 
           <div>
             <span class="lw-global-title">
-              {{ $lwLanguage.get('','最小销售量') }}
+              {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.ahlgyadg','最小销售量') }}
             </span>
             <span class="lw-global-value-bold-red">
               {{ lackPopup.skuInfo.uomQty }}
@@ -237,7 +160,7 @@
 
         <lw-title-value-cell
           class="lw-global-row"
-          :title="$lwLanguage.get('','待拣量')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.nbwstigk','待拣量')"
           :value="lackPopup.skuInfo.qty || 0"
           val-bold
           :is-row="false"
@@ -247,7 +170,7 @@
 
 
       <lw-input
-        :title="$lwLanguage.get('','缺货量')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.mcywreph','缺货量')"
         v-model="lackPopup.lackQty"
         :get-focus.sync="lackPopup.lackQtyFocus"
         type="digit"
@@ -256,14 +179,14 @@
 
       <template #button>
         <lw-button @click="lackConfirm"
-        >{{ $lwLanguage.get('','确认') }}</lw-button>
+        >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.pwuturyd','确认') }}</lw-button>
       </template>
 
     </lw-popup>
 
     <!-- 异常 -->
     <lw-popup
-      :title="$lwLanguage.get('','异常')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.wrhgkhxs','异常')"
       v-model="abnPopup.show"
       @closed="abnPopup.comShow = false"
     >
@@ -273,30 +196,30 @@
         ref="abnormal"
         v-bind="abnPopup.skuInfo"
         :location="abnPopup.skuInfo.fromLocationCode"
-        :type="$lwLanguage.get('','在库')"
-        :ab-type="$lwLanguage.get('','拣选')"
+        :type="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.jguajwtw','在库')"
+        :ab-type="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.sveqfqie','拣选')"
       />
 
       <template #button>
         <lw-button @click="abnConfirm"
-        >{{ $lwLanguage.get('','确认') }}</lw-button>
+        >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.pwuturyd','确认') }}</lw-button>
       </template>
 
     </lw-popup>
 
     <!-- 去播种 -->
     <lw-popup
-      :title="$lwLanguage.get('','拣选完成 - 提总')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.wkhikwpx','拣选完成 - 提总')"
       v-model="sowShow"
-      :off-btn-fn="backPage"
+      @closed="backPage"
     >
 
       <div class="lw-global-row lw-data-loot-adn-change-success">
-        {{ $lwLanguage.get('','当前任务已拣选完成，请移动到播种墙进行播种分拣') }}
+        {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.tiqcxxpm','当前任务已拣选完成，请移动到播种墙进行播种集货') }}
       </div>
 
       <lw-title-value-cell
-        :title="$lwLanguage.get('','拣选容器号')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.adpgbpey','拣选容器号')"
         :value="pickContainer"
         val-red
         val-bold
@@ -304,27 +227,33 @@
       />
 
       <lw-title-value-cell
-        :title="$lwLanguage.get('','播种墙')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.nonxcofj','播种墙')"
         :value="pickData.sowCode"
         val-bold
         :val-size="16"
       />
 
+      <template #button>
+        <lw-button @click="goSowCollect">
+          {{$lwLanguage.get('','播种集货')}}
+        </lw-button>
+      </template>
+
     </lw-popup>
 
     <!-- 集合 -->
     <lw-popup
-      :title="$lwLanguage.get('','拣选完成')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.ocnaieum','拣选完成')"
       v-model="summaryShow"
-      :off-btn-fn="backPage"
+      @closed="backPage"
     >
 
       <div class="lw-global-row lw-data-loot-adn-change-success">
-        {{ $lwLanguage.get('','当前任务已拣选完成，请移动到集合口进行分区拣选集合') }}
+        {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.iotrhdno','当前任务已拣选完成，请移动到集合口进行分区拣选集合') }}
       </div>
 
       <lw-title-value-cell
-        :title="$lwLanguage.get('','拣选容器号')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.adpgbpey','拣选容器号')"
         :value="pickContainer"
         val-red
         val-bold
@@ -333,14 +262,14 @@
 
       <div class="lw-global-flex-between">
         <lw-title-value-cell
-          :title="$lwLanguage.get('','集合口')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.nicfndjc','集合口')"
           :value="pickData.summaryCode"
           val-bold
           :val-size="16"
         />
 
         <lw-title-value-cell
-          :title="$lwLanguage.get('','集合位')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.rnlhotsx','集合位')"
           :value="pickData.summaryLineCode"
           val-bold
           :val-size="16"
@@ -351,26 +280,26 @@
 
     <!-- 独立件 - 集货 -->
     <lw-popup
-      :title="$lwLanguage.get('','拣选完成')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.ocnaieum','拣选完成')"
       v-model="aloneShow"
-      :off-btn-fn="backPage"
+      @closed="backPage"
     >
 
       <div class="lw-global-row lw-data-loot-adn-change-success">
-        {{ $lwLanguage.get('','当前任务已拣选完成，请移动到集货位进行集货') }}
+        {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.yxomdpgj','当前任务已拣选完成，请移动到集货位进行集货') }}
       </div>
 
     </lw-popup>
 
     <!-- 非独立件 -->
     <lw-popup
-      :title="$lwLanguage.get('','拣选完成')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.ocnaieum','拣选完成')"
       v-model="notAloneShow"
-      :off-btn-fn="backPage"
+      @closed="backPage"
     >
 
       <div class="lw-global-row lw-data-loot-adn-change-success">
-        {{ $lwLanguage.get('','当前任务已拣选完成，请移动到捆包区:') }}
+        {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.usntgvja','当前任务已拣选完成，请移动到捆包区:') }}
         <span
           class="lw-global-value-bold-red"
           style="font-size: 16px"
@@ -380,17 +309,13 @@
       <!-- 独立捆包件不显示 -->
       <lw-title-value-cell
         v-if="pickData.pickMethod !== 'ALONE_PACK'"
-        :title="$lwLanguage.get('','拣选容器号')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.adpgbpey','拣选容器号')"
         :value="pickContainer"
         val-red
         val-bold
         :val-size="16"
       />
 
-      <div style="text-align: center;margin-top: 10px">
-        <lw-tag size="large">{{ pickData.pickPackTypeLabel }}</lw-tag>
-      </div>
-
     </lw-popup>
 
 
@@ -398,9 +323,14 @@
 </template>
 
 <script>
+import taskInfo from "../taskInfo.vue";
+import {projectWmsGetPrintBoxData} from "../../../../../../api/outbound/reprint-box";
 
 export default {
   name: "index",
+  components:{
+    taskInfo
+  },
   props:{
 
     // 当前拣选类型： box-按箱、lpn-按托盘、alone-独立件、notAlone-非独立件
@@ -462,10 +392,10 @@ export default {
     // 拣选方式
     pickMethod(){
       if (this.pickData.pickUom === 'CASE'){
-        return this.$lwLanguage.get('','按箱拣选')
+        return this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.gjxccjvg','按箱拣选')
       }
       if (this.pickData.pickUom === 'LPN'){
-        return this.$lwLanguage.get('','整托盘拣选')
+        return this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.htxwnpou','整托盘拣选')
       }
 
       return this.pickData.pickMethodLabel
@@ -473,9 +403,9 @@ export default {
   },
   data() {
     return {
-      // 选择零件的弹框
+      // 选择商品的弹框
       skuSelectPopup:{
-        // 调用选择零件的父类型：缺货-lack，异常-abn
+        // 调用选择商品的父类型：缺货-lack，异常-abn
         type:'',
         show: false,
         list:[]
@@ -509,11 +439,20 @@ export default {
       notAloneShow: false,
 
       // 有无打印数据
-      hasPrint: false
+      hasPrint: false,
+
+      // 打印机信息
+      printData:{}
     }
   },
   mounted() {
-    // TODO 检查是否配置了打印机
+    // 判断当前是否配置了打印机
+    const {printData} = this.$lwPrint.test(
+      'OUTBOUND_BOX_LABEL',
+      this.$lwLanguage.get('','出库箱票标签'),
+      false
+    )
+    this.printData = printData || {}
   },
   methods: {
 
@@ -521,7 +460,7 @@ export default {
     lackAbnSuccess(res){
       if (res.generateStatus){
         this.$lwToast.success(
-          this.$lwLanguage.get('','上报缺货成功')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.eknxrtel','上报缺货成功')
         )
       }
 
@@ -553,7 +492,7 @@ export default {
     },
 
 
-    // 缺货拣选或者异常上报时候是否存在多零件
+    // 缺货拣选或者异常上报时候是否存在多商品
     checkSkuMore(type){
 
       let data
@@ -597,13 +536,13 @@ export default {
         }
       }
     },
-    // 显示需要选择零件的弹框
+    // 显示需要选择商品的弹框
     showSkuSelect(list, type){
       this.skuSelectPopup.list = list
       this.skuSelectPopup.type = type
       this.skuSelectPopup.show = true
     },
-    // 选中零件
+    // 选中商品
     skuSelectClick(item){
       if (this.skuSelectPopup.type === 'abn'){
         this.showAbnPopup(item)
@@ -634,7 +573,7 @@ export default {
       if (!qty){
         this.lackPopup.lackQtyFocus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','缺货量不能为空，且应当是大于0的整数')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.vgtttoca','缺货量不能为空，且应当是大于0的整数')
         )
         this.lackPopup.lackQty = ''
         return
@@ -646,7 +585,7 @@ export default {
       if (Number(sku.qty || 0) < qty){
         this.lackPopup.lackQtyFocus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','缺货量不能大于待拣量')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.lqqjxrxd','缺货量不能大于待拣量')
         )
         this.lackPopup.lackQty = ''
         return
@@ -710,9 +649,31 @@ export default {
 
 
     // 打印箱票
-    print(res){
-      // TODO 调用接口获取打印数据
-      console.log(res)
+    async print(res){
+      if (!this.printData.printId) {
+        console.warn('获取打印设备失败，可能是未配置打印机，打印终止')
+        return
+      }
+      try {
+        const printData = await projectWmsGetPrintBoxData({
+          boxId: res.packBoxId,
+          printDeviceId: this.printData.printId
+        })
+
+        await this.$lwPrint.bluetoothPrint({taskId:printData.id})
+      }catch (e) {
+        console.warn('打印箱票失败：', e)
+      }
+    },
+
+    // 提总拣选完成 - 播种集货
+    goSowCollect(){
+      this.$router.replace({
+        path:'/outbound/sowCollect/lwIndex',
+        query:{
+          pickContainer: this.pickContainer
+        }
+      })
     }
 
   }

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

@@ -1,5 +1,5 @@
 <!--
-  出库拣选 - 零件及库位信息展示
+  出库拣选 - 商品及库位信息展示
   @author: 张文
   @date: 2022-06-17
 -->
@@ -22,9 +22,10 @@
 
           <!-- 尺寸 -->
           <lw-tag
+            v-if="item.skuSizeLabel"
             plain
             round
-          >{{ item.skuSizeLabel || '-' }}</lw-tag>
+          >{{ item.skuSizeLabel }}</lw-tag>
 
           <!-- 拣选状态 -->
           <lw-tag
@@ -47,7 +48,7 @@
       ]"
     >
       <lw-title-value-cell
-        :title="$lwLanguage.get('','拣选库位')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.ikdqzbgv','拣选库位')"
         :value="item.fromLocationCode"
         val-bold
         :is-row="false"
@@ -63,7 +64,7 @@
       />
       <lw-title-value-cell
         v-else
-        :title="$lwLanguage.get('','已拣选/计划')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.fwtrskro','已拣选/计划')"
         :value="item.pickQty + ' / ' + item.totalQty"
         val-bold
         val-red
@@ -94,7 +95,7 @@
           style="font-size: 16px"
         >{{ item.pickQty }} / {{ item.totalQty }}</div>
         <div class="lw-global-title">
-          {{ $lwLanguage.get('','总量') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.spymmddb','总量') }}
         </div>
       </div>
 
@@ -105,7 +106,7 @@
           style="font-size: 16px"
         >{{ waitQty }}</div>
         <div class="lw-global-title">
-          {{ $lwLanguage.get('','待拣量') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.ghoxuwxz','待拣量') }}
         </div>
       </div>
 
@@ -150,29 +151,29 @@ export default {
         case '100':
           return {
             type: 'danger',
-            msg: this.$lwLanguage.get('', '未拣选')
+            msg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.dgwlpfxf','未拣选')
           }
         case '200':
           return {
             type: 'warning',
-            msg: this.$lwLanguage.get('', '拣选中')
+            msg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.amobnsbo','拣选中')
           }
         case '300':
           return {
             type: 'success',
-            msg: this.$lwLanguage.get('', '已拣选')
+            msg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.gfspoqjr','已拣选')
           }
         default:
           return {
             type: 'primary',
-            msg: this.$lwLanguage.get('', '未知')
+            msg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.hrcwcwcb','未知')
           }
       }
     },
 
     // 待拣量
     waitQty(){
-      return Number(this.item.totalQty || 0) - Number(this.item.pickQty)
+      return Number(this.item.totalQty || 0) - Number(this.item.pickQty || 0)
     },
 
     // 最小单位数
@@ -187,7 +188,7 @@ export default {
 
       const uomQty = Number(this.item.uomQty || 0)
       if (uomQty === 0) {
-        console.warn('拣选最小单位数据异常，无法做除法运算！值为：',this.item.uomQty)
+        console.warn(this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.skuLocationInfo.xdvunhnd', '拣选最小单位数据异常，无法做除法运算！值为：'),this.item.uomQty)
         return 0
       }