@logwire/logwire-wms-pda-ui 3.1.3-zc-beta → 3.3.2

package/src/views/wms/page/outbound/pickConsole/orderAction/index.vue

@@ -11,6 +11,7 @@
 
     <div class="lw-global-page-box">
 
+      <!-- 出库单信息 -->
       <div class="lw-global-model-box lw-global-row-box">
 
         <div class="lw-global-flex-between">
@@ -78,6 +79,7 @@
 
           <lw-button
             v-if="orderData.canShip"
+            style="width: 25%"
             round
             mini
             @click="canShipOrder"
@@ -87,11 +89,24 @@
             }}
           </lw-button>
 
+          <lw-button
+            v-if="showCanCancel"
+            style="width: 25%"
+            round
+            mini
+            @click="oneBtnShip"
+          >
+            {{
+              $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.pmliebev','一键发运')
+            }}
+          </lw-button>
+
         </div>
 
 
       </div>
 
+      <!-- 数据看板 -->
       <lw-data-look-bg style="margin: 10px 0">
 
         <lw-data-look-item
@@ -116,25 +131,76 @@
 
       </lw-data-look-bg>
 
-      <div class="lw-global-model-box lw-global-flex-between">
+      <!-- 待拣、已拣统计 -->
+      <div
+        v-if="hasLpnPick || hasCasePick || hasSkuPick"
+        class="lw-global-model-box"
+      >
+        <div class="lw-global-flex-start-start lw-global-row-start">
 
-        <lw-title-value-cell
-          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.ucpzgsqb','已拣托数')"
-          :value="orderData.pickLpnCount"
-          val-bold
-          :is-row="false"
-        />
+          <div class="lw-global-title">
+            {{ $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.ooonuwul','待拣') }}
+          </div>
 
-        <lw-title-value-cell
-          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.krojmcit','待拣托数')"
-          :value="orderData.waitPickLpnCount"
-          val-bold
-          :is-row="false"
-        />
+          <div
+            v-if="hasLpnPick"
+            class="lw-global-value-bold-red total-item"
+          >
+            {{ orderData.waitPickLpnCount || 0 }}
+            {{ $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.aufourwa','托') }}
+          </div>
+
+          <div
+            v-if="hasCasePick"
+            class="lw-global-value-bold-red total-item"
+          >
+            {{ orderData.waitPickCaseCount || 0 }}
+            {{ $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.pcvxrvqk','箱') }}
+          </div>
+
+          <div
+            v-if="hasSkuPick"
+            class="lw-global-value-bold-red total-item"
+          >
+            {{ orderData.waitPickSctQty || 0 }}
+            {{ $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.fcbcjnpc','EA') }}
+          </div>
+
+        </div>
+        <div class="lw-global-flex-start-start lw-global-row-end">
 
+          <div class="lw-global-title">
+            {{ $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.ctyeiuyb','已拣') }}
+          </div>
 
+          <div
+            v-if="hasLpnPick"
+            class="lw-global-value-bold total-item"
+          >
+            {{ orderData.pickLpnCount || 0 }}
+            {{ $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.aufourwa','托') }}
+          </div>
+
+          <div
+            v-if="hasCasePick"
+            class="lw-global-value-bold total-item"
+          >
+            {{ orderData.pickCaseCount || 0 }}
+            {{ $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.pcvxrvqk','箱') }}
+          </div>
+
+          <div
+            v-if="hasSkuPick"
+            class="lw-global-value-bold total-item"
+          >
+            {{ orderData.pickSctQty || 0 }}
+            {{ $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.fcbcjnpc','EA') }}
+          </div>
+
+        </div>
       </div>
 
+      <!-- 拣选tab页 -->
       <lw-tab-box style="margin-top: 10px">
         <van-tabs
           type="card"
@@ -149,103 +215,179 @@
               :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.dofvaabs','正在拣选')"
             >
 
-              <div
-                v-if="orderData.pendingList.length"
-                class="lw-global-model-box"
-              >
+              <template v-if="orderData.currentPickList.length">
 
-                <div class="lw-global-flex-between lw-global-row-start">
+                <div class="lw-global-model-box">
 
-                  <template v-if="nowPickData.pickType === '100'">
-                    <div class="lw-global-value-bold">{{ nowPickData.fromLpn }}</div>
+                  <div class="lw-global-flex-between lw-global-row-start">
 
-                    <lw-tag
-                      round
-                      plain
-                    >
-                      {{
-                        $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.pefdvzrt', '整托')
-                      }}
-                    </lw-tag>
+                    <template v-if="nowPickData.pickType === '100'">
+                      <div class="lw-global-value-bold">{{ nowPickData.fromLpn }}</div>
 
-                  </template>
+                      <lw-tag
+                        round
+                        plain
+                      >
+                        {{
+                          $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.pefdvzrt', '整托')
+                        }}
+                      </lw-tag>
 
-                  <template v-else-if="nowPickData.pickType === '200'">
-                    <div class="lw-global-value-bold">{{ nowPickData.fromCaseNum }}</div>
+                    </template>
 
-                    <lw-tag
-                      round
-                      plain
-                    >
-                      {{
-                        $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.pppbfmey', '整箱')
-                      }}
-                    </lw-tag>
+                    <template v-else-if="nowPickData.pickType === '200'">
+                      <div class="lw-global-value-bold">{{ nowPickData.fromCaseNum }}</div>
 
-                  </template>
+                      <lw-tag
+                        round
+                        plain
+                      >
+                        {{
+                          $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.pppbfmey', '整箱')
+                        }}
+                      </lw-tag>
 
-                  <template v-else>
+                    </template>
 
-                    <lw-tag
-                      round
-                      plain
-                    >
-                      {{
-                        $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.vdiyzwhc', '零散')
-                      }}
-                    </lw-tag>
+                    <template v-else>
 
-                  </template>
+                      <div class="lw-global-value-bold">
+                        {{ nowPickData.skuCode + ' - ' + nowPickData.skuName }}
+                      </div>
 
-                </div>
+                      <lw-tag
+                        style="flex-shrink: 0"
+                        round
+                        plain
+                      >
+                        {{
+                          $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.vdiyzwhc', '零散')
+                        }}
+                      </lw-tag>
+
+                    </template>
 
-                <lw-title-value-cell
-                  :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.jfjejwrp','拣选库位')"
-                  :value="nowPickData.fromLocationCode"
-                  val-bold
-                />
+                  </div>
 
-                <lw-title-value-cell
-                  :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.oshdtmho','数量')"
-                  :value="nowPickData.totalQty"
-                  val-bold
-                />
+                  <lw-title-value-cell
+                    :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.jfjejwrp','拣选库位')"
+                    :value="nowPickData.fromLocationCode"
+                    val-bold
+                  />
 
-                <div
-                  class="lw-global-row"
-                  style="padding: 0 10px 8px 10px"
-                >
+                  <lw-title-value-cell
+                    :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.oshdtmho','推荐数量')"
+                    :value="nowPickData.totalQty"
+                    val-bold
+                  />
 
                   <div
-                    style="align-items: flex-start"
-                    v-for="(i,k) in nowPickData.skuList"
-                    :key="k"
-                    :class="[
-                    'lw-global-flex-between',
-                     getRowClass(k)
-                  ]"
+                    v-if="nowPickData.skuList && nowPickData.skuList.length"
+                    class="lw-global-row"
+                    style="padding: 0 10px 8px 10px"
                   >
 
-                    <div>
-                      <div class="lw-global-value-bold">{{ i.skuCode }}</div>
-                      <div class="lw-global-title">{{ i.skuName }}</div>
-                    </div>
+                    <div
+                      style="align-items: flex-start"
+                      v-for="(i,k) in nowPickData.skuList"
+                      :key="k"
+                      :class="[
+                      'lw-global-flex-between',
+                       getRowClass(k)
+                    ]"
+                    >
 
-                    <div class="lw-global-value-bold-red">{{ i.qty }}</div>
+                      <div>
+                        <div class="lw-global-value-bold">{{ i.skuCode }}</div>
+                        <div class="lw-global-title">{{ i.skuName }}</div>
+                      </div>
+
+                      <div class="lw-global-value-bold-red">{{ i.qty }}</div>
+
+                    </div>
 
                   </div>
+                  <template v-else>
 
-                </div>
 
-                <lw-cut-card
-                  v-model="nowPickIndex"
-                  :length="orderData.pendingList.length"
-                  :cut-start="cutStart"
-                  :cut-end="cutEnd"
-                />
+                    <lw-title-value-cell
+                      v-if="nowPickData.fromLpn"
+                      :title="$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.mqxqompf','托盘号')"
+                      :value="nowPickData.fromLpn"
+                      val-bold
+                    />
 
+                    <lw-title-value-cell
+                      v-if="nowPickData.fromCaseNum"
+                      :title="$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.gyjpigyb','箱号')"
+                      :value="nowPickData.fromCaseNum"
+                      val-bold
+                    />
+                  </template>
 
-              </div>
+                  <lw-cut-card
+                    v-model="nowPickIndex"
+                    :length="orderData.pendingList.length"
+                    :cut-start="cutStart"
+                    :cut-end="cutEnd"
+                  />
+
+
+                </div>
+
+                <!-- 输入框模块 -->
+                <div class="lw-global-model-box lw-global-model-box-3px">
+
+                  <!-- 整托拣选 - 外托号 -->
+                  <lw-input
+                    v-if="nowPickData.pickType === '100'"
+                    :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.ragtvybg','外托号')"
+                    v-model="extLpn.value"
+                    :get-focus.sync="extLpn.focus"
+                    :create-rule="$lwScanRule.create('出库拣选控制台-执行拣选-外托号','LPN')"
+                    rule-key="extLpn"
+                    required
+                    @confirm="extLpnConfirm"
+                  />
+
+                  <!-- 判断是否是整托或有无托号、箱号 -->
+                  <lw-input
+                    v-if="nowPickData.pickType === '100' || (nowPickData.fromLpn && !nowPickData.fromCaseNum)"
+                    :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.kmqavizx','托盘号')"
+                    v-model="lpn.value"
+                    :get-focus.sync="lpn.focus"
+                    :create-rule="$lwScanRule.create('出库拣选控制台-执行拣选-托盘号','LPN')"
+                    rule-key="lpn"
+                    required
+                    :show-bottom-border="false"
+                    @confirm="lpnConfirm"
+                  />
+
+                  <!-- 零散拣选 -->
+                  <template v-if="nowPickData.pickType === '300'">
+                    <lw-input
+                      v-if="nowPickData.fromCaseNum"
+                      :title="$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.gyjpigyb','箱号')"
+                      v-model="caseNum.value"
+                      :get-focus.sync="caseNum.focus"
+                      :create-rule="$lwScanRule.create('出库拣选控制台-执行拣选-托盘号','LPN')"
+                      rule-key="lpn"
+                      required
+                      @confirm="caseNumConfirm"
+                    />
+
+                    <lw-input
+                      :title="$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.wtxeolpv','数量')"
+                      v-model="qty.value"
+                      :get-focus.sync="qty.focus"
+                      type="digit"
+                      required
+                      :show-bottom-border="false"
+                      @confirm="submitPick"
+                    />
+                  </template>
+                </div>
+              </template>
               <lw-not-data v-else/>
 
             </van-tab>
@@ -259,7 +401,7 @@
                 v-for="(i,k) in orderData.pendingList"
                 :key="k"
                 :item="i"
-                @itemClick="waitItemClick(k)"
+                @itemClick="waitItemClick(k,i)"
               />
               <lw-not-data v-if="!orderData.pendingList.length"/>
             </van-tab>
@@ -287,54 +429,25 @@
 
     </div>
 
-    <template v-if="orderData.pendingList.length">
+    <lw-bottom-bar v-if="orderData.currentPickList.length && tabActive==='ing'">
 
-      <lw-bottom-bar
-        :slot-btn="false"
-        height="auto"
-        v-if="tabActive==='ing'"
-      >
+      <lw-button @click="submitPick">
+        {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.amljfwvg', '确认拣选') }}
+      </lw-button>
 
-        <lw-input
-          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.kmqavizx','托盘号')"
-          v-model="lpn.value"
-          :get-focus.sync="lpn.focus"
-          :create-rule="$lwScanRule.create('出库拣选控制台-执行拣选-托盘号','LPN')"
-          rule-key="lpn"
-          required
-          @confirm="lpnConfirm"
-        />
-        <lw-input
-          :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.ragtvybg','外托号')"
-          v-model="extLpn.value"
-          :get-focus.sync="extLpn.focus"
-          :create-rule="$lwScanRule.create('出库拣选控制台-执行拣选-外托号','LPN')"
-          rule-key="extLpn"
-          required
-          @confirm="submitPick"
-        />
-        <lw-button
-          style="margin: 5px 0"
-          block
-          @click="submitPick"
-        >
-          {{ $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.amljfwvg', '确认拣选') }}
-        </lw-button>
+    </lw-bottom-bar>
 
-      </lw-bottom-bar>
-      <lw-bottom-bar v-if="tabActive==='task'">
+    <lw-bottom-bar v-if="orderData.pendingList.length && tabActive==='task'">
 
-        <lw-button @click="cancelPickTask">
-          {{
-            $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.vqwtpwkf', '取消拣选任务')
-          }}
-        </lw-button>
-
-      </lw-bottom-bar>
-
-    </template>
+      <lw-button @click="cancelPickTask">
+        {{
+          $lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.vqwtpwkf', '取消拣选任务')
+        }}
+      </lw-button>
 
+    </lw-bottom-bar>
 
+    <!-- 撤销拣选弹框 -->
     <lw-popup
       :title="$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.jtdifuye','撤销拣货')"
       v-model="backPopup.show"
@@ -366,6 +479,39 @@
       </template>
     </lw-popup>
 
+    <!-- 确认发运弹框弹框 -->
+    <lw-popup
+      :title="shipPopupTitleBtnLabel.title"
+      v-model="shipPopup.show"
+      :show-keyboard-placeholder="false"
+      @open="shipPopup.showImg=true"
+      @closed="shipPopupOff"
+    >
+
+      <div class="lw-global-flex-start-start">
+        <div class="lw-global-title" style="margin-right: 5px">
+          {{ $lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.cmzwibqq','发运图片') }}
+        </div>
+
+        <lw-img-upload
+          v-if="shipPopup.showImg"
+          v-model="shipPopup.imgList"
+        />
+      </div>
+
+      <template #button>
+
+        <lw-button
+          :color="shipPopupTitleBtnLabel.btnColor"
+          @click="shipPopupConfirm"
+        >
+          {{ shipPopupTitleBtnLabel.btn }}
+        </lw-button>
+
+      </template>
+
+    </lw-popup>
+
   </div>
 </template>
 
@@ -375,8 +521,12 @@ import {
   projectWmsOutboundPDASoCancel,
   projectWmsOutboundPDASoCancelLpnPick,
   projectWmsOutboundPDASoCancelPickTask,
+  projectWmsOutboundPDASoCancelSkuPick,
+  projectWmsOutboundPDASoDirectShip,
   projectWmsOutboundPDASoLoadData,
-  projectWmsOutboundPDASoPick, projectWmsOutboundPDASoPickShip
+  projectWmsOutboundPDASoPick,
+  projectWmsOutboundPDASoPickShip,
+  projectWmsOutboundPDASoSkuPick
 } from "../../../../api/outbound/pickConsole/orderPick";
 import waitOverTaskItem from "./../components/waitOverTaskItem.vue";
 
@@ -388,6 +538,7 @@ export default {
   data() {
     return {
       orderData: {
+        currentPickList: [],
         pendingList: [],
         pickedList: [],
         totalQty: 5,
@@ -401,6 +552,14 @@ export default {
         value: '',
         focus: false
       },
+      caseNum: {
+        value: '',
+        focus: false
+      },
+      qty: {
+        value: '',
+        focus: false
+      },
       extLpn: {
         value: '',
         focus: false
@@ -413,12 +572,20 @@ export default {
           focus: false
         },
         item: {}
+      },
+
+      // 发运弹框
+      shipPopup: {
+        type: '',
+        show: false,
+        imgList: [],
+        showImg: false
       }
     }
   },
   computed: {
     nowPickData() {
-      return this.orderData.pendingList[this.nowPickIndex] || {}
+      return this.orderData.currentPickList[this.nowPickIndex] || {}
     },
     // 显示拣货中和带拣货
     showWait() {
@@ -428,10 +595,52 @@ export default {
     tabShowType() {
       const {totalQty, pickQty} = this.orderData
       const t = Number(totalQty || 0) - Number(pickQty || 0)
-      // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-      if (!t) this.tabActive = 'over'
       return !!t
     },
+
+    // 订单中是否包含 - 整托拣选
+    hasLpnPick() {
+      const {waitPickLpnCount, pickLpnCount} = this.orderData
+      return !!(Number(waitPickLpnCount || 0) || Number(pickLpnCount || 0))
+    },
+    // 订单中是否包含 - 整箱拣选
+    hasCasePick() {
+      const {pickCaseCount, waitPickCaseCount} = this.orderData
+      return !!(Number(pickCaseCount || 0) || Number(waitPickCaseCount || 0))
+    },
+    // 订单中是否包含 - 零散拣选
+    hasSkuPick() {
+      const {pickSctQty, waitPickSctQty} = this.orderData
+      return !!(Number(pickSctQty || 0) || Number(waitPickSctQty || 0))
+    },
+
+    // 是否显示一键发运
+    showCanCancel() {
+      const {canCancel, type} = this.orderData
+      return canCancel && ['FP_RETURN', 'EMPTY_CONTAINER'].includes(type)
+    },
+
+    // 发运弹框标题及按钮文字
+    shipPopupTitleBtnLabel() {
+      if (['all', 'oneBtn'].includes(this.shipPopup.type)) {
+        return {
+          title: this.$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.kzxnrmcu','确认发运'),
+          btn: this.$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.wwsfrjrr','发运')
+        }
+      }
+      return {
+        title: this.$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.fwcrndpq', '部分发运确认'),
+        btn: this.$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.cmnjemvo', '部分发运'),
+        btnColor: 'rgb(51, 51, 51)'
+      }
+    }
+  },
+  watch: {
+    tabShowType: {
+      handler(n) {
+        if (!n) this.tabActive = 'over'
+      }
+    }
   },
   mounted() {
     this.getOrderData()
@@ -445,9 +654,10 @@ export default {
       return t
     },*/
     // 数据格式化
-    dataFormat(res) {
+    dataFormat(res, cutEnd) {
       this.orderData = res
       this.nowPickIndex = this.$lwUtils.cutCardIndexCount(this.nowPickIndex, this.orderData.pendingList.length)
+      cutEnd && this.cutEnd()
     },
 
     // 获取出库单信息
@@ -455,7 +665,7 @@ export default {
       projectWmsOutboundPDASoLoadData({
         soId: this.$route.query.lwOrderId
       }).then(res => {
-        this.dataFormat(res)
+        this.dataFormat(res, true)
       }).catch(() => {
         history.go(-1)
       })
@@ -500,7 +710,7 @@ export default {
       projectWmsOutboundPDASoAllocate({
         soId: this.orderData.soId
       }).then(res => {
-        this.dataFormat(res)
+        this.dataFormat(res, true)
         let msg = ''
         let type = ''
 
@@ -515,27 +725,42 @@ export default {
         this.$lwToast[type](msg)
       })
     },
+
+
+    // 打开发运弹框
+    openShipPopup(type) {
+      this.shipPopup.type = type
+      this.shipPopup.show = true
+    },
     // 发运
     canShipOrder() {
-      const message = this.orderData.waitPickQty ?
-        this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.mmahvlkd', '该订单未拣货完成，是否确认部分发运？') :
-        this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.dbieaepc', '商品拣货完成，是否确认发运？')
-
+      const {totalQty, pickQty} = this.orderData
+      this.openShipPopup(Number(totalQty || 0) > Number(pickQty || 0) ? 'part' : 'all')
+    },
+    // 一键发运
+    oneBtnShip() {
+      this.openShipPopup('oneBtn')
+    },
+    // 发运弹框 - 关闭
+    shipPopupOff() {
+      this.shipPopup.imgList = []
+      this.shipPopup.showImg = false
+    },
+    // 发运弹框 - 确认提交
+    shipPopupConfirm() {
+      const api = this.shipPopup.type === 'oneBtn' ?
+        projectWmsOutboundPDASoDirectShip :
+        projectWmsOutboundPDASoPickShip
 
-      this.$lwDialog.confirm({
-        title: this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.prqekmqt', '提示'),
-        message,
-        type: 'warning'
+      api({
+        soId: this.orderData.soId,
+        shipImages: this.shipPopup.imgList.join('|')
       }).then(() => {
-        projectWmsOutboundPDASoPickShip({
-          soId: this.orderData.soId
-        }).then(() => {
-          this.$lwToast.success(
-            this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.zuzkrcnp', '已发运')
-          )
-          history.go(-1)
-        })
-      }).catch(() => {
+        this.$lwToast.success(
+          this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.zuzkrcnp', '已发运')
+        )
+        const step = Number(this.$route.query.lwBackStep || 1)
+        history.go(-step)
       })
     },
 
@@ -562,11 +787,31 @@ export default {
     },
     // 数据切换后
     cutEnd() {
-      const input = ['lpn', 'extLpn']
+      const input = ['lpn', 'extLpn', 'caseNum', 'qty']
       for (const i of input) {
         this[i].value = ''
       }
-      this[input[0]].focus = true
+
+
+      if (this.nowPickData.pickType === '100') {
+        this.extLpn.focus = true
+        return
+      }
+
+      if (this.nowPickData.pickType === '300') {
+
+        if (this.nowPickData.fromCaseNum) {
+          this.caseNum.focus = true
+          return
+        }
+
+        if (this.nowPickData.fromLpn) {
+          this.lpn.focus = true
+          return
+        }
+
+        this.qty.focus = true
+      }
     },
 
     // 托盘校验
@@ -582,8 +827,18 @@ export default {
     },
     // 托盘确认
     lpnConfirm() {
-      if (this.lpnCheck()) this.extLpn.focus = true
+      if (!this.lpnCheck()) return
+      switch (this.nowPickData.pickType) {
+        case '100':
+          this.submitPick()
+          break;
+        case '300':
+          this.qty.focus = true
+          break;
+      }
+
     },
+
     // 外托盘校验
     extLpnCheck() {
       if (this.extLpn.value) return true
@@ -594,9 +849,59 @@ export default {
       )
       return false
     },
+    // 外托盘确认
+    extLpnConfirm() {
+      if (this.extLpnCheck()) this.lpn.focus = true
+    },
+
+    // 箱校验
+    caseNumCheck() {
+      if (this.caseNum.value) return true
+
+      this.caseNum.focus = true
+      this.$lwShowErrorMsg(
+        this.$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.vojtkbxq', '箱号不能为空')
+      )
+      return false
+
+    },
+    // 箱确认
+    caseNumConfirm() {
+      if (this.caseNumCheck()) {
+        this.qty.focus = true
+      }
+    },
+    // 数量校验
+    qtyCheck() {
+      if (Number(this.qty.value || 0)) return true
+
+      this.qty.focus = true
+      this.$lwShowErrorMsg(
+        this.$lwLanguage.get('wms_project.pda.views.wms.page.outbound.pickConsole.orderAction.index.ezkenfkg','数量不能为空，且应当是大于0的正整数')
+      )
+      return false
+    },
     // 提交拣选
     submitPick() {
+      // 整托盘拣选校验
+      if (this.nowPickData.pickType === '100') {
+        this.lpnSubmit()
+        return
+      }
+      // 零散拣选校验
+      if (this.nowPickData.pickType === '300') {
+
+        if (this.nowPickData.fromLpn && !this.nowPickData.fromCaseNum && !this.lpnCheck()) return
+
+        if (this.nowPickData.fromCaseNum && !this.caseNumCheck()) return
 
+        if (!this.qtyCheck()) return
+
+        this.skuSubmit()
+      }
+    },
+    // 整托拣选提交
+    lpnSubmit() {
       if (!this.lpnCheck() || !this.extLpnCheck()) return
 
       const {pickId, fromLpn, fromLocationId} = this.nowPickData
@@ -607,18 +912,55 @@ export default {
         fromLocationId,
         actualLpn: this.lpn.value,
         extLpn: this.extLpn.value,
-      }).then(res => {
-        this.$lwToast.success(
-          this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.jcvxtjmd', '操作成功')
-        )
-        this.dataFormat(res)
-        this.cutEnd()
-      })
+      }).then(res => this.submitOver(res))
+    },
+    // 零散拣选提交
+    skuSubmit() {
+      if (this.nowPickData.fromLpn && !this.nowPickData.fromCaseNum && !this.lpnCheck()) return
+
+      if (this.nowPickData.fromCaseNum && !this.caseNumCheck()) return
+
+      if (!this.qtyCheck()) return
+
+      const {fromLpn, fromCaseNum, fromLocationId, skuId} = this.nowPickData
+      projectWmsOutboundPDASoSkuPick({
+        soId: this.orderData.soId,
+        skuId,
+        fromLpn,
+        fromCaseNum,
+        fromLocationId,
+        actualLpn: this.lpn.value,
+        actualCaseNum: this.caseNum.value,
+        currentPickQty: this.qty.value,
+      }).then(res => this.submitOver(res))
+    },
+
+    // 提交完成后执行的操作
+    submitOver(res) {
+      this.$lwToast.success(
+        this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.jcvxtjmd', '操作成功')
+      )
+      this.dataFormat(res, true)
     },
 
     // 待拣选任务项点击
-    waitItemClick(index) {
-      this.nowPickIndex = index
+    waitItemClick(index, item) {
+      let k = index
+      if (item.pickType === '300') {
+        const waitPick = this.orderData.currentPickList
+        for (let i = 0; i < waitPick.length; i++) {
+          const pick = waitPick[i]
+          if (
+            pick.pickType === '300' &&
+            pick.skuCode === item.skuCode &&
+            pick.fromLocationCode === item.fromLocationCode
+          ) {
+            k = i
+            break
+          }
+        }
+      }
+      this.nowPickIndex = k
       this.tabActive = "ing"
       this.cutEnd()
     },
@@ -630,7 +972,7 @@ export default {
       this.backPopup.show = true
     },
     // 撤销弹框 - 确认库位
-    backPopupLocConfirm() {
+    async backPopupLocConfirm() {
       const {loc, item} = this.backPopup
       if (!loc.value) {
         this.backPopup.loc.focus = true
@@ -640,20 +982,34 @@ export default {
         return
       }
 
-      projectWmsOutboundPDASoCancelLpnPick({
+      const data = {
         soId: this.orderData.soId,
-        pickId: item.pickId,
-        fromLpn: item.fromLpn,
         fromLocationId: item.fromLocationId,
         cancelToLocationCode: loc.value,
-      }).then(res => {
-        this.dataFormat(res)
-        this.$lwToast.success(
-          this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.hmiwzmix', '已撤销')
-        )
-        this.backPopup.show = false
-        this.backPopup.loc.value = ''
-      })
+      }
+
+      let res = {}
+      if (item.pickType === '300') {
+        res = await projectWmsOutboundPDASoCancelSkuPick({
+          ...data,
+          skuId: item.skuId,
+          cancelQty: item.totalQty
+        })
+      } else {
+        res = await projectWmsOutboundPDASoCancelLpnPick({
+          ...data,
+          pickId: item.pickId,
+          fromLpn: item.fromLpn,
+        })
+      }
+
+
+      this.dataFormat(res)
+      this.$lwToast.success(
+        this.$lwLanguage.get('wms_project.pda.wms.page.outbound.pickConsole.orderAction.index.hmiwzmix', '已撤销')
+      )
+      this.backPopup.show = false
+      this.backPopup.loc.value = ''
     },
 
     // 取消拣选任务
@@ -683,7 +1039,12 @@ export default {
   text-align: right;
 
   > button {
-    width: 30%;
+    width: 20%;
+    margin: 3px 0;
   }
 }
+
+.total-item {
+  width: 20%;
+}
 </style>