@logwire/logwire-wms-pda-ui 3.4.0 → 3.5.0

package/src/views/wms/page/outbound/bale/checkBale/action/index.vue

@@ -1,4 +1,4 @@
-;<!--
+<!--
   复核捆包执行页
   @author: 张文
   @date: 2022-06-30
@@ -19,7 +19,7 @@
         :customer-code="customerCode"
         :customer-name="customerName"
         show-print
-        @print="printClick"
+        @print="printClick(true)"
       >
         <div
           style="text-align: center"
@@ -35,6 +35,7 @@
         <div
           v-if="Object.keys(packContainer).length"
           class="lw-global-model-box lw-global-border-2px"
+          style="padding-top: 3px"
         >
 
           <lw-input
@@ -43,29 +44,31 @@
             :get-focus.sync="actionCheck.sku.focus"
             auto-clear-val
             rule-key="sku"
+            :create-rule="$lwScanRule.create('复核捆包-执行页-商品/SN号','SKU')"
+            :rule-serve-query="packContainer"
             @confirm="actionCheckSkuConfirm"
           />
 
           <template v-if="Object.keys(actionCheck.skuInfo).length">
 
-            <lw-input
+
+            <lw-get-qty-by-type
+              ref="qty"
               :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.exgcjfus','复核数量')"
-              v-model="actionCheck.qty.value"
-              :get-focus.sync="actionCheck.qty.focus"
-              type="digit"
+              :sku-id="actionCheck.skuInfo.skuId"
               @confirm="actionCheckQtyConfirm"
             >
-
               <template #button>
                 <lw-button
                   mini
                   round
                   @click="actionCheckQtyConfirm"
-                >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.xlsgeumr','确认复核') }}
+                >{{
+                    $lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.xlsgeumr', '确认复核')
+                  }}
                 </lw-button>
               </template>
-
-            </lw-input>
+            </lw-get-qty-by-type>
 
             <lw-sku-info-module
               :sku-name="actionCheck.skuInfo.skuName"
@@ -85,7 +88,7 @@
 
               <lw-title-value-cell
                 :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.zekjwfre','数量')"
-                :value="actionCheck.skuInfo.waitQty"
+                :value="actionCheck.skuInfo.waitQtyLabel"
                 val-red
                 val-bold
                 :is-row="false"
@@ -114,13 +117,10 @@
         v-if="Object.keys(packContainer).length"
         style="margin-top: 10px"
         :container="packContainer.pickContainer"
-        :sku-count="packContainer.skuTypeCount"
-        :over-count="packContainer.packQty"
-        :wait-count="packContainer.waitPackQty"
-        :abnormal-count="packContainer.abnormalQty"
         :sku-list="packContainer.packSkuList"
         :show-abn-btn="!fromAllCheck"
         :show-all-check="!fromAllCheck && allowAllCheck"
+        :label-qty-list="packContainer.labeledQtyList"
         :abn-confirm="abnConfirm"
         @abnSuccess="mixinAbnSuccess"
       />
@@ -172,6 +172,8 @@
         :get-focus.sync="checkPopup.sn.focus"
         auto-clear-val
         rule-key="sn"
+        :create-rule="$lwScanRule.create('复核捆包-执行页-序列号','SN')"
+        :rule-serve-query="packContainer"
         @confirm="checkPopupSnConfirm"
       />
 
@@ -218,7 +220,7 @@
     >
       <container-sku-qty
         :box-no="packBox.boxNo"
-        :pack-qty="packBox.packQty"
+        :pack-qty="packBox.packQtyLabel || packBox.packQty"
         :type-count="packBox.skuTypeCount"
       />
 
@@ -242,6 +244,8 @@
         :get-focus.sync="overBalePopup.materials.focus"
         rule-key="skuPack"
         :required="packTableConfig.forceUseSuggestPackMaterial"
+        :create-rule="$lwScanRule.create('复核捆包-执行页-捆包包材','SKU')"
+        :rule-serve-query="packContainer"
         @confirm="mixinMaterialsConfirm"
       />
 
@@ -308,6 +312,7 @@
         rule-key="containerKey"
         :create-rule="$lwScanRule.create('复核捆包 - 执行捆包 - 捆包容器','CONTAINER')"
         :required="packTableConfig.packNeedUseContainerConf === '1'"
+        :rule-serve-query="packContainer"
         @confirm="mixinPackUseContainerConfirm"
       />
 
@@ -359,7 +364,7 @@
 
       <container-sku-qty
         :box-no="packBox.boxNo"
-        :pack-qty="packBox.packQty"
+        :pack-qty="packBox.packQtyLabel || packBox.packQty"
         :type-count="packBox.skuTypeCount"
       />
 
@@ -369,6 +374,7 @@
         :get-focus.sync="addPopup.container.focus"
         required
         rule-key="container"
+        :create-rule="$lwScanRule.create('复核捆包-执行页-商品/SN号','CONTAINER')"
         @confirm="addContainerConfirm"
       />
 
@@ -647,10 +653,7 @@ export default {
         }
 
         // 校验是否需要sn
-        this.checkNeedSn({
-          ...skuInfo,
-          waitQty: skuInfo.totalQty - skuInfo.packQty
-        })
+        this.checkNeedSn(skuInfo)
         return
       }
 
@@ -671,44 +674,46 @@ export default {
       this.actionCheck.skuInfo = data
 
       // 判断是否需要处理sn
-      if (data.needHandleSn){
+      if (data.needHandleSn) {
         this.checkPopup.show = true
         this.checkPopup.sn.focus = true
         // 判断是否需要增加一条数据
         type === 'add' && this.checkPopup.snList.unshift({sn: data.sn, qty: data.qty})
-        this.getCheckPopupNum()
+        // this.getCheckPopupNum()
         return
       }
 
-      this.actionCheck.qty.value = Number(this.actionCheck.qty.value || 0 ) + Number(data.qty || 0)
+      this.$nextTick(() => {
+        this.$refs.qty.setQty(this.$refs.qty?.getQty() || 0 + Number(data.qty || 0))
 
-      // 如果扫描方式是逐件扫描或者当前捆包数量等于扫描数量就自动提交
-      if (this.packContainer.outboundPackScanMethod === 'SINGLE' && !this.actionCheck.qty.value){
-        this.actionCheck.qty.value = data.minSellQty || 1
-      }
+        if (this.packContainer.outboundPackScanMethod === 'SINGLE' && !this.$refs.qty?.getQty()) {
+          this.$nextTick(() => this.$refs.qty.setQty(data.minSellQty || 1))
+        }
+      })
+      /*// 如果扫描方式是逐件扫描或者当前捆包数量等于扫描数量就自动提交
       if(this.packContainer.outboundPackScanMethod === 'SINGLE' || this.actionCheck.qty.value === this.actionCheck.skuInfo.waitQty){
         this.actionCheckQtyConfirm()
-      }
+      }*/
     },
     // 开始复核 - 商品数量确认
     actionCheckQtyConfirm(){
 
-      const qty = Number(this.actionCheck.qty.value || 0)
+      const qty = this.$refs.qty?.getQty() || 0
 
       if (!qty){
-        this.actionCheck.qty.focus = true
+        this.$refs.qty?.getFocus()
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.sesxkxyt','复核数不能为空，且应当是大于0的整数')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.sesxkxyt', '复核数不能为空，且应当是大于0的整数')
         )
         return
       }
 
       if (qty > this.actionCheck.skuInfo.waitQty){
-        this.actionCheck.qty.focus = true
+        this.$refs.qty?.getFocus()
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.cbitnesb','复核数不能大于待复核数')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.cbitnesb', '复核数不能大于待复核数')
         )
-        this.actionCheck.qty.value = ''
+        this.$refs.qty?.clearInput()
         return
       }
 
@@ -733,8 +738,6 @@ export default {
 
         this.actionCheck.sku.value = ''
         this.actionCheck.sku.focus = true
-        this.actionCheck.qty.focus = false
-        this.actionCheck.qty.value = ''
         this.$nextTick(()=>this.actionCheck.skuInfo = {})
 
         this.mixinCheckBlock(res)
@@ -742,14 +745,11 @@ export default {
     },
 
     // 复核序列号 - 当前复核量
-    getCheckPopupNum(){
-      let num = 0
-      this.checkPopup.snList.forEach(item=>{
-        num += Number(item.qty || 0)
-      })
-      this.checkPopup.nowScanNum = num
+    getCheckPopupNum() {
+
+      this.checkPopup.nowScanNum = this.checkPopup.snList.reduce((t, i) => t + Number(i.qty || 0), 0)
 
-      if (num === this.actionCheck.skuInfo.waitQty){
+      if (this.checkPopup.nowScanNum === this.actionCheck.skuInfo.waitQty) {
         this.checkPopupSubmit()
       }
 
@@ -884,7 +884,7 @@ export default {
       )
 
       try {
-        await this.printClick()
+        await this.printClick(false)
       }finally {
         history.go(-1)
       }
@@ -929,6 +929,7 @@ export default {
     // 追加 - 确认追加
     addConfirm(){
       this.packContainer = this.$lwDeepCopy(this.addPopup.data)
+      this.fromAllCheck = false
       this.addPopup.show = false
     },
     // 追加 - 弹框关闭
@@ -1002,7 +1003,7 @@ export default {
     },
 
     // 异常确认
-    abnConfirm(data){
+    abnConfirm(data) {
       return projectWmsMixPackSubmitAbnormal({
         pickContainer: this.packContainer.pickContainer,
         ...data
@@ -1010,15 +1011,17 @@ export default {
     },
 
     // 打印
-    async printClick(){
+    async printClick(printCheck) {
+      if (!this.mixinPrintCheck(printCheck)) return
+
       try {
         const res = await projectWmsGetPrintBoxData({
           boxId: this.packBox.boxId,
           printDeviceId: this.printData.printId
         })
 
-        await this.$lwPrint.bluetoothPrint({taskId:res.id})
-      }catch (e) {
+        await this.$lwPrint.bluetoothPrint({taskId: res.id})
+      } catch (e) {
         console.log('打印失败：', e)
       }
     }

package/src/views/wms/page/outbound/bale/checkBale/allCheck/index.vue

@@ -31,11 +31,8 @@
       <container-info
         style="margin-top: 10px"
         :container="packContainer.pickContainer"
-        :sku-count="packContainer.skuTypeCount"
-        :over-count="packContainer.packQty"
-        :wait-count="packContainer.waitPackQty"
-        :abnormal-count="packContainer.abnormalQty"
         :sku-list="packContainer.packSkuList"
+        :label-qty-list="packContainer.labeledQtyList"
       />
 
       <!-- 推荐包材 -->

package/src/views/wms/page/outbound/bale/checkBale/index/index.vue

@@ -53,16 +53,19 @@
                   v-model="plan.search"
                   :show-bottom-border="false"
                   rule-key="boxNo"
-                  @confirm="planSearchConfirm"
-                  @clear="planSearchConfirm"
+                  :create-rule="$lwScanRule.create('复核捆包-起始页-箱号','CASE')"
+                  @confirm="planTabChange"
+                  @clear="planTabChange"
                 >
 
                   <template #button>
                     <lw-button
                       mini
                       round
-                      @click="planSearchConfirm"
-                    >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.index.fwtdjvgk','搜索') }}
+                      @click="planTabChange"
+                    >{{
+                        $lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.index.fwtdjvgk', '搜索')
+                      }}
                     </lw-button>
                   </template>
 
@@ -72,10 +75,16 @@
               <!-- 数据 -->
               <plan-collapse
                 v-for="(i,k) in plan.data"
-                :key="k"
+                :key="i.tabGroupKey + i.valueGroupKey"
                 :index="k"
                 :item="i"
               />
+              <lw-pagination
+                v-model="plan.pageNum"
+                :page-size.sync="plan.pageSize"
+                :page-total="plan.pageTotal"
+                @change="getPlanData"
+              />
             </div>
 
             <lw-not-data v-else/>
@@ -106,14 +115,20 @@
             :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.index.ezygjewy','已捆包')"
           >
             <store-info
-              v-for="(i,k) in baleOver"
+              v-for="(i,k) in baleOver.data"
               :key="k"
               :index="k"
               :item="i"
               @btnClick="baleOverBtnClick(i)"
               is-over
             />
-            <lw-not-data v-if="!baleOver.length"/>
+            <lw-pagination
+              v-model="baleOver.pageNum"
+              :page-size.sync="baleOver.pageSize"
+              :page-total="baleOver.pageTotal"
+              @change="getBaleOver"
+            />
+            <lw-not-data v-if="!baleOver.data.length"/>
           </van-tab>
         </van-tabs>
       </lw-tab-box>
@@ -137,8 +152,8 @@ import planCollapse from './../../components/planCollapse/index.vue'
 import checkPackConfig from "../../components/checkPackConfig/index.vue";
 import storeInfo from '../../components/storeInfo/index.vue'
 import {
-  projectWmsGetPackStatisticsData,
-  projectWmsGetWarehouseHandoverTabKey,
+  projectWmsGetPackStatisticsDataV2,
+  projectWmsGetWarehouseHandoverTabKeyV3,
   projectWmsOutboundQueryMixPackedBox,
   projectWmsOutboundQueryMixPackingBox
 } from "../../../../../api/outbound/bale/checkBale";
@@ -166,31 +181,34 @@ export default {
         search: '',
 
         // 数据
-        data: [
-          {
-            title: [],
-            store: []
-          }
-        ]
+        data: [],
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
       },
 
       // 捆包中的数据
-      baleIng:[],
+      baleIng: [],
 
       // 已捆包的数据
-      baleOver:[],
+      baleOver: {
+        data: [],
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
+      },
 
       // 打印机数据
-      printData:{}
+      printData: {}
     }
   },
   mounted() {
 
     // 获取捆包进度tab项
-    projectWmsGetWarehouseHandoverTabKey().then(res=>{
+    projectWmsGetWarehouseHandoverTabKeyV3().then(res => {
       this.plan.tabList = res
 
-      if (this.plan.tabList.length){
+      if (this.plan.tabList.length) {
         this.plan.tabActive = this.plan.tabList[0]
         this.planTabChange()
       }
@@ -209,7 +227,7 @@ export default {
           }
           return
         case 'over':
-          if (!this.baleOver.length){
+          if (!this.baleOver.data.length) {
             this.getBaleOver()
           }
       }
@@ -218,24 +236,27 @@ export default {
 
     // 捆包进度tab切换
     planTabChange() {
-      this.plan.data = []
-      projectWmsGetPackStatisticsData({
+      this.plan.pageNum = 1
+      this.plan.pageSize = 10
+      this.getPlanData()
+    },
+    // 获取捆包中数据
+    getPlanData() {
+      projectWmsGetPackStatisticsDataV2({
         tabGroupKey: this.plan.tabActive,
-        queryParam: this.plan.search
-      }).then(res=>{
-        this.plan.data = res
+        queryParam: this.plan.search,
+        pageNum: this.plan.pageNum,
+        pageSize: this.plan.pageSize,
+      }).then(res => {
+        this.plan.data = res.datas
+        this.plan.pageTotal = res.total
       })
     },
-    // 捆包进度搜索
-    planSearchConfirm() {
-      this.planTabChange()
-    },
-
 
     // 获取捆包中的数据
-    getBaleIng(){
+    getBaleIng() {
       this.baleIng = []
-      projectWmsOutboundQueryMixPackingBox().then(res=>{
+      projectWmsOutboundQueryMixPackingBox().then(res => {
         this.baleIng = res || []
       })
     },
@@ -244,7 +265,7 @@ export default {
 
       this.$router.push({
         path: '/outbound/bale/lwAllCheck',
-        query:{
+        query: {
           lwContainer: item.boxNo
         }
       })
@@ -252,20 +273,24 @@ export default {
 
 
     // 获取捆包中的数据
-    getBaleOver(){
-      this.baleOver = []
-      projectWmsOutboundQueryMixPackedBox().then(res=>{
-        this.baleOver = res
+    getBaleOver() {
+      projectWmsOutboundQueryMixPackedBox({
+        pageNum: this.baleOver.pageNum,
+        pageSize: this.baleOver.pageSize,
+      }).then(res => {
+        this.baleOver.data = res.datas
+        this.baleOver.pageTotal = res.total
       })
     },
     // 已捆包打印出货票
-    async baleOverBtnClick(item){
+    async baleOverBtnClick(item) {
 
-      if (!Object.keys(this.printData).length){
+      if (!this.printData.printId) {
         // 判断当前是否配置了打印机
-        const {success,printData} = await this.$lwPrint.test(
+        const {success, printData} = await this.$lwPrint.test(
           'OUTBOUND_BOX_LABEL',
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.index.index.xxjbcoze','出库箱票标签')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.index.index.xxjbcoze', '出库箱票标签'),
+          true
         )
 
         if (!success) return

package/src/views/wms/page/outbound/bale/checkBale/newBale/index.vue

@@ -22,6 +22,7 @@
           v-model="container.value"
           :get-focus.sync="container.focus"
           rule-key="boxNo"
+          :create-rule="$lwScanRule.create('复核捆包-新捆包-拣选容器号','CONTAINER')"
           required
           @confirm="containerConfirm"
         />

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

@@ -22,33 +22,20 @@
         round
         mini
         @click="allCheck"
-      >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.tkxjaeza','全部复核') }}</lw-button>
+      >{{
+          $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.tkxjaeza', '全部复核')
+        }}
+      </lw-button>
 
     </div>
 
-    <lw-data-look-bg type="not">
-
-      <lw-data-look-item
-        v-if="showCustomer"
-        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.lvjrjuvr','客户数')"
-        :value="customerCount || 0"
-      />
-
-      <lw-data-look-item
-        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.vdkljntv','品种数')"
-        :value="skuCount"
-      />
-
-      <lw-data-look-item
-        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.ogeeqjzr','待复核')"
-        :value="waitCount"
-      />
-
-      <lw-data-look-item
-        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.vwbnookb','已复核')"
-        :value="overCount"
-      />
-    </lw-data-look-bg>
+    <lw-data-look-bg
+      type="not"
+      :data="labelQtyList"
+      value-key="qtyLabel"
+      title-key="fieldCode"
+      :show-end-line="false"
+    />
 
     <div
       style="padding: 0 10px 3px"
@@ -91,7 +78,7 @@
             <div style="text-align: center">
 
               <div class="lw-global-value-bold-red">
-                {{ i.totalQty - i.packQty }}
+                {{ i.waitQtyLabel }}
               </div>
 
               <lw-button
@@ -121,7 +108,10 @@
         ref="abnormal"
         :sku-code="abnPopup.data.skuCode"
         :sku-name="abnPopup.data.skuName"
+        :sku-id="abnPopup.data.skuId"
+        :owner-id="abnPopup.data.ownerId"
         :qty="abnPopup.data.waitQty"
+        :qty-label="abnPopup.data.waitQtyLabel"
         :location="abnPopup.data.locationCode"
         :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','捆包')"
@@ -142,31 +132,26 @@
 
 export default {
   name: "containerInfo",
-  props:{
+  props: {
     // 容器号
-    container:{
+    container: {
       type: [String, Number],
       default: ''
     },
+    // 看板显示数据
+    labelQtyList: {
+      type: Array,
+      default: () => []
+    },
 
     // 是否显示全部复核按钮
     showAllCheck: Boolean,
     // 是否显示客户数
     showCustomer: Boolean,
 
-    // 客户数
-    customerCount: [String, Number],
-    // 品种数
-    skuCount: [String, Number],
-    // 待复核
-    waitCount: [String, Number],
-    // 已复核
-    overCount: [String, Number],
-    // 异常
-    abnormalCount: [String, Number],
 
     // 商品列表
-    skuList:{
+    skuList: {
       type: Array,
       default: ()=>[]
     },
@@ -198,10 +183,7 @@ export default {
 
     // 异常按钮点击
     abnBtnClick(item){
-      this.abnPopup.data = {
-        ...item,
-        waitQty: item.totalQty - item.packQty
-      }
+      this.abnPopup.data = item
       this.abnPopup.comShow = true
       this.abnPopup.show = true
     },