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

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

@@ -10,12 +10,12 @@
     <div class="lw-global-flex-between">
 
       <div class="lw-global-title" style="flex-shrink: 0">
-        {{ title || $lwLanguage.get('', '扫描统计') }}
+        {{ title || $lwLanguage.get('wms_project.pda.components.module.ScanDataList.scan', '扫描统计') }}
       </div>
 
       <div>
         <span class="lw-global-value">
-          {{ $lwLanguage.get('','行数') }}
+          {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.imabkbcr','行数') }}
         </span>
         <span class="lw-global-value-bold-red">
           {{ scanList.length }}
@@ -24,7 +24,7 @@
 
       <div>
         <span class="lw-global-value">
-          {{ $lwLanguage.get('','总数量') }}
+          {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.bmldqjbt','总数量') }}
         </span>
         <span class="lw-global-value-bold-red">
           {{ total }}
@@ -43,15 +43,18 @@
       <div class="lw-global-row lw-global-flex-between">
 
         <div class="lw-global-title lw-scan-data-list-title">
-          {{ $lwLanguage.get('','箱号/序列号') }}
+          {{ rowTitle ||  $lwLanguage.get('wms_project.pda.components.module.ScanDataList.pgbyfyml','箱号/序列号') }}
         </div>
 
         <div class="lw-global-title lw-scan-data-list-num">
-          {{ $lwLanguage.get('','数量') }}
+          {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.rtppuhwl','数量') }}
         </div>
 
-        <div class="lw-global-title lw-scan-data-list-btn">
-          {{ $lwLanguage.get('','操作') }}
+        <div
+          v-if="isChange"
+          class="lw-global-title lw-scan-data-list-btn"
+        >
+          {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.kuvraqkd','操作') }}
         </div>
 
       </div>
@@ -67,14 +70,23 @@
 
         <div class="lw-global-value-bold-red lw-scan-data-list-num">{{ i[qtyKey] }}</div>
 
-        <div class="lw-scan-data-list-btn">
-          <lw-button
+        <div
+          v-if="isChange"
+          class="lw-scan-data-list-btn"
+        >
+          <van-icon
+            name="clear"
+            color="#d50000"
+            size="20px"
+            @click="del(k)"
+          />
+<!--          <lw-button
             mini
             round
             @click="del(k)"
           >
-            {{ $lwLanguage.get('','删除') }}
-          </lw-button>
+            {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.ihocngtf','删除') }}
+          </lw-button>-->
         </div>
 
       </div>
@@ -84,7 +96,7 @@
         class="lw-global-click-style lw-scan-data-list-look-edit"
         @click="lookEdit"
       >
-        {{ $lwLanguage.get('', '查看全部 / 编辑') }}
+        {{ editText || $lwLanguage.get('wms_project.pda.components.module.ScanDataList.edit', '查看全部 / 编辑') }}
         <van-icon name="arrow" />
       </div>
 
@@ -93,14 +105,14 @@
     <!-- 更多弹出列表 -->
     <lw-popup
       v-model="popup.show"
-      :title="$lwLanguage.get('','查看更多')"
+      :title="$lwLanguage.get('wms_project.pda.components.module.ScanDataList.fywkkruh','查看更多')"
       height="70%"
       @closed="popupOff"
     >
 
       <!-- 搜索输入框 -->
       <lw-input
-        :title="$lwLanguage.get('','箱号/序列号')"
+        :title="rowTitle || $lwLanguage.get('wms_project.pda.components.module.ScanDataList.pgbyfyml','箱号/序列号')"
         v-model="popup.seoVal"
         @confirm="seoConfirm"
         @clear="seoClear"
@@ -110,7 +122,7 @@
             mini
             round
             @click="seoConfirm"
-          >{{ $lwLanguage.get('','搜索') }}</lw-button>
+          >{{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.wbncqmzx','搜索') }}</lw-button>
         </template>
       </lw-input>
 
@@ -119,15 +131,18 @@
         <div class="lw-global-row lw-global-flex-between">
 
           <div class="lw-global-title lw-scan-data-list-title">
-            {{ $lwLanguage.get('','箱号/序列号') }}
+            {{ rowTitle || $lwLanguage.get('wms_project.pda.components.module.ScanDataList.pgbyfyml','箱号/序列号') }}
           </div>
 
           <div class="lw-global-title lw-scan-data-list-num">
-            {{ $lwLanguage.get('','数量') }}
+            {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.rtppuhwl','数量') }}
           </div>
 
-          <div class="lw-global-title lw-scan-data-list-btn">
-            {{ $lwLanguage.get('','操作') }}
+          <div
+            v-if="isChange"
+            class="lw-global-title lw-scan-data-list-btn"
+          >
+            {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.kuvraqkd','操作') }}
           </div>
 
         </div>
@@ -142,14 +157,16 @@
 
           <div class="lw-global-value-bold-red lw-scan-data-list-num">{{ i[qtyKey] }}</div>
 
-          <div class="lw-scan-data-list-btn">
-            <lw-button
-              mini
-              round
+          <div
+            v-if="isChange"
+            class="lw-scan-data-list-btn"
+          >
+            <van-icon
+              name="clear"
+              color="#d50000"
+              size="20px"
               @click="popupDel(i,k)"
-            >
-              {{ $lwLanguage.get('','删除') }}
-            </lw-button>
+            />
           </div>
 
         </div>
@@ -159,7 +176,7 @@
       <!-- 确认按钮 -->
       <template #button>
         <lw-button @click="popupConfirm">
-          {{ $lwLanguage.get('','确认') }}
+          {{ $lwLanguage.get('wms_project.pda.components.module.ScanDataList.ibopntwx','确认') }}
         </lw-button>
       </template>
 
@@ -175,6 +192,8 @@ export default {
   props:{
     // 标题
     title: String,
+    // 列标题
+    rowTitle: String,
 
     // 扫描的数据
     value:{
@@ -198,7 +217,16 @@ export default {
     showListNum:{
       type: Number,
       default: 3
-    }
+    },
+
+    // 是否允许编辑
+    isChange:{
+      type: Boolean,
+      default: true
+    },
+
+    // 底部更多显示的文字
+    editText: String
 
   },
   computed:{
@@ -240,12 +268,13 @@ export default {
     del(index){
 
       const sn = this.scanList[index][this.snKey]
-      this.$dialog.confirm({
-        title: this.$lwLanguage.get('','警告'),
-        message: this.$lwLanguage.get('','确认删除') + ':' + sn,
+      this.$lwDialog.confirm({
+        title: this.$lwLanguage.get('wms_project.pda.components.module.ScanDataList.vwfdbaxc','警告'),
+        message: this.$lwLanguage.get('wms_project.pda.components.module.ScanDataList.msnpyznm','确认删除:') + sn,
       }).then(()=>{
-        this.scanList.splice(index, 1)
-        this.$lwToast.success(this.$lwLanguage.get('','删除成功'))
+        const item = this.scanList.splice(index, 1)
+        this.$lwToast.success(this.$lwLanguage.get('wms_project.pda.components.module.ScanDataList.olgsxjea','删除成功'))
+        this.$emit('del',item[0])
       }).catch(()=>{})
     },
 
@@ -281,8 +310,10 @@ export default {
 
     // 弹出确认
     popupConfirm(){
+      const change = this.scanList.length !== this.popup.rootList.length
       this.scanList = this.popup.rootList
       this.popup.show = false
+      this.$emit('confirm',change)
     },
     // 弹窗关闭
     popupOff(){

package/src/components/module/ScanDataList//346/211/253/346/217/217/346/225/260/346/215/256/345/261/225/347/244/272/345/217/212/345/210/240/351/231/244.md

@@ -0,0 +1,2 @@
+
+# 扫描数据展示及删除 [查看文档](https://www.yuque.com/docs/share/f925a9c2-4ef2-4f9a-9784-71289538df27)

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

@@ -7,8 +7,9 @@
   <div
     :class="[
       'lw-global-flex-start-start',
-      isRow && !isLast ? 'lw-global-row' : '',
-      isRow && isLast ? 'lw-global-row-end' : ''
+      isRowFirst ? 'lw-global-row-start' : '',
+      isRow && (!isRowLast && !isRowFirst) ? 'lw-global-row' : '',
+      isRowLast ? 'lw-global-row-end' : ''
     ]"
   >
     <div style="flex: 1">
@@ -23,7 +24,7 @@
           class="lw-global-value-bold-red"
         >{{ qty }}</div>
         <div class="lw-global-title">
-          {{ qtyText || $lwLanguage.get('', '数量') }}
+          {{ qtyText || $lwLanguage.get('wms_project.pda.components.module.SkuInfo.index.xjtkybxc','数量') }}
         </div>
       </div>
     </slot>
@@ -43,8 +44,10 @@ export default {
     qty: [String, Number],
     // 是否使用全局行样式
     isRow: Boolean,
+    // 是否是组的第一行，必须开启行
+    isRowFirst: Boolean,
     // 是否是组的最后一行，必须开启行
-    isLast: Boolean,
+    isRowLast: Boolean,
     // 数量的描述文字
     qtyText: String,
     // 是否显示右边数据栏

package/src/components/module/SkuInfo//346/237/245/347/234/213/345/225/206/345/223/201/344/277/241/346/201/257.md

@@ -0,0 +1,4 @@
+
+
+
+# 通过序列号搜索商品号 [查看文档](https://www.yuque.com/docs/share/631f96b9-a483-4a9e-ba1b-da8f120d9b91)

package/src/components/module/SnSearchSku/index.js

@@ -0,0 +1,11 @@
+/*
+* 通过序列号搜索商品号
+* @author: 张文
+* @date  2022-10-10
+* */
+
+import lwSnSearchSkuModule from "./index.vue";
+
+lwSnSearchSkuModule.install = Vue => Vue.component(lwSnSearchSkuModule.name, lwSnSearchSkuModule)
+
+export default lwSnSearchSkuModule

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

@@ -0,0 +1,150 @@
+<!--
+  通过序列号搜索商品号
+  @author: 张文
+  @date: 2022-10-10
+-->
+<template>
+  <div>
+
+    <lw-input
+      v-model="skuCode"
+      :get-focus.sync="skuFocus"
+      v-bind="inputProp"
+      @confirm="skuConfirm"
+    />
+
+    <lw-popup
+      :title="popupTitle || $lwLanguage.get('wms_project.pda.components.module.SnSearchSku.index.rylvpgem','选择')"
+      v-model="showPopup"
+      :off-btn-fn="offPopup"
+    >
+
+      <div
+        v-for="(i,k) in skuList"
+        :key="k"
+        :class="[
+          'lw-global-flex-between',
+          'lw-global-click-style',
+          getClassName(k)
+        ]"
+        @click="selectSku(i)"
+      >
+        <div style="flex: 1">
+          <div class="lw-global-value-bold">{{ i.skuCode }}</div>
+          <div class="lw-global-title">{{ i.skuName }}</div>
+        </div>
+
+        <van-icon name="arrow" size="20px" color="#999"/>
+      </div>
+
+    </lw-popup>
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "lwSnSearchSku",
+  props:{
+    value:{
+      type: [String,Number],
+      default: ''
+    },
+    getFocus:{
+      type: Boolean,
+      default: false
+    },
+    inputProp:{
+      type: Object,
+      default: () => {}
+    },
+    popupTitle: String,
+    skuId: String,
+    ownerId: String,
+  },
+  computed:{
+    skuCode:{
+      get(){
+        return this.value
+      },
+      set(v){
+        this.$emit('input', v)
+      }
+    },
+    skuFocus:{
+      get(){
+        return this.getFocus
+      },
+      set(v){
+        this.$emit('update:getFocus', v)
+      }
+    }
+  },
+  data() {
+    return {
+
+      // 显示弹框
+      showPopup: false,
+      // 商品列表
+      skuList:[]
+    }
+  },
+  methods: {
+    // 获取class名
+    getClassName(index){
+      if (index===0){
+        if (this.skuList.length === 1) return 'lw-global-row-end'
+        return 'lw-global-row-start'
+      }
+
+      if ((index+1) === this.skuList.length) return 'lw-global-row-end'
+
+      return 'lw-global-row'
+    },
+
+    // 输入框回车
+    skuConfirm(){
+
+      if (!this.skuCode) return
+
+      this.$lwApi.common.wmsProjectMobileGetSkuBySn({
+        skuId: this.skuId,
+        ownerId: this.ownerId,
+        sn: this.skuCode
+      }).then(res=>{
+        if (!res || !Array.isArray(res) || !res.length){
+          this.selectSku({skuCode: this.skuCode})
+          return
+        }
+
+        if (res.length === 1){
+          this.selectSku(res[0])
+          return
+        }
+
+        this.skuList = res
+        this.showPopup = true
+      })
+    },
+
+    // 确认选择
+    selectSku(item){
+      this.skuCode = item.skuCode
+      this.showPopup = false
+      this.$emit('confirm', item)
+    },
+
+    // 关闭弹窗
+    offPopup(){
+      this.showPopup = false
+      this.skuCode = ''
+      this.skuFocus = true
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/components/module/SnSearchSku//351/200/232/350/277/207/345/272/217/345/210/227/345/217/267/346/220/234/347/264/242/345/225/206/345/223/201/345/217/267.md

@@ -0,0 +1,2 @@
+
+# 收货异常模块 [查看文档](https://www.yuque.com/docs/share/fc1246b8-baa5-4755-ab1d-9e142f0a9867)

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">{{ $lwLocalStorage.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,
@@ -100,7 +110,7 @@ export default {
   },
   computed:{
     serverNameVal(){
-      return this.serverName || this.$lwAppPower.appHostName()
+      return this.serverName || this.appHost
     }
   },
   data() {
@@ -109,6 +119,7 @@ export default {
       online: '',
       // 用户名
       username: '',
+      appHost: '',
       // 修改状态按钮文字
       statusBtnText: this.$lwLanguage.get('wms_project.pda.model.systemInfo.downLine', '下线'),
       // 在线时长
@@ -121,37 +132,38 @@ export default {
     }
   },
   mounted() {
-
     this.getUserStatus()
-
+    this.$lwAppPower.appHostName().then((r)=>{
+      this.appHost = r
+    })
   },
   methods: {
     // 获取当前登录状态
     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 {
-        res = await this.$lwApi.user.userStatus()
+        res = await this.$lwApi.user.getUserInfo()
       }
 
+      this.online = res.taskOnlineData.online
 
-      this.online = res.online
+      this.username = res.common_name
 
-      this.username = res.staffName
 
       if (this.online){
 
         this.statusBtnText = this.$lwLanguage.get('wms_project.pda.model.systemInfo.downLine', '下线')
         const {text} = this.$lwDate.timeToStr({
-          l: res.lastOnlineTime,
-          n: new Date(),
-          agoText: false
+          l: res.last_login_time,
+          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,34 @@ 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";
+// 通过序列号搜索商品号
+import lwSnSearchSkuModule from "./SnSearchSku/index.js";
+// 下线理由弹框
+import lwOffLinePopupModule from "./OffLinePopup";
 
 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,
+  lwSnSearchSkuModule,
+  lwOffLinePopupModule,
 ]

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/Language/index.vue

@@ -114,7 +114,7 @@ export default {
     },
 
     // 确定按钮点击
-    confirmBtn(){
+    async confirmBtn(){
       if (!this.value){
         this.$lwShowErrorMsg(this.$lwLanguage.get('wms_project.pda.common.language.select','请选择语言'))
         return
@@ -125,13 +125,19 @@ export default {
         return
       }
 
-      this.$lwLanguage.asyncSetKey(this.value).then(()=>{
-        this.$lwToast.success({
-          message: this.$lwLanguage.get('wms_project.pda.common.language.success','设置成功')
-        })
+      await this.$lwLanguage.asyncSetKey(this.value)
 
-        history.go(-1)
+      this.$lwAxios.setLanguage(this.value)
+
+      if (this.$lwWarehouse.get() && this.$lwApiUtils.getToken()){
+        await this.$lwDict.asyncGet(null, true)
+      }
+
+      this.$lwToast.success({
+        message: this.$lwLanguage.get('wms_project.pda.common.language.success','设置成功')
       })
+
+      history.go(-1)
     },
   }
 }