@logwire/logwire-wms-pda-ui 3.1.0 → 3.1.2

package/src/components/ui/NoticeBar/index.vue

@@ -9,22 +9,22 @@
     v-if="show"
     ref="notBox"
     class="lw-global-flex-between not-box"
-    :style="{background,color}"
+    :style="{background,color,height}"
   >
     <div style="flex: 1">{{message}}</div>
 
     <div
       class="close-btn"
-      @click="closeClick"
+      @click="close"
     >×</div>
   </div>
 </template>
 
 <script>
-import {lwCloseNoticeBar} from "./index";
 
 /* 注意此组件不能使用 this.$XXX 的方法，因为没有注册组件是通过指令调用的 */
 
+
 export default {
   name: "lwNoticeBar",
   /*props:{
@@ -44,30 +44,51 @@ export default {
       showTime: '',
       // 定时器
       timeOut:'',
+      // 高度
+      height: ''
     }
   },
   watch:{
     show(n){
       if (n){
-        this.timeOut && clearTimeout(this.timeOut)
-        const showTime = this.showTime === 0 ? 0 : this.showTime ? this.showTime : 2
-        let time = Number(showTime)
-        time = isNaN(time) ? 2 : time
-        time !== 0 ? this.timeOut = setTimeout(()=>this.closeClick(),time * 1000) : ''
+        this.renderDom()
       }
     }
   },
   methods: {
+    // 显示
+    showDom({message, background, color, showTime}){
+      this.message = message
+      this.background = background
+      this.color = color
+      this.showTime = showTime
+      this.renderDom()
+    },
+
+    // 渲染dom
+    renderDom(){
+      this.timeOut && clearTimeout(this.timeOut)
+      const showTimeNum = this.showTime === 0 ? 0 : this.showTime ? this.showTime : 2
+      let time = Number(showTimeNum)
+      time = isNaN(time) ? 2 : time
+      time !== 0 ? this.timeOut = setTimeout(()=>this.close(),time * 1000) : ''
+      this.height = 'auto'
 
-    // 手动关闭
-    closeClick(){
-      lwCloseNoticeBar()
+      this.$nextTick(()=>{
+        this.dom = document.getElementsByClassName('not-box')[0]
+        this.height = this.dom.offsetHeight + 'px'
+      })
     },
 
     // 关闭弹框
     close(){
-      this.show = false
-      this.timeOut && clearTimeout(this.timeOut)
+      this.height = 0
+
+      this.dom.addEventListener('transitionend', ()=>{
+        this.show = false
+        this.timeOut && clearTimeout(this.timeOut)
+        window.lwWindowGlobalData.set('noticeBarDom',null)
+      })
     },
 
   }

package/src/components/ui/TabBox/index.js

@@ -0,0 +1,11 @@
+/*
+* tab组件容器
+* @author: 张文
+* @date: 2023-01-04
+* */
+
+import lwTabBox from "./index.vue";
+
+lwTabBox.install = Vue => Vue.component(lwTabBox.name, lwTabBox)
+
+export default lwTabBox

package/src/components/ui/TabBox/index.vue

@@ -0,0 +1,99 @@
+<!--
+  tab组件容器
+  @author: 张文
+  @date: 2023-01-04
+-->
+<template>
+  <div ref="tabBox">
+
+
+    <!-- 滚动时的占位 -->
+    <div
+      v-if="showCopy"
+      :style="{
+        height: this.height + 10 + 'px',
+        width:'100%'
+      }"
+    ></div>
+    <!-- 放置tabs -->
+    <div class="lw-global-tab-box">
+      <slot></slot>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "lwTabBox",
+  props:{
+    // 是否固定
+    fixed:{
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      tabDom:'',
+      height: 0,
+      top: 0,
+      showCopy: false
+    }
+  },
+  mounted() {
+    if (!this.fixed) return
+    this.tabDom = this.$refs.tabBox.getElementsByClassName('van-tabs__wrap')[0]
+    this.height = this.tabDom.clientHeight
+    this.top = this.$refs.tabBox.offsetTop
+
+    window.addEventListener('scroll',this.scrollFn)
+
+    this.tabDom.addEventListener('click',this.clickFn)
+  },
+  methods: {
+
+    scrollFn(){
+      this.height = this.tabDom.clientHeight
+      this.top = this.$refs.tabBox.offsetTop
+      if (window.scrollY >= this.top){
+        this.showCopy = true
+        this.tabDom.style.position = 'fixed'
+        this.tabDom.style.top = 0
+        this.tabDom.style.left = 0
+        this.tabDom.style.zIndex = 10
+        this.tabDom.style.width = '100%'
+        this.tabDom.style.boxShadow = '0 1px 8px 1px rgba(0, 0, 0, 0.3)'
+      }else {
+        this.tabDom.style.position = 'initial'
+        this.tabDom.style.boxShadow = 'none'
+        this.tabDom.style.zIndex = 1
+        this.showCopy = false
+      }
+    },
+
+    clickFn(){
+      this.tabDom.style.position === 'fixed' && this.$refs.tabBox.scrollIntoView({
+        behavior: "smooth",
+        block:'start',
+      })
+    }
+
+  },
+  destroyed() {
+    window.removeEventListener('scroll', this.scrollFn)
+    window.removeEventListener('click', this.clickFn)
+  }
+}
+</script>
+
+<style scoped lang="less">
+.lw-tab-box-fixed{
+  position: relative;
+  top: 0;
+  left: 0;
+  width: 100%;
+}
+
+</style>

package/src/components/ui/index.js

@@ -58,6 +58,8 @@ import lwBottomBarBtnHidden from "./BottomBarBtnHidden";
 import lwPagination from "./Pagination";
 // 行加多选弹框组件
 import lwCellPopupCheckbox from "./CellPopupCheckbox";
+// tab组件容器
+import lwTabBox from "./TabBox";
 
 
 
@@ -89,4 +91,5 @@ export const ui = [
   lwPagination,
   lwCellPopupSelect,
   lwCellPopupCheckbox,
+  lwTabBox,
 ]

package/src/directive/Permissions.js

@@ -5,7 +5,7 @@
 * */
 
 import {Permissions} from "../utils/Permissions";
-import {lwShowErrorMsg} from "../components/ui/ErrorMsg";
+import {lwErrMsg} from "../components/ui/ErrorMsg";
 
 export default {
   inserted(el, binding) {
@@ -26,7 +26,7 @@ export default {
         el.parentNode && el.parentNode.removeChild(el)
       }
     } else {
-      lwShowErrorMsg('权限校验失败，请检查传入数据是否正确')
+      lwErrMsg.show('权限校验失败，请检查传入数据是否正确')
       throw new Error(
           "权限校验失败，请检查传入数据是否正确! 像这样使用：<div v-permission=\"['admin','editor']\"></div>"
       )

package/src/router/index.js

@@ -98,6 +98,12 @@ export default [
     name: "LwSearchTask",
     component: () => import('./../views/common/task/search.vue'),
   },
+  // 任务控制台
+  {
+    path: "/lwTaskConsole",
+    name: "LwTaskConsole",
+    component: () => import('./../views/common/taskConsole/index.vue'),
+  },
 
   // 入库上架
   {
@@ -637,6 +643,11 @@ export default [
     name: "LwOutboundPickSowAction",
     component: () => import('./../views/outbound/pick/sowAction.vue')
   },
+  {
+    path: "/outbound/pick/lwContainerAction",
+    name: "LwOutboundPickContainerAction",
+    component: () => import('./../views/outbound/pick/containerAction.vue')
+  },
 
   // 出库 - 捆包集货
   {
@@ -739,14 +750,14 @@ export default [
 
   // 出库 - 拣选容器查询
   {
-    path: "/outbound/pickContainer/lwIndex",
+    path: "/outbound/pickContainerSearch/lwIndex",
     name: "LwOutboundPickContainerIndex",
-    component: () => import('./../views/outbound/pickContainer/index.vue')
+    component: () => import('../views/outbound/pickContainerSearch/index.vue')
   },
   {
-    path: "/outbound/pickContainer/lwAction",
-    name: "LwOutboundPickContainerAction",
-    component: () => import('./../views/outbound/pickContainer/action.vue')
+    path: "/outbound/pickContainerSearch/lwAction",
+    name: "LwOutboundPickContainerSearchAction",
+    component: () => import('../views/outbound/pickContainerSearch/action.vue')
   },
 
   // 出库 - 滞留件转存
@@ -892,4 +903,77 @@ export default [
     component: () => import('../views/process/screen/display/index.vue')
   },
 
+
+  /* ----- 容器管理 S ----- */
+    // 报修登记 - 起始页
+  {
+    path: "/container/repairRegister/lwIndex",
+    name: "lwContainerRepairRegisterIndex",
+    component: () => import('../views/container/repairRegister/index.vue')
+  },
+    // 报修登记 - 维修单信息
+  {
+    path: "/container/repairRegister/lwOrderInfo",
+    name: "lwContainerRepairRegisterOrderInfo",
+    component: () => import('../views/container/repairRegister/orderInfo.vue')
+  },
+
+    // 维修归还 - 起始页
+  {
+    path: "/container/repairBack/lwIndex",
+    name: "lwContainerRepairBackIndex",
+    component: () => import('../views/container/repairBack/index.vue')
+  },
+    // 维修归还 - 详情页
+  {
+    path: "/container/repairBack/lwContent",
+    name: "lwContainerRepairBackContent",
+    component: () => import('../views/container/repairBack/content.vue')
+  },
+    // 维修归还 - 执行页
+  {
+    path: "/container/repairBack/lwAction",
+    name: "lwContainerRepairBackAction",
+    component: () => import('../views/container/repairBack/action.vue')
+  },
+
+    // 报废登记 - 起始页
+  {
+    path: "/container/scrapRecord/lwIndex",
+    name: "lwContainerScrapRecordIndex",
+    component: () => import('../views/container/scrapRecord/index.vue')
+  },
+    // 报废登记 - 执行页
+  {
+    path: "/container/scrapRecord/lwOrderInfo",
+    name: "lwContainerScrapRecordOrderInfo",
+    component: () => import('../views/container/scrapRecord/orderInfo.vue')
+  },
+
+    // 租赁归还 - 起始页
+  {
+    path: "/container/rentBack/lwIndex",
+    name: "lwContainerRentBackIndex",
+    component: () => import('../views/container/rentBack/index.vue')
+  },
+  // 维修归还 - 详情页
+  {
+    path: "/container/rentBack/lwContent",
+    name: "lwContainerRentBackContent",
+    component: () => import('../views/container/rentBack/content.vue')
+  },
+  // 维修归还 - 执行页
+  {
+    path: "/container/rentBack/lwAction",
+    name: "lwContainerRentBackAction",
+    component: () => import('../views/container/rentBack/action.vue')
+  },
+
+  // 容器归还
+  {
+    path: "/container/containerBack/lwIndex",
+    name: "lwContainerContainerBackIndex",
+    component: () => import('../views/container/containerBack/index.vue')
+  },
+
 ]

package/src/router/menu.js

@@ -6,6 +6,7 @@
 
 import {DeepCopy} from "../utils/DeepCopy";
 import {at, set, unset} from "lodash/object";
+import {Language} from "../utils/Language";
 
 import taskImg from './../assets/img/menu/task.png'
 import messageImg from './../assets/img/menu/message.png'
@@ -16,6 +17,7 @@ import mainLocSearchImg from './../assets/img/menu/mainLocSearch.png'
 import receiveImg from './../assets/img/menu/receive.png'
 import receiveSkuImg from '../assets/img/menu/receive-sku.png'
 import receiveLpnImg from './../assets/img/menu/receive-lpn.png'
+import lpnBatchReceive from './../assets/img/menu/lpnBatchReceive.png'
 import receiveCaseImg from './../assets/img/menu/receive-case.png'
 import allotReceiveImg from './../assets/img/menu/allotReceive.png'
 import receive_randomImg from './../assets/img/menu/receive_random.png'
@@ -26,7 +28,11 @@ import receiveAbnormalImg from './../assets/img/menu/receiveAbnormal.png'
 import innerImg from '../assets/img/menu/inner.png'
 import randomMoveImg from './../assets/img/menu/randomMove.png'
 import moveAllImg from './../assets/img/menu/moveAll.png'
+import caseQuickMove from './../assets/img/menu/caseQuickMove.png'
+import fragQuickMove from './../assets/img/menu/fragQuickMove.png'
+import replenish from './../assets/img/menu/replenish.png'
 import moveUpImg from './../assets/img/menu/moveUp.png'
+import movePutAway from './../assets/img/menu/movePutAway.png'
 import countImg from './../assets/img/menu/count.png'
 import materialApplyImg from './../assets/img/menu/materialApply.png'
 import borrowPickImg from './../assets/img/menu/borrowPick.png'
@@ -36,6 +42,7 @@ import stockSearchImg from './../assets/img/menu/stockSearch.png'
 import deadPutawayImg from './../assets/img/menu/deadPutaway.png'
 import processImg from './../assets/img/menu/process.png'
 import processTableImg from './../assets/img/menu/processTable.png'
+import packScreen from './../assets/img/menu/packScreen.png'
 import outboundImg from './../assets/img/menu/outbound.png'
 import pickImg from './../assets/img/menu/pick.png'
 import pickMergeImg from './../assets/img/menu/pickMerge.png'
@@ -54,8 +61,15 @@ import outboundBlockImg from './../assets/img/menu/outboundBlock.png'
 import confirmStockOutImg from './../assets/img/menu/confirmStockOut.png'
 import outboundReprintImg from './../assets/img/menu/outboundReprint.png'
 import sortingImg from './../assets/img/menu/sorting.png'
+import unload from './../assets/img/menu/unload.png'
 import packCollect from "./../assets/img/menu/packCollect.png";
 import sowCollect from "./../assets/img/menu/sowCollect.png";
+import container from "../assets/img/menu/container/container.png";
+import containerBack from "../assets/img/menu/container/containerBack.png";
+import repairRegister from "./../assets/img/menu/container/repairRegister.png";
+import repairBack from "./../assets/img/menu/container/repairBack.png";
+import rentBack from "./../assets/img/menu/container/rentBack.png";
+import scrapRecord from "./../assets/img/menu/container/scrapRecord.png";
 
 const menuList = {
   // 任务
@@ -91,10 +105,10 @@ const menuList = {
     children: {
 
 
-      // 新品配置
+      // 商品配置
       newProject: {
         src: newConfigImg,
-        title: '新品配置',
+        title: '商品配置',
         titleKey: 'wms_project.pda.menu.newProject',
         tip: 0,
         hidden: false,
@@ -157,7 +171,7 @@ const menuList = {
       },
       // 整托批量收货
       lpnBatchReceive: {
-        src: receiveLpnImg,
+        src: lpnBatchReceive,
         title: '整托批量收货',
         titleKey: 'wms_project.pda.menu.receiveLpnBatch',
         tip: 0,
@@ -239,10 +253,10 @@ const menuList = {
       },
 
 
-      // 新品配置
+      // 商品配置
       newProject: {
         src: receiveAbnormalImg,
-        title: '新品配置',
+        title: '商品配置',
         titleKey: 'wms_project.pda.menu.newProject',
         tip: 0,
         hidden: false,
@@ -263,7 +277,7 @@ const menuList = {
 
       // 分拣 TODO
       unload: {
-        src: sortingImg,
+        src: unload,
         title: '卸货',
         titleKey: '',
         tip: 0,
@@ -320,7 +334,7 @@ const menuList = {
 
       // 移动上架
       movePutAway: {
-        src: moveUpImg,
+        src: movePutAway,
         title: '移动上架',
         titleKey: 'wms_project.pda.menu.movePutAway',
         tip: 0,
@@ -430,7 +444,7 @@ const menuList = {
 
       // 随机快速移动 - 整箱
       caseQuickMove: {
-        src: moveAllImg,
+        src: caseQuickMove,
         title: '随机快速移动 - 整箱',
         titleKey: 'wms_project.pda.menu.caseQuickMove',
         tip: 0,
@@ -441,7 +455,7 @@ const menuList = {
 
       // 随机快速移动 - 零散
       fragQuickMove: {
-        src: moveAllImg,
+        src: fragQuickMove,
         title: '随机快速移动 - 零散',
         titleKey: 'wms_project.pda.menu.fragQuickMove',
         tip: 0,
@@ -450,6 +464,17 @@ const menuList = {
         path: '/inner/fragQuickMove/lwIndex',
       },
 
+      // 补货
+      replenish: {
+        src: replenish,
+        title: '补货',
+        titleKey: '',
+        tip: 0,
+        hidden: false,
+        permissions: [],
+        path: `/lwTaskConsole?lwTitle=${Language.get('','补货')}&lwType=REPLENISH&lwFixedStatusTab=1`,
+      },
+
 
 
     }
@@ -478,7 +503,7 @@ const menuList = {
 
       // 加工台PAD大屏
       workTableProcessScreen: {
-        src: processTableImg,
+        src: packScreen,
         title: '加工台PAD大屏',
         titleKey: 'wms_project.pda.menu.process.padScreen',
         tip: 0,
@@ -646,12 +671,12 @@ const menuList = {
       // 拣选容器查询
       pickContainer: {
         src: pickContainerImg,
-        title: '容器查询',
+        title: '拣选容器查询',
         titleKey: 'wms_project.pda.menu.pickContainer',
         tip: 0,
         hidden: false,
-        permissions: ['/wms/pda/outbound/pickContainer/lwIndex'],
-        path: '/outbound/pickContainer/lwIndex',
+        permissions: ['/wms/pda/outbound/pickContainerSearch/lwIndex'],
+        path: '/outbound/pickContainerSearch/lwIndex',
       },
 
       // 滞留箱转存
@@ -700,6 +725,68 @@ const menuList = {
 
     },
   },
+
+  // 容器管理 TODO 国际化、权限
+  container:{
+    src: container,
+    title: '容器管理',
+    titleKey: 'wms_project.pda.menu.container',
+    tip: 0,
+    hidden: false,
+    permissions: [],
+    children:{
+      // 容器归还
+      containerBack:{
+        src: containerBack,
+        title: '容器归还',
+        titleKey: '',
+        tip: 0,
+        hidden: false,
+        permissions: [],
+        path: '/container/containerBack/lwIndex',
+      },
+      // 报修登记
+      repairRegister:{
+        src: repairRegister,
+        title: '报修登记',
+        titleKey: '',
+        tip: 0,
+        hidden: false,
+        permissions: [],
+        path: '/container/repairRegister/lwIndex',
+      },
+      // 维修归还
+      repairBack:{
+        src: repairBack,
+        title: '维修归还',
+        titleKey: '',
+        tip: 0,
+        hidden: false,
+        permissions: [],
+        path: '/container/repairBack/lwIndex',
+      },
+      // 租赁归还
+      rentBack:{
+        src: rentBack,
+        title: '租赁归还',
+        titleKey: '',
+        tip: 0,
+        hidden: false,
+        permissions: [],
+        path: '/container/rentBack/lwIndex',
+      },
+      // 报废登记
+      scrapRecord:{
+        src: scrapRecord,
+        title: '报废登记',
+        titleKey: '',
+        tip: 0,
+        hidden: false,
+        permissions: [],
+        path: '/container/scrapRecord/lwIndex',
+      },
+    }
+  }
 }
 
 // 修改菜单初始数据的值

package/src/utils/AppPower.js

@@ -25,6 +25,26 @@ function handleAppExtendResult(result, error, resolve, reject) {
 
 export const AppPower = {
 
+  /**
+   * 获取定位
+   *  返回："坐标类型,经度,维度" 或 ""
+   *  坐标系：wgs84、gcj02、bd09、bd09ll、bd09mc
+   * @returns {Promise<unknown>}
+   */
+  appLocation: (type = "wgs84") => {
+    let androidApp = window.androidApp;
+    if (androidApp && typeof (androidApp.appLocation) == "function") {
+      return new Promise(function (resolve, reject) {
+        androidApp.appLocation(type, function (result, error) {
+          handleAppExtendResult(result, error, resolve, reject);
+        });
+      });
+    }
+    return new Promise(function (resolve, reject) {
+      reject(false);
+    });
+  },
+
   //----------------- 子web控制
 
   /**