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

package/src/utils/Axios.js

@@ -5,11 +5,11 @@
 * @date 2022-02-10
 * */
 
-import Axios from 'axios';
+import {axios} from "@bundled-es-modules/axios";
 import {ApiUtils} from "./ApiUtils";
 import {Warehouse} from "./Warehouse";
-import {lwShowErrorMsg} from "../components/ui/ErrorMsg";
-import {lwShowLoading, lwCloseLoading} from "../components/ui/Loading";
+import {lwErrMsg} from "../components/ui/ErrorMsg";
+import {lwLoading} from "../components/ui/Loading";
 import {Language} from "./Language";
 import {LocalStorage} from "./LocalStorage";
 import {Timezone} from "./Timezone";
@@ -17,7 +17,7 @@ import {Timezone} from "./Timezone";
 // 用于自定义处理http报错的问题，为false时候不显示报错信息，直接返回错误信息，通过catch接收
 let errGetMe = false
 
-const lwAxios = Axios.create({
+const lwAxios = axios.create({
   baseURL: import.meta.env.VITE_APP_BASE_URL,
   timeout: 1000 * 60 * 30,
 })
@@ -112,7 +112,7 @@ lwAxios.interceptors.request.use(
 
     // 判断是否显示加载框
     if (config.loading || config.loading === undefined){
-      lwShowLoading()
+      lwLoading.show()
     }
 
     // 记录当前请求是否需要手动处理报错
@@ -121,7 +121,7 @@ lwAxios.interceptors.request.use(
     return config
   },
   error => {
-    lwCloseLoading()
+    lwLoading.close()
     console.error('请求异常: ', error)
     return Promise.reject(error)
   }
@@ -131,7 +131,7 @@ lwAxios.interceptors.request.use(
 lwAxios.interceptors.response.use(
   response => {
 
-    lwCloseLoading()
+    lwLoading.close()
 
     let result = response.data
     if (!result || !['none', 'success'].includes(result.code)) {
@@ -151,32 +151,32 @@ lwAxios.interceptors.response.use(
   },
   error => {
 
-    lwCloseLoading()
+    lwLoading.close()
     console.error('接口返回异常: ', error)
 
     let resp = error.response
 
-    if (errGetMe){
-      errGetMe = false
-      return Promise.reject(resp)
-    }
-
     if (resp){
       if (resp.status === 401) {
         ApiUtils.setToken(undefined)
-        lwShowErrorMsg({ message: Language.get('wms_project.pda.utils.axios.loginOvertime', '登录超时，请重新登录') })
+        lwErrMsg.show({ message: Language.get('wms_project.pda.utils.axios.loginOvertime', '登录超时，请重新登录') })
         ApiUtils.delToken()
         history.go(0)
         return Promise.reject(resp)
       }
 
       if (resp.status === 404){
-        lwShowErrorMsg({ message: Language.get('wms_project.pda.utils.axios.serveError', '请求失败，接口路径错误(404)') })
+        lwErrMsg.show({ message: Language.get('wms_project.pda.utils.axios.serveError', '请求失败，接口路径错误(404)') })
+        return Promise.reject(resp)
+      }
+
+      if (errGetMe){
+        errGetMe = false
         return Promise.reject(resp)
       }
 
       if (resp.data) {
-        lwShowErrorMsg({
+        lwErrMsg.show({
           message: resp.data && resp.data.message ?
             resp.data.message :
             Language.get('wms_project.pda.utils.axios.unknownError', '未知错误（可能是系统正在升级或异常）请稍后再试')
@@ -186,7 +186,7 @@ lwAxios.interceptors.response.use(
 
     }
 
-    lwShowErrorMsg({message: Language.get('wms_project.pda.utils.axios.network', '请求失败，请检查网络连接')})
+    lwErrMsg.show({message: Language.get('wms_project.pda.utils.axios.network', '请求失败，请检查网络连接')})
     return Promise.reject(resp)
   }
 )

package/src/utils/BarcodeResolve.js

@@ -5,7 +5,7 @@
 * */
 
 import {common} from "../api/common/common";
-import {lwShowErrorMsg} from "../components/ui/ErrorMsg";
+import {lwErrMsg} from "../components/ui/ErrorMsg";
 import {DateTime} from "luxon";
 import {Language} from "./Language";
 
@@ -181,7 +181,7 @@ export const BarcodeResolve = {
     const {componentId, barcode, ownerId, createRule} = param
 
     if (!componentId){
-      lwShowErrorMsg(
+      lwErrMsg.show(
         Language.get('wms_project.pda.utils.BarcodeResolve.qemvmsdn','获取条码解析规则失败，未指定输入框解析ID')
       )
       return {
@@ -217,7 +217,7 @@ export const BarcodeResolve = {
         }
 
       }else {
-        lwShowErrorMsg(
+        lwErrMsg.show(
           Language.get('wms_project.pda.utils.BarcodeResolve.bmkxoyxk','获取条码解析规则失败，未获取到解析规则。输入框解析ID：')+ componentId
         )
         return {
@@ -272,7 +272,7 @@ export const BarcodeResolve = {
         ) {
 
           if (!typeResolvers.primaryValid || !typeResolvers.primaryValid.field){
-            lwShowErrorMsg(
+            lwErrMsg.show(
                 Language.get('wms_project.pda.utils.BarcodeResolve.stpryqma','主字段配置有误，请联系管理员重新配置')
             )
             return {
@@ -309,7 +309,7 @@ export const BarcodeResolve = {
 
 
     // 走到这就是所有解析规则都没过了且没有使用默认规则
-    lwShowErrorMsg(
+    lwErrMsg.show(
       Language.get('wms_project.pda.utils.BarcodeResolve.agyiotes','条码解析失败！输入框ID：') + componentId
     )
 

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

@@ -7,9 +7,9 @@
 import {AppPower} from "./AppPower";
 import {lwToast} from "./Toast";
 import {print} from "../api/common/Print";
-import {lwCloseLoading, lwShowLoading} from "../components/ui/Loading";
-import {lwShowErrorMsg} from "../components/ui/ErrorMsg";
-import {lwShowNoticeBar} from "../components/ui/NoticeBar";
+import {lwLoading} from "../components/ui/Loading";
+import {lwErrMsg} from "../components/ui/ErrorMsg";
+import {lwNoticeBar} from "../components/ui/NoticeBar";
 import {Language} from "./Language";
 
 export const Print = {
@@ -87,7 +87,7 @@ export const Print = {
       }
     }
     const message = msg + Language.get('','打印模板未配置！请前往【打印设置栏】配置模板。模板编码：') + templateCode
-    needWarn ? lwShowErrorMsg(message) : lwShowNoticeBar({message, showTime: 8, type:'warning'})
+    needWarn ? lwErrMsg.show(message) : lwNoticeBar.show({message, showTime: 8, type:'warning'})
     return {success: false, printData: {}}
   },
 
@@ -97,38 +97,32 @@ 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', '打印数据有误')
-      lwShowErrorMsg(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
     }
 
-    lwShowLoading(Language.get('wms_project.pda.utils.print.printing', '正在打印') + '...')
+    lwLoading.show(Language.get('wms_project.pda.utils.print.printing', '正在打印') + '...')
 
     try {
-      await this.asyncGeyPrintData({
-        taskId,
-        taskNo,
-        pageNum,
-        pageSize,
-        deviceType,
-        billStatusList,
-      })
+      await this.asyncGeyPrintData(obj)
 
-      lwCloseLoading()
+      lwLoading.close()
 
       lwToast.success({
         message: Language.get('wms_project.pda.utils.print.success', '打印成功'),
@@ -137,9 +131,9 @@ export const Print = {
     }catch (e){
       console.log(e,'方法错误')
       if (e.msg){
-        lwShowErrorMsg(e.msg)
+        lwErrMsg.show(e.msg)
       }
-      lwCloseLoading()
+      lwLoading.close()
       throw new Error(e)
     }
 
@@ -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

@@ -7,8 +7,8 @@
 import {DateTime} from "./DateTime"
 import {ScanRule} from "./ScanRule"
 import {AppPower} from './AppPower'
-import {lwShowLoading, lwCloseLoading} from "../components/ui/Loading"
-import {lwShowErrorMsg, lwCloseErrorMsg} from "../components/ui/ErrorMsg"
+import {lwLoading} from "../components/ui/Loading"
+import {lwErrMsg} from "../components/ui/ErrorMsg"
 import lwAxios from './Axios'
 import {GetImgSrc} from "./GetImgSrc";
 import {lwToast} from "./Toast";
@@ -32,7 +32,8 @@ import {BarcodeResolve} from "./BarcodeResolve";
 import {lwDialog} from "./Dialog";
 import {Timezone} from "./Timezone";
 import {Utils} from "./Utils";
-import {lwCloseNoticeBar, lwShowNoticeBar} from "../components/ui/NoticeBar";
+import {lwNoticeBar} from "../components/ui/NoticeBar";
+import {UserInfo} from "./UserInfo";
 
 
 
@@ -40,12 +41,12 @@ export const utils = (Vue) => {
   Vue.prototype.$lwDate = DateTime
   Vue.prototype.$lwScanRule = ScanRule
   Vue.prototype.$lwAppPower = AppPower
-  Vue.prototype.$lwShowLoading = lwShowLoading
-  Vue.prototype.$lwCloseLoading = lwCloseLoading
-  Vue.prototype.$lwShowErrorMsg = lwShowErrorMsg
-  Vue.prototype.$lwShowNoticeBar = lwShowNoticeBar
-  Vue.prototype.$lwCloseNoticeBar = lwCloseNoticeBar
-  Vue.prototype.$lwCloseErrorMsg = lwCloseErrorMsg
+  Vue.prototype.$lwShowLoading = lwLoading.show
+  Vue.prototype.$lwCloseLoading = lwLoading.close
+  Vue.prototype.$lwShowErrorMsg = lwErrMsg.show
+  Vue.prototype.$lwCloseErrorMsg = lwErrMsg.close
+  Vue.prototype.$lwShowNoticeBar = lwNoticeBar.show
+  Vue.prototype.$lwCloseNoticeBar = lwNoticeBar.close
   Vue.prototype.$lwAxios = lwAxios
   Vue.prototype.$lwGetImgSrc = GetImgSrc
   Vue.prototype.$lwToast = lwToast
@@ -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>

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

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

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

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

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

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

package/src/views/container/repairBack/content.vue

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

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

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

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

@@ -0,0 +1,23 @@
+<!--
+  报修登记 - 起始页
+  @author: 张文
+  @date: 2022-12-20
+-->
+<template>
+  <lw-container-repair-register-index-page/>
+</template>
+
+<script>
+
+export default {
+  name: "index",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/container/repairRegister/orderInfo.vue

@@ -0,0 +1,23 @@
+<!--
+  维修单信息
+  @author: 张文
+  @date: 2022-12-21
+-->
+<template>
+  <lw-container-repair-register-order-info-page/>
+</template>
+
+<script>
+
+export default {
+  name: "orderInfo",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

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

@@ -0,0 +1,23 @@
+<!--
+  报废登记 - 起始页
+  @author: 张文
+  @date: 2022-12-21
+-->
+<template>
+  <lw-container-scrap-record-index-page/>
+</template>
+
+<script>
+
+export default {
+  name: "index",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>