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

package/src/views/wms/page/receive/moreOrder/components/asnListContent.vue

@@ -10,7 +10,7 @@
 
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.components.asnListContent.lnkqsalg', '到货通知单数')"
-        :value="JSON.parse($route.query.lwAsnIds).length"
+        :value="$route.query.lwAsnIds.split(',').length"
         val-bold
         val-red
         :is-row="false"
@@ -46,7 +46,7 @@
 <script>
 
 import asnInfo from "./asnInfo.vue";
-import {wmsMobileMultiInGetOrders} from "../../../../api/receive/moreOrder";
+import {wmsMobileMultiInGetOrdersV2} from "../../../../api/receive/moreOrder";
 
 export default {
   name: "asnListContent",
@@ -67,8 +67,8 @@ export default {
         return
       }
 
-      wmsMobileMultiInGetOrders({
-        asnIds: JSON.parse(this.$route.query.lwAsnIds)
+      wmsMobileMultiInGetOrdersV2({
+        asnIds: this.$route.query.lwAsnIds.split(',')
       }).then(res => {
         this.list = res || []
         this.popupShow = true

package/src/views/wms/page/receive/moreOrder/components/asnSkuInfo.vue

@@ -39,7 +39,7 @@
 
             <lw-title-value-cell
               :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.components.asnSkuInfo.uruouzxu', '商品数量')"
-              :value="item.qty"
+              :value="item.qtyLabel"
               val-bold
               val-red
               :is-row="false"
@@ -103,7 +103,7 @@
 
               <lw-title-value-cell
                 :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.components.asnSkuInfo.xirpsxwi', '数量')"
-                :value="i.qty"
+                :value="i.qtyLabel"
                 val-bold
                 val-red
                 :is-row="false"
@@ -153,6 +153,7 @@
       :asn-no="asnData.asnNo"
       :sku-code="abnPopup.skuCode"
       :qty="abnPopup.qty"
+      :qty-label="abnPopup.qtyLabel"
       @submit="abnSubmit"
     />
   </div>
@@ -190,7 +191,8 @@ export default {
       abnPopup: {
         show: false,
         skuCode: '',
-        qty: 0
+        qty: 0,
+        qtyLabel: 0,
       }
     }
   },
@@ -198,6 +200,7 @@ export default {
     abnClick(item) {
       this.abnPopup.skuCode = item.sku.code
       this.abnPopup.qty = item.qty
+      this.abnPopup.qtyLabel = item.qtyLabel
       this.abnPopup.show = true
     },
 

package/src/views/wms/page/receive/moreOrder/index/index.vue

@@ -74,7 +74,10 @@
 <script>
 
 import asnInfo from "./../components/asnInfo.vue";
-import {wmsMobileInboundQueryAsn, wmsMobileMultiInGetOrders} from "../../../../api/receive/moreOrder";
+import {
+  wmsMobileMultiInGetOrdersV2,
+  wmsMobileMultiInQueryAsnListV2
+} from "../../../../api/receive/moreOrder";
 
 export default {
   name: "lwReceiveMoreOrderIndex",
@@ -92,9 +95,9 @@ export default {
     }
   },
   mounted() {
-    const asnIds = JSON.parse(this.$route.query.lwAsnIds || '[]')
-    asnIds.length && wmsMobileMultiInGetOrders({
-      asnIds
+    const asnIdStr = this.$route.query.lwAsnIds
+    asnIdStr && wmsMobileMultiInGetOrdersV2({
+      asnIds: asnIdStr.split(',')
     }).then(res => {
       this.asnList = res
     })
@@ -112,7 +115,7 @@ export default {
         return
       }
 
-      wmsMobileInboundQueryAsn({
+      wmsMobileMultiInQueryAsnListV2({
         no: asn
       }).then(res => {
         this.asn.value = ''
@@ -159,11 +162,11 @@ export default {
         return
       }
 
-      const lwAsnIds = this.asnList.map(item => item.id)
+      const lwAsnIds = this.asnList.map(item => item.id).join(',')
       this.$router.replace({
         path: '/receive/moreOrder/lwIndex',
         query: {
-          lwAsnIds: JSON.stringify(lwAsnIds),
+          lwAsnIds,
           _time: Date.now()
         }
       })
@@ -171,7 +174,7 @@ export default {
       this.$router.push({
         path: '/receive/moreOrder/lwSelectType',
         query: {
-          lwAsnIds: JSON.stringify(lwAsnIds),
+          lwAsnIds,
         }
       })
     },

package/src/views/wms/page/receive/moreOrder/lpn/index.vue

@@ -39,7 +39,7 @@
           v-model="lpn.value"
           :get-focus.sync="lpn.focus"
           rule-key="lpn"
-          :create-rule="$lwScanRule.create('多单收货 - 整托盘收货 - 托盘号','LPN')"
+          :create-rule="$lwScanRule.create('多单收货-整托盘收货-托盘号','LPN')"
           :show-bottom-border="false"
           required
           @confirm="lpnConfirm"
@@ -81,7 +81,7 @@
 
               <lw-title-value-cell
                 :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.lpn.index.oamifjwc', '商品数量')"
-                :value="lpnObj.qty"
+                :value="lpnObj.qtyLabel"
                 val-red
                 val-bold
                 :is-row="false"
@@ -259,7 +259,7 @@ export default {
     getCountData() {
 
       wmsMobileMultiInGetLpnState({
-        asnIds: JSON.parse(this.$route.query.lwAsnIds)
+        asnIds: this.$route.query.lwAsnIds.split(',')
       }).then(res => this.countData = res)
 
     },
@@ -285,7 +285,7 @@ export default {
 
       wmsMobileMultiInQueryLpn({
         lpn,
-        asnIds: JSON.parse(this.$route.query.lwAsnIds)
+        asnIds: this.$route.query.lwAsnIds.split(',')
       }).then(res => {
         const list = res.list || []
         if (!list.length) {
@@ -413,7 +413,8 @@ export default {
       const obj = {
         lpn,
         locationCode,
-        lines: dataList
+        lines: dataList,
+        taskId: this.$route.query.lwTaskId
       }
 
       const api = fastReceive ? wmsMobileMultiInFastReceiveByLpn : wmsMobileMultiInAdvanceReceiveByLpn

package/src/views/wms/page/receive/moreOrder/selectType/index.vue

@@ -11,34 +11,13 @@
     <lw-page-body-module>
 
       <asn-list-content/>
-      <lw-data-look-bg type="bottom">
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.selectType.index.fzdjqnmn', '计划量')"
-          :value="$lwCheckVal(asnCount.qty)"
-        />
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.selectType.index.cfkprrks', '已收量')"
-          :value="$lwCheckVal(asnCount.receiveQty)"
-        />
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.selectType.index.okkrelcq', '待收量')"
-          :value="$lwCheckVal(asnCount.canReceiveQty)"
-        />
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.selectType.index.hczyetsl', '到货量')"
-          :value="$lwCheckVal(asnCount.arrivalQty)"
-        />
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.selectType.index.lqvwzhox', '异常量')"
-          :value="$lwCheckVal(asnCount.qualityLossQty)"
-        />
-
-      </lw-data-look-bg>
+      <lw-data-look-bg
+        type="bottom"
+        :data="asnCount.qtyList"
+        value-key="qtyLabel"
+        title-key="label"
+        :show-end-line="false"
+      />
 
     </lw-page-body-module>
 
@@ -87,7 +66,7 @@ export default {
     getAsnData() {
       this.btnList = []
       wmsMobileMultiInGetSkuState({
-        asnIds: JSON.parse(this.$route.query.lwAsnIds)
+        asnIds: this.$route.query.lwAsnIds.split(',')
       }).then(res => {
         this.asnCount = res
         this.asnCount.receiveMethodList.forEach(item => {

package/src/views/wms/page/receive/moreOrder/sku/index.vue

@@ -11,33 +11,13 @@
     <lw-page-body-module>
 
       <asn-list-content/>
-      <lw-data-look-bg type="bottom">
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.qvgdqadd', '计划量')"
-          :value="$lwCheckVal(skuCount.qty)"
-        />
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.roaqlkuh', '已收量')"
-          :value="$lwCheckVal(skuCount.receiveQty)"
-        />
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.fhcomifa', '待收量')"
-          :value="$lwCheckVal(skuCount.canReceiveQty)"
-        />
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.mgibxixn', '到货量')"
-          :value="$lwCheckVal(skuCount.arrivalQty)"
-        />
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.bevhvxgv', '异常量')"
-          :value="$lwCheckVal(skuCount.qualityLossQty)"
-        />
-      </lw-data-look-bg>
+      <lw-data-look-bg
+        type="bottom"
+        :data="skuCount.qtyList"
+        value-key="qtyLabel"
+        title-key="label"
+        :show-end-line="false"
+      />
 
       <!-- 商品条码输入框 -->
       <div
@@ -50,7 +30,7 @@
           v-model="sku.value"
           :get-focus.sync="sku.focus"
           rule-key="sku"
-          :create-rule="$lwScanRule.create('多单收货 - 按商品收货 - 商品号','SKU')"
+          :create-rule="$lwScanRule.create('多单收货-按商品收货-商品号','SKU')"
           :show-bottom-border="false"
           required
           @confirm="skuConfirm"
@@ -72,51 +52,41 @@
           <div class="lw-global-title">{{ i.sku.name }}</div>
 
         </div>
-        <div class="lw-global-row-end lw-global-flex-start">
-          <lw-title-value-cell
-            :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.amiaknyh', '计划')"
-            :value="$lwCheckVal(i.qty,0)"
-            :is-row="false"
-            val-red
-            val-bold
-          />
-          <div class="separator">/</div>
-          <lw-title-value-cell
-            :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.cphnuwbf', '已收')"
-            :value="$lwCheckVal(i.receiveQty,0)"
-            :is-row="false"
-            val-red
-            val-bold
-          />
-          <div class="separator">/</div>
-          <lw-title-value-cell
-            :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.pevyvnes', '到货')"
-            :value="$lwCheckVal(i.arrivalQty,0)"
-            :is-row="false"
-            val-red
-            val-bold
-          />
-          <div class="separator">/</div>
-          <lw-title-value-cell
-            :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.klkidmth', '异常')"
-            :value="$lwCheckVal(i.qualityLossQty,0)"
-            :is-row="false"
-            val-red
-            val-bold
-          />
-          <div class="separator">/</div>
-          <lw-title-value-cell
-            :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.qkfrugfu', '待收')"
-            :value="$lwCheckVal(i.canReceiveQty,0)"
-            :is-row="false"
-            val-red
-            val-bold
-          />
+        <div
+          style="flex-wrap: wrap"
+          class="lw-global-row-end lw-global-flex-start"
+        >
+          <template v-for="(item,key) in i.qtyList">
+            <lw-title-value-cell
+              :key="key"
+              :title="item.label"
+              :value="item.qtyLabel"
+              :is-row="false"
+              val-red
+              val-bold
+            />
+            <div
+              v-if="(key+1) !== i.qtyList.length"
+              :key="'i'+key"
+              class="separator"
+            >
+              /
+            </div>
+          </template>
+
         </div>
 
       </div>
 
 
+      <lw-pagination
+        v-model="pageNum"
+        :page-size.sync="pageSize"
+        :page-total="pageTotal"
+        @change="pageChange"
+      />
+
+
     </lw-page-body-module>
 
 
@@ -135,72 +105,15 @@
         <div
           v-for="(i,k) in selectPopup.list"
           :key="k"
-          class="lw-global-model-box lw-global-model-box-3px radio-box"
+          class="lw-global-model-box radio-box"
         >
           <van-radio :name="k">
 
-            <div class="lw-global-row-box">
-              <div class="lw-global-value-bold">{{ i.sku.sku.code + ' - ' + i.sku.sku.name }}</div>
-              <lw-title-value-cell
-                :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.agcicayb', '到货通知单')"
-                :value="i.asn.asnNo"
-                val-bold
-                :is-row="false"
-              />
-              <lw-title-value-cell
-                :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.hwzsciig', '外部单号')"
-                :value="$lwCheckVal(i.asn.extNo)"
-                val-bold
-                :is-row="false"
-              />
-              <lw-title-value-cell
-                v-if="i.sku.ownerCode"
-                :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.uudyvfhf', '货主')"
-                :value="i.sku.ownerCode + '-' +i.sku.ownerName"
-                val-bold
-                :is-row="false"
-              />
-              <lw-title-value-cell
-                v-if="i.asn.supplierCode"
-                :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.szjnahxd', '供应商')"
-                :value="i.asn.supplierCode + '-' +i.asn.supplierName"
-                val-bold
-                :is-row="false"
-              />
-
-              <div class="lw-global-flex-between">
-
-                <lw-title-value-cell
-                  :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.qvgdqadd', '计划量')"
-                  :value="$lwCheckVal(i.sku.qty ,0)"
-                  val-bold
-                  :is-row="false"
-                />
-
-                <lw-title-value-cell
-                  :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.xcllrnog', '到货量')"
-                  :value="$lwCheckVal(i.sku.arrivalQty, 0)"
-                  val-bold
-                  :is-row="false"
-                />
-              </div>
-              <div class="lw-global-flex-between">
-
-                <lw-title-value-cell
-                  :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.jhwhiixy', '异常量')"
-                  :value="$lwCheckVal(i.sku.qualityLossQty ,0)"
-                  val-bold
-                  :is-row="false"
-                />
-
-                <lw-title-value-cell
-                  :title="$lwLanguage.get('wms_project.pda.wms.page.receive.moreOrder.sku.index.roaqlkuh', '已收量')"
-                  :value="$lwCheckVal(i.sku.receiveQty, 0)"
-                  val-bold
-                  :is-row="false"
-                />
-              </div>
-            </div>
+            <lw-label-value-group
+              :list="i.sku.contentList"
+              show-row-style
+            />
+
           </van-radio>
         </div>
       </van-radio-group>
@@ -226,9 +139,9 @@
 
 import asnListContent from "./../components/asnListContent.vue"
 import {
-  wmsMobileMultiInGetSkuList,
   wmsMobileMultiInGetSkuState,
-  wmsMobileMultiInQuerySku
+  wmsMobileMultiInQuerySku,
+  wmsMobileMultiInQuerySkuPageListV2, wmsMobileMultiInQuerySkuV2
 } from "../../../../api/receive/moreOrder";
 
 export default {
@@ -238,6 +151,7 @@ export default {
   },
   data() {
     return {
+      asnIds: [],
       skuCount: {},
       sku: {
         value: '',
@@ -252,7 +166,10 @@ export default {
       },
 
       // 商品列表
-      skuList: []
+      skuList: [],
+      pageNum: 1,
+      pageSize: 10,
+      pageTotal: 0,
     }
   },
   mounted() {
@@ -260,15 +177,22 @@ export default {
   },
   methods: {
     init() {
-      const asnIds = JSON.parse(this.$route.query.lwAsnIds)
+      this.asnIds = this.$route.query.lwAsnIds.split(',')
       wmsMobileMultiInGetSkuState({
-        asnIds
+        asnIds: this.asnIds
       }).then(res => this.skuCount = res)
-      wmsMobileMultiInGetSkuList({
-        asnIds
+      this.pageChange()
+    },
+
+    // 页码改变
+    pageChange() {
+      wmsMobileMultiInQuerySkuPageListV2({
+        asnIds: this.asnIds,
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
       }).then(res => {
-        this.skuList = res.skuList || []
-        console.log(res)
+        this.skuList = res.datas || []
+        this.pageTotal = res.total || 0
       })
     },
 
@@ -284,8 +208,8 @@ export default {
         return
       }
 
-      wmsMobileMultiInQuerySku({
-        asnIds: JSON.parse(this.$route.query.lwAsnIds),
+      wmsMobileMultiInQuerySkuV2({
+        asnIds: this.$route.query.lwAsnIds.split(','),
         skuCode
       }).then(res => {