@logwire/logwire-wms-pda-ui 3.5.0 → 3.5.3

package/src/views/wms/page/inner/lpnMove/action/index.vue

@@ -37,63 +37,51 @@
       <div class="lw-global-model-box">
 
         <!-- 商品信息 -->
-        <div
-          class="lw-global-flex-between lw-global-bottom-border lw-lpn-move-row"
-          style="align-items: flex-start"
+        <lw-sku-info-module
+          :sku-name="nowShowSkuInfo.skuName"
+          :sku-code="nowShowSkuInfo.skuCode"
+          :show-right="nowShowSkuInfo.skuSizeTypeLabel"
+          is-row-first
         >
 
-          <div class="lw-global-text-overflow" style="flex: 1">
-            <div class="lw-global-value">{{ actionData.taskLines[actionIndex].skuCode }}</div>
-            <div class="lw-global-title">{{ actionData.taskLines[actionIndex].skuName }}</div>
-          </div>
-
           <lw-tag
-            v-if="actionData.taskLines[actionIndex].skuSizeTypeLabel"
+            v-if="nowShowSkuInfo.skuSizeTypeLabel"
             style="flex-shrink: 0"
             round
             plain
-          >{{ actionData.taskLines[actionIndex].skuSizeTypeLabel }}</lw-tag>
-
-        </div>
+          >
+            {{ nowShowSkuInfo.skuSizeTypeLabel }}
+          </lw-tag>
+        </lw-sku-info-module>
 
 
         <!-- 库存信息 -->
-        <div class="lw-global-flex-between lw-global-bottom-border lw-lpn-move-row">
-
-          <div>
-            <span class="lw-global-title">
-              {{ $lwLanguage.get('wms_project.pda.inbound.lpnMoveAction.all','总库存量') }}
-            </span>
-            <span class="lw-global-value lw-lpn-move-font-bold">{{
-                actionData.taskLines[actionIndex].invQtyLabel
-              }}</span>
-          </div>
-
-          <div>
-            <span class="lw-global-title">
-              {{ $lwLanguage.get('wms_project.pda.inbound.lpnMoveAction.has','可用库存量') }}
-            </span>
-            <span
-              class="lw-global-value lw-lpn-move-font-bold"
-              style="color: #D50000"
-            >{{ actionData.taskLines[actionIndex].availInvQtyLabel }}</span>
-          </div>
+        <div class="lw-global-flex-between lw-global-row">
+
+          <lw-title-value-cell
+            :title="$lwLanguage.get('wms_project.pda.inbound.lpnMoveAction.all', '总库存量')"
+            :value="nowShowSkuInfo.invQtyLabel "
+            val-bold
+            :is-row="false"
+          />
+
+          <lw-title-value-cell
+            :title="$lwLanguage.get('wms_project.pda.inbound.lpnMoveAction.has', '可用库存量')"
+            :value="nowShowSkuInfo.availInvQtyLabel "
+            val-bold
+            val-red
+            :is-row="false"
+          />
 
         </div>
 
 
         <!-- 货主 -->
-        <div
-          class="lw-global-bottom-border lw-lpn-move-row"
-          style="margin-bottom: 0"
-        >
-          <span class="lw-global-title">
-            {{ $lwLanguage.get('wms_project.pda.inbound.lpnMoveAction.owner', '货主') }}
-          </span>
-          <span class="lw-global-value lw-lpn-move-font-bold">
-            {{ actionData.taskLines[actionIndex].ownerCode }} - {{ actionData.taskLines[actionIndex].ownerName }}
-          </span>
-        </div>
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.inbound.lpnMoveAction.owner', '货主')"
+          :value="$lwCheckVal(nowShowSkuInfo.ownerCode) + ' / ' +$lwCheckVal(nowShowSkuInfo.ownerName)"
+          val-bold
+        />
 
 
         <!-- 切换按钮 -->
@@ -105,12 +93,13 @@
       </div>
 
       <!-- 批次属性 -->
-      <div class="lw-global-model-box">
-        <lw-lot-look-module :columns="actionData.taskLines[actionIndex].lotAttributeData.items"/>
-      </div>
+      <lw-lot-look-module
+        class="lw-global-model-box"
+        :columns="nowShowSkuInfo.lotAttributeData.items"
+      />
 
 
-      <div class="lw-global-model-box">
+      <div class="lw-global-model-box lw-global-model-box-3px">
         <!-- 目标托盘 -->
         <lw-input
           :title="$lwLanguage.get('wms_project.pda.inbound.lpnMoveAction.toLpn','目标托盘')"
@@ -129,6 +118,7 @@
           required
           rule-key="location"
           :create-rule="$lwScanRule.create('随机移动整托盘-执行页-目标托盘','LOCATION')"
+          :show-bottom-border="false"
           @confirm="actionLpnMove"
         />
       </div>
@@ -153,30 +143,35 @@ export default {
   data() {
     return {
       // 库位
-      local:'',
+      local: '',
       // 托盘号
-      lpn:'',
+      lpn: '',
 
       // 后端返回的集合
-      actionData:{
-        taskLines:[]
+      actionData: {
+        taskLines: []
       },
       // 当前操作的数据索引
       actionIndex: 0,
 
       // 目标托盘
-      actionLpn:{
-        value:'',
-        focus: true
+      actionLpn: {
+        value: '',
+        focus: false
       },
 
       // 目标库位
-      actionLocal:{
-        value:'',
+      actionLocal: {
+        value: '',
         focus: true
       },
     }
   },
+  computed: {
+    nowShowSkuInfo() {
+      return this.actionData.taskLines[this.actionIndex] || {}
+    }
+  },
   mounted() {
     const {lwLocal, lwLpn} = this.$route.query
     this.local = lwLocal
@@ -185,11 +180,11 @@ export default {
   },
   methods: {
     // 获取数据
-    getData(){
+    getData() {
       wmsRandomMoveGetLpnInfo({
         lpn: this.lpn,
         locationCode: this.local
-      }).then(res=>{
+      }).then(res => {
         this.actionIndex = this.$lwUtils.cutCardIndexCount(this.actionIndex, res[0].taskLines.length)
         this.actionData = res[0]
       })
@@ -228,21 +223,5 @@ export default {
 
 <style scoped lang="less">
 
-@import "./../../../../../../assets/css/var.less";
-
-.lw-lpn-move-row{
-  padding-bottom: 5px;
-  margin-bottom: 5px;
-}
-
-.lw-lpn-move-font-bold{
-  font-weight: bold;
-}
-
-.lw-lpn-move-change-btn{
-  padding: 5px;
-  border-radius: 5px;
-  border: solid 1px @titleColor;
-}
 
 </style>

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

@@ -0,0 +1,183 @@
+<!--
+  整托盘移动上架 - 执行页
+  @author: 张文
+  @date: 2024-07-03
+-->
+<template>
+  <div>
+    <lw-nav-bar :title="$lwLanguage.get('', '整托盘移动上架')"/>
+
+    <lw-page-body-module v-if="Object.keys(lpnInfo).length">
+      <div class="lw-global-model-box">
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('', '托盘号')"
+          :value="lpnInfo.lpn"
+        />
+        <lw-title-value-cell
+          :title="$lwLanguage.get('', '原库位')"
+          :value="lpnInfo.locationCode"
+          :is-row-end="!lpnInfo.toLocationCode"
+        />
+        <lw-title-value-cell
+          v-if="lpnInfo.toLocationCode"
+          :title="$lwLanguage.get('', '目标库位')"
+          :value="lpnInfo.toLocationCode"
+          is-row-end
+        />
+
+      </div>
+
+      <div class="lw-global-model-box">
+
+        <lw-sku-info-module
+          :sku-name="nowShowSkuInfo.skuName"
+          :sku-code="nowShowSkuInfo.skuCode"
+          :show-right="false"
+          is-row-first
+        />
+
+        <div class="lw-global-row lw-global-flex-between">
+          <lw-title-value-cell
+            :title="$lwLanguage.get('', '总库存量')"
+            :value="nowShowSkuInfo.invQtyLabel"
+            :is-row="false"
+            val-bold
+          />
+          <lw-title-value-cell
+            :title="$lwLanguage.get('', '可用库存量')"
+            :value="nowShowSkuInfo.availInvQtyLabel"
+            :is-row="false"
+            val-bold
+            val-red
+          />
+        </div>
+        <lw-title-value-cell
+          :title="$lwLanguage.get('', '货主')"
+          :value="$lwCheckVal(nowShowSkuInfo.ownerCode) + ' / ' +$lwCheckVal(nowShowSkuInfo.ownerName)"
+          val-bold
+        />
+
+
+        <!-- 切换按钮 -->
+        <lw-cut-card
+          v-model="taskIndex"
+          :length="lpnInfo.taskLines.length"
+        />
+
+
+      </div>
+
+      <lw-lot-look-module
+        class="lw-global-model-box"
+        :columns="nowShowSkuInfo.lotAttributeData.items"
+      />
+
+      <div class="lw-global-model-box lw-global-model-box-3px">
+        <!-- 目标托盘 -->
+        <lw-input
+          :title="$lwLanguage.get('','目标托盘')"
+          v-model="actionLpn.value"
+          :get-focus.sync="actionLpn.focus"
+          rule-key="lpn"
+          :create-rule="$lwScanRule.create('整托盘移动上架-执行页-目标托盘','LPN')"
+          @confirm="actionLocal.focus=true"
+        />
+
+        <!-- 目标库位 -->
+        <lw-input
+          :title="$lwLanguage.get('','目标库位')"
+          v-model="actionLocal.value"
+          :get-focus.sync="actionLocal.focus"
+          required
+          rule-key="location"
+          :create-rule="$lwScanRule.create('整托盘移动上架-执行页-目标托盘','LOCATION')"
+          :show-bottom-border="false"
+          @confirm="actionLpnMove"
+        />
+      </div>
+
+    </lw-page-body-module>
+
+    <lw-bottom-bar>
+      <lw-button @click="actionLpnMove">
+        {{ $lwLanguage.get('', '执行整托盘移动') }}
+      </lw-button>
+    </lw-bottom-bar>
+  </div>
+</template>
+
+<script>
+
+import {wmsMobileGetMoveUpTaskByWholeLpn, wmsMobileSubmitMoveUpTaskByWholeLpn} from "../../../api/inner/lpnMovePutaway";
+
+export default {
+  name: "lwInnerLpnMovePutawayAction",
+  data() {
+    return {
+      lpnInfo: {},
+      // 当前任务行的索引
+      taskIndex: 0,
+
+      actionLpn: {
+        value: '',
+        focus: false
+      },
+      actionLocal: {
+        value: '',
+        focus: false
+      },
+    }
+  },
+  computed: {
+    nowShowSkuInfo() {
+      return this.lpnInfo.taskLines[this.taskIndex] || {}
+    }
+  },
+  mounted() {
+    wmsMobileGetMoveUpTaskByWholeLpn({
+      lpn: this.$route.query.lpn
+    }).then(res => {
+      this.lpnInfo = res || {}
+      if (!this.lpnInfo.taskLines || !this.lpnInfo.taskLines.length) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '当前托盘没有查询到明细行')
+        )
+        throw Error()
+      }
+    }).catch(() => history.go(-1))
+  },
+  methods: {
+    actionLpnMove() {
+
+      // 如果为空就取托盘
+      const toLpn = this.actionLpn.value || this.lpnInfo.lpn
+
+      const toLocationCode = this.actionLocal.value
+      if (!toLocationCode) {
+        this.actionLocal.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '目标库位不能为空')
+        )
+        return
+      }
+
+      wmsMobileSubmitMoveUpTaskByWholeLpn({
+        lpn: this.lpnInfo.lpn,
+        toLocationCode,
+        toLpn
+      }).then(() => {
+        this.$lwToast.success(
+          this.$lwLanguage.get('', '操作成功')
+        )
+        history.go(-1)
+      })
+
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/wms/page/inner/lpnMovePutaway/index.vue

@@ -0,0 +1,64 @@
+<!--
+  整托盘移动上架 - 起始页
+  @author: 张文
+  @date: 2024-07-03
+-->
+<template>
+  <div>
+    <lw-nav-bar :title="$lwLanguage.get('', '整托盘移动上架')"/>
+
+    <lw-page-body-module>
+
+      <div class="lw-global-model-box-3px lw-global-model-box">
+        <lw-input
+          :title="$lwLanguage.get('', '托盘号')"
+          v-model="lpn.value"
+          :get-focus.sync="lpn.focus"
+          rule-key="lpn"
+          :create-rule="$lwScanRule.create('整托盘移动上架-起始页-托盘号','LPN')"
+          :show-bottom-border="false"
+          @confirm="lpnConfirm"
+        />
+      </div>
+
+    </lw-page-body-module>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "lwInnerLpnMovePutawayIndex",
+  data() {
+    return {
+      lpn: {
+        value: '',
+        focus: true
+      }
+    }
+  },
+  methods: {
+    // 托盘号确认
+    lpnConfirm() {
+      const lpn = this.lpn.value
+
+      if (!lpn) {
+        this.lpn.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '托盘号不能为空')
+        )
+        return
+      }
+
+      this.$router.push({
+        path: '/inner/lpnMovePutaway/lwAction',
+        query: {lpn}
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/wms/page/inner/materialApply/action/index.vue

@@ -14,11 +14,11 @@
       <div class="lw-global-model-top-radius">
 
         <div class="lw-global-flex-between">
-          <div style="font-size: 12px;font-weight: bold;">{{ applyData.taskNo }}</div>
-          <div style="font-size: 12px">{{ $lwDate.format(applyData.startTime, 'MM-dd hh:mm') }}</div>
+          <div style="font-size: 0.85rem;font-weight: bold;">{{ applyData.taskNo }}</div>
+          <div style="font-size: 0.85rem">{{ $lwDate.format(applyData.startTime, 'MM-dd hh:mm') }}</div>
         </div>
 
-        <div style="font-size: 12px">
+        <div style="font-size: 0.85rem">
           {{ $lwLanguage.get('wms_project.pda.common.task.formerly', '已过') }}
           <span class="lw-global-title">
                 {{ $lwDate.timeToStr({l: applyData.startTime, minType: 'min'}).text }}
@@ -312,8 +312,8 @@ export default {
     diffCompleteTask() {
       this.$lwDialog.confirm({
         type: 'warning',
-        title: this.$lwLanguage.get('', '提示'),
-        message: this.$lwLanguage.get('', '确定要差异完成？')
+        title: this.$lwLanguage.get('wms_project.pda.wms.page.inner.materialApply.action.index.qgfnlbwy', '提示'),
+        message: this.$lwLanguage.get('wms_project.pda.wms.page.inner.materialApply.action.index.rdmtecpw', '确定要差异完成？')
       }).then(() => {
         wmsDiffCompleteApplyTask({
           applyId: this.applyData.applyId,
@@ -359,7 +359,6 @@ export default {
     // 是否有托盘
     hasLpn(){
       let item = this.nowTaskLine
-      console.log(item.lpn && item.lpn !== '')
       return item.lpn && item.lpn !== ''
     },
 

package/src/views/wms/page/inner/materialApply/generate/index.vue

@@ -85,7 +85,7 @@
           style="margin: 10px 0"
           class="lw-global-title"
         >
-          {{ $lwLanguage.get('', '领用列表') }}
+          {{ $lwLanguage.get('wms_project.pda.wms.page.inner.materialApply.generate.index.zmkoxvsi', '领用列表') }}
         </div>
         <div
           class="lw-global-model-box"
@@ -316,7 +316,7 @@ export default {
         if (obj.eaQty) {
           if (obj.eaQty > item.availableQty) {
             this.$lwShowErrorMsg(
-              this.$lwLanguage.get('', '存在领取数量大于库存数量的数据,请检查')
+              this.$lwLanguage.get('wms_project.pda.wms.page.inner.materialApply.generate.index.vfajoczj', '存在领取数量大于库存数量的数据,请检查')
             )
             return
           }

package/src/views/wms/page/inner/movePutAway/index/index.vue

@@ -45,12 +45,14 @@
 
           <!-- 头部 -->
           <div class="lw-global-flex-between lw-global-bottom-border lw-task-page-order-title">
-            <img style="width: 50px;margin-right: 5px" src="../../../../../../assets/img/taskOrder.png" alt="">
+            <img style="width: 50px;margin-right: 5px" src="../../../../../../assets/img/common/taskOrder.png" alt="">
 
             <div style="flex: 1">
               <div style="font-weight: bold;margin-bottom: 5px">{{ i.task.taskNo }}</div>
-              <div style="font-size: 12px">
-                已过 <span class="lw-global-title">{{ $lwDate.timeToStr({l:i.taskReceiveTime || i.taskCreateTime}).text }}</span>
+              <div style="font-size: 0.85rem">
+                已过 <span class="lw-global-title">{{
+                  $lwDate.timeToStr({l: i.taskReceiveTime || i.taskCreateTime}).text
+                }}</span>
               </div>
             </div>
 
@@ -116,14 +118,14 @@
         <!-- 头部 -->
         <div class="lw-global-flex-between lw-global-bottom-border lw-task-page-order-title">
 
-          <img style="width: 50px;margin-right: 5px" src="../../../../../../assets/img/taskOrder.png" alt="">
+          <img style="width: 50px;margin-right: 5px" src="../../../../../../assets/img/common/taskOrder.png" alt="">
 
           <div style="flex: 1">
             <div style="font-weight: bold;margin-bottom: 5px">{{ taskPopup.data.task.taskNo }}</div>
-            <div style="font-size: 12px">
+            <div style="font-size: 0.85rem">
               {{ $lwLanguage.get('wms_project.pda.common.task.formerly', '已过') }}
               <span class="lw-global-title">
-                {{ $lwDate.timeToStr({l:taskPopup.data.taskReceiveTime || taskPopup.data.taskCreateTime}).text }}
+                {{ $lwDate.timeToStr({l: taskPopup.data.taskReceiveTime || taskPopup.data.taskCreateTime}).text }}
               </span>
             </div>
           </div>
@@ -327,8 +329,8 @@ export default {
   height: 70%;
 }
 
-.lw-task-page-look-item-title{
-  font-size: 14px;
+.lw-task-page-look-item-title {
+  font-size: 1rem;
 }
 
 .lw-task-page-look-line{
@@ -340,14 +342,14 @@ export default {
 }
 
 
-.lw-task-page-order-title{
-  font-size: 14px;
+.lw-task-page-order-title {
+  font-size: 1rem;
 }
 .lw-task-page-order-body{
   padding: 10px 0;
 }
-.lw-task-page-order-end{
-  font-size: 12px;
+.lw-task-page-order-end {
+  font-size: 0.85rem;
   font-weight: bold;
   padding-top: 10px;
   border-top: 1px solid #F0F0F0;