@logwire/logwire-wms-pda-ui 3.1.1 → 3.1.2

package/src/components/page/inner/taskMove/whole/MoveTaskWholeIndex.vue

@@ -49,7 +49,7 @@
       </div>
 
       <!-- tab -->
-      <div class="lw-global-tab-box" style="margin-top: 10px">
+      <lw-tab-box style="margin-top: 10px">
         <van-tabs type="card" animated v-model="tabActive">
           <!-- 下架 -->
           <van-tab name="down" :title="$lwLanguage.get('wms_project.pda.inbound.taskMove.down','下架')">
@@ -176,7 +176,7 @@
             <lw-not-data v-if="toUpLpns.length === 0"/>
           </van-tab>
         </van-tabs>
-      </div>
+      </lw-tab-box>
     </div>
 
     <lw-bottom-bar>

package/src/components/page/inventory/queryInventory/index/index.vue

@@ -9,38 +9,40 @@
 
     <div class="lw-global-page-box">
       <!-- 查询入口Tab -->
-      <div class="lw-global-tab-box">
-        <van-tabs
-          type="card"
-          animated
-          v-model="tabActive"
-          @change="tabChange"
-        >
-          <van-tab
-            :title="$lwLanguage.get('wms_project.pda.queryInventory.sku','商品')"
-            name="sku"
-          />
-          <van-tab
-            :title="$lwLanguage.get('wms_project.pda.queryInventory.location','库位')"
-            name="location"
-          />
-          <van-tab
-            :title="$lwLanguage.get('wms_project.pda.queryInventory.skuLocation','商品+库位')"
-            name="skuLocation"
-          />
-          <van-tab
-            :title="$lwLanguage.get('wms_project.pda.queryInventory.lot','批次')"
-            name="lot"
-          />
-          <van-tab
-            :title="$lwLanguage.get('wms_project.pda.queryInventory.container','容器')"
-            name="container"
-          />
-          <van-tab
-            :title="$lwLanguage.get('wms_project.pda.queryInventory.sn','序列号')"
-            name="sn"
-          />
-        </van-tabs>
+      <div>
+        <lw-tab-box>
+          <van-tabs
+            type="card"
+            animated
+            v-model="tabActive"
+            @change="tabChange"
+          >
+            <van-tab
+              :title="$lwLanguage.get('wms_project.pda.queryInventory.sku','商品')"
+              name="sku"
+            />
+            <van-tab
+              :title="$lwLanguage.get('wms_project.pda.queryInventory.location','库位')"
+              name="location"
+            />
+            <van-tab
+              :title="$lwLanguage.get('wms_project.pda.queryInventory.skuLocation','商品+库位')"
+              name="skuLocation"
+            />
+            <van-tab
+              :title="$lwLanguage.get('wms_project.pda.queryInventory.lot','批次')"
+              name="lot"
+            />
+            <van-tab
+              :title="$lwLanguage.get('wms_project.pda.queryInventory.container','容器')"
+              name="container"
+            />
+            <van-tab
+              :title="$lwLanguage.get('wms_project.pda.queryInventory.sn','序列号')"
+              name="sn"
+            />
+          </van-tabs>
+        </lw-tab-box>
 
         <!-- 搜索 -->
         <div class="lw-global-model-box" v-if="tabActive === 'sku' || tabActive === 'skuLocation'">

package/src/components/page/inventory/queryInventory/page/index.vue

@@ -10,7 +10,7 @@
 
     <div class="lw-global-page-box">
       <!-- 货主+分仓分组 -->
-      <div class="lw-global-tab-box">
+      <lw-tab-box>
         <van-tabs
           v-if="type !== 'container'"
           type="card"
@@ -297,43 +297,44 @@
 
           </van-tab>
         </van-tabs>
+      </lw-tab-box>
 
-        <div v-if="type === 'container'">
-          <!-- 头部 -->
-          <div class="lw-global-model-box">
-            <div class="lw-global-flex-between lw-global-row-start">
-              <div>
+      <div v-if="type === 'container'">
+        <!-- 头部 -->
+        <div class="lw-global-model-box">
+          <div class="lw-global-flex-between lw-global-row-start">
+            <div>
                     <span class="lw-global-title">
                       {{ $lwLanguage.get('wms_project.pda.inventory.query.lpn', '托盘号') }}
                     </span>
-                <span class="lw-global-value-bold">
+              <span class="lw-global-value-bold">
                       {{ $route.query.lpn }}
                     </span>
-              </div>
-
-              <lw-button
-                round
-                style="flex-shrink: 0"
-                @click="goIndex">
-                {{ $lwLanguage.get('wms_project.pda.inventory.query.changeCondition', '切换条件') }}
-              </lw-button>
             </div>
 
-            <div class="lw-global-row">
+            <lw-button
+              round
+              style="flex-shrink: 0"
+              @click="goIndex">
+              {{ $lwLanguage.get('wms_project.pda.inventory.query.changeCondition', '切换条件') }}
+            </lw-button>
+          </div>
+
+          <div class="lw-global-row">
                   <span class="lw-global-title">
                     {{ $lwLanguage.get('wms_project.pda.inventory.query.caseNum', '箱号') }}
                   </span>
-              <span class="lw-global-value">
+            <span class="lw-global-value">
                     {{ $route.query.caseNum }}
                   </span>
-            </div>
+          </div>
 
-            <!-- 库存统计 -->
-            <div class="lw-global-row">
+          <!-- 库存统计 -->
+          <div class="lw-global-row">
                 <span class="lw-global-title">
                   {{ $lwLanguage.get('wms_project.pda.inventory.query.invReport', '库存统计') }}
                 </span>
-              <span>
+            <span>
                 <span class="lw-global-value">
                   {{ $lwLanguage.get('wms_project.pda.inventory.query.invReport.qty', '库存量') }}
                 </span>
@@ -362,27 +363,26 @@
                     {{ group.availQty }}
                   </span>
                 </span>
-            </div>
           </div>
-
-          <!-- 库存明细 -->
-          <lw-inventory-item
-            v-for="(i, k) in groupPage.datas"
-            :key="i.belongCompanyCode + ':' + i.ownerCode + ':' + i.skuCode + ':' + i.locationCode"
-            :item="i"
-            :index="k"
-            :type="type"
-            @detail="openLotPopup"
-          />
-
-          <!-- 分页 -->
-          <lw-pages v-model="groupPage.pageNum"
-                    :page-total="groupPage.total"
-                    :page-size="groupPage.pageSize"
-                    @change="paging"
-                    :hide="false"
-          />
         </div>
+
+        <!-- 库存明细 -->
+        <lw-inventory-item
+          v-for="(i, k) in groupPage.datas"
+          :key="i.belongCompanyCode + ':' + i.ownerCode + ':' + i.skuCode + ':' + i.locationCode"
+          :item="i"
+          :index="k"
+          :type="type"
+          @detail="openLotPopup"
+        />
+
+        <!-- 分页 -->
+        <lw-pages v-model="groupPage.pageNum"
+                  :page-total="groupPage.total"
+                  :page-size="groupPage.pageSize"
+                  @change="paging"
+                  :hide="false"
+        />
       </div>
 
       <lw-popup

package/src/components/page/outbound/bale/aloneBale/action/index.vue

@@ -162,7 +162,7 @@
 
         </div>
 
-        <div v-if="Object.keys(packBox).length" class="lw-global-tab-box">
+        <lw-tab-box v-if="Object.keys(packBox).length">
           <van-tabs
             type="card"
             animated
@@ -232,7 +232,7 @@
 
             </van-tab>
           </van-tabs>
-        </div>
+        </lw-tab-box>
 
 
 
@@ -346,6 +346,17 @@
 
       </div>
 
+      <lw-input
+        v-if="packTableConfig.packNeedUseContainerConf !== '0'"
+        :title="$lwLanguage.get('','捆包容器')"
+        v-model="overBalePopup.packUseContainer.value"
+        :get-focus.sync="overBalePopup.packUseContainer.focus"
+        rule-key="containerKey"
+        :create-rule="$lwScanRule.create('独立捆包 - 执行捆包 - 捆包容器','CONTAINER')"
+        :required="packTableConfig.packNeedUseContainerConf === '1'"
+        @confirm="mixinPackUseContainerConfirm"
+      />
+
       <lw-input
         v-if="packTableConfig.needPackedLocation"
         :title="$lwLanguage.get('','放置库位')"
@@ -421,7 +432,6 @@
 
 <script>
 import checkPackConfig from "../../components/checkPackConfig/index.vue";
-import suggestMaterial from "../../components/suggestMaterial/index.vue";
 import {
   projectWmsAlonePackClose,
   projectWmsAlonePackComputeBoxSuggest,
@@ -437,7 +447,6 @@ import {
   projectWmsOutboundQueryAlonePackContainerData,
 } from "../../../../../../api/outbound/bale/aloneBale/action";
 import {baleMixins} from "../../mixins";
-import {projectWmsOutboundMobileGetPackConfig} from "../../../../../../api/outbound/bale/packTableConfig";
 import {projectWmsGetPrintBoxData} from "../../../../../../api/outbound/bale/checkBale/action";
 
 export default {
@@ -445,7 +454,6 @@ export default {
   mixins:[baleMixins],
   components:{
     checkPackConfig,
-    suggestMaterial,
   },
   data() {
     return {
@@ -500,24 +508,12 @@ export default {
     },
   },
   mounted() {
-
-    // 判断当前是否配置了打印机
-    const {success,printData} = this.$lwPrint.test(
-      'OUTBOUND_BOX_LABEL',
-      this.$lwLanguage.get('','出库箱票标签')
-    )
-    if (!success){
-      history.go(-1)
-      return
-    }
-    this.printData = printData
-
     this.init()
   },
   methods: {
     // 初始化
     async init(){
-      this.packTableConfig = await projectWmsOutboundMobileGetPackConfig()
+      await this.mixinInit()
 
       await this.getData()
     },
@@ -713,20 +709,17 @@ export default {
     },
     // 完成捆包 - 封箱
     async overBaleConfirm(){
-      let packedLocation = this.overBalePopup.packedLocation.value
-      if (this.packTableConfig.needPackedLocation && !packedLocation){
-        this.overBalePopup.packedLocation.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','放置库位不能为空')
-        )
-        return
-      }
+
+      const {success, packUseContainer, packedLocation} = this.mixinOverBaleCheck()
+      if (!success) return
+
       await projectWmsAlonePackClose({
         boxId: this.packBox.boxId,
         packWeight: this.overBalePopup.real.value || this.overBalePopup.data.standardWeight,
         packMaterialList: this.mixinGetMaterials(),
         packTableId: this.packTableConfig.needPackTable ? this.$lwLocalStorage.get('lwPackTableData').packTableId : '',
-        packedLocation
+        packedLocation,
+        packUseContainer,
       })
 
 
@@ -800,7 +793,7 @@ export default {
     // 全部拦截
     allBlockConfirm(){
       projectWmsAlonePackContainerWholeBlock({
-        pickContainer: this.packContainer.pickContainer
+        pickContainer: this.allBlockData.pickContainer
       }).then(()=>{
         this.$lwToast.success(
           this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.aloneBale.action.ikkbinvx','已全部拦截')
@@ -812,7 +805,7 @@ export default {
     async partBlockConfirm(data){
 
       const res = await projectWmsAlonePackContainerSkuBlock({
-        pickContainer: data.container,
+        pickContainer: this.partBlockPopup.data.pickContainer,
         currentBlockQty: data.qty,
         skuId: this.partBlockPopup.data.blockData.skuId
       })

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

@@ -11,7 +11,7 @@
     <div class="lw-global-page-box">
       <check-pack-config :need-bind="false"/>
 
-      <div class="lw-global-tab-box">
+      <lw-tab-box>
 
         <van-tabs
           type="card"
@@ -51,7 +51,7 @@
           </van-tab>
 
         </van-tabs>
-      </div>
+      </lw-tab-box>
 
     </div>
 

package/src/components/page/outbound/bale/baleChange/action/index.vue

@@ -75,7 +75,7 @@
       >
         {{ $lwLanguage.get(
           '',
-          '捆包箱中的商品全部取下复核捆包，然后可以再次捆包'
+          '捆包箱中的商品全部取消复核捆包，然后可以再次捆包'
         )}}
       </div>
 

package/src/components/page/outbound/bale/checkBale/action/index.vue

@@ -38,7 +38,7 @@
         >
 
           <lw-input
-            :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.mfghjxey','商品号')"
+            :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.mfghjxey','商品/SN号')"
             v-model="actionCheck.sku.value"
             :get-focus.sync="actionCheck.sku.focus"
             auto-clear-val
@@ -300,6 +300,17 @@
 
       </div>
 
+      <lw-input
+        v-if="packTableConfig.packNeedUseContainerConf !== '0'"
+        :title="$lwLanguage.get('','捆包容器')"
+        v-model="overBalePopup.packUseContainer.value"
+        :get-focus.sync="overBalePopup.packUseContainer.focus"
+        rule-key="containerKey"
+        :create-rule="$lwScanRule.create('复核捆包 - 执行捆包 - 捆包容器','CONTAINER')"
+        :required="packTableConfig.packNeedUseContainerConf === '1'"
+        @confirm="mixinPackUseContainerConfirm"
+      />
+
       <lw-input
         v-if="packTableConfig.needPackedLocation"
         :title="$lwLanguage.get('','放置库位')"
@@ -307,7 +318,7 @@
         :get-focus.sync="overBalePopup.packedLocation.focus"
         :show-bottom-border="false"
         rule-key="packedLocation"
-        :create-rule="$lwScanRule.create('独立捆包 - 执行捆包 - 放置库位','LOCATION')"
+        :create-rule="$lwScanRule.create('复核捆包 - 执行捆包 - 放置库位','LOCATION')"
         required
         @confirm="overBaleConfirm"
       />
@@ -405,9 +416,9 @@
     <!-- 全部拦截 -->
     <all-block
       v-model="allBlockShow"
-      :container="packContainer.pickContainer"
-      :type-count="packContainer.skuTypeCount"
-      :qty="packContainer.blockQty"
+      :container="allBlockData.pickContainer"
+      :type-count="allBlockData.skuTypeCount"
+      :qty="allBlockData.blockQty"
       @confirm="allBlockConfirm"
     />
 
@@ -450,7 +461,6 @@ import {
   projectWmsMixPackSubmitWithSn
 } from "../../../../../../api/outbound/bale/checkBale/action";
 import {baleMixins} from "../../mixins";
-import {projectWmsOutboundMobileGetPackConfig} from "../../../../../../api/outbound/bale/packTableConfig";
 
 export default {
   name: "lwOutboundBaleActionPage",
@@ -509,12 +519,6 @@ export default {
         },
         data:{}
       },
-
-      // 捆包台配置信息
-      packTableConfig:{},
-
-      // 打印机数据
-      printData:{},
     }
   },
   computed:{
@@ -541,25 +545,13 @@ export default {
     },
   },
   mounted() {
-
     this.init()
   },
   methods: {
 
     // 初始化
     async init(){
-      // 判断当前是否配置了打印机
-      const {success,printData} = this.$lwPrint.test(
-        'OUTBOUND_BOX_LABEL',
-        this.$lwLanguage.get('','出库箱票标签')
-      )
-      if (!success){
-        history.go(-1)
-        return
-      }
-      this.printData = printData
-
-      this.packTableConfig = await projectWmsOutboundMobileGetPackConfig()
+      await this.mixinInit()
 
       const query = this.$route.query
       // 判断是否是通过全部复核进入的
@@ -861,6 +853,7 @@ export default {
     // 完成捆包 - 封箱
     async overBaleConfirm(){
 
+      // 校验包材
       if (this.packTableConfig.forceUseSuggestPackMaterial && !this.overBalePopup.materials.list.length){
         this.overBalePopup.materials.focus = true
         this.$lwShowErrorMsg(
@@ -869,22 +862,16 @@ export default {
         return
       }
 
-      let packedLocation = this.overBalePopup.packedLocation.value
-      if (this.packTableConfig.needPackedLocation && !packedLocation){
-        this.overBalePopup.packedLocation.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','放置库位不能为空')
-        )
-        return
-      }
+      const {success, packUseContainer, packedLocation} = this.mixinOverBaleCheck()
+      if (!success) return
 
       await projectWmsMixPackCloseBox({
         boxId: this.packBox.boxId,
         packWeight: this.overBalePopup.real.value || this.overBalePopup.data.standardWeight,
         packMaterialList: this.mixinGetMaterials(),
         packTableId: this.packTableConfig.needPackTable ? this.$lwLocalStorage.get('lwPackTableData').packTableId : '',
-        packedLocation
-
+        packedLocation,
+        packUseContainer
       })
 
       this.$lwToast.success(
@@ -976,7 +963,7 @@ export default {
     // 全部拦截
     allBlockConfirm(){
       projectWmsMixPackContainerWholeBlock({
-        pickContainer: this.packContainer.pickContainer
+        pickContainer: this.allBlockData.pickContainer
       }).then(()=>{
         this.$lwToast.success(
           this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.bncgywex','已拦截')
@@ -988,7 +975,7 @@ export default {
     async partBlockConfirm(data){
 
       const res = await projectWmsMixPackContainerSkuBlock({
-        pickContainer: data.container,
+        pickContainer: this.partBlockPopup.data.pickContainer,
         currentBlockQty: data.qty,
         skuId: this.partBlockPopup.data.blockData.skuId
       })
@@ -1000,7 +987,13 @@ export default {
           this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.jfmhrzqh','当前容器已全部捆包')
         )
         this.overBaleOpen()
+        return
       }
+
+      this.$lwToast.success(
+        this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.bncgywex','已拦截')
+      )
+      this.partBlockPopup.show = false
     },
 
     // 异常确认