npm - @logwire/logwire-wms-pda-ui - Versions diffs - 3.3.4 → 3.4.0 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (386) hide show

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

@@ -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 CHANGED Viewed

@@ -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/vin/module/index.js CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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"

package/src/views/vin/page/keyRoom/transfer/index.vue CHANGED Viewed

@@ -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.transfer.index.pkefgakn','员工')"
           v-model="userNo.value"
           :focus.sync="userNo.focus"

package/src/views/vin/page/maintain/components/taskActionItem.vue CHANGED Viewed

@@ -15,6 +15,7 @@
       <van-checkbox
         v-if="showTitleCheckbox"
         v-model="titleVal"
+        shape="square"
         @change="titleCheckboxChange"
       >
         {{ item.name }}
@@ -25,6 +26,7 @@
       <van-checkbox
         v-if="titleVal"
         v-model="hasQuestion"
+        shape="square"
         @change="questionCheckboxChange"
       >
         {{ $lwLanguage.get('', '有问题') }}

package/src/views/vin/page/maintain/move/index.vue CHANGED Viewed

@@ -12,7 +12,7 @@
       <div class="lw-global-model-box lw-global-model-box-3px">
-        <lw-vin-user-select-module
+        <lw-user-select-module
           v-if="showUser"
           :title="$lwLanguage.get('','员工')"
           v-model="userNo.value"

package/src/views/vin/page/maintain/recharge/index.vue CHANGED Viewed

@@ -12,7 +12,7 @@
       <div class="lw-global-model-box lw-global-model-box-3px">
-        <lw-vin-user-checkbox-module
+        <lw-user-checkbox-module
           v-model="staff.list"
           :focus.sync="staff.focus"
         />

package/src/views/vin/page/maintain/task/components/taskMyItem.vue CHANGED Viewed

@@ -13,6 +13,7 @@
       class="checkbox-box"
       style="flex: 1"
       :name="item.groupCode"
+      shape="square"
     >
       <div class="box">

package/src/views/vin/page/maintain/task/index.vue CHANGED Viewed

@@ -15,7 +15,7 @@
         class="lw-global-model-box"
       >
-        <lw-vin-user-checkbox-module
+        <lw-user-checkbox-module
           v-model="staffList"
           :focus.sync="staffFocus"
           is-row-start
@@ -157,6 +157,7 @@
       >
         <van-checkbox
           v-model="myTaskAll"
+          shape="square"
           @click="myTaskAllClick"
         >
           {{ $lwLanguage.get('', '已选 {num} 台', {num: myTaskCarNum}) }}

package/src/views/vin/page/maintain/task/myTaskGroup.vue CHANGED Viewed

@@ -44,6 +44,7 @@
             class="checkbox-box"
             style="flex: 1"
             :name="i.zoneCode"
+            shape="square"
           >
             <div class="box">
@@ -102,6 +103,7 @@
       >
         <van-checkbox
           v-model="all"
+          shape="square"
           @click="allClick"
         >
           {{ $lwLanguage.get('', '已选 {num} 台', {num: carNum}) }}

package/src/views/vin/page/maintain/task/taskGroup.vue CHANGED Viewed

@@ -44,6 +44,7 @@
             class="checkbox-box"
             style="flex: 1"
             :name="i.zoneCode"
+            shape="square"
           >
             <div class="box">
@@ -120,6 +121,7 @@
       >
         <van-checkbox
           v-model="all"
+          shape="square"
           @click="allClick"
         >
           {{ $lwLanguage.get('', '已选 {num} 台', {num: carNum}) }}

package/src/views/vin/page/maintain/task/taskGroupContent.vue CHANGED Viewed

@@ -36,6 +36,7 @@
                 <van-checkbox
                   class="checkbox-box"
                   :name="i.vin"
+                  shape="square"
                 >
                   <task-group-zone-item
@@ -97,6 +98,7 @@
       >
         <van-checkbox
           v-model="wait.all"
+          shape="square"
           @click="allClick"
         >
           {{ $lwLanguage.get('', '已选 {num} 台', {num: carNum}) }}

package/src/views/vin/page/maintain/wash/index.vue CHANGED Viewed

@@ -12,9 +12,9 @@
       <div class="lw-global-model-box lw-global-model-box-3px">
-        <lw-vin-user-checkbox-module
+        <lw-user-checkbox-module
           v-model="staff.list"
-          :get-focus.sync="staff.focus"
+          :focus.sync="staff.focus"
         />
         <lw-cell-popup-radio

package/src/views/vin/page/outbound/delivery/index.vue CHANGED Viewed

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

package/src/views/vin/page/outbound/keyAllot/action.vue CHANGED Viewed

@@ -63,7 +63,7 @@
               />
-              <lw-vin-user-select-module
+              <lw-user-select-module
                 :title="$lwLanguage.get('wms_project.pda.vin.page.outbound.keyAllot.action.wzthbrni','作业人员')"
                 v-model="userNo.value"
                 :focus.sync="userNo.focus"

package/src/views/vin/page/outbound/keyAllot/index.vue CHANGED Viewed

@@ -20,7 +20,7 @@
           @confirm="userNo.focus = true"
         />
-        <lw-vin-user-select-module
+        <lw-user-select-module
           :title="$lwLanguage.get('wms_project.pda.vin.page.outbound.keyAllot.index.dwomgwaj','员工')"
           v-model="userNo.value"
           :focus.sync="userNo.focus"

package/src/views/vin/page/outbound/pick/index.vue CHANGED Viewed

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

package/src/views/vin/page/quality/register/action.vue CHANGED Viewed

@@ -158,6 +158,7 @@
                   v-for="(i,k) in qualityList.typeList"
                   :key="k"
                   :name="i.value"
+                  shape="square"
                 >
                   {{ i.label }}
                 </van-checkbox>

package/src/views/vin/page/quality/register/index.vue CHANGED Viewed

@@ -12,7 +12,7 @@
       <div class="lw-global-model-box" style="padding-top: 3px">
-        <lw-vin-user-checkbox-module
+        <lw-user-checkbox-module
           v-model="userList"
           :focus.sync="userFocus"
         />

package/src/views/vin/page/receive/back/index.vue CHANGED Viewed

@@ -12,7 +12,7 @@
       <div class="lw-global-model-box lw-global-model-box-3px">
-        <lw-vin-user-select-module
+        <lw-user-select-module
           :title="$lwLanguage.get('wms_project.pda.vin.page.receive.back.index.ugculbdq','员工编号')"
           v-model="userNo.value"
           :focus.sync="userNo.focus"

package/src/views/vin/page/receive/components/receiveOrderInfo.vue CHANGED Viewed

@@ -8,7 +8,7 @@
     <div>
-      <lw-vin-user-select-module
+      <lw-user-select-module
         :title="$lwLanguage.get('wms_project.pda.vin.page.receive.components.receiveOrderInfo.vzxvitpx','收车人工号')"
         v-model="userNo"
         @initConfirm="getClassData"
@@ -79,6 +79,7 @@
             v-for="(i,k) in lockLocPopup.list"
             :key="k"
             :name="i.code"
+            shape="square"
           >
             <div
               style="width: 100%"
@@ -109,6 +110,7 @@
         <van-checkbox
           v-model="lockLocPopup.all"
           :disabled="!lockLocPopup.list.length"
+          shape="square"
           @click="lockLocPopupAllClick"
         >
           {{ $lwLanguage.get('wms_project.pda.vin.page.receive.components.receiveOrderInfo.vrzvvnkl','全选') }}

package/src/views/vin/page/receive/stopRecord/action.vue CHANGED Viewed

@@ -30,7 +30,7 @@
           @confirm="vinConfirm"
         />
-        <lw-vin-user-select-module
+        <lw-user-select-module
           :title="$lwLanguage.get('wms_project.pda.vin.page.receive.stopRecord.action.osobyuxy','入位员工编号')"
           v-model="userNo.value"
           :focus.sync="userNo.focus"

package/src/views/vin/page/receive/stopRecord/index.vue CHANGED Viewed

@@ -12,7 +12,7 @@
       <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.receive.stopRecord.index.wfwbgblj','工作车司机编号')"
           v-model="userNo.value"
           :focus.sync="userNo.focus"

package/src/views/wms/api/inbound/receive.js CHANGED Viewed

@@ -465,3 +465,11 @@ export function wmsMobileInboundGetAsnDetail(data) {
   })
 }
+// 生成收货托盘
+export function wmsMobileInboundNewReceiveLpn(data) {
+  return lwAxios.action({
+    url: 'wmsMobileInboundNewReceiveLpn',
+    data
+  })
+}

package/src/views/wms/api/outbound/assignLpnPick.js ADDED Viewed

@@ -0,0 +1,38 @@
+/*
+* 指定整托盘拣选api
+* @author: 张文
+* @date  2023-06-05
+* */
+import lwAxios from '../../../../utils/Axios'
+// 获取指定任务的数据
+export function projectWmsOutboundPDASoLoadAppointPickData(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundPDASoLoadAppointPickData',
+    data
+  })
+}
+// 获取当前托的拣选数据
+export function projectWmsOutboundPDASoAppointLpnQuery(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundPDASoAppointLpnQuery',
+    data
+  })
+}
+// 整托零散拣选
+export function projectWmsOutboundPDASoAppointLpnSkuPick(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundPDASoAppointLpnSkuPick',
+    data
+  })
+}
+// 整托拣选
+export function projectWmsOutboundPDASoAppointLpnWholePick(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundPDASoAppointLpnWholePick',
+    data
+  })
+}

package/src/views/wms/api/outbound/pick/sort.js ADDED Viewed

@@ -0,0 +1,23 @@
+/*
+* 拣选分货
+* @author: 张文
+* @date  2023-07-18
+* */
+import lwAxios from "../../../../../utils/Axios";
+// 获取拣选数据
+export function projectWmsOutboundContainerQueryDistributeData(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundContainerQueryDistributeData',
+    data
+  })
+}
+// 执行分拣
+export function projectWmsOutboundContainerDistribute(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundContainerDistribute',
+    data
+  })
+}

package/src/views/wms/api/outbound/pickConsole/orderPick.js CHANGED Viewed

@@ -175,3 +175,21 @@ export function projectWmsOutboundPDAQuerySkuInvAbQty(data) {
     data
   })
 }
+// 整箱拣选
+export function projectWmsOutboundPDASoCasePick(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundPDASoCasePick',
+    data
+  })
+}
+// 回单
+export function projectWmsOutboundPDASoPickReceipt(data) {
+  return lwAxios.action({
+    url: 'projectWmsOutboundPDASoPickReceipt',
+    data
+  })
+}