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

package/src/utils/Timezone.js

@@ -0,0 +1,183 @@
+/*
+* 时区
+* @author: 张文
+* @date  2022-08-03
+* */
+
+import {DateTime} from "./DateTime";
+import {LocalStorage} from "./LocalStorage";
+
+
+export const Timezone = {
+
+  /**
+   * 获取时区数据
+   * @author 张文
+   * @return {Object} 时区
+   * */
+  get(){
+    return window.lwWindowGlobalData.get('timezone')
+  },
+
+
+  /**
+   * 获取指定时区的偏移量
+   * @author 张文
+   * @param {String|null} timezone 需要获取的时区
+   * @return {Number} 时区的偏移值(min)
+   * */
+  getTimezoneOffset(timezone = null){
+
+    let numOffset = ''
+
+    if (timezone){
+      // 获取时区的值
+      let timezoneObj = this.get()[timezone] || {}
+      // 判断是否成功获取到时区
+      if (!Object.keys(timezoneObj).length) {
+        console.error('调用【时间转换】方法时，传入的timezone无法获取到时区，已默认为0时区，数据可能存在差异，请注意！')
+        numOffset = 0
+      }else {
+        numOffset = timezoneObj.offset
+      }
+
+    }else {
+      // 如果没有传入偏移值就取系统选择的时区
+      let timezone = LocalStorage.get('lwTimezone')
+      if (!Object.keys(timezone).length){
+        timezone = this.getTimezone()
+      }
+      numOffset = Number(timezone.offset)
+    }
+
+    return numOffset
+  },
+
+
+  /**
+   * 获取当前时区，及偏移量
+   * @author 张文
+   * @return {Object} {timezone: 时区, offset: 时区差值(min)}
+   * */
+  getTimezone(){
+
+    let offset = new Date().getTimezoneOffset()
+    let timezone = offset / 60
+
+    // 判断是否是0时区
+    if (timezone === 0){
+      return {
+        timezone: 'UTC',
+        offset: 0
+      }
+    }
+
+    // 判断是否是西时区
+    if (timezone > 0) {
+      return {
+        timezone: 'UTC-' + timezone,
+        offset: Number('-' + timezone) * 60
+      }
+    }
+
+    return {
+      timezone: 'UTC+' + Math.abs(timezone),
+      offset: Math.abs(timezone) * 60
+    }
+  },
+
+
+  /**
+   * 将时区时间转换为标准时间
+   * @author 张文
+   * @param {Object} obj
+   * date - 需要转换的时间；
+   * timezone - 转换时间所属的时区 - 为空时默认取用户选择的时区；
+   * format - 格式化表达式；
+   * backUTC - 当格式化表达式为空时，是否返回标准时间格式；
+   * @return {String|Number} 当format为空时返回标准时间格式或时间戳，否则返回格式化后的时间
+   * */
+  timezoneToUTC({date, timezone, format, backUTC = true}){
+
+    // 标准时间的时间戳
+    let utc = ''
+
+    // 获取当前设备所处时区
+    const nowTimezone = this.getTimezone()
+
+    // 获取设备所处时区的标准时间戳
+    const s = Date.parse(new Date(date).toUTCString())
+
+    let numOffset = this.getTimezoneOffset(timezone)
+
+    utc = s + (nowTimezone.offset - numOffset) * 60 * 1000
+
+    if (format) {
+      // DateTime.format方法是通过new Date()实现，所以需要减去当前时间偏移量才是标准时间
+      return DateTime.format(utc - nowTimezone.offset * 60 * 1000, format)
+    }
+
+    if (backUTC){
+      const utcList = DateTime.format(utc - nowTimezone.offset * 60 * 1000, 'yyyy-MM-dd hh:mm:ss').split(' ')
+      return utcList.join('T')+'Z'
+    }
+
+    return utc
+
+  },
+
+
+  /**
+   * 将标准时间转换为时区时间
+   * @author 张文
+   * @param {Object} obj date - 需要转换的标准时间；timezone-需要转换的时区 - 为空时默认取用户选择的时区；format - 格式化表达式
+   * @return {String|Number} 当format为空时返回时间戳，否则返回格式化后的时间
+   * */
+  UTCToTimezone({date, timezone, format = 'yyyy-MM-dd hh:mm'}){
+
+    // 时区时间戳
+    let timezoneTime = ''
+    let d = date
+    if (/(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(.\d+)?Z)/gm.test(date)){
+      d = date.replace(/[T|Z]/gm,' ').trim()
+    }
+
+    // 获取标准时间的时间戳
+    const s = Date.parse(d)
+
+    let numOffset = this.getTimezoneOffset(timezone)
+
+    timezoneTime = s + numOffset * 60 * 1000
+
+    if (format) return DateTime.format(timezoneTime, format)
+
+    return timezoneTime
+  },
+
+
+  /**
+   * 获取指定时区的时间
+   * @author 张文
+   * @param {Object} obj timezone - 需要获取时间的时区；format - 格式化表达式
+   * @return {String|Number} 当format为空时返回时间戳，否则返回格式化后的时间
+   * */
+  getTimezoneDate({timezone, format}={}){
+
+    // 获取设备所处时区的标准时毫秒数
+    const s = Date.parse(new Date().toUTCString())
+    // 获取当前时区
+    const nowTimezone = this.getTimezone()
+
+    // 获取时区的偏移值
+    let numOffset = this.getTimezoneOffset(timezone)
+
+    // 根据当前值和时间偏移值计算出偏移后的标准时毫秒数
+    const utc = s + (numOffset - nowTimezone.offset) * 60 * 1000
+
+    if (format) return DateTime.format(utc, format)
+
+    return utc
+
+  },
+
+}

package/src/utils/Tip.js

@@ -9,18 +9,18 @@
  * 角标数字格式化
  * @author 张文
  * @date 2022-03-11
- * @param {String|Number} val val-需要格式化的数据；
- * @param {Number} max max-最大显示值；
- * @return {String|Number} 返回对象格式化后的对象
+ * @param {String|Number} val 需要格式化的数据；
+ * @param {Number} max 最大显示值；
+ * @return {String|Number} 返回对象格式化后的数据
  * */
-export function Tip (val, max=9){
+export function Tip(val, max = 9) {
   const num = Number(val)
 
   if (isNaN(num)) return val
 
-  if (num > max){
+  if (num > max) {
     return max + '+'
-  }else {
+  } else {
     return num
   }
 }

package/src/utils/UUID.js

@@ -8,26 +8,26 @@ import {AppPower} from "./AppPower";
 import {uuid} from "../api/common/UUID";
 
 export const UUID = {
-  // 绑定设备id
-  bound() {
-
-    return new Promise((res, err) => {
-
-      const UUID = AppPower.appUUID()
-      if (!UUID) {
 
-        res()
-
-        return
-      }
-
-      uuid.mobileBindDevice({
-        uuid: UUID
-      }).then(() => {
-        res()
-      }).catch((e) => {
-        err(e)
-      })
+  /**
+   * 绑定设备id
+   * @author 张文
+   * @date 2022-03-11
+   * @return {Promise}
+   * */
+  bound() {
+    return new Promise((res, err)=>{
+        return AppPower.appUUID().then((UUID)=>{
+          if(UUID && UUID.length!==0){
+            return uuid.mobileBindDevice({
+              uuid: UUID
+            })
+              .then(()=>{res(UUID)})
+              .catch((e)=>{err(e)})
+          } else {
+            res("")
+          }
+        })
     })
   }
 }

package/src/utils/Utils.js

@@ -0,0 +1,34 @@
+/*
+* 公共方法
+* @author: 张文
+* @date  2022-08-18
+* */
+export const Utils = {
+
+  /**
+   * 配合卡片切换组件使用。用于计算当前显示页是否符合时间最大条数
+   * @author 张文
+   * @date 2022-08-18
+   * @param {Number} index 需要比较的值
+   * @param {Number} length 比较的最大值
+   * @return {Number} 符合要求的数组
+   * */
+  cutCardIndexCount(index, length) {
+    const i = Number(index)
+    const l = Number(length)
+    if (isNaN(i)) {
+      console.error('传入【index】无法转换为数字，值为：' + index)
+      return 0
+    }
+    if (isNaN(l)) {
+      console.error('传入【length】无法转换为数字，值为：' + length)
+      return 0
+    }
+
+    if (l === 0) return 0
+
+    if ((i + 1) > l) return i - 1
+
+    return i
+  }
+}

package/src/utils/Warehouse.js

@@ -12,13 +12,17 @@ export const Warehouse = {
    * @author 张文
    * @param {Object} data 需要设置的仓库数据
    * */
-  set(data){
+  set(data) {
     window.lwWindowGlobalData.set('warehouse', data)
     window.sessionStorage.setItem('lwWarehouse', JSON.stringify(data))
   },
 
 
-  // 获取仓库数据
+  /**
+   * 获取仓库数据
+   * @author 张文
+   * @return {Object} 仓库数据
+   * */
   get() {
     return window.lwWindowGlobalData.get('warehouse')
   },

package/src/utils/index.js

@@ -28,7 +28,11 @@ import {TabBar} from "./TabBar";
 import {RouteInit} from "./RouteInit";
 import {UUID} from "./UUID";
 import {AppBack} from "./AppBack";
-import {barcodeResolve} from "./BarcodeResolve";
+import {BarcodeResolve} from "./BarcodeResolve";
+import {lwDialog} from "./Dialog";
+import {Timezone} from "./Timezone";
+import {Utils} from "./Utils";
+import {lwCloseNoticeBar, lwShowNoticeBar} from "../components/ui/NoticeBar";
 
 
 
@@ -39,13 +43,15 @@ export const utils = (Vue) => {
   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.$lwAxios = lwAxios
   Vue.prototype.$lwGetImgSrc = GetImgSrc
   Vue.prototype.$lwToast = lwToast
   Vue.prototype.$lwPrint = Print
   Vue.prototype.$lwDeepCopy = DeepCopy
-  Vue.prototype.$lwLocalStorag = LocalStorage
+  Vue.prototype.$lwLocalStorage = LocalStorage
   Vue.prototype.$lwSetColor = SetColor
   Vue.prototype.$lwTip = Tip
   Vue.prototype.$lwLanguage = Language
@@ -59,5 +65,8 @@ export const utils = (Vue) => {
   Vue.prototype.$lwRouteInit = RouteInit
   Vue.prototype.$lwUUID = UUID
   Vue.prototype.$lwAppBack = AppBack
-  Vue.prototype.$lwBarcodeResolve = barcodeResolve
+  Vue.prototype.$lwBarcodeResolve = BarcodeResolve
+  Vue.prototype.$lwDialog = lwDialog.call(Vue.prototype)
+  Vue.prototype.$lwTimezone = Timezone
+  Vue.prototype.$lwUtils = Utils
 }

package/src/utils/windowGlobalData.js

@@ -42,7 +42,33 @@ export function lwWindowGlobalData(){
       data:{}
     },
     // app返回的路由
-    appBackRoute:[]
+    appBackRoute:[],
+    // 时区
+    timezone: {
+      'UTC': {timezone: 'UTC', offset: 0},
+      'UTC+1': {timezone: 'UTC+1', offset: 60},
+      'UTC+2': {timezone: 'UTC+2', offset: 120},
+      'UTC+3': {timezone: 'UTC+3', offset: 180},
+      'UTC+4': {timezone: 'UTC+4', offset: 240},
+      'UTC+5': {timezone: 'UTC+5', offset: 300},
+      'UTC+6': {timezone: 'UTC+6', offset: 360},
+      'UTC+7': {timezone: 'UTC+7', offset: 420},
+      'UTC+8': {timezone: 'UTC+8', offset: 480},
+      'UTC+9': {timezone: 'UTC+9', offset: 540},
+      'UTC+10': {timezone: 'UTC+10', offset: 600},
+      'UTC+11': {timezone: 'UTC+11', offset: 660},
+      'UTC-1': {timezone: 'UTC-1', offset: -60},
+      'UTC-2': {timezone: 'UTC-2', offset: -120},
+      'UTC-3': {timezone: 'UTC-3', offset: -180},
+      'UTC-4': {timezone: 'UTC-4', offset: -240},
+      'UTC-5': {timezone: 'UTC-5', offset: -300},
+      'UTC-6': {timezone: 'UTC-6', offset: -360},
+      'UTC-7': {timezone: 'UTC-7', offset: -420},
+      'UTC-8': {timezone: 'UTC-8', offset: -480},
+      'UTC-9': {timezone: 'UTC-9', offset: -540},
+      'UTC-10': {timezone: 'UTC-10', offset: -600},
+      'UTC-11': {timezone: 'UTC-11', offset: -660},
+    }
   }
 
   // 初始化时获取本地储存的仓库信息

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

@@ -57,9 +57,20 @@ export default {
       try {
 
         // 获取语言  优先级：本地储存 > 项目预设 > 系统语言
-        const lang = this.$lwLocalStorag.get('lwLanguage') || this.$lwLanguage.getKey() || navigator.language
+        const lang = this.$lwLocalStorage.get('lwLanguage') || this.$lwLanguage.getKey() || navigator.language
         await this.$lwLanguage.asyncSetKey(lang, false)
 
+        if (!this.$lwLocalStorage.get('lwTimezone')){
+          this.$lwLocalStorage.set('lwTimezone', this.$lwTimezone.getTimezone())
+        }
+
+        try {
+          // app 退出路由设置
+          await this.$lwAppPower.setExitRoute(this.$lwAppBack.getExitRoute())
+        }catch (e) {
+          console.warn('设置APP退出路由失败', e)
+        }
+
         // 如果没有token 或者 没有仓库就去登录
         if (!this.$lwApiUtils.getToken() || !this.$lwWarehouse.get().id) {
 
@@ -96,12 +107,18 @@ export default {
           this.showLoading = false
         }, 1000)
 
-        console.warn('初始化页面异常：', e)
+        console.error('初始化页面异常：', e)
 
-        const api = ['wmsGetAllChoices','wmsGetUserPermissions']
+        const api = [
+          'wmsGetAllChoices',
+          'wmsGetUserPermissions',
+          'wmsMobilePrintSelectedTemplate',
+          'commonWmsLoadAllComponentConfig'
+        ]
         const url = e.config.url.split('/')
 
         if (api.includes(url.pop())){
+          this.$lwCloseErrorMsg()
           this.$router.replace({
             path: '/lwLogin'
           })

package/src/views/common/my/timezone.vue

@@ -0,0 +1,23 @@
+<!--
+  选择时区
+  @author: 张文
+  @date: 2022-08-02
+-->
+<template>
+  <lw-timezone-page/>
+</template>
+
+<script>
+
+export default {
+  name: "timezone",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/common/task/search.vue

@@ -0,0 +1,23 @@
+<!--
+  任务搜索
+  @author: 张文
+  @date: 2022-11-25
+-->
+<template>
+  <lw-search-task-page/>
+</template>
+
+<script>
+
+export default {
+  name: "search",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/config/masterLocation/masterLocationConfig/action.vue

@@ -0,0 +1,23 @@
+<!--
+  主库为配置
+  @author: 杨震天
+  @date: 2022-07-06
+-->
+<template>
+  <lw-inner-master-location-config-action-page/>
+</template>
+
+<script>
+
+export default {
+  name: "action",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/config/masterLocation/masterLocationConfig/index.vue

@@ -0,0 +1,23 @@
+<!--
+  商品住库位配置
+  @author: 杨震天
+  @date: 2022-07-05
+-->
+<template>
+  <lw-inner-master-location-config-index/>
+</template>
+
+<script>
+
+export default {
+  name: "index",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/config/masterLocation/masterLocationQuery/index.vue

@@ -0,0 +1,23 @@
+<!--
+  商品住库位配置
+  @author: 杨震天
+  @date: 2022-07-05
+-->
+<template>
+  <lw-inner-master-location-query-index/>
+</template>
+
+<script>
+
+export default {
+  name: "index",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/config/masterLocation/masterLocationQuery/queryByLocationCode.vue

@@ -0,0 +1,23 @@
+<!--
+  主库位查询-by库位编码
+  @author: 杨震天
+  @date: 2022-07-08
+-->
+<template>
+  <lw-inner-master-location-query-by-location-code-action/>
+</template>
+
+<script>
+
+export default {
+  name: "action",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/config/masterLocation/masterLocationQuery/queryBySkuCode.vue

@@ -0,0 +1,23 @@
+<!--
+  主库位查询
+  @author: 杨震天
+  @date: 2022-07-06
+-->
+<template>
+  <lw-inner-master-location-query-by-sku-code-action/>
+</template>
+
+<script>
+
+export default {
+  name: "action",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/count/console.vue

@@ -0,0 +1,23 @@
+<!--
+  盘点控制台
+  @author: 张文
+  @date: 2022-11-28
+-->
+<template>
+  <lw-count-console-index-page/>
+</template>
+
+<script>
+
+export default {
+  name: "console",
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/count/index.vue

@@ -8,7 +8,7 @@
     <lw-nav-bar title="盘点"/>
     <div class="lw-global-page-box">
       <div class="lw-global-model-box">
-        <lw-input title="盘点任务号" required
+        <lw-input title="盘点任务号" importd
                   v-model="taskNo.value"
                   :get-focus.sync="taskNo.focus"
                   @confirm="getCountTask"/>
@@ -85,4 +85,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

package/src/views/inbound/quality/InboundQualityExecuteView.vue

@@ -3,10 +3,10 @@
 </template>
 
 <script>
-import LwInboundQualityExecutePage from '../../../components/page/inbound/receive/quality/LwInboundQualityExecutePage'
+import LwInboundQualityExecutePage from '../../../components/page/inbound/receive/quality/LwInboundQualityExecutePage.vue'
 
 export default {
   name: 'InboundQualityExecuteView',
   components: { LwInboundQualityExecutePage }
 }
-</script>
+</script>

package/src/views/inbound/quality/InboundQualityTaskListView.vue

@@ -3,10 +3,10 @@
 </template>
 
 <script>
-import LwInboundQualityTaskListPage from '../../../components/page/inbound/receive/quality/LwInboundQualityTaskListPage'
+import LwInboundQualityTaskListPage from '../../../components/page/inbound/receive/quality/LwInboundQualityTaskListPage.vue'
 
 export default {
   name: 'InboundQualityTaskListView',
   components: { LwInboundQualityTaskListPage }
 }
-</script>
+</script>

package/src/views/inbound/receive/alloc/InboundReceiveAllocSkuExecuteView.vue

@@ -0,0 +1,13 @@
+<template>
+  <lw-inbound-receive-alloc-sku-execute-page/>
+</template>
+
+<script>
+import lwInboundReceiveAllocSkuExecutePage
+  from '../../../../components/page/inbound/receive/receive-alloc/LwInboundReceiveAllocSkuExecutePage.vue'
+
+export default {
+  name: 'InboundReceiveAllocSkuExecuteView',
+  components: { lwInboundReceiveAllocSkuExecutePage },
+}
+</script>