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

package/src/components/page/inbound/components/SnsList.vue

@@ -1,99 +1,103 @@
-<template>
-  <div class="lw-global-page-box">
-    <div class="lw-global-model-box">
-      <lw-input title="序列号条码" required v-model="filterSn"/>
-      <div class="tag-list dialog">
-        <div class="tag-list-head">
-          <div>SN</div>
-          <div>数量</div>
-          <div>操作</div>
-        </div>
-        <div class="tag-list-row" v-for="t in filterSns" :key="t.sn">
-          <div>{{ t.sn }}</div>
-          <div>{{ t.qty }}</div>
-          <div>
-            <lw-button mini @click="$emit('remove', t)">剔除</lw-button>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'SnsList',
-  props: {
-    sns: Array,
-  },
-  data () {
-    return {
-      filterSn: '',
-    }
-  },
-  computed: {
-    filterSns () {
-      if (this.filterSn) {
-        return this.sns.filter(i => i.sn.startsWith(this.filterSn))
-      } else {
-        return this.sns
-      }
-    },
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.tag-list {
-  margin-top: 10px;
-
-  &.dialog {
-    max-height: 50vh;
-    overflow-y: auto;
-  }
-
-  & > div {
-    display: flex;
-    align-items: center;
-
-    & > div:first-child {
-      flex-basis: 40%;
-    }
-
-    & > div:nth-child(2) {
-      flex-basis: 20%;
-      text-align: center;
-    }
-
-    & > div:last-child {
-      flex-basis: 40%;
-      text-align: center;
-    }
-  }
-
-  &-title {
-    background: #0f90dd;
-    color: white;
-    margin: -10px -10px 0;
-    padding: 8px;
-    border-radius: 8px 8px 0 0;
-
-    span {
-      color: yellow;
-      font-weight: bold;
-    }
-  }
-
-  &-head {
-    font-size: 0.9em;
-    color: gray;
-    padding: 5px 0;
-  }
-
-  &-row {
-    font-size: 0.9em;
-    height: 36px;
-    border-top: 1px solid lightgray;
-  }
-}
-</style>
+<template>
+  <div class="lw-global-page-box">
+    <div class="lw-global-model-box">
+      <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.inbound.components.lzpjpfgt', '序列号条码')" required v-model="filterSn" v-if="search"/>
+      <div class="tag-list dialog">
+        <div class="tag-list-head">
+          <div>SN</div>
+          <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.mcopqjww', '数量')}}</div>
+          <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.offkwfup', '操作')}}</div>
+        </div>
+        <div class="tag-list-row" v-for="t in filterSns" :key="t.sn">
+          <div>{{ t.sn }}</div>
+          <div>{{ t.qty }}</div>
+          <div>
+            <lw-button mini @click="$emit('remove', t)">{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.dvmlxsjb', '剔除')}}</lw-button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'SnsList',
+  props: {
+    sns: Array,
+    search: {
+      type: Boolean,
+      default: true
+    },
+  },
+  data () {
+    return {
+      filterSn: '',
+    }
+  },
+  computed: {
+    filterSns () {
+      if (this.filterSn) {
+        return this.sns.filter(i => i.sn.startsWith(this.filterSn))
+      } else {
+        return this.sns
+      }
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.tag-list {
+  margin-top: 10px;
+
+  &.dialog {
+    max-height: 50vh;
+    overflow-y: auto;
+  }
+
+  & > div {
+    display: flex;
+    align-items: center;
+
+    & > div:first-child {
+      flex-basis: 40%;
+    }
+
+    & > div:nth-child(2) {
+      flex-basis: 20%;
+      text-align: center;
+    }
+
+    & > div:last-child {
+      flex-basis: 40%;
+      text-align: center;
+    }
+  }
+
+  &-title {
+    background: red;
+    color: white;
+    margin: -10px -10px 0;
+    padding: 8px;
+    border-radius: 8px 8px 0 0;
+
+    span {
+      color: yellow;
+      font-weight: bold;
+    }
+  }
+
+  &-head {
+    font-size: 0.9em;
+    color: gray;
+    padding: 5px 0;
+  }
+
+  &-row {
+    font-size: 0.9em;
+    height: 36px;
+    border-top: 1px solid lightgray;
+  }
+}
+</style>

package/src/components/page/inbound/index.js

@@ -1,17 +1,23 @@
 import LwInboundReceiveIndexPage from './receive/index'
 import LwInboundReceiveHomePage from './receive/home'
-import receiveSkuPages from './receive/receive-sku'
-import skuQualityPages from './receive/quality'
 // 新品配置
-import lwNewProjectIndexPage from "./newProject/index";
+import lwNewProjectIndexPage from "../config/newProject/index";
 // 新品配置
-import lwNewProjectActionPage from "./newProject/action";
+import lwNewProjectActionPage from "../config/newProject/action";
+import receiveSkuPages from './receive/receive-sku'
+import receiveLpnPages from './receive/receive-lpn'
+import receiveAllocPages from './receive/receive-alloc'
+import skuQualityPages from './receive/quality'
+import receiveRandomPages from './receive/receive-random'
 
 export default [
   LwInboundReceiveIndexPage,
   LwInboundReceiveHomePage,
   ...receiveSkuPages,
+  ...receiveLpnPages,
+  ...receiveAllocPages,
   ...skuQualityPages,
+  ...receiveRandomPages,
   lwNewProjectIndexPage,
   lwNewProjectActionPage,
-]
+]

package/src/components/page/inbound/receive/home/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
-    <lw-nav-bar title="收货"/>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.home.ylxxpwsg', '收货')"/>
     <div v-if="asn">
       <div class="lw-global-page-box">
-        <div class="lw-global-model-box">
+        <div>
           <asn-info :data="asn"/>
         </div>
       </div>
@@ -11,23 +11,24 @@
     <div v-else>
       <lw-not-data/>
     </div>
-    <lw-bottom-bar v-if="asn">
-      <lw-button @click="toReceive('sku')">按商品收货</lw-button>
-      <lw-button>调拨收货</lw-button>
-      <lw-button plain @click="toReceive('lpn')">整托收货</lw-button>
-      <lw-button plain @click="toReceive('case')">整箱收货</lw-button>
-    </lw-bottom-bar>
+
+    <lw-bottom-bar-btn-hidden
+      v-if="asn"
+      :btn-list="bottomBtnList"
+    />
   </div>
 </template>
 
 <script>
 import { getInboundAsnByNo, getInboundAsnByTaskId } from '../../../../../api/inbound/receive'
-import AsnInfo from '../../components/AsnInfo'
+import AsnInfo from '../../components/AsnInfo.vue'
 
 const receiveTypePaths = {
   sku: '/inbound/receive/sku/scan',
   lpn: '/inbound/receive/lpn/scan',
+  lpnBatch: '/inbound/receive/lpn/batchExecute',
   'case': '/inbound/receive/case/scan',
+  alloc: '/inbound/receive/alloc/tab',
 }
 
 export default {
@@ -36,8 +37,55 @@ export default {
   data () {
     return {
       asn: null,
+
+      // 底部按钮区全部按钮
+      allBtnList:{
+        sku:{
+          text: this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.home.xieujxgn','按商品收货'),
+          click: this.skuShelf
+        },
+        lpn:{
+          text: this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.home.xondxjwd', '整托收货'),
+          click: this.lpnShelf
+        },
+        lpnBatch:{
+          text: this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.home.lpnBatch', '整托批量收货'),
+          click: this.lpnBatchShelf
+        },
+        case:{
+          text: this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.home.jszrixlt', '整箱收货'),
+          click: this.caseShelf
+        },
+        allocate:{
+          text: this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.home.vktirfss', '调拨收货'),
+          click: this.allocShelf
+        },
+      },
+
     }
   },
+  computed:{
+    // 底部按钮显示的按钮块
+    bottomBtnList() {
+
+      if (!this.asn){
+        return []
+      }
+
+      let btnList = this.asn.receiveMethodList || []
+
+      // 去重
+      let arr =  [...new Set(btnList)].map(item=>this.allBtnList[item])
+
+      // 按商品收货 - 如果没有任何交集，按商品收货就是兜底方案
+      if (!arr.length){
+        arr.push(this.allBtnList.sku)
+      }
+
+      return arr
+    }
+
+  },
   created () {
     const { lwTaskId, asnNo } = this.$route.query
     if (lwTaskId) {
@@ -45,12 +93,17 @@ export default {
     } else if (asnNo) {
       this.getAsnByAsnNo(asnNo)
     } else {
-      return this.$lwShowErrorMsg('参数错误')
+      return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.home.htawzyjx', '参数错误'))
     }
   },
   methods: {
     getAsnByTaskId (taskId) {
-      getInboundAsnByTaskId(taskId).then(res => this.asn = res)
+      getInboundAsnByTaskId(taskId).then(res => {
+        this.asn = res
+        if(this.bottomBtnList.length === 1){
+            this.bottomBtnList[0].click(true)
+        }
+      })
     },
     getAsnByAsnNo (asnNo) {
       getInboundAsnByNo(asnNo).then(data => {
@@ -58,16 +111,35 @@ export default {
           this.asn = data[0]
           return
         }
-        this.$lwShowErrorMsg('错误的到货通知单号')
+        this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.home.gtjmkplb', '错误的到货通知单号'))
       })
     },
-    toReceive (type = 'sku') {
+    toReceive (type = 'sku', replace = false) {
       const path = receiveTypePaths[type]
       if (!path) {
-        return this.$lwShowErrorMsg('错误的收货方式')
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.home.jyouxnyb', '错误的收货方式'))
       }
-      this.$router.push({ path, query: { asnNo: this.asn.asnNo } })
-    }
+      if(replace){
+        this.$router.replace({ path, query: { asnNo: this.asn.asnNo } })
+      }else{
+        this.$router.push({ path, query: { asnNo: this.asn.asnNo } })
+      }
+    },
+    skuShelf(replace = false){
+      this.toReceive('sku', replace)
+    },
+    lpnShelf(replace = false){
+      this.toReceive('lpn', replace)
+    },
+    lpnBatchShelf(replace = false){
+      this.toReceive('lpnBatch', replace)
+    },
+    caseShelf(replace = false){
+      this.toReceive('case', replace)
+    },
+    allocShelf(replace = false){
+      this.toReceive('alloc', replace)
+    },
   }
 }
 </script>

package/src/components/page/inbound/receive/index/index.vue

@@ -1,89 +1,92 @@
-<template>
-  <div>
-    <lw-nav-bar :title="title"/>
-    <div class="lw-global-page-box">
-      <div class="lw-global-model-box">
-        <lw-input title="收货单号" required
-                  v-model="asnNo.value"
-                  :get-focus.sync="asnNo.focus"
-                  placeholder="到货通知单/外部单号/入库计划单号/调拨单号"
-                  @confirm="getData"/>
-        <lw-button
-            block
-            style="margin-top: 10px"
-            @click="getData">
-          查询到货通知单
-        </lw-button>
-      </div>
-      <div v-if="data" style="margin: 10px 0;">
-        <div class="lw-global-model-box" v-for="a in data" :key="a.id" @click="toDetails(a)">
-          <asn-info :data="a"/>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getInboundAsnByNo } from '../../../../../api/inbound/receive'
-import AsnInfo from '../../components/AsnInfo'
-
-const titles = {
-  sku: '收货',
-  lpn: '整托盘收货',
-  'case': '整箱收货',
-}
-
-const receiveTypePaths = {
-  sku: '/inbound/receive/sku/scan',
-  lpn: '/inbound/receive/lpn/scan',
-  'case': '/inbound/receive/case/scan',
-}
-
-export default {
-  name: 'lwInboundReceiveIndexPage',
-  components: { AsnInfo },
-  data () {
-    return {
-      type: 'sku',
-      asnNo: {
-        value: '',
-        focus: true
-      },
-      data: null,
-    }
-  },
-  computed: {
-    title () {
-      return titles[this.type]
-    },
-  },
-  created () {
-    const type = this.$route.query.type
-    if (['sku', 'lpn', 'case'].includes(type)) {
-      this.type = type
-    }
-  },
-  methods: {
-    getData () {
-      this.data = null
-      if (this.asnNo.value) {
-        getInboundAsnByNo(this.asnNo.value).then(data => {
-          if (data && data.length) {
-            this.data = data
-            return
-          }
-          this.$lwShowErrorMsg('错误的单号')
-        })
-      }
-    },
-    toDetails (item) {
-      let path = receiveTypePaths[this.type]
-      if (!path) {
-        path = receiveTypePaths['sku']
-      }
-      this.$router.push({ path, query: { asnNo: item.asnNo } })
-    },
-  }
-}
-</script>
+<template>
+  <div>
+    <lw-nav-bar :title="title"/>
+    <div class="lw-global-page-box">
+      <div class="lw-global-model-box">
+        <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.index.cuywdeau', '收货单号')" required
+                  v-model="asnNo.value"
+                  :get-focus.sync="asnNo.focus"
+                  :placeholder="$lwLanguage.get('wms_project.pda.components.page.inbound.receive.index.yxatyvvt', '到货通知单/外部单号/入库计划单号/调拨单号')"
+                  @confirm="getData"/>
+        <lw-button
+            block
+            style="margin-top: 10px"
+            @click="getData">
+          {{ $lwLanguage.get('wms_project.pda.components.page.inbound.receive.index.yxastyvvt', '查询到货通知单') }}
+        </lw-button>
+      </div>
+      <div v-if="data" style="margin: 10px 0;">
+        <div  v-for="a in data" :key="a.id" @click="toDetails(a)">
+          <asn-info :data="a"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getInboundAsnByNo } from '../../../../../api/inbound/receive'
+import AsnInfo from '../../components/AsnInfo.vue'
+
+const receiveTypePaths = {
+  sku: '/inbound/receive/sku/scan',
+  lpn: '/inbound/receive/lpn/scan',
+  'case': '/inbound/receive/case/scan',
+  alloc: '/inbound/receive/alloc/tab',
+  lpnBatch: '/inbound/receive/lpn/batchExecute',
+}
+
+export default {
+  name: 'lwInboundReceiveIndexPage',
+  components: { AsnInfo },
+  data () {
+    return {
+      titles: {
+        sku: this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.index.pxwtdnvf', '收货'),
+        lpn: this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.index.tzztgswu', '整托盘收货'),
+        case: this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.index.uububwjt', '整箱收货'),
+        alloc: this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.index.hmcqfydx', '调拨收货'),
+        lpnBatch: this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.index.lpnBatch', '整托盘批量收货'),
+      },
+      type: 'sku',
+      asnNo: {
+        value: '',
+        focus: true
+      },
+      data: null,
+    }
+  },
+  computed: {
+    title () {
+      return this.titles[this.type]
+    },
+  },
+  created () {
+    const type = this.$route.query.type
+    if (['sku', 'lpn', 'case','alloc','lpnBatch'].includes(type)) {
+      this.type = type
+    }
+  },
+  methods: {
+    getData () {
+      this.data = null
+      if (this.asnNo.value) {
+        getInboundAsnByNo(this.asnNo.value).then(data => {
+          if (data && data.length) {
+            this.data = data
+            return
+          }
+          this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.index.xylbogua', '错误的单号'))
+        })
+      }
+    },
+    toDetails (item) {
+      let path = receiveTypePaths[this.type]
+      if (!path) {
+        path = receiveTypePaths['sku']
+      }
+      this.$router.push({ path, query: { asnNo: item.asnNo } })
+    },
+  }
+}
+</script>