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

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

@@ -0,0 +1,178 @@
+<!--
+   入库上架 - 箱信息
+-->
+<template>
+
+  <div>
+
+    <!-- 折叠框 -->
+    <van-collapse
+      v-model="activeNames"
+      :border="false"
+    >
+
+      <!-- 任务信息 -->
+      <div
+        class="lw-putaway-case-item"
+        v-for="(i,k) in caseList"
+        :key="k"
+      >
+
+        <van-collapse-item>
+          <template #title>
+
+            <!-- 托盘号、是否整托 -->
+            <div class="lw-global-flex-between">
+
+              <div class="lw-global-flex-start">
+                <lw-tag
+                  style="margin-right: 6px;margin-left: 0px;"
+                  :style="{visibility:showScanned && i._scanned?'visible':'hidden'}"
+                  v-if="showScanned"
+                  plain
+                  round
+                  type="success"
+                >
+                  {{ $lwLanguage.get('wms_project.pda.receive.putaway.scanned', '已扫描') }}
+                </lw-tag>
+
+                <div class="lw-global-title lw-global-value-bold">
+                  {{ i.fromCase }}
+                  <span style="color: red;margin-left: 8px;"
+                        v-if="i.hasMixCase">{{ $lwLanguage.get('wms_project.pda.receive.putaway.mix', '混箱') }}</span>
+                </div>
+              </div>
+
+              <div class="lw-global-flex-start">
+                <div class="lw-global-title lw-global-value-bold" style="color: red;">
+                  {{ showPaQty?i.canPaQty:i.qty }}
+                </div>
+
+                <div style="margin: 0px 12px 0px 32px;" v-if="showDel">
+                  <van-icon
+                    name="clear"
+                    color="#d50000"
+                    size="20px"
+                    @click.stop="itemDel(k)"
+                  />
+                </div>
+              </div>
+
+            </div>
+
+          </template>
+
+          <!-- 品种 + 数量 -->
+          <div
+            style="margin: 3px 0 5px"
+            class="lw-global-flex-between"
+          >
+            <lw-title-value-cell
+              :title="$lwLanguage.get('wms_project.pda.receive.putaway.skuCount', '品种数')"
+              :value="i.skuCount"
+              :is-row="false"
+              val-bold
+              val-red
+            />
+            <lw-title-value-cell
+              :title="$lwLanguage.get('wms_project.pda.receive.putaway.qty', '数量')"
+              :value="showPaQty?i.canPaQty:i.qty"
+              :is-row="false"
+              val-bold
+              val-red
+            />
+          </div>
+
+          <sku-info
+            :sku-list="i.lines"
+            :show-abnormal="showSkuAbnormal"
+            :location-code="locationCode"
+            :task-id="taskId"
+            :show-pa-qty="showPaQty"
+            @abnSuccess="$emit('skuAbnSuccess')"
+          />
+
+        </van-collapse-item>
+
+      </div>
+
+    </van-collapse>
+
+  </div>
+
+</template>
+
+<script>
+
+import SkuInfo from './../SkuInfo/index.vue'
+
+export default {
+  name: "CaseInfo",
+  components: {
+    SkuInfo
+  },
+  props: {
+    // 箱数据
+    caseList: {
+      type: Array,
+      default: () => []
+    },
+    // 是否显示已扫描
+    showScanned: {
+      type: Boolean,
+      default: false
+    },
+    // 是否显示删除按钮
+    showDel: {
+      type: Boolean,
+      default: false
+    },
+
+    // 是否显示异常上报按钮
+    showAbnormal: {
+      type: Boolean,
+      default: false
+    },
+    showSkuAbnormal: {
+      type: Boolean,
+      default: false
+    },
+
+    // 库位 - 异常使用
+    locationCode: String,
+    // 任务id
+    taskId: String,
+
+    showPaQty: {
+      type: Boolean,
+      default: true
+    },
+  },
+  data() {
+    return {
+      activeNames: [],
+    }
+  },
+  methods: {
+    itemDel(index) {
+      const item = this.caseList[index]
+      this.$emit('delItem', item)
+    },
+    skuAbnSuccess() {
+      this.$emit('abnSuccess')
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+.lw-putaway-case-item {
+
+  &:last-child {
+    border-bottom: none;
+  }
+
+}
+
+</style>

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

@@ -1,5 +1,5 @@
 <!--
-   入库上架 - 零件信息
+   入库上架 - 商品信息
   @author: 张文
   @date: 2022-05-25
 -->
@@ -9,98 +9,112 @@
 
     <!-- 任务信息 -->
     <div
-      class="lw-global-row lw-putaway-com-sku-info-item"
+      class="lw-putaway-com-sku-info-item"
+      :class="{'lw-global-row':showBorder}"
       v-for="(i,k) in skuList"
       :key="k"
     >
 
-      <!-- 零件基本信息 -->
-      <div class="lw-global-value-bold">{{ i.sku.code }}</div>
-      <div class="lw-global-title">{{ i.sku.name }}</div>
+      <!-- 商品基本信息 -->
+      <lw-sku-info-module
+        :sku-code="i.sku.code"
+        :sku-name="i.sku.name"
+        :show-right="false"
+      />
 
       <!-- 各种标签 -->
       <div style="margin-top: 3px">
 
-        <!-- 商品频度 -->
-        <lw-tag
-          v-if="i.sku.abcTypeLabel"
-          plain
-          round
-          type="warning"
-        >
-          {{ i.sku.abcTypeLabel }}
-        </lw-tag>
-
-        <!-- 尺寸类型 -->
-        <lw-tag
-          v-if="i.sku.sizeTypeLabel"
-          plain
-          round
-        >
-          {{ i.sku.sizeTypeLabel }}
-        </lw-tag>
-
-        <!-- 质检方式 -->
-        <lw-tag
-          v-if="i.sku.qualityTypeLabel"
-          plain
-          round
-        >
-          {{ i.sku.qualityTypeLabel }}
-        </lw-tag>
-
-        <!-- 快收件 -->
+        <template v-if="!i.skuTags.length">
+          <!-- 商品频度 -->
+          <lw-tag
+            v-if="i.sku.abcTypeLabel"
+            plain
+            round
+            type="warning"
+          >
+            {{ i.sku.abcTypeLabel }}
+          </lw-tag>
+
+          <!-- 尺寸类型 -->
+          <lw-tag
+            v-if="i.sku.sizeTypeLabel"
+            plain
+            round
+          >
+            {{ i.sku.sizeTypeLabel }}
+          </lw-tag>
+
+          <!-- 质检方式 -->
+          <lw-tag
+            v-if="i.sku.qualityTypeLabel"
+            plain
+            round
+          >
+            {{ i.sku.qualityTypeLabel }}
+          </lw-tag>
+
+          <!-- 快收件 -->
+          <lw-tag
+            v-if="i.sku.isFastReceive"
+            plain
+            round
+          >
+            {{ $lwLanguage.get('wms_project.pda.receive.putaway.fastReceive','快收件') }}
+          </lw-tag>
+
+          <!-- 快移 -->
+          <lw-tag
+            v-if="i.sku.isFastMove"
+            plain
+            round
+          >
+            {{ $lwLanguage.get('wms_project.pda.receive.putaway.fastMove','快移') }}
+          </lw-tag>
+
+          <!-- 打刻件 -->
+          <lw-tag
+            v-if="i.sku.isEngraving"
+            plain
+            round
+          >
+            {{ $lwLanguage.get('wms_project.pda.receive.putaway.engraving','打刻件') }}
+          </lw-tag>
+
+          <!-- 左右件 -->
+          <lw-tag
+            v-if="i.sku.isLeftRight"
+            plain
+            round
+          >
+            {{ $lwLanguage.get('wms_project.pda.receive.putaway.leftRight','左右件') }}
+          </lw-tag>
+
+          <!-- 新品 -->
+          <lw-tag
+            v-if="i.sku.isNew"
+            plain
+            round
+          >
+            {{ $lwLanguage.get('wms_project.pda.receive.putaway.new','新品') }}
+          </lw-tag>
+
+          <!-- 设变号 -->
+          <lw-tag
+            v-if="i.sku.isDesignChangeNum"
+            plain
+            round
+          >
+            {{ $lwLanguage.get('wms_project.pda.receive.putaway.designChangeNum','设变号') }}
+          </lw-tag>
+        </template>
         <lw-tag
-          v-if="i.sku.isFastReceive"
+          v-for="ini in i.skuTags"
+          :key="ini"
           plain
           round
         >
-          {{ $lwLanguage.get('wms_project.pda.receive.putaway.fastReceive','快收件') }}
-        </lw-tag>
-
-        <!-- 快移 -->
-        <lw-tag
-          v-if="i.sku.isFastMove"
-          plain
-          round
-        >
-          {{ $lwLanguage.get('wms_project.pda.receive.putaway.fastMove','快移') }}
-        </lw-tag>
-
-        <!-- 打刻件 -->
-        <lw-tag
-          v-if="i.sku.isEngraving"
-          plain
-          round
-        >
-          {{ $lwLanguage.get('wms_project.pda.receive.putaway.engraving','打刻件') }}
-        </lw-tag>
-
-        <!-- 左右件 -->
-        <lw-tag
-          v-if="i.sku.isLeftRight"
-          plain
-          round
-        >
-          {{ $lwLanguage.get('wms_project.pda.receive.putaway.leftRight','左右件') }}
-        </lw-tag>
-
-        <!-- 新品 -->
-        <lw-tag
-          v-if="i.sku.isNew"
-          plain
-          round
-        >
-          {{ $lwLanguage.get('wms_project.pda.receive.putaway.new','新品') }}
-        </lw-tag>
-
-        <!-- 设变号 -->
-        <lw-tag
-          v-if="i.sku.isDesignChangeNum"
-          plain
-          round
-        >
-          {{ $lwLanguage.get('wms_project.pda.receive.putaway.designChangeNum','设变号') }}
+          {{ ini }}
         </lw-tag>
 
 
@@ -109,20 +123,35 @@
       <!-- 数量 -->
       <div class="lw-global-flex-between">
 
-        <div>
-          <span class="lw-global-title">
-            {{ $lwLanguage.get('wms_project.pda.receive.putaway.qty', '数量') }}
-          </span>
-          <span
-            class="lw-global-value-bold"
-            style="color: #D50000"
-          >{{ i.qty }}</span>
-        </div>
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.receive.putaway.qty', '数量')"
+          :value="showPaQty?i.canPaQty:i.qty"
+          :is-row="false"
+          val-bold
+          val-red
+        />
+
+        <lw-title-value-cell
+          v-if="hasPutaway"
+          :title="$lwLanguage.get('wms_project.pda.receive.putaway.actToLocal', '实际库位')"
+          :value="i.toActLocationCode"
+          :is-row="false"
+          val-bold
+        />
+
+        <lw-title-value-cell
+          v-else
+          :title="$lwLanguage.get('wms_project.pda.receive.putaway.toLocal', '目标库位')"
+          :value="i.toLocationCode"
+          :is-row="false"
+          val-bold
+        />
 
         <lw-button
           v-if="showAbnormal"
           round
           mini
+          plain
           type="last"
           @click="openAbn(i)"
         >
@@ -168,17 +197,32 @@ import {wmsMobileSubmitPutawayByAbnormal} from "../../../../../../api/receive/pu
 export default {
   name: "SkuInfo",
   props:{
-    // 零件数据
+    // 商品数据
     skuList:{
       type: Array,
       default: () => []
     },
 
+    // 显示分割线
+    showBorder:{
+      type: Boolean,
+      default: true
+    },
+
     // 是否显示异常上报按钮
     showAbnormal:{
       type: Boolean,
       default: true
     },
+    // 是否显示实际库位
+    hasPutaway:{
+      type: Boolean,
+      default: false
+    },
+    showPaQty: {
+      type: Boolean,
+      default: true
+    },
 
     // 库位 - 异常使用
     locationCode: String,