@logwire/logwire-wms-pda-ui 3.3.4 → 3.4.0

package/src/views/wms/page/inbound/unload/components/asnInfo.vue

@@ -0,0 +1,103 @@
+<!--
+  到货通知单数据详情 - 新建卸货单、选择单号
+  @author: 张文
+  @date: 2023-07-20
+-->
+<template>
+  <div
+    class="lw-global-model-box lw-global-row-box"
+    @click="$emit('click')"
+  >
+
+    <div class="lw-global-flex-between">
+      <lw-title-value-cell
+        :title="$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.components.asnInfo.ubasgnun', '到货通知单')"
+        :value="item.asnNo"
+        :is-row="false"
+        val-bold
+      />
+
+      <slot name="asnNoEnd"></slot>
+
+    </div>
+
+    <lw-title-value-cell
+      :title="$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.components.asnInfo.bxpygdkz', '外部单号')"
+      :value="$lwCheckVal(item.extNo)"
+      :is-row="false"
+      val-bold
+    />
+
+    <lw-title-value-cell
+      :title="$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.components.asnInfo.bfgdxciu', '订单类型')"
+      :value="$lwCheckVal(item.typeLabel)"
+      :is-row="false"
+    />
+
+    <lw-title-value-cell
+      :title="$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.components.asnInfo.lxonyykz', '货主')"
+      :value="$lwCheckVal(item.ownerCode,'') + '-' + $lwCheckVal(item.ownerName,'')"
+      :is-row="false"
+    />
+
+    <lw-title-value-cell
+      :title="$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.components.asnInfo.pzoizqpt', '承运商')"
+      :value="$lwCheckVal(item.carrierCode,'') + '-' + $lwCheckVal(item.carrierCode,'')"
+      :is-row="false"
+    />
+
+    <lw-title-value-cell
+      :title="$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.components.asnInfo.loibsinu', '车牌号')"
+      :value="$lwCheckVal(item.carrierPlateNum)"
+      :is-row="false"
+    />
+
+    <lw-title-value-cell
+      :title="$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.components.asnInfo.ssxawtpl', '计划时间')"
+      :value="$lwDate.format(item.planArrivalTime,'yyyy-MM-dd hh:mm')"
+      :is-row="false"
+    />
+
+    <lw-title-value-cell
+      :title="$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.components.asnInfo.hsjayrsd', '预约时间')"
+      :value="$lwDate.format(item.estArrivalTime,'yyyy-MM-dd hh:mm')"
+      :is-row="false"
+    />
+
+    <lw-title-value-cell
+      :title="$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.components.asnInfo.dbqgrtwo', '预约月台')"
+      :value="$lwCheckVal(item.dockCode,'') + '-' + $lwCheckVal(item.dockName,'')"
+      :is-row="false"
+    />
+
+    <lw-title-value-cell
+      :title="$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.components.asnInfo.iodmbwta', '计划')"
+      :value="$lwCheckVal(item.plannedQuantity)"
+      :is-row="false"
+      val-bold
+    />
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "asnInfo",
+  props: {
+    item: {
+      type: Object,
+      default: () => {
+      }
+    }
+  },
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/wms/page/inbound/unload/index/index.vue

@@ -10,6 +10,16 @@
 
     <div class="lw-global-page-box">
 
+      <div class="lw-global-model-box">
+        <lw-user-checkbox-module
+          :title="$lwLanguage.get('wms_project.pda.wms.page.inbound.unload.index.index.ypbgouwo', '卸货人')"
+          v-model="staff.list"
+          :focus.sync="staff.focus"
+          :is-row="false"
+          @change="staffSetLocalStorage"
+        />
+      </div>
+
       <div class="lw-global-model-box">
 
         <lw-input
@@ -24,6 +34,7 @@
             <lw-button
               mini
               round
+              @click="searchConfirm"
             >
               {{$lwLanguage.get('wms_project.pda.components.page.inbound.unload.index.index.rlstnojv','搜索')}}
             </lw-button>
@@ -81,6 +92,7 @@
             v-if="i.plannedQuantity"
             :title="$lwLanguage.get('wms_project.pda.components.page.inbound.unload.index.index.wbexrrtu','计划')"
             :value="i.plannedQuantity"
+            :is-row-end="!i.unloadQuantity"
           />
 
           <lw-title-value-cell
@@ -113,21 +125,26 @@
 <script>
 
 import {wmsMobileUnloadQueryInfo} from "../../../../api/inbound/unload";
+import {uploadMixin} from "./../uploadMixin";
 
 export default {
   name: "lwInboundUnloadIndexPage",
+  mixins: [uploadMixin],
   data() {
     return {
-      search:{
-        value:'',
-        focus:true
+      search: {
+        value: '',
+        focus: true
       },
 
       // 卸货单数据
-      orderList:[]
+      orderList: []
     }
   },
   mounted() {
+
+    this.search.value = this.$route.query.lwSearch || ''
+
     this.searchConfirm()
   },
   methods: {
@@ -153,19 +170,42 @@ export default {
     },
 
     // 卸货单数据被点击
-    orderItemClick(unloadOrderNo){
-      this.$router.push({
-        path:'/inbound/unload/lwAction',
-        query:{
-          unloadOrderNo
-        }
-      })
+    orderItemClick(unloadOrderNo) {
+
+      this.jumpPage('/inbound/unload/lwAction', {unloadOrderNo})
+
     },
 
 
     // 新建卸货单
-    addOrder(){
-      this.$router.push('/inbound/unload/lwAdd')
+    addOrder() {
+      this.jumpPage('/inbound/unload/lwAdd')
+    },
+
+    // 页面跳转
+    jumpPage(path, query) {
+
+      // 获取卸货人，并将数据转换为对象{ code:name }
+      /*const staffObj = {}
+      this.staff.list.forEach(item => staffObj[item.code] = item.name)
+      const staffStr = JSON.stringify(staffObj)
+
+      this.$router.replace({
+        path: '/inbound/unload/lwIndex',
+        query: {
+          lwStaffObj: staffStr,
+          lwSearch: this.search.value,
+          _time: Date.now()
+        }
+      })*/
+
+      this.staffSetLocalStorage()
+      this.$router.push({
+        path,
+        query: {
+          ...query
+        }
+      })
     }
   }
 }

package/src/views/wms/page/inbound/unload/uploadMixin.js

@@ -0,0 +1,36 @@
+/*
+* 卸货混入
+* @author: 张文
+* @date  2023-07-26
+* */
+
+export const uploadMixin = {
+  data() {
+    return {
+      staff: {
+        list: [],
+        focus: false
+      },
+    }
+  },
+  mounted() {
+    const {user, list} = this.$lwLocalStorage.get('lwInboundUploadStaff', {})
+    if (user === this.$lwUserInfo.get().staff.code) this.staff.list = list
+  },
+  methods: {
+    // 储存当前用户进入本地储存
+    staffSetLocalStorage() {
+
+      const staff = {
+        user: this.$lwUserInfo.get().staff.code,
+        list: this.staff.list.map(item => {
+          return {
+            code: item.code,
+            name: item.name
+          }
+        })
+      }
+      this.$lwLocalStorage.set('lwInboundUploadStaff', staff)
+    }
+  }
+}

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

@@ -5,9 +5,12 @@
 -->
 <template>
   <div>
-    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.inbound.randomMove.title','随机移动')"/>
+    <lw-nav-bar
+      :title="$lwLanguage.get('wms_project.pda.inbound.randomMove.title','随机移动')"
+      :click-left="navBack"
+    />
 
-    <div class="lw-global-page-box">
+    <lw-page-body-module>
 
       <lw-tab-box>
 
@@ -52,7 +55,7 @@
       </lw-tab-box>
 
 
-    </div>
+    </lw-page-body-module>
 
     <!-- 下架的底部操作栏 -->
     <lw-bottom-bar v-if="tabActive === 'down' && !isDownInput">
@@ -168,6 +171,21 @@ export default {
     }
   },
   methods: {
+    // 导航栏点击返回
+    navBack() {
+
+      if (this.tabActive === 'down') {
+
+        this.isDownInput ? history.go(-1) : this.downClear()
+
+        return
+      }
+
+      this.isUpInput ? history.go(-1) : this.upClear()
+
+
+    },
+
     // 下架取消
     downClear() {
       this.isDownInput = true

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

@@ -304,8 +304,12 @@
                   </span>
                   <span class="lw-global-value-bold">{{ nowUpData.curLpn }}</span>
                 </div>
-                <lw-button v-if="wholeLpns[nowUpData.curLpn]" mini
-                           @click="wholeLpnUp(nowUpData.curLpn)">整容器上架
+                <lw-button
+                  v-if="wholeLpns[nowUpData.curLpn]"
+                  mini
+                  @click="wholeLpnUp(nowUpData.curLpn)"
+                >
+                  {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.lpnc', '整容器上架') }}
                 </lw-button>
               </div>
 
@@ -1192,6 +1196,7 @@ export default {
       this.downData.input.sku.value = ''
       this.downData.input.num.value = ''
       this.downData.input.lpn.value = ''
+      this.downData.input.downLpn.value = ''
       this.downData.input.snList = []
       this.downData.input.sn = {
         value: '',
@@ -1797,7 +1802,7 @@ export default {
 
       this.downData.input.sn.value = ''
 
-      let moveDownSnCheck = {sn: snkey, qty: snQty, taskId: this.$route.query.lwTaskId};
+      let moveDownSnCheck = {sn: snkey, qty: snQty, taskId: this.$route.query.lwTaskId, skuId: this.nowDownData.skuId};
       innerMoveTaskMoveDownSnCheck(moveDownSnCheck).then(res => {
 
         if (!this.snScanDownCheck(snkey, res.snInvQty)) {
@@ -1838,7 +1843,7 @@ export default {
       let snQty = data.qty;
 
 
-      innerMoveTaskMoveUpSnCheck({sn: snkey, qty: snQty, taskId: this.$route.query.lwTaskId,}).then(res => {
+      innerMoveTaskMoveUpSnCheck({sn: snkey, qty: snQty, taskId: this.$route.query.lwTaskId, skuId: this.nowUpData.skuId}).then(res => {
 
         if (!this.snUpScanCheck(snkey, res.snInvQty)) {
           return;

package/src/views/wms/page/inner/taskMove/whole/MoveTaskWholeIndex.vue

@@ -49,9 +49,14 @@
               <div class="normal-row lw-global-flex-between">
                 <lw-title-value-cell :title="$lwLanguage.get('wms_project.pda.inner.taskMove.whole.jqehfnmk', '托盘号')" :value="lpn.lpn" val-bold :is-row="false" />
                 <div>
-                  <lw-tag plain v-if="lpn.whole">{{$lwLanguage.get('wms_project.pda.inner.taskMove.whole.phevityy', '整托盘')}}</lw-tag>
-                  <lw-tag plain v-if="!lpn.lpn" type="danger">{{$lwLanguage.get('wms_project.pda.inner.taskMove.whole.ozecyhxw', '零散')}}</lw-tag>
-                  <van-icon class="btn-shrink" v-if="lpn.cases?.length" :class="{inverted: !lpn.shrink}" name="arrow-up" @click="lpn.shrink = !lpn.shrink" />
+                  <lw-tag plain v-if="lpn.whole">
+                    {{ $lwLanguage.get('wms_project.pda.inner.taskMove.whole.phevityy', '整托盘') }}
+                  </lw-tag>
+                  <lw-tag plain v-if="!lpn.lpn" type="danger">
+                    {{ $lwLanguage.get('wms_project.pda.inner.taskMove.whole.ozecyhxw', '零散') }}
+                  </lw-tag>
+                  <van-icon class="btn-shrink" v-if="lpn.cases?.length" :class="{inverted: lpn.shrink}" name="arrow-up"
+                            @click="lpn.shrink = !lpn.shrink"/>
                 </div>
               </div>
               <div class="normal-row lw-global-flex-between">
@@ -68,9 +73,12 @@
                   <div class="lw-global-flex-between">
                     <lw-title-value-cell :title="$lwLanguage.get('wms_project.pda.inner.taskMove.whole.oxvtvclc', '箱号')" :value="c.caseNum" val-bold :is-row="false" />
                     <div>
-                      <lw-tag plain v-if="c.whole">{{$lwLanguage.get('wms_project.pda.inner.taskMove.whole.aefwheoc', '整箱')}}</lw-tag>
-                      <lw-tag plain v-if="!c.caseNum" type="danger">{{$lwLanguage.get('零散', '零散')}}</lw-tag>
-                      <van-icon class="btn-shrink" :class="{inverted: !c.shrink}" name="arrow-up" @click="c.shrink = !c.shrink" />
+                      <lw-tag plain v-if="c.whole">
+                        {{ $lwLanguage.get('wms_project.pda.inner.taskMove.whole.aefwheoc', '整箱') }}
+                      </lw-tag>
+                      <lw-tag plain v-if="!c.caseNum" type="danger">{{ $lwLanguage.get('零散', '零散') }}</lw-tag>
+                      <van-icon class="btn-shrink" :class="{inverted: c.shrink}" name="arrow-up"
+                                @click="c.shrink = !c.shrink"/>
                     </div>
                   </div>
                   <div v-if="!c.shrink">
@@ -112,9 +120,10 @@
               <div class="normal-row lw-global-flex-between">
                 <lw-title-value-cell :title="$lwLanguage.get('wms_project.pda.inner.taskMove.whole.jqehfnmk', '托盘号')" :value="lpn.lpn" val-bold :is-row="false" />
                 <div>
-                  <lw-tag plain v-if="lpn.whole">{{$lwLanguage.get('整托盘', '整托盘')}}</lw-tag>
-                  <lw-tag plain v-if="!lpn.lpn" type="danger">{{$lwLanguage.get('零散', '零散')}}</lw-tag>
-                  <van-icon class="btn-shrink" v-if="lpn.cases?.length" :class="{inverted: !lpn.shrink}" name="arrow-up" @click="lpn.shrink = !lpn.shrink" />
+                  <lw-tag plain v-if="lpn.whole">{{ $lwLanguage.get('整托盘', '整托盘') }}</lw-tag>
+                  <lw-tag plain v-if="!lpn.lpn" type="danger">{{ $lwLanguage.get('零散', '零散') }}</lw-tag>
+                  <van-icon class="btn-shrink" v-if="lpn.cases?.length" :class="{inverted: lpn.shrink}" name="arrow-up"
+                            @click="lpn.shrink = !lpn.shrink"/>
                 </div>
               </div>
               <div class="normal-row lw-global-flex-between">
@@ -129,30 +138,42 @@
               <div v-if="lpn.cases?.length && !lpn.shrink" class="box-model">
                 <div class="box-item" v-for="c in lpn.cases" :key="c.caseNum">
                   <div class="lw-global-flex-between">
-                    <lw-title-value-cell :title="$lwLanguage.get('wms_project.pda.inner.taskMove.whole.oxvtvclc', '箱号')" :value="c.caseNum" val-bold :is-row="false" />
+                    <lw-title-value-cell
+                      :title="$lwLanguage.get('wms_project.pda.inner.taskMove.whole.oxvtvclc', '箱号')"
+                      :value="c.caseNum" val-bold :is-row="false"/>
                     <div>
-                      <lw-tag plain v-if="c.whole">{{$lwLanguage.get('整箱', '整箱')}}</lw-tag>
-                      <lw-tag plain v-if="!c.caseNum" type="danger">{{$lwLanguage.get('零散', '零散')}}</lw-tag>
-                      <van-icon class="btn-shrink" :class="{inverted: !c.shrink}" name="arrow-up" @click="c.shrink = !c.shrink" />
+                      <lw-tag plain v-if="c.whole">{{ $lwLanguage.get('整箱', '整箱') }}</lw-tag>
+                      <lw-tag plain v-if="!c.caseNum" type="danger">{{ $lwLanguage.get('零散', '零散') }}</lw-tag>
+                      <van-icon class="btn-shrink" :class="{inverted: c.shrink}" name="arrow-up"
+                                @click="c.shrink = !c.shrink"/>
                     </div>
                   </div>
-                  <div class="box-item-sku" v-for="line in c.lines" :key="line.id">
-                    <!-- 商品信息 -->
-                    <div class="lw-global-row">
-                      <div class="lw-global-flex-between">
-                        <div class="lw-global-value-bold">{{line.skuCode}}</div>
-                        <div>
-                          <lw-tag plain round v-if="line.skuSizeType">{{$lwDict.getDictLabel('size_type_choice', line.skuSizeType)}}</lw-tag>
-                          <lw-tag plain round v-if="line.skuFastReceive">{{$lwLanguage.get('快收', '快收')}}</lw-tag>
+                  <template v-if="!c.shrink">
+                    <div class="box-item-sku" v-for="line in c.lines" :key="line.id">
+                      <!-- 商品信息 -->
+                      <div class="lw-global-row">
+                        <div class="lw-global-flex-between">
+                          <div class="lw-global-value-bold">{{ line.skuCode }}</div>
+                          <div>
+                            <lw-tag plain round v-if="line.skuSizeType">
+                              {{ $lwDict.getDictLabel('size_type_choice', line.skuSizeType) }}
+                            </lw-tag>
+                            <lw-tag plain round v-if="line.skuFastReceive">{{ $lwLanguage.get('快收', '快收') }}
+                            </lw-tag>
+                          </div>
                         </div>
+                        <div class="lw-global-title">{{ line.skuName }}</div>
+                      </div>
+                      <div class="lw-global-flex-between">
+                        <lw-title-value-cell
+                          :title="$lwLanguage.get('wms_project.pda.inner.taskMove.whole.ybpsnqug', '数量')"
+                          :value="line.planQty" val-bold val-red :is-row="false"/>
+                        <lw-title-value-cell
+                          :title="$lwLanguage.get('wms_project.pda.inner.taskMove.whole.evailvnq', '目标库位')"
+                          :value="line.toLocationCode || '-'" val-bold val-red :is-row="false"/>
                       </div>
-                      <div class="lw-global-title">{{line.skuName}}</div>
-                    </div>
-                    <div class="lw-global-flex-between">
-                      <lw-title-value-cell :title="$lwLanguage.get('wms_project.pda.inner.taskMove.whole.ybpsnqug', '数量')" :value="line.planQty" val-bold val-red :is-row="false" />
-                      <lw-title-value-cell :title="$lwLanguage.get('wms_project.pda.inner.taskMove.whole.evailvnq', '目标库位')" :value="line.toLocationCode || '-'" val-bold val-red :is-row="false" />
                     </div>
-                  </div>
+                  </template>
                 </div>
               </div>
               <div class="lw-global-flex-between">
@@ -245,15 +266,21 @@
         </div>
       </div>
       <div class="lw-global-row">
-        <lw-input :title="$lwLanguage.get('wms_project.pda.inner.taskMove.whole.cnalmela', '确认托盘')" required v-model="lpnUp.lpn.value" :get-focus.sync="lpnUp.lpn.focus" />
+        <lw-input :title="$lwLanguage.get('wms_project.pda.inner.taskMove.whole.cnalmela', '确认托盘')" required
+                  v-model="lpnUp.lpn.value" :get-focus.sync="lpnUp.lpn.focus"/>
         <lw-cell style="padding: 0"
-          :title="$lwLanguage.get('wms_project.pda.receive.skuAction.rely','接力上架')"
-          :is-link="false" required>
+                 :title="$lwLanguage.get('wms_project.pda.receive.skuAction.rely','接力上架')"
+                 :is-link="false" required>
           <template #value>
             <van-switch v-model="lpnUp.relay" size="22px"/>
           </template>
         </lw-cell>
-        <lw-input :title="$lwLanguage.get('wms_project.pda.inner.taskMove.whole.evailvnq', '目标库位')" required v-model="lpnUp.loc.value" :get-focus.sync="lpnUp.loc.focus" />
+        <lw-input
+          :title="lpnUp.relay ? $lwLanguage.get('wms_project.pda.inner.taskMove.whole.evailvnqc', '通道库位'):$lwLanguage.get('wms_project.pda.inner.taskMove.whole.evailvnq', '目标库位')"
+          required
+          v-model="lpnUp.loc.value"
+          :get-focus.sync="lpnUp.loc.focus"
+        />
       </div>
       <template #button>
         <lw-button @click="doWholeLpnUp">{{lpnUp.relay ? $lwLanguage.get('wms_project.pda.inner.taskMove.whole.vrhbhphm', '整托盘接力上架') : $lwLanguage.get('wms_project.pda.inner.taskMove.whole.vrhbhphn', '整托盘上架')}}</lw-button>