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

package/src/components/module/SystemInfo/index.vue

@@ -40,10 +40,17 @@
     <!-- 当前服务器信息 -->
     <div v-if="showServer" class="lw-global-flex-start">
       <img class="lw-system-info-row-img" :src="serverImg" alt="">
-      <!-- 服务器名未获取 TODO -->
+      <!-- 服务器名未获取 -->
       <div class="lw-system-info-row-val">{{ serverNameVal || '-' }}</div>
     </div>
 
+    <!-- 时区 -->
+    <div v-if="showServer" class="lw-global-flex-start">
+      <img class="lw-system-info-row-img" src="./../../../assets/img/timezone.png" alt="">
+      <!-- 服务器名未获取 -->
+      <div class="lw-system-info-row-val">{{ $lwLocalStorag.get('lwTimezone').timezone || '-' }}</div>
+    </div>
+
     <slot name="end"/>
 
     <lw-on-line-module
@@ -55,14 +62,17 @@
 </template>
 
 <script>
+import warehouseImg from './../../../assets/img/warehouse.png'
+import linkImg from './../../../assets/img/link.png'
+
 
 export default {
   name: "lwSystemInfoModule",
   props:{
     // 请求路径
-    stateApi: String,
+    api: String,
     // 请求额外携带的参数
-    apiData: Object,
+    query: Object,
 
 
     // 是否显示仓库信息栏
@@ -73,7 +83,7 @@ export default {
     // 仓库图标
     warehouseImg:{
       type: null,
-      default: require('./../../../assets/img/warehouse.png')
+      default: warehouseImg
     },
     // 仓库显示的名称
     warehouseName: String,
@@ -86,7 +96,7 @@ export default {
     // 当前服务器路径图标
     serverImg:{
       type: null,
-      default: require('./../../../assets/img/link.png')
+      default: linkImg
     },
     // 当前服务器名称
     serverName: String,
@@ -129,11 +139,11 @@ export default {
     // 获取当前登录状态
     async getUserStatus(){
       let res = null
-      if (this.stateApi){
+      if (this.api){
         res = await this.$lwAxios({
-          url:this.stateApi,
+          url:this.api,
           data:{
-            ...this.apiData
+            ...this.query
           }
         })
       }else {
@@ -150,8 +160,8 @@ export default {
         this.statusBtnText = this.$lwLanguage.get('wms_project.pda.model.systemInfo.downLine', '下线')
         const {text} = this.$lwDate.timeToStr({
           l: res.lastOnlineTime,
-          n: new Date(),
-          agoText: false
+          agoText: false,
+          minType: 'min'
         })
         this.onLineTime = text
 

package/src/components/module/SystemInfo//347/263/273/347/273/237/344/277/241/346/201/257/344/270/216/344/270/212/347/272/277/347/212/266/346/200/201/346/250/241/345/235/227.md

@@ -1 +1 @@
-# 系统信息与上线状态模块 [查看文档](http://note.youdao.com/groupshare/?token=F0C2285CC01B47689B73BEDC6592F195&gid=136361463)
+# 系统信息与上线状态模块 [查看文档](https://www.yuque.com/docs/share/c94d99d7-afc3-421e-b531-f018d92656bf)

package/src/components/module/index.js

@@ -21,22 +21,28 @@ import lwReceiveAbnormalModule from './ReceiveAbnormal/index.js'
 // 在库异常
 import lwInnerAbnormalModule from './InnerAbnormal/index.js'
 // 批次属性数据查看
-import lwLotLookModule from "./LotLook";
+import lwLotLookModule from "./LotLook/index.js";
 // 扫描数据显示及删除模块
-import lwScanDataListModule from "./ScanDataList";
+import lwScanDataListModule from "./ScanDataList/index.js";
 // 查看商品信息
-import lwSkuInfoModule from "./SkuInfo";
+import lwSkuInfoModule from "./SkuInfo/index.js";
+// 显示箱号、客户及数量的组件
+import lwBoxInfoModule from "./BoxInfo/index.js";
+// 异常输入模块
+import lwAbnormalInputModule from "./AbnormalInput/index.js";
 
 export const module = [
-    lwLoginModule,
-    lwMenuModule,
-    lwOnLineModule,
-    lwSystemInfoModule,
-    lwMsgItemModule,
-    lwLotModule,
-    lwReceiveAbnormalModule,
-    lwInnerAbnormalModule,
-    lwLotLookModule,
-    lwScanDataListModule,
-    lwSkuInfoModule,
+  lwLoginModule,
+  lwMenuModule,
+  lwOnLineModule,
+  lwSystemInfoModule,
+  lwMsgItemModule,
+  lwLotModule,
+  lwReceiveAbnormalModule,
+  lwInnerAbnormalModule,
+  lwLotLookModule,
+  lwScanDataListModule,
+  lwSkuInfoModule,
+  lwBoxInfoModule,
+  lwAbnormalInputModule,
 ]

package/src/components/page/common/Device/index.js

@@ -1,11 +1,11 @@
-/*
-* 设备管理
-* @author: 张文
-* @date  2022-03-09
-* */
-
-import lwDevicePage from "./index.vue";
-
-lwDevicePage.install = Vue => Vue.component(lwDevicePage.name, lwDevicePage)
-
-export default lwDevicePage
+/*
+* 设备管理
+* @author: 张文
+* @date  2022-03-09
+* */
+
+import lwDevicePage from "./index.vue";
+
+lwDevicePage.install = Vue => Vue.component(lwDevicePage.name, lwDevicePage)
+
+export default lwDevicePage

package/src/components/page/common/Device/index.vue

@@ -120,7 +120,7 @@ export default {
   methods: {
     // 重新绑定
     clearDevice(){
-      this.$dialog.confirm({
+      this.$lwDialog.confirm({
         title: this.$lwLanguage.get('wms_project.pda.common.warning', '警告'),
         message: this.$lwLanguage.get('wms_project.pda.common.device.newBindingDel', '重新绑定将会删除当前设备'),
       }).then(() => {
@@ -137,7 +137,7 @@ export default {
 
     // 绑定当前设备
     addDevice(){
-      this.$dialog.confirm({
+      this.$lwDialog.confirm({
         title:this.$lwLanguage.get('wms_project.pda.common.tip', '提示'),
         message:this.$lwLanguage.get('wms_project.pda.common.device.confirmBinding','确认绑定')+
           `：${this.deviceInfo.name}（${this.deviceInfo.code}）?`

package/src/components/page/common/Device//350/256/276/345/244/207/347/256/241/347/220/206/351/241/265.md

@@ -1 +1 @@
-# 设备管理页  [查看文档](http://note.youdao.com/groupshare/?token=28C6BA4B1DE54CE1935FA0BD0EB95506&gid=136361463K)
+# 设备管理页  [查看文档](http://note.youdao.com/groupshare/?token=28C6BA4B1DE54CE1935FA0BD0EB95506&gid=136361463K)

package/src/components/page/common/Home/index.js

@@ -1,11 +1,11 @@
-/*
-* 首页
-* @author: 张文
-* @date  2022-03-01
-* */
-
-import lwHomePage from "./index.vue";
-
-lwHomePage.install = Vue => Vue.component(lwHomePage.name, lwHomePage)
-
-export default lwHomePage
+/*
+* 首页
+* @author: 张文
+* @date  2022-03-01
+* */
+
+import lwHomePage from "./index.vue";
+
+lwHomePage.install = Vue => Vue.component(lwHomePage.name, lwHomePage)
+
+export default lwHomePage

package/src/components/page/common/Home/index.vue

@@ -1,113 +1,113 @@
-<!--
-  首页
-  @author: 张文
-  @date: 2022-03-01
--->
-<template>
-  <div :style="{background: pageBg, minHeight: '100vh'}">
-
-    <!-- 顶部导航栏 -->
-    <slot name="nav">
-      <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.common.home.home', '首页')" :left-arrow="false"/>
-    </slot>
-
-    <slot name="top"/>
-
-    <!-- 系统信息 -->
-    <lw-system-info-module
-      v-if="showSystem"
-      v-bind="systemStyle"
-      @click="systemClick"
-    >
-
-      <template #top>
-        <slot name="systemTop"></slot>
-      </template>
-
-      <template #end>
-        <slot name="systemEnd"></slot>
-      </template>
-
-    </lw-system-info-module>
-
-    <slot name="menuTop"/>
-
-    <!-- 菜单 -->
-    <slot name="menu">
-      <lw-menu-module
-        v-if="showMenu"
-        style="padding: 10px"
-        :move="false"
-        v-bind="menuStyle"
-        @click="menuClick"
-      ></lw-menu-module>
-    </slot>
-
-    <!-- 底部 -->
-    <slot name="end"/>
-
-    <slot name="tabBar">
-      <lw-tab-bar :tab-bar-menu="tabBarMenu" :badge="badge"/>
-    </slot>
-
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: "lwHomePage",
-  props:{
-    // 页面背景颜色
-    pageBg:{
-      type: String,
-      default: '#ffffff'
-    },
-
-    // 是否显示系统数据模块
-    showSystem:{
-      type:Boolean,
-      default:true
-    },
-    // 系统信息数据
-    systemStyle: Object,
-
-    // 是否显示菜单模块
-    showMenu: {
-      type: Boolean,
-      default: true
-    },
-    // 菜单样式
-    menuStyle:{
-      type: Object,
-      default:() => {
-        return {
-          background:"#f0f0f0"
-        }
-      }
-    },
-
-    // 底部导航栏的菜单数据
-    tabBarMenu:Object,
-    // 底部导航栏的角标更新
-    badge: Array
-  },
-  data() {
-    return {}
-  },
-  methods: {
-    // 系统信息下线按钮被点击
-    systemClick(ev){
-      this.$emit('systemClick', ev)
-    },
-    // 菜单项被点击
-    menuClick({item, key}){
-      this.$emit('menuClick', {item, key})
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-
-</style>
+<!--
+  首页
+  @author: 张文
+  @date: 2022-03-01
+-->
+<template>
+  <div :style="{background: pageBg, minHeight: '100vh'}">
+
+    <!-- 顶部导航栏 -->
+    <slot name="nav">
+      <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.common.home.home', '首页')" :left-arrow="false"/>
+    </slot>
+
+    <slot name="top"/>
+
+    <!-- 系统信息 -->
+    <lw-system-info-module
+      v-if="showSystem"
+      v-bind="systemStyle"
+      @click="systemClick"
+    >
+
+      <template #top>
+        <slot name="systemTop"></slot>
+      </template>
+
+      <template #end>
+        <slot name="systemEnd"></slot>
+      </template>
+
+    </lw-system-info-module>
+
+    <slot name="menuTop"/>
+
+    <!-- 菜单 -->
+    <slot name="menu">
+      <lw-menu-module
+        v-if="showMenu"
+        style="padding: 10px"
+        :move="false"
+        v-bind="menuStyle"
+        @click="menuClick"
+      ></lw-menu-module>
+    </slot>
+
+    <!-- 底部 -->
+    <slot name="end"/>
+
+    <slot name="tabBar">
+      <lw-tab-bar :tab-bar-menu="tabBarMenu" :badge="badge"/>
+    </slot>
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "lwHomePage",
+  props:{
+    // 页面背景颜色
+    pageBg:{
+      type: String,
+      default: '#ffffff'
+    },
+
+    // 是否显示系统数据模块
+    showSystem:{
+      type:Boolean,
+      default:true
+    },
+    // 系统信息数据
+    systemStyle: Object,
+
+    // 是否显示菜单模块
+    showMenu: {
+      type: Boolean,
+      default: true
+    },
+    // 菜单样式
+    menuStyle:{
+      type: Object,
+      default:() => {
+        return {
+          background:"#f0f0f0"
+        }
+      }
+    },
+
+    // 底部导航栏的菜单数据
+    tabBarMenu:Object,
+    // 底部导航栏的角标更新
+    badge: Array
+  },
+  data() {
+    return {}
+  },
+  methods: {
+    // 系统信息下线按钮被点击
+    systemClick(ev){
+      this.$emit('systemClick', ev)
+    },
+    // 菜单项被点击
+    menuClick({item, key}){
+      this.$emit('menuClick', {item, key})
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/components/page/common/Home//344/270/273/351/241/265.md

@@ -1 +1 @@
-# 主页 [查看文档](http://note.youdao.com/groupshare/?token=693F331CA55C4974AC983FEE580B45AA&gid=136361463)
+# 主页 [查看文档](http://note.youdao.com/groupshare/?token=693F331CA55C4974AC983FEE580B45AA&gid=136361463)

package/src/components/page/common/Language/index.js

@@ -1,11 +1,11 @@
-/*
-* 语言选择页
-* @author: 张文
-* @date  2022-04-14
-* */
-
-import lwLanguagePage from "./index.vue";
-
-lwLanguagePage.install = Vue => Vue.component(lwLanguagePage.name, lwLanguagePage)
-
-export default lwLanguagePage
+/*
+* 语言选择页
+* @author: 张文
+* @date  2022-04-14
+* */
+
+import lwLanguagePage from "./index.vue";
+
+lwLanguagePage.install = Vue => Vue.component(lwLanguagePage.name, lwLanguagePage)
+
+export default lwLanguagePage