@logwire/logwire-wms-pda-ui 3.5.3 → 3.5.5-wat.1

package/src/views/wms/module/ReceiveAbnormal/index.vue

@@ -436,7 +436,7 @@
         />
 
         <!-- 图片 -->
-        <div class="lw-global-title" style="padding: 8px 0">
+        <div class="lw-global-title" style="padding: 8px 0" :class="mustUploadImg ? 'lw-global-title lw-global-required' : 'lw-global-title' ">
           {{ $lwLanguage.get('wms_project.pda.module.receiveAbn.img','图片') }}
         </div>
         <lw-img-upload v-model="skuInfo.imagesArr"/>
@@ -576,6 +576,10 @@ export default {
 
     // 商品的分组key
     groupKey: String,
+    mustUploadImg: {
+      type: Boolean,
+      default: false,
+    }
   },
   data() {
     return {
@@ -711,6 +715,8 @@ export default {
     }
   },
   mounted() {
+    this.mustUploadImg = this.$lwWarehouseConfig.get('systemConfig.WAREHOUSE_SUBMIT_ABNORMAL_MUST_UPLOAD_IMAGE') === 'true'
+
     this.init()
   },
   methods: {
@@ -1049,6 +1055,15 @@ export default {
         return false
       }
 
+      if (this.mustUploadImg) {
+        if (!this.skuInfo.imagesArr || this.skuInfo.imagesArr.length <= 0){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('wms_project.pda.module.inboundAbn.abnImgArrNull','异常图片不能为空')
+          )
+          return false
+        }
+      }
+
       return true
     },
 

package/src/views/wms/module/ScanDataList/index.vue

@@ -295,7 +295,10 @@ export default {
         message: this.$lwLanguage.get('wms_project.pda.components.module.ScanDataList.msnpyznm', '确认删除:') + sn,
       }).then(() => {
         const item = this.scanList.splice(index, 1)
-        this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.module.ScanDataList.olgsxjea', '删除成功'))
+        this.$lwToast.success({
+          message: this.$lwLanguage.get('wms_project.pda.components.module.ScanDataList.olgsxjea', '删除成功'),
+          forbidClick: false
+        })
         this.$emit('del', item[0])
       }).catch(() => {
       })

package/src/views/wms/page/count/inv/action/index.vue

@@ -494,7 +494,6 @@ import {
 import CountBoard from '../../components/CountBoard.vue'
 import RandomCount from '../../components/RandomCount.vue'
 import waitSubmitSkuItemCollapse from './../components/waitSubmitSkuItemCollapse.vue'
-import stringRandom from "string-random";
 
 export default {
   name: 'lwCountInvActionPage',
@@ -1036,7 +1035,7 @@ export default {
           return {
             ...item,
             countQty: getCountQty(item.systemQty, item.countQty),
-            _time: stringRandom(10, {numbers: true}) + Date.now(),
+            _time: this.$lwStringRandom(10, {numbers: true, letters: true}) + Date.now(),
           }
         })
 

package/src/views/wms/page/inner/check/action/action.vue

@@ -309,7 +309,10 @@
         :rows="4"
       />
 
-
+      <!-- 图片 -->
+      <div class="lw-global-title" style="padding: 8px 0" :class="mustUploadImg ? 'lw-global-title lw-global-required' : 'lw-global-title' ">
+        {{ $lwLanguage.get('wms_project.pda.module.inboundAbn.img','图片') }}
+      </div>
       <lw-img-upload v-model="addAbnormalFrom.abnormalImage" />
 
       <template #button>
@@ -396,6 +399,10 @@ export default {
         remark: false,
       },
       requireLpn: false,
+      mustUploadImg: {
+        type: Boolean,
+        default: false,
+      }
     }
   },
   computed: {
@@ -405,6 +412,8 @@ export default {
     }
   },
   mounted() {
+    this.mustUploadImg = this.$lwWarehouseConfig.get('systemConfig.WAREHOUSE_SUBMIT_ABNORMAL_MUST_UPLOAD_IMAGE') === 'true'
+
     this.$lwApi.warehouse.getList().then(res => {
       this.warehouseList = res
     })
@@ -572,7 +581,14 @@ export default {
         }
       }
 
-
+      if (this.mustUploadImg) {
+        if (!this.addAbnormalFrom.abnormalImage || this.addAbnormalFrom.abnormalImage.length <= 0){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('wms_project.pda.module.inboundAbn.abnImgArrNull','异常图片不能为空')
+          )
+          return false
+        }
+      }
 
       return true;
 

package/src/views/wms/page/inner/lotTransfer/action.vue

@@ -66,7 +66,7 @@
                 <lw-button
                   mini
                   :disabled="!i.canTransferQty || i.canTransferQty !== i.qty"
-                  @click="transferBtnClick('lpn',i)"
+                  @click="transferWholeBtnClick('lpn',i)"
                 >
                   {{ $lwLanguage.get('wms_project.pda.wms.page.inner.lotTransfer.action.snoiaxrn', '转移') }}
                 </lw-button>
@@ -144,7 +144,7 @@
                 <lw-button
                   mini
                   :disabled="!i.canTransferQty || i.canTransferQty !== i.qty"
-                  @click="transferBtnClick('box',i)"
+                  @click="transferWholeBtnClick('box',i)"
                 >
                   {{ $lwLanguage.get('wms_project.pda.wms.page.inner.lotTransfer.action.snoiaxrn', '转移') }}
                 </lw-button>
@@ -297,11 +297,18 @@
 
       <template v-if="lotPopup.showModel">
 
-        <lot-item
-          class="lw-global-model-box"
-          :item="lotPopup.data"
-        />
-
+        <template v-if="lotPopup.type==='sku'">
+          <lot-item
+            class="lw-global-model-box"
+            :item="lotPopup.data"
+          />
+        </template>
+        <template v-else>
+          <wholeLotItem
+            class="lw-global-model-box"
+            :item="lotPopup.data"
+          />
+        </template>
         <div class="lw-global-model-box lw-global-model-box-3px">
           <!-- 零散转移 -->
           <template v-if="lotPopup.type==='sku'">
@@ -419,6 +426,7 @@
 <script>
 
 import lotItem from "./components/lotItem.vue";
+import wholeLotItem from "./components/wholeLotItem.vue";
 import {
   projectWmsInnerLotTransferSubmit,
   wmsInnerLotTransferQueryCase,
@@ -427,6 +435,7 @@ import {
   wmsInnerQueryInventoryList,
   wmsMobileInboundNewReceiveLpn,
   wmsMobileInnerLotTransferGetLotDetail,
+  wmsMobileInnerLotTransferGetWholeContainerDetail,
   wmsMobileInnerLotTransferQuerySn,
   wmsMobileInnerLotTransferSubmitBySku,
   wmsMobileInnerLotTransferSubmitBySn
@@ -435,7 +444,8 @@ import {
 export default {
   name: "lwInnerLotTransferAction",
   components: {
-    lotItem
+    lotItem,
+    wholeLotItem
   },
   data() {
     return {
@@ -680,6 +690,24 @@ export default {
       })
     },
 
+    transferWholeBtnClick(type, item) {
+      const {lpn, caseNum} = item
+      let queryType = type==='lpn'?'lpn':'case_num';
+      this.lotPopup.param = {
+        skuId: this.$route.query.skuId,
+        locationId: this.$route.query.locationId,
+        ownerId: this.skuInfo.ownerId,
+        lpn,
+        caseNum,
+        queryType
+      }
+      this.lotPopup.type = type
+      wmsMobileInnerLotTransferGetWholeContainerDetail(this.lotPopup.param).then(res => {
+        this.lotPopup.data = res
+        this.lotPopup.show = true
+      })
+    },
+
     // 转移弹框 - 打开
     lotPopupOpen() {
       this.lotPopup.moveLoc = this.$lwWarehouseConfig.get('systemConfig.WMS_INNER_INVENTORY_TRANSFER_SUPPORT_MOVE') === 'true'

package/src/views/wms/page/inner/lotTransfer/components/wholeLotItem.vue

@@ -0,0 +1,67 @@
+<!--
+  批次项
+  @author: 张文
+  @date: 2023-08-25
+-->
+<template>
+  <div>
+    <lw-label-value-group
+      :list="item.contentList"
+      :show-end-row-style="false"
+    />
+
+    <div
+      v-if="nowShowLotInfo.displayLot.items && nowShowLotInfo.displayLot.items.length"
+      class="lw-global-row-end"
+    >
+      <lw-title-value-cell
+        title="批次"
+        :value="nowShowLotInfo.lotNo"
+        val-bold
+        val-red
+      />
+      <lw-lot-look-module
+        :columns="nowShowLotInfo.displayLot.items"
+        :show-row="false"
+      />
+    </div>
+
+    <!-- 切换按钮 -->
+    <lw-cut-card
+      v-model="actionIndex"
+      :length="item.lotLines.length"
+    />
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "wholeLotItem",
+  props: {
+    item: {
+      type: Object,
+      default: () => {
+      }
+    }
+  },
+  data() {
+    return {
+      // 当前操作的数据索引
+      actionIndex: 0,
+    }
+  },
+  computed: {
+    nowShowLotInfo() {
+      console.log(this.item)
+      return this.item.lotLines[this.actionIndex] || {}
+    }
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/wms/page/inner/lpnCount/action.vue

@@ -546,7 +546,7 @@
     >
 
       <div
-        style="text-align: center;font-size: 16px;padding: 20px 0"
+        style="text-align: center;font-size: 1.14rem;padding: 20px 0"
         class="lw-global-value-bold-red"
       >
         {{