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

package/src/utils/Utils.js

@@ -43,26 +43,35 @@ export const Utils = {
    * @date 2022-08-18
    * @param {Number} index 当前索引
    * @param {Number} length 数组长度
+   * @param {String} start 开始行的 Class 名
+   * @param {String} end 结束行的 Class 名
+   * @param {String} cell 行的 Class 名
    * @return {String} 行样式的 class 名
    * */
-  getCellClass(index, length) {
+  getCellClass(
+      index,
+      length,
+      start = 'lw-global-row-start',
+      end = 'lw-global-row-end',
+      cell = 'lw-global-row'
+  ) {
     const i = Number(index)
     const l = Number(length)
     if (isNaN(i)) {
       console.error('获取行样式方法，传入【index】无法转换为数字，值为：' + index)
-      return 'lw-global-row-start'
+      return start
     }
     if (isNaN(l)) {
       console.error('获取行样式方法，传入【length】无法转换为数字，值为：' + length)
-      return 'lw-global-row-start'
+      return start
     }
 
     if (l === 1) return ''
 
-    if (i === 0) return 'lw-global-row-start'
+    if (i === 0) return start
 
-    if ((i + 1) >= l) return 'lw-global-row-end'
+    if ((i + 1) >= l) return end
 
-    return 'lw-global-row'
+    return cell
   }
 }

package/src/views/common/mixin/userSelectInputMixin.js

@@ -0,0 +1,57 @@
+/*
+* 员工选择输入框混入
+* @author: 张文
+* @date  2023-07-25
+* */
+
+export const userSelectInputMixin = {
+  props: {
+    // 扫码解析规则
+    ruleKey: {
+      type: String,
+      default: 'staffCode'
+    },
+
+    // 条码解析规则前缀，不传默认使用路由地址+ruleKey
+    rulePrefix: {
+      type: String,
+      default: '/common/staff/select'
+    },
+
+    // 扫码解析后输入框回填字段的key
+    ruleValueKey: {
+      type: String,
+      default: 'key'
+    },
+
+    // 解码的额外参数
+    ruleServeQuery: {
+      type: Object,
+      default: () => {
+      }
+    },
+    /*
+   * 条码解析如果id不存在自主生成所需的数据，数据应当包含
+   * {
+   *   name: 规则名称,
+   *   appCode: 所属项目,
+   *   moduleName: 所属模块,
+   *   bizType: 规则类型,
+   *   defaultBizType: 默认规则
+   * }
+   * */
+    createRule: {
+      type: Object,
+      default: () => {
+        return {
+          name: '员工选择-工号输入框',
+          appCode: 'wms-project',
+          moduleName: 'wms-project',
+          bizType: 'STAFF',
+          defaultBizType: 'STAFF'
+        }
+      }
+    }
+
+  }
+}

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

@@ -0,0 +1,11 @@
+/*
+* 用户复选模块
+* @author: 张文
+* @date: 2023-04-18
+* */
+
+import lwUserCheckboxModule from "./index.vue";
+
+lwUserCheckboxModule.install = Vue => Vue.component(lwUserCheckboxModule.name, lwUserCheckboxModule)
+
+export default lwUserCheckboxModule

package/src/views/{vin/module/userCheckbox → common/module/UserCheckbox}/index.vue

@@ -28,7 +28,7 @@
             required && 'lw-global-required'
           ]"
         >
-          {{ title || $lwLanguage.get('', '员工') }}
+          {{ titleMsg }}
         </div>
 
         <div class="lw-global-flex-start" style="flex: 1;flex-wrap: wrap;margin-left: 5px">
@@ -48,8 +48,13 @@
             style="width: 100%;padding: 0;margin-left: 4px"
             v-model="user"
             :get-focus.sync="userFocus"
-            :placeholder="title || $lwLanguage.get('', '员工')"
             :show-bottom-border="false"
+            :placeholder="placeholder"
+            :rule-key="ruleKey"
+            :rule-prefix="rulePrefix"
+            :rule-value-key="ruleValueKey"
+            :rule-serve-query="ruleServeQuery"
+            :create-rule="createRule"
             @confirm="userConfirm"
           >
 
@@ -72,17 +77,28 @@
 
     </div>
 
-    <lw-vin-user-select-popup-module
+    <lw-user-select-popup-module
       v-model="showPopup"
+      :rule-key="ruleKey"
+      :rule-prefix="rulePrefix"
+      :rule-value-key="ruleValueKey"
+      :rule-serve-query="ruleServeQuery"
+      :create-rule="createRule"
+      checkbox
+      :max="max"
+      :result-list="userList"
       @selectConfirm="addUser"
+      @checkboxConfirm="checkboxConfirm"
     />
   </div>
 </template>
 
 <script>
+import {userSelectInputMixin} from "./../../mixin/userSelectInputMixin";
 
 export default {
-  name: "lwVinUserCheckboxModule",
+  name: "lwUserCheckboxModule",
+  mixins: [userSelectInputMixin],
   props: {
     title: String,
     //是否必填
@@ -122,6 +138,12 @@ export default {
     },
     // 是否忽略仓库配置的不允许删除当前用户配置
     ignoreConfig: Boolean,
+
+    // 最大可选数，为 0 时不限制
+    max: {
+      type: Number,
+      default: 0
+    },
   },
   data() {
     return {
@@ -147,6 +169,15 @@ export default {
         this.$emit('update:focus', v)
       }
     },
+
+    // 标题
+    titleMsg() {
+      return this.title || this.$lwLanguage.get('wms_project.pda.common.module.UserCheckbox.index.ohippvhi', '员工')
+    },
+    // 输入框占位符
+    placeholder() {
+      return this.$lwLanguage.get('wms_project.pda.common.module.UserCheckbox.index.ohippvhic', '请扫描或输入') + this.titleMsg
+    }
   },
   mounted() {
     this.init()
@@ -157,30 +188,59 @@ export default {
     async init() {
       if (!this.selectNowUser) return
 
-      const res = await this.$lwApi.common.staffInfo(this.$lwUserInfo.get().staff.code)
-      const disabled = !this.ignoreConfig && this.$lwWarehouseConfig.get('systemConfig.WMS_APP_LOGIN_USER_AS_CURRENT_USER') === 'true'
-      this.addUser({
-        ...res,
-        disabled
+      // 如果已经传入了数据就不要再添加当前用户数据
+      this.$nextTick(async () => {
+
+        if (this.userList.length) return
+
+        const res = await this.$lwApi.common.staffInfo(this.$lwUserInfo.get().staff.code)
+        const disabled = !this.ignoreConfig && this.$lwWarehouseConfig.get('systemConfig.WMS_APP_LOGIN_USER_AS_CURRENT_USER') === 'true'
+        this.addUser({
+          ...res,
+          disabled
+        }, 'init')
       })
+
     },
 
     // 搜索确认用户
     async userConfirm() {
+      if (this.max > 0 && this.userList.length >= this.max) {
+        this.$lwShowNoticeBar({
+          message: this.$lwLanguage.get('wms_project.pda.common.module.UserCheckbox.index.ohippvhid', '超过最大可选数：') + this.max,
+          type: 'error'
+        })
+        this.user = ''
+        return
+      }
+
       const res = await this.$lwApi.common.staffInfo(this.user)
       this.addUser(res)
     },
 
     // 添加已选员工
-    addUser(res) {
-      !this.userList.some(item => item.code === res.code) && this.userList.push(res)
-      this.userFocus = true
+    addUser(res, type) {
+
+      // 判断是否是初始状态进入，避免不必要的焦点获取
+      type !== 'init' ? this.userFocus = true : ''
       this.user = ''
+
+      // 判断当前选中用户是否存在已选列表
+      if (this.userList.some(item => item.code === res.code)) return
+
+      this.userList.push(res)
+      this.$emit('change')
+    },
+    // 弹框点击确认
+    checkboxConfirm(res) {
+      this.userList = res
+      this.$emit('change')
     },
 
     // 删除员工
     delUser(index) {
       this.userList.splice(index, 1)
+      this.$emit('change')
     },
   }
 }

package/src/views/common/module/UserCheckbox//345/221/230/345/267/245/345/244/215/351/200/211/346/250/241/345/235/227.md

@@ -0,0 +1 @@
+可选择多个员工，自动去重。显示员工姓名且可以删除

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

@@ -0,0 +1,11 @@
+/*
+* 员工选择模块
+* @author: 张文
+* @date: 2023-02-24
+* */
+
+import lwUserSelectModule from "./index.vue";
+
+lwUserSelectModule.install = Vue => Vue.component(lwUserSelectModule.name, lwUserSelectModule)
+
+export default lwUserSelectModule

package/src/views/{vin/module/userSelect → common/module/UserSelect}/index.vue

@@ -7,12 +7,17 @@
   <div>
 
     <lw-input
-      :title="title || $lwLanguage.get('wms_project.pda.vin.module.userSelect.index.zzvospaa','工号')"
+      :title="title || $lwLanguage.get('wms_project.pda.common.module.UserSelect.index.thtsabqj', '工号')"
       v-model="userNo"
       :required="required"
       :show-bottom-border="showBorder"
       :get-focus.sync="getFocus"
       :disabled="disabled"
+      :rule-key="ruleKey"
+      :rule-prefix="rulePrefix"
+      :rule-value-key="ruleValueKey"
+      :rule-serve-query="ruleServeQuery"
+      :create-rule="createRule"
       @confirm="$emit('confirm')"
     >
 
@@ -30,8 +35,13 @@
 
 
     <!-- 选择用户弹框 -->
-    <lw-vin-user-select-popup-module
+    <lw-user-select-popup-module
       v-model="popupShow"
+      :rule-key="ruleKey"
+      :rule-prefix="rulePrefix"
+      :rule-value-key="ruleValueKey"
+      :rule-serve-query="ruleServeQuery"
+      :create-rule="createRule"
       @selectConfirm="userSelectPopupSelected"
     />
 
@@ -39,10 +49,12 @@
 </template>
 
 <script>
+import {userSelectInputMixin} from "./../../mixin/userSelectInputMixin";
 
 
 export default {
-  name: "lwVinUserSelectModule",
+  name: "lwUserSelectModule",
+  mixins: [userSelectInputMixin],
   props: {
     title: String,
 

package/src/views/common/module/UserSelect//345/221/230/345/267/245/345/215/225/351/200/211/346/250/241/345/235/227.md

@@ -0,0 +1 @@
+仅可选择一个员工，显示员工工号

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

@@ -0,0 +1,11 @@
+/*
+* 员工选择模块
+* @author: 张文
+* @date: 2023-04-19
+* */
+
+import lwUserSelectPopupModule from "./index.vue";
+
+lwUserSelectPopupModule.install = Vue => Vue.component(lwUserSelectPopupModule.name, lwUserSelectPopupModule)
+
+export default lwUserSelectPopupModule

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: pageNum - 1
+      }).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,12 @@ 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'
 
 export default [
   lwLoginModule,
@@ -27,4 +33,7 @@ export default [
   lwMsgItemModule,
   lwOffLinePopupModule,
   lwPageBodyModule,
+  lwUserSelectModule,
+  lwUserSelectPopupModule,
+  lwUserCheckboxModule,
 ]

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

@@ -161,7 +161,7 @@ export default {
 .lw-login-page-logo {
   width: 90px;
   transform: translate(10px, 30px);
-  opacity: 0.5;
+  opacity: 0.8;
 }
 
 .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
     }
   }