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

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

@@ -39,6 +39,7 @@
         v-for="i in orderList"
         :key="i.id"
         :item="i"
+        :page-jump-fn="pageJumpFn"
         @orderCancel="pageChange"
         @orderConfirm="pageChange"
       />
@@ -62,8 +63,8 @@
 
 import orderInfo from "./../components/orderInfo.vue";
 import {
+  wmsMobileConsoleInAsnQueryPageList,
   wmsMobileInboundGetReceiveMethodList,
-  wmsMobileInboundQueryAsnList
 } from "../../../../api/receive/console";
 
 export default {
@@ -114,6 +115,10 @@ export default {
     wmsMobileInboundGetReceiveMethodList().then(res => {
       res.forEach(item => this.btnList.push(this.jumpPagePath[item]))
     })
+    const {searchVal, pageNum, pageSize} = this.$route.query
+    this.searchVal = searchVal || ''
+    this.pageNum = Number(pageNum || 1)
+    this.pageSize = Number(pageSize || 10)
     this.pageChange()
   },
   methods: {
@@ -125,7 +130,7 @@ export default {
 
     // 页码改变
     pageChange() {
-      wmsMobileInboundQueryAsnList({
+      wmsMobileConsoleInAsnQueryPageList({
         no: this.searchVal,
         pageNum: this.pageNum,
         pageSize: this.pageSize
@@ -137,7 +142,21 @@ export default {
 
     // 底部按钮点击
     bottomClick(path) {
+      this.pageJumpFn()
       this.$router.push(path)
+    },
+
+    // 页面跳转前记录当前搜索信息及页码信息
+    pageJumpFn() {
+      this.$router.replace({
+        path: '/receive/console/lwIndex',
+        query: {
+          searchVal: this.searchVal,
+          pageNum: this.pageNum,
+          pageSize: this.pageSize,
+          _time: Date.now()
+        }
+      })
     }
   }
 }

package/src/views/wms/page/receive/console/look/index.vue

@@ -10,241 +10,175 @@
 
     <div class="lw-global-page-box">
 
-      <div class="lw-global-model-top-radius lw-global-row-box">
-
-        <lw-title-value-cell
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.opqrliqk','到货通知单')"
-          :value="orderData.asnNo"
-          :is-row="false"
-          val-bold
-        />
-
-        <lw-title-value-cell
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.gunwkgms','订单类型')"
-          :value="orderData.type"
-          :is-row="false"
-        />
-
-        <lw-title-value-cell
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.qcfmhjkn','货主')"
-          :value="$lwCheckVal(orderData.ownerCode)+' / '+$lwCheckVal(orderData.ownerName)"
-          :is-row="false"
-        />
-
-        <lw-title-value-cell
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.fdwhlnbr','承运商')"
-          :value="$lwCheckVal(orderData.carrierCode)+' / '+$lwCheckVal(orderData.carrierName)"
-          :is-row="false"
-        />
-
-        <lw-title-value-cell
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.uidpkebf','车牌号')"
-          :value="orderData.carrierPlateNum"
-          :is-row="false"
-        />
-
-        <lw-title-value-cell
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.czypurzd','计划时间')"
-          :value="$lwDate.format(orderData.planArrivalTime,'yyyy-MM-dd hh:mm')"
-          :is-row="false"
-        />
-
-        <lw-title-value-cell
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.hklrawdg','预约时间')"
-          :value="$lwDate.format(orderData.estArrivalTime,'yyyy-MM-dd hh:mm')"
-          :is-row="false"
-        />
-
-        <lw-title-value-cell
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.gnqohvsf','预约月台')"
-          :value="$lwCheckVal(orderData.estDockCode)+' / '+$lwCheckVal(orderData.estDockName)"
-          :is-row="false"
-        />
-
-        <lw-title-value-cell
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.ldifiqtu','异常率')"
-          :value="$lwCheckVal(orderData.abnormalRate)"
-          :is-row="false"
-          val-red
-        />
+      <div class="lw-global-model-top-radius">
 
-      </div>
-      <lw-data-look-bg type="bottom">
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.gyorrshr','计划量')"
-          :value="$lwCheckVal(orderData.qty)"
-        />
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.ffxdaven','已收量')"
-          :value="$lwCheckVal(orderData.receiveQty)"
-        />
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.ieoxdptm','待收量')"
-          :value="$lwCheckVal(orderData.qualityLossQty)"
-        />
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.iuiuessb','到货量')"
-          :value="$lwCheckVal(orderData.arrivalQty)"
-        />
-
-        <lw-data-look-item
-          color="yellow"
-          :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.chzqlfxi','异常量')"
-          :value="$lwCheckVal(orderData.qualityLossQty)"
-        />
+        <lw-label-value-group :list="orderData.contentList"/>
 
-      </lw-data-look-bg>
+      </div>
+      <lw-data-look-bg
+        type="bottom"
+        :data="orderData.qtyList"
+        value-key="qtyLabel"
+        title-key="label"
+        :show-end-line="false"
+      />
 
       <lw-tab-box style="margin-top: 10px">
         <van-tabs
           type="card"
           animated
           v-model="tabActive"
+          @change="tabChange"
         >
-
+          <!-- 托 -->
           <van-tab
             name="lpn"
-            :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.voeespsj','托')"
+            :title="$lwLanguage.get('','已收托盘')"
           >
 
             <lw-title-value-cell
               style="margin-bottom: 10px"
               :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.qsbogvmj','托数')"
-              :value="lpnList.length"
+              :value="lpn.pageTotal"
               val-red
               val-bold
               val-size="16px"
               :is-row="false"
             />
 
-            <lpn-case-info
-              v-for="(i,k) in lpnList"
+            <lw-label-value-group
+              v-for="(i,k) in lpn.data"
               :key="k"
-              :code="i.lpn"
-              :type="i.lpn"
-              :locationCode="i.locationCode"
-              :qty="i.qty"
-              :startTime="i.startTime"
-              :endTime="i.endTime"
+              :list="i.contentList"
+              show-model-style
+            />
+            <lw-pagination
+              v-model="lpn.pageNum"
+              :page-size.sync="lpn.pageSize"
+              :page-total="lpn.pageTotal"
+              @change="getTabItemData('lpn')"
             />
-            <lw-not-data v-if="!lpnList.length"/>
+            <lw-not-data v-if="!lpn.data.length"/>
 
           </van-tab>
 
+          <!-- 箱 -->
           <van-tab
             name="box"
-            :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.epkiomvx','箱')"
+            :title="$lwLanguage.get('','已收箱')"
           >
 
             <lw-title-value-cell
               style="margin-bottom: 10px"
               :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.znyaeguq','箱数')"
-              :value="caseNumList.length"
+              :value="box.pageTotal"
               val-red
               val-bold
               val-size="16px"
               :is-row="false"
             />
 
-            <lpn-case-info
-              v-for="(i,k) in caseNumList"
+
+            <lw-label-value-group
+              v-for="(i,k) in box.data"
               :key="k"
-              :code="i.caseNum"
-              :type="i.caseNum"
-              :locationCode="i.locationCode"
-              :qty="i.qty"
-              :startTime="i.startTime"
-              :endTime="i.endTime"
+              :list="i.contentList"
+              show-model-style
+            />
+
+            <lw-pagination
+              v-model="box.pageNum"
+              :page-size.sync="box.pageSize"
+              :page-total="box.pageTotal"
+              @change="getTabItemData('box')"
             />
-            <lw-not-data v-if="!caseNumList.length"/>
+            <lw-not-data v-if="!box.data.length"/>
 
           </van-tab>
 
+          <!-- 商品 -->
           <van-tab
             name="sku"
-            :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.oonkfsda','商品')"
+            :title="$lwLanguage.get('','已收商品')"
           >
 
             <lw-title-value-cell
               style="margin-bottom: 10px"
               :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.yfpgepbu','商品数')"
-              :value="skuList.length"
+              :value="sku.pageTotal"
               val-red
               val-bold
               val-size="16px"
               :is-row="false"
             />
 
-            <div
-              class="lw-global-model-box lw-global-row-box"
-              v-for="(i,k) in skuList"
+            <lw-label-value-group
+              v-for="(i,k) in sku.data"
               :key="k"
-            >
-
-              <div class="lw-global-flex-between">
-
-                <div class="lw-global-value-bold">
-                  {{ i.skuCode + ' - ' + i.skuName }}
-                </div>
-
-                <lw-tag
-                  plain
-                  round
-                  type="success"
-                >
-                  {{ $lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.krqbryak','已收货') }}
-                </lw-tag>
-
-              </div>
-
-              <div class="lw-global-flex-between">
+              :list="i.contentList"
+              show-model-style
+            />
 
-                <lw-title-value-cell
-                  :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.jandcmho','收货库位')"
-                  :value="i.locationCode"
-                  val-bold
-                  :is-row="false"
-                />
+            <lw-pagination
+              v-model="sku.pageNum"
+              :page-size.sync="sku.pageSize"
+              :page-total="sku.pageTotal"
+              @change="getTabItemData('sku')"
+            />
+            <lw-not-data v-if="!sku.data.length"/>
 
-                <lw-title-value-cell
-                  :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.bjfgjrfn','数量')"
-                  :value="i.qty"
-                  val-bold
-                  :is-row="false"
-                />
+          </van-tab>
 
-              </div>
+          <!-- 全部 -->
+          <van-tab
+            name="all"
+            :title="$lwLanguage.get('','全部商品')"
+          >
 
-              <lw-title-value-cell
-                :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.yrabxtlp','收货托盘')"
-                :value="i.lpn"
-                val-bold
-                :is-row="false"
-              />
+            <lw-title-value-cell
+              style="margin-bottom: 10px"
+              :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.yfpgepbu','商品数')"
+              :value="all.pageTotal"
+              val-red
+              val-bold
+              val-size="16px"
+              :is-row="false"
+            />
 
-              <div class="lw-global-flex-between">
 
-                <lw-title-value-cell
-                  :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.mcdbemme','收货人')"
-                  :value="i.staffName"
-                  val-bold
-                  :is-row="false"
-                />
+            <div
+              class="lw-global-model-box"
+              v-for="(i,k) in all.data"
+              :key="k"
+            >
+              <lw-label-value-group :list="i.contentList"/>
 
-                <lw-title-value-cell
-                  :title="$lwLanguage.get('wms_project.pda.wms.page.receive.console.look.index.kexywpqo','收货时间')"
-                  :value="$lwDate.format(i.time,'yyyy-MM-dd hh:mm:ss')"
-                  :is-row="false"
-                />
+              <div class="lw-global-flex-start">
+                <div
+                  class="lw-global-flex-start"
+                  v-for="(item,index) in i.qtyList"
+                  :key="'inner'+index"
+                >
+                  <div style="margin: 0 5px" v-if="index>0">/</div>
+                  <lw-title-value-cell
+                    :title="item.label"
+                    :value="item.qtyLabel"
+                    :is-row="false"
+                    val-red
+                    val-bold
+                  />
 
+                </div>
               </div>
-
             </div>
-            <lw-not-data v-if="!skuList.length"/>
+
+            <lw-pagination
+              v-model="all.pageNum"
+              :page-size.sync="all.pageSize"
+              :page-total="all.pageTotal"
+              @change="getTabItemData('all')"
+            />
+            <lw-not-data v-if="!all.data.length"/>
 
           </van-tab>
         </van-tabs>
@@ -259,36 +193,94 @@
 
 <script>
 
-import lpnCaseInfo from "./../components/lpnCaseInfo.vue";
+
 import {
-  wmsMobileInboundGetReceiveDetail
+  wmsMobileConsoleInAsnGetDetail,
+  wmsMobileConsoleInAsnQueryCasePageListByReceive,
+  wmsMobileConsoleInAsnQueryLpnPageListByReceive,
+  wmsMobileConsoleInAsnQuerySkuPageList,
+  wmsMobileConsoleInAsnQuerySkuPageListByReceive,
 } from "../../../../api/receive/console";
 
 export default {
   name: "lwReceiveConsoleLook",
-  components: {
-    lpnCaseInfo
-  },
   data() {
     return {
       orderData: {},
       tabActive: 'lpn',
+      asnId: '',
+      lpn: {
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
+        data: []
+      },
+      box: {
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
+        data: []
+      },
+      sku: {
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
+        data: []
+      },
+      all: {
+        pageNum: 1,
+        pageSize: 10,
+        pageTotal: 0,
+        data: []
+      },
       lpnList: [],
       caseNumList: [],
       skuList: [],
     }
   },
   mounted() {
-    wmsMobileInboundGetReceiveDetail({
-      id: this.$route.query.lwId
+    this.asnId = this.$route.query.lwId
+    wmsMobileConsoleInAsnGetDetail({
+      asnId: this.asnId
     }).then(res => {
       this.orderData = res
-      this.skuList = this.orderData.skuList || []
-      this.lpnList = this.orderData.lpnList || []
-      this.caseNumList = this.orderData.caseNumList || []
     })
+    this.getTabItemData(this.tabActive)
   },
-  methods: {}
+  methods: {
+    getTabItemData(key) {
+      let api = null
+      switch (key) {
+        case 'lpn':
+          api = wmsMobileConsoleInAsnQueryLpnPageListByReceive
+          break
+        case 'box':
+          api = wmsMobileConsoleInAsnQueryCasePageListByReceive
+          break
+        case 'sku':
+          api = wmsMobileConsoleInAsnQuerySkuPageListByReceive
+          break
+        case 'all':
+        default:
+          api = wmsMobileConsoleInAsnQuerySkuPageList
+          break
+      }
+      api({
+        asnId: this.asnId,
+        pageNum: this[key].pageNum,
+        pageSize: this[key].pageSize,
+      }).then(res => {
+        this[key].data = res.datas || []
+        this[key].pageTotal = res.total || 0
+      })
+    },
+
+    // tab切换
+    tabChange() {
+      const key = this.tabActive
+      if (!this[key].pageTotal) this.getTabItemData(key)
+    }
+  }
 }
 </script>
 

package/src/views/wms/page/receive/index.js

@@ -33,6 +33,20 @@ import lwReceiveConsoleLook from "./console/look"
 // 收货控制台 - 创建、修改收货单
 import lwReceiveConsoleCreateEditOrder from "./console/createEditOrder"
 
+// 多单收货 - 起始页
+import lwReceiveMoreOrderIndex from "./moreOrder/index"
+// 多单收货 - 选择收货方式
+import lwReceiveMoreOrderSelectType from "./moreOrder/selectType"
+// 多单收货 - 按托盘收货
+import lwReceiveMoreOrderLpn from "./moreOrder/lpn"
+// 多单收货 - 按商品收货
+import lwReceiveMoreOrderSku from "./moreOrder/sku"
+// 多单收货 - 按箱收货
+import lwReceiveMoreOrderBox from "./moreOrder/box"
+
+// 混合收货组件集合
+import mixture from "./mixture";
+
 
 export const receive = [
   lwReceiveReceiptPage,
@@ -48,4 +62,12 @@ export const receive = [
   lwReceiveConsoleIndex,
   lwReceiveConsoleLook,
   lwReceiveConsoleCreateEditOrder,
+
+  lwReceiveMoreOrderIndex,
+  lwReceiveMoreOrderSelectType,
+  lwReceiveMoreOrderLpn,
+  lwReceiveMoreOrderSku,
+  lwReceiveMoreOrderBox,
+
+  ...mixture,
 ]