@logwire/logwire-wms-pda-ui 1.1.19 → 3.1.0

package/src/components/page/receive/putaway/components/TaskInfo/index.vue

@@ -16,30 +16,55 @@
 
           <!-- 托盘号、是否整托 -->
           <div class="lw-global-flex-between">
-            <div>
-            <span class="lw-global-title">
-              {{ $lwLanguage.get('wms_project.pda.inbound.LpnItem.lpn','托盘号') }}
-            </span>
+            <div style="flex: 1">
+              <span class="lw-global-title">
+                {{ $lwLanguage.get('wms_project.pda.inbound.LpnItem.lpn','托盘号') }}
+              </span>
               <span class="lw-global-value-bold">{{ item.lpn || '-' }}</span>
             </div>
 
-            <lw-tag
-              v-if="item.wholeLpnPutaway"
-              plain
-              round
-              type="success"
-            >
-              {{ $lwLanguage.get('wms_project.pda.receive.putaway.allLpn','整托') }}
-            </lw-tag>
-
-            <lw-tag
-              v-else
-              plain
-              round
-              type="warning"
-            >
-              {{ $lwLanguage.get('wms_project.pda.receive.putaway.scattered','零散') }}
-            </lw-tag>
+            <div>
+              <lw-tag
+                style="flex-shrink: 0"
+                v-if="item.wholeLpnPutaway"
+                plain
+                round
+                type="success"
+              >
+                {{ $lwLanguage.get('wms_project.pda.receive.putaway.allLpn','整托') }}
+              </lw-tag>
+
+              <lw-tag
+                style="flex-shrink: 0"
+                v-if="item.wholeCasePutaway"
+                plain
+                round
+                type="success"
+              >
+                {{ $lwLanguage.get('wms_project.pda.receive.putaway.allCase','整箱') }}
+              </lw-tag>
+
+              <lw-tag
+                v-if="!item.wholeLpnPutaway && !item.wholeCasePutaway"
+                plain
+                round
+                type="warning"
+              >
+                {{ $lwLanguage.get('wms_project.pda.receive.putaway.scattered','零散') }}
+              </lw-tag>
+
+              <lw-tag
+                v-for="ini in item.tagList"
+                :key="ini"
+                color="red"
+                plain
+                round
+              >
+                {{ ini }}
+              </lw-tag>
+            </div>
+
+
           </div>
 
           <!-- 原库位、目标库区 -->
@@ -55,7 +80,7 @@
             </div>
             <div>
               <span class="lw-global-title">
-                {{ $lwLanguage.get('wms_project.pda.inbound.LpnItem.new','目标库区') }}
+                {{ $lwLanguage.get('wms_project.pda.inbound.LpnItem.toZone','目标库区') }}
               </span>
               <span class="lw-global-value-bold">{{ item.toZoneCode }}</span>
             </div>
@@ -65,9 +90,13 @@
           <div class="lw-global-flex-between">
             <div>
               <span class="lw-global-title">
-                {{ $lwLanguage.get('wms_project.pda.inbound.LpnItem.num','数量') }}
+                {{ $lwLanguage.get('wms_project.pda.receive.putaway.allqty.and.paqty','总数量/待上架') }}
+              </span>
+              <span class="lw-global-value-bold">
+                <span>{{ item.qty }}</span>
+                /
+                <span style="color: #D50000">{{ item.canPaQty }}</span>
               </span>
-              <span class="lw-global-value-bold">{{ item.qty }}</span>
             </div>
             <div>
               <span class="lw-global-title">
@@ -79,8 +108,16 @@
 
         </template>
 
-        <!-- 零件信息 -->
+        <!-- 商品信息 -->
+        <case-info
+          v-if="item.caseList && item.caseList.length>0"
+          :case-list="item.caseList"
+          :location-code="locationCode"
+          :task-id="item.taskId"
+        />
+
         <sku-info
+          v-else
           :sku-list="item.lines"
           :show-abnormal="showSkuAbnormal"
           :location-code="locationCode"
@@ -92,11 +129,21 @@
       </van-collapse-item>
     </van-collapse>
 
+
+
     <!-- 按钮操作区 -->
     <div
-      v-if="showDel || showPrint"
+      v-if="showConfirmEndTask||showDel || showPrint"
       class="lw-putaway-com-item-btn-box"
     >
+      <lw-button
+        v-if="showConfirmEndTask"
+        mini
+        round
+        @click="$emit('preConfirmEndTask')"
+      >
+        {{ $lwLanguage.get('','结束上架任务') }}
+      </lw-button>
       <!-- 删除按钮 -->
       <lw-button
         v-if="showDel"
@@ -105,7 +152,7 @@
         round
         @click="del"
       >
-        {{ $lwLanguage.get('wms_project.pda.receive.putaway.del','删除') }}
+        {{ $lwLanguage.get('wms_project.pda.receive.putaway.del','移出') }}
       </lw-button>
 
       <!-- 补打标签按钮 -->
@@ -124,6 +171,8 @@
 <script>
 
 import SkuInfo from './../SkuInfo/index.vue'
+import CaseInfo from './../CaseInfo/index.vue'
+
 import {
   wmsMobilePrintPutawayLabel
 } from "../../../../../../api/receive/putaway";
@@ -131,20 +180,25 @@ import {
 export default {
   name: "TaskInfo",
   components:{
-    SkuInfo
+    SkuInfo,CaseInfo
   },
   props:{
-    // 零件数据
+    // 商品数据
     item:{
       type: Object,
       default: () => {}
     },
 
-    // 是否显示删除按钮
-    showDel:{
+    // 是否显示结束任务按钮
+    showConfirmEndTask:{
       type: Boolean,
-      default: true
+      default: false
     },
+    // 是否显示删除按钮
+     showDel:{
+        type: Boolean,
+        default: true
+      },
 
     // 是否显示补打标签按钮
     showPrint:{
@@ -152,7 +206,7 @@ export default {
       default: true
     },
 
-    // 是否显示零件异常上报按钮
+    // 是否显示商品异常上报按钮
     showSkuAbnormal:{
       type: Boolean,
       default: true
@@ -172,9 +226,9 @@ export default {
   methods: {
     // 删除
     del(){
-      this.$dialog.confirm({
+      this.$lwDialog.confirm({
         title: this.$lwLanguage.get('wms_project.pda.receive.putaway.total','提示'),
-        message: this.$lwLanguage.get('wms_project.pda.receive.putaway.confirmDel','确认删除当前数据？')
+        message: this.$lwLanguage.get('wms_project.pda.receive.putaway.confirmDel','确认移出当前上架任务？')
       }).then(()=>{
         this.$emit('del')
       }).catch(()=>{})

package/src/components/page/receive/putaway/components/lpnBatchItem.vue

@@ -0,0 +1,112 @@
+<!--
+  整托盘批量上架数据项
+  @author: 张文
+  @date: 2022-08-05
+-->
+<template>
+  <div
+    class="lw-global-model-box lw-global-collapse-box lw-global-animation-out"
+    :style="{animationDelay: index * 50 + 'ms'}"
+    style="padding: 5px 10px"
+  >
+    <van-collapse
+      v-model="collapseAction"
+      :border="false"
+    >
+      <van-collapse-item name="1">
+
+        <template #title>
+
+          <div class="lw-global-flex-between lw-global-row-start">
+
+            <lw-title-value-cell
+              :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.lpnBatchItem.yqvlvcpl','托盘号')"
+              :value="item.lpn"
+              :is-row="false"
+            />
+
+            <lw-button
+              style="margin-right: 12px;"
+              round
+              mini
+              @click.stop="$emit('del')"
+            >
+              {{ $lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.lpnBatchItem.abehmmoo','移除') }}
+            </lw-button>
+          </div>
+
+          <lw-title-value-cell
+            :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.lpnBatchItem.yeiaxvun','原库位')"
+            :value="item.fromLocationCode"
+          />
+          <lw-title-value-cell
+            :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.lpnBatchItem.eyfuhbkf','目标库位')"
+            :value="item.toLocationCode"
+          />
+
+          <div class="lw-global-flex-between lw-global-row-end">
+            <lw-title-value-cell
+              :title="$lwLanguage.get('wms_project.pda.receive.putaway.allqty.and.paqty','总数量/待上架')"
+              :value="item.qty +'/' + item.canPaQty"
+              :is-row="false"
+            />
+
+            <lw-title-value-cell
+              :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.lpnBatchItem.rasgoskt','行数')"
+              :value="item.lineCount"
+              :is-row="false"
+            />
+          </div>
+
+        </template>
+
+        <!--   箱信息     -->
+        <case-info
+          v-if="item.caseList && item.caseList.length>0"
+          :case-list="item.caseList || []"
+          :task-id="item.taskId"
+        />
+
+        <!-- 商品信息 -->
+        <sku-info
+          v-else
+          :sku-list="item.lines"
+          :show-abnormal="false"
+        />
+
+      </van-collapse-item>
+    </van-collapse>
+  </div>
+</template>
+
+<script>
+import skuInfo from './SkuInfo/index.vue'
+import CaseInfo from './CaseInfo/index.vue'
+
+export default {
+  name: "lpnBatchItem",
+  components:{
+    skuInfo,CaseInfo
+  },
+  props:{
+    index:{
+      type: Number,
+      default: 0
+    },
+    item:{
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      collapseAction:[]
+    }
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/components/page/receive/putaway/components/overPutawayItem.vue

@@ -0,0 +1,119 @@
+<!--
+  已上架列表折叠项
+  @author: 张文
+  @date: 2022-07-18
+-->
+<template>
+  <div
+    class="lw-global-model-box lw-global-collapse-box lw-global-animation-out"
+    :style="{animationDelay: 50 * index + 'ms',padding:'5px 10px'}"
+  >
+    <van-collapse
+      v-model="collapse"
+      :border="false"
+    >
+      <van-collapse-item name="1">
+
+        <template #title>
+
+          <lw-title-value-cell
+            style="padding: 0 0 5px"
+            :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.hpuxweda','上架标签/托盘号')"
+            :value="item.lpn"
+            val-bold
+          />
+
+          <div class="lw-global-row lw-global-flex-between">
+
+            <lw-title-value-cell
+              :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.upkikhvl','原库位')"
+              :value="item.fromLocationCode"
+              val-bold
+              :is-row="false"
+            />
+
+            <lw-title-value-cell
+              :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.ymfsbcri','数量')"
+              :value="item.qty"
+              val-bold
+              :is-row="false"
+            />
+
+            <lw-title-value-cell
+              :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.ypiitxep','行数')"
+              :value="item.lineCount"
+              val-bold
+              :is-row="false"
+            />
+
+          </div>
+
+          <lw-title-value-cell
+            :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.wlbdsnzh','实际库位')"
+            :value="item.toActLocationCode"
+            val-bold
+          />
+
+          <lw-title-value-cell
+            style="padding-top: 5px"
+            :title="$lwLanguage.get('wms_project.pda.components.page.receive.putaway.components.qmbkjada','上架时间')"
+            :value="$lwDate.format(item.time, 'yyyy-MM-dd hh:mm')"
+            val-bold
+            :is-row="false"
+          />
+
+        </template>
+
+        <case-info
+          v-if="item.caseList && item.caseList.length>0"
+          :case-list="item.caseList"
+          :show-pa-qty="false"
+        />
+        <sku-info
+          v-else
+          :sku-list="item.lines"
+          :show-abnormal="false"
+          :has-putaway="true"
+          :show-pa-qty="false"
+        />
+
+      </van-collapse-item>
+    </van-collapse>
+
+  </div>
+</template>
+
+<script>
+import skuInfo from './SkuInfo/index.vue'
+import CaseInfo from './CaseInfo/index.vue'
+
+export default {
+  name: "overPutawayItem",
+  components:{
+    skuInfo,CaseInfo
+  },
+  props:{
+    // 当前索引
+    index:{
+      type: Number,
+      default: 0
+    },
+
+    // 数据
+    item:{
+      type: Object,
+      default: ()=>{}
+    }
+  },
+  data() {
+    return {
+      collapse:[]
+    }
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>