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

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

@@ -1,203 +1,203 @@
-<!--
-  按零件上架 - 零件信息
-  @author: 张文
-  @date: 2022-05-25
--->
-<template>
-  <div
-    :style="{
-      borderRadius: topRadius ? '8px 8px 0 0' : 'unset',
-      background:'#fff'
-    }"
-  >
-
-    <div style="padding: 10px">
-      <!-- 零件信息 -->
-      <div class="lw-global-value-bold">{{ item.sku.code }}</div>
-      <div class="lw-global-title">{{ item.sku.name }}</div>
-
-      <!-- 各种标签 -->
-      <div style="margin-top: 5px">
-
-        <!-- 商品频度 -->
-        <lw-tag
-          v-if="item.sku.abcTypeLabel"
-          plain
-          round
-          type="warning"
-        >
-          {{ item.sku.abcTypeLabel }}
-        </lw-tag>
-
-        <!-- 尺寸类型 -->
-        <lw-tag
-          v-if="item.sku.sizeTypeLabel"
-          plain
-          round
-        >
-          {{ item.sku.sizeTypeLabel }}
-        </lw-tag>
-
-        <!-- 质检方式 -->
-        <lw-tag
-          v-if="item.sku.qualityTypeLabel"
-          plain
-          round
-        >
-          {{ item.sku.qualityTypeLabel }}
-        </lw-tag>
-
-        <!-- 快收件 -->
-        <lw-tag
-          v-if="item.sku.isFastReceive"
-          plain
-          round
-        >
-          {{ $lwLanguage.get('wms_project.pda.receive.putaway.fastReceive','快收件') }}
-        </lw-tag>
-
-        <!-- 快移 -->
-        <lw-tag
-          v-if="item.sku.isFastMove"
-          plain
-          round
-        >
-          {{ $lwLanguage.get('wms_project.pda.receive.putaway.fastMove','快移') }}
-        </lw-tag>
-
-        <!-- 打刻件 -->
-        <lw-tag
-          v-if="item.sku.isEngraving"
-          plain
-          round
-        >
-          {{ $lwLanguage.get('wms_project.pda.receive.putaway.engraving','打刻件') }}
-        </lw-tag>
-
-        <!-- 左右件 -->
-        <lw-tag
-          v-if="item.sku.isLeftRight"
-          plain
-          round
-        >
-          {{ $lwLanguage.get('wms_project.pda.receive.putaway.leftRight','左右件') }}
-        </lw-tag>
-
-        <!-- 新品 -->
-        <lw-tag
-          v-if="item.sku.isNew"
-          plain
-          round
-        >
-          {{ $lwLanguage.get('wms_project.pda.receive.putaway.new','新品') }}
-        </lw-tag>
-
-        <!-- 设变号 -->
-        <lw-tag
-          v-if="item.sku.isDesignChangeNum"
-          plain
-          round
-        >
-          {{ $lwLanguage.get('wms_project.pda.receive.putaway.designChangeNum','设变号') }}
-        </lw-tag>
-
-
-      </div>
-
-      <!-- 扩展分组显示字段 -->
-      <div
-        v-if="item.extendGroupFields && item.extendGroupFields.length"
-        class="lw-putaway-com-extend-box"
-      >
-        <div
-          v-for="(i,k) in item.extendGroupFields"
-          :key="k"
-        >
-          <span class="lw-global-title">{{ i.fieldName }}</span>
-          <span class="lw-global-value">{{ i.fieldValue }}</span>
-        </div>
-      </div>
-
-      <!-- 推荐库位 -->
-      <div style="margin-top: 5px">
-      <span class="lw-global-title">
-        {{ $lwLanguage.get('wms_project.pda.receive.putaway.recommend','推荐库位') }}
-      </span>
-        <span class="lw-global-value-bold" style="font-size: 16px">
-        {{ item.toLocationCode }}
-      </span>
-      </div>
-    </div>
-
-    <!-- 看板 -->
-    <lw-data-look-bg :type="lookType">
-
-      <!-- 计划量 -->
-      <div>
-        <div>{{ item.qty || 0 }}</div>
-        <div class="lw-data-look-bg-title">
-          {{ $lwLanguage.get('wms_project.pda.receive.putaway.planQty','计划量') }}
-        </div>
-      </div>
-
-      <!-- 已上架 -->
-      <div>
-        <div>{{ item.paQty || 0 }}</div>
-        <div class="lw-data-look-bg-title">
-          {{ $lwLanguage.get('wms_project.pda.receive.putaway.paQty','已上架') }}
-        </div>
-      </div>
-
-      <!-- 异常 -->
-      <div>
-        <div>{{ item.abnormalQty || 0 }}</div>
-        <div class="lw-data-look-bg-title">
-          {{ $lwLanguage.get('wms_project.pda.receive.putaway.abnQty','异常量') }}
-        </div>
-      </div>
-    </lw-data-look-bg>
-
-
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: "SkuPutawayInfo",
-  props:{
-    // 数据信息
-    item:{
-      type: Object,
-      default: () => {}
-    },
-
-    // 是否显示顶部圆角
-    topRadius:{
-      type: Boolean,
-      default: true
-    },
-
-    // 底部数据看板样式
-    lookType:{
-      type: String,
-      default: 'bottom'
-    },
-  },
-  data() {
-    return {}
-  },
-  methods: {}
-}
-</script>
-
-<style scoped lang="less">
-
-.lw-putaway-com-extend-box{
-  margin-top: 5px;
-  padding: 5px 0;
-  border-top: solid 1px #f0f0f0;
-  border-bottom:solid 1px #f0f0f0;
-}
-
-</style>
+<!--
+  按商品上架 - 商品信息
+  @author: 张文
+  @date: 2022-05-25
+-->
+<template>
+  <div
+    :style="{
+      borderRadius: topRadius ? '8px 8px 0 0' : 'unset',
+      background:'#fff'
+    }"
+  >
+
+    <div style="padding: 10px">
+      <!-- 商品信息 -->
+      <div class="lw-global-value-bold">{{ item.sku.code }}</div>
+      <div class="lw-global-title">{{ item.sku.name }}</div>
+
+      <!-- 各种标签 -->
+      <div style="margin-top: 5px">
+
+        <!-- 商品频度 -->
+        <lw-tag
+          v-if="item.sku.abcTypeLabel"
+          plain
+          round
+          type="warning"
+        >
+          {{ item.sku.abcTypeLabel }}
+        </lw-tag>
+
+        <!-- 尺寸类型 -->
+        <lw-tag
+          v-if="item.sku.sizeTypeLabel"
+          plain
+          round
+        >
+          {{ item.sku.sizeTypeLabel }}
+        </lw-tag>
+
+        <!-- 质检方式 -->
+        <lw-tag
+          v-if="item.sku.qualityTypeLabel"
+          plain
+          round
+        >
+          {{ item.sku.qualityTypeLabel }}
+        </lw-tag>
+
+        <!-- 快收件 -->
+        <lw-tag
+          v-if="item.sku.isFastReceive"
+          plain
+          round
+        >
+          {{ $lwLanguage.get('wms_project.pda.receive.putaway.fastReceive','快收件') }}
+        </lw-tag>
+
+        <!-- 快移 -->
+        <lw-tag
+          v-if="item.sku.isFastMove"
+          plain
+          round
+        >
+          {{ $lwLanguage.get('wms_project.pda.receive.putaway.fastMove','快移') }}
+        </lw-tag>
+
+        <!-- 打刻件 -->
+        <lw-tag
+          v-if="item.sku.isEngraving"
+          plain
+          round
+        >
+          {{ $lwLanguage.get('wms_project.pda.receive.putaway.engraving','打刻件') }}
+        </lw-tag>
+
+        <!-- 左右件 -->
+        <lw-tag
+          v-if="item.sku.isLeftRight"
+          plain
+          round
+        >
+          {{ $lwLanguage.get('wms_project.pda.receive.putaway.leftRight','左右件') }}
+        </lw-tag>
+
+        <!-- 新品 -->
+        <lw-tag
+          v-if="item.sku.isNew"
+          plain
+          round
+        >
+          {{ $lwLanguage.get('wms_project.pda.receive.putaway.new','新品') }}
+        </lw-tag>
+
+        <!-- 设变号 -->
+        <lw-tag
+          v-if="item.sku.isDesignChangeNum"
+          plain
+          round
+        >
+          {{ $lwLanguage.get('wms_project.pda.receive.putaway.designChangeNum','设变号') }}
+        </lw-tag>
+
+
+      </div>
+
+      <!-- 扩展分组显示字段 -->
+      <div
+        v-if="item.extendGroupFields && item.extendGroupFields.length"
+        class="lw-putaway-com-extend-box"
+      >
+        <div
+          v-for="(i,k) in item.extendGroupFields"
+          :key="k"
+        >
+          <span class="lw-global-title">{{ i.fieldName }}</span>
+          <span class="lw-global-value">{{ i.fieldValue }}</span>
+        </div>
+      </div>
+
+      <!-- 推荐库位 -->
+      <div style="margin-top: 5px">
+      <span class="lw-global-title">
+        {{ $lwLanguage.get('wms_project.pda.receive.putaway.recommend','推荐库位') }}
+      </span>
+        <span class="lw-global-value-bold" style="font-size: 16px">
+        {{ item.toLocationCode }}
+      </span>
+      </div>
+    </div>
+
+    <!-- 看板 -->
+    <lw-data-look-bg :type="lookType">
+
+      <!-- 计划量 -->
+      <div>
+        <div>{{ item.qty || 0 }}</div>
+        <div>
+          {{ $lwLanguage.get('wms_project.pda.receive.putaway.planQty','计划量') }}
+        </div>
+      </div>
+
+      <!-- 已上架 -->
+      <div>
+        <div>{{ item.paQty || 0 }}</div>
+        <div>
+          {{ $lwLanguage.get('wms_project.pda.receive.putaway.paQty','已上架') }}
+        </div>
+      </div>
+
+      <!-- 异常 -->
+      <div>
+        <div>{{ item.abnormalQty || 0 }}</div>
+        <div>
+          {{ $lwLanguage.get('wms_project.pda.receive.putaway.abnQty','异常量') }}
+        </div>
+      </div>
+    </lw-data-look-bg>
+
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "SkuPutawayInfo",
+  props:{
+    // 数据信息
+    item:{
+      type: Object,
+      default: () => {}
+    },
+
+    // 是否显示顶部圆角
+    topRadius:{
+      type: Boolean,
+      default: true
+    },
+
+    // 底部数据看板样式
+    lookType:{
+      type: String,
+      default: 'bottom'
+    },
+  },
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+.lw-putaway-com-extend-box{
+  margin-top: 5px;
+  padding: 5px 0;
+  border-top: solid 1px #f0f0f0;
+  border-bottom:solid 1px #f0f0f0;
+}
+
+</style>

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

@@ -16,14 +16,15 @@
 
           <!-- 托盘号、是否整托 -->
           <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
+              style="flex-shrink: 0"
               v-if="item.wholeLpnPutaway"
               plain
               round
@@ -33,7 +34,17 @@
             </lw-tag>
 
             <lw-tag
-              v-else
+              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"
@@ -55,7 +66,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 +76,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 +94,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"
@@ -105,7 +128,7 @@
         round
         @click="del"
       >
-        {{ $lwLanguage.get('wms_project.pda.receive.putaway.del','删除') }}
+        {{ $lwLanguage.get('wms_project.pda.receive.putaway.del','移出') }}
       </lw-button>
 
       <!-- 补打标签按钮 -->
@@ -124,6 +147,8 @@
 <script>
 
 import SkuInfo from './../SkuInfo/index.vue'
+import CaseInfo from './../CaseInfo/index.vue'
+
 import {
   wmsMobilePrintPutawayLabel
 } from "../../../../../../api/receive/putaway";
@@ -131,10 +156,10 @@ import {
 export default {
   name: "TaskInfo",
   components:{
-    SkuInfo
+    SkuInfo,CaseInfo
   },
   props:{
-    // 零件数据
+    // 商品数据
     item:{
       type: Object,
       default: () => {}
@@ -152,7 +177,7 @@ export default {
       default: true
     },
 
-    // 是否显示零件异常上报按钮
+    // 是否显示商品异常上报按钮
     showSkuAbnormal:{
       type: Boolean,
       default: true
@@ -172,9 +197,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>