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

package/src/components/module/index.js

@@ -1,42 +1,48 @@
-/*
-* 组件导出入口
-* @author: 张文
-* @date  2022-02-23
-* */
-
-// 登录功能模块
-import lwLoginModule from './Login/index.js'
-// 菜单模块
-import lwMenuModule from './Menu/index.js'
-// 上下线模块
-import lwOnLineModule from './OnLine/index.js'
-// 系统信息模块
-import lwSystemInfoModule from './SystemInfo/index.js'
-// 消息列表及分页模块
-import lwMsgItemModule from './MsgItem/index.js'
-// 批次属性
-import lwLotModule from './Lot/index.js'
-// 收货异常
-import lwReceiveAbnormalModule from './ReceiveAbnormal/index.js'
-// 在库异常
-import lwInnerAbnormalModule from './InnerAbnormal/index.js'
-// 批次属性数据查看
-import lwLotLookModule from "./LotLook";
-// 扫描数据显示及删除模块
-import lwScanDataListModule from "./ScanDataList";
-// 查看商品信息
-import lwSkuInfoModule from "./SkuInfo";
-
-export const module = [
-    lwLoginModule,
-    lwMenuModule,
-    lwOnLineModule,
-    lwSystemInfoModule,
-    lwMsgItemModule,
-    lwLotModule,
-    lwReceiveAbnormalModule,
-    lwInnerAbnormalModule,
-    lwLotLookModule,
-    lwScanDataListModule,
-    lwSkuInfoModule,
-]
+/*
+* 组件导出入口
+* @author: 张文
+* @date  2022-02-23
+* */
+
+// 登录功能模块
+import lwLoginModule from './Login/index.js'
+// 菜单模块
+import lwMenuModule from './Menu/index.js'
+// 上下线模块
+import lwOnLineModule from './OnLine/index.js'
+// 系统信息模块
+import lwSystemInfoModule from './SystemInfo/index.js'
+// 消息列表及分页模块
+import lwMsgItemModule from './MsgItem/index.js'
+// 批次属性
+import lwLotModule from './Lot/index.js'
+// 收货异常
+import lwReceiveAbnormalModule from './ReceiveAbnormal/index.js'
+// 在库异常
+import lwInnerAbnormalModule from './InnerAbnormal/index.js'
+// 批次属性数据查看
+import lwLotLookModule from "./LotLook/index.js";
+// 扫描数据显示及删除模块
+import lwScanDataListModule from "./ScanDataList/index.js";
+// 查看商品信息
+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,
+  lwBoxInfoModule,
+  lwAbnormalInputModule,
+]

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

@@ -1,186 +1,186 @@
-<!--
-  设备管理
-  @author: 张文
-  @date: 2022-03-09
--->
-<template>
-  <div class="lw-device-page-box">
-    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.common.device.title', '设备管理')"/>
-
-    <div class="lw-global-page-box">
-
-      <div
-        class="lw-global-title-left-line lw-global-animation-out"
-        style="padding-bottom: 10px"
-      >
-        {{ hasDevice ?
-          $lwLanguage.get('wms_project.pda.common.device.nowBinding', '当前绑定设备') :
-          $lwLanguage.get('wms_project.pda.common.device.bindingDevice', '绑定设备')
-        }}
-      </div>
-
-      <!-- 绑定新设备输入框 -->
-      <div
-        v-if="!hasDevice"
-        class="lw-global-model-box lw-global-animation-out"
-      >
-        <lw-input
-          v-model="value"
-          :get-focus.sync="focus"
-          :show-bottom-border="false"
-          :title="$lwLanguage.get('wms_project.pda.common.device.barCode', '设备条码')"
-          @confirm="search"
-        />
-      </div>
-
-      <!--信息设备-->
-      <div
-        v-if="deviceInfo.name"
-        class="lw-global-model-box lw-global-animation-out"
-      >
-
-        <div class="lw-global-row">
-          <span class="lw-global-title lw-global-show-colon">
-            {{$lwLanguage.get('wms_project.pda.common.device.name', '设备名称')}}
-          </span>
-          <span class="lw-global-value">{{ deviceInfo.name }}</span>
-        </div>
-
-        <div class="lw-global-row">
-          <span class="lw-global-title lw-global-show-colon">
-            {{$lwLanguage.get('wms_project.pda.common.device.number', '设备编号')}}
-          </span>
-          <span class="lw-global-value">{{ deviceInfo.code }}</span>
-        </div>
-
-        <div class="lw-global-row">
-          <span class="lw-global-title lw-global-show-colon">
-            {{ $lwLanguage.get('wms_project.pda.common.device.topDownType', '高低类型') }}
-          </span>
-          <span class="lw-global-value">{{ deviceInfo.forkliftHightLowTypeLabel }}</span>
-        </div>
-
-        <div style="padding-top: 10px;border-top: solid 1px #f0f0f0">
-          <lw-button
-            v-if="hasDevice"
-            @click="clearDevice"
-            block
-          >{{ $lwLanguage.get('wms_project.pda.common.device.newBinding', '重新绑定') }}</lw-button>
-
-          <lw-button
-            v-else
-            @click="addDevice"
-            block
-          >{{ $lwLanguage.get('wms_project.pda.common.device.binding', '绑定') }}</lw-button>
-        </div>
-      </div>
-
-
-    </div>
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: "lwDevicePage",
-  data() {
-    return {
-      // 设备信息
-      deviceInfo:{
-        name:'',
-        code:'',
-        forkliftHightLowTypeLabel:'',
-        id:''
-      },
-
-      // 当前是否绑定设备
-      hasDevice: false,
-
-      // 新设备条码
-      value:'',
-      // 输入框获取焦点
-      focus: false,
-
-
-    }
-  },
-  mounted() {
-    this.$lwApi.device.get().then(res=>{
-      if (res){
-        this.hasDevice = true
-        this.deviceInfo.name = res.name
-        this.deviceInfo.code = res.code
-        this.deviceInfo.forkliftHightLowTypeLabel = res.forkliftHightLowTypeLabel
-      }else {
-        this.focus = true
-      }
-    })
-  },
-  methods: {
-    // 重新绑定
-    clearDevice(){
-      this.$dialog.confirm({
-        title: this.$lwLanguage.get('wms_project.pda.common.warning', '警告'),
-        message: this.$lwLanguage.get('wms_project.pda.common.device.newBindingDel', '重新绑定将会删除当前设备'),
-      }).then(() => {
-        this.$lwApi.device.del().then(()=>{
-          this.deviceInfo.name = ''
-          this.deviceInfo.code = ''
-          this.deviceInfo.forkliftHightLowTypeLabel = ''
-          this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.common.delSuccess', '删除成功'))
-          this.hasDevice = false
-          this.focus = true
-        })
-      }).catch(() => {});
-    },
-
-    // 绑定当前设备
-    addDevice(){
-      this.$dialog.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}）?`
-      }).then(()=>{
-        this.$lwApi.device.add({id:this.deviceInfo.id}).then(()=>{
-          this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.common.device.success','设备绑定成功'))
-          setTimeout(()=>{
-            history.go(-1)
-          },2000)
-        })
-      }).catch(()=>{})
-    },
-
-    // 搜索设备
-    search(){
-      this.$lwApi.device.search({forkliftCode:this.value}).then(res=>{
-        if (res){
-          this.deviceInfo.name=res.name
-          this.deviceInfo.code=res.code
-          this.deviceInfo.id=res.id
-          this.deviceInfo.forkliftHightLowTypeLabel = res.forkliftHightLowTypeLabel
-        }else {
-          this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.common.device.notDeviceData','没有找到设备数据'))
-          this.value =''
-          this.deviceInfo.name=''
-        }
-      }).catch(() => {
-        this.value =''
-        this.deviceInfo.name=''
-      })
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-
-.lw-device-page-box{
-
-  .lw-global-row{
-    padding-left: 0;
-    padding-right: 0;
-  }
-}
-
-</style>
+<!--
+  设备管理
+  @author: 张文
+  @date: 2022-03-09
+-->
+<template>
+  <div class="lw-device-page-box">
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.common.device.title', '设备管理')"/>
+
+    <div class="lw-global-page-box">
+
+      <div
+        class="lw-global-title-left-line lw-global-animation-out"
+        style="padding-bottom: 10px"
+      >
+        {{ hasDevice ?
+          $lwLanguage.get('wms_project.pda.common.device.nowBinding', '当前绑定设备') :
+          $lwLanguage.get('wms_project.pda.common.device.bindingDevice', '绑定设备')
+        }}
+      </div>
+
+      <!-- 绑定新设备输入框 -->
+      <div
+        v-if="!hasDevice"
+        class="lw-global-model-box lw-global-animation-out"
+      >
+        <lw-input
+          v-model="value"
+          :get-focus.sync="focus"
+          :show-bottom-border="false"
+          :title="$lwLanguage.get('wms_project.pda.common.device.barCode', '设备条码')"
+          @confirm="search"
+        />
+      </div>
+
+      <!--信息设备-->
+      <div
+        v-if="deviceInfo.name"
+        class="lw-global-model-box lw-global-animation-out"
+      >
+
+        <div class="lw-global-row">
+          <span class="lw-global-title lw-global-show-colon">
+            {{$lwLanguage.get('wms_project.pda.common.device.name', '设备名称')}}
+          </span>
+          <span class="lw-global-value">{{ deviceInfo.name }}</span>
+        </div>
+
+        <div class="lw-global-row">
+          <span class="lw-global-title lw-global-show-colon">
+            {{$lwLanguage.get('wms_project.pda.common.device.number', '设备编号')}}
+          </span>
+          <span class="lw-global-value">{{ deviceInfo.code }}</span>
+        </div>
+
+        <div class="lw-global-row">
+          <span class="lw-global-title lw-global-show-colon">
+            {{ $lwLanguage.get('wms_project.pda.common.device.topDownType', '高低类型') }}
+          </span>
+          <span class="lw-global-value">{{ deviceInfo.forkliftHightLowTypeLabel }}</span>
+        </div>
+
+        <div style="padding-top: 10px;border-top: solid 1px #f0f0f0">
+          <lw-button
+            v-if="hasDevice"
+            @click="clearDevice"
+            block
+          >{{ $lwLanguage.get('wms_project.pda.common.device.newBinding', '重新绑定') }}</lw-button>
+
+          <lw-button
+            v-else
+            @click="addDevice"
+            block
+          >{{ $lwLanguage.get('wms_project.pda.common.device.binding', '绑定') }}</lw-button>
+        </div>
+      </div>
+
+
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "lwDevicePage",
+  data() {
+    return {
+      // 设备信息
+      deviceInfo:{
+        name:'',
+        code:'',
+        forkliftHightLowTypeLabel:'',
+        id:''
+      },
+
+      // 当前是否绑定设备
+      hasDevice: false,
+
+      // 新设备条码
+      value:'',
+      // 输入框获取焦点
+      focus: false,
+
+
+    }
+  },
+  mounted() {
+    this.$lwApi.device.get().then(res=>{
+      if (res){
+        this.hasDevice = true
+        this.deviceInfo.name = res.name
+        this.deviceInfo.code = res.code
+        this.deviceInfo.forkliftHightLowTypeLabel = res.forkliftHightLowTypeLabel
+      }else {
+        this.focus = true
+      }
+    })
+  },
+  methods: {
+    // 重新绑定
+    clearDevice(){
+      this.$lwDialog.confirm({
+        title: this.$lwLanguage.get('wms_project.pda.common.warning', '警告'),
+        message: this.$lwLanguage.get('wms_project.pda.common.device.newBindingDel', '重新绑定将会删除当前设备'),
+      }).then(() => {
+        this.$lwApi.device.del().then(()=>{
+          this.deviceInfo.name = ''
+          this.deviceInfo.code = ''
+          this.deviceInfo.forkliftHightLowTypeLabel = ''
+          this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.common.delSuccess', '删除成功'))
+          this.hasDevice = false
+          this.focus = true
+        })
+      }).catch(() => {});
+    },
+
+    // 绑定当前设备
+    addDevice(){
+      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}）?`
+      }).then(()=>{
+        this.$lwApi.device.add({id:this.deviceInfo.id}).then(()=>{
+          this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.common.device.success','设备绑定成功'))
+          setTimeout(()=>{
+            history.go(-1)
+          },2000)
+        })
+      }).catch(()=>{})
+    },
+
+    // 搜索设备
+    search(){
+      this.$lwApi.device.search({forkliftCode:this.value}).then(res=>{
+        if (res){
+          this.deviceInfo.name=res.name
+          this.deviceInfo.code=res.code
+          this.deviceInfo.id=res.id
+          this.deviceInfo.forkliftHightLowTypeLabel = res.forkliftHightLowTypeLabel
+        }else {
+          this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.common.device.notDeviceData','没有找到设备数据'))
+          this.value =''
+          this.deviceInfo.name=''
+        }
+      }).catch(() => {
+        this.value =''
+        this.deviceInfo.name=''
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+.lw-device-page-box{
+
+  .lw-global-row{
+    padding-left: 0;
+    padding-right: 0;
+  }
+}
+
+</style>

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

@@ -126,6 +126,7 @@ export default {
       }
 
       this.$lwLanguage.asyncSetKey(this.value).then(()=>{
+        this.$lwAxios.setLanguage(this.value)
         this.$lwToast.success({
           message: this.$lwLanguage.get('wms_project.pda.common.language.success','设置成功')
         })

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

@@ -49,9 +49,6 @@
           <template #button>
             <slot name="loginButton"/>
           </template>
-          <template #addButton>
-            <slot name="loginAddButton"/>
-          </template>
           <template #end>
             <slot name="loginEnd"/>
           </template>
@@ -66,6 +63,7 @@
 </template>
 
 <script>
+import logoImage from '../../../../assets/img/logo.png'
 
 export default {
   name: "lwLoginPage",
@@ -76,7 +74,7 @@ export default {
     subtitle: String,
     // logo路径
     logoSrc: {
-      default: require('../../../../assets/img/logo.png')
+      default: logoImage
     },
     // 顶部背景色
     background:{

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

@@ -6,7 +6,7 @@
 <template>
   <div>
     <slot name="nav" :data="menuTitle">
-      <lw-nav-bar :title="menuTitle"/>
+      <lw-nav-bar :title="i18nTitle"/>
     </slot>
 
     <slot name="top"></slot>
@@ -40,23 +40,29 @@ export default {
     // 取全局数据的key
     dataKey: String,
     // 标题
-    title: String
+    title: String,
+  },
+  data() {
+    return {
+      pageMenuKey: this.$route.query.lwMenuKey,
+      i18nTitle: this.title,
+    }
   },
   computed:{
     menuTitle(){
-      return this.title || this.$route.query.lwMenuTitle || this.$lwLanguage.get('wms_project.pda.common.menu.menu','菜单')
+      return this.i18nTitle || this.title || this.$route.query.lwMenuTitle || this.$lwLanguage.get('wms_project.pda.common.menu.menu','菜单')
     },
     menuKey(){
-      return this.dataKey || this.$route.query.lwMenuKey || ''
+      return this.dataKey || this.pageMenuKey || ''
     }
   },
-  data() {
-    return {
-
+  created() {
+    if (this.pageMenuKey) {
+      const menu = this.$lwMenu.get(this.pageMenuKey)
+      if (menu.titleKey) {
+        this.i18nTitle = this.$lwLanguage.get(menu.titleKey, menu.title)
+      }
     }
-  },
-  mounted() {
-
   },
   methods: {
     click(obj){