@logwire/logwire-wms-pda-ui 3.3.3 → 3.4.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: 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
     }
   }

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

@@ -244,10 +244,9 @@ export default {
     }
   },
   mounted() {
-
-    const {taskTypeActive, taskStatusActive} = JSON.parse(sessionStorage.getItem('lwTaskTabsActive') || '{}')
-    this.taskTypeActive = taskTypeActive
-    this.taskStatus.active = taskStatusActive
+    const {taskTypeActive, taskStatusActive} = this.$route.query
+    this.taskTypeActive = taskTypeActive || ''
+    this.taskStatus.active = taskStatusActive ? Number(taskStatusActive) : ''
     this.init()
   },
   methods: {
@@ -274,7 +273,6 @@ export default {
         let index = 0
         // 如果有值就校验是否在本次任务中存在
         if (this.taskTypeActive) {
-
           for (let i = 0; i < this.taskInfo.typeList.length; i++) {
             if (this.taskInfo.typeList[i].type === this.taskTypeActive) {
               index = i
@@ -408,16 +406,25 @@ export default {
     startTask({jump, query}) {
       if (!jump) return
 
-      this.$router.push(query)
+      this.jumpPage(query)
     },
 
-  },
-  destroyed() {
+    // 页面跳转
+    jumpPage(query) {
+      this.$router.replace({
+        path: '/lwTask',
+        query: {
+          taskTypeActive: this.taskTypeActive,
+          taskStatusActive: this.taskStatus.active,
+          _time: Date.now()
+        }
+      })
 
-    window.sessionStorage.setItem('lwTaskTabsActive', JSON.stringify({
-      taskTypeActive: this.taskTypeActive,
-      taskStatusActive: this.taskStatus.active
-    }))
+      this.$router.push(query)
+    }
+
+  },
+  beforeDestroy() {
     clearTimeout(this.autoTimer)
   },
 

package/src/views/common/page/Task/searchTask/index.vue

@@ -10,7 +10,7 @@
 
     <div class="lw-global-page-box">
 
-      <div class="lw-global-model-box">
+      <div class="lw-global-model-box lw-global-model-box-3px">
 
         <lw-input
           v-model="search.value"
@@ -22,55 +22,65 @@
 
       </div>
 
-      <lw-tab-box
-        v-if="show"
-        style="margin-top: 10px;"
-      >
-        <van-tabs type="card" animated v-model="tabActive">
-
-          <!-- 可领取|接受任务 -->
-          <van-tab name="accept">
-            <template #title>
-              <div class="lw-global-tip-box">
+      <div v-if="show && (taskList.length || acceptTaskList.length)">
+        <lw-tab-box style="margin-top: 10px;">
+          <van-tabs type="card" animated v-model="tabActive">
+
+            <!-- 可领取|接受任务 -->
+            <van-tab
+              v-if="acceptTaskList.length"
+              name="accept"
+            >
+              <template #title>
+                <div class="lw-global-tip-box">
                 <span>
-                  {{ $lwLanguage.get('wms_project.pda.components.page.common.Task.searchTask.index.pppphdfs','可领取 | 待接收') }}
+                  {{
+                    $lwLanguage.get('wms_project.pda.components.page.common.Task.searchTask.index.pppphdfs', '可领取 | 待接收')
+                  }}
                 </span>
-                <span class="lw-global-tip">{{ $lwTip(acceptTaskList.length) }}</span>
-              </div>
-            </template>
-            <task-item
-              v-for="(i,k) in acceptTaskList"
-              :key="k"
-              :item="i"
-              show-header-type
-              @click="taskItemClick(i)"
-            />
-            <lw-not-data v-if="!acceptTaskList.length"/>
-          </van-tab>
-
-
-          <!-- 进行中 -->
-          <van-tab name="ing">
-            <template #title>
-              <div class="lw-global-tip-box">
+                  <span class="lw-global-tip">{{ $lwTip(acceptTaskList.length) }}</span>
+                </div>
+              </template>
+              <task-item
+                v-for="(i,k) in acceptTaskList"
+                :key="k"
+                :item="i"
+                show-header-type
+                @click="taskItemClick(i)"
+              />
+              <lw-not-data v-if="!acceptTaskList.length"/>
+            </van-tab>
+
+
+            <!-- 进行中 -->
+            <van-tab
+              v-if="taskList.length"
+              name="ing"
+            >
+              <template #title>
+                <div class="lw-global-tip-box">
                 <span>
-                  {{ $lwLanguage.get('wms_project.pda.components.page.common.Task.searchTask.index.nucajjtb','进行中') }}
+                  {{
+                    $lwLanguage.get('wms_project.pda.components.page.common.Task.searchTask.index.nucajjtb', '进行中')
+                  }}
                 </span>
-                <span class="lw-global-tip">{{ $lwTip(taskList.length) }}</span>
-              </div>
-            </template>
-            <task-item
-              v-for="(i,k) in taskList"
-              :key="k"
-              :item="i"
-              show-header-type
-              @click="taskItemClick(i)"
-            />
-            <lw-not-data v-if="!taskList.length"/>
-          </van-tab>
-        </van-tabs>
-      </lw-tab-box>
+                  <span class="lw-global-tip">{{ $lwTip(taskList.length) }}</span>
+                </div>
+              </template>
+              <task-item
+                v-for="(i,k) in taskList"
+                :key="k"
+                :item="i"
+                show-header-type
+                @click="taskItemClick(i)"
+              />
+              <lw-not-data v-if="!taskList.length"/>
+            </van-tab>
+          </van-tabs>
+        </lw-tab-box>
+      </div>
 
+      <lw-not-data v-if="show && !taskList.length && !acceptTaskList.length"/>
 
 
     </div>
@@ -136,10 +146,13 @@ export default {
 
       this.$lwApi.task.searchTask({
         key
-      }).then(res=>{
+      }).then(res => {
         this.show = true
         this.taskList = res.progressingTaskList || []
         this.acceptTaskList = res.canAcceptTaskList || []
+        this.$nextTick(() => {
+          this.tabActive = this.acceptTaskList.length ? 'accept' : 'ing'
+        })
       })
     },
     // 任务项被点击

package/src/views/common/views/init/index.vue

@@ -36,7 +36,7 @@
 import {loginAndInit} from "../../../../mixins/loginAndInit";
 
 export default {
-  name: "init",
+  name: "lwInit",
   mixins: [loginAndInit],
   data() {
     return {
@@ -147,22 +147,12 @@ export default {
           this.showLoading = false
         }, 1000)
 
-        console.error('初始化页面异常：', e)
+        console.warn('初始化页面异常：', e)
 
-        const api = [
-          'wmsGetAllChoices',
-          'wmsGetUserPermissions',
-          'wmsMobilePrintSelectedTemplate',
-          'commonWmsLoadAllComponentConfig'
-        ]
-        const url = e.config.url.split('/')
 
-        if (api.includes(url.pop())) {
-          this.$lwCloseErrorMsg()
-          this.$router.replace({
-            path: '/lwLogin'
-          })
-        }
+        this.$router.replace({
+          path: '/lwLogin'
+        })
       }
     },
 

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

@@ -4,15 +4,9 @@
 * @date  2023-02-24
 * */
 
-import lwVinUserSelectModule from './userSelect'
 import lwVinDockSelectModule from './dockSelect'
-import lwVinUserSelectPopupModule from './userSelectPopup'
-import lwVinUserCheckboxModule from './userCheckbox'
 
 
 export default [
-  lwVinUserSelectModule,
   lwVinDockSelectModule,
-  lwVinUserCheckboxModule,
-  lwVinUserSelectPopupModule,
 ]

package/src/views/vin/page/index.js

@@ -21,10 +21,6 @@ const vinComponents = [
 ]
 
 
-vinComponents.forEach(item => {
-  item.install = Vue => Vue.component(item.name, item)
-})
-
 export default vinComponents.map(item => {
   item.install = Vue => Vue.component(item.name, item)
   return item

package/src/views/vin/page/inner/count/index.vue

@@ -11,7 +11,7 @@
     <div class="lw-global-page-box">
 
       <div class="lw-global-model-box" style="padding-top: 3px">
-        <lw-vin-user-select-module
+        <lw-user-select-module
           :title="$lwLanguage.get('wms_project.pda.vin.page.inner.count.index.gzyrvuik','员工')"
           v-model="userNo.value"
           :focus.sync="userNo.focus"

package/src/views/vin/page/inner/move/index.vue

@@ -11,7 +11,7 @@
     <div class="lw-global-page-box">
 
       <div class="lw-global-model-box lw-global-model-box-3px" style="padding-bottom: 10px">
-        <lw-vin-user-select-module
+        <lw-user-select-module
           :title="$lwLanguage.get('wms_project.pda.vin.page.inner.move.index.index.awmzfqhm','员工')"
           v-model="userNo.value"
           :focus.sync="userNo.focus"

package/src/views/vin/page/keyRoom/handover/action.vue

@@ -102,7 +102,7 @@
 
       <div style="width: 100%;height: 100%;padding: 3px 0 10px 0">
 
-        <lw-vin-user-select-module
+        <lw-user-select-module
           :title="$lwLanguage.get('wms_project.pda.vin.page.keyRoom.handover.action.gfjymigo','接收人')"
           v-model="handoverUser.value"
           :focus.sync="handoverUser.focus"

package/src/views/vin/page/keyRoom/myKey/action.vue

@@ -47,7 +47,10 @@
                 :key="i.vin"
                 class="lw-global-model-box"
               >
-                <van-checkbox :name="i.vin">
+                <van-checkbox
+                  :name="i.vin"
+                  shape="square"
+                >
 
                   <div class="lw-global-row-box">
                     <div class="lw-global-value-bold">{{ i.vin }}</div>
@@ -179,6 +182,7 @@
           v-if="tabActive==='wait'"
           v-model="waitAll"
           :disabled="!waitList.length"
+          shape="square"
           @click="waitAllClick"
         >
           {{

package/src/views/vin/page/keyRoom/myKey/index.vue

@@ -15,7 +15,7 @@
         class="lw-global-model-box"
       >
 
-        <lw-vin-user-select-module
+        <lw-user-select-module
           :title="$lwLanguage.get('wms_project.pda.vin.page.keyRoom.myKey.index.sagstddy','员工')"
           v-model="userNo.value"
           :focus.sync="userNo.focus"

package/src/views/vin/page/keyRoom/transfer/action.vue

@@ -47,7 +47,10 @@
                 :key="i.vin"
                 class="lw-global-model-box"
               >
-                <van-checkbox :name="i.vin">
+                <van-checkbox
+                  shape="square"
+                  :name="i.vin"
+                >
 
                   <div class="lw-global-row-box">
                     <div class="lw-global-value-bold">{{ i.vin }}</div>
@@ -179,6 +182,7 @@
           v-if="tabActive==='wait'"
           v-model="waitAll"
           :disabled="!waitList.length"
+          shape="square"
           @click="waitAllClick"
         >
           {{ $lwLanguage.get('wms_project.pda.vin.page.keyRoom.transfer.action.xyiecmhx','已选择{num}条记录', {num: waitResult.length}) }}
@@ -205,7 +209,7 @@
       @opened="submitPopup.userNo.focus = true"
     >
 
-      <lw-vin-user-select-module
+      <lw-user-select-module
         :title="$lwLanguage.get('wms_project.pda.vin.page.keyRoom.transfer.action.pzrqtlgf','接收人')"
         v-model="submitPopup.userNo.value"
         :focus.sync="submitPopup.userNo.focus"