@logwire/logwire-wms-pda-ui 1.1.17 → 1.2.0

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

@@ -6,22 +6,22 @@
 <template>
 
   <div>
-    <lw-nav-bar :title="$lwLanguage.get('','复核捆包')"/>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.vbefbsau','复核捆包')"/>
 
     <div class="lw-global-page-box">
 
       <!-- 门店信息 -->
       <store-info-sku-list
-        :item="checkData.boxData"
-        :customer-code="checkData.containerData.customerCode"
-        :customer-name="checkData.containerData.customerName"
-        show-bale-info
+        v-if="Object.keys(packBox).length || Object.keys(packContainer).length"
+        :item="packBox"
+        :customer-code="customerCode"
+        :customer-name="customerName"
       >
         <div
           style="text-align: center"
           class="lw-global-row-end lw-global-value-bold-red"
         >
-          {{ $lwLanguage.get('','当前还未执行捆包，请扫描商品号执行捆包') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.iqtdtjed','当前还未执行捆包，请扫描商品号执行捆包') }}
         </div>
       </store-info-sku-list>
 
@@ -29,22 +29,23 @@
       <template v-if="!fromAllCheck">
 
         <div
-          style="border: solid 2px #D50000"
-          class="lw-global-model-box"
+          v-if="Object.keys(packContainer).length"
+          class="lw-global-model-box lw-global-border-2px"
         >
 
           <lw-input
-            :title="$lwLanguage.get('','商品号')"
+            :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.mfghjxey','商品号')"
             v-model="actionCheck.sku.value"
             :get-focus.sync="actionCheck.sku.focus"
             auto-clear-val
+            rule-key="sku"
             @confirm="actionCheckSkuConfirm"
           />
 
           <template v-if="Object.keys(actionCheck.skuInfo).length">
 
             <lw-input
-              :title="$lwLanguage.get('','复核数量')"
+              :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"
@@ -56,7 +57,8 @@
                   mini
                   round
                   @click="actionCheckQtyConfirm"
-                >{{ $lwLanguage.get('','确认复核') }}</lw-button>
+                >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.xlsgeumr','确认复核') }}
+                </lw-button>
               </template>
 
             </lw-input>
@@ -70,56 +72,62 @@
             <div class="lw-global-flex-between lw-global-row-end">
 
               <lw-title-value-cell
-                :title="$lwLanguage.get('','最小销售数')"
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.fsqjrrbv','最小销售数')"
                 :value="actionCheck.skuInfo.minSellQty"
                 val-bold
                 val-red
                 :is-row="false"
               />
 
-              <div>
-              <span class="lw-global-title">
-                {{ $lwLanguage.get('','数量') }}
-              </span>
-                <span class="lw-global-value">
-                <span class="lw-global-value-bold-red">
-                  {{ actionCheck.skuInfo.packQty }}
-                </span>
-                 / {{ actionCheck.skuInfo.totalQty }}
-              </span>
-              </div>
+              <lw-title-value-cell
+                :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.zekjwfre','数量')"
+                :value="actionCheck.skuInfo.waitQty"
+                val-red
+                val-bold
+                :is-row="false"
+              />
 
             </div>
           </template>
 
         </div>
 
+        <div
+          v-else
+          style="text-align: center;letter-spacing: 1px"
+          class="lw-global-model-box lw-global-value-bold-red"
+        >
+          {{ $lwLanguage.get(
+            '',
+            '当前捆包箱没有可用的拣选容器，如需继续捆包请点击追加按钮，或封箱完成')
+          }}
+        </div>
+
       </template>
 
       <!-- 容器信息 -->
       <container-info
+        v-if="Object.keys(packContainer).length"
         style="margin-top: 10px"
-        :container="checkData.containerData.pickContainer"
-        :sku-count="checkData.containerData.skuTypeCount"
-        :over-count="checkData.containerData.packQty"
-        :wait-count="checkData.containerData.waitPackQty"
-        :abnormal-count="checkData.containerData.abnormalQty"
-        :sku-list="checkData.containerData.packSkuList"
+        :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"
         :abn-confirm="abnConfirm"
+        @abnSuccess="mixinAbnSuccess"
       />
 
     </div>
 
-    <lw-bottom-bar-btn-hidden
-      v-if="checkData.boxData && Object.keys(checkData.boxData).length"
-      :btn-list="btnList"
-    />
+    <lw-bottom-bar-btn-hidden :btn-list="btnList"/>
 
     <!-- 复核序列号 -->
     <lw-popup
-      :title="$lwLanguage.get('','复核序列号')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.agvbvelf','复核序列号')"
       v-model="checkPopup.show"
       @closed="checkPopupOff"
     >
@@ -128,21 +136,21 @@
         :sku-name="actionCheck.skuInfo.skuName"
         :sku-code="actionCheck.skuInfo.skuCode"
         :qty="actionCheck.skuInfo.minSellQty"
-        :qty-text="$lwLanguage.get('','最小销售量')"
+        :qty-text="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.ugretxll','最小销售量')"
       />
 
       <div class="lw-global-row lw-global-flex-between">
 
         <lw-title-value-cell
-          :title="$lwLanguage.get('','待复核量')"
-          :value="actionCheck.skuInfo.totalQty - actionCheck.skuInfo.packQty"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.ownspubo','待复核量')"
+          :value="actionCheck.skuInfo.waitQty"
           val-red
           val-bold
           :is-row="false"
         />
 
         <lw-title-value-cell
-          :title="$lwLanguage.get('','当前扫描数量')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.pisatdcc','当前扫描数量')"
           :value="checkPopup.nowScanNum"
           val-red
           val-bold
@@ -152,10 +160,11 @@
       </div>
 
       <lw-input
-        :title="$lwLanguage.get('','序列号')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.wyjevgpl','序列号')"
         v-model="checkPopup.sn.value"
         :get-focus.sync="checkPopup.sn.focus"
         auto-clear-val
+        rule-key="sn"
         @confirm="checkPopupSnConfirm"
       />
 
@@ -183,12 +192,12 @@
           plain
           @click="checkPopupRepeatScan"
         >
-          {{ $lwLanguage.get('','重新扫描') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.hirjtmqc','重新扫描') }}
         </lw-button>
 
 
         <lw-button @click="checkPopupSubmit">
-          {{ $lwLanguage.get('','确认复核') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.xlsgeumr','确认复核') }}
         </lw-button>
 
       </template>
@@ -196,36 +205,37 @@
 
     <!-- 完成捆包弹框 -->
     <lw-popup
-      :title="$lwLanguage.get('','完成捆包')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.aqugjfcu','完成捆包')"
       v-model="overBalePopup.show"
-      @closed="overBaleOff"
+      @closed="mixinOverBaleOff"
     >
       <container-sku-qty
-        :box-no="checkData.boxData.boxNo"
-        :pack-qty="checkData.boxData.packQty"
-        :type-count="checkData.boxData.skuTypeCount"
+        :box-no="packBox.boxNo"
+        :pack-qty="packBox.packQty"
+        :type-count="packBox.skuTypeCount"
       />
 
       <lw-title-value-cell
-        :title="$lwLanguage.get('','标准重量') + '(KG)'"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.nzkqhshe','标准重量') + '(KG)'"
         :value="overBalePopup.data.standardWeight"
         val-bold
       />
 
       <lw-input
-        :title="$lwLanguage.get('','实际重量') + '(KG)'"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.eisrswcv','实际重量') + '(KG)'"
         v-model="overBalePopup.real.value"
         :get-focus.sync="overBalePopup.real.focus"
         type="number"
-        @confirm="realConfirm"
+        @confirm="mixinRealConfirm"
       />
 
       <lw-input
-        :title="$lwLanguage.get('','捆包包材')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.pepgmjjv','捆包包材')"
         v-model="overBalePopup.materials.value"
         :get-focus.sync="overBalePopup.materials.focus"
         :show-bottom-border="false"
-        @confirm="materialsConfirm"
+        rule-key="skuPack"
+        @confirm="mixinMaterialsConfirm"
       />
 
       <div
@@ -238,11 +248,11 @@
         >
 
           <div class="lw-global-title col-1">
-            {{ $lwLanguage.get('','包材编码') }}
+            {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.iezednfo','包材编码') }}
           </div>
 
           <div class="lw-global-title col-2">
-            {{ $lwLanguage.get('','包材规格') }}
+            {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.qlpuvxgs','包材规格') }}
           </div>
 
           <div class="col-3"></div>
@@ -273,7 +283,7 @@
                 color="#D50000"
                 name="clear"
                 size="20"
-                @click="delMaterials(k)"
+                @click="mixinDelMaterials(k)"
               />
             </div>
 
@@ -288,66 +298,44 @@
           v-if="overBalePopup.materials.list.length"
           @click="overBaleConfirm"
         >
-          {{ $lwLanguage.get('','完成复核(封箱)') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.bjabixrx','完成复核(封箱)') }}
         </lw-button>
         <lw-button
           v-else
           @click="overBaleConfirm"
         >
-          {{ $lwLanguage.get('','无需包材(封箱)') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.wwetygri','无需包材(封箱)') }}
         </lw-button>
       </template>
 
     </lw-popup>
 
     <!-- 重新复核弹框 -->
-    <lw-popup
-      :title="$lwLanguage.get('','重新复核')"
-      v-model="repeatPopup.show"
-      @closed="repeatPopup.container.value=''"
-    >
-
-      <container-sku-qty
-        :box-no="checkData.boxData.boxNo"
-        :pack-qty="checkData.boxData.packQty"
-        :type-count="checkData.boxData.skuTypeCount"
-      />
-
-      <lw-input
-        :title="$lwLanguage.get('','商品撤回容器')"
-        v-model="repeatPopup.container.value"
-        :get-focus.sync="repeatPopup.container.focus"
-        :show-bottom-border="false"
-        required
-        @confirm="repeatConfirm"
-      />
-
-      <template #button>
-        <lw-button @click="repeatConfirm">
-          {{ $lwLanguage.get('','确认重新复核') }}
-        </lw-button>
-      </template>
-
-    </lw-popup>
+    <repeat-check
+      v-model="repeatPopupShow"
+      :box-data="packBox"
+      @repeatConfirm="repeatConfirm"
+    />
 
     <!-- 追加弹框 -->
     <lw-popup
-      :title="$lwLanguage.get('','追加')"
+      :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.daocvnkk','追加')"
       v-model="addPopup.show"
       @closed="addPopupOff"
     >
 
       <container-sku-qty
-        :box-no="checkData.boxData.boxNo"
-        :pack-qty="checkData.boxData.packQty"
-        :type-count="checkData.boxData.skuTypeCount"
+        :box-no="packBox.boxNo"
+        :pack-qty="packBox.packQty"
+        :type-count="packBox.skuTypeCount"
       />
 
       <lw-input
-        :title="$lwLanguage.get('','拣选容器号')"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.ipqzcucf','拣选容器号')"
         v-model="addPopup.container.value"
         :get-focus.sync="addPopup.container.focus"
         required
+        rule-key="container"
         @confirm="addContainerConfirm"
       />
 
@@ -357,14 +345,14 @@
       >
 
         <lw-title-value-cell
-          :title="$lwLanguage.get('','品种数')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.mvbzrrkd','品种数')"
           :value="addPopup.data.skuTypeCount"
           val-bold
           :is-row="false"
         />
 
         <lw-title-value-cell
-          :title="$lwLanguage.get('','待复核')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.vjsyivfg','待复核')"
           :value="addPopup.data.waitPackQty"
           val-bold
           :is-row="false"
@@ -375,7 +363,7 @@
       <template #button>
 
         <lw-button @click="addConfirm">
-          {{ $lwLanguage.get('','确认追加') }}
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.fljefeua','确认追加') }}
         </lw-button>
 
       </template>
@@ -383,95 +371,21 @@
     </lw-popup>
 
     <!-- 剔除商品 -->
-    <lw-popup
-      :title="$lwLanguage.get('','剔除商品')"
-      v-model="delSkuPopup.show"
-      @closed="delSkuOff"
-    >
-
-      <container-sku-qty
-        :box-no="checkData.boxData.boxNo"
-        :pack-qty="checkData.boxData.packQty"
-        :type-count="checkData.boxData.skuTypeCount"
-      />
-
-      <!-- 商品条码 -->
-      <lw-input
-        :title="$lwLanguage.get('','商品条码')"
-        v-model="delSkuPopup.sku.value"
-        :get-focus.sync="delSkuPopup.sku.focus"
-        required
-        @confirm="delSkuSkuCodeConfirm"
-      />
-
-      <!-- 序列号 -->
-      <lw-input
-        v-if="delSkuPopup.isSn"
-        :title="$lwLanguage.get('','序列号')"
-        v-model="delSkuPopup.sn.value"
-        :get-focus.sync="delSkuPopup.sn.focus"
-        required
-        rule-key="delSkuSn"
-        rule-value-key="sn"
-        @confirm="delSkuSnConfirm"
-      />
-
-      <!-- 剔除数量 -->
-      <lw-input
-        :title="$lwLanguage.get('','剔除数量')"
-        v-model="delSkuPopup.qty.value"
-        :get-focus.sync="delSkuPopup.qty.focus"
-        type="digit"
-        :disabled="delSkuPopup.isSn"
-        required
-        @confirm="delSkuQtyConfirm"
-      >
-        <template #button>
-          <lw-tag
-            v-if="delSkuPopup.isSn"
-            type="danger"
-            plain
-            round
-          >{{ $lwLanguage.get('','不可修改') }}</lw-tag>
-        </template>
-      </lw-input>
-
-      <!-- 商品信息 -->
-      <lw-sku-info-module
-        :sku-code="delSkuPopup.data.skuCode"
-        :sku-name="delSkuPopup.data.skuName"
-        :qty="delSkuPopup.data.minSellQty"
-        :qty-text="$lwLanguage.get('','最小销售数')"
-        is-row
-      />
-
-      <!-- 剔除容器号 -->
-      <lw-input
-        :title="$lwLanguage.get('','容器号')"
-        v-model="delSkuPopup.container.value"
-        :get-focus="delSkuPopup.container.focus"
-        :show-bottom-border="false"
-        :placeholder="$lwLanguage.get('','剔除商品放入的容器号')"
-        required
-        @confirm="delSkuConfirm"
-      />
-
-      <template #button>
-
-        <lw-button @click="delSkuConfirm">
-          {{ $lwLanguage.get('','确认剔除') }}
-        </lw-button>
-
-      </template>
-
-    </lw-popup>
+    <del-sku
+      v-model="delPopupShow"
+      :box-data="packBox"
+      :sku-list="packBox.skuList"
+      :sku-sn-list="packBox.packSnList"
+      need-sn
+      @delConfirm="delSkuConfirm"
+    />
 
     <!-- 全部拦截 -->
     <all-block
       v-model="allBlockShow"
-      :container="checkData.containerData.pickContainer"
-      :type-count="checkData.containerData.skuTypeCount"
-      :qty="checkData.containerData.blockQty"
+      :container="packContainer.pickContainer"
+      :type-count="packContainer.skuTypeCount"
+      :qty="packContainer.blockQty"
       @confirm="allBlockConfirm"
     />
 
@@ -490,11 +404,7 @@
 </template>
 
 <script>
-import containerInfo from './../../components/containerInfo/index.vue'
 import storeInfoSkuList from './../../components/storeInfoSkuList/index.vue'
-import containerSkuQty from './../../components/containerSkuQty/index.vue'
-import allBlock from './../../components/allBlock/index.vue'
-import partBlock from './../../components/partBlock/index.vue'
 import {
   projectWmsContainerWholePack,
   projectWmsMixPackQueryPackData
@@ -508,77 +418,29 @@ import {
   projectWmsMixPackContainerWholeBlock,
   projectWmsMixPackDeleteSku,
   projectWmsMixPackDeleteSkuWithSn,
-  projectWmsMixPackRePack, projectWmsMixPackSubmitAbnormal,
+  projectWmsMixPackRePack,
+  projectWmsMIxPackScanQuery,
+  projectWmsMixPackSubmitAbnormal,
   projectWmsMixPackSubmitSku,
-  projectWmsMixPackSubmitWithSn,
-  projectWmsOutbondQueryPackMaterial
+  projectWmsMixPackSubmitWithSn
 } from "../../../../../../api/outbound/bale/checkBale/action";
+import {baleMixins} from "../../mixins";
 
 export default {
   name: "lwOutboundBaleActionPage",
   components:{
-    containerInfo,
     storeInfoSkuList,
-    containerSkuQty,
-    allBlock,
-    partBlock,
   },
+  mixins:[baleMixins],
   data() {
     return {
-
-      // 复核的数据
-      checkData:{
-        "boxData": {
-          "boxNo": "BOX-001",
-          "boxId": 0,
-          "customerCode": "KH001",
-          "customerName": "客户001",
-          "skuTypeCount": 0,
-          "packQty": 10,
-          "skuList": [
-            {
-              "skuId": 0,
-              "skuCode": "LJ-001",
-              "skuName": "零件001",
-              "qty": 5,
-              "minSellQty": 0,
-              "needHandleSn": false
-            }
-          ],
-          "packSnList": [
-            {
-              "sn": "",
-              "qty": 0
-            }
-          ]
-        },
-        "containerData": {
-          "pickContainer": "RQ-001",
-          "canWholePack": false,
-          "skuTypeCount": 2,
-          "packQty": 4,
-          "waitPackQty": 6,
-          "abnormalQty": 0,
-          "blockStatus": "",
-          "blockQty": 0,
-          "packSkuList": [
-            {
-              "skuId": 0,
-              "skuCode": "LJ-001",
-              "skuName": "零件001",
-              "minSellQty": 0,
-              "totalQty": 10,
-              "packQty": 4,
-              "locationId": 0,
-              "locationCode": "",
-              "needHandleSn": false
-            }
-          ]
-        }
-      },
+      // 捆包箱数据
+      packBox:{},
+      // 拣选容器数据
+      packContainer:{},
 
       // 是否是全部复核进入
-      fromAllCheck: true,
+      fromAllCheck: false,
 
       // 允许全部复核
       allowAllCheck: false,
@@ -599,7 +461,7 @@ export default {
 
       // 序列号复核弹框
       checkPopup:{
-        show: true,
+        show: false,
         // 当前扫描量
         nowScanNum: 0,
         sn:{
@@ -610,32 +472,6 @@ export default {
       },
 
 
-      // 完成捆包弹框
-      overBalePopup:{
-        show: false,
-        // 实际重量
-        real:{
-          value: '',
-          focus: false
-        },
-        // 包材输入框
-        materials:{
-          value:'',
-          focus:false,
-          list:[]
-        },
-        data:{}
-      },
-
-      // 重新复核
-      repeatPopup:{
-        show: false,
-        container:{
-          value: '',
-          focus: false
-        }
-      },
-
       // 追加
       addPopup:{
         show: false,
@@ -645,82 +481,30 @@ export default {
         },
         data:{}
       },
-
-      // 剔除商品
-      delSkuPopup:{
-        show: false,
-        // 是否需要扫描sn
-        isSn: false,
-        // 商品号
-        sku: {
-          value: '',
-          focus: false
-        },
-        // 序列号
-        sn: {
-          value: '',
-          focus: false
-        },
-        // 数量
-        qty: {
-          value: '',
-          focus: false
-        },
-        // 剔除容器号
-        container: {
-          value: '',
-          focus: false
-        },
-        data:{}
-      },
-
-      // 是否全部拦截
-      allBlockShow: true,
-
-      // 部分拦截弹框
-      partBlockPopup:{
-        show: false,
-        data:{
-          pickContainer:'',
-          skuTypeCount:'',
-          skuQty:'',
-          blockData:{}
-        }
-      },
     }
   },
   computed:{
-    // 底部按钮
-    btnList(){
-      return [
-        {
-          text: this.$lwLanguage.get('','完成复核(封箱)'),
-          click: this.overBaleOpen
-        },
-        {
-          text: this.$lwLanguage.get('','重新复核'),
-          click: this.repeatOpen
-        },
-        {
-          text: this.$lwLanguage.get('','剔除商品'),
-          click: this.delSkuOpen
-        },
-        {
-          text: this.$lwLanguage.get('','追加'),
-          click: this.addSkuOpen
-        }
-      ]
+    customerName(){
 
-      // 是否显示追加商品按钮
-      /*if (this.showAddBtn){
-        list.push({
-          text: this.$lwLanguage.get('','追加'),
-          click: this.addSkuOpen
-        })
-      }*/
+      if (this.packContainer.customerName)return this.packContainer.customerName
 
-      // return list
-    }
+      if (this.packBox.customerName)return this.packBox.customerName
+
+      return '-'
+    },
+    customerCode(){
+
+      if (this.packContainer.customerCode)return this.packContainer.customerCode
+
+      if (this.packBox.customerCode)return this.packBox.customerCode
+
+      return '-'
+    },
+
+    // 是否需要显示追加按钮
+    showAddBtn(){
+      return !(this.packContainer && this.packContainer.waitPackQty > 0);
+    },
   },
   mounted() {
     const query = this.$route.query
@@ -731,28 +515,40 @@ export default {
       projectWmsContainerWholePack({
         pickContainer: query.lwContainer
       }).then(res=>{
-        this.checkBlock(res)
+        this.mixinCheckBlock(res)
 
-        this.checkData = res
+        this.formatDat(res)
       })
       return
     }
 
-    this.getData()
+    this.getData(true)
   },
   methods: {
+    // 数据处理
+    formatDat(res){
+      this.packBox = res.packBox || {}
+      this.packContainer = res.packContainer || {}
+    },
+
     // 获取数据
-    getData(){
+    getData(first){
       return new Promise((PR,PE)=>{
 
+        let queryContainer = ''
+        if (this.packBox.boxId){
+          queryContainer = this.packBox.boxId
+        }else {
+          queryContainer = this.$route.query.lwContainer
+        }
         projectWmsMixPackQueryPackData({
-          queryContainer: this.$route.query.lwContainer
+          queryContainer
         }).then(res=>{
 
-          if (res.containerData.blockStatus === '200') this.allBlockShow = true
-
-          this.checkData = res
+          this.formatDat(res)
+          if (res.packContainer && res.packContainer.blockStatus === '200') this.allBlockShow = true
 
+          first ? this.actionCheck.sku.focus = true : ''
           PR()
         }).catch(()=>{
           PE()
@@ -761,54 +557,81 @@ export default {
       })
     },
 
-    // 开始复核 - 商品号确认
-    actionCheckSkuConfirm(val,{data}){
+    // 查找当前扫描商品是否在拣选容器内
+    checkPickContainerHasSkuCode(skuCode){
+      for (let i of this.packContainer.packSkuList){
 
-      if (
-        Object.keys(this.actionCheck.skuInfo).length &&
-        data.key !== this.actionCheck.skuInfo.skuCode
-      ){
-        this.actionCheck.sku.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get(
-            '',
-            '当前扫描商品与上一次扫描商品不一致！如需更换商品，请完成上次商品复核或点击重新扫描按钮')
-        )
-        return
-      }
+        if (i.skuCode === skuCode){
+          return {success: true, skuInfo:i}
+        }
 
-      for (let i of this.checkData.containerData.packSkuList){
+      }
 
-        if (i.skuCode === data.key){
+      return {success: false, skuInfo: {}}
 
-          this.actionCheck.skuInfo = {
-            ...i,
-            waitQty: i.totalQty - i.packQty
+    },
+    // 开始复核 - 商品号确认
+    actionCheckSkuConfirm(val,{data}){
+      const {success, skuInfo} = this.checkPickContainerHasSkuCode(data.key || val)
+
+      if (success){
+
+        // 查看当前是否存在记录数据
+        if (Object.keys(this.actionCheck.skuInfo).length){
+
+          // 如果存在历史记录就判断是否和上次扫描的数据一直
+          if (skuInfo.skuCode !== this.actionCheck.skuInfo.skuCode){
+            this.actionCheck.sku.focus = true
+            this.$lwShowErrorMsg(
+              this.$lwLanguage.get(
+                '',
+                this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.nhcgbeqa', '当前扫描商品与上一次扫描商品不一致！')
+              )
+            )
+            return
           }
 
-          if(i.needHandleSn){
-            this.checkPopup.show = true
-            this.checkPopup.sn.focus = true
-            this.getCheckPopupNum()
-          }else {
-            this.actionCheck.qty.value += Number(data.qty || 0)
-
-            if (this.actionCheck.qty.value === this.actionCheck.skuInfo.waitQty){
-              this.actionCheckQtyConfirm()
-            }
-          }
-          return
         }
 
+        // 校验是否需要sn
+        this.checkNeedSn({
+          ...skuInfo,
+          waitQty: skuInfo.totalQty - skuInfo.packQty
+        })
+        return
       }
 
-      this.actionCheck.sku.focus = true
-      this.$lwShowErrorMsg(
-        this.$lwLanguage.get('','当前商品不在拣选容器中')
-      )
-      this.actionCheck.sku.value = ''
+      projectWmsMIxPackScanQuery({
+        pickContainer: this.packContainer.pickContainer,
+        boxId: this.packBox.boxId,
+        currentSkuId: this.actionCheck.skuInfo.skuId,
+        sn: data.key,
+        qty: data.qty
+      }).then(res=>{
+        this.checkNeedSn(res, 'add')
+      })
 
     },
+    // 校验是否需要处理sn
+    checkNeedSn(data, type){
+
+      this.actionCheck.skuInfo = data
+
+      // 判断是否需要处理sn
+      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()
+        return
+      }
+
+      this.actionCheck.qty.value = Number(this.actionCheck.qty.value) + Number(data.qty || 0)
+      if (this.actionCheck.qty.value === this.actionCheck.skuInfo.waitQty){
+        this.actionCheckQtyConfirm()
+      }
+    },
     // 开始复核 - 商品数量确认
     actionCheckQtyConfirm(){
 
@@ -817,7 +640,7 @@ export default {
       if (!qty){
         this.actionCheck.qty.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','复核数不能为空，且应当是大于0的整数')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.sesxkxyt','复核数不能为空，且应当是大于0的整数')
         )
         return
       }
@@ -825,24 +648,25 @@ export default {
       if (qty > this.actionCheck.skuInfo.waitQty){
         this.actionCheck.qty.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','复核数不能大于待复核数')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.cbitnesb','复核数不能大于待复核数')
         )
+        this.actionCheck.qty.value = ''
         return
       }
 
 
       projectWmsMixPackSubmitSku({
-        boxId: this.checkData.containerData.boxId,
-        pickContainer: this.checkData.containerData.pickContainer,
+        boxId: this.packBox.boxId,
+        pickContainer: this.packContainer.pickContainer,
         skuId: this.actionCheck.skuInfo.skuId,
         currentPackQty: qty
       }).then(res=>{
 
-        this.checkData = res
+        this.formatDat(res)
 
         if (res.containerPackFinish){
           this.$lwToast.success(
-            this.$lwLanguage.get('','当前容器已复核完毕')
+            this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.fzaqeggt','当前容器已复核完毕')
           )
 
           this.overBaleOpen()
@@ -851,10 +675,11 @@ export default {
 
         this.actionCheck.sku.value = ''
         this.actionCheck.sku.focus = true
-        this.actionCheck.qty.focus = ''
+        this.actionCheck.qty.focus = false
+        this.actionCheck.qty.value = ''
         this.actionCheck.skuInfo = {}
 
-        this.checkBlock(res)
+        this.mixinCheckBlock(res)
       })
     },
 
@@ -877,7 +702,7 @@ export default {
       if (!sn){
         this.checkPopup.sn.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','序列号不能为空')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.zturbxlj','序列号不能为空')
         )
         return
       }
@@ -906,22 +731,22 @@ export default {
       if (!snList.length){
         this.checkPopup.sn.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','请输入或扫描需要复核的序列号')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.agienozq','请输入或扫描需要复核的序列号')
         )
         return
       }
 
       projectWmsMixPackSubmitWithSn({
-        boxId: this.checkData.containerData.boxId,
-        pickContainer: this.checkData.containerData.pickContainer,
+        boxId: this.packBox.boxId,
+        pickContainer: this.packContainer.pickContainer,
         skuId: this.actionCheck.skuInfo.skuId,
         snList
       }).then(res=>{
-        this.checkData = res
+        this.formatDat(res)
 
         if (res.containerPackFinish){
           this.$lwToast.success(
-            this.$lwLanguage.get('','当前容器已复核完毕')
+            this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.fzaqeggt','当前容器已复核完毕')
           )
 
           this.overBaleOpen()
@@ -929,14 +754,14 @@ export default {
 
         this.checkPopup.show = false
 
-        this.checkBlock(res)
+        this.mixinCheckBlock(res)
       })
     },
     // 复核序列号 - 重新扫描
     checkPopupRepeatScan(){
-      this.$dialog.confirm({
-        title: this.$lwLanguage.get('','警告'),
-        message: this.$lwLanguage.get('','当前扫描数据将会被清空')
+      this.$lwDialog.confirm({
+        title: this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.tyoupcga','警告'),
+        message: this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.aviijbed','当前扫描数据将会被清空')
       }).then(()=>{
         this.checkPopup.sn = ''
         this.snList = []
@@ -955,129 +780,36 @@ export default {
     // 完成捆包 - 打开弹框
     overBaleOpen(){
       projectWmsMixPackComputeBoxSuggest({
-        boxId: this.checkData.boxData.boxId
+        boxId: this.packBox.boxId
       }).then(res=>{
         this.overBalePopup.data = res
         this.overBalePopup.show = true
         this.overBalePopup.real.focus = true
       })
     },
-    // 完成捆包 - 实际重量确认
-    realConfirm(){
-      if (this.realCheck()) this.overBalePopup.materials.focus = true
-    },
-    // 完成捆包 - 实际重量校验
-    realCheck(){
-      const num = Number(this.overBalePopup.real.value || 0)
-
-      if (!num) return true
-
-      const data = this.overBalePopup.data
-      if (data.weightFloor > num){
-        this.overBalePopup.real.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','实际重量不能低于标准重量下限') + ':' + data.weightFloor
-        )
-        return false
-      }
-      if (data.weightLimit < num){
-        this.overBalePopup.real.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','实际重量不能大于标准重量上限') + ':' + data.weightLimit
-        )
-        return false
-      }
-
-      return true
-    },
-    // 完成捆包 - 包材确认
-    materialsConfirm(){
-      const materials = this.overBalePopup.materials.value
-      if (!materials){
-        this.overBalePopup.materials.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','捆包包材不能为空')
-        )
-        return
-      }
-
-
-      projectWmsOutbondQueryPackMaterial({
-        packMaterialCode: materials
-      }).then(res=>{
-        this.overBalePopup.materials.list.unshift(res)
-      })
-    },
-    // 完成捆包 - 删除包材
-    delMaterials(index){
-      this.overBalePopup.materials.list.splice(index, 1)
-    },
     // 完成捆包 - 封箱
     overBaleConfirm(){
-      if (!this.realCheck()) return
-
-      // 通过包材长度判断是否是有包材还是无包材封箱
-      const list = this.overBalePopup.materials.list
-
-      // 获取每一个包材的使用量
-      let obj = {}
-      list.forEach(item=>{
-        if (obj[item.packMaterialId]){
-          obj[item.packMaterialId] = obj[item.packMaterialId] + 1
-        }else {
-          obj[item.packMaterialId] = 1
-        }
-      })
-      let packMaterialList = []
-      for (let i in obj){
-        packMaterialList.push({
-          packMaterialId: i,
-          qty: obj[i]
-        })
-      }
 
       projectWmsMixPackCloseBox({
-        boxId: this.boxId,
+        boxId: this.packBox.boxId,
         packWeight: this.overBalePopup.real.value || this.overBalePopup.data.standardWeight,
-        packMaterialList
+        packMaterialList: this.mixinGetMaterials()
       }).then(()=>{
         this.$lwToast.success(
-          this.$lwLanguage.get('','捆包成功')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.bqbzdkbu','捆包成功')
         )
         history.go(-1)
       })
 
     },
-    // 完成捆包 - 弹框关闭
-    overBaleOff(){
-      this.overBalePopup.materials.value = ''
-      this.overBalePopup.materials.list = []
-      this.overBalePopup.real.value = ''
-      this.overBalePopup.data = {}
-    },
-
-    // 重新复核 - 打开弹框
-    repeatOpen(){
-      this.repeatPopup.show = true
-      this.repeatPopup.container.focus = true
-    },
     // 重新复核 - 确认
-    repeatConfirm(){
-      const container = this.repeatPopup.container.value
-      if (!container){
-        this.repeatPopup.container.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','商品撤回容器号不能为空')
-        )
-        return
-      }
-
+    repeatConfirm(container){
       projectWmsMixPackRePack({
-        boxId: this.checkData.boxData.boxId,
+        boxId: this.packBox.boxId,
         toPickContainer: container
       }).then(()=>{
         this.$lwToast.success(
-          this.$lwLanguage.get('','操作成功')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.vecsyyxh','操作成功')
         )
         history.go(-1)
       })
@@ -1094,13 +826,13 @@ export default {
       if (!container){
         this.addPopup.container.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','拣选容器号不能为空')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.wmwodaqc','拣选容器号不能为空')
         )
         return
       }
 
       projectWmsMixPackAddContainerCheck({
-        boxId: this.checkData.boxData.boxId,
+        boxId: this.packBox.boxId,
         addPickContainer: container
       }).then(res=>{
         this.addPopup.data = res
@@ -1108,7 +840,7 @@ export default {
     },
     // 追加 - 确认追加
     addConfirm(){
-      this.checkData.containerData = this.$lwDeepCopy(this.addPopup.data)
+      this.packContainer = this.$lwDeepCopy(this.addPopup.data)
       this.addPopup.show = false
     },
     // 追加 - 弹框关闭
@@ -1117,162 +849,41 @@ export default {
       this.addPopup.data = {}
     },
 
-    // 剔除商品 - 打开弹框
-    delSkuOpen(){
-      this.delSkuPopup.show = true
-      this.delSkuPopup.sku.focus = true
-    },
-    // 剔除商品 - 商品号确认
-    delSkuSkuCodeConfirm(val, {data}){
-
-      for (let i of this.checkData.boxData.skuList) {
-        if (i.skuCode === data.key){
-          this.delSkuPopup.data = i
-
-          // 判断是否需要sn
-          if (i.needHandleSn){
-            this.delSkuPopup.isSn = true
-
-            // 看看条码是否解析出了sn
-            if (data.sn){
-              this.delSkuPopup.sn.value = data.sn
-              this.delSkuSnConfirm(data.sn,{data:{key:data.sn}})
-            }else {
-              this.delSkuPopup.sn.focus = ''
-            }
-
-          }else {
-            this.delSkuPopup.isSn = false
-            this.delSkuPopup.qty.focus = true
-          }
-          return
-        }
-      }
-
-
-      this.delSkuPopup.sku.focus = true
-      this.$lwShowErrorMsg(
-        this.$lwLanguage.get('','当前商品不在捆包箱中')
-      )
-      this.delSkuPopup.sku.value = ''
-    },
-    // 剔除商品 - 序列号确认
-    delSkuSnConfirm(val, {data}){
-
-      for (let i of this.checkData.boxData.packSnList) {
-        if (i.sn === data.key){
-          this.delSkuPopup.qty.value = i.qty
-          this.delSkuQtyConfirm()
-          return
-        }
-      }
-
-      this.delSkuPopup.sn.focus = true
-      this.$lwShowErrorMsg(
-        this.$lwLanguage.get('','当前商品序列号不在捆包箱中')
-      )
-      this.delSkuPopup.sn.value = ''
-
-    },
-    // 剔除商品 - 剔除数量确认
-    delSkuQtyConfirm(){
-      if(this.delSkuQtyCheck()) this.delSkuPopup.container.focus = true
-    },
-    // 剔除商品 - 剔除数量校验
-    delSkuQtyCheck(){
-      const qty = Number(this.delSkuPopup.qty.value || 0)
-
-      if(!qty){
-        this.delSkuPopup.qty.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','剔除数量不能为空，且应当是大于0的整数')
-        )
-        return false
-      }
-
-      if (qty%this.delSkuPopup.data.minSellQty !== 0){
-        this.delSkuPopup.qty.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','剔除数量必须是最小销售数的整数倍')
-        )
-        this.delSkuPopup.qty.value = ''
-        return false
-      }
-
-      return true
-
-    },
     // 剔除商品 - 确认剔除
-    delSkuConfirm(){
-      const data = this.delSkuPopup
-      const container = data.container.value
-
-      if (!container){
-        this.delSkuPopup.container.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('','剔除容器号不能为空')
-        )
-        return
-      }
+    delSkuConfirm(data){
 
       // 判断当前是需要sn还是不需要
-      const fn = this.delSkuPopup.isSn ?
+      const fn = data.isSn ?
         projectWmsMixPackDeleteSkuWithSn :
         projectWmsMixPackDeleteSku
 
       fn({
-        boxId: this.checkData.boxData.boxId,
-        deleteToContainer: container,
-        skuId: data.data.skuId,
-        // 按唯一号剔除需要
-        snList:[{sn: data.sn.value, qty: data.qty.value}],
-        // 按商品剔除需要
-        currentDeleteQty: data.qty.value
+        ...data,
+        boxId: this.packBox.boxId
       }).then(res=>{
         if (res.boxDelAll){
           this.$lwToast.success(
-            this.$lwLanguage.get('','当前箱已全部剔除')
+            this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.bheqtugt','当前箱已全部剔除')
           )
           history.go(-1)
           return
         }
 
         this.$lwToast.success(
-          this.$lwLanguage.get('','剔除成功')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.vkvtsjoo','剔除成功')
         )
         this.getData()
-        this.delSkuPopup.show = false
+        this.delPopupShow = false
       })
     },
-    // 剔除商品 - 弹框关闭
-    delSkuOff(){
-      this.delSkuPopup.sku.value = ''
-      this.delSkuPopup.sn.value = ''
-      this.delSkuPopup.qty.value = ''
-      this.delSkuPopup.container.value = ''
-      this.delSkuPopup.isSn = false
-      this.delSkuPopup.data = {}
-    },
 
-    // 校验是否拦截
-    checkBlock(res){
-      if (res.containerBlockData.blockStatus === '200') this.allBlockShow = true
-      if (res.containerBlockData.blockStatus === '100') {
-        this.partBlockPopup.data={
-          pickContainer: res.containerData.pickContainer,
-          skuTypeCount:res.containerData.skuTypeCount,
-          skuQty:res.containerData.packQty,
-          blockData:res.containerBlockData.blockSkuList[0]
-        }
-      }
-    },
     // 全部拦截
     allBlockConfirm(){
       projectWmsMixPackContainerWholeBlock({
-        pickContainer: this.checkData.containerData.pickContainer
+        pickContainer: this.packContainer.pickContainer
       }).then(()=>{
         this.$lwToast.success(
-          this.$lwLanguage.get('','已拦截')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.bncgywex','已拦截')
         )
         history.go(-1)
       })
@@ -1283,14 +894,14 @@ export default {
       const res = await projectWmsMixPackContainerSkuBlock({
         pickContainer: data.container,
         currentBlockQty: data.qty,
-        skuId: ''
+        skuId: this.partBlockPopup.data.blockData.skuId
       })
 
       await this.getData()
 
       if (res.containerPackFinish){
         this.$lwToast.success(
-          this.$lwLanguage.get('','当前容器已全部捆包')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.checkBale.action.jfmhrzqh','当前容器已全部捆包')
         )
         this.overBaleOpen()
       }
@@ -1299,7 +910,7 @@ export default {
     // 异常确认
     abnConfirm(data){
       return projectWmsMixPackSubmitAbnormal({
-        pickContainer: this.checkData.containerData.pickContainer,
+        pickContainer: this.packContainer.pickContainer,
         ...data
       })
     }