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

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

@@ -0,0 +1,188 @@
+<!--
+  商品 + 库存查询
+  @author: 张文
+  @date: 2023-05-09
+-->
+<template>
+  <div>
+
+    <div class="lw-global-model-box" style="padding-top: 3px">
+
+      <lw-input
+        :title="$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.skuLocSearch.dqonenuj','商品')"
+        v-model="skuCode"
+        rule-key="sku"
+        :create-rule="$lwScanRule.create('库存查询 - 商品搜索 - sku','SKU')"
+      />
+
+      <lw-input
+        :title="$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.skuLocSearch.mpqzxkoa','库位')"
+        v-model="loc"
+        rule-key="loc"
+        :create-rule="$lwScanRule.create('库存查询 - 库位搜索 - loc','LOCATION')"
+      />
+
+      <lw-button
+        style="margin-top: 10px"
+        block
+        @click="searchClick"
+      >
+        {{
+          $lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.skuLocSearch.fafijsnb', '查询')
+        }}
+      </lw-button>
+
+    </div>
+
+    <owner-tab
+      ref="ownerTab"
+      v-model="tabActive"
+      :get-owner-api="getOwnerAndData"
+      @notOwner="notOwnerData"
+      @tabChange="tabChange"
+    >
+
+      <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.skuLocSearch.dqonenuj','商品')"
+            :value="i.skuCode"
+            val-bold
+            :is-row="false"
+          />
+
+          <lw-button
+            mini
+            @click="lookContent(i)"
+          >
+            {{
+              $lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.skuLocSearch.fhvhtcde', '查看详情')
+            }}
+          </lw-button>
+
+        </div>
+      <lw-title-value-cell
+        :title="$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.skuLocSearch.adsxdfmr','商品名称')"
+        :value="i.skuName"
+      />
+      <div class="lw-global-flex-between lw-global-row">
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.skuLocSearch.mpqzxkoa','库位')"
+          :value="i.locationCode"
+          val-bold
+          :is-row="false"
+        />
+
+        <div class="lw-global-value-bold">{{ i.name }}</div>
+      </div>
+
+        <loc-info-row :item="i"/>
+
+      </div>
+      <lw-pagination
+        v-model="pageNum"
+        :page-total="pageTotal"
+        :page-size.sync="pageSize"
+        @change="getData"
+      />
+    </owner-tab>
+
+  </div>
+</template>
+
+<script>
+
+import {
+  projectWmsQueryInventoryOwner,
+  projectWmsQueryInventoryOwnersBySkuLocation
+} from "../../../../api/inventory/inventory";
+import locInfoRow from "./locInfoRow.vue";
+import ownerTab from "./ownerTab.vue";
+
+export default {
+  name: "skuLocSearch",
+  components: {
+    locInfoRow,
+    ownerTab,
+  },
+  data() {
+    return {
+      skuCode: '',
+      loc: '',
+
+      tabActive: '',
+
+      pageSize: 10,
+      pageNum: 1,
+      pageTotal: 0,
+      dataList: []
+    }
+  },
+  mounted() {
+    this.getOwnerAndData()
+  },
+  methods: {
+    // 获取货主信息及数据
+    async getOwnerAndData() {
+      return await projectWmsQueryInventoryOwner({
+        skuCodeOrName: this.skuCode,
+        locCode: this.loc
+      })
+    },
+    notOwnerData() {
+      this.dataList = []
+      this.pageNum = 1
+      this.pageTotal = 0
+    },
+
+    // tab切换
+    tabChange() {
+      this.pageNum = 1
+      this.getData()
+    },
+
+    // 商品搜索
+    searchClick() {
+      this.pageNum = 1
+      this.$refs.ownerTab.getOwnerData()
+    },
+
+    // 获取数据
+    getData() {
+      projectWmsQueryInventoryOwnersBySkuLocation({
+        locationCode: this.loc,
+        skuCode: this.skuCode,
+        ownerCode: this.tabActive,
+        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: 'skuLocation',
+          ownerCode: this.tabActive,
+          locationCode: item.locationCode,
+          skuCode: item.skuCode
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

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

@@ -0,0 +1,164 @@
+<!--
+  商品搜索
+  @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.skuSearch.ngjboqqv','商品')"
+        v-model="skuCode"
+        :show-bottom-border="false"
+        rule-key="sku"
+        :create-rule="$lwScanRule.create('库存查询 - 商品搜索 - sku','SKU')"
+        @confirm="skuSearch"
+      >
+
+        <template #button>
+          <van-icon
+            name="search"
+            size="18px"
+            @click="skuSearch"
+          />
+        </template>
+
+      </lw-input>
+
+    </div>
+
+    <owner-tab
+      ref="ownerTab"
+      v-model="tabActive"
+      :get-owner-api="getOwnerAndData"
+      @notOwner="notOwnerData"
+      @tabChange="tabChange"
+    >
+
+      <div
+        class="lw-global-model-box"
+        v-for="(i,k) in skuList"
+        :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.skuSearch.ngjboqqv','商品')"
+            :value="i.skuCode"
+            val-bold
+            :is-row="false"
+          />
+
+          <lw-button
+            mini
+            @click="lookContent(i)"
+          >
+            {{
+              $lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.skuSearch.vrrjcsgd', '查看详情')
+            }}
+          </lw-button>
+
+        </div>
+        <lw-title-value-cell
+          :title="$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.skuSearch.bxkznaow','商品名称')"
+          :value="i.skuName"
+        />
+        <loc-info-row :item="i"/>
+
+      </div>
+      <lw-pagination
+        v-model="pageNum"
+        :page-total="pageTotal"
+        :page-size.sync="pageSize"
+        @change="getData"
+      />
+    </owner-tab>
+
+  </div>
+</template>
+
+<script>
+
+import {
+  projectWmsQueryInventoryOwner,
+  projectWmsQueryInventoryOwnersBySku
+} from "../../../../api/inventory/inventory";
+import locInfoRow from "./locInfoRow.vue";
+import ownerTab from "./ownerTab.vue";
+
+export default {
+  name: "skuSearch",
+  components: {
+    locInfoRow,
+    ownerTab,
+  },
+  data() {
+    return {
+      skuCode: '',
+      tabActive: '',
+      pageSize: 10,
+      pageNum: 1,
+      pageTotal: 0,
+      skuList: []
+    }
+  },
+  methods: {
+    // 获取货主信息及数据
+    getOwnerAndData() {
+      return projectWmsQueryInventoryOwner({
+        skuCodeOrName: this.skuCode
+      })
+    },
+    // 没有获取到货主数据
+    notOwnerData() {
+      this.skuList = []
+      this.pageNum = 1
+      this.pageTotal = 0
+    },
+
+    // tab切换
+    tabChange() {
+      this.pageNum = 1
+      this.getData()
+    },
+
+    // 商品搜索
+    skuSearch() {
+      this.pageNum = 1
+      this.$refs.ownerTab.getOwnerData()
+    },
+
+    // 获取数据
+    getData() {
+      projectWmsQueryInventoryOwnersBySku({
+        skuCode: this.skuCode,
+        pageSize: this.pageSize,
+        pageNum: this.pageNum,
+        ownerCode: this.tabActive
+      }).then(res => {
+        this.skuList = res.datas || []
+        this.pageTotal = res.total || 0
+      })
+    },
+
+    // 查看详情
+    lookContent(item) {
+      this.$router.replace({
+        path: '/inventory/queryInventory/lwPage',
+        query: {
+          type: 'sku',
+          ownerCode: this.tabActive,
+          skuCode: item.skuCode,
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

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

@@ -45,23 +45,19 @@
         </lw-tab-box>
 
         <!-- 搜索 -->
-        <div class="lw-global-model-box" v-if="tabActive === 'sku' || tabActive === 'skuLocation'">
-          <lw-input :title="$lwLanguage.get('wms_project.pda.queryInventory.skuCode','商品条码')"
-                    v-model="sku.value"
-                    :get-focus.sync="sku.focus"
-                    required
-                    rule-key="sku"
-                    @confirm="skuConfirm" />
-        </div>
+        <sku-search v-if="tabActive === 'sku'"/>
+        <loc-search v-if="tabActive === 'location'"/>
+        <sku-loc-search v-if="tabActive === 'skuLocation'"/>
+        
         <div class="lw-global-model-box" v-if="tabActive === 'lot'">
           <lw-input :title="$lwLanguage.get('wms_project.pda.queryInventory.location','库位')"
                     v-model="location.value"
                     :get-focus.sync="location.focus"
-                    rule-key="location" />
+                    rule-key="location"/>
           <lw-input :title="$lwLanguage.get('wms_project.pda.queryInventory.skuCode','商品条码')"
                     v-model="sku.value"
                     :get-focus.sync="sku.focus"
-                    rule-key="sku" />
+                    rule-key="sku"/>
           <lw-cell-popup-select :title="$lwLanguage.get('wms_project.pda.queryInventory.owner','货主')"
                     v-model="owner.value"
                     :get-focus.sync="owner.focus"
@@ -76,30 +72,22 @@
           <lw-input :title="$lwLanguage.get('wms_project.pda.queryInventory.lpn','托盘号')"
                     v-model="lpn.value"
                     :get-focus.sync="lpn.focus"
-                    rule-key="lpn" />
+                    rule-key="lpn"/>
           <lw-input :title="$lwLanguage.get('wms_project.pda.queryInventory.caseNum','箱号')"
                     v-model="caseNum.value"
                     :get-focus.sync="caseNum.focus"
-                    rule-key="case" />
-          <lw-button block @click="lotQueryClick" >
-            {{$lwLanguage.get('wms_project.pda.queryInventory.query','查询')}}
+                    rule-key="case"/>
+          <lw-button block @click="lotQueryClick">
+            {{ $lwLanguage.get('wms_project.pda.queryInventory.query', '查询') }}
           </lw-button>
         </div>
-        <div class="lw-global-model-box" v-if="tabActive === 'location' || tabActive === 'skuLocation'">
-          <lw-input :title="$lwLanguage.get('wms_project.pda.queryInventory.location','库位')"
-                    v-model="location.value"
-                    :get-focus.sync="location.focus"
-                    required
-                    rule-key="location"
-                    @confirm="locationConfirm" />
-        </div>
         <div class="lw-global-model-box" v-if="tabActive === 'sn'">
           <lw-input :title="$lwLanguage.get('wms_project.pda.queryInventory.sn','序列号')"
                     v-model="sn.value"
                     :get-focus.sync="sn.focus"
                     required
                     rule-key="sn"
-                    @confirm="snConfirm" />
+                    @confirm="snConfirm"/>
         </div>
       </div>
     </div>
@@ -109,11 +97,16 @@
 <script>
 
 import {projectGetWarehouseOwner} from "../../../../api/outbound/delivery/addOrder";
+import skuSearch from "./../components/skuSearch.vue";
+import locSearch from "./../components/locSearch.vue";
+import skuLocSearch from "./../components/skuLocSearch.vue";
 
 export default {
   name: "lwQueryInventoryIndex",
   components: {
-
+    skuSearch,
+    locSearch,
+    skuLocSearch,
   },
   data() {
     return {
@@ -193,40 +186,6 @@ export default {
       })
     },
 
-    //商品条码校验
-    skuCheck() {
-      if (!this.sku.value) {
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.queryInventory.sku.null','商品条码不能为空')
-        )
-        this.sku.focus = true
-        return false
-      }
-
-      return true
-    },
-    //商品确认
-    skuConfirm() {
-      if (!this.skuCheck()) {
-        return
-      }
-
-      switch (this.tabActive) {
-        case "sku":
-          this.$router.replace({
-            path: '/inventory/queryInventory/lwPage',
-            query: {
-              'type': this.tabActive,
-              'skuCode': this.sku.value
-            }
-          })
-          break
-        case "skuLocation":
-          this.location.focus = true
-          break
-      }
-    },
-
     //序列号校验
     snCheck() {
       if (!this.sn.value) {
@@ -254,50 +213,6 @@ export default {
       })
     },
 
-    //库位校验
-    locationCheck() {
-      if (!this.location.value) {
-        this.$lwShowErrorMsg(
-          this.$lwLanguage.get('wms_project.pda.queryInventory.location.null','库位不能为空')
-        )
-        this.location.focus = true
-        return false
-      }
-
-      return true
-    },
-    //库位确认
-    locationConfirm() {
-      if (!this.locationCheck()) {
-        return
-      }
-
-      switch (this.tabActive) {
-        case "location":
-          this.$router.replace({
-            path: '/inventory/queryInventory/lwPage',
-            query: {
-              'type': this.tabActive,
-              'locationCode': this.location.value
-            }
-          })
-          break
-        case "skuLocation":
-          if (!this.skuCheck()) {
-            return
-          }
-
-          this.$router.replace({
-            path: '/inventory/queryInventory/lwPage',
-            query: {
-              'type': this.tabActive,
-              'skuCode': this.sku.value,
-              'locationCode': this.location.value
-            }
-          })
-          break
-      }
-    },
 
     // 货主确认
     ownerConfirm() {