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

package/src/views/wms/page/inbound/unload/action/index.vue

@@ -9,6 +9,8 @@
     <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.dagbhasd','卸货')"/>
 
     <lw-page-body-module>
+
+
       <div class="lw-global-model-box">
         <lw-user-checkbox-module
           :title="$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.action.index.srznmjcg', '卸货人')"
@@ -23,47 +25,33 @@
 
         <div class="lw-global-flex-between lw-global-row-start">
 
-          <div class="lw-global-value-bold">{{ unloadData.unloadOrderNo }}</div>
+          <div class="lw-global-value-bold">{{ unloadData.unloadNo }}</div>
 
           <div class="lw-global-title">
-            {{ $lwDate.format(unloadData.insertDate, 'yyyy-MM-dd hh:mm') }}
+            {{ $lwDate.format(unloadData.time, 'yyyy-MM-dd hh:mm') }}
           </div>
 
         </div>
 
-        <lw-title-value-cell
-          v-if="unloadData.extNoInfo"
-          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.qkgdrpwf','外部单号')"
-          :value="unloadData.extNoInfo"
-        />
-
-        <lw-title-value-cell
-          v-if="unloadData.asnNoInfo"
-          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.mywmbswe','到货通知单')"
-          :value="unloadData.asnNoInfo"
-        />
-
-        <lw-title-value-cell
-          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.rphbeioq','车牌号')"
-          :value="$lwCheckVal(unloadData.carrierPlateNum)"
-        />
-
-        <lw-title-value-cell
-          v-if="unloadData.plannedQuantity"
-          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.fwcikzex','计划量')"
-          :value="unloadData.plannedQuantity"
-          val-bold
-          :is-row-end="unloadData.unloadQuantity"
+        <lw-label-value-group
+          :list="unloadData.contentList"
+          :show-start-row-style="false"
+          :show-end-row-style="false"
         />
 
-        <lw-title-value-cell
-          v-if="unloadData.unloadQuantity"
-          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.racihbbx','已卸货量')"
-          :value="unloadData.unloadQuantity"
-          val-bold
-          val-red
-          is-row-end
-        />
+        <div
+          style="text-align: right"
+          class="lw-global-row-end"
+        >
+          <lw-button
+            style="width: 25%"
+            small
+            :disabled="!unloadData.currentData"
+            @click="overUnload"
+          >
+            {{ $lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.gzsvuzgg', '完成卸货') }}
+          </lw-button>
+        </div>
 
       </div>
 
@@ -76,86 +64,135 @@
           @change="tabChange"
         >
 
-          <!-- 托 -->
-          <van-tab
-            name="lpn"
-            :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.rhshoegd','托')"
-          ></van-tab>
-
-          <!-- 箱 -->
-          <van-tab
-            name="case"
-            :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.gewkuvfg','箱')"
-          ></van-tab>
-
-          <!-- 商品 -->
           <van-tab
-            name="sku"
-            :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.gwidwenz','商品')"
-          ></van-tab>
-
+            v-for="i in tabItemList"
+            :key="i.name"
+            :name="i.name"
+            :title="i.title"
+          />
 
         </van-tabs>
       </lw-tab-box>
 
       <!-- 数据采集区域 -->
       <div
+        v-if="tabActive"
         style="padding: 5px 10px"
         class="lw-global-model-box"
       >
 
-        <lw-input
-          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.bapivknc','商品条码')"
-          v-model="dataInfo.skuCode.value"
-          :get-focus.sync="dataInfo.skuCode.focus"
-          rule-key="skuCode"
-          :create-rule="$lwScanRule.create('卸货-执行卸货-商品号','SKU')"
-          @confirm="skuCodeConfirm"
-        />
+        <!-- 按照数量卸货时有效 -->
+        <template v-if="tabActive==='qty'">
+
+          <!-- 箱数 -->
+          <lw-input
+            :title="$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.action.index.vfocgwzd', '箱数')"
+            v-model="dataInfo.caseQty.value"
+            :get-focus.sync="dataInfo.caseQty.focus"
+            type="digit"
+            @confirm="dataInfo.skuQty.focus=true"
+          />
+
+          <!-- 件数 -->
+          <lw-input
+            :title="$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.action.index.cskgimfs', '件数')"
+            v-model="dataInfo.skuQty.value"
+            :get-focus.sync="dataInfo.skuQty.focus"
+            type="number"
+            :show-bottom-border="false"
+          />
 
-        <lw-input
-          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.gwnsjkgh','商品名称')"
-          v-model="dataInfo.skuName.value"
-          :get-focus.sync="dataInfo.skuName.focus"
-          @confirm="skuNameConfirm"
-        />
-
-        <lw-input
-          v-if="tabActive==='lpn'"
-          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.eslfyvtd','托码')"
-          v-model="dataInfo.lpn.value"
-          :get-focus.sync="dataInfo.lpn.focus"
-          rule-key="lpn"
-          :create-rule="$lwScanRule.create('卸货-执行卸货-托码','LPN')"
-          auto-clear-val
-          @confirm="lpnAndCaseConfirm"
-        />
+        </template>
 
-        <lw-input
-          v-if="tabActive==='case'"
-          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.mwdlsreu','箱码')"
-          v-model="dataInfo.case.value"
-          :get-focus.sync="dataInfo.case.focus"
-          rule-key="case"
-          :create-rule="$lwScanRule.create('卸货-执行卸货-箱号','CASE')"
-          auto-clear-val
-          @confirm="lpnAndCaseConfirm"
-        />
+        <!-- 非按照数量卸货时有效 -->
+        <template v-else>
+
+          <!-- 商品条码 -->
+          <lw-input
+            :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.bapivknc','商品条码')"
+            v-model="dataInfo.skuCode.value"
+            :get-focus.sync="dataInfo.skuCode.focus"
+            rule-key="skuCode"
+            :create-rule="$lwScanRule.create('卸货-执行卸货-商品号','SKU')"
+            :rule-serve-query="unloadData"
+            :disabled="dataInfo.skuDisabled"
+            need-show-clear
+            @confirm="skuCodeConfirm"
+            @clear="skuCodeClear"
+          >
+
+            <template #button>
+              <van-icon
+                name="arrow"
+                color="#cdcdcd"
+                size="18px"
+                @click="selectSkuPopup.show = true"
+              />
+            </template>
+
+          </lw-input>
+
+          <!-- 商品名称 -->
+          <lw-input
+            :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.gwnsjkgh','商品名称')"
+            v-model="dataInfo.skuName.value"
+            :get-focus.sync="dataInfo.skuName.focus"
+            :disabled="dataInfo.skuDisabled"
+            @confirm="skuNameConfirm"
+          />
+
+          <!-- 托码 按托盘收货时有效 -->
+          <lw-input
+            v-if="tabActive==='lpn'"
+            :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.eslfyvtd','托码')"
+            v-model="dataInfo.lpn.value"
+            :get-focus.sync="dataInfo.lpn.focus"
+            rule-key="lpn"
+            :create-rule="$lwScanRule.create('卸货-执行卸货-托码','LPN')"
+            :rule-serve-query="unloadData"
+            auto-clear-val
+            @confirm="lpnAndCaseConfirm"
+          />
+
+          <!-- 箱号 按箱收货时有效 -->
+          <lw-input
+            v-if="tabActive==='case'"
+            :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.mwdlsreu','箱码')"
+            v-model="dataInfo.case.value"
+            :get-focus.sync="dataInfo.case.focus"
+            rule-key="case"
+            :create-rule="$lwScanRule.create('卸货-执行卸货-箱号','CASE')"
+            :rule-serve-query="unloadData"
+            auto-clear-val
+            @confirm="lpnAndCaseConfirm"
+          />
+
+          <!-- 数量 -->
+          <lw-get-qty-by-type
+            v-if="showUomQtyModel"
+            :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.fstvwxbc','数量')"
+            ref="qty"
+            :owner-id="selectSkuPopup.data.ownerId"
+            :sku-id="selectSkuPopup.data.id"
+            :show-bottom-border="false"
+          />
+          <lw-input
+            v-else
+            :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.fstvwxbc','数量')"
+            v-model="dataInfo.qty.value"
+            :get-focus.sync="dataInfo.qty.focus"
+            required
+            type="number"
+            :show-bottom-border="false"
+          />
 
-        <lw-input
-          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.fstvwxbc','数量')"
-          v-model="dataInfo.qty.value"
-          :get-focus.sync="dataInfo.qty.focus"
-          required
-          type="digit"
-          :show-bottom-border="false"
-        />
+        </template>
 
       </div>
 
-      <!-- 扫描数据统计 -->
+      <!-- 按箱、托卸货时扫描数据统计 -->
       <lw-scan-data-list-module
-        v-if="tabActive!=='sku'"
+        v-if="tabActive!=='qty' && tabActive!=='sku'"
         class="lw-global-model-box"
         :title="scanModel.title"
         :row-title="scanModel.rowTitle"
@@ -167,6 +204,7 @@
 
       <!-- 异常信息 -->
       <div
+        v-if="$lwWarehouseConfig.get('systemConfig.INBOUND_UNLOAD_ABN')==='true'"
         style="padding: 5px 10px"
         class="lw-global-model-box"
       >
@@ -200,10 +238,6 @@
         {{$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.ohhgsibt','重新扫描')}}
       </lw-button>
 
-      <lw-button @click="overUnload">
-        {{$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.gzsvuzgg','完成卸货')}}
-      </lw-button>
-
       <lw-button @click="confirmUnload">
         {{$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.vwrcncnq','确认卸货')}}
       </lw-button>
@@ -235,11 +269,29 @@
         :value="dataInfo.remark.value"
       />
 
+      <lw-get-qty-by-type
+        v-if="showUomQtyModel && confirmPopup.show"
+        :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.fstvwxbc','数量')"
+        ref="confirmQty"
+        :owner-id="selectSkuPopup.data.ownerId"
+        :sku-id="selectSkuPopup.data.id"
+        :init-qty="confirmPopup.qty.value"
+        :show-bottom-border="false"
+      >
+        <template #button>
+
+          <span class="lw-global-value-bold-red">
+            {{ confirmPopup.qtyLabel }}
+          </span>
+
+        </template>
+      </lw-get-qty-by-type>
       <lw-input
+        v-else
         :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.fstvwxbc','数量')"
         v-model="confirmPopup.qty.value"
         :get-focus.sync="confirmPopup.qty.focus"
-        type="digit"
+        type="number"
         @confirm="confirmPopupSubmit"
       >
         <template #button>
@@ -249,14 +301,13 @@
           </span>
 
         </template>
-
       </lw-input>
 
 
       <template #button>
 
         <lw-button @click="confirmPopupSubmit">
-          {{$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.tbhnhsyu','确认')}}
+          {{ $lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.tbhnhsyu', '确认') }}
         </lw-button>
 
       </template>
@@ -265,62 +316,17 @@
     </lw-popup>
 
     <!-- 选择商品弹框 -->
-    <lw-popup
+    <lw-much-data-select-popup-module
       :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.qpmmjdwd','选择商品')"
       v-model="selectSkuPopup.show"
-      background="#f0f0f0"
-    >
-
-      <div
-        class="lw-global-model-box lw-global-click-style"
-        v-for="(i,k) in selectSkuPopup.list"
-        :key="k"
-        @click="selectSkuPopupConfirm(i)"
-      >
-
-
-        <div class="lw-global-flex-between lw-global-row-start">
-
-          <div class="lw-global-value-bold">{{ i.ownerCode + '-' + i.ownerName }}</div>
-
-          <van-icon name="arrow" />
-
-        </div>
-
-        <lw-sku-info-module
-          :sku-code="i.code"
-          :sku-name="i.name"
-          :show-right="false"
-          is-row-last
-        />
-
-        <div class="lw-global-flex-between">
-
-          <div>
-            <span class="lw-global-title">
-              {{$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.hxrpfbnm','异常率')}}
-            </span>
-            <span class="lw-global-value-bold-red">{{ i.abnormalRate || 0 }}%</span>
-          </div>
-
-          <div>
-            <lw-tag
-              v-if="i.qualityTypeLabel"
-              round
-              plain
-            >{{ i.qualityTypeLabel }}</lw-tag>
-            <lw-tag
-              v-if="i.skuUrgencyLabel"
-              round
-              plain
-            >{{ i.skuUrgencyLabel }}</lw-tag>
-          </div>
-
-        </div>
-
-      </div>
-
-    </lw-popup>
+      :api="$lwApi.common.searchSku"
+      rule-key="skuCode"
+      :create-rule="$lwScanRule.create('卸货-执行卸货-商品号','SKU')"
+      :rule-serve-query="unloadData"
+      :keyword="selectSkuPopup.keyword"
+      type="sku"
+      @confirm="selectSkuPopupConfirm"
+    />
 
   </div>
 </template>
@@ -328,9 +334,10 @@
 <script>
 
 import {
+  wmsMobileAddEntryLinesUnloadOrder,
   wmsMobileCompleteUnloadOrder,
   wmsMobileScanEntryUnloadOrder,
-  wmsMobileUnloadQueryInfo, wmsMobileUnloadQuerySku
+  wmsMobileUnloadQueryInfo,
 } from "../../../../api/inbound/unload";
 import {uploadMixin} from "./../uploadMixin";
 
@@ -339,15 +346,39 @@ export default {
   mixins: [uploadMixin],
   data() {
     return {
+      // tab 项原始数据
+      tabBaseData: {
+        lpn: {
+          name: 'lpn',
+          title: this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.rhshoegd', '托')
+        },
+        case: {
+          name: 'case',
+          title: this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.gewkuvfg', '箱')
+        },
+        sku: {
+          name: 'sku',
+          title: this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.gwidwenz', '商品')
+        },
+        qty: {
+          name: 'qty',
+          title: this.$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.action.index.oplrsmjg', '数量')
+        },
+      },
+      // tab 项显示的数据
+      tabItemList: [],
 
 
       // 卸货单数据
       unloadData: {},
 
-      tabActive: 'lpn',
-      tabActiveOld: 'lpn',
+      tabActive: '',
+      tabActiveOld: '',
 
+      // 输入框数据
       dataInfo: {
+        // 商品号、名称禁用
+        skuDisabled: false,
         skuCode: {
           value: '',
           focus: false
@@ -368,33 +399,44 @@ export default {
           value: '',
           focus: false
         },
-        list:[],
-        abnormal:{
-          value:'',
-          label:'',
+        list: [],
+        abnormal: {
+          value: '',
+          label: '',
           focus: false,
         },
-        remark:{
-          value:'',
+        remark: {
+          value: '',
+          focus: false
+        },
+        caseQty: {
+          value: '',
+          focus: false
+        },
+        skuQty: {
+          value: '',
           focus: false
         },
       },
+      // 输入框数据key
+      inputKey: ['skuCode', 'skuName', 'lpn', 'case', 'qty', 'caseQty',
+        'skuQty'],
 
       // 确认卸货弹框
-      confirmPopup:{
+      confirmPopup: {
         show: false,
-        qty:{
+        qty: {
           value: '',
           focus: false
         },
-        qtyLabel:''
+        qtyLabel: ''
       },
 
       // 选择商品弹框
-      selectSkuPopup:{
+      selectSkuPopup: {
         show: false,
-        list:[],
-        data:{}
+        keyword: '',
+        data: {}
       }
     }
   },
@@ -404,66 +446,91 @@ export default {
 
       if (this.tabActive === 'lpn'){
         return {
-          title: this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.vnivpbuh','已扫托码'),
-          rowTitle: this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.eslfyvtd','托码')
+          title: this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.vnivpbuh', '已扫托码'),
+          rowTitle: this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.eslfyvtd', '托码')
         }
       }
 
       return {
-        title: this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.xuvcgqvv','已扫箱码'),
-        rowTitle: this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.mwdlsreu','箱码')
+        title: this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.xuvcgqvv', '已扫箱码'),
+        rowTitle: this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.mwdlsreu', '箱码')
       }
 
+    },
+
+    // 是否显示包装输入框模块组件
+    showUomQtyModel() {
+      return this.tabActive === 'sku' && this.dataInfo.skuDisabled
     }
   },
   mounted() {
-    this.init()
+    this.init(true)
+    this.clearInput()
   },
   methods: {
-    init(){
+    init(isFirst) {
       const {unloadOrderNo, lwTaskId} = this.$route.query
       wmsMobileUnloadQueryInfo({
-        queryInfo:unloadOrderNo,
+        queryInfo: unloadOrderNo,
         taskId: lwTaskId
-      }).then(res=>{
-        const list = res.unloadQueryOrderVoList || []
-        if(!list || !list.length){
+      }).then(res => {
+        const list = res.unloadOrderList || []
+        if (!list || !list.length) {
           this.$lwShowErrorMsg(
-            this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.pnfloaga','获取卸货单数据失败')
+            this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.pnfloaga', '获取卸货单数据失败')
           )
           history.go(-1)
           return
         }
 
         this.unloadData = list[0]
-      })
+
+        if (isFirst) {
+          const unloadMethodList = this.unloadData.handlerMethodList
+          unloadMethodList.forEach(item => {
+            this.tabItemList.push(this.tabBaseData[item])
+          })
+
+          this.$nextTick(() => {
+            this.tabActive = unloadMethodList[0]
+            this.tabActive = this.tabActiveOld
+          })
+        }
+      }).catch(() => history.go(-1))
     },
 
     // 清除输入框
-    clearInput(){
-      this.dataInfo.skuCode.value = ''
-      this.dataInfo.skuName.value = ''
-      this.dataInfo.lpn.value = ''
-      this.dataInfo.case.value = ''
-      this.dataInfo.qty.value = ''
+    clearInput() {
+      this.inputKey.forEach(item => {
+        this.dataInfo[item].value = ''
+      })
+      this.dataInfo.skuDisabled = false
+
       this.dataInfo.list = []
-      this.dataInfo.skuCode.focus = true
-      this.tabActiveOld = this.tabActive
       this.selectSkuPopup.data = {}
+
+      // 获取焦点
+      this.$nextTick(() => {
+        this.tabActive === 'qty' ?
+          this.dataInfo.caseQty.focus = true :
+          this.dataInfo.skuCode.focus = true
+      })
+
+      this.tabActiveOld = this.tabActive
     },
     // 清除数据的方法
-    clearDataFn(message){
-      const isNull = ['skuCode','skuName','lpn','case','qty'].some(item=>{
+    clearDataFn(message) {
+      const isNull = this.inputKey.some(item => {
         return !!this.dataInfo[item].value
       })
 
-      if (isNull || this.dataInfo.list.length){
+      if (isNull || this.dataInfo.list.length) {
         this.$lwDialog.confirm({
-          title:this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.uwaysliq','提示'),
+          title: this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.uwaysliq', '提示'),
           message
-        }).then(()=>{
+        }).then(() => {
           this.clearInput()
-        }).catch(()=>{
+        }).catch(() => {
           this.tabActive = this.tabActiveOld
         })
         return
@@ -481,35 +548,45 @@ export default {
     skuCodeConfirm(){
       const skuCode = this.dataInfo.skuCode.value
 
-      if (!skuCode){
+      if (!skuCode) {
         this.dataInfo.skuCode.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.shianfxw','商品号不能为空')
+          this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.shianfxw', '商品号不能为空')
         )
         return
       }
 
-      wmsMobileUnloadQuerySku({
-        skuCode
-      }).then(res=>{
-        if (!res || !res.length){
-          this.dataInfo.skuName.focus = true
+      this.$lwApi.common.searchSku({
+        keyword: skuCode,
+        pageNum: 1,
+        pageSize: 10
+      }).then(res => {
+        if (res.datas.length === 0) {
+          this.selectSkuPopupConfirm(res.datas[0])
           return
         }
 
-        if(res.length>1){
-          this.selectSkuPopup.list = res
+        this.dataInfo.skuDisabled = false
+
+        if (res.datas.length > 1) {
+          this.selectSkuPopup.keyword = skuCode
           this.selectSkuPopup.show = true
           return
         }
 
-        this.changeSkuName(res[0])
+        this.dataInfo.skuName.focus = true
 
       })
     },
+    // 商品号清空
+    skuCodeClear() {
+      this.dataInfo.skuName.value = ''
+      this.dataInfo.skuDisabled = false
+      this.dataInfo.skuCode.focus = true
+    },
     // 商品名称确认
-    skuNameConfirm(){
-      switch (this.tabActive){
+    skuNameConfirm() {
+      switch (this.tabActive) {
         case 'lpn':
           this.dataInfo.lpn.focus = true
           break;
@@ -539,51 +616,136 @@ export default {
     },
 
     // 选择商品回写商品名称并让商品名称后面的输入框获取焦点
-    changeSkuName(item){
+    changeSkuName(item) {
       this.selectSkuPopup.data = item
       this.dataInfo.skuName.value = item.name
+      this.dataInfo.skuDisabled = true
       this.skuNameConfirm()
     },
     // 确认商品信息
-    selectSkuPopupConfirm(item){
+    selectSkuPopupConfirm(item) {
+      this.dataInfo.skuCode.value = item.code
+      if (this.$refs.qty) {
+        this.$refs.qty.init(0, true)
+      }
+      this.dataInfo.qty.value = 0
       this.changeSkuName(item)
-      this.selectSkuPopup.show = false
     },
 
     // 确认异常类型
-    abnormalConfirm(item){
+    abnormalConfirm(item) {
       this.dataInfo.abnormal.label = item.label
     },
     // 清除异常类型
-    abnormalClear(){
+    abnormalClear() {
       this.dataInfo.abnormal.label = ''
     },
 
     // 重新扫描
-    repeatScan(){
-      this.clearDataFn(this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.xhxcijbo','当前存在录入数据，确认全部清除？'))
+    repeatScan() {
+      this.clearDataFn(this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.xhxcijbo', '当前存在录入数据，确认全部清除？'))
+    },
+
+    // 检查并获取卸货员工
+    checkGetStaff() {
+      const staffList = this.staff.list.map(item => item.code)
+      if (!staffList.length) {
+        this.staff.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.action.index.ihxngxxl', '卸货人不能为空')
+        )
+        return null
+      }
+
+      return staffList
     },
 
     // 确认卸货
-    confirmUnload(){
-      this.confirmPopup.qty.value = this.dataInfo.qty.value || 0
+    confirmUnload() {
 
-      switch (this.tabActive){
-        case 'lpn':
-          this.confirmPopup.qtyLabel = this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.rhshoegd','托')
-          break;
-        case 'case':
-          this.confirmPopup.qtyLabel = this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.gewkuvfg', '箱')
-          break;
-        default:
-          this.confirmPopup.qtyLabel = this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.gwidwenz', '商品')
+      const staffList = this.checkGetStaff()
+      if (!staffList) return
+
+      // 按托、箱、商品收货
+      if (this.tabActive !== 'qty') {
+
+
+        this.confirmPopup.qty.value = this.showUomQtyModel ?
+          this.$refs.qty.getQty() :
+          (this.dataInfo.qty.value || 0)
+
+
+        switch (this.tabActive) {
+          case 'lpn':
+            this.confirmPopup.qtyLabel = this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.rhshoegd', '托')
+            break;
+          case 'case':
+            this.confirmPopup.qtyLabel = this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.gewkuvfg', '箱')
+            break;
+          case 'sku':
+            this.confirmPopup.qtyLabel = this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.gwidwenz', '商品')
+        }
+
+        this.confirmPopup.show = true
+
+        return
+      }
+
+      // 按数量收货
+      const caseQty = Number(this.dataInfo.caseQty.value || 0)
+      const skuQty = Number(this.dataInfo.skuQty.value || 0)
+
+      if (!caseQty && !skuQty) {
+        this.dataInfo.caseQty.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.action.index.efbualty', '箱数和件数必须填写一个，且应当是大于0的正整数')
+        )
+        return;
       }
 
-      this.confirmPopup.show = true
+      let msg = ''
+      if (caseQty) msg += caseQty + this.$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.action.index.kylwjvjk', '箱')
+      if (skuQty) msg += skuQty + this.$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.action.index.qxqhjxpx', '件')
+
+      this.$lwDialog.confirm({
+        title: this.$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.action.index.oinpzoqc', '卸货确认'),
+        message: this.$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.action.index.kpdidpnf', '本次卸货总数为【{msg}】，请确认', {msg})
+      }).then(() => {
+        const lines = []
+        if (caseQty) {
+          lines.push({
+            unloadSpecification: 'CASE',
+            qty: caseQty
+          })
+        }
+        if (skuQty) {
+          lines.push({
+            unloadSpecification: 'QTY',
+            qty: skuQty
+          })
+        }
+
+        wmsMobileAddEntryLinesUnloadOrder({
+          unloadOrderId: this.unloadData.id,
+          unloadSpecification: 'SKU',
+          unloadException: this.dataInfo.abnormal.value,
+          remark: this.dataInfo.remark.value,
+          staffList,
+          lines,
+        }).then(this.unloadConfirm).catch(() => {
+        })
+      }).catch(() => {
+      })
     },
     // 确认卸货提交
     async confirmPopupSubmit() {
-      if (!Number(this.confirmPopup.qty.value || 0)) {
+
+      const staffList = this.checkGetStaff()
+      if (!staffList) return
+
+      const qty = this.showUomQtyModel ? this.$refs.confirmQty.getQty() : this.confirmPopup.qty.value
+
+      if (!qty) {
         this.confirmPopup.qty.focus = true
         this.$lwShowErrorMsg(
           this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.nrjnyceo', '数量不能为空，且应当是大于0的正整数')
@@ -591,19 +753,11 @@ export default {
         return
       }
 
-      const staffList = this.staff.list.map(item => item.code)
-      if (!staffList.length) {
-        this.staff.focus = true
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.action.index.ihxngxxl', '卸货人不能为空')
-        )
-        return
-      }
 
       await wmsMobileScanEntryUnloadOrder({
-        unloadOrderId: this.unloadData.unloadOrderId,
+        unloadOrderId: this.unloadData.id,
         unloadSpecification: this.tabActive.toUpperCase(),
-        qty: this.confirmPopup.qty.value,
+        qty,
         unloadException: this.dataInfo.abnormal.value,
         remark: this.dataInfo.remark.value,
         skuId: this.selectSkuPopup.data.id,
@@ -613,8 +767,14 @@ export default {
         staffList
       })
 
+      this.unloadConfirm()
+
+    },
+
+    // 卸货确认后
+    unloadConfirm() {
       this.$lwToast.success(
-        this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.akqsknmo','已确认')
+        this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.akqsknmo', '已确认')
       )
 
       this.confirmPopup.show = false
@@ -624,17 +784,22 @@ export default {
     },
 
     // 完成卸货
-    overUnload(){
+    overUnload() {
+
+      if (!this.unloadData.currentData) return
 
       this.$lwDialog.confirm({
-        title: this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.uwaysliq','提示'),
-        message: this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.prirhhrw','是否结束卸货单')
-      }).then(()=>{
+        title: this.$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.action.index.aheirgyt', '完成卸货'),
+        message: this.$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.action.index.aheirgytq', '计划卸货总数为【{total}】，本次卸货总数为【{qty}】，请确认', {
+          total: this.unloadData.planData,
+          qty: this.unloadData.currentData
+        })
+      }).then(() => {
         wmsMobileCompleteUnloadOrder({
-          completeUnloadIdList: [this.unloadData.unloadOrderId]
-        }).then(()=>{
+          completeUnloadIdList: [this.unloadData.id]
+        }).then(() => {
           this.$lwToast.success(
-            this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.fjjuktnk','已完成')
+            this.$lwLanguage.get('wms_project.pda.components.page.inbound.unload.action.index.fjjuktnk', '已完成')
           )
 
           history.go(-1)