@logwire/logwire-wms-pda-ui 3.4.0 → 3.5.0

package/src/views/common/module/SearchSelectPopup/index.vue

@@ -0,0 +1,303 @@
+<!--
+  选择搜索弹框
+  @author: 张文
+  @date: 2023-09-14
+-->
+<template>
+  <div>
+    <lw-input
+      ref="searchSelectInput"
+      :title="title"
+      v-model="inputVal"
+      :required="required"
+      :show-bottom-border="showBorder"
+      :get-focus.sync="focus"
+      :disabled="disabled || isDisabled"
+      :rule-key="ruleKey"
+      :rule-prefix="rulePrefix"
+      :rule-value-key="ruleValueKey"
+      :rule-serve-query="ruleServeQuery"
+      :create-rule="createRule"
+      :owner-id="ownerId"
+      :input-align="inputAlign"
+      :need-show-clear="!disabled"
+      :placeholder="placeholder"
+      @confirm="inputConfirm"
+      @clear="inputClear"
+    >
+
+      <template #button>
+        <van-icon
+          v-if="!disabled && (!isDisabled || hasDataHideSelect)"
+          name="arrow"
+          color="#cdcdcd"
+          size="18px"
+          @click="popup.show = true"
+        />
+      </template>
+    </lw-input>
+
+    <!-- 选择弹框 -->
+    <lw-much-data-select-popup-module
+      v-model="popup.show"
+      :keyword="popup.keyword"
+      :title="title"
+      :type="type"
+      :api="getData"
+      :label-key="labelKey"
+      :owner-label-key="ownerLabelKey"
+      :rule-key="ruleKey"
+      :rule-prefix="rulePrefix"
+      :rule-value-key="ruleValueKey"
+      :rule-serve-query="ruleServeQuery"
+      :create-rule="createRule"
+      :owner-id="ownerId"
+      :owner-rule-key="ownerRuleKey"
+      :owner-rule-value-key="ownerRuleValueKey"
+      :owner-create-rule="ownerCreateRule"
+      :hidden-owner-search="hiddenOwnerSearch"
+      @confirm="dataSelected"
+    />
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "lwSearchSelectPopupModule",
+  props: {
+    // 类型
+    type: String,
+    /*
+    * 获取数据的方法
+    * 入参：{ pageSize: 分页大小, pageNum: 页码, keyword: 搜索的关键字 }
+    * 返回：{ total: 总条数, datas: 数据（数组类型） }
+    * */
+    api: {
+      type: Function,
+      required: true
+    },
+    // 数据显示的key
+    labelKey: {
+      type: Array,
+      default: () => ['code', 'name']
+    },
+    // 当type=sku时货主的取值
+    ownerLabelKey: {
+      type: Array,
+      default: () => ['ownerCode', 'ownerName']
+    },
+    // 选中后的取值key
+    valueKey: {
+      type: String,
+      default: 'id'
+    },
+    // 选中的值
+    value: String,
+    // 标题
+    title: String,
+    // 输入框占位符
+    placeholder: String,
+    // 焦点
+    getFocus: {
+      type: Boolean,
+      default: false
+    },
+    // 是否显示下划线
+    showBorder: {
+      type: Boolean,
+      default: true
+    },
+    // 是否显示必填星号
+    required: {
+      type: Boolean,
+      default: false
+    },
+    // 扫码解析后输入框回填字段的key
+    ruleValueKey: {
+      type: String,
+      default: 'key'
+    },
+    // 解码的额外参数
+    ruleServeQuery: {
+      type: Object,
+      default: () => {
+      }
+    },
+    // 货主id
+    ownerId: null,
+    // 条码解析规则key
+    ruleKey: String,
+    // 条码解析规则前缀
+    rulePrefix: String,
+    // 条码解析创建规则数据
+    createRule: Object,
+    // 货主条码解析规则key
+    ownerRuleKey: String,
+    // 货主条码解析规则前缀
+    ownerRuleValueKey: String,
+    // 货主条码解析创建规则数据
+    ownerCreateRule: Object,
+    // 输入框文本对齐方式
+    inputAlign: String,
+    // 是否禁用，如果值为true则不显示清空按钮
+    disabled: Boolean,
+    // 有选中数据后隐藏打开选择弹框按钮
+    hasDataHideSelect: {
+      type: Boolean,
+      default: true
+    },
+    // 失焦后是否自动搜索
+    blurSearch: {
+      type: Boolean,
+      default: true
+    },
+    // 是否显示货主搜索弹框，当 type=sku 时有效
+    hiddenOwnerSearch: {
+      type: Boolean,
+      default: false
+    },
+
+
+  },
+  computed: {
+    // 是否获取焦点
+    focus: {
+      get() {
+        return this.getFocus
+      },
+      set(v) {
+        this.$emit('update:getFocus', v)
+      }
+    },
+    // 选中的值
+    selectedVal: {
+      get() {
+        return this.value
+      },
+      set(v) {
+        this.$emit('input', v)
+      }
+    },
+  },
+  data() {
+    return {
+      // 显示在输入框的值
+      inputVal: '',
+      // 是否禁用
+      isDisabled: false,
+
+      // 搜索弹框
+      popup: {
+        show: false,
+        keyword: '',
+      }
+
+    }
+  },
+  methods: {
+    // 暴露给外部使用 - 调用前请务必确保value参数有值 - 用于回填数据/参数表明是否禁用选择
+    initEchoData(isDisabled) {
+      if (!this.selectedVal) {
+        this.$lwToast.fail(
+          this.$lwLanguage.get('', '初始化{title}失败，参数value值为空', {title: this.title})
+        )
+        return
+      }
+
+      this.getData({id: this.selectedVal}).then(({datas}) => {
+        this.formatDataAndDisabled(datas[0])
+        this.isDisabled = isDisabled
+      })
+    },
+    // 暴露给外部使用 - 用于手动调用输入框的搜索。当输入框没有搜索的情况会自动调用搜索，如果搜索成功后会触发 confirm 事件或弹出选择框
+    needSearch() {
+      // 如果当前有值、或被禁用就直接返回 false
+      if (this.disabled || this.isDisabled) return
+
+      // 如果输入框存在值则调用输入框的回车搜索
+      this.$refs.searchSelectInput.confirm()
+    },
+    // 暴露给外部使用 - 用于清空输入框
+    inputClear(getFocus = true, emit = true) {
+      this.isDisabled = false
+      this.inputVal = ''
+      this.selectedVal = ''
+      this.popup.keyword = ''
+      getFocus && this.$nextTick(() => this.focus = true)
+      emit && this.$emit('clear')
+    },
+
+
+    // 回填数据并禁用输入框
+    formatDataAndDisabled(item) {
+      this.focus = false
+      this.$nextTick(() => {
+        this.isDisabled = true
+        this.inputVal = this.getLabel(item)
+      })
+    },
+
+    // 获取选择的显示值
+    getLabel(item) {
+      let str = ''
+      this.labelKey.forEach(k => {
+        str += (item[k] + ' / ')
+      })
+      return str.substring(0, str.length - 3)
+    },
+    // 获取数据
+    getData(data) {
+      return this.api({
+        pageSize: 10,
+        pageNum: 1,
+        ...data
+      })
+    },
+    // 确认选中
+    dataSelected(item) {
+      this.formatDataAndDisabled(item)
+      this.selectedVal = item[this.valueKey]
+      this.popup.show = false
+      this.$emit('confirm', item)
+    },
+
+    // 输入框 - 确定
+    async inputConfirm(val, {data}) {
+
+      // 如果类型为 sku，且解析数据中包含有 skuId 则不需要再请求接口直接回填数据即可
+      if (this.type === 'sku' && data.skuId) {
+        this.dataSelected({
+          id: data.skuId,
+          code: data.skuCode,
+          name: data.skuName,
+          barcodeData: data
+        })
+        return
+      }
+
+      const {total, datas} = await this.getData({keyword: this.inputVal})
+
+      switch (total) {
+        case 0:
+          this.$lwToast.fail(
+            this.$lwLanguage.get('', '没有查询到任何数据')
+          )
+          this.inputClear()
+          return false
+        case 1:
+          this.dataSelected(datas[0])
+          return true
+        default:
+          this.popup.keyword = this.inputVal
+          this.popup.show = true
+          return false
+      }
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/common/module/SystemInfo/index.vue

@@ -13,9 +13,10 @@
         <span class="lw-system-info-state">{{ username }}</span>
         {{ $lwLanguage.get('wms_project.pda.model.systemInfo.yi', '已') }}
         <span class="lw-system-info-state">
-          {{ online?
-            $lwLanguage.get('wms_project.pda.model.systemInfo.upLine', '上线') :
-            $lwLanguage.get('wms_project.pda.model.systemInfo.downLine', '下线')
+          {{
+            online ?
+              $lwLanguage.get('wms_project.pda.model.systemInfo.upLine', '上线') :
+              $lwLanguage.get('wms_project.pda.model.systemInfo.downLine', '下线')
           }}
         </span>
       </div>
@@ -23,7 +24,8 @@
         mini
         round
         @click="click"
-      >{{ statusBtnText }}</lw-button>
+      >{{ statusBtnText }}
+      </lw-button>
     </div>
 
     <div v-if="online">
@@ -31,24 +33,36 @@
       <span class="lw-system-info-state">{{ onLineTime }}</span>
     </div>
 
-    <!-- 仓库信息 -->
-    <div v-if="showWarehouse" class="lw-global-flex-start">
-      <img class="lw-system-info-row-img" :src="warehouseImg" alt="">
-      <div class="lw-system-info-row-val">{{ warehouseName || $lwWarehouse.get().name || '-' }}</div>
-    </div>
+    <div
+      style="flex-wrap: wrap"
+      class="lw-global-flex-between"
+    >
+
+      <!-- 仓库信息 -->
+      <div
+        v-if="showWarehouse"
+        class="lw-global-flex-start system-item"
+      >
+        <img class="lw-system-info-row-img" :src="warehouseImg" alt="">
+        <div class="lw-system-info-row-val">{{ warehouseName || $lwWarehouse.get().name || '-' }}</div>
+      </div>
 
-    <!-- 当前服务器信息 -->
-    <div v-if="showServer" class="lw-global-flex-start">
-      <img class="lw-system-info-row-img" :src="serverImg" alt="">
-      <!-- 服务器名未获取 -->
-      <div class="lw-system-info-row-val">{{ serverNameVal || '-' }}</div>
-    </div>
+      <!-- 当前服务器信息 -->
+      <div
+        v-if="showServer"
+        class="lw-global-flex-start system-item"
+      >
+        <img class="lw-system-info-row-img" :src="serverImg" alt="">
+        <!-- 服务器名未获取 -->
+        <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 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>
     </div>
 
     <slot name="end"/>
@@ -134,15 +148,15 @@ export default {
   },
   methods: {
     // 获取当前登录状态
-    async getUserStatus(){
-      let res = this.$lwUserInfo.get()
+    async getUserStatus(need) {
+      let res = need ? await this.$lwUserInfo.asyncGet() : this.$lwUserInfo.get()
 
       this.online = res.taskOnlineData.online
 
       this.username = res.common_name
 
 
-      if (this.online){
+      if (this.online) {
 
         this.statusBtnText = this.$lwLanguage.get('wms_project.pda.model.systemInfo.downLine', '下线')
         const {text} = this.$lwDate.timeToStr({
@@ -171,7 +185,7 @@ export default {
 
     // 状态管理弹出关闭
     onlineConfirm(){
-      this.getUserStatus()
+      this.getUserStatus(true)
     }
   }
 }
@@ -202,13 +216,19 @@ export default {
   color: @baseColor;
 }
 
-.lw-system-info-row-img{
+.lw-system-info-row-img {
   width: 18px;
   margin-right: 8px;
 }
 
-.lw-system-info-row-val{
+.lw-system-info-row-val {
   color: @titleColor;
 }
 
+
+.system-item {
+  min-width: 30%;
+  margin-right: 5px;
+}
+
 </style>

package/src/views/common/module/UserSelectPopup/index.vue

@@ -168,7 +168,7 @@ export default {
       this.$lwApi.common.staffList({
         key: search,
         pageSize,
-        pageNum: pageNum - 1
+        pageNum
       }).then(res => {
 
         // 当为复选模式时，回显选中的数据

package/src/views/common/module/index.js

@@ -24,6 +24,10 @@ import lwUserSelectModule from './UserSelect'
 import lwUserSelectPopupModule from './UserSelectPopup'
 // 用户复选弹框
 import lwUserCheckboxModule from './UserCheckbox'
+// 选择搜索弹框
+import lwSearchSelectPopupModule from './SearchSelectPopup'
+// 多数据选择弹框
+import lwMuchDataSelectPopupModule from "./MuchDataSelectPopup";
 
 export default [
   lwLoginModule,
@@ -36,4 +40,6 @@ export default [
   lwUserSelectModule,
   lwUserSelectPopupModule,
   lwUserCheckboxModule,
+  lwSearchSelectPopupModule,
+  lwMuchDataSelectPopupModule,
 ]

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

@@ -11,7 +11,7 @@
     <slot name="title">
       <div
         class="lw-global-flex-between lw-login-page-head"
-        :style="{ background: background }"
+        :style="{ background }"
         @click="goTestPage"
       >
         <div>
@@ -22,7 +22,12 @@
             {{ subtitle || $lwLanguage.get('wms_project.pda.common.login.projectSubtitle', '智慧物流管理平台') }}
           </div>
         </div>
-        <img :src="logoSrc" alt="" class="lw-login-page-logo">
+        <img
+          :src="logoSrc"
+          alt=""
+          :style="{opacity:imgOpacity}"
+          class="lw-login-page-logo"
+        >
       </div>
     </slot>
 
@@ -77,6 +82,11 @@ export default {
     logoSrc: {
       default: logoImage
     },
+    // logo透明度
+    imgOpacity: {
+      type: Number,
+      default: 0.8
+    },
     // 顶部背景色
     background: {
       type: String,
@@ -161,7 +171,6 @@ export default {
 .lw-login-page-logo {
   width: 90px;
   transform: translate(10px, 30px);
-  opacity: 0.8;
 }
 
 .lw-login-page-model {

package/src/views/common/page/My/index.vue

@@ -444,6 +444,7 @@ export default {
       this.$lwPermissions.set([])
       this.$lwWarehouse.set({})
       this.$lwApiUtils.setToken(null)
+      this.$lwBarcodeResolve.clearRule()
       sessionStorage.removeItem('lwWarehouse')
       sessionStorage.removeItem('lwToken')
       sessionStorage.removeItem('lwTaskTabsActive')

package/src/views/common/page/Print/index.vue

@@ -16,7 +16,7 @@
         <div
           class="lw-global-model-box lw-global-animation-out"
           v-for="(i,k) in printList"
-          :key="k"
+          :key="i.id"
           :style="{animationDelay: k * 50 + 'ms'}"
         >
 

package/src/views/common/page/Task/components/itemHeader.vue

@@ -27,13 +27,24 @@
           v-if="type"
           round
           plain
-        >{{ type }}</lw-tag>
+        >
+          {{ type }}
+        </lw-tag>
       </div>
+
       <div style="font-size: 12px">
-        {{ $lwLanguage.get('wms_project.pda.components.page.common.Task.components.itemHeader.vkeagwoq','已过') }}
-        <span class="lw-global-title">
-          {{ $lwDate.timeToStr({l:time}).text }}
-        </span>
+        <template v-if="timeType==='create'">
+          {{ $lwLanguage.get('wms_project.pda.components.page.common.Task.components.itemHeader.vkeagwoq', '已过') }}
+          <span class="lw-global-title">
+            {{ $lwDate.timeToStr({l: time}).text }}
+          </span>
+        </template>
+        <template v-if="timeType==='spend'">
+          {{ $lwLanguage.get('', '耗时') }}
+          <span class="lw-global-title">
+            {{ $lwDate.timeToStr({s: spendSecond}).text }}
+          </span>
+        </template>
       </div>
     </div>
 
@@ -44,10 +55,18 @@
 
 export default {
   name: "itemHeader",
-  props:{
-    taskNo:String,
-    time:String,
-    type:String,
+  props: {
+    type: String,
+    taskNo: String,
+    // 显示的时间类型，取值：create-已过用时，spend-消耗时间
+    timeType: {
+      type: String,
+      default: 'create'
+    },
+    // 任务已过秒数，当timeType=create时有效
+    time: [String, Number],
+    // 任务耗时秒数，当timeType=spend时有效
+    spendSecond: [String, Number],
   },
   data() {
     return {}

package/src/views/common/page/Task/components/lookTaskContentPopup.vue

@@ -7,7 +7,7 @@
   <div>
     <lw-popup
       v-model="show"
-      :show-off-btn="false"
+      :show-off-btn="!showBottomBtn"
       height="auto"
       :title="$lwLanguage.get('wms_project.pda.components.page.common.Task.components.lookTaskContentPopup.qxzikdoq','任务详情')"
       :show-keyboard-placeholder="false"
@@ -19,6 +19,8 @@
         <item-header
           :time="item.taskReceiveTime || item.taskCreateTime"
           :task-no="item.task.taskNo"
+          :time-type="timeType"
+          :spend-second="item.task.taskSpendSecond"
         />
 
         <!-- 数据显示 -->
@@ -29,14 +31,18 @@
         />
       </template>
 
-      <template #button>
+      <template
+        v-if="showBottomBtn"
+        #button
+      >
         <lw-button
           class="lw-global-animation-rotate"
           v-if="item.canRefuse"
           type="last"
           plain
           @click="refuseTaskPopupShow=true"
-        >{{
+        >
+          {{
             $lwLanguage.get('wms_project.pda.components.page.common.Task.components.lookTaskContentPopup.hjplqefc', '拒绝任务')
           }}
         </lw-button>
@@ -45,7 +51,8 @@
           class="lw-global-animation-rotate"
           v-if="item.canAccept"
           @click="acceptTask"
-        >{{
+        >
+          {{
             $lwLanguage.get('wms_project.pda.components.page.common.Task.components.lookTaskContentPopup.fxknypka', '接受任务')
           }}
         </lw-button>
@@ -54,7 +61,8 @@
           class="lw-global-animation-rotate"
           v-if="item.canReceive"
           @click="claimTask"
-        >{{
+        >
+          {{
             $lwLanguage.get('wms_project.pda.components.page.common.Task.components.lookTaskContentPopup.cudwjgcl', '领取任务')
           }}
         </lw-button>
@@ -133,7 +141,18 @@ export default {
       type: Object,
       default: () => {
       }
-    }
+    },
+
+    // 是否显示底部操作按钮，当为 false 时底部将显示关闭按钮
+    showBottomBtn: {
+      type: Boolean,
+      default: true
+    },
+    // 显示的时间类型，取值：create-已过用时，spend-消耗时间
+    timeType: {
+      type: String,
+      default: 'create'
+    },
   },
   computed: {
     show: {