@logwire/logwire-wms-pda-ui 1.1.17 → 1.2.0

package/src/components/page/outbound/delivery/components/soAndLpnItem/index.vue

@@ -18,82 +18,125 @@
     }"
   >
 
-    <!-- 单号 -->
-    <div class="lw-global-flex-between lw-global-row-start">
-      <div>
+    <template v-if="item.labelValueList && item.labelValueList.length">
+
+      <div class="lw-global-flex-between lw-global-row-start">
+        <div>
+          <span class="lw-global-title">
+            {{ item.labelValueList[0].label }}
+          </span>
+            <span class="lw-global-value-bold">
+              {{ item.labelValueList[0].value }}
+            </span>
+        </div>
+
+        <slot>
+          <lw-button
+            style="flex-shrink: 0"
+            round
+            mini
+            @click="del"
+          >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.delete', '删除') }}
+          </lw-button>
+        </slot>
+      </div>
+
+      <lw-lot-look-module
+        :columns="item.labelValueList.slice(1)"
+        :hidden-first-border="false"
+        title-key="label"
+        value-key="value"
+      />
+
+    </template>
+
+    <template v-else>
+      <!-- 单号 -->
+      <div class="lw-global-flex-between lw-global-row-start">
+        <div v-if="type === 'so'">
         <span class="lw-global-title">
-          {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.orderNo','单号') }}
+          {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.orderNo', '单号') }}
         </span>
-        <span class="lw-global-value-bold">
+          <span class="lw-global-value-bold">
           {{ item.soNo }}
         </span>
-      </div>
+        </div>
+
+        <div v-if="type === 'lpn'">
+        <span class="lw-global-title">
+          {{ $lwLanguage.get('wms_project.pda.outbound.delivery.action.lpn', '托盘号') }}
+        </span>
+          <span class="lw-global-value-bold">
+          {{ item.palletNo }}
+        </span>
+        </div>
 
-      <slot>
-        <lw-button
+        <slot>
+          <lw-button
             style="flex-shrink: 0"
             round
             mini
             @click="del"
-        >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.delete','删除') }}</lw-button>
-      </slot>
-    </div>
+          >{{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.delete', '删除') }}
+          </lw-button>
+        </slot>
+      </div>
 
-    <!-- 外部单号 -->
-    <div class="lw-global-row">
+      <!-- 外部单号 -->
+      <div class="lw-global-row">
       <span class="lw-global-title">
-        {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.extOrderNo','外部单号') }}
+        {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.extOrderNo', '外部单号') }}
       </span>
-      <span class="lw-global-value-bold">
+        <span class="lw-global-value-bold">
         {{ item.extSoNo || '-' }}
       </span>
 
-    </div>
+      </div>
 
-    <!-- 客户单号 -->
-    <div class="lw-global-row">
+      <!-- 客户单号 -->
+      <div class="lw-global-row">
       <span class="lw-global-title">
-        {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.customerOrderNo','客户单号') }}
+        {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.customerOrderNo', '客户单号') }}
       </span>
-      <span class="lw-global-value-bold">
+        <span class="lw-global-value-bold">
         {{ item.extOrderNo || '-' }}
       </span>
 
-    </div>
+      </div>
 
-    <!-- 客户 -->
-    <div class="lw-global-row">
+      <!-- 客户 -->
+      <div class="lw-global-row">
       <span class="lw-global-title">
-        {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.customer','客户') }}
+        {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.customer', '客户') }}
       </span>
-      <span class="lw-global-value-bold">
+        <span class="lw-global-value-bold">
         {{ (item.customerCode || '-') + ' / ' + (item.customerName || '-') }}
       </span>
 
-    </div>
+      </div>
 
-    <!-- 装箱数据 -->
-    <div class="lw-global-row">
+      <!-- 装箱数据 -->
+      <div class="lw-global-row">
       <span class="lw-global-title">
-        {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.boxData','装箱数据') }}
+        {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.boxData', '装箱数据') }}
       </span>
-      <span>
+        <span>
         <span class="lw-global-value">
-          {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.skuType','品类') }}
+          {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.skuType', '品类') }}
         </span>
         <span
           style="color: #D50000"
           class="lw-global-value-bold"
         >{{ item.skuTypeCount }}</span>
         <span class="lw-global-value">
-           / {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.qty','数量') }}
+           / {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.qty', '数量') }}
         </span>
         <span
           style="color: #D50000"
           class="lw-global-value-bold"
         >{{ item.skuQty }}</span>
         <span class="lw-global-value">
-           / {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.boxAmount','箱量') }}
+           / {{ $lwLanguage.get('wms_project.pda.outbound.delivery.soAndLpn.boxAmount', '箱量') }}
         </span>
         <span
           style="color: #D50000"
@@ -101,12 +144,15 @@
         >{{ item.boxCount }}</span>
       </span>
 
-    </div>
+      </div>
 
-    <!-- 其他数据 -->
-    <lw-lot-look-module v-if="item.extDataList"
-                        :columns="item.extDataList"
-                        title-key="label" value-key="value"/>
+      <!-- 其他数据 -->
+      <lw-lot-look-module
+        v-if="item.extDataList"
+        :columns="item.extDataList"
+        title-key="label" value-key="value"
+      />
+    </template>
   </div>
 </template>
 
@@ -114,21 +160,22 @@
 
 export default {
   name: "index",
-  props:{
+  props: {
     // 类别 so-按单，lpn-按托盘
-    type:{
+    type: {
       type: String,
       default: 'so'
     },
 
     // 数据
-    item:{
+    item: {
       type: Object,
-      default: ()=>{}
+      default: () => {
+      }
     },
 
     // 数据索引
-    index:{
+    index: {
       type: Number,
       default: 0
     },
@@ -139,7 +186,7 @@ export default {
   },
   methods: {
     // 删除
-    del(){
+    del() {
       const no = this.type === 'so' ? this.item.soNo : this.item.palletNo
       this.$emit('del', no, this.index)
     }

package/src/components/page/outbound/delivery/index/index.js

@@ -1,11 +1,11 @@
-/*
-* 发运起始页
-* @author: 张文
-* @date  2022-06-07
-* */
-
-import lwOutboundDeliveryIndexPage from "./index.vue";
-
-lwOutboundDeliveryIndexPage.install = Vue => Vue.component(lwOutboundDeliveryIndexPage.name, lwOutboundDeliveryIndexPage)
-
-export default lwOutboundDeliveryIndexPage
+/*
+* 发运起始页
+* @author: 张文
+* @date  2022-06-07
+* */
+
+import lwOutboundDeliveryIndexPage from "./index.vue";
+
+lwOutboundDeliveryIndexPage.install = Vue => Vue.component(lwOutboundDeliveryIndexPage.name, lwOutboundDeliveryIndexPage)
+
+export default lwOutboundDeliveryIndexPage

package/src/components/page/outbound/delivery/index/index.vue

@@ -25,12 +25,11 @@
 
             <div class="lw-global-model-box">
               <lw-input
-                :title="$lwLanguage.get('wms_project.pda.outbound.delivery.orderNo','发运单号')"
                 v-model="seo.value"
                 :get-focus.sync="seo.focus"
-                required
-                :placeholder="$lwLanguage.get('wms_project.pda.outbound.delivery.inputOrderNo','发运单/外部发运单/承运商运单/计划运输单')"
+                :placeholder="$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.index.index.pihmxyvh','单号/车牌号/月台/货主/承运搜索')"
                 rule-key="order"
+                :show-bottom-border="false"
                 @confirm="seoConfirm"
               >
                 <template #button>
@@ -51,6 +50,12 @@
               :item="i"
             />
             <lw-not-data v-if="!seo.list.length && seo.showNotData"/>
+            <lw-pagination
+              v-model="seo.pageNum"
+              :page-total="seo.pageTotal"
+              :page-size.sync="seo.pageSize"
+              @change="seoConfirm"
+            />
 
           </van-tab>
 
@@ -60,12 +65,18 @@
           >
             <order-content
               class="lw-global-animation-out"
-              v-for="(i,k) in waitList"
+              v-for="(i,k) in waitDelivery.list"
               :style="{animationDelay: 50 * k + 'ms'}"
               :key="i.deliveryId"
               :item="i"
             />
-            <lw-not-data v-if="!waitList.length"/>
+            <lw-not-data v-if="!waitDelivery.list.length"/>
+            <lw-pagination
+              v-model="waitDelivery.pageNum"
+              :page-total="waitDelivery.pageTotal"
+              :page-size.sync="waitDelivery.pageSize"
+              @change="refreshWait"
+            />
           </van-tab>
         </van-tabs>
 
@@ -77,6 +88,14 @@
       <lw-button @click="addOrder">
         {{ $lwLanguage.get('wms_project.pda.outbound.delivery.newOrder','新建发运单') }}
       </lw-button>
+      <lw-button
+        v-if="tabActive === 'wait'"
+        type="last"
+        plain
+        @click="refreshWait"
+      >
+        {{ $lwLanguage.get('wms_project.pda.outbound.delivery.refresh','刷新未发运') }}
+      </lw-button>
     </lw-bottom-bar>
 
   </div>
@@ -104,18 +123,26 @@ export default {
         showNotData: false,
         value:'',
         focus: true,
-        list:[]
+        list:[],
+        pageSize: 10,
+        pageTotal: 0,
+        pageNum: 1
       },
 
       // 未发运
-      waitList:[]
+      waitDelivery:{
+        list: [],
+        pageSize: 10,
+        pageTotal: 0,
+        pageNum: 1
+      }
     }
   },
   methods: {
     // tab切换
     tabChange(){
-      if (this.tabActive === 'wait' && !this.waitList.length){
-        projectGetWarehouseCanDeliveryData().then(res=>this.waitList=res)
+      if (this.tabActive === 'wait'){
+        this.refreshWait()
       }
     },
 
@@ -126,15 +153,19 @@ export default {
       if (!deliveryNo){
         this.seo.focus = true
         this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.outbound.delivery.inputOrderNo','请输入发运单号/外部发运单号/承运商运单号/计划运输单号')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.delivery.index.index.rzmubgvr','请输入单号/车牌号/月台/货主/承运搜索')
         )
         return
       }
 
       projectQueryDeliveryData({
-        deliveryNo
+        deliveryNo: this.seo.value,
+        pageNum: this.seo.pageNum,
+        pageSizes: this.seo.pageSize,
+        pageTotal: this.seo.pageTotal,
       }).then(res=>{
-        this.seo.list = res || []
+        this.seo.pageTotal = res.total || 0
+        this.seo.list = res.datas || []
         this.seo.showNotData = true
       })
     },
@@ -145,6 +176,26 @@ export default {
         path:'/outbound/delivery/lwAddOrder'
       })
     },
+
+    // 刷新未发运
+    refreshWait(){
+      const dom = document.getElementById('app')
+      dom && dom.scrollIntoView({
+        behavior: "smooth",
+        block:'start',
+      });
+      projectGetWarehouseCanDeliveryData({
+        pageNum: this.waitDelivery.pageNum,
+        pageSizes: this.waitDelivery.pageSize,
+        pageTotal: this.waitDelivery.pageTotal
+      }).then(res=>{
+        this.waitDelivery.list = []
+        this.waitDelivery.pageTotal = res.total || 0
+        this.$nextTick(()=>{
+          this.waitDelivery.list=res.datas || []
+        })
+      })
+    }
   }
 }
 </script>

package/src/components/page/outbound/handover/components/boxInfo.vue

@@ -0,0 +1,51 @@
+<!--
+  捆包箱数据
+  @author: 张文
+  @date: 2022-07-11
+-->
+<template>
+  <div class="lw-global-model-box">
+
+    <lw-sku-info-module
+      :sku-code="boxNo || '-'"
+      :sku-name="$lwLanguage.get('wms_project.pda.components.page.outbound.handover.components.hfitpqcw','捆包箱号')"
+      :qty="qty || 0"
+      :qty-text="$lwLanguage.get('wms_project.pda.components.page.outbound.handover.components.tflhkgzl','商品数')"
+      :is-row-first="showCustomer"
+    />
+
+    <div v-if="showCustomer" class="lw-global-row-end">
+      {{ customerCode || '' }} - {{ customerName || '' }}
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "boxInfo",
+  props:{
+    // 是否显示客户信息
+    showCustomer: Boolean,
+
+    // 客户编码
+    customerCode: String,
+    // 客户名称
+    customerName: String,
+
+    // 箱号
+    boxNo: String,
+    // 数量
+    qty: [String, Number]
+  },
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/components/page/outbound/handover/components/boxNumList.vue

@@ -0,0 +1,158 @@
+<!--
+  捆包箱列表
+  @author: 张文
+  @date: 2022-07-15
+-->
+<template>
+  <div>
+
+    <div class="lw-global-model-box">
+
+      <lw-input
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.handover.components.enxirfzw','捆包箱号')"
+        v-model="search"
+        :show-bottom-border="false"
+        rule-prefix="handover/component/boxList"
+        rule-key="box"
+        @confirm="searchConfirm"
+        @clear="searchClear"
+      >
+
+        <template #button>
+
+          <lw-button
+            mini
+            round
+            @click="searchConfirm"
+          >{{ $lwLanguage.get('wms_project.pda.components.page.outbound.handover.components.eatukaln','搜索') }}</lw-button>
+
+        </template>
+
+      </lw-input>
+
+    </div>
+
+    <div
+      v-if="list.length"
+      class="lw-global-model-box"
+    >
+
+      <div class="lw-global-row-start lw-global-flex-between row">
+
+        <div class="lw-global-title col-1">
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.handover.components.enxirfzw','捆包箱号') }}
+        </div>
+
+        <div class="lw-global-title col-2">
+          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.handover.components.qwfcbdjb','商品数') }}
+        </div>
+
+      </div>
+
+      <div
+        class="lw-global-flex-between lw-global-animation-out lw-global-row row"
+        v-for="(i,k) in list"
+        :key="i.boxNo"
+        :style="{animationDelay: 50 * k + 'ms'}"
+      >
+
+        <div class="col-1">
+          <span class="lw-global-value-bold">{{ i.customerCode }}</span>
+          <span class="lw-global-value">{{ i.boxNo.replace(i.customerCode,'').replace(i.shortBoxNo,'') }}</span>
+          <span class="lw-global-value-bold">{{ i.shortBoxNo }}</span>
+        </div>
+        <div class="lw-global-value-bold-red col-2">
+          {{ i.skuQty || 0 }}
+        </div>
+
+      </div>
+
+      <lw-pages
+        v-model="pageNum"
+        :page-total="pageTotal"
+        :page-size="pageSize"
+        :scroll-top="false"
+        mode="simple"
+        @change="pageChange"
+      />
+
+    </div>
+    <lw-not-data v-else/>
+
+
+  </div>
+</template>
+
+<script>
+
+import {projectWmsOutboundHandoverQueryBoxList} from "../../../../../api/outbound/handover/pageBox";
+
+export default {
+  name: "boxNumList",
+  props:{
+    type:{
+      type: String,
+      default: '100'
+    },
+    query:{
+      type: Object,
+      default: () => {}
+    },
+  },
+  data() {
+    return {
+      search: '',
+      pageSize: 10,
+      pageTotal: 0,
+      pageNum: 1,
+      list: []
+    }
+  },
+  mounted() {
+    this.getData()
+  },
+  methods: {
+    // 获取数据
+    getData(){
+      projectWmsOutboundHandoverQueryBoxList({
+        ...this.query,
+        type: this.type,
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+        boxNo: this.search
+      }).then(res=>{
+        this.pageTotal = res.total
+        this.list = res.datas
+      })
+    },
+
+    // 页面切换
+    pageChange(){
+      this.getData()
+    },
+
+    // 搜索
+    searchConfirm(){
+      this.getData()
+    },
+
+    // 搜索清空
+    searchClear(){
+      this.pageNum = 1
+      this.search = ''
+      this.getData()
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+.col-1{
+  width: 75%;
+}
+.col-2{
+  width: 20%;
+  flex-shrink: 0;
+  text-align: center;
+}
+</style>