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

package/src/views/wms/page/inner/borrow/action/index.vue

@@ -17,11 +17,11 @@
         <div class="lw-global-flex-between lw-global-row-start">
           <lw-title-value-cell
             :title="$lwLanguage.get('wms_project.pda.inner.borrow.borrowNo','借件单号') "
-            :value="this.borrowNo"
+            :value="pickData.borrowNo"
             val-bold
             :is-row="false"
           />
-          <div class="lw-global-value-bold-red">{{ typeLabel }}</div>
+          <div class="lw-global-value-bold-red">{{ pickData.typeLabel }}</div>
         </div>
 
         <!--   借件单其他信息-->
@@ -29,13 +29,13 @@
           <div class="lw-global-flex-between ">
             <lw-title-value-cell
               :title="$lwLanguage.get('wms_project.pda.inner.borrow.org','借件单位')  "
-              :value="this.borrowOrganization"
+              :value="pickData.borrowOrganization"
               val-bold
               :is-row="false"
             />
             <lw-title-value-cell
               :title="$lwLanguage.get('wms_project.pda.inner.borrow.unPickQty','待捡量')  "
-              :value="this.unPickQty"
+              :value="pickData.unPickQtyLabel"
               val-bold
               val-red
               :is-row="false"
@@ -45,13 +45,13 @@
           <div class="lw-global-flex-between ">
             <lw-title-value-cell
               :title="$lwLanguage.get('wms_project.pda.inner.borrow.user','借件人')  "
-              :value="this.borrowerName"
+              :value="pickData.borrowerName"
               val-bold
               :is-row="false"
             />
             <lw-title-value-cell
               :title="$lwLanguage.get('wms_project.pda.inner.borrow.pickedQty','已拣量')  "
-              :value="this.pickedQty"
+              :value="pickData.pickedQtyLabel"
               val-bold
               :is-row="false"
             />
@@ -74,92 +74,86 @@
             name="ing"
           >
             <!--   任务明细-->
-            <div  class="lw-global-model-box">
-                <!-- 商品编码、状态 -->
-                <div class="lw-global-flex-between lw-global-row-start">
-                  <div class="lw-global-value-bold">{{ taskLine[task.index].skuCode }}</div>
-                  <div class="lw-global-value-bold-red">{{ taskLine[task.index].statusLabel }}</div>
-                </div>
+            <div class="lw-global-model-box">
+              <!-- 商品编码、状态 -->
+              <div class="lw-global-flex-between lw-global-row-start">
+                <div class="lw-global-value-bold">{{ nowTaskLine.skuCode }}</div>
+                <div class="lw-global-value-bold-red">{{ nowTaskLine.statusLabel }}</div>
+              </div>
 
-                <!-- 商品名称、大小 -->
-                <div class="lw-global-flex-between lw-global-row" >
-                  <div class="lw-global-value-bold">{{ taskLine[task.index].skuName }}</div>
-                  <lw-tag v-if="taskLine[task.index].sizeTypeLabel" round plain style="flex-shrink: 0">{{ taskLine[task.index].sizeTypeLabel }}</lw-tag>
-                </div>
+              <!-- 商品名称、大小 -->
+              <div class="lw-global-flex-between lw-global-row">
+                <div class="lw-global-value-bold">{{ nowTaskLine.skuName }}</div>
+                <lw-tag v-if="nowTaskLine.sizeTypeLabel" round plain style="flex-shrink: 0">{{
+                    nowTaskLine.sizeTypeLabel
+                  }}
+                </lw-tag>
+              </div>
 
-                <!-- 库位 -->
-                <div class="lw-global-row">
+              <!-- 库位 -->
+              <div class="lw-global-row">
                   <span class="lw-global-title">
                     {{ $lwLanguage.get('wms_project.pda.inner.borrow.location', '库位') }}
                   </span>
-                  <span class="lw-global-value-bold">
-                    {{ taskLine[task.index].locationCode }}
+                <span class="lw-global-value-bold">
+                    {{ nowTaskLine.locationCode }}
                   </span>
-                </div>
+              </div>
 
-                <!-- 托盘号 -->
-                <div class="lw-global-row" v-if="hasLpn()">
+              <!-- 托盘号 -->
+              <div class="lw-global-row" v-if="hasLpn()">
                   <span class="lw-global-title">
                     {{ $lwLanguage.get('wms_project.pda.inner.borrow.lpn', '托盘号') }}
                   </span>
-                  <span class="lw-global-value-bold">
-                    {{ taskLine[task.index].lpn }}
+                <span class="lw-global-value-bold">
+                    {{ nowTaskLine.lpn }}
                   </span>
-                </div>
-
-                <!-- 数据看板 -->
-                <div class="lw-global-row lw-global-flex-around">
-                  <!-- 计划量 -->
-                  <div class="lw-global-data-look-item">
-                    <div class="lw-global-value-bold">{{ taskLine[task.index].planQty || 0 }}</div>
-                    <div class="lw-global-title">
-                      {{ $lwLanguage.get('wms_project.pda.inner.borrow.planQty', '计划量') }}
-                    </div>
-                  </div>
-
-                  <!-- 已拣选 -->
-                  <div class="lw-global-data-look-item">
-                    <div class="lw-global-value-bold">{{ taskLine[task.index].pickQty || 0 }}</div>
-                    <div class="lw-global-title">
-                      {{ $lwLanguage.get('wms_project.pda.inner.borrow.picked', '已拣选') }}
-                    </div>
-                  </div>
-
-                  <!-- 待拣选 -->
-                  <div class="lw-global-data-look-item">
-                    <div class="lw-global-value-bold" style="color: #D50000" >{{ taskLine[task.index].unPickQty || 0 }}</div>
-                    <div class="lw-global-title">
-                      {{ $lwLanguage.get('wms_project.pda.inner.borrow.unPick', '待拣选') }}
-                    </div>
-                  </div>
-                </div>
-
-                <!-- 库位 -->
-                <lw-input
-                  :title="$lwLanguage.get('wms_project.pda.inner.borrow.pickLocation.confirm','确认拣选库位')"
-                  v-model="task.input.location.value"
-                  :get-focus.sync="task.input.location.focus"
-                  required
-                  @confirm="taskLocationConfirm"
-                />
+              </div>
 
-                <!-- LPN -->
-                <lw-input
-                  v-if="hasLpn()"
-                  :title="$lwLanguage.get('wms_project.pda.inner.borrow.lpn.confirm','确认托盘号')"
-                  v-model="task.input.lpn.value"
-                  :get-focus.sync="task.input.lpn.focus"
-                  required
-                  @confirm="taskLpnConfirm"
-                />
+              <!-- 数据看板 -->
+              <lw-data-look-bg
+                style="padding: 0"
+                class="lw-global-row"
+                type="null"
+                :data="nowTaskLine.labeledQtyList"
+                value-key="qtyLabel"
+                title-key="fieldCode"
+                :show-end-line="false"
+                need-show
+              />
+
+              <!-- 库位 -->
+              <lw-input
+                :title="$lwLanguage.get('wms_project.pda.inner.borrow.pickLocation.confirm','确认拣选库位')"
+                v-model="task.input.location.value"
+                :get-focus.sync="task.input.location.focus"
+                required
+                rule-key="pickLoc"
+                :create-rule="$lwScanRule.create('借件拣选-执行页-拣选库位','LOCATION')"
+                @confirm="taskLocationConfirm"
+              />
+
+              <!-- LPN -->
+              <lw-input
+                v-if="hasLpn()"
+                :title="$lwLanguage.get('wms_project.pda.inner.borrow.lpn.confirm','确认托盘号')"
+                v-model="task.input.lpn.value"
+                :get-focus.sync="task.input.lpn.focus"
+                required
+                rule-key="lpn"
+                :create-rule="$lwScanRule.create('借件拣选-执行页-托盘号','LPN')"
+                @confirm="taskLpnConfirm"
+              />
 
               <div>
-                <div v-if="taskLine[task.index].needHandleSn">
+                <div v-if="nowTaskLine.needHandleSn">
 
                   <lw-input
                     :title="$lwLanguage.get('wms_project.pda.components.page.inner.borrow.action.index.jqpedjtc','扫描序列号')"
                     v-model="task.input.sn.value"
                     :get-focus.sync="task.input.sn.focus"
+                    :owner-id="nowTaskLine.ownerId"
+                    :rule-serve-query="nowTaskLine"
                     :create-rule="$lwScanRule.create('借件拣选-SN','SN')"
                     rule-key="sn"
                     required
@@ -179,16 +173,19 @@
                     v-model="task.input.sku.value"
                     :get-focus.sync="task.input.sku.focus"
                     required
+                    :owner-id="nowTaskLine.ownerId"
+                    :rule-serve-query="nowTaskLine"
+                    rule-key="sku"
+                    :create-rule="$lwScanRule.create('借件拣选-执行页-商品编码','SKU')"
                     @confirm="taskSkuCodeConfirm"
                   />
 
                   <!-- 数量 -->
-                  <lw-input
+                  <lw-get-qty-by-type
+                    ref="pickQty"
                     :title="$lwLanguage.get('wms_project.pda.inner.borrow.qty','拣选数量')"
-                    v-model="task.input.qty.value"
-                    :get-focus.sync="task.input.qty.focus"
-                    type="digit"
-                    required
+                    :owner-id="nowTaskLine.ownerId"
+                    :sku-id="nowTaskLine.skuId"
                     @confirm="taskQtyCheck"
                   />
                 </div>
@@ -203,7 +200,7 @@
             </div>
             <!-- 批次属性 -->
             <div class="lw-global-model-box" v-if="this.taskLine.length">
-              <lw-lot-look-module :columns="taskLine[task.index].lotAttributeData.items"/>
+              <lw-lot-look-module :columns="nowTaskLine.lotAttributeData.items"/>
             </div>
 
           </van-tab>
@@ -248,10 +245,10 @@
                     </span>
                     <span class="lw-global-value-bold">
                       <span class="lw-global-value-bold-red">
-                        {{i.pickQty || 0}}
+                        {{ i.pickQtyLabel || 0 }}
                       </span>
                       <span >
-                        / {{i.planQty}}
+                        / {{ i.planQtyLabel }}
                       </span>
                     </span>
 
@@ -262,7 +259,7 @@
                 <!-- 托盘号-->
                 <lw-title-value-cell
                   :title="$lwLanguage.get('wms_project.pda.inner.borrow.lpn','托盘号')"
-                  :value="i.lpn"
+                  :value="$lwCheckVal(i.lpn)"
                   val-bold
                   :is-row="false"
                 />
@@ -277,7 +274,7 @@
 
 
     <!--    底部按钮-->
-    <lw-bottom-bar >
+    <lw-bottom-bar>
 
       <!--      拣选缺货-->
       <lw-button
@@ -285,21 +282,22 @@
         plain
         @click="lackPopupShow"
       >
-        {{ $lwLanguage.get('wms_project.pda.inner.borrow.pickLack','拣选缺货') }}
+        {{ $lwLanguage.get('wms_project.pda.inner.borrow.pickLack', '拣选缺货') }}
       </lw-button>
 
-      <!--      确认拣选-->
+      <!--      拣选异常-->
       <lw-button
-        @click="execPick"
+        type="last"
+        @click="abnPopShow"
       >
-        {{ $lwLanguage.get('wms_project.pda.inner.borrow.confirmPick','确认拣选') }}
+        {{ $lwLanguage.get('wms_project.pda.inner.borrow.abnormal', '异常') }}
       </lw-button>
 
-      <!--      拣选异常-->
+      <!--      确认拣选-->
       <lw-button
-        @click="abnPopShow"
+        @click="execPick"
       >
-        {{ $lwLanguage.get('wms_project.pda.inner.borrow.abnormal','异常') }}
+        {{ $lwLanguage.get('wms_project.pda.inner.borrow.confirmPick', '确认拣选') }}
       </lw-button>
     </lw-bottom-bar>
 
@@ -308,42 +306,45 @@
       v-if="taskLine.length"
       v-model="lackPopup.show"
       :title="$lwLanguage.get('wms_project.pda.inner.borrow.pickLack','拣选缺货')"
+      @opened="$refs.lackQty.init(0,true)"
     >
       <!-- 拣选缺货商品信息 -->
-      <div >
+      <div class="lw-global-row-start">
 
         <!-- 商品编码、状态 -->
         <div class="lw-global-flex-between">
-          <div class="lw-global-value-bold">{{ taskLine[task.index].skuCode }}</div>
+          <div class="lw-global-value-bold">{{ nowTaskLine.skuCode }}</div>
         </div>
 
         <!-- 商品名称 大小-->
         <div class="lw-global-flex-between ">
-          <div class="lw-global-value-bold">{{ taskLine[task.index].skuName }}</div>
-          <lw-tag v-if="taskLine[task.index].sizeTypeLabel" round plain style="flex-shrink: 0">{{ taskLine[task.index].sizeTypeLabel }}</lw-tag>
-        </div>
-
-        <!-- 库位、内装数-->
-        <div class="lw-global-flex-between ">
-          <div class="lw-global-value-bold">{{ taskLine[task.index].locationCode }}</div>
-          <lw-title-value-cell
-            :title="$lwLanguage.get('wms_project.pda.inner.borrow.innerQty','内装数')"
-            :value="taskLine[task.index].innerQty"
-            val-bold
-            :is-row="false"
-          />
+          <div class="lw-global-title">{{ nowTaskLine.skuName }}</div>
+          <lw-tag v-if="nowTaskLine.sizeTypeLabel" round plain style="flex-shrink: 0">{{
+              nowTaskLine.sizeTypeLabel
+            }}
+          </lw-tag>
         </div>
+      </div>
 
-        <lw-input
-          :title="$lwLanguage.get('wms_project.pda.inner.borrow.lackQty','缺货量')"
-          v-model="task.input.lackQty.value"
-          :get-focus.sync="task.input.lackQty.focus"
-          type="digit"
-          required
-          @confirm="lackQtyCheck"
+      <!-- 库位、内装数-->
+      <div class="lw-global-flex-between lw-global-row">
+        <div class="lw-global-value-bold">{{ nowTaskLine.locationCode }}</div>
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.inner.borrow.innerQty','内装数')"
+          :value="nowTaskLine.innerQty"
+          val-bold
+          :is-row="false"
         />
       </div>
 
+      <lw-get-qty-by-type
+        ref="lackQty"
+        :title="$lwLanguage.get('wms_project.pda.inner.borrow.lackQty','缺货量')"
+        :owner-id="nowTaskLine.ownerId"
+        :sku-id="nowTaskLine.skuId"
+        @confirm="lackQtyCheck"
+      />
+
       <template #button>
         <lw-button @click="pickLack">
           {{ $lwLanguage.get('wms_project.pda.inner.borrow.confirmLack', '确认拣选缺货') }}
@@ -364,10 +365,12 @@
         ref="abnormal"
         :type="$lwLanguage.get('wms_project.pda.inner.borrow.inner','在库')"
         :ab-type="$lwLanguage.get('wms_project.pda.inner.borrow.borrowPick','借件拣选')"
-        :sku-code="this.taskLine[task.index].skuCode"
-        :sku-name="this.taskLine[task.index].skuName"
-        :qty="this.taskLine[task.index].unPickQty"
-        :location="this.taskLine[task.index].locationCode"
+        :sku-code="nowTaskLine.skuCode"
+        :sku-name="nowTaskLine.skuName"
+        :sku-id="nowTaskLine.skuId"
+        :owner-id="nowTaskLine.ownerId"
+        :qty="this.nowTaskLine.unPickQty"
+        :location="nowTaskLine.locationCode"
       />
 
       <template #button>
@@ -390,7 +393,6 @@ import {
 } from "../../../../api/inner/borrow";
 
 import {
-  innerTaskSnCheck,
   borrowSnCheck
 } from "../../../../api/inner/snCheck/snCheck";
 
@@ -399,22 +401,10 @@ export default {
   data() {
     return {
 
-      // 借件单Id
-      borrowId: '',
-      // 借件单号
-      borrowNo: '',
+      // 拣选数据
+      pickData: {},
       //  任务Id
       taskId: '',
-      //  借件类型
-      typeLabel:'',
-      //  借件单位
-      borrowOrganization:'',
-      //  借件人
-      borrowerName:'',
-      //  待捡量
-      unPickQty:'',
-      //  已捡量
-      pickedQty:'',
 
       //  任务明细
       taskLine: [],
@@ -441,48 +431,48 @@ export default {
         // 任务行索引
         index:0,
         // 输入框
-        input:{
+        input: {
           // 库位
-          location:{
-            value:'',
+          location: {
+            value: '',
             focus: false
           },
           // LPN
-          lpn:{
-            value:'',
+          lpn: {
+            value: '',
             focus: false
           },
           // 商品
           sku: {
-            value:'',
-            focus: false
-          },
-          // 数量
-          qty:{
-            value:'',
+            value: '',
             focus: false
           },
           // 缺货数量
-          lackQty:{
-            value:'',
+          lackQty: {
+            value: '',
             focus: false
           },
           // sn
           sn: {
-            value:'',
+            value: '',
             focus: false
           },
           // sn扫描列表
-          snList:[],
+          snList: [],
 
         }
       }
     }
   },
+  computed: {
+    //  当前任务行
+    nowTaskLine() {
+      return this.taskLine[this.task.index]
+    },
+  },
   mounted() {
     this.init()
   },
-
   methods: {
 
     init() {
@@ -493,30 +483,23 @@ export default {
     getPickTaskData() {
 
       wmsGetBorrowPickTask({
-        borrowId: this.borrowId,
+        borrowId: this.pickData.borrowId,
         borrowNo: this.$route.query.borrowNo,
         taskId: this.$route.query.lwTaskId
       }).then(res => {
-        console.log(res)
 
-        this.borrowId = res.borrowId
-        this.borrowNo = res.borrowNo
         this.taskId = res.taskId
-        this.typeLabel = res.typeLabel
-        this.borrowOrganization = res.borrowOrganization
-        this.borrowerName = res.borrowerName
-        this.unPickQty = res.unPickQty
-        this.pickedQty = res.pickedQty
 
-        this.task.index = this.$lwUtils.cutCardIndexCount(this.task.index,res.taskLine.length )
+        this.pickData = res
+
+        this.task.index = this.$lwUtils.cutCardIndexCount(this.task.index, res.taskLine.length)
         this.taskLine = res.taskLine
 
         this.pickLine = res.pickLine
-      }).catch((e) => {
-        console.log(e)
-        setTimeout(()=>{
+      }).catch(() => {
+        setTimeout(() => {
           history.go(-1)
-        },2000)
+        }, 2000)
       })
     },
 
@@ -530,18 +513,17 @@ export default {
           this.taskQtyCheck())
       ) return
 
-      const pickingLine = this.taskLine[this.task.index]
+      const pickingLine = this.nowTaskLine
       wmsExecBorrowPick({
-        borrowId: this.borrowId,
+        borrowId: this.pickData.borrowId,
         taskId: this.taskId,
         skuId: pickingLine.skuId,
         ownerId: pickingLine.ownerId,
         locationId: pickingLine.locationId,
         lpn: this.task.input.lpn.value,
-        qty: this.task.input.qty.value,
-        snParamList:this.task.input.snList
+        qty: this.$refs.pickQty?.getQty(),
+        snParamList: this.task.input.snList
       }).then(res => {
-        console.log(res)
         this.clearInput()
         if (res.taskFinished) {
           this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.inner.borrow.taskFinish','借用拣选任务已完成'))
@@ -549,13 +531,10 @@ export default {
             history.go(-1)
           },2000)
         } else {
-          this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.inner.borrow.pickSuccess','拣选成功'))
-          setTimeout(()=>{
-            this.getPickTaskData()
-          },2000)
+          this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.inner.borrow.pickSuccess', '拣选成功'))
+          this.getPickTaskData()
+
         }
-      }).catch((e) => {
-        console.log(e)
       })
     },
 
@@ -565,18 +544,16 @@ export default {
       if (!this.lackQtyCheck()) {
         return
       }
-      const pickingLine = this.taskLine[this.task.index]
+      const pickingLine = this.nowTaskLine
       wmsBorrowPickLack({
-        borrowId: this.borrowId,
+        borrowId: this.pickData.borrowId,
         taskId: this.taskId,
         skuId: pickingLine.skuId,
         ownerId: pickingLine.ownerId,
         locationId: pickingLine.locationId,
         lpn: this.task.input.lpn.value,
-        qty: this.task.input.lackQty.value
+        qty: this.$refs.lackQty?.getQty()
       }).then(res => {
-        console.log(res)
-
         this.clearInput()
         if (res.taskFinished) {
           this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.inner.borrow.taskFinish','借用拣选任务已完成'))
@@ -590,8 +567,6 @@ export default {
             this.lackPopup.show = false
           },2000)
         }
-      }).catch((e) => {
-        console.log(e)
       })
     },
 
@@ -599,11 +574,11 @@ export default {
     submitAbnormal() {
       const {success, data} = this.$refs.abnormal.getAbnormalData()
       if (!success) return
-      const pickingLine = this.taskLine[this.task.index]
+      const pickingLine = this.nowTaskLine
       wmsBorrowSubmitAbnormal({
         ...data,
         taskId: this.taskId,
-        borrowId: this.borrowId,
+        borrowId: this.pickData.borrowId,
         skuId: pickingLine.skuId,
         ownerId: pickingLine.ownerId,
         fromLpn: pickingLine.lpn,
@@ -623,27 +598,28 @@ export default {
             this.getPickTaskData()
           },2000)
         }
-      }).catch((e) => {
-        console.log(e)
       })
     },
 
     // 清空输入框
-    clearInput(){
+    clearInput() {
       const input = this.task.input
       input.location.value = ''
       input.location.focus = true
       input.sku.value = ''
-      input.qty.value = ''
       input.lpn.value = ''
       input.lackQty.value = ''
-      input.snList=[]
+      input.snList = []
+
+      this.$nextTick(() => {
+        this.$refs.pickQty?.clearInput()
+        this.$refs.pickQty?.init()
+      })
     },
 
     // 是否有托盘
     hasLpn(){
-      let item = this.taskLine[this.task.index]
-      console.log(item.lpn && item.lpn !== '')
+      let item = this.nowTaskLine
       return item.lpn && item.lpn !== ''
     },
 
@@ -663,14 +639,15 @@ export default {
       let snkey = data.key;
       let snQty = data.qty;
 
-      const pickingLine = this.taskLine[this.task.index]
+      const pickingLine = this.nowTaskLine
       this.task.input.sn.value=''
       let snCheckData = {
-        borrowId: this.borrowId,
+        borrowId: this.pickData.borrowId,
         skuId: pickingLine.skuId,
         ownerId: pickingLine.ownerId,
-        sn:snkey,
-        qty:snQty};
+        sn: snkey,
+        qty: snQty
+      };
       borrowSnCheck(snCheckData).then(res=>{
 
         if(!this.snScanCheck(snkey,res.snInvQty)){
@@ -697,9 +674,7 @@ export default {
         }
         snCount+=snObj.qty
       }
-      let availInvQty=(this.taskLine[this.task.index].unPickQty || 0)
-      console.log(this.$lwLanguage.get('wms_project.pda.inner.borrow.action.javsynxf', '总扫描数量:'),(snCount+qty))
-      console.log(this.$lwLanguage.get('wms_project.pda.inner.borrow.action.jvvqfbgz', '当前行可用数量:'),availInvQty)
+      let availInvQty = (this.nowTaskLine.unPickQty || 0)
       if((snCount+qty) > availInvQty){
         this.$lwShowErrorMsg(
           this.$lwLanguage.get('wms_project.pda.components.page.inner.borrow.action.index.fplmaurv','扫描数量大于待拣选数量')
@@ -720,10 +695,10 @@ export default {
         return false
       }
 
-      if (location.value !== this.taskLine[this.task.index].locationCode){
+      if (location.value !== this.nowTaskLine.locationCode) {
         location.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.inner.borrow.locationNotMatch','库位与任务库位不一致')
+          this.$lwLanguage.get('wms_project.pda.inner.borrow.locationNotMatch', '库位与任务库位不一致')
         )
         location.value = ''
         return false
@@ -751,10 +726,10 @@ export default {
         return false
       }
 
-      if (lpn.value !== this.taskLine[this.task.index].lpn){
+      if (lpn.value !== this.nowTaskLine.lpn) {
         lpn.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.inner.borrow.lpnNotMatch','托盘号与任务托盘号不一致')
+          this.$lwLanguage.get('wms_project.pda.inner.borrow.lpnNotMatch', '托盘号与任务托盘号不一致')
         )
         lpn.value = ''
         return false
@@ -765,32 +740,32 @@ export default {
     // 商品号确认
     taskSkuCodeConfirm(){
       if (this.taskSkuCodeCheck()){
-        this.task.input.qty.focus = true
+        this.$refs.pickQty?.getFocus()
       }
     },
     // 商品号输入校验
-    taskSkuCodeCheck(){
+    taskSkuCodeCheck() {
 
       // 需要处理sn，不用扫描商品条码
-      if(this.taskLine[this.task.index].needHandleSn){
-       return true
+      if (this.nowTaskLine.needHandleSn) {
+        return true
       }
 
       const sku = this.task.input.sku
       // 非空校验
-      if (!sku.value){
+      if (!sku.value) {
         sku.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.inner.borrow.skuCodeNull','商品编码不能为空')
+          this.$lwLanguage.get('wms_project.pda.inner.borrow.skuCodeNull', '商品编码不能为空')
         )
         return false
       }
 
       // 是否输入正确
-      if (sku.value !== this.taskLine[this.task.index].skuCode){
+      if (sku.value !== this.nowTaskLine.skuCode) {
         sku.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.inner.borrow.skuCodeNotMatch','当前商品编码与任务商品编码不一致')
+          this.$lwLanguage.get('wms_project.pda.inner.borrow.skuCodeNotMatch', '当前商品编码与任务商品编码不一致')
         )
         sku.value = ''
         return false
@@ -799,27 +774,26 @@ export default {
     },
 
     // 数量确认
-    taskQtyCheck(){
+    taskQtyCheck() {
 
-      if(this.taskLine[this.task.index].needHandleSn){
+      if (this.nowTaskLine.needHandleSn) {
         return true
       }
 
-      const qty = Number(this.task.input.qty.value || 0)
-      if (!qty){
-        this.task.input.qty.focus = true
-        this.task.input.qty.value = ''
+      const qty = this.$refs.pickQty?.getQty()
+      if (!qty) {
+        this.$refs.pickQty?.getFocus()
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.inner.borrow.qtyLessZero','数量不能为空，且应当是大于0的整数')
+          this.$lwLanguage.get('wms_project.pda.inner.borrow.qtyLessZero', '数量不能为空，且应当是大于0的整数')
         )
         return false
       }
 
-      if (qty > this.taskLine[this.task.index].unPickQty){
-        this.task.input.qty.focus = true
-        this.task.input.qty.value = ''
+      if (qty > this.nowTaskLine.unPickQty) {
+        this.$refs.pickQty?.getFocus()
+        this.$refs.pickQty?.clearInput()
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.inner.borrow.qtyMore','数量不能大于待拣选量')
+          this.$lwLanguage.get('wms_project.pda.inner.borrow.qtyMore', '数量不能大于待拣选量')
         )
         return false
       }
@@ -827,22 +801,21 @@ export default {
     },
 
     //缺货数量确认
-    lackQtyCheck(){
-      const qty = Number(this.task.input.lackQty.value || 0)
-      if (!qty){
-        this.task.input.lackQty.focus = true
-        this.task.input.lackQty.value = ''
+    lackQtyCheck() {
+      const qty = this.$refs.lackQty?.getQty()
+      if (!qty) {
+        this.$refs.lackQty?.getFocus()
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.inner.borrow.qtyLessZero','数量不能为空，且应当是大于0的整数')
+          this.$lwLanguage.get('wms_project.pda.inner.borrow.qtyLessZero', '数量不能为空，且应当是大于0的整数')
         )
         return false
       }
 
-      if (qty > this.taskLine[this.task.index].unPickQty){
-        this.task.input.lackQty.focus = true
-        this.task.input.lackQty.value = ''
+      if (qty > this.nowTaskLine.unPickQty) {
+        this.$refs.lackQty?.getFocus()
+        this.$refs.lackQty?.clearInput()
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.inner.borrow.qtyMore','数量不能大于待领取量')
+          this.$lwLanguage.get('wms_project.pda.inner.borrow.qtyMore', '数量不能大于待领取量')
         )
         return false
       }
@@ -861,7 +834,6 @@ export default {
 
     lackPopupShow() {
       this.lackPopup.show = true
-      this.task.input.lackQty.focus = true
     }