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

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控制
 
   /**

package/src/utils/Axios.js

@@ -156,11 +156,6 @@ lwAxios.interceptors.response.use(
 
     let resp = error.response
 
-    if (errGetMe){
-      errGetMe = false
-      return Promise.reject(resp)
-    }
-
     if (resp){
       if (resp.status === 401) {
         ApiUtils.setToken(undefined)
@@ -175,6 +170,11 @@ lwAxios.interceptors.response.use(
         return Promise.reject(resp)
       }
 
+      if (errGetMe){
+        errGetMe = false
+        return Promise.reject(resp)
+      }
+
       if (resp.data) {
         lwErrMsg.show({
           message: resp.data && resp.data.message ?

package/src/utils/Dialog.js

@@ -16,18 +16,14 @@ function format(obj){
     const msg = obj.msgList.map(item => {
       return `
         <div style="text-align: left" class="lw-global-row">
-          <span
-           class="lw-global-title"
-          >${item.key}</span>
-          <span
-           class="lw-global-value-bold"
-          >${item.value}</span>
+          <span class="lw-global-title">${item.key}</span>
+          <span class="lw-global-value-bold">${item.value}</span>
         </div>
       `
     })
 
     obj.message = `
-      <div class="lw-global-value">${obj.message}</div>
+      <div class="lw-global-value">${obj.message || ''}</div>
       ${msg.join('')}
     `
   }

package/src/utils/Print.js

@@ -97,36 +97,30 @@ export const Print = {
    * @author 张文
    * @date 2022-02-15
    * @return {Promise} {success:'成功-true，失败-false',message：失败原因}}
-   * @param obj
+   * @param {Object|String} param 可直接传入taskId 或 传入对象
    * */
-  async bluetoothPrint({
-   taskId,
-   taskNo,
-   pageNum = 1,
-   pageSize = 10,
-   deviceType = 'BLUETOOTH',
-   billStatusList = ['100'],
-  }) {
-
-    let msg = ''
-
-    if (!taskId && !taskNo) {
-      msg = Language.get('wms_project.pda.utils.print.error', '打印数据有误')
-      lwErrMsg.show(msg)
-      throw new Error(msg)
+  async bluetoothPrint(param) {
+    const obj = typeof param === 'object' ? param : {taskId: param}
+
+    const deepObj = {
+      pageNum : 1,
+      pageSize : 10,
+      deviceType : 'BLUETOOTH',
+      billStatusList : ['100'],
+    }
+    for (const k in deepObj) {
+      obj[k] = obj[k] || deepObj[k]
+    }
+
+    if (!obj.taskId && !obj.taskNo) {
+      await this.asyncGetPrintDataId(obj)
+      return
     }
 
     lwLoading.show(Language.get('wms_project.pda.utils.print.printing', '正在打印') + '...')
 
     try {
-      await this.asyncGeyPrintData({
-        taskId,
-        taskNo,
-        pageNum,
-        pageSize,
-        deviceType,
-        billStatusList,
-      })
+      await this.asyncGeyPrintData(obj)
 
       lwLoading.close()
 
@@ -228,5 +222,48 @@ export const Print = {
     }catch{
       throw new Error({msg:Language.get('', '调用打印数据更新接口调用失败')})
     }
+  },
+
+  /**
+   * 根据条件获取打印id
+   * @author 张文
+   * @date 2023-02-03
+   * @param {Object} param 请求接口的参数
+   * @return {Object} 获取的打印数据
+   * */
+  async asyncGetPrintDataId(param){
+    const res = await print.getPrintDataId(param)
+
+    lwLoading.show(Language.get('wms_project.pda.utils.print.printing', '正在打印') + '...')
+
+    try{
+      for (const re of res.datas) {
+        await this.asyncGeyPrintData({
+          pageNum : 1,
+          pageSize : 10,
+          taskId: re.id,
+          ...param
+        })
+      }
+
+      if (res.total > param.pageNum){
+        await this.asyncGetPrintDataId({
+          ...param,
+          pageNum:param.pageNum++
+        })
+      }
+
+      lwToast.success({
+        message: Language.get('wms_project.pda.utils.print.success', '打印成功'),
+        duration: 1000
+      })
+    }catch (e) {
+      console.warn('通过条件查询打印数据方法打印失败!', e)
+    }
+
+    lwLoading.close()
+
   }
+
+
 }

package/src/utils/UserInfo.js

@@ -0,0 +1,32 @@
+/*
+* 当前用户数据
+* @author: 张文
+* @date  2023-02-03
+* */
+
+import {user} from "./../api/common/User";
+
+export const UserInfo = {
+
+  // 异步获取当前登录用户的数据
+  async asyncGet(){
+    return new Promise((r,e)=>{
+      user.getUserInfo().then(res=>{
+        this.set(res)
+        r(res)
+      }).catch(err=>e(err))
+
+    })
+  },
+
+  // 获取当前缓存的用户数据
+  get(){
+    return window.lwWindowGlobalData.get('userInfo')
+  },
+
+  // 设置当前缓存的用户数据
+  set(data){
+    window.lwWindowGlobalData.set('userInfo',data)
+  }
+
+}

package/src/utils/index.js

@@ -33,6 +33,7 @@ import {lwDialog} from "./Dialog";
 import {Timezone} from "./Timezone";
 import {Utils} from "./Utils";
 import {lwNoticeBar} from "../components/ui/NoticeBar";
+import {UserInfo} from "./UserInfo";
 
 
 
@@ -69,4 +70,5 @@ export const utils = (Vue) => {
   Vue.prototype.$lwDialog = lwDialog.call(Vue.prototype)
   Vue.prototype.$lwTimezone = Timezone
   Vue.prototype.$lwUtils = Utils
+  Vue.prototype.$lwUserInfo = UserInfo
 }

package/src/utils/windowGlobalData.js

@@ -68,7 +68,13 @@ export function lwWindowGlobalData(){
       'UTC-9': {timezone: 'UTC-9', offset: -540},
       'UTC-10': {timezone: 'UTC-10', offset: -600},
       'UTC-11': {timezone: 'UTC-11', offset: -660},
-    }
+    },
+    // 错误信息弹框dom
+    errorMsgDom: null,
+    // 顶部消息栏dom
+    noticeBarDom:null,
+    // 用户数据
+    userInfo: null
   }
 
   // 初始化时获取本地储存的仓库信息
@@ -111,4 +117,4 @@ export function lwWindowGlobalData(){
 
   }
 
-  }
+}

package/src/views/common/init/index.vue

@@ -88,6 +88,9 @@ export default {
 
         await this.getSystemInitData()
 
+        // 获取当前用户的登录数据
+        await this.$lwUserInfo.asyncGet()
+
         if (self === top){
           history.go(-1)
         }else {

package/src/views/common/taskConsole/index.vue

@@ -0,0 +1,23 @@
+<!--
+  任务控制台
+  @author: 张文
+  @date: 2023-01-10
+-->
+<template>
+  <lw-task-console-page/>
+</template>
+
+<script>
+
+export default {
+  name: "index",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/container/containerBack/index.vue

@@ -0,0 +1,23 @@
+<!--
+  容器归还
+  @author: 张文
+  @date: 2022-12-22
+-->
+<template>
+  <lw-container-container-back-index-page/>
+</template>
+
+<script>
+
+export default {
+  name: "index",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/container/rentBack/action.vue

@@ -0,0 +1,23 @@
+<!--
+  维修归还 - 执行页
+  @author: 张文
+  @date: 2022-12-21
+-->
+<template>
+  <lw-container-rent-back-action-page/>
+</template>
+
+<script>
+
+export default {
+  name: "over",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>