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

package/src/views/wms/page/inbound/receive/quality/LwInboundQualityTaskListPage.vue

@@ -3,19 +3,35 @@
     <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.wqvrovzh', '收货品检')"/>
     <div class="lw-global-page-box">
       <div v-if="mode === 0" class="lw-global-model-box">
-        <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.fgmsahuy', '托盘号')" required v-model="lpn" :get-focus="true" @confirm="lpnScan"/>
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.fgmsahuy', '托盘号')"
+          required
+          v-model="lpn"
+          :get-focus="true"
+          rule-key="lpn"
+          :create-rule="$lwScanRule.create('收货品检-起始页-托盘号','LPN')"
+          @confirm="lpnScan"
+        />
       </div>
       <template v-else>
         <!-- LPN信息 -->
-        <div class="lw-global-model-box quality-lpn">
-          <div>
-            <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.zxlnkwfy', '托盘号 ')}}<span>{{ lpn }}</span></div>
-          </div>
-          <div class="lw-global-sh"></div>
-          <div>
-            <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.lqheenfn', '品种数 ')}}<span>{{bannerData.skus}}</span></div>
-            <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.tenxsrba', '行数 ')}}<span>{{ tasks.length }}</span></div>
-            <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.yoihyypx', '待检量 ')}}<span>{{bannerData.pendingQty}}</span></div>
+        <div class="lw-global-model-box">
+          <lw-title-value-cell
+            :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.zxlnkwfy', '托盘号 ')"
+            :value="lpn"
+            val-bold
+            is-row-start
+          />
+
+          <div class="lw-global-flex-between lw-global-row-end">
+            <lw-title-value-cell
+              v-for="(i,k) in bannerData"
+              :key="k"
+              :title="i.label"
+              :value="i.qtyLabel"
+              val-bold
+              :is-row="false"
+            />
           </div>
         </div>
         <!-- 任务 -->
@@ -25,28 +41,38 @@
       </template>
     </div>
     <lw-bottom-bar v-if="mode === 1">
-      <lw-button plain @click="showSku">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.cscjlkcz', '扫描商品')}}</lw-button>
-      <lw-button v-if="!taskId" @click="reset">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.iwcpsfvh', '切换托盘')}}</lw-button>
+      <lw-button plain @click="showSku">
+        {{ $lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.cscjlkcz', '扫描商品') }}
+      </lw-button>
+      <lw-button v-if="!taskId" @click="reset">
+        {{ $lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.iwcpsfvh', '切换托盘') }}
+      </lw-button>
     </lw-bottom-bar>
 
-    <van-dialog v-model="showSkuScan" :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.dbctqapp', '扫描定位商品')" :show-confirm-button="false">
-      <div class="lw-global-page-box">
-        <div class="lw-global-model-box">
-          <div>
-            <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.dszzokfg', '商品条码')" required v-model="skuBarCode.value" :get-focus.sync="skuBarCode.focus"
-                      rule-key="sku" :rule-serve-query="barcodeQuery" @confirm="resolveSkuBarcode"/>
-          </div>
-        </div>
-      </div>
-      <lw-bottom-bar>
-        <lw-button plain @click="showSkuScan = false">{{$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.kzykgqbt', '关闭')}}</lw-button>
-      </lw-bottom-bar>
-    </van-dialog>
+    <lw-popup
+      v-model="showSkuScan"
+      :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.dbctqapp', '扫描定位商品')"
+    >
+      <lw-input
+        :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.dszzokfg', '商品条码')"
+        required
+        v-model="skuBarCode.value"
+        :get-focus.sync="skuBarCode.focus"
+        :rule-serve-query="barcodeQuery"
+        :owner-id="barcodeQuery.ownerId"
+        rule-key="sku"
+        :create-rule="$lwScanRule.create('收货品检-起始页-商品条码','SKU')"
+        @confirm="resolveSkuBarcode"
+      />
+    </lw-popup>
   </div>
 </template>
 
 <script>
-import { getInboundGetQualityDetail, getInboundQueryQualityByLpn } from '../../../../api/inbound/quality'
+import {
+  getInboundGetQualityDetail,
+  wmsMobileInQualityQueryByLpnV2
+} from '../../../../api/inbound/quality'
 import QualityTaskInfo from '../../components/QualityTaskInfo.vue'
 
 export default {
@@ -63,16 +89,10 @@ export default {
         value: '',
         focus: false,
       },
+      bannerData: []
     }
   },
   computed: {
-    bannerData () {
-      return {
-        skus: new Set(this.tasks.map(i => i.sku.code)).size,
-        count: this.tasks.length,
-        pendingQty: this.tasks.map(i => parseInt(i.canQualityQty)).reduce((a, b) => a + b, 0)
-      }
-    },
     barcodeQuery () {
       const ownerIds = this.tasks.map(i => i.asn.ownerId)
       const warehouseIds = this.tasks.map(i => i.asn.warehouseId)
@@ -95,9 +115,11 @@ export default {
   },
   methods: {
     lpnScan () {
-      getInboundQueryQualityByLpn(this.lpn).then(res => {
+      wmsMobileInQualityQueryByLpnV2({
+        lpn: this.lpn
+      }).then(res => {
 
-        switch (res.status){
+        switch (res.status) {
           case 'NONE':
             this.$lwShowErrorMsg(
               this.$lwLanguage.get(
@@ -115,6 +137,7 @@ export default {
             }
             this.tasks = res.dataList
             this.mode = 1
+            this.bannerData = res.qtyList
             break
           case 'DONE':
             this.$lwToast.success(
@@ -123,17 +146,6 @@ export default {
             this.lpn = ''
             this.mode = 0
         }
-
-        /*if (res && res.length) {
-          if (this.lpn !== this.$route.query.lpn) {
-            this.$router.replace({query: {lpn: this.lpn}})
-          }
-          this.tasks = res
-          this.mode = 1
-        } else {
-          this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.quality.lpn.error', '托盘 {lpn} 未找到品检任务', {lpn: this.lpn}))
-          this.lpn = ''
-        }*/
       })
     },
     getTask () {

package/src/views/wms/page/inbound/receive/receive-alloc/LwInboundReceiveAllocSkuExecutePage.vue

@@ -6,40 +6,76 @@
   <div>
     <lw-nav-bar
       :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.odstbwjf', '调拨按商品收货')"/>
-    <div v-if="asn" class="lw-global-page-box">
-      <div>
-        <asn-info :data="asn" shrinkable radius/>
-      </div>
-
-      <div class="lw-global-model-box" style="margin-top: 10px;" v-if="!showScanResult">
+    <div
+      v-if="asn"
+      class="lw-global-page-box"
+    >
+      <asn-info
+        :data="asn"
+        shrinkable
+        radius
+      />
+
+      <div
+        class="lw-global-model-box lw-global-model-box-3px"
+        style="margin-top: 10px;"
+        v-if="!showScanResult"
+      >
         <lw-input
           :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.ixnhhqzo', '商品收货条码')"
-          required v-model="skuTag.value" :get-focus.sync="skuTag.focus"
-          rule-key="skuReceive" :rule-serve-query="barcodeQuery"
-          @confirm="scanSkuTag"/>
+          required
+          v-model="skuTag.value"
+          :get-focus.sync="skuTag.focus"
+          rule-key="skuReceive"
+          :create-rule="$lwScanRule.create('调拨按商品收货-收货页-商品收货条码','SKU')"
+          :owner-id="asn.ownerId"
+          :rule-serve-query="asn"
+          :show-bottom-border="showScanResult && currentSku"
+          @confirm="scanSkuTag"
+        />
       </div>
 
-      <div class="lw-global-model-box" v-if="showScanResult && currentSku">
+      <div
+        v-if="showScanResult && currentSku"
+        class="lw-global-model-box"
+        style="margin-top: 10px;padding-top: 3px"
+      >
 
         <!--   商品 + 数量   -->
         <div v-if="!currentSku.needSn">
-          <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.calpdkwu','商品编码')" :is-row="false" val-bold val-size="16px"
-                    style="margin-top: 10px;"
-                    required v-model="sku.value" :get-focus.sync="sku.focus"
-                    rule-key="skuReceive" :rule-serve-query="barcodeQuery"
-                    @confirm="addTag"
+          <lw-input
+            :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.calpdkwu','商品编码')"
+            :is-row="false"
+            val-bold
+            val-size="16px"
+            required
+            v-model="sku.value"
+            :get-focus.sync="sku.focus"
+            rule-key="sku"
+            :create-rule="$lwScanRule.create('调拨按商品收货-收货页-商品编码','SKU')"
+            :owner-id="asn.ownerId"
+            :rule-serve-query="asn"
+            @confirm="addTag"
           />
-          <div class="lw-global-flex-between">
-            <lw-input style="flex: 1;margin-top: 10px;" :title-width="50"
-                      :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.qofpogny', '数量')"
-                      required v-model="skuQty.value" :get-focus.sync="skuQty.focus"
-                      :placeholder="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.twmfeikg', '请输入数量')"
-                      type="digit">
-              <template #button>
-                <lw-button mini round @click="submitScanSku"> {{ $lwLanguage.get('wms_project.pda.components.page.receive.alloc.sku.btn.submit', '提交') }}</lw-button>
-              </template>
-            </lw-input>
-          </div>
+
+
+          <lw-get-qty-by-type
+            ref="qty"
+            :sku-id="scanTempItem.sku.id"
+          >
+            <template #button>
+              <lw-button
+                small
+                block
+                round
+                @click="submitScanSku"
+              >
+                {{ $lwLanguage.get('wms_project.pda.components.page.receive.alloc.sku.btn.submit', '提交') }}
+              </lw-button>
+
+            </template>
+          </lw-get-qty-by-type>
+
         </div>
 
         <!--   序列号     -->
@@ -77,7 +113,7 @@
             <lw-title-value-cell
               v-if="currentSkuItem"
               :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.odataaqg','待收量')"
-              :value="currentSkuItem.canReceiveQty"
+              :value="currentSkuItem.canReceiveQtyLabel"
               val-bold
               val-red
               :is-row="false"
@@ -87,8 +123,13 @@
 
           <lw-input
             :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.hgbwhydg', '序列号')"
-            v-model="sn.value" :get-focus.sync="sn.focus" @confirm="addSn"
-            rule-key="sn" :rule-serve-query="barcodeQuery"
+            v-model="sn.value"
+            :get-focus.sync="sn.focus"
+            rule-key="sn"
+            :create-rule="$lwScanRule.create('调拨按商品收货-收货页-序列号','SN')"
+            :owner-id="asn.ownerId"
+            :rule-serve-query="asn"
+            @confirm="addSn"
           />
 
         </div>
@@ -156,9 +197,16 @@
           {{ $lwLanguage.get('wms_project.pda.components.page.receive.alloc.label.scan.num', '扫描总数：') }}
           <span>{{ numStatistics.scanQty }}</span>
         </div>
-        <lw-input v-model="receiveLoc.value"
-                  :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.mtnlfgma', '收货库位')"
-                  required :get-focus.sync="receiveLoc.focus"/>
+        <lw-input
+          v-model="receiveLoc.value"
+          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.mtnlfgma', '收货库位')"
+          required
+          :get-focus.sync="receiveLoc.focus"
+          rule-key="loc"
+          :create-rule="$lwScanRule.create('调拨按商品收货-收货页-收货库位','LOCATION')"
+          :owner-id="asn.ownerId"
+          :rule-serve-query="asn"
+        />
       </div>
     </div>
 
@@ -208,9 +256,14 @@
 
 <script>
 import {
-  getInboundAsn, getInboundAllocAsnScanListBySku, getInboundAllocAsnSku,
-  submitInboundAllocAsnScanBySkuSn, submitInboundAllocAsnScanBySku, receiveInboundAllocAsnScanBySku,
-  resetInboundAllocAsnScanBySku, deleteInboundAllocAsnScanSnBySku, deleteInboundAllocAsnScanSku,
+  getInboundAllocAsnScanListBySku,
+  getInboundAllocAsnSku,
+  submitInboundAllocAsnScanBySkuSn,
+  submitInboundAllocAsnScanBySku,
+  receiveInboundAllocAsnScanBySku,
+  resetInboundAllocAsnScanBySku,
+  deleteInboundAllocAsnScanSnBySku,
+  deleteInboundAllocAsnScanSku, wmsMobileExtInGetAsnV2,
 } from '../../../../api/inbound/receive'
 import AsnInfo from '../../components/AsnInfo.vue'
 import AllocScanListItem from '../../components/AllocScanListItem.vue'
@@ -219,7 +272,7 @@ import AllocReceiveResult from '../../components/AllocReceiveResult.vue'
 import {scanUtils} from '../../util/InboundUtils'
 
 export default {
-  name: 'LwInboundReceiveAllocSnExecutePage',
+  name: 'LwInboundReceiveAllocSkuExecutePage',
   components: {AsnInfo, AllocScanListItem, SnsList, AllocReceiveResult},
   data() {
     return {
@@ -260,11 +313,6 @@ export default {
         scanQty: i.scanQty
       })).reduce((a, b) => ({scanQty: a.scanQty + b.scanQty}), ({scanQty: 0}))
     },
-    barcodeQuery() {
-      return {
-        ownerId: this.asn.ownerId,
-      }
-    },
     currentSkuItem() {
       if (this.scanTempItem) {
         let a1 = this.list ? this.list.filter(i => i.sku.id === this.scanTempItem.sku.id) : []
@@ -337,7 +385,10 @@ export default {
       }
     },
     loadAsn(asnId) {
-      getInboundAsn(asnId).then(res => {
+      wmsMobileExtInGetAsnV2({
+        asnId,
+        bizPoint: 'allocate'
+      }).then(res => {
         this.asn = res
         this.loadScanList()
       })
@@ -357,7 +408,8 @@ export default {
       this.scanTempItem = null
       this.skuTag.value = null
       this.sku.value = null
-      this.skuQty.value = null
+      // this.skuQty.value = null
+      this.$refs.qty?.clearInput()
       this.sn.value = null
       this.receiveLoc.focus = false
       this.skuTag.focus = 'tag' === f
@@ -411,25 +463,29 @@ export default {
       if (scanData.skuCode !== this.currentSku.code) {
         this.sku.value = null
         this.sku.focus = true
-        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.sku.no.same', '商品编码：{sku} 与当前商品：{currentSku} 不符',{sku:scanData.skuCode,currentSku:this.currentSku.code}))
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.sku.no.same', '商品编码：{sku} 与当前商品：{currentSku} 不符', {
+          sku: scanData.skuCode,
+          currentSku: this.currentSku.code
+        }))
       }
-      const qty = parseInt(scanData.skuCode.qty) || 0
-      const oQty = parseInt(this.skuQty.value) || 0
+      const qty = Number(scanData.qty || 0)
+      const oQty = this.$refs.qty?.getQty() || 0
 
-      this.skuQty.value = oQty + qty
-      this.sku.value = null
+
+      this.$refs.qty.setQty(oQty + qty)
+      this.sku.value = ''
       this.sku.focus = true
     },
     submitScanSku() {
-      if (!this.skuQty.value) {
-        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.lzcfoqzq', '请输入商品数量'))
-      }
-      const qty = parseInt(this.skuQty.value) || 0
-      if (qty <= 0) {
-        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.vibspquz', '商品数量必须大于0'))
+      const qty = this.$refs.qty?.getQty() || 0
+      if (!qty) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '商品数量不能为空，且应当是大于0的正整数')
+        )
+        return
       }
 
-      submitInboundAllocAsnScanBySku(this.asn.id, this.currentSku.id, qty).then((res)=>{
+      submitInboundAllocAsnScanBySku(this.asn.id, this.currentSku.id, qty, {taskId: this.$route.query.lwTaskId}).then((res) => {
         this.list = res
         this.updateReceiveLoc()
       }).finally(() => {
@@ -462,7 +518,7 @@ export default {
       this.submitScanSn(scanData.sn)
     },
     submitScanSn(sn) {
-      submitInboundAllocAsnScanBySkuSn(this.asn.id, this.currentSku.id, sn).then((res)=>{
+      submitInboundAllocAsnScanBySkuSn(this.asn.id, this.currentSku.id, sn, {taskId: this.$route.query.lwTaskId}).then((res) => {
         this.list = res
         this.updateReceiveLoc()
       }).finally(() => {
@@ -506,7 +562,14 @@ export default {
       if (this.list.length === 0) {
         return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.hhdnpqde', '未提交已扫描商品'))
       }
-      receiveInboundAllocAsnScanBySku(this.asn.id, this.receiveLoc.value).then(res => {
+      receiveInboundAllocAsnScanBySku({
+        asnId: this.asn.id,
+        locationCode: this.receiveLoc.value,
+        lpn: null,
+        printDeviceId: null,
+        printTemplate: null,
+        taskId: this.$route.query.lwTaskId
+      }).then(res => {
         this.clearInput()
 
         this.loadAsn(this.asn.id)

package/src/views/wms/page/inbound/receive/receive-alloc/LwInboundReceiveAllocSnExecutePage.vue

@@ -6,15 +6,24 @@
   <div>
     <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.sfonbhar', '调拨按序列号收货')"/>
     <div v-if="asn" class="lw-global-page-box">
-      <div>
-        <asn-info :data="asn" shrinkable radius/>
-      </div>
+      <asn-info
+        :data="asn"
+        shrinkable
+        radius
+      />
 
       <div class="lw-global-model-box" style="margin-top: 10px;">
-        <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.tzjvvrsj', '序列号')"
-                  required v-model="sn.value"  :get-focus.sync="sn.focus"
-                  rule-key="sn" :rule-serve-query="barcodeQuery"
-                  @confirm="addSn"/>
+        <lw-input
+          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.tzjvvrsj', '序列号')"
+          required
+          v-model="sn.value"
+          :get-focus.sync="sn.focus"
+          rule-key="sn"
+          :create-rule="$lwScanRule.create('调拨按序列号收货-收货页-序列号','SN')"
+          :owner-id="asn.ownerId"
+          :rule-serve-query="asn"
+          @confirm="addSn"
+        />
       </div>
 
       <template v-if="list.length">
@@ -28,9 +37,16 @@
           {{ $lwLanguage.get('wms_project.pda.components.page.receive.alloc.label.scan.num', '扫描总数：') }}
           <span>{{ numStatistics.scanQty }}</span>
         </div>
-        <lw-input v-model="receiveLoc.value"
-                  :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.cmoggvqd', '收货库位')"
-                  required :get-focus.sync="receiveLoc.focus"/>
+        <lw-input
+          v-model="receiveLoc.value"
+          :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.cmoggvqd', '收货库位')"
+          required
+          :get-focus.sync="receiveLoc.focus"
+          rule-key="loc"
+          :create-rule="$lwScanRule.create('调拨按序列号收货-收货页-收货库位','LOCATION')"
+          :owner-id="asn.ownerId"
+          :rule-serve-query="asn"
+        />
       </div>
     </div>
 
@@ -59,10 +75,10 @@
 
 <script>
 import {
-  getInboundAsn, getInboundAllocAsnScanListBySn,
+  getInboundAllocAsnScanListBySn,
   submitInboundAllocAsnScanBySn, receiveInboundAllocAsnScanBySn,
   resetInboundAllocAsnScanBySn,
-  deleteInboundAllocAsnScanSn, deleteInboundAllocAsnScanSkuAllSn,
+  deleteInboundAllocAsnScanSn, deleteInboundAllocAsnScanSkuAllSn, wmsMobileExtInGetAsnV2,
 } from '../../../../api/inbound/receive'
 import AsnInfo from '../../components/AsnInfo.vue'
 import AllocScanListItem from '../../components/AllocScanListItem.vue'
@@ -129,7 +145,10 @@ export default {
       }
     },
     loadAsn(asnId) {
-      getInboundAsn(asnId).then(res => {
+      wmsMobileExtInGetAsnV2({
+        asnId,
+        bizPoint: 'allocate'
+      }).then(res => {
         this.asn = res
         this.loadScanList()
       })
@@ -149,7 +168,7 @@ export default {
     },
     submitScan() {
       if (this.sn.value) {
-        submitInboundAllocAsnScanBySn(this.asn.id, this.sn.value).then(this.updateList).finally(() => {
+        submitInboundAllocAsnScanBySn(this.asn.id, this.sn.value, {taskId: this.$route.query.lwTaskId}).then(this.updateList).finally(() => {
           this.sn.value = null
         })
       }
@@ -191,11 +210,18 @@ export default {
         this.sn.focus = true
         return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.pdkzrgdt', '请扫描序列号'))
       }
-      receiveInboundAllocAsnScanBySn(this.asn.id, this.receiveLoc.value).then(res => {
+      receiveInboundAllocAsnScanBySn({
+        asnId: this.asn.id,
+        locationCode: this.receiveLoc.value,
+        lpn: null,
+        printDeviceId: null,
+        printTemplate: null,
+        taskId: this.$route.query.lwTaskId
+      }).then(res => {
         this.loadAsn(this.asn.id)
         this.receiveResult = res
         this.showResult = true
-      }).finally(()=>{
+      }).finally(() => {
         this.receiveLoc.value = null
         this.sn.focus = true
       })

package/src/views/wms/page/inbound/receive/receive-alloc/LwInboundReceiveAllocTabListPage.vue

@@ -20,8 +20,12 @@
               <template v-if="receive.list && receive.list.length">
                 <alloc-sku-list-item v-for="(i,k) in receive.list" :key="i.sku.id" :item="i" :index="k"
                                      :abnormal="true" @abnormalClick="itemAbnormalClick"/>
-                <lw-pages v-model="receive.pageNum" :page-total="receive.total" :page-size="pageSize" force-ellipses
-                          @change="getReceiveData"/>
+                <lw-pagination
+                  v-model="receive.pageNum"
+                  :page-total="receive.total"
+                  :page-size.sync="pageSize"
+                  @change="getReceiveData"
+                />
               </template>
               <lw-not-data v-else/>
             </van-tab>
@@ -37,8 +41,12 @@
                 <alloc-sku-list-item v-for="(i,k) in all.list" :key="i.sku.id" :item="i" :index="k"
                                      :abnormal="true" @abnormalClick="itemAbnormalClick"/>
 
-                <lw-pages v-model="all.pageNum" :page-total="all.total" :page-size="pageSize" force-ellipses
-                          @change="getAllData"/>
+                <lw-pagination
+                  v-model="all.pageNum"
+                  :page-total="all.total"
+                  :page-size.sync="pageSize"
+                  @change="getAllData"
+                />
               </template>
               <lw-not-data v-else/>
             </van-tab>
@@ -63,7 +71,8 @@
     <lw-popup
       :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.xrpvhjjx', '收货异常')"
       v-model="showAbnormal"
-      class="abnormal-popup-bg">
+      background="#f0f0f0"
+    >
 
       <lw-receive-abnormal-module
         v-if="showAbnormal"
@@ -74,6 +83,7 @@
         :asn-no="asn.asnNo"
         :sku-code="itemSku.sku.code"
         :qty="itemSku.canReceiveQty"
+        :qty-label="itemSku.canReceiveQtyLabel"
       />
 
       <template #button>
@@ -87,9 +97,8 @@
 
 <script>
 import {
-  getInboundAsnByAsnNo,
   getInboundAllocAsnSkuReceiveList,
-  getInboundAllocAsnSkuList, submitInboundAllocAsnAbnormal
+  getInboundAllocAsnSkuList, submitInboundAllocAsnAbnormal, wmsMobileExtInGetAsnV2
 } from '../../../../api/inbound/receive'
 import AsnInfo from '../../components/AsnInfo.vue'
 import SearchBar from '../../components/SearchBar.vue'
@@ -148,7 +157,10 @@ export default {
   },
   methods: {
     getAsnByAsnNo(asnNo) {
-      getInboundAsnByAsnNo(asnNo).then(data => {
+      wmsMobileExtInGetAsnV2({
+        asnNo,
+        bizPoint: 'allocate'
+      }).then(data => {
         if (data) {
           this.asn = data
 
@@ -169,7 +181,6 @@ export default {
         if (data) {
           this.receive.list = data.datas
           this.receive.total = data.total
-          this.receive.pageNum = data.pageNum + 1
         }
       })
     },
@@ -184,7 +195,6 @@ export default {
         if (data) {
           this.all.list = data.datas
           this.all.total = data.total
-          this.all.pageNum = data.pageNum + 1
         }
       })
     },
@@ -204,7 +214,13 @@ export default {
       if (!path) {
         return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.receive_alloc.mucvbrhi', '错误的调拨收货方式'))
       }
-      this.$router.push({path, query: {asnId: this.asn.id}})
+      this.$router.push({
+        path,
+        query: {
+          asnId: this.asn.id,
+          lwTaskId: this.$route.query.lwTaskId
+        }
+      })
     },
     itemAbnormalClick(item) {
       this.itemSku = item
@@ -222,6 +238,7 @@ export default {
         skuId: this.itemSku.sku.id,
         order:data.order,
         ...data.lines[0],
+        taskId: this.$route.query.lwTaskId
       }).then(() => {
         this.showAbnormal = false
         this.itemSku = null
@@ -238,10 +255,4 @@ export default {
 
 <style lang="less" scoped>
 
-@import "../../../../../../assets/css/var.less";
-
-.abnormal-popup-bg {
-  background: @pageColor;
-}
-
 </style>