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

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

@@ -42,22 +42,30 @@
         </span>
       </div>
 
-      <div style="flex-shrink: 0">
+<!--      <div style="flex-shrink: 0">
         <span class="lw-global-value-bold">
           {{ item.locationTypeLabel }}
         </span>
-      </div>
+      </div>-->
     </div>
 
     <!-- 批次 -->
     <div v-if="type === 'lot'">
-      <div class="lw-global-row-start">
-        <span class="lw-global-title">
-          {{ $lwLanguage.get('wms_project.pda.inventory.query.sku', '商品') }}
-        </span>
-        <span class="lw-global-value-bold">
-            {{ item.skuCode }}
-        </span>
+
+      <div class="lw-global-flex-between lw-global-row-start">
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.inventory.query.sku', '商品')"
+          :value="item.skuCode"
+          val-bold
+          :is-row="false"
+        />
+
+        <lw-button
+          round
+          @click="$emit('cutBtn')"
+        >
+          {{ $lwLanguage.get('wms_project.pda.inventory.query.changeCondition', '切换') }}
+        </lw-button>
       </div>
       <div class="lw-global-flex-between lw-global-row">
         <div>
@@ -122,62 +130,37 @@
     </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"
-        >
-          {{ item.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"
-        >
-          {{ item.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"
-        >
-          {{ item.availQty }}
-        </span>
-      </span>
-    </div>
+    <loc-info-row
+      :item="item"
+      :show-frozen-qty="['sku','location'].includes(type)"
+    />
 
   </div>
 </template>
 
 <script>
+import locInfoRow from "../queryInventory/components/locInfoRow.vue";
 
 export default {
   name: "index",
-  props:{
+  components: {
+    locInfoRow
+  },
+  props: {
     type: {
       type: String,
       default: ''
     },
 
     // 数据
-    item:{
+    item: {
       type: Object,
-      default: ()=>{}
+      default: () => {
+      }
     },
 
     // 数据索引
-    index:{
+    index: {
       type: Number,
       default: 0
     }
@@ -187,7 +170,7 @@ export default {
   },
   methods: {
     // 查看详细
-    detail(){
+    detail() {
       this.$emit('detail', this.item, this.index)
     }
   }

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

@@ -46,80 +46,49 @@
       </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"
-        >
-          {{ item.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"
-        >
-          {{ item.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"
-        >
-          {{ item.availQty }}
-        </span>
-      </span>
-      </div>
+      <loc-info-row
+        class="lw-global-row"
+        :item="item"
+      />
     </div>
 
     <!-- 数据看板 -->
-    <div class="lw-global-row lw-global-flex-around">
-      <!-- 待下架 -->
-      <div class="lw-task-move-look-item">
-        <div class="lw-global-value-bold">{{ lotPage.data.qty || 0 }}</div>
-        <div class="lw-global-title">
-          {{ $lwLanguage.get('wms_project.pda.inventory.query.invReport.qty','库存量') }}
-        </div>
-      </div>
-
-      <!-- 已下架 -->
-      <div class="lw-task-move-look-item">
-        <div class="lw-global-value-bold">{{ lotPage.data.lockQty || 0 }}</div>
-        <div class="lw-global-title">
-          {{ $lwLanguage.get('wms_project.pda.inventory.query.invReport.lockQty', '锁定量') }}
-        </div>
-      </div>
-
-      <!-- 异常量 -->
-      <div class="lw-task-move-look-item">
-        <div class="lw-global-value-bold" style="color: #D50000">
-          {{ lotPage.data.availQty || 0 }}
-        </div>
-        <div class="lw-global-title" style="color: #D50000">
-          {{ $lwLanguage.get('wms_project.pda.inventory.query.invReport.availQty', '可用量') }}
-        </div>
-      </div>
-    </div>
+    <lw-data-look-bg
+      class="lw-global-bottom-border"
+      type="null"
+      :show-end-line="false"
+    >
+      <lw-data-look-item
+        :title="$lwLanguage.get('wms_project.pda.inventory.query.invReport.qty','库存')"
+        :value="lotPage.data.qty || 0"
+      />
+      <lw-data-look-item
+        :title="$lwLanguage.get('wms_project.pda.inventory.query.invReport.lockQty', '锁定')"
+        :value="lotPage.data.lockQty || 0"
+      />
+      <lw-data-look-item
+        :title="$lwLanguage.get('wms_project.pda.inventory.query.invReport.availQty', '可用')"
+        :value="lotPage.data.availQty || 0"
+        color="#D50000"
+      />
+      <lw-data-look-item
+        :title="$lwLanguage.get('', '冻结')"
+        :value="lotPage.data.frozenQty || 0"
+        color="#D50000"
+      />
+    </lw-data-look-bg>
 
     <lw-title-value-cell
       :title="$lwLanguage.get('wms_project.pda.inventory.query.lpn', '托盘号')"
       :value="lotPage.data.lpn"
     />
     <lw-title-value-cell
+      style="margin-bottom: 10px"
       :title="$lwLanguage.get('wms_project.pda.inventory.query.caseNum', '箱号')"
       :value="lotPage.data.caseNum"
     />
-    <lw-lot-look-module :columns="lotPage.data.lotItems" />
+
+    <lw-lot-look-module :columns="lotPage.data.lotItems"/>
 
     <!-- 分页 -->
     <lw-pages
@@ -137,14 +106,19 @@
 <script>
 
 import {projectWmsQueryInventoryLotBySku} from "../../../api/inventory/inventory";
+import locInfoRow from "../queryInventory/components/locInfoRow.vue";
 
 export default {
   name: "index",
-  props:{
+  components: {
+    locInfoRow
+  },
+  props: {
     // 数据
-    item:{
+    item: {
       type: Object,
-      default: ()=>{}
+      default: () => {
+      }
     },
   },
   data() {

package/src/views/wms/page/inventory/queryInventory/components/locInfoRow.vue

@@ -0,0 +1,105 @@
+<!--
+  库存情况行
+  @author: 张文
+  @date: 2023-05-09
+-->
+<template>
+  <div class="lw-global-flex-start lw-global-row-end">
+
+    <div
+      class="lw-global-title"
+      style="flex-shrink: 0;margin-right: 5px"
+    >
+      {{ $lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.locInfoRow.smhkbkjk','库存情况') }}
+    </div>
+
+    <div
+      class="lw-global-flex-start"
+      style="flex-wrap: wrap;"
+    >
+
+      <template v-for="(i,k) in list">
+        <lw-title-value-cell
+          :key="k"
+          :title="i.label"
+          :value="item[i.key]"
+          val-bold
+          val-red
+          :is-row="false"
+          :title-style="{color:'#262626'}"
+        />
+        <div :key="'separator' + k" class="separator"></div>
+      </template>
+
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "locInfoRow",
+  props: {
+    item: {
+      type: Object,
+      default: () => {
+      }
+    },
+    // 是否显示品种数
+    addList: {
+      type: Array,
+      default: () => []
+    },
+    // 是否显示冻结数
+    showFrozenQty: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      list: [
+        {
+          label: this.$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.locInfoRow.lcnxbswt','库存'),
+          key: 'qty'
+        },
+        {
+          label: this.$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.locInfoRow.qxbivsad','锁定'),
+          key: 'lockQty'
+        },
+        {
+          label: this.$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.locInfoRow.ocvwrdnk','可用'),
+          key: 'availQty'
+        }
+      ],
+
+    }
+  },
+  mounted() {
+    if (this.showFrozenQty) {
+      this.list.push({
+        label: this.$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.locInfoRow.zbhjbuxv', '冻结'),
+        key: 'frozenQty'
+      })
+    }
+    this.list = this.addList.concat(this.list)
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="less">
+.separator {
+  margin: 0 5px;
+
+  &:after {
+    content: '/';
+  }
+
+  &:last-child:after {
+    content: '';
+  }
+}
+</style>

package/src/views/wms/page/inventory/queryInventory/components/locSearch.vue

@@ -0,0 +1,150 @@
+<!--
+  库位查询
+  @author: 张文
+  @date: 2023-05-09
+-->
+<template>
+  <div>
+
+    <div class="lw-global-model-box lw-global-model-box-3px">
+
+      <lw-input
+        :title="$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.locSearch.jheyqiwa','库位')"
+        v-model="search"
+        :show-bottom-border="false"
+        rule-key="loc"
+        :create-rule="$lwScanRule.create('库存查询 - 库位搜索 - loc','LOCATION')"
+        @confirm="skuSearch"
+      >
+
+        <template #button>
+          <van-icon
+            name="search"
+            size="18px"
+            @click="skuSearch"
+          />
+        </template>
+
+      </lw-input>
+
+    </div>
+
+    <div
+      class="lw-global-model-box"
+      v-for="(i,k) in dataList"
+      :key="k"
+    >
+
+      <div class="lw-global-flex-between lw-global-row-start">
+
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.locSearch.jheyqiwa','库位')"
+          :value="i.locationCode"
+          val-bold
+          :is-row="false"
+        />
+
+        <lw-button
+          mini
+          @click="lookContent(i)"
+        >
+          {{ $lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.locSearch.lodyjirw','查看详情') }}
+        </lw-button>
+
+      </div>
+      <lw-title-value-cell
+        :title="$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.locSearch.rwimrbpd','库位类型')"
+        :value="i.locationTypeLabel"
+      />
+      <lw-title-value-cell
+        :title="$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.locSearch.gihcmqaj','货主')"
+        :value="i.ownerCode"
+      />
+      <loc-info-row
+        :item="i"
+        :add-list="[{
+          label: $lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.locSearch.logwukls','品种'),
+          key: 'skuCount'
+        }]"
+      />
+
+    </div>
+    <lw-not-data v-if="!pageTotal"/>
+    <lw-pagination
+      v-model="pageNum"
+      :page-total="pageTotal"
+      :page-size.sync="pageSize"
+      @change="getData"
+    />
+
+  </div>
+</template>
+
+<script>
+
+import {projectWmsQueryInventoryByLocation} from "../../../../api/inventory/inventory";
+import locInfoRow from "./locInfoRow.vue";
+
+export default {
+  name: "locSearch",
+  components: {
+    locInfoRow
+  },
+  data() {
+    return {
+      search: '',
+
+      pageSize: 10,
+      pageNum: 1,
+      pageTotal: 0,
+      dataList: []
+    }
+  },
+  mounted() {
+    this.getData()
+  },
+  methods: {
+
+    // tab切换
+    tabChange() {
+      this.pageNum = 1
+      this.pageSize = 10
+      this.getData()
+    },
+
+    // 商品搜索
+    skuSearch() {
+      this.pageNum = 1
+      this.getData()
+    },
+
+    // 获取数据
+    getData() {
+      projectWmsQueryInventoryByLocation({
+        locationCode: this.search,
+        pageSize: this.pageSize,
+        pageNum: this.pageNum
+      }).then(res => {
+        this.dataList = res.datas || []
+        this.pageTotal = res.total || 0
+      })
+    },
+
+    // 查看详情
+    lookContent(item) {
+      this.$router.replace({
+        path: '/inventory/queryInventory/lwPage',
+        query: {
+          type: 'location',
+          ownerCode: item.ownerCode,
+          locationCode: item.locationCode
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/wms/page/inventory/queryInventory/components/ownerTab.vue

@@ -0,0 +1,91 @@
+<!--
+  货主tab选项框
+  @author: 张文
+  @date: 2023-05-19
+-->
+<template>
+  <div>
+    <lw-tab-box
+      v-if="ownerList.length"
+      style="margin-top: 10px"
+    >
+      <van-tabs
+        type="card"
+        animated
+        v-model="tabActive"
+        @change="tabChange"
+      >
+
+        <van-tab
+          v-for="(i,k) in ownerList"
+          :key="k"
+          :name="i.code"
+          :title="i.code"
+        />
+      </van-tabs>
+    </lw-tab-box>
+
+    <slot></slot>
+
+    <lw-not-data v-if="!ownerList.length"/>
+  </div>
+</template>
+
+<script>
+
+
+export default {
+  name: "ownerTab",
+  props: {
+    value: String,
+    getOwnerApi: {
+      type: Function,
+      default: () => {
+      },
+      required: true
+    }
+  },
+  computed: {
+    tabActive: {
+      get() {
+        return this.value
+      },
+      set(v) {
+        this.$emit('input', v)
+      }
+    }
+  },
+  data() {
+    return {
+      ownerList: [],
+    }
+  },
+  mounted() {
+    this.getOwnerData()
+  },
+  methods: {
+
+    // 获取货主信息
+    async getOwnerData() {
+      this.ownerList = await this.getOwnerApi()
+
+      if (!this.ownerList.length) {
+        this.$emit('notOwner')
+        return
+      }
+
+      let hasOwner = this.tabActive && this.ownerList.some(item => this.tabActive === item.code)
+      !hasOwner ? this.tabActive = this.ownerList[0].code : ''
+
+      this.tabChange()
+    },
+    tabChange() {
+      this.$emit('tabChange', this.tabActive)
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>