@logwire/logwire-wms-pda-ui 3.1.3-zc-beta → 3.3.2

package/src/views/wms/page/inventory/queryInventory/page/index.vue

@@ -10,9 +10,8 @@
 
     <div class="lw-global-page-box">
       <!-- 货主+分仓分组 -->
-      <lw-tab-box>
+      <lw-tab-box v-if="type !== 'container'">
         <van-tabs
-          v-if="type !== 'container'"
           type="card"
           animated
           v-model="tabActive"
@@ -41,7 +40,7 @@
                     round
                     style="flex-shrink: 0"
                     @click="goIndex">
-                    {{ $lwLanguage.get('wms_project.pda.inventory.query.changeSku', '切换商品') }}
+                    {{ $lwLanguage.get('wms_project.pda.inventory.query.changeCondition', '切换') }}
                   </lw-button>
                 </div>
 
@@ -55,40 +54,7 @@
                 </div>
 
                 <!-- 库存统计 -->
-                <div class="lw-global-row">
-                <span class="lw-global-title">
-                  {{ $lwLanguage.get('wms_project.pda.inventory.query.invReport', '库存统计') }}
-                </span>
-                  <span>
-                <span class="lw-global-value">
-                  {{ $lwLanguage.get('wms_project.pda.inventory.query.invReport.qty', '库存量') }}
-                </span>
-                  <span
-                    class="lw-global-value-bold"
-                    style="color: #D50000"
-                  >
-                    {{ group.qty }}
-                  </span>
-                  <span class="lw-global-value">
-                     / {{ $lwLanguage.get('wms_project.pda.inventory.query.invReport.lockQty', '锁定量') }}
-                  </span>
-                  <span
-                    class="lw-global-value-bold"
-                    style="color: #D50000"
-                  >
-                    {{ group.lockQty }}
-                  </span>
-                  <span class="lw-global-value">
-                     / {{ $lwLanguage.get('wms_project.pda.inventory.query.invReport.availQty', '可用量') }}
-                  </span>
-                  <span
-                    class="lw-global-value-bold"
-                    style="color: #D50000"
-                  >
-                    {{ group.availQty }}
-                  </span>
-                </span>
-                </div>
+                <loc-info-row :item="group"/>
               </div>
             </div>
 
@@ -108,7 +74,7 @@
                     round
                     style="flex-shrink: 0"
                     @click="goIndex">
-                    {{ $lwLanguage.get('wms_project.pda.inventory.query.changeSku', '切换库位') }}
+                    {{ $lwLanguage.get('wms_project.pda.inventory.query.changeCondition', '切换') }}
                   </lw-button>
                 </div>
 
@@ -122,49 +88,13 @@
                 </div>
 
                 <!-- 库存统计 -->
-                <div class="lw-global-row">
-                  <span class="lw-global-title">
-                    {{ $lwLanguage.get('wms_project.pda.inventory.query.invReport', '库存统计') }}
-                  </span>
-                    <span>
-                      <span class="lw-global-value">
-                        {{ $lwLanguage.get('wms_project.pda.inventory.query.invReport.skuCount', '品种数') }}
-                      </span>
-                      <span
-                        class="lw-global-value-bold"
-                        style="color: #D50000"
-                      >
-                        {{ group.skuCount }}
-                      </span>
-                      <span class="lw-global-value">
-                        {{ $lwLanguage.get('wms_project.pda.inventory.query.invReport.qty', '库存量') }}
-                      </span>
-                      <span
-                        class="lw-global-value-bold"
-                        style="color: #D50000"
-                      >
-                        {{ group.qty }}
-                      </span>
-                      <span class="lw-global-value">
-                         / {{ $lwLanguage.get('wms_project.pda.inventory.query.invReport.lockQty', '锁定量') }}
-                      </span>
-                      <span
-                        class="lw-global-value-bold"
-                        style="color: #D50000"
-                      >
-                        {{ group.lockQty }}
-                      </span>
-                      <span class="lw-global-value">
-                         / {{ $lwLanguage.get('wms_project.pda.inventory.query.invReport.availQty', '可用量') }}
-                      </span>
-                      <span
-                        class="lw-global-value-bold"
-                        style="color: #D50000"
-                      >
-                        {{ group.availQty }}
-                      </span>
-                    </span>
-                </div>
+                <loc-info-row
+                  :item="group"
+                  :add-list="[{
+                    label: $lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.page.index.pqrwjdzw','品种'),
+                    key: 'skuCount'
+                  }]"
+                />
               </div>
             </div>
 
@@ -177,6 +107,7 @@
                 :index="k"
                 :type="type === 'sku'? 'location': (type === 'location'? 'sku': type)"
                 @detail="openLotPopup"
+                @cutBtn="goIndex"
               />
             </div>
             <!-- 分页 -->
@@ -195,7 +126,7 @@
                     <lw-button
                       round
                       @click="goIndex">
-                      {{ $lwLanguage.get('wms_project.pda.inventory.query.changeCondition', '切换条件') }}
+                      {{ $lwLanguage.get('wms_project.pda.inventory.query.changeCondition', '切换') }}
                     </lw-button>
                   </template>
                 </lw-inventory-lot-page>
@@ -218,7 +149,7 @@
                     round
                     style="flex-shrink: 0"
                     @click="goIndex">
-                    {{ $lwLanguage.get('wms_project.pda.inventory.query.changeCondition', '切换条件') }}
+                    {{ $lwLanguage.get('wms_project.pda.inventory.query.changeCondition', '切换') }}
                   </lw-button>
                 </div>
 
@@ -281,11 +212,11 @@
               <div class="lw-global-model-box">
                 <!-- 数据看板 -->
                 <div class="lw-global-row lw-global-flex-around">
-                  <!-- 待下架 -->
+                  <!-- 库存量 -->
                   <div class="lw-task-move-look-item">
-                    <div class="lw-global-value-bold">{{ group.qty || 0 }}</div>
+                    <div class="lw-global-value-bold" style="text-align: center">{{ group.qty || 0 }}</div>
                     <div class="lw-global-title">
-                      {{ $lwLanguage.get('wms_project.pda.inbound.taskMove.todoQty','库存量') }}
+                      {{ $lwLanguage.get('wms_project.pda.inventory.query.invReport.qty','库存量') }}
                     </div>
                   </div>
                 </div>
@@ -316,7 +247,7 @@
               round
               style="flex-shrink: 0"
               @click="goIndex">
-              {{ $lwLanguage.get('wms_project.pda.inventory.query.changeCondition', '切换条件') }}
+              {{ $lwLanguage.get('wms_project.pda.inventory.query.changeCondition', '切换') }}
             </lw-button>
           </div>
 
@@ -402,6 +333,7 @@
 <script>
 import lwInventoryItem from './../../inventoryItem/index.vue'
 import lwInventoryLotPage from './../../inventoryLotPage/index.vue'
+import locInfoRow from "../components/locInfoRow.vue";
 import {
   projectWmsQueryInventoryLocationBySku,
   projectWmsQueryInventoryLotBySn,
@@ -417,7 +349,8 @@ export default {
   name: "lwQueryInventoryPage",
   components: {
     lwInventoryItem,
-    lwInventoryLotPage
+    lwInventoryLotPage,
+    locInfoRow,
   },
   data() {
     return {
@@ -464,15 +397,20 @@ export default {
     },
     // 重新加载
     reload() {
+      const routerData = this.$route.query
       if (this.type === 'sku') {
         projectWmsQueryInventoryOwnersBySku({
-          skuCode: this.$route.query.skuCode
-        }).then(res => {
+          skuCode: routerData.skuCode,
+          ownerCode: routerData.ownerCode,
+          pageSize: 10,
+          pageNum: 1
+        }).then(data => {
+          const res = data.datas
           this.checkExistInventory(res)
 
           for (let i = 0; i < res.length; i++) {
             // 分组: 货主+分仓代码
-            res[i].key = res[i].ownerCode + (res[i].belongCompanyCode? (':' + res[i].belongCompanyCode): '')
+            res[i].key = res[i].ownerCode + (res[i].belongCompanyCode ? (':' + res[i].belongCompanyCode) : '')
           }
           this.groupList = res;
 
@@ -483,13 +421,17 @@ export default {
         })
       } else if (this.type === 'location') {
         projectWmsQueryInventoryOwnersByLocation({
-          locationCode: this.$route.query.locationCode
-        }).then(res => {
+          locationCode: routerData.locationCode,
+          ownerCode: routerData.ownerCode,
+          pageSize: 10,
+          pageNum: 1
+        }).then(data => {
+          const res = data.datas
           this.checkExistInventory(res)
 
           for (let i = 0; i < res.length; i++) {
             // 分组: 货主+分仓代码
-            res[i].key = res[i].ownerCode + (res[i].belongCompanyCode? (':' + res[i].belongCompanyCode): '')
+            res[i].key = res[i].ownerCode + (res[i].belongCompanyCode ? (':' + res[i].belongCompanyCode) : '')
           }
           this.groupList = res;
 
@@ -500,14 +442,18 @@ export default {
         })
       } else if (this.type === 'skuLocation') {
         projectWmsQueryInventoryOwnersBySkuLocation({
-          skuCode: this.$route.query.skuCode,
-          locationCode: this.$route.query.locationCode
-        }).then(res => {
+          skuCode: routerData.skuCode,
+          locationCode: routerData.locationCode,
+          ownerCode: routerData.ownerCode,
+          pageSize: 10,
+          pageNum: 1
+        }).then(data => {
+          const res = data.datas
           this.checkExistInventory(res)
 
           for (let i = 0; i < res.length; i++) {
             // 分组: 货主+分仓代码
-            res[i].key = res[i].ownerCode + (res[i].belongCompanyCode? (':' + res[i].belongCompanyCode): '')
+            res[i].key = res[i].ownerCode + (res[i].belongCompanyCode ? (':' + res[i].belongCompanyCode) : '')
           }
           this.groupList = res;
 

package/src/views/wms/page/outbound/bale/components/containerInfo/index.vue

@@ -27,40 +27,27 @@
     </div>
 
     <lw-data-look-bg type="not">
-      <div v-if="showCustomer">
 
-        <div>{{ customerCount || 0 }}</div>
-        <div>
-          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.lvjrjuvr','客户数') }}
-        </div>
-
-      </div>
-      <div>
-
-        <div>{{ skuCount }}</div>
-        <div>
-          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.vdkljntv','品种数') }}
-        </div>
-
-      </div>
-
-      <div>
-
-        <div>{{ waitCount }}</div>
-        <div>
-          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.ogeeqjzr','待复核') }}
-        </div>
-
-      </div>
+      <lw-data-look-item
+        v-if="showCustomer"
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.lvjrjuvr','客户数')"
+        :value="customerCount || 0"
+      />
 
-      <div>
+      <lw-data-look-item
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.vdkljntv','品种数')"
+        :value="skuCount"
+      />
 
-        <div>{{ overCount }}</div>
-        <div>
-          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.vwbnookb','已复核') }}
-        </div>
+      <lw-data-look-item
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.ogeeqjzr','待复核')"
+        :value="waitCount"
+      />
 
-      </div>
+      <lw-data-look-item
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.components.containerInfo.vwbnookb','已复核')"
+        :value="overCount"
+      />
     </lw-data-look-bg>
 
     <div

package/src/views/wms/page/outbound/pick/alone/index.vue

@@ -227,9 +227,6 @@ export default {
       // 拣选数据
       pickData: {},
 
-      // tab激活项
-      tabActive: 'ing',
-
       // 拣选库位
       locationCode: {
         value: '',
@@ -458,7 +455,7 @@ export default {
     // 任务行切换后
     cutEnd() {
       this.clearInputVal(
-        ['locationCode', 'lpn', 'box'],
+        this.getCheckInputKeyArr(this.nowPickData.fromCase),
         ['sku', 'qty', 'sn']
       )
       this.sn.list = []

package/src/views/wms/page/outbound/pick/box/index.vue

@@ -202,9 +202,6 @@ export default {
       // 拣选数据
       pickData: {},
 
-      // tab激活项
-      tabActive: 'ing',
-
       // 拣选库位
       locationCode: {
         value: '',
@@ -297,7 +294,7 @@ export default {
     // 任何行切换后
     cutEnd() {
       this.clearInputVal(
-        ['locationCode', 'lpn'],
+        this.getCheckInputKeyArr(false),
         ['box'],
         true
       )

package/src/views/wms/page/outbound/pick/components/taskInfo.vue

@@ -38,36 +38,28 @@
     <lw-data-look-bg type="not">
 
       <!-- 计划量 -->
-      <div>
-        <div>{{ item.totalQty || 0 }}</div>
-        <div>
-          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.tyxurdvg','计划量') }}
-        </div>
-      </div>
+      <lw-data-look-item
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.tyxurdvg','计划量')"
+        :value="item.totalQty || 0"
+      />
 
       <!-- 已拣量 -->
-      <div>
-        <div>{{ item.pickQty || 0 }}</div>
-        <div>
-          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.zzeboixn','已拣量') }}
-        </div>
-      </div>
+      <lw-data-look-item
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.zzeboixn','已拣量')"
+        :value="item.pickQty || 0"
+      />
 
       <!-- 待拣量 -->
-      <div>
-        <div>{{ item.waitPickQty || 0 }}</div>
-        <div>
-          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.nbwstigk','待拣量') }}
-        </div>
-      </div>
+      <lw-data-look-item
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.nbwstigk','待拣量')"
+        :value="item.waitPickQty || 0"
+      />
 
       <!-- 异常量 -->
-      <div>
-        <div>{{ item.abnormalQty || 0 }}</div>
-        <div>
-          {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.chaslvxr','异常量') }}
-        </div>
-      </div>
+      <lw-data-look-item
+        :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.components.dataLookAndChange.chaslvxr','异常量')"
+        :value="item.abnormalQty || 0"
+      />
 
     </lw-data-look-bg>
     <div

package/src/views/wms/page/outbound/pick/container/index.vue

@@ -213,9 +213,6 @@ export default {
       // 拣选数据
       pickData: {},
 
-      // tab激活项
-      tabActive: 'ing',
-
       // 绑定的容器号
       lpn: {
         value: '',

package/src/views/wms/page/outbound/pick/index/index.vue

@@ -126,27 +126,26 @@
       <!--数据看板-->
       <lw-data-look-bg>
 
-        <div>
-          <div>{{ taskData.pickData.receiveLineCount }}</div>
-          <div>
-            {{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.lmpwxfwy','接收行') }}
-          </div>
-        </div>
+        <lw-data-look-item
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.lmpwxfwy','接收行')"
+          :value="taskData.pickData.receiveLineCount"
+        />
 
-        <div>
-          <div>{{ taskData.pickData.finishLineCount }}</div>
-          <div>{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.rebhfkmi','完成行') }}</div>
-        </div>
+        <lw-data-look-item
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.rebhfkmi','完成行')"
+          :value="taskData.pickData.finishLineCount"
+        />
 
-        <div>
-          <div>{{ taskData.pickData.skuQty }}</div>
-          <div>{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.vvaytrgg','商品数') }}</div>
-        </div>
+        <lw-data-look-item
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.vvaytrgg','商品数')"
+          :value="taskData.pickData.skuQty"
+        />
+
+        <lw-data-look-item
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.lmmwhidr','有效工时')"
+          :value="useMinutes"
+        />
 
-        <div>
-          <div>{{ useMinutes }}</div>
-          <div>{{ $lwLanguage.get('wms_project.pda.components.page.outbound.pick.index.lmmwhidr','有效工时') }}</div>
-        </div>
 
       </lw-data-look-bg>
 

package/src/views/wms/page/outbound/pick/lpn/index.vue

@@ -161,9 +161,6 @@ export default {
       // 任务行索引
       taskIndex: 0,
 
-      // tab激活项
-      tabActive: 'ing',
-
       // 拣选库位
       locationCode: {
         value: '',

package/src/views/wms/page/outbound/pick/mixin/all.js

@@ -8,7 +8,10 @@ export const all = {
   data() {
     return {
       // 是否是用户主动切换表示
-      isUserClickCut: true
+      isUserClickCut: true,
+
+      // 拣选tab激活项
+      tabActive: 'ing',
     }
   },
   methods: {
@@ -104,37 +107,60 @@ export const all = {
       let all = []
       let focus = 'sku'
       if (this.isUserClickCut) {
-        all = checkArr
+        all = ['locationCode', 'lpn', 'box']
         focus = checkArr[0]
       } else {
         const {fromLocationCode, fromLpn, fromCase} = this.nowPickData
 
-        if (checkArr.includes('locationCode') && this.locationCode.value !== fromLocationCode) {
+        const checkLoc = this.locationCode && this.locationCode.value !== fromLocationCode
+        const checkLpn = this.lpn && this.lpn.value !== fromLpn
+        const checkBox = this.box && this.box.value !== fromCase
+
+        const hasLoc = checkArr.includes('locationCode') && checkLoc
+        const hasLpn = checkArr.includes('lpn') && checkLpn
+        const hasBox = checkArr.includes('box') && checkBox
+
+
+        if (checkLoc) {
           all.push('locationCode')
-          focus = 'locationCode'
+          hasLoc ? focus = 'locationCode' : ''
         }
 
-        if (checkArr.includes('lpn') && this.lpn.value !== fromLpn) {
+        if (checkLpn) {
           all.push('lpn')
-          focus = 'lpn'
+          !hasLoc && hasLpn ? focus = 'lpn' : ''
         }
 
-        if (checkArr.includes('box') && this.box.value !== fromCase) {
+        if (checkBox) {
           all.push('box')
-          focus = 'box'
+          !hasLoc && !hasLpn && hasBox ? focus = 'box' : ''
         }
       }
 
       const arr = [...all, ...clearArr]
-      arr.forEach(item => this[item].value = '')
+      arr.forEach(item => {
+        this[item] ? this[item].value = '' : ''
+      })
 
       this.goTop()
-      getFocus ? this[focus].focus = true : ''
+
+      getFocus && this[focus] ? this[focus].focus = true : ''
       this.isUserClickCut = false
       return {
         arr,
         focus
       }
+    },
+
+    // 获取需要校验不清空输入框的数组
+    getCheckInputKeyArr(hasBox = true) {
+      let clearArr = ['locationCode']
+
+      if (this.hasLpn) clearArr.push('lpn')
+
+      hasBox && clearArr.push('box')
+      console.log(clearArr, 999)
+      return clearArr
     }
   }
 }

package/src/views/wms/page/outbound/pick/notAlone/index.vue

@@ -306,9 +306,6 @@ export default {
       // 拣选数据
       pickData: {},
 
-      // tab激活项
-      tabActive: 'ing',
-
       // 拣选库位
       locationCode: {
         value: '',
@@ -605,10 +602,8 @@ export default {
     },
     // 任务行切换后
     cutEnd() {
-
-
       this.clearInputVal(
-        ['locationCode', 'lpn', 'box'],
+        this.getCheckInputKeyArr(this.nowPickData.fromCase),
         ['sku', 'nowScan', 'qty', 'sn'],
         true
       )