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

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

@@ -8,110 +8,115 @@
 
     <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.index.axlxkmjr','复核捆包')"/>
 
-    <div class="lw-global-page-box lw-global-tab-box">
+    <div class="lw-global-page-box">
 
       <check-pack-config :need-bind="false"/>
 
       <!-- 占位用 -->
       <div style="height: 0;padding: 0" class="lw-global-model-box"></div>
 
-      <van-tabs
-        type="card"
-        animated
-        v-model="tabActive"
-        @change="tabChange"
-      >
-        <!-- 捆包进度 -->
-        <van-tab
-          name="plan"
-          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.index.zifkajrt','捆包进度')"
+      <lw-tab-box>
+        <van-tabs
+          type="card"
+          animated
+          v-model="tabActive"
+          @change="tabChange"
         >
+          <!-- 捆包进度 -->
+          <van-tab
+            name="plan"
+            :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.index.zifkajrt','捆包进度')"
+          >
+
+            <div v-if="plan.tabList.length" class="lw-global-tab-box">
+
+              <van-tabs
+                type="card"
+                animated
+                v-model="plan.tabActive"
+                @change="planTabChange"
+              >
 
-          <div v-if="plan.tabList.length" class="lw-global-tab-box">
-
-            <van-tabs
-              type="card"
-              animated
-              v-model="plan.tabActive"
-              @change="planTabChange"
-            >
-
-              <van-tab
-                v-for="(i,k) in plan.tabList"
-                :name="i"
+                <van-tab
+                  v-for="(i,k) in plan.tabList"
+                  :name="i"
+                  :key="k"
+                  :title="i"
+                />
+
+              </van-tabs>
+
+              <!-- 搜索框 -->
+              <div style="padding: 3px 10px" class="lw-global-model-box">
+                <lw-input
+                  :placeholder="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.index.clukmydf','线路名或编码/店代码/箱票号')"
+                  v-model="plan.search"
+                  :show-bottom-border="false"
+                  rule-key="boxNo"
+                  @confirm="planSearchConfirm"
+                  @clear="planSearchConfirm"
+                >
+
+                  <template #button>
+                    <lw-button
+                      mini
+                      round
+                      @click="planSearchConfirm"
+                    >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.index.fwtdjvgk','搜索') }}
+                    </lw-button>
+                  </template>
+
+                </lw-input>
+              </div>
+
+              <!-- 数据 -->
+              <plan-collapse
+                v-for="(i,k) in plan.data"
                 :key="k"
-                :title="i"
+                :index="k"
+                :item="i"
               />
+            </div>
 
-            </van-tabs>
-
-            <!-- 搜索框 -->
-            <div style="padding: 3px 10px" class="lw-global-model-box">
-              <lw-input
-                :placeholder="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.index.clukmydf','线路名或编码/店代码/箱票号')"
-                v-model="plan.search"
-                :show-bottom-border="false"
-                rule-key="boxNo"
-                @confirm="planSearchConfirm"
-                @clear="planSearchConfirm"
-              >
-
-                <template #button>
-                  <lw-button
-                    mini
-                    round
-                    @click="planSearchConfirm"
-                  >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.index.fwtdjvgk','搜索') }}
-                  </lw-button>
-                </template>
+            <lw-not-data v-else/>
 
-              </lw-input>
-            </div>
+          </van-tab>
 
-            <!-- 数据 -->
-            <plan-collapse
-              v-for="(i,k) in plan.data"
+          <!-- 捆包中 -->
+          <van-tab name="ing">
+            <template #title>
+              <div class="lw-global-tip-box">
+                <span>{{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.index.xjvzvrbq','捆包中') }}</span>
+                <span class="lw-global-tip">{{ $lwTip(baleIng.length || 0) }}</span>
+              </div>
+            </template>
+            <store-info
+              v-for="(i,k) in baleIng"
               :key="k"
               :index="k"
               :item="i"
+              @btnClick="baleIngBtnClick(i)"
             />
-          </div>
-
-          <lw-not-data v-else/>
-
-        </van-tab>
-
-        <!-- 捆包中 -->
-        <van-tab
-          name="ing"
-          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.index.xjvzvrbq','捆包中')"
-        >
-          <store-info
-            v-for="(i,k) in baleIng"
-            :key="k"
-            :index="k"
-            :item="i"
-            @btnClick="baleIngBtnClick(i)"
-          />
-          <lw-not-data v-if="!baleIng.length"/>
-        </van-tab>
-
-        <!-- 已捆包 -->
-        <van-tab
-          name="over"
-          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.index.ezygjewy','已捆包')"
-        >
-          <store-info
-            v-for="(i,k) in baleOver"
-            :key="k"
-            :index="k"
-            :item="i"
-            @btnClick="baleOverBtnClick(i)"
-            is-over
-          />
-          <lw-not-data v-if="!baleOver.length"/>
-        </van-tab>
-      </van-tabs>
+            <lw-not-data v-if="!baleIng.length"/>
+          </van-tab>
+
+          <!-- 已捆包 -->
+          <van-tab
+            name="over"
+            :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.index.ezygjewy','已捆包')"
+          >
+            <store-info
+              v-for="(i,k) in baleOver"
+              :key="k"
+              :index="k"
+              :item="i"
+              @btnClick="baleOverBtnClick(i)"
+              is-over
+            />
+            <lw-not-data v-if="!baleOver.length"/>
+          </van-tab>
+        </van-tabs>
+      </lw-tab-box>
 
     </div>
 
@@ -190,6 +195,7 @@ export default {
         this.planTabChange()
       }
 
+      this.getBaleIng()
     })
   },
   methods: {
@@ -230,7 +236,7 @@ export default {
     getBaleIng(){
       this.baleIng = []
       projectWmsOutboundQueryMixPackingBox().then(res=>{
-        this.baleIng = res
+        this.baleIng = res || []
       })
     },
     // 捆包中数据按钮点击

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

@@ -25,6 +25,7 @@
       />
 
       <lw-button
+        style="flex-shrink: 0"
         mini
         round
         @click="changePackTable"

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

@@ -229,6 +229,7 @@ export default {
         this.$lwToast.success(
           this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.vygnyuwb','异常上报成功')
         )
+        this.$refs.abnormal.printLabel()
         this.abnPopup.show = false
         this.$emit('abnSuccess', res)
       })

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

@@ -8,7 +8,6 @@
     :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
@@ -42,6 +41,7 @@
       :sku-code="blockData.skuCode"
       :qty="blockData.blockQty"
       :qty-text="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.partBlock.catiktji','拦截数量')"
+      is-row
     />
 
     <lw-input
@@ -61,19 +61,8 @@
       @confirm="qtyConfirm"
     />
 
-    <lw-input
-      :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"
-    />
-
-
     <template #button>
-
-      <lw-button @click="containerConfirm">
+      <lw-button @click="qtyConfirm">
         {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.partBlock.ermxcjuo','确认拦截') }}
       </lw-button>
 
@@ -120,33 +109,40 @@ export default {
       qty:{
         value:'',
         focus: false
-      },
-
-      container:{
-        value:'',
-        focus: false
-      },
+      }
 
     }
   },
   methods: {
 
-    skuConfirm(val,{data}){
-      if (data.key !== this.blockData.skuCode){
+    // 商品号校验
+    skuCheck(){
+      const sku = this.sku.value
+
+      if (!sku){
         this.sku.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.partBlock.itdpzzrc','当前商品与拦截商品不一致')
+          this.$lwLanguage.get('','商品号不能为空')
         )
-        return
+        return false
       }
 
-      this.qty.focus = true
+      if (sku !== this.blockData.skuCode){
+        this.sku.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.partBlock.itdpzzrc','当前商品与拦截商品不一致')
+        )
+        return false
+      }
 
+      return true
     },
+    skuConfirm(){
+
+      this.skuCheck() ? this.qty.focus = true : ''
 
-    qtyConfirm(){
-      if(this.qtyCheck()) this.container.focus = true
     },
+
     qtyCheck(){
       const num = Number(this.qty.value || 0)
       if (!num){
@@ -168,29 +164,13 @@ export default {
 
       return true
     },
-
-    containerConfirm(){
-
-      if (!this.container.value){
-        this.container.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.partBlock.cphhvfkk','容器号不能为空')
-        )
-        return
-      }
-
-      if (!this.qtyCheck()) return
+    qtyConfirm(){
+      if (!this.skuCheck() || !this.qtyCheck()) return
 
       this.$emit('confirm', {
         skuCode: this.sku.value,
-        qty: this.qty.value,
-        container: this.container.value
+        qty: this.qty.value
       })
-
-    },
-
-    off(){
-
     }
   }
 }

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

@@ -43,21 +43,21 @@
             </div>
 
             <div class="lw-global-data-look-item">
-              <div class="lw-global-value-bold">{{ item.pickRate }}</div>
+              <div class="lw-global-value-bold">{{ item.pickRate + '%' }}</div>
               <div class="lw-global-title">
                 {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.xqkntvxw','拣选率') }}
               </div>
             </div>
 
             <div class="lw-global-data-look-item">
-              <div class="lw-global-value-bold">{{ item.packRate }}</div>
+              <div class="lw-global-value-bold">{{ item.packRate + '%' }}</div>
               <div class="lw-global-title">
                 {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.srloewmg','捆包率') }}
               </div>
             </div>
 
             <div class="lw-global-data-look-item">
-              <div class="lw-global-value-bold">{{ item.handoverRate }}</div>
+              <div class="lw-global-value-bold">{{ item.handoverRate + '%' }}</div>
               <div class="lw-global-title">
                 {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.ycmhppsy','交接率') }}
               </div>
@@ -83,7 +83,7 @@
             <lw-title-value-cell
               class="lw-global-click-style"
               :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.kzaaakzq','拣选率')"
-              :value="i.pickRate"
+              :value="i.pickRate + '%'"
               val-red
               val-bold
               :is-row="false"
@@ -93,7 +93,7 @@
             <lw-title-value-cell
               class="lw-global-click-style"
               :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.planCollapse.hcwareuy','捆包率')"
-              :value="i.packRate"
+              :value="i.packRate + '%'"
               val-red
               val-bold
               :is-row="false"

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

@@ -44,6 +44,7 @@
 
         <lw-button
           v-if="showPrint"
+          style="flex-shrink: 0"
           mini
           round
           @click="printClick"

package/src/components/page/outbound/bale/mixins.js

@@ -11,6 +11,7 @@ import allBlock from "./components/allBlock/index.vue";
 import partBlock from "./components/partBlock/index.vue";
 import delSku from './components/delSku/index.vue'
 import repeatCheck from './components/repeatCheck/index.vue'
+import {projectWmsOutboundMobileGetPackConfig} from "../../../../api/outbound/bale/packTableConfig";
 
 export const baleMixins = {
   components:{
@@ -46,6 +47,11 @@ export const baleMixins = {
           value: '',
           focus: false
         },
+        // 捆包容器
+        packUseContainer:{
+          value: '',
+          focus: false
+        },
         data:{}
       },
 
@@ -57,6 +63,8 @@ export const baleMixins = {
 
       // 全部拦截弹框
       allBlockShow: false,
+      // 全部拦截的数据
+      allBlockData:{},
 
       // 部分拦截弹框
       partBlockPopup:{
@@ -70,7 +78,13 @@ export const baleMixins = {
       },
 
       // 推荐包材
-      suggestMaterialList:[]
+      suggestMaterialList:[],
+
+      // 捆包台配置信息
+      packTableConfig:{},
+
+      // 打印机数据
+      printData:{},
     }
   },
   computed:{
@@ -111,6 +125,22 @@ export const baleMixins = {
     },
   },
   methods: {
+    // 初始化获取打印机和配置信息
+    async mixinInit(){
+      // 判断当前是否配置了打印机
+      const {success,printData} = this.$lwPrint.test(
+          'OUTBOUND_BOX_LABEL',
+          this.$lwLanguage.get('','出库箱票标签')
+      )
+      if (!success){
+        history.go(-1)
+        throw Error('打印机设备未配置')
+      }
+      this.printData = printData
+
+      this.packTableConfig = await projectWmsOutboundMobileGetPackConfig()
+    },
+
     // 完成捆包打开弹框
     mixinOpenOverBale(res){
       this.overBalePopup.data = res
@@ -202,14 +232,20 @@ export const baleMixins = {
     },
 
     // 校验是否拦截
-    mixinCheckBlock(res, key){
+    mixinCheckBlock(res){
       if (!res.containerBlockData) return
-      if (res.containerBlockData.blockStatus === '200') this.allBlockShow = true
+      // 全部拦截
+      if (res.containerBlockData.blockStatus === '200') {
+        this.allBlockShow = true
+        this.allBlockData = res.containerBlockData
+      }
+
+      // 部分拦截
       if (res.containerBlockData.blockStatus === '100') {
         this.partBlockPopup.data={
-          pickContainer: res[key].pickContainer,
-          skuTypeCount:res[key].skuTypeCount,
-          skuQty:res[key].packQty,
+          pickContainer: res.containerBlockData.pickContainer,
+          skuTypeCount:res.containerBlockData.skuTypeCount,
+          skuQty:res.containerBlockData.packQty,
           blockData:res.containerBlockData.blockSkuList[0]
         }
         this.partBlockPopup.show = true
@@ -231,6 +267,43 @@ export const baleMixins = {
       }
 
 
+    },
+
+    // 捆包容器确认
+    mixinPackUseContainerConfirm(){
+      this.packTableConfig.needPackedLocation ? this.overBalePopup.packedLocation.focus = true : this.overBaleConfirm()
+    },
+
+    // 完成捆包的必填校验
+    mixinOverBaleCheck(){
+      const {packNeedUseContainerConf, needPackedLocation} = this.packTableConfig
+
+      // 校验捆包容器
+      let packUseContainer = this.overBalePopup.packUseContainer.value
+      if (packNeedUseContainerConf === '1' && !packUseContainer){
+        this.overBalePopup.packUseContainer.focus = true
+        this.$lwShowErrorMsg(
+            this.$lwLanguage.get('','捆包容器不能为空')
+        )
+        return {success:false}
+      }
+
+      // 校验放置库位
+      let packedLocation = this.overBalePopup.packedLocation.value
+      if (needPackedLocation && !packedLocation){
+        this.overBalePopup.packedLocation.focus = true
+        this.$lwShowErrorMsg(
+            this.$lwLanguage.get('','放置库位不能为空')
+        )
+        return {success:false}
+      }
+
+
+      return {
+        success:true,
+        packUseContainer,
+        packedLocation
+      }
     }
   }
 }

package/src/components/page/outbound/boxTransfer/action/index.vue

@@ -40,7 +40,7 @@
 
       </div>
 
-      <div style="margin-top: 10px" class="lw-global-tab-box">
+      <lw-tab-box style="margin-top: 10px">
 
         <van-tabs
           type="card"
@@ -95,7 +95,7 @@
           </van-tab>
         </van-tabs>
 
-      </div>
+      </lw-tab-box>
 
 
     </div>

package/src/components/page/outbound/boxTransfer/index/index.vue

@@ -20,7 +20,7 @@
         />
       </div>
 
-      <div style="margin-top: 10px" class="lw-global-tab-box">
+      <lw-tab-box style="margin-top: 10px">
         <div class="lw-global-model-box">
 
           <lw-title-value-cell
@@ -46,7 +46,7 @@
           />
         </div>
         <lw-not-data v-if="!scanOverData.length"/>
-      </div>
+      </lw-tab-box>
 
     </div>
 

package/src/components/page/outbound/delivery/action/index.vue

@@ -18,10 +18,9 @@
 
       <template v-if="!isAbn">
         <!-- tab -->
-        <div
+        <lw-tab-box
           v-if="orderContent.billStatus!=='300'"
           style="margin-top: 10px"
-          class="lw-global-tab-box"
         >
           <van-tabs
             type="card"
@@ -44,7 +43,7 @@
               name="box"
             ></van-tab>
           </van-tabs>
-        </div>
+        </lw-tab-box>
 
         <!-- 按箱 -->
         <template v-if="tabActive==='box'">

package/src/components/page/outbound/delivery/index/index.vue

@@ -9,7 +9,7 @@
 
     <div class="lw-global-page-box">
 
-      <div class="lw-global-tab-box">
+      <lw-tab-box>
 
         <van-tabs
           type="card"
@@ -80,7 +80,7 @@
           </van-tab>
         </van-tabs>
 
-      </div>
+      </lw-tab-box>
 
     </div>
 

package/src/components/page/outbound/handover/components/customerAndLine.vue

@@ -20,7 +20,7 @@
   >
 
     <!-- tab -->
-    <div class="lw-global-tab-box">
+    <lw-tab-box>
 
       <van-tabs
         type="card"
@@ -94,7 +94,7 @@
         </van-tab>
       </van-tabs>
 
-    </div>
+    </lw-tab-box>
 
     <!-- 查看线路交接箱信息弹框 -->
     <lw-popup