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

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

@@ -0,0 +1,247 @@
+<!--
+  员工选择模块
+  @author: 张文
+  @date: 2023-04-19
+-->
+<template>
+  <lw-popup
+    :title="$lwLanguage.get('wms_project.pda.common.module.UserSelectPopup.index.fdxbzcme', '员工选择')"
+    v-model="show"
+    height="80%"
+    :show-keyboard-placeholder="false"
+    @open="open"
+    @closed="off"
+  >
+
+    <lw-input
+      :title="$lwLanguage.get('wms_project.pda.common.module.UserSelectPopup.index.shyyojxe', '搜索')"
+      v-model="userSelectPopup.search"
+      :placeholder="$lwLanguage.get('wms_project.pda.common.module.UserSelectPopup.index.ghtkfoqv', '输入关键字搜索')"
+      :rule-key="ruleKey"
+      :rule-prefix="rulePrefix"
+      :rule-value-key="ruleValueKey"
+      :rule-serve-query="ruleServeQuery"
+      :create-rule="createRule"
+      @confirm="userSelectPopupSearch"
+    >
+
+      <template #button>
+
+        <lw-button
+          mini
+          round
+          @click="userSelectPopupSearch"
+        >
+          {{ $lwLanguage.get('wms_project.pda.common.module.UserSelectPopup.index.shyyojxe', '搜索') }}
+        </lw-button>
+
+      </template>
+
+    </lw-input>
+
+    <!-- 复选框 -->
+    <template v-if="checkbox">
+
+      <van-checkbox
+        v-for="(i,k) in userSelectPopup.dataList"
+        :class="[$lwUtils.getCellClass(k,userSelectPopup.dataList.length,'lw-global-row')]"
+        :key="k"
+        :name="i.code"
+        v-model="i._checkbox"
+        @change="res=>checkboxChange(i,res)"
+      >
+        {{ i.code + '-' + i.name }}
+      </van-checkbox>
+
+    </template>
+
+    <!-- 单选 -->
+    <template v-else>
+      <lw-cell
+        v-for="(i,k) in userSelectPopup.dataList"
+        :key="k"
+        :title-width="0"
+        value-align="left"
+        :value="i.code +'-'+ i.name"
+        @click="userSelectPopupSelected(i)"
+      />
+    </template>
+
+
+    <lw-not-data v-if="!userSelectPopup.dataList.length"/>
+
+
+    <lw-pagination
+      v-model="userSelectPopup.pageNum"
+      :page-size.sync="userSelectPopup.pageSize"
+      :page-total="userSelectPopup.pageTotal"
+      @change="userSelectPopupPageChange"
+    />
+
+    <template
+      v-if="checkbox"
+      #button
+    >
+      <lw-button @click="checkboxConfirm">
+        {{ $lwLanguage.get('wms_project.pda.common.module.UserSelectPopup.index.fdxbzcmea', '确定') }}
+      </lw-button>
+    </template>
+
+  </lw-popup>
+</template>
+
+<script>
+import {userSelectInputMixin} from "./../../mixin/userSelectInputMixin";
+
+
+export default {
+  name: "lwUserSelectPopupModule",
+  mixins: [userSelectInputMixin],
+  props: {
+    value: {
+      type: Boolean,
+      default: false
+    },
+
+    // 是否多选
+    checkbox: Boolean,
+    // 当前选中的数据，当类型为多选模式时有效，
+    resultList: {
+      type: Array,
+      default: () => []
+    },
+    // 当类型为多选模式时最大可选数，为 0 时不限制
+    max: {
+      type: Number,
+      default: 0
+    },
+
+  },
+  data() {
+    return {
+      // 选择员工弹框
+      userSelectPopup: {
+        show: false,
+        search: '',
+        dataList: [],
+        pageSize: 10,
+        pageNum: 1,
+        pageTotal: 0
+      },
+
+      // 当类型为复选框时的选中值
+      resultObj: {},
+    }
+  },
+  computed: {
+    show: {
+      get() {
+        return this.value
+      },
+      set(v) {
+        this.$emit('input', v)
+      }
+    }
+  },
+  methods: {
+    // 弹框打开
+    open() {
+
+      this.checkbox && this.checkboxInit()
+
+      this.userSelectPopup.search = ''
+      this.userSelectPopup.pageSize = 10
+      this.userSelectPopup.pageNum = 1
+      this.userSelectPopup.pageTotal = 0
+      this.userSelectPopupGetData()
+    },
+    // 弹框关闭
+    off() {
+      this.userSelectPopup.pageTotal = 0
+      this.userSelectPopup.dataList = []
+      this.resultObj = {}
+    },
+
+    // 获取用户数据
+    userSelectPopupGetData() {
+      const {search, pageSize, pageNum} = this.userSelectPopup
+      this.$lwApi.common.staffList({
+        key: search,
+        pageSize,
+        pageNum
+      }).then(res => {
+
+        // 当为复选模式时，回显选中的数据
+        const result = Object.keys(this.resultObj)
+        if (this.checkbox && result.length) {
+          res.datas.forEach(item => {
+            item._checkbox = result.includes(item.code)
+          })
+        }
+
+        this.userSelectPopup.pageTotal = res.total
+        this.userSelectPopup.dataList = res.datas
+      })
+    },
+    // 搜索
+    userSelectPopupSearch() {
+      this.userSelectPopup.pageNum = 1
+      this.userSelectPopupGetData()
+    },
+    // 分页改变
+    userSelectPopupPageChange() {
+      this.userSelectPopupGetData()
+    },
+
+
+    // 单选 - 确认
+    userSelectPopupSelected(item) {
+      this.show = false
+      this.$emit('selectConfirm', item)
+    },
+
+
+    // 复选 - 初始化复选框选中数据
+    checkboxInit() {
+      this.resultList.forEach(item => {
+        this.resultObj[item.code] = item
+      })
+    },
+    // 复选 - 复选框数据改变
+    checkboxChange(item, res) {
+      // 删除
+      if (!res) {
+        delete this.resultObj[item.code]
+        return
+      }
+
+      // 判断是否存在最大可选数
+      if (this.max > 0 && Object.keys(this.resultObj).length >= this.max) {
+
+        this.$lwShowNoticeBar({
+          message: this.$lwLanguage.get('wms_project.pda.common.module.UserSelectPopup.index.fdxbzcmeb', '超过最大可选数：') + this.max,
+          type: 'error'
+        })
+
+        item._checkbox = false
+        return
+      }
+
+      this.resultObj[item.code] = item
+    },
+    // 复选 - 确定
+    checkboxConfirm() {
+      const list = []
+      for (const k in this.resultObj) {
+        list.push(this.resultObj[k])
+      }
+      this.show = false
+      this.$emit('checkboxConfirm', list)
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

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

@@ -18,6 +18,16 @@ import lwMsgItemModule from './MsgItem/index.js'
 import lwOffLinePopupModule from "./OffLinePopup/index.js";
 // 页面主体
 import lwPageBodyModule from "./PageBody/index.js";
+// 用户选择模块
+import lwUserSelectModule from './UserSelect'
+// 用户选择弹框
+import lwUserSelectPopupModule from './UserSelectPopup'
+// 用户复选弹框
+import lwUserCheckboxModule from './UserCheckbox'
+// 选择搜索弹框
+import lwSearchSelectPopupModule from './SearchSelectPopup'
+// 多数据选择弹框
+import lwMuchDataSelectPopupModule from "./MuchDataSelectPopup";
 
 export default [
   lwLoginModule,
@@ -27,4 +37,9 @@ export default [
   lwMsgItemModule,
   lwOffLinePopupModule,
   lwPageBodyModule,
+  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.5;
 }
 
 .lw-login-page-model {

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

@@ -8,7 +8,7 @@
     <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.common.message.title','消息')"/>
 
     <div class="lw-global-page-box">
-      <lw-tab-box v-if="Object.keys(typeTab.obj).length">
+      <lw-tab-box v-if="showTab">
 
         <!-- 消息类型tab -->
         <van-tabs
@@ -133,7 +133,7 @@ export default {
       // 类型tab
       typeTab:{
         active:'',
-        obj:[]
+        obj: {}
       },
 
       // 读取状态tab
@@ -155,11 +155,11 @@ export default {
       // 显示弹框
       popupShow: false,
       // 显示数据
-      showContent:false,
+      showContent: false,
       // 当前显示的数据
-      msgItem:{},
-      // 更新数据
-      update: false
+      msgItem: {},
+      // 是否显示tab
+      showTab: false
     }
   },
   activated(){
@@ -210,9 +210,11 @@ export default {
         pageSize:this.msg.pageSize,
         flag: this.readTab.action === 'unread' ? 0 : 1,
         bizType: this.readTab.data.bizType
-      }).then(res=>{
+      }).then(res=> {
         this.msg.list = res.messages || []
         this.msg.pageTotal = res.messageCount || 0
+
+        this.showTab = !!Object.keys(this.typeTab.obj).length
       })
     },
 
@@ -240,10 +242,7 @@ export default {
 
     // 关闭弹出层
     popupClosed(){
-      if (this.readTab.action === 'unread'){
-        this.init()
-        this.update = true
-      }
+      if (this.readTab.action === 'unread') this.init()
       this.showContent = false
     }
   }

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: {

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

@@ -14,6 +14,8 @@
       :task-no="item.task.taskNo"
       :time="item.taskReceiveTime || item.taskCreateTime"
       :type="showHeaderType ? item.task.operationTypeLabel : ''"
+      :time-type="timeType"
+      :spend-second="item.task.taskSpendSecond"
     />
 
     <!-- 数据显示 -->
@@ -25,18 +27,9 @@
 
     <!-- 基本信息 -->
     <div class="lw-global-flex-between lw-task-page-order-end">
-      <div>{{ userName(item.staffList) }}</div>
-      <div>
-        <span v-if="item.taskStartTime" >
-          <span style="font-weight: normal">
-            {{ $lwLanguage.get('wms_project.pda.common.task.duration', '已耗时') }}
-          </span>
-          {{ $lwDate.timeToStr({l:item.taskStartTime}).text }}
-        </span>
-        <span v-else style="font-weight: normal">
-          {{ $lwLanguage.get('wms_project.pda.common.task.notStart', '任务未开始') }}
-        </span>
-      </div>
+      <div>{{ userName }}</div>
+
+      <div>{{ taskTime }}</div>
     </div>
   </div>
 </template>
@@ -47,29 +40,60 @@ import itemContent from "./itemContent.vue";
 
 export default {
   name: "taskItem",
-  components:{
+  components: {
     itemHeader,
     itemContent,
   },
-  props:{
-    item:{
+  props: {
+    item: {
       type: Object,
-      default: ()=>{}
+      default: () => {
+      }
     },
 
     // 是否显示头部标签
-    showHeaderType: Boolean
+    showHeaderType: Boolean,
+    // 显示的时间类型，取值：create-已过用时，spend-消耗时间
+    timeType: {
+      type: String,
+      default: 'create'
+    },
+  },
+  computed: {
+    // 任务开始时间
+    taskTime() {
+      const {
+        canRefuse,
+        canAccept,
+        canReceive,
+        taskStartTime,
+        taskCreateTime,
+        taskReceiveTime
+      } = this.item
+      let date = ''
+      if (this.timeType === 'create') {
+        date = canRefuse || canAccept || canReceive ?
+          taskCreateTime :
+          taskStartTime || taskReceiveTime
+      } else {
+        date = this.item.task.endTime
+      }
+      // 当任务未拒绝，未接受，未领取时，显示任务创建时间，否则显示任务开始时间
+      return this.$lwTimezone.UTCToTimezone({date})
+    },
+    // 员工姓名
+    userName() {
+      if (!Array.isArray(this.item.staffList)) return ''
+
+      return this.item.staffList.map(item => item.staffName).join('/')
+    }
+
   },
   data() {
     return {}
   },
   methods: {
-    // 获取员工姓名
-    userName(i){
-      if (!Array.isArray(i)) return
 
-      return i.map(item=>item.staffName).join('/')
-    },
   }
 }
 </script>