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

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

@@ -1,89 +1,89 @@
-<template>
-  <div class="quality-info" v-if="data">
-    <div class="lw-global-flex-between">
-      <div style="color: red; font-size: 1.1em;"><b>{{data.sku.code}}</b></div>
-      <div>
-        <lw-tag plain v-if="data.sku.sizeType">{{$lwDict.getDictLabel('size_type_choice', data.sku.sizeType)}}</lw-tag>
-        <lw-tag plain v-if="data.sku.isLeftRight">左右件</lw-tag>
-        <lw-tag plain color="red">{{$lwDict.getDictLabel('WmsSkuUrgency', data.sku.skuUrgency)}}</lw-tag>
-      </div>
-    </div>
-    <div class="lw-global-sh"></div>
-    <div>{{data.sku.name}}</div>
-    <div class="lw-global-props label-vertical-align">
-      <div>
-        <div>货主</div>
-        <div>{{data.sku.ownerCode}} - {{data.sku.ownerName}}</div>
-      </div>
-      <div>
-        <div>供应商</div>
-        <div>{{data.asn.supplierCode}} - {{data.asn.supplierName}}</div>
-      </div>
-      <div>
-        <div>异常率</div>
-        <div>{{data.asn.abnormalRate || 0}}%</div>
-        <div>
-          <lw-tag plain color="red">{{$lwDict.getDictLabel('quality_type_choice', data.sku.qualityType)}}</lw-tag>
-        </div>
-      </div>
-    </div>
-    <!-- 数字板 -->
-    <div class="lw-global-board-nums">
-      <div>
-        <div>{{data.canQualityQty}}</div>
-        <div>待检量</div>
-      </div>
-      <div>
-        <div>{{data.qualityQty}}</div>
-        <div>已检量</div>
-      </div>
-      <div>
-        <div>{{data.receiveQty}}</div>
-        <div>正品量</div>
-      </div>
-      <div style="color: yellow;">
-        <div>{{data.qualityLossQty}}</div>
-        <div>异常量</div>
-      </div>
-      <div class="lw-global-sv"></div>
-      <div>
-        <div>{{parseInt(data.startTime / 60)}}</div>
-        <div>耗时/分钟</div>
-      </div>
-    </div>
-    <div class="lw-global-props label-vertical-align" style="margin-top: 10px;">
-      <div>
-        <div>通知单号</div>
-        <div>{{data.asn.asnNo}}</div>
-      </div>
-      <div>
-        <div>托盘</div>
-        <div>{{data.lpn}}</div>
-      </div>
-      <div>
-        <div>库位</div>
-        <div>{{data.locationCode}}</div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'QualityTaskInfo',
-  props: {
-    data: Object,
-  },
-}
-</script>
-
-<style lang="less" scoped>
-.quality-info {
-  font-size: 0.9em;
-  line-height: 1.6em;
-  color: gray;
-}
-.lw-global-sh {
-  margin: 5px 0;
-}
+<template>
+  <div class="quality-info" v-if="data">
+    <div class="lw-global-flex-between">
+      <div style="color: red; font-size: 1.1em;"><b>{{data.sku.code}}</b></div>
+      <div>
+        <lw-tag plain v-if="data.sku.sizeType">{{$lwDict.getDictLabel('size_type_choice', data.sku.sizeType)}}</lw-tag>
+        <lw-tag plain v-if="data.sku.isLeftRight">{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.qgwplokn', '左右件')}}</lw-tag>
+        <lw-tag plain color="red">{{$lwDict.getDictLabel('WmsSkuUrgency', data.sku.skuUrgency)}}</lw-tag>
+      </div>
+    </div>
+    <div class="lw-global-sh"></div>
+    <div>{{data.sku.name}}</div>
+    <div class="lw-global-props label-vertical-align">
+      <div>
+        <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.yyqmxivo', '货主')}}</div>
+        <div>{{data.sku.ownerCode}} - {{data.sku.ownerName}}</div>
+      </div>
+      <div>
+        <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.fpksxltq', '供应商')}}</div>
+        <div>{{data.asn.supplierCode}} - {{data.asn.supplierName}}</div>
+      </div>
+      <div>
+        <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.tmfmdakc', '异常率')}}</div>
+        <div>{{data.asn.abnormalRate || 0}}%</div>
+        <div>
+          <lw-tag plain color="red">{{$lwDict.getDictLabel('quality_type_choice', data.sku.qualityType)}}</lw-tag>
+        </div>
+      </div>
+    </div>
+    <!-- 数字板 -->
+    <div class="lw-global-board-nums">
+      <div>
+        <div>{{data.canQualityQty}}</div>
+        <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.gypojjwp', '待检量')}}</div>
+      </div>
+      <div>
+        <div>{{data.qualityQty}}</div>
+        <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.fwqychhx', '已检量')}}</div>
+      </div>
+      <div>
+        <div>{{data.receiveQty}}</div>
+        <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.nkanulec', '正品量')}}</div>
+      </div>
+      <div style="color: yellow;">
+        <div>{{data.qualityLossQty}}</div>
+        <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.dstmavxr', '异常量')}}</div>
+      </div>
+      <div class="lw-global-sv"></div>
+      <div>
+        <div>{{parseInt(data.startTime / 60)}}</div>
+        <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.hkcctkww', '耗时/分钟')}}</div>
+      </div>
+    </div>
+    <div class="lw-global-props label-vertical-align" style="margin-top: 10px;">
+      <div>
+        <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.yjxnsabo', '通知单号')}}</div>
+        <div>{{data.asn.asnNo}}</div>
+      </div>
+      <div>
+        <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.viqkwtvs', '托盘')}}</div>
+        <div>{{data.lpn}}</div>
+      </div>
+      <div>
+        <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.lmsuxjmj', '库位')}}</div>
+        <div>{{data.locationCode}}</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'QualityTaskInfo',
+  props: {
+    data: Object,
+  },
+}
+</script>
+
+<style lang="less" scoped>
+.quality-info {
+  font-size: 0.9em;
+  line-height: 1.6em;
+  color: gray;
+}
+.lw-global-sh {
+  margin: 5px 0;
+}
 </style>

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

@@ -0,0 +1,85 @@
+<!--
+  搜索栏
+  @author: Jimmy
+-->
+<template>
+  <div class="lw-global-model-box lw-global-collapse-box">
+
+    <div class="lw-global-flex-between">
+
+      <lw-input
+        style="flex: 1"
+        v-model="searchKey"
+        :placeholder="$lwLanguage.get('wms_project.pda.components.page.inbound.components.ldltdplx', '商品条码')"
+        :rule-key="ruleKey" :rule-serve-query="ruleQuery"
+        @confirm="searchClick"
+        @clear="searchClear">
+
+        <template #button>
+
+          <lw-button
+            mini
+            round
+            @click="searchClick"
+          >
+            {{ $lwLanguage.get('', '搜索') }}
+          </lw-button>
+
+        </template>
+
+      </lw-input>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import {scanUtils} from '../util/InboundUtils'
+
+export default {
+  name: "seo",
+  props: {
+    ruleQuery: {
+      type: Object,
+      default: () => {
+      }
+    },
+    ruleKey: {
+      type: String,
+      default: null
+    },
+  },
+  data() {
+    return {
+      searchKey: '',
+    }
+  },
+  methods: {
+    searchClear() {
+      this.searchKey = ''
+      this.$emit('search', this.searchKey)
+    },
+    searchClick(sku, res) {
+      const scanData = scanUtils.getScanSkuCodeData(sku, res)
+      if(!scanData.success){
+        this.searchKey = ''
+        return
+      }
+
+      this.searchKey = scanData.skuCode
+
+      if (this.searchKey) {
+        this.$emit('search', this.searchKey)
+      } else {
+        this.$lwToast.fail(this.$lwLanguage.get('wms_project.pda.components.page.inbound.components.tvwoehll', '商品条码不能为空'))
+      }
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

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

@@ -0,0 +1,69 @@
+<template>
+  <div v-if="sku"
+       class="sku-info lw-global-model-box"
+       :class="{'lw-global-click-style':showItemClick}"
+       @click="itemClick"
+  >
+
+    <div class="lw-global-row-start">
+      <div style="font-size: 1.1em;"><b>{{sku.ownerCode + " - " + sku.ownerName}}</b></div>
+    </div>
+
+    <div class="lw-global-flex-between" style="margin-top: 10px;">
+      <div style="font-size: 1.1em;"><b>{{sku.code}}</b></div>
+      <div v-if="showItemClick"><b>&#62;</b></div>
+    </div>
+    <div>
+      <div>{{sku.name}}</div>
+    </div>
+    <div>
+      <div>{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.vnwckvwg', '异常率 ')}}<b style="color: red; font-size: 1.1em;">{{sku.abnormalRate}}</b>%</div>
+      <div>
+        <lw-tag plain color="red">{{sku.qualityTypeLabel}}</lw-tag>
+        <lw-tag v-if="sku.needSn" color="red">{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.weztwunz', '序列号')}}</lw-tag>
+        <lw-tag plain color="red" v-if="sku.new">{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.wktrouoi', '新品')}}</lw-tag>
+        <lw-tag plain color="red">{{ sku.skuUrgencyLabel }}</lw-tag>
+      </div>
+    </div>
+    <slot name="extend"/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'SkuReceiveInfo',
+  props: {
+    sku: {
+      type: Object,
+      default: () => {
+      }
+    },
+    showItemClick: {
+      type: Boolean,
+      default: false
+    },
+  },
+  methods: {
+    itemClick(){
+      this.$emit("itemClick", this.sku)
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.sku-info {
+  font-size: 0.9em;
+  line-height: 1.5em;
+
+  & > div {
+    display: flex;
+    align-items: center;
+
+    & > div:first-child {
+      flex-grow: 1;
+    }
+  }
+}
+
+</style>

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

@@ -1,18 +1,18 @@
 <template>
   <div class="lw-global-page-box">
     <div class="lw-global-model-box">
-      <lw-input title="序列号条码" required v-model="filterSn"/>
+      <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>数量</div>
-          <div>操作</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)">剔除</lw-button>
+            <lw-button mini @click="$emit('remove', t)">{{$lwLanguage.get('wms_project.pda.components.page.inbound.components.dvmlxsjb', '剔除')}}</lw-button>
           </div>
         </div>
       </div>
@@ -25,6 +25,10 @@ export default {
   name: 'SnsList',
   props: {
     sns: Array,
+    search: {
+      type: Boolean,
+      default: true
+    },
   },
   data () {
     return {
@@ -72,7 +76,7 @@ export default {
   }
 
   &-title {
-    background: #0f90dd;
+    background: red;
     color: white;
     margin: -10px -10px 0;
     padding: 8px;
@@ -96,4 +100,4 @@ export default {
     border-top: 1px solid lightgray;
   }
 }
-</style>
+</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 lwNewProjectActionPage from "./newProject/action";
-
-export default [
-  LwInboundReceiveIndexPage,
-  LwInboundReceiveHomePage,
-  ...receiveSkuPages,
-  ...skuQualityPages,
-  lwNewProjectIndexPage,
-  lwNewProjectActionPage,
-]
+import LwInboundReceiveIndexPage from './receive/index'
+import LwInboundReceiveHomePage from './receive/home'
+// 新品配置
+import lwNewProjectIndexPage from "../config/newProject/index";
+// 新品配置
+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.js

@@ -1,5 +1,5 @@
-import lwInboundReceiveHomePage from './index.vue'
-
-lwInboundReceiveHomePage.install = Vue => Vue.component(lwInboundReceiveHomePage.name, lwInboundReceiveHomePage)
-
-export default lwInboundReceiveHomePage
+import lwInboundReceiveHomePage from './index.vue'
+
+lwInboundReceiveHomePage.install = Vue => Vue.component(lwInboundReceiveHomePage.name, lwInboundReceiveHomePage)
+
+export default lwInboundReceiveHomePage

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

@@ -1,73 +1,145 @@
-<template>
-  <div>
-    <lw-nav-bar title="收货"/>
-    <div v-if="asn">
-      <div class="lw-global-page-box">
-        <div class="lw-global-model-box">
-          <asn-info :data="asn"/>
-        </div>
-      </div>
-    </div>
-    <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>
-  </div>
-</template>
-
-<script>
-import { getInboundAsnByNo, getInboundAsnByTaskId } from '../../../../../api/inbound/receive'
-import AsnInfo from '../../components/AsnInfo'
-
-const receiveTypePaths = {
-  sku: '/inbound/receive/sku/scan',
-  lpn: '/inbound/receive/lpn/scan',
-  'case': '/inbound/receive/case/scan',
-}
-
-export default {
-  name: 'lwInboundReceiveHomePage',
-  components: { AsnInfo },
-  data () {
-    return {
-      asn: null,
-    }
-  },
-  created () {
-    const { lwTaskId, asnNo } = this.$route.query
-    if (lwTaskId) {
-      this.getAsnByTaskId(lwTaskId)
-    } else if (asnNo) {
-      this.getAsnByAsnNo(asnNo)
-    } else {
-      return this.$lwShowErrorMsg('参数错误')
-    }
-  },
-  methods: {
-    getAsnByTaskId (taskId) {
-      getInboundAsnByTaskId(taskId).then(res => this.asn = res)
-    },
-    getAsnByAsnNo (asnNo) {
-      getInboundAsnByNo(asnNo).then(data => {
-        if (data && data.length) {
-          this.asn = data[0]
-          return
-        }
-        this.$lwShowErrorMsg('错误的到货通知单号')
-      })
-    },
-    toReceive (type = 'sku') {
-      const path = receiveTypePaths[type]
-      if (!path) {
-        return this.$lwShowErrorMsg('错误的收货方式')
-      }
-      this.$router.push({ path, query: { asnNo: this.asn.asnNo } })
-    }
-  }
-}
-</script>
+<template>
+  <div>
+    <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>
+          <asn-info :data="asn"/>
+        </div>
+      </div>
+    </div>
+    <div v-else>
+      <lw-not-data/>
+    </div>
+
+    <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.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 {
+  name: 'lwInboundReceiveHomePage',
+  components: { AsnInfo },
+  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) {
+      this.getAsnByTaskId(lwTaskId)
+    } else if (asnNo) {
+      this.getAsnByAsnNo(asnNo)
+    } else {
+      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
+        if(this.bottomBtnList.length === 1){
+            this.bottomBtnList[0].click(true)
+        }
+      })
+    },
+    getAsnByAsnNo (asnNo) {
+      getInboundAsnByNo(asnNo).then(data => {
+        if (data && data.length) {
+          this.asn = data[0]
+          return
+        }
+        this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.home.gtjmkplb', '错误的到货通知单号'))
+      })
+    },
+    toReceive (type = 'sku', replace = false) {
+      const path = receiveTypePaths[type]
+      if (!path) {
+        return this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.components.page.inbound.receive.home.jyouxnyb', '错误的收货方式'))
+      }
+      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.js

@@ -1,5 +1,5 @@
-import lwInboundReceiveIndexPage from './index.vue'
-
-lwInboundReceiveIndexPage.install = Vue => Vue.component(lwInboundReceiveIndexPage.name, lwInboundReceiveIndexPage)
-
-export default lwInboundReceiveIndexPage
+import lwInboundReceiveIndexPage from './index.vue'
+
+lwInboundReceiveIndexPage.install = Vue => Vue.component(lwInboundReceiveIndexPage.name, lwInboundReceiveIndexPage)
+
+export default lwInboundReceiveIndexPage