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

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

@@ -6,15 +6,13 @@
 <template>
   <div>
 
-    <lw-nav-bar :title=" title || $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.gmmvhnxt','执行拣选')"/>
+    <lw-nav-bar :title="showTitle"/>
 
     <!-- 页主体 -->
     <div class="lw-global-page-box">
 
       <!-- 头部数据看板 -->
-      <task-info
-        :item="pickData"
-      >
+      <task-info :item="pickData">
         <div class="lw-global-row-end">
           <lw-tag
             v-if="pickData.allocationOrder"
@@ -73,14 +71,22 @@
 
       <lw-button
         type="last"
-        @click="lackBtn"
-      >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.odduxuax','拣选缺货') }}</lw-button>
+        @click="lackAbnBtn('lack')"
+      >
+        {{
+          $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.odduxuax', '拣选缺货')
+        }}
+      </lw-button>
 
       <lw-button
         type="normal"
         plain
-        @click="abnBtn"
-      >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.wrhgkhxs','异常') }}</lw-button>
+        @click="lackAbnBtn('abn')"
+      >
+        {{
+          $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.wrhgkhxs', '异常')
+        }}
+      </lw-button>
 
       <lw-button
         @click="confirmBtn"
@@ -88,137 +94,6 @@
 
     </lw-bottom-bar>
 
-    <!-- 多商品选择 -->
-    <lw-popup
-      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.kvpwvbms','选择商品')"
-      v-model="skuSelectPopup.show"
-    >
-
-      <div
-        class="lw-global-row lw-global-click-style lw-global-flex-start-start"
-        v-for="(i,k) in skuSelectPopup.list"
-        :key="k"
-        @click="skuSelectClick(i)"
-      >
-
-        <div style="flex: 1">
-          <lw-sku-info-module v-bind="i"/>
-        </div>
-
-        <van-icon
-          style="margin-left: 10px;"
-          name="arrow"
-          size="18px"
-          color="#ccc"
-        />
-      </div>
-
-    </lw-popup>
-
-    <!-- 拣选缺货 -->
-    <lw-popup
-      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.odduxuax','拣选缺货')"
-      v-model="lackPopup.show"
-    >
-
-      <!-- 箱、托盘显示 -->
-      <template v-if="isBoxOrLpn">
-        <lw-sku-info-module
-          v-bind="lackPopup.skuInfo"
-          :qty="lackPopup.skuInfo.qtyLabel"
-          is-row
-        />
-      </template>
-      <!-- 独立件、非独立件显示 -->
-      <template v-else>
-        <div class="lw-global-flex-start-start lw-global-row">
-
-          <div style="flex: 1">
-            <div class="lw-global-value-bold">{{ lackPopup.skuInfo.skuCode }}</div>
-            <div class="lw-global-title">{{ lackPopup.skuInfo.skuName }}</div>
-          </div>
-
-          <lw-tag
-            v-if="lackPopup.skuInfo.skuSizeLabel"
-            plain
-            round
-          >{{ lackPopup.skuInfo.skuSizeLabel }}</lw-tag>
-
-        </div>
-
-        <div class="lw-global-flex-between lw-global-row">
-
-          <lw-title-value-cell
-            :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.jphugkrl','拣选库位')"
-            :value="lackPopup.skuInfo.fromLocationCode"
-            val-bold
-            :is-row="false"
-          />
-
-          <lw-title-value-cell
-            :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.ahlgyadg','最小销售量')"
-            :value="lackPopup.skuInfo.uomQty || 1"
-            val-bold
-            val-red
-            :is-row="false"
-          />
-
-        </div>
-
-        <lw-title-value-cell
-          class="lw-global-row"
-          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.nbwstigk','待拣量')"
-          :value="lackPopup.skuInfo.waitPickQtyLabel || 0"
-          val-bold
-          :is-row="false"
-        />
-
-      </template>
-
-      <lw-get-qty-by-type
-        v-if="lackPopup.show"
-        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.mcywreph','缺货量')"
-        ref="lackPopupQty"
-        :owner-id="lackPopup.skuInfo.ownerId"
-        :sku-id="lackPopup.skuInfo.skuId"
-        init-focus
-        @confirm="lackConfirm"
-      />
-
-      <template #button>
-        <lw-button @click="lackConfirm"
-        >{{
-            $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.pwuturyd', '确认')
-          }}
-        </lw-button>
-      </template>
-
-    </lw-popup>
-
-    <!-- 异常 -->
-    <lw-popup
-      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.wrhgkhxs','异常')"
-      v-model="abnPopup.show"
-      @closed="abnPopup.comShow = false"
-    >
-
-      <lw-inner-abnormal-module
-        v-if="abnPopup.comShow"
-        ref="abnormal"
-        v-bind="abnPopup.skuInfo"
-        :location="abnPopup.skuInfo.fromLocationCode"
-        :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','拣选')"
-        :qty-label="abnPopup.skuInfo.waitPickQtyLabel || abnPopup.skuInfo.qtyLabel"
-      />
-
-      <template #button>
-        <lw-button @click="abnConfirm"
-        >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.pwuturyd','确认') }}</lw-button>
-      </template>
-
-    </lw-popup>
-
     <!-- 去播种 -->
     <lw-popup
       :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.wkhikwpx','拣选完成 - 提总')"
@@ -333,7 +208,7 @@
 
         <span
           class="lw-global-value-bold-red"
-          style="font-size: 16px"
+          style="font-size: 1.125rem"
         >
           {{
             pickData.pickPackType === 'MIX_PACK' ?
@@ -383,13 +258,13 @@
 
     <!-- 拣选分货 -->
     <lw-popup
-      :title="$lwLanguage.get('','拣选完成')"
+      :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pick.components.dataLookAndChange.index.dbvypcdi', '拣选完成')"
       v-model="distributePopupShow"
       @closed="backPage"
     >
 
       <div class="lw-global-row lw-data-loot-adn-change-success">
-        {{ $lwLanguage.get('', '当前任务已拣选完成，请执行分货') }}
+        {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.pick.components.dataLookAndChange.index.erwasqqt', '当前任务已拣选完成，请执行分货') }}
       </div>
 
       <lw-title-value-cell
@@ -404,7 +279,9 @@
       <template #button>
 
         <lw-button @click="goDistribute">
-          {{ $lwLanguage.get('', '去分货') }}
+          {{
+            $lwLanguage.get('wms_project.pda.wms.page.outbound.pick.components.dataLookAndChange.index.dzvkzhuj', '去分货')
+          }}
         </lw-button>
 
       </template>
@@ -412,29 +289,63 @@
 
     </lw-popup>
 
+    <!-- 系统提示弹框 -->
+    <lw-popup
+      :title="$lwLanguage.get('', '拣选完成')"
+      v-model="systemPopup.show"
+      @closed="backPage"
+    >
+
+      <lw-label-value-group :list="systemPopup.data.labelValueList"/>
+
+      <template #button>
+
+        <lw-button
+          v-if="systemPopup.data.taskPage"
+          @click="systemPopupConfirm"
+        >
+          {{ $lwLanguage.get('', '确认') }}
+        </lw-button>
+
+      </template>
+
+
+    </lw-popup>
+
+    <!-- 异常、缺货弹框 -->
+    <pick-more-sku-abn-lack-popup
+      ref="moreSkuAbnLackPopup"
+      :abn-api="abnConfirm"
+      :lack-api="lackConfirm"
+      @abnSubmitSuccess="lackAbnSuccess"
+      @lackSubmitSuccess="lackAbnSuccess"
+    />
+
 
   </div>
 </template>
 
 <script>
 import taskInfo from "../taskInfo.vue";
+import pickMoreSkuAbnLackPopup from "./../../../components/pickMoreSkuAbnLackPopup.vue";
 import {projectWmsGetPrintBoxData} from "../../../../../api/outbound/reprint-box";
 import {projectWmsOutboundPickQueryPoAllContainers} from "./../../../../../api/outbound/pick/common";
 
 export default {
   name: "index",
-  components:{
-    taskInfo
+  components: {
+    taskInfo,
+    pickMoreSkuAbnLackPopup,
   },
-  props:{
+  props: {
 
     // 当前拣选类型： box-按箱、lpn-按托盘、alone-独立件、notAlone-非独立件、container-容器
-    type:{
+    type: {
       type: String,
       required: true
     },
     // 标题
-    title:{
+    title: {
       type: String,
     },
 
@@ -474,9 +385,17 @@ export default {
       default: true
     }
   },
-  computed:{
+  computed: {
+    // 显示的标题
+    showTitle() {
+      if (this.$route.query.deliveryId) {
+        return this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pick.components.dataLookAndChange.index.pwumxign', '按运单拣选装车')
+      }
+      return this.title || this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.gmmvhnxt', '执行拣选')
+    },
+
     // 完成百分比
-    percentage(){
+    percentage() {
       return Math.floor(
         (this.pickData.pickQty + this.pickData.abnormalQty) /
         this.pickData.totalQty * 100
@@ -502,28 +421,6 @@ export default {
   },
   data() {
     return {
-      // 选择商品的弹框
-      skuSelectPopup:{
-        // 调用选择商品的父类型：缺货-lack，异常-abn
-        type:'',
-        show: false,
-        list:[]
-      },
-
-      // 拣选缺货的弹框
-      lackPopup:{
-        show: false,
-        skuInfo: [],
-        lackQty:'',
-        lackQtyFocus:false,
-      },
-
-      // 异常的弹框
-      abnPopup:{
-        show: false,
-        comShow:false,
-        skuInfo: []
-      },
 
       // 播种墙
       sowShow: false,
@@ -552,6 +449,12 @@ export default {
 
       // 打印机信息
       printData: {},
+
+      // 系统提示弹框
+      systemPopup: {
+        show: false,
+        data: {}
+      }
     }
   },
   mounted() {
@@ -563,11 +466,11 @@ export default {
 
       if (this.printData.printId) return true
 
-      const {printData, success} = this.$lwPrint.test(
-        'OUTBOUND_BOX_LABEL',
-        this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.index.oybgjedb', '出库箱票标签'),
-        needCheck
-      )
+      const {printData, success} = this.$lwPrint.test({
+        templateCode: 'OUTBOUND_BOX_LABEL',
+        msg: this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.index.oybgjedb', '出库箱票标签'),
+        msgType: needCheck ? 'HARD' : ''
+      })
       this.printData = printData || {}
       return success
     },
@@ -594,25 +497,41 @@ export default {
 
       this.getData()
     },
+    // 其他类型拣选完成的提示框
+    async otherSuccessPopup(msg) {
+      this.notAlone.msg = msg
+
+
+      const pickContentar = this.pickData.pickId && await projectWmsOutboundPickQueryPoAllContainers({
+        pickId: this.pickData.pickId
+      })
+
+      // 其他
+      this.notAlone.show = true
+      this.notAlone.contentar = pickContentar ? pickContentar.join(',') : ''
+    },
     // 拣选完成的弹出框
     async openPickSuccessPopup(res) {
       this.notAlone.msg = ''
 
       // 是否自动捆包完成
-      if (res && res.packBoxNo) {
-        this.notAlone.msg = this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.index.zizejnxr', '当前任务已拣选完成，并且已经捆包')
+      if (res) {
+        if (res.hint && Object.keys(res.hint).length) {
+          this.systemPopup.show = true
+          this.systemPopup.data = res.hint
+          return
+        }
 
-        this.notAlone.collectLoc = res.collectLocation || ''
+        if (res.packBoxNo) {
 
-        const pickContentar = this.pickData.pickId && await projectWmsOutboundPickQueryPoAllContainers({
-          pickId: this.pickData.pickId
-        })
+          this.notAlone.collectLoc = res.collectLocation || ''
 
-        // 其他
-        this.notAlone.show = true
-        this.notAlone.contentar = pickContentar ? pickContentar.join(',') : ''
+          await this.otherSuccessPopup(
+            this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.index.zizejnxr', '当前任务已拣选完成，并且已经捆包')
+          )
+          return
 
-        return
+        }
       }
 
       // 是否需要播种
@@ -639,20 +558,16 @@ export default {
         return
       }
 
-
       // 其他
-      this.notAlone.msg = this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.index.zizejnxrc', '当前任务已拣选完成')
-      const pickContentar = this.pickData.pickId && await projectWmsOutboundPickQueryPoAllContainers({
-        pickId: this.pickData.pickId
-      })
-      this.notAlone.show = true
-      this.notAlone.contentar = pickContentar ? pickContentar.join(',') : ''
+      await this.otherSuccessPopup(
+        this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.index.zizejnxrc', '当前任务已拣选完成')
+      )
 
     },
 
 
-    // 缺货拣选或者异常上报时候是否存在多商品
-    checkSkuMore(type){
+    // 获取商品列表
+    getSkuList() {
 
       let data
       switch (this.type) {
@@ -665,136 +580,55 @@ export default {
         default:
           data = {
             ...this.pickData.pendingPickLineList[this.taskIndex],
-            qty:Number(this.pickData.pendingPickLineList[this.taskIndex].totalQty || 0) -
+            qty: Number(this.pickData.pendingPickLineList[this.taskIndex].totalQty || 0) -
               Number(this.pickData.pendingPickLineList[this.taskIndex].pickQty || 0)
           }
       }
 
-      let skuInfo = []
-      if (this.isBoxOrLpn){
-        skuInfo = data.skuList.map(item=>{
+      let skuList = []
+      if (this.isBoxOrLpn) {
+        skuList = data.skuList.map(item => {
           item.fromLocationCode = data.fromLocationCode
           item.qty = Number(item.qty || 0)
           return item
         })
-      }else {
-        skuInfo = [data]
+      } else {
+        skuList = [data]
       }
 
 
-      if (skuInfo.length === 1){
-        return {
-          success: true,
-          data: skuInfo[0]
-        }
-      }else {
-        this.showSkuSelect(skuInfo, type)
-        return {
-          success: false,
-          data: {}
-        }
-      }
-    },
-    // 显示需要选择商品的弹框
-    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)
-      }else {
-        this.showLackPopup(item)
-      }
-      this.skuSelectPopup.show = false
+      return skuList
     },
 
 
     // 拣选缺货按钮
-    lackBtn(){
-      const {success, data} = this.checkSkuMore('lack')
-
-      if (!success) return
-
-      this.showLackPopup(data)
-    },
-    // 显示拣选缺货弹框
-    showLackPopup(data){
-      this.lackPopup.skuInfo = data
-      this.lackPopup.show = true
+    lackAbnBtn(type) {
+      this.$refs.moreSkuAbnLackPopup.openPopup(
+        this.getSkuList(),
+        type,
+        this.type
+      )
     },
     // 确认拣选缺货
-    lackConfirm(){
-      const qty = this.$refs.lackPopupQty.getQty()
-      if (!qty){
-        this.$refs.lackPopupQty.getFocus()
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.vgtttoca', '缺货量不能为空，且应当是大于0的整数')
-        )
-        return
-      }
-
-      const sku = this.lackPopup.skuInfo
-
-      // 判断是否大于待拣量
-      if (Number(sku.qty || 0) < qty){
-        this.$refs.lackPopupQty.getFocus()
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.lqqjxrxd', '缺货量不能大于待拣量')
-        )
-        this.$refs.lackPopupQty.clearInput()
-        return
-      }
-
-      this.lackConfirmFn({
-        ...this.lackPopup.skuInfo,
-        lackQty: qty
-      }).then((res)=>{
-
-        this.lackAbnSuccess(res)
-
-        this.lackPopup.show = false
+    lackConfirm({skuInfo, lackQty}) {
+      return this.lackConfirmFn({
+        ...skuInfo,
+        lackQty
       })
     },
 
 
-    // 异常按钮
-    abnBtn(){
-      const {success, data} = this.checkSkuMore('abn')
-
-      if (!success) return
-
-      this.showAbnPopup(data)
-    },
-    // 显示拣选缺货弹框
-    showAbnPopup(data){
-      this.abnPopup.skuInfo = data
-      this.abnPopup.comShow = true
-      this.$nextTick(()=>{
-        this.abnPopup.show = true
-      })
-    },
     // 确认异常
-    abnConfirm(){
-      const {success, data} = this.$refs.abnormal.getAbnormalData()
-
-      if (!success) return
-
-      this.abnConfirmFn({
-        ...this.abnPopup.skuInfo,
-        data
-      }).then((res)=>{
-        this.$refs.abnormal.printLabel()
-        this.lackAbnSuccess(res)
-        this.abnPopup.show = false
+    abnConfirm({skuInfo, abnData}) {
+      return this.abnConfirmFn({
+        ...skuInfo,
+        data: abnData
       })
     },
 
 
     // 确认拣选按钮
-    confirmBtn(){
+    confirmBtn() {
       this.$emit('pickConfirm')
     },
 
@@ -855,6 +689,14 @@ export default {
           lwContainer: this.pickContainer
         }
       })
+    },
+
+    // 系统弹框确认按钮点击
+    systemPopupConfirm() {
+      this.$router.replace({
+        path: this.systemPopup.data.taskPage,
+        query: this.systemPopup.data.taskPageParams
+      })
     }
 
   }
@@ -862,8 +704,8 @@ export default {
 </script>
 
 <style scoped lang="less">
-.lw-data-loot-adn-change-success{
-  font-size: 16px;
+.lw-data-loot-adn-change-success {
+  font-size: 1.125rem;
   text-align: center;
   font-weight: bold;
   letter-spacing: 1px;
@@ -882,8 +724,8 @@ export default {
   overflow: hidden;
   transition: all .3s;
 
-  .lw-global-title{
-    font-size: 12px;
+  .lw-global-title {
+    font-size: 0.85rem;
   }
 }