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

package/src/components/page/outbound/bale/components/containerInfo/index.vue

@@ -6,14 +6,11 @@
 <template>
   <div>
 
-    <div
-      style="border-radius: 10px 10px 0 0"
-      class="lw-global-flex-between lw-global-model-box"
-    >
+    <div class="lw-global-flex-between lw-global-model-top-radius">
 
       <lw-title-value-cell
         style="flex:1"
-        :title="$lwLanguage.get('','容器号')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.ydaonusj','容器号')"
         :value="container"
         val-bold
         :is-row="false"
@@ -25,51 +22,50 @@
         round
         mini
         @click="allCheck"
-      >{{ $lwLanguage.get('','全部复核') }}</lw-button>
+      >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.tkxjaeza','全部复核') }}</lw-button>
 
     </div>
 
     <lw-data-look-bg type="not">
-      <div>
+      <div v-if="showCustomer">
 
-        <div>{{ skuCount }}</div>
-        <div class="lw-data-look-bg-title">
-          {{ $lwLanguage.get('','品种数') }}
+        <div>{{ customerCount || 0 }}</div>
+        <div>
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.lvjrjuvr','客户数') }}
         </div>
 
       </div>
-
       <div>
 
-        <div>{{ waitCount }}</div>
-        <div class="lw-data-look-bg-title">
-          {{ $lwLanguage.get('','待复核') }}
+        <div>{{ skuCount }}</div>
+        <div>
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.vdkljntv','品种数') }}
         </div>
 
       </div>
 
       <div>
 
-        <div>{{ overCount }}</div>
-        <div class="lw-data-look-bg-title">
-          {{ $lwLanguage.get('','已复核') }}
+        <div>{{ waitCount }}</div>
+        <div>
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.ogeeqjzr','待复核') }}
         </div>
 
       </div>
 
-      <div class="lw-data-last-item">
+      <div>
 
-        <div>{{ abnormalCount }}</div>
-        <div class="lw-data-look-bg-title">
-          {{ $lwLanguage.get('','异常') }}
+        <div>{{ overCount }}</div>
+        <div>
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.vwbnookb','已复核') }}
         </div>
 
       </div>
     </lw-data-look-bg>
 
     <div
-      style="border-radius: 0 0 10px 10px;padding: 0 10px 3px"
-      class="lw-global-model-box lw-global-collapse-box"
+      style="padding: 0 10px 3px"
+      class="lw-global-model-bottom-radius lw-global-collapse-box"
     >
 
       <!-- 折叠框 -->
@@ -84,12 +80,12 @@
             <div class="lw-global-flex-between">
 
               <div class="lw-global-title">
-                {{ $lwLanguage.get('','商品列表') }}
+                {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.ebqgtuka','商品列表') }}
               </div>
 
               <div class="lw-global-value-bold-red">
                 {{ skuList.length || 0 }}
-                {{ $lwLanguage.get('','行') }}
+                {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.wobsgwyf','行') }}
               </div>
 
             </div>
@@ -102,14 +98,13 @@
             :sku-code="i.skuCode"
             :sku-name="i.skuName"
             is-row
-            :is-last="(k+1) === skuList.length"
+            :is-row-last="(k+1) === skuList.length"
           >
 
             <div style="text-align: center">
 
-              <div class="lw-global-value-bold">
-                <span class="lw-global-value-bold-red">{{ i.packQty }}</span>
-                <span> / {{ i.totalQty }}</span>
+              <div class="lw-global-value-bold-red">
+                {{ i.totalQty - i.packQty }}
               </div>
 
               <lw-button
@@ -117,7 +112,7 @@
                 round
                 mini
                 @click="abnBtnClick(i)"
-              >{{ $lwLanguage.get('','异常') }}</lw-button>
+              >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.zjxmxgij','异常') }}</lw-button>
 
             </div>
 
@@ -129,7 +124,7 @@
     </div>
 
     <lw-popup
-      :title="$lwLanguage.get('','异常上报')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.bxgdgfvn','异常上报')"
       v-model="abnPopup.show"
       @closed="abnPopup.comShow = false"
     >
@@ -139,15 +134,15 @@
         ref="abnormal"
         :sku-code="abnPopup.data.skuCode"
         :sku-name="abnPopup.data.skuName"
-        :qty="abnPopup.data.availInvQty"
+        :qty="abnPopup.data.waitQty"
         :location="abnPopup.data.locationCode"
-        :type="$lwLanguage.get('','出库')"
-        :ab-type="$lwLanguage.get('','捆包')"
+        :type="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.goleqnbr','出库')"
+        :ab-type="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.lyzvwyim','捆包')"
       />
 
       <template #button>
         <lw-button @click="abnConfirmBtn">
-          {{ $lwLanguage.get('','上报') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.kfkccxqo','上报') }}
         </lw-button>
       </template>
 
@@ -169,7 +164,11 @@ export default {
 
     // 是否显示全部复核按钮
     showAllCheck: Boolean,
+    // 是否显示客户数
+    showCustomer: Boolean,
 
+    // 客户数
+    customerCount: [String, Number],
     // 品种数
     skuCount: [String, Number],
     // 待复核
@@ -212,7 +211,10 @@ export default {
 
     // 异常按钮点击
     abnBtnClick(item){
-      this.abnPopup.data = item
+      this.abnPopup.data = {
+        ...item,
+        waitQty: item.totalQty - item.packQty
+      }
       this.abnPopup.comShow = true
       this.abnPopup.show = true
     },
@@ -222,10 +224,13 @@ export default {
 
       if (!success) return
 
-      this.abnConfirm({...data,...this.abnPopup.data}).then(()=>{
+      this.abnConfirm({...data,...this.abnPopup.data}).then(res=>{
 
+        this.$lwToast.success(
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.vygnyuwb','异常上报成功')
+        )
         this.abnPopup.show = false
-        this.$emit('abnSuccess')
+        this.$emit('abnSuccess', res)
       })
     },
   }

package/src/components/page/outbound/bale/components/containerSkuQty/index.vue

@@ -6,7 +6,7 @@
 <template>
   <div>
     <lw-title-value-cell
-      :title="$lwLanguage.get('','当前捆包箱')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerSkuQty.irsrlqdc','当前捆包箱')"
       :value="boxNo"
       val-bold
     />
@@ -14,7 +14,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.bale.components.containerSkuQty.fqwqkgoa','品种数')"
         :value="typeCount"
         val-bold
         val-red
@@ -22,7 +22,7 @@
       />
 
       <lw-title-value-cell
-        :title="$lwLanguage.get('','捆包数量')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerSkuQty.gqijhihj','捆包数量')"
         :value="packQty"
         val-bold
         val-red

package/src/components/page/outbound/bale/components/containerSkuQty//345/275/223/345/211/215/346/215/206/345/214/205/345/256/271/345/231/250/345/217/212/345/223/201/347/247/215/346/225/260.md

@@ -0,0 +1 @@
+![img.png](img.png)

package/src/components/page/outbound/bale/components/delSku/index.vue

@@ -0,0 +1,317 @@
+<!--
+  剔除商品弹框
+  @author: 张文
+  @date: 2022-07-07
+-->
+<template>
+  <lw-popup
+    :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.delSku.kumwmxdj','剔除商品')"
+    v-model="show"
+    @closed="delSkuOff"
+  >
+
+    <container-sku-qty
+      :box-no="boxData.boxNo"
+      :pack-qty="boxData.packQty"
+      :type-count="boxData.skuTypeCount"
+    />
+
+    <!-- 剔除容器号 -->
+    <lw-input
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.delSku.ixlqirnc','剔除容器号')"
+      v-model="container.value"
+      :get-focus.sync="container.focus"
+      :placeholder="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.delSku.mwwkkmcn','剔除商品放入的容器号')"
+      required
+      rule-key="container"
+      rule-prefix="baleComponentsDel"
+      @confirm="delContainerConfirm"
+    />
+
+    <!-- 商品条码 -->
+    <lw-input
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.delSku.uafvnqvi','商品条码')"
+      v-model="sku.value"
+      :get-focus.sync="sku.focus"
+      required
+      rule-prefix="baleComponentsDel"
+      rule-key="sku"
+      @confirm="delSkuSkuCodeConfirm"
+    />
+
+    <template v-if="Object.keys(skuInfo).length">
+
+      <!-- 商品信息 -->
+      <lw-sku-info-module
+        :sku-code="skuInfo.skuCode"
+        :sku-name="skuInfo.skuName"
+        :qty="skuInfo.minSellQty"
+        :qty-text="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.delSku.vtlxdpsn','最小销售数')"
+        is-row
+      />
+
+      <!-- 序列号 -->
+      <lw-input
+        v-if="sn.show"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.delSku.juyjrimm','序列号')"
+        v-model="sn.value"
+        :get-focus.sync="sn.focus"
+        required
+        rule-key="sn"
+        rule-prefix="baleComponentsDel"
+        @confirm="delSkuSnConfirm"
+      />
+
+      <!-- 剔除数量 -->
+      <lw-input
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.delSku.fbulibgz','剔除数量')"
+        v-model="qty.value"
+        :get-focus.sync="qty.focus"
+        type="digit"
+        :disabled="sn.show"
+        required
+        :show-bottom-border="false"
+        @confirm="delSkuQtyConfirm"
+      >
+        <template #button>
+          <lw-tag
+            v-if="sn.show"
+            type="danger"
+            plain
+            round
+          >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.delSku.znwnttas','不可修改') }}</lw-tag>
+        </template>
+      </lw-input>
+    </template>
+
+    <template #button>
+
+      <lw-button @click="delSkuConfirm">
+        {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.delSku.cywlaogy','确认剔除') }}
+      </lw-button>
+
+    </template>
+
+  </lw-popup>
+</template>
+
+<script>
+import containerSkuQty from './../containerSkuQty/index.vue'
+
+export default {
+  name: "index",
+  components:{
+    containerSkuQty
+  },
+  props:{
+    // 箱数据
+    boxData:{
+      type: Object,
+      default: () => {}
+    },
+
+    // 商品列表
+    skuList:{
+      type: Array,
+      default: () => []
+    },
+
+    // 序列号列表
+    skuSnList:{
+      type: Array,
+      default: () => []
+    },
+
+    // 弹框的显示隐藏
+    value: Boolean,
+
+    // 是否需要校验sn
+    needSn: Boolean
+  },
+  computed:{
+    show:{
+      get(){
+        return this.value
+      },
+      set(v){
+        this.$emit('input', v)
+      }
+    }
+  },
+  watch:{
+    show(n){
+      if (n){
+        this.$nextTick(()=>{
+          this.container.focus = true
+        })
+      }
+    }
+  },
+  data() {
+    return {
+      container:{
+        value: '',
+        focus: false
+      },
+      sku:{
+        value: '',
+        focus: false
+      },
+      sn:{
+        value: '',
+        focus: false,
+        show: false,
+      },
+      qty:{
+        value: '',
+        focus: false
+      },
+      skuInfo:{}
+    }
+  },
+  methods: {
+    // 容器号确认
+    delContainerConfirm(){
+      if (this.delContainerCheck)this.sku.focus = true
+    },
+    // 容器号校验
+    delContainerCheck(){
+      if (this.container.value) return true
+
+      this.container.focus = true
+      this.$lwShowErrorMsg(
+        this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.delSku.ncwpiaba','容器号不能为空')
+      )
+      return false
+    },
+
+    // 商品号确认
+    delSkuSkuCodeConfirm(val, {data}){
+
+      for (let i of this.skuList) {
+        if (i.skuCode === this.sku.value){
+          this.skuInfo = i
+          // 判断是否需要sn
+          if (i.needHandleSn){
+            this.sn.show = true
+
+            // 看看条码是否解析出了sn
+            if (data.sn){
+              this.sn.value = data.sn
+              this.delSkuSnConfirm(data.sn,{data:{key:data.sn}})
+            }else {
+              this.sn.focus = ''
+            }
+
+          }else {
+            this.sn.show = false
+            this.qty.focus = true
+          }
+          return
+        }
+      }
+
+      this.skuInfo = {}
+      this.sku.focus = true
+      this.$lwShowErrorMsg(
+        this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.delSku.wvypegef','当前商品不在捆包箱中')
+      )
+      this.sku.value = ''
+    },
+
+    // 序列号确认
+    delSkuSnConfirm(val, {data}){
+
+      if (!this.sn.value){
+        this.sn.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.delSku.smfuojle','序列号不能为空')
+        )
+        return;
+      }
+
+      for (let i of this.skuSnList) {
+        if (i.sn === data.key){
+          this.qty.value = i.qty
+          this.delSkuQtyConfirm()
+          return
+        }
+      }
+
+      this.sn.focus = true
+      this.$lwShowErrorMsg(
+        this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.delSku.lwkvrrhf','当前商品序列号不在捆包箱中')
+      )
+      this.sn.value = ''
+
+    },
+
+    // 剔除数量确认
+    delSkuQtyConfirm(){
+      if(this.delSkuQtyCheck()) this.delSkuConfirm()
+    },
+    // 剔除数量校验
+    delSkuQtyCheck(){
+      const qty = Number(this.qty.value || 0)
+
+      if(!qty){
+        this.qty.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.delSku.hqvgurkg','剔除数量不能为空，且应当是大于0的整数')
+        )
+        return false
+      }
+
+      /*if (qty % this.skuInfo.minSellQty !== 0){
+        this.qty.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.delSku.txfgzqmn','剔除数量必须是最小销售数的整数倍')
+        )
+        this.qty.value = ''
+        return false
+      }*/
+
+      return true
+
+    },
+
+    // 弹框关闭
+    delSkuOff(){
+      this.sku.value = ''
+      this.sn.value = ''
+      this.sn.show = false
+      this.qty.value = ''
+      this.container.value = ''
+      this.skuInfo = {}
+    },
+
+    // 确认剔除
+    delSkuConfirm(){
+
+      if (!this.delContainerCheck()) return
+
+      if (!Object.keys(this.skuInfo).length){
+        this.sku.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.delSku.liezjnjn','剔除商品信息不能为空')
+        )
+        return
+      }
+
+      if (!this.delSkuQtyCheck()) return
+
+      this.$emit('delConfirm',{
+        deleteToContainer: this.container.value,
+        skuId: this.skuInfo.skuId,
+        isSn: this.sn.show,
+        snList:[{sn: this.sn.value, qty: this.qty.value}],
+        currentDeleteQty: this.qty.value
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/components/page/outbound/bale/components/partBlock/index.vue

@@ -5,14 +5,14 @@
 -->
 <template>
   <lw-popup
-    :title="$lwLanguage.get('','拦截提示')"
+    :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.partBlock.eaaoaqjx','拦截提示')"
     v-model="show"
     :allow-off="false"
     @closed="off"
   >
 
     <lw-title-value-cell
-      :title="$lwLanguage.get('','当前容器号')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.partBlock.tghanwzg','当前容器号')"
       :value="pickContainer"
       val-bold
     />
@@ -20,7 +20,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.bale.components.partBlock.mlujutpi','品种数')"
         :value="typeCount"
         val-bold
         val-red
@@ -28,7 +28,7 @@
       />
 
       <lw-title-value-cell
-        :title="$lwLanguage.get('','商品数量')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.partBlock.dfkzgjhg','商品数量')"
         :value="skuQty"
         val-bold
         val-red
@@ -41,18 +41,20 @@
       :sku-name="blockData.skuName"
       :sku-code="blockData.skuCode"
       :qty="blockData.blockQty"
-      :qty-text="$lwLanguage.get('','拦截数量')"
+      :qty-text="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.partBlock.catiktji','拦截数量')"
     />
 
     <lw-input
-      :title="$lwLanguage.get('','商品号')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.partBlock.xzmrdrjc','商品号')"
       v-model="sku.value"
       :get-focus.sync="sku.focus"
+      rule-prefix="baleComponentsPartBlock"
+      rule-key="sku"
       @confirm="skuConfirm"
     />
 
     <lw-input
-      :title="$lwLanguage.get('','拦截数量')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.partBlock.catiktji','拦截数量')"
       v-model="qty.value"
       :get-focus.sync="qty.focus"
       type="digit"
@@ -60,9 +62,11 @@
     />
 
     <lw-input
-      :title="$lwLanguage.get('','容器号')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.partBlock.eqdmtwnd','容器号')"
       v-model="container.value"
       :get-focus.sync="container.focus"
+      rule-prefix="baleComponentsPartBlock"
+      rule-key="container"
       @confirm="containerConfirm"
     />
 
@@ -70,7 +74,7 @@
     <template #button>
 
       <lw-button @click="containerConfirm">
-        {{ $lwLanguage.get('','确认拦截') }}
+        {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.partBlock.ermxcjuo','确认拦截') }}
       </lw-button>
 
     </template>
@@ -131,7 +135,7 @@ export default {
       if (data.key !== this.blockData.skuCode){
         this.sku.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','当前商品与拦截商品不一致')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.partBlock.itdpzzrc','当前商品与拦截商品不一致')
         )
         return
       }
@@ -148,7 +152,7 @@ export default {
       if (!num){
         this.qty.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','拦截量不能为空，且应当是大于0的整数')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.partBlock.rrkeumxk','拦截量不能为空，且应当是大于0的整数')
         )
         return false
       }
@@ -156,7 +160,7 @@ export default {
       if (num > this.blockData.blockQty){
         this.qty.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','拦截量不能大于要求拦截量')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.partBlock.dwziplfn','拦截量不能大于要求拦截量')
         )
         this.qty.value = ''
         return false
@@ -170,7 +174,7 @@ export default {
       if (!this.container.value){
         this.container.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','容器号不能为空')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.partBlock.cphhvfkk','容器号不能为空')
         )
         return
       }