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

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

@@ -1,91 +1,87 @@
 <template>
   <div>
+    <lw-title-value-cell
+      :title="$lwLanguage.get('', '货主')"
+      :value="$lwCheckVal(lotPage.data.ownerCode) + ' / ' + $lwCheckVal(lotPage.data.ownerName)"
+      is-row-start
+      val-bold
+    />
     <!-- 商品 -->
-    <div class="lw-global-model-box">
-      <div class="lw-global-flex-between lw-global-row-start">
-        <div>
-          <span class="lw-global-title">
-            {{ $lwLanguage.get('wms_project.pda.inventory.query.sku', '商品') }}
-          </span>
-          <span class="lw-global-value-bold">
-            {{ item.skuCode }}
-          </span>
-        </div>
-
-        <div style="flex-shrink: 0">
-          <slot name="button">
-          </slot>
-        </div>
-      </div>
+    <div class="lw-global-flex-between lw-global-row">
+
+      <lw-title-value-cell
+        style="flex: 1"
+        :title="$lwLanguage.get('wms_project.pda.inventory.query.sku', '商品')"
+        :value="item.skuCode"
+        val-bold
+        :is-row="false"
+      />
 
-      <div class="lw-global-row">
-        <span class="lw-global-title">
-          {{ $lwLanguage.get('wms_project.pda.inventory.query.skuName', '商品名称') }}
-        </span>
-        <span class="lw-global-value">
-          {{ item.skuName }}
-        </span>
+      <div style="flex-shrink: 0">
+        <slot name="button"></slot>
       </div>
+    </div>
 
-      <!-- 库位 -->
-      <div class="lw-global-flex-between lw-global-row">
-        <div>
-          <span class="lw-global-title">
-            {{ $lwLanguage.get('wms_project.pda.inventory.query.location', '库位') }}
-          </span>
-            <span class="lw-global-value-bold">
-            {{ item.locationCode }}
-          </span>
-        </div>
-
-        <div style="flex-shrink: 0">
-          <span class="lw-global-value-bold">
-            {{ item.locationTypeLabel }}
-          </span>
-        </div>
-      </div>
+    <lw-title-value-cell
+      style="flex: 1"
+      :title="$lwLanguage.get('wms_project.pda.inventory.query.skuName', '商品名称')"
+      :value="$lwCheckVal(item.skuName)"
+    />
 
-      <!-- 库存统计 -->
-      <loc-info-row
-        class="lw-global-row"
-        :item="item"
+    <!-- 库位 -->
+    <div class="lw-global-flex-between lw-global-row">
+      <lw-title-value-cell
+        style="flex: 1"
+        :title="$lwLanguage.get('wms_project.pda.inventory.query.location', '库位') "
+        :value="item.locationCode"
+        val-bold
+        :is-row="false"
       />
+
+      <lw-tag
+        v-if="item.locationTypeLabel"
+        style="flex-shrink: 0"
+        round
+        plain
+      >
+        {{ item.locationTypeLabel }}
+      </lw-tag>
     </div>
 
-    <!-- 数据看板 -->
+    <!-- 库存统计 -->
     <lw-data-look-bg
-      class="lw-global-bottom-border"
+      class="lw-global-row"
       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"
+        :value="lotPage.data.qtyLabel || 0"
       />
       <lw-data-look-item
         :title="$lwLanguage.get('wms_project.pda.inventory.query.invReport.lockQty', '锁定')"
-        :value="lotPage.data.lockQty || 0"
+        :value="lotPage.data.lockQtyLabel || 0"
       />
       <lw-data-look-item
         :title="$lwLanguage.get('wms_project.pda.inventory.query.invReport.availQty', '可用')"
-        :value="lotPage.data.availQty || 0"
+        :value="lotPage.data.availQtyLabel || 0"
         color="#D50000"
       />
       <lw-data-look-item
         :title="$lwLanguage.get('', '冻结')"
-        :value="lotPage.data.frozenQty || 0"
+        :value="lotPage.data.frozenQtyLabel || 0"
         color="#D50000"
       />
     </lw-data-look-bg>
 
     <lw-title-value-cell
       :title="$lwLanguage.get('wms_project.pda.inventory.query.lpn', '托盘号')"
-      :value="lotPage.data.lpn"
+      :value="$lwCheckVal(lotPage.data.lpn)"
     />
     <lw-title-value-cell
       style="margin-bottom: 10px"
       :title="$lwLanguage.get('wms_project.pda.inventory.query.caseNum', '箱号')"
-      :value="lotPage.data.caseNum"
+      :value="$lwCheckVal(lotPage.data.caseNum)"
     />
 
     <lw-lot-look-module :columns="lotPage.data.lotItems"/>
@@ -106,13 +102,9 @@
 <script>
 
 import {projectWmsQueryInventoryLotBySku} from "../../../api/inventory/inventory";
-import locInfoRow from "../queryInventory/components/locInfoRow.vue";
 
 export default {
   name: "index",
-  components: {
-    locInfoRow
-  },
   props: {
     // 数据
     item: {
@@ -150,10 +142,7 @@ export default {
     paging(){
       projectWmsQueryInventoryLotBySku({
         ...this.item.parentQuery,
-        skuCode: this.item.skuCode,
-        locationCode: this.item.locationCode,
-        ownerCode: this.item.ownerCode,
-        belongCompanyCode: this.item.belongCompanyCode,
+        ...this.item,
         pageNum: this.lotPage.pageNum,
         pageSize: this.lotPage.pageSize
       }).then(res => {

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

@@ -63,15 +63,15 @@ export default {
       list: [
         {
           label: this.$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.locInfoRow.lcnxbswt','库存'),
-          key: 'qty'
+          key: 'qtyLabel'
         },
         {
           label: this.$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.locInfoRow.qxbivsad','锁定'),
-          key: 'lockQty'
+          key: 'lockQtyLabel'
         },
         {
           label: this.$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.locInfoRow.ocvwrdnk','可用'),
-          key: 'availQty'
+          key: 'availQtyLabel'
         }
       ],
 

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

@@ -12,8 +12,8 @@
         :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')"
+        rule-key="locLoc"
+        :create-rule="$lwScanRule.create('库存查询-库位查询-库位','LOCATION')"
         @confirm="skuSearch"
       >
 
@@ -132,12 +132,12 @@ export default {
 
     // 查看详情
     lookContent(item) {
-      this.$router.replace({
-        path: '/inventory/queryInventory/lwPage',
+      this.$emit('jumpPage')
+      this.$router.push({
+        path: '/inventory/queryInventory/lwLocContent',
         query: {
-          type: 'location',
-          ownerCode: item.ownerCode,
-          locationCode: item.locationCode
+          locationCode: item.locationCode,
+          groupKeyValue: item.groupKeyValue
         }
       })
     }

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

@@ -7,19 +7,27 @@
   <div>
 
     <div class="lw-global-model-box" style="padding-top: 3px">
+      <lw-search-select-popup-module
+        :title="$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.skuSearch.ngjboqqvc','货主')"
+        v-model="ownerCode"
+        value-key="code"
+        :api="$lwApi.common.searchOwner"
+        required
+        @confirm="searchClick"
+      />
 
       <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')"
+        rule-key="skuLocSku"
+        :create-rule="$lwScanRule.create('库存查询-商品库位查询-商品','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')"
+        rule-key="skuLocLoc"
+        :create-rule="$lwScanRule.create('库存查询-商品库位查询-库位','LOCATION')"
       />
 
       <lw-button
@@ -34,39 +42,32 @@
 
     </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-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 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>
+      </div>
       <lw-title-value-cell
         :title="$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.skuLocSearch.adsxdfmr','商品名称')"
         :value="i.skuName"
@@ -82,16 +83,16 @@
         <div class="lw-global-value-bold">{{ i.name }}</div>
       </div>
 
-        <loc-info-row :item="i"/>
+      <loc-info-row :item="i"/>
 
-      </div>
-      <lw-pagination
-        v-model="pageNum"
-        :page-total="pageTotal"
-        :page-size.sync="pageSize"
-        @change="getData"
-      />
-    </owner-tab>
+    </div>
+    <lw-pagination
+      v-model="pageNum"
+      :page-total="pageTotal"
+      :page-size.sync="pageSize"
+      @change="getData"
+    />
+    <lw-not-data v-if="searchActive && !dataList.length"/>
 
   </div>
 </template>
@@ -99,58 +100,41 @@
 <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: '',
+      ownerCode: '',
 
       pageSize: 10,
       pageNum: 1,
       pageTotal: 0,
-      dataList: []
+      dataList: [],
+      searchActive: false
     }
   },
-  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() {
+      if (!this.ownerCode) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '请选择货主')
+        )
+        return
+      }
       this.pageNum = 1
-      this.$refs.ownerTab.getOwnerData()
+      this.getData()
     },
 
     // 获取数据
@@ -158,10 +142,11 @@ export default {
       projectWmsQueryInventoryOwnersBySkuLocation({
         locationCode: this.loc,
         skuCode: this.skuCode,
-        ownerCode: this.tabActive,
+        ownerCode: this.ownerCode,
         pageSize: this.pageSize,
         pageNum: this.pageNum
       }).then(res => {
+        this.searchActive = true
         this.dataList = res.datas || []
         this.pageTotal = res.total || 0
       })
@@ -169,13 +154,16 @@ export default {
 
     // 查看详情
     lookContent(item) {
-      this.$router.replace({
-        path: '/inventory/queryInventory/lwPage',
+      this.$emit('jumpPage')
+      this.$router.push({
+        path: '/inventory/queryInventory/lwSkuLocContent',
         query: {
-          type: 'skuLocation',
-          ownerCode: this.tabActive,
+          ownerCode: item.ownerCode,
           locationCode: item.locationCode,
-          skuCode: item.skuCode
+          skuCode: item.skuCode,
+          skuName: item.skuName,
+          locationTypeLabel: item.locationTypeLabel,
+          groupKeyValue: item.groupKeyValue,
         }
       })
     }

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

@@ -6,76 +6,83 @@
 <template>
   <div>
 
-    <div class="lw-global-model-box lw-global-model-box-3px">
+    <div
+      style="padding-top: 3px"
+      class="lw-global-model-box"
+    >
+      <lw-search-select-popup-module
+        :title="$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.skuSearch.ngjboqqvc','货主')"
+        v-model="ownerCode"
+        value-key="code"
+        :api="$lwApi.common.searchOwner"
+        required
+        @confirm="skuSearch"
+      />
 
       <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')"
+        rule-key="skuSku"
+        :create-rule="$lwScanRule.create('库存查询-商品查询-商品','SKU')"
         @confirm="skuSearch"
-      >
-
-        <template #button>
-          <van-icon
-            name="search"
-            size="18px"
-            @click="skuSearch"
-          />
-        </template>
+      />
 
-      </lw-input>
+      <lw-button
+        style="margin-top: 10px"
+        block
+        @click="skuSearch"
+      >
+        {{ $lwLanguage.get('', '查询') }}
+      </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 skuList"
+      :key="k"
     >
 
-      <div
-        class="lw-global-model-box"
-        v-for="(i,k) in skuList"
-        :key="k"
-      >
+      <div class="lw-global-flex-between lw-global-row-start">
 
-        <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"
+          :title="$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.skuSearch.ngjboqqv','商品')"
+          :value="i.skuCode"
+          val-bold
+          :is-row="false"
         />
-        <loc-info-row :item="i"/>
+
+        <lw-button
+          mini
+          @click="lookContent(i)"
+        >
+          {{
+            $lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.skuSearch.vrrjcsgd', '查看详情')
+          }}
+        </lw-button>
 
       </div>
-      <lw-pagination
-        v-model="pageNum"
-        :page-total="pageTotal"
-        :page-size.sync="pageSize"
-        @change="getData"
+      <lw-title-value-cell
+        :title="$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.skuSearch.bxkznaow','商品名称')"
+        :value="i.skuName"
+      />
+      <lw-title-value-cell
+        v-if="i.belongCompanyCode"
+        :title="$lwLanguage.get('wms_project.pda.views.wms.page.inventory.queryInventory.components.skuSearch.bxkznaowc','分仓代码')"
+        :value="i.belongCompanyCode"
       />
-    </owner-tab>
+      <loc-info-row :item="i"/>
+
+    </div>
+    <lw-pagination
+      v-model="pageNum"
+      :page-total="pageTotal"
+      :page-size.sync="pageSize"
+      @change="getData"
+    />
+    <lw-not-data v-if="searchActive && !skuList.length"/>
+
 
   </div>
 </template>
@@ -83,52 +90,38 @@
 <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: '',
+      ownerCode: '',
       pageSize: 10,
       pageNum: 1,
       pageTotal: 0,
-      skuList: []
+      skuList: [],
+      searchActive: false
     }
   },
   methods: {
-    // 获取货主信息及数据
-    getOwnerAndData() {
-      return projectWmsQueryInventoryOwner({
-        skuCodeOrName: this.skuCode
-      })
-    },
-    // 没有获取到货主数据
-    notOwnerData() {
-      this.skuList = []
-      this.pageNum = 1
-      this.pageTotal = 0
-    },
-
-    // tab切换
-    tabChange() {
-      this.pageNum = 1
-      this.getData()
-    },
 
     // 商品搜索
     skuSearch() {
+      if (!this.ownerCode) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '请选择货主')
+        )
+        return
+      }
       this.pageNum = 1
-      this.$refs.ownerTab.getOwnerData()
+      this.getData()
     },
 
     // 获取数据
@@ -137,8 +130,9 @@ export default {
         skuCode: this.skuCode,
         pageSize: this.pageSize,
         pageNum: this.pageNum,
-        ownerCode: this.tabActive
+        ownerCode: this.ownerCode
       }).then(res => {
+        this.searchActive = true
         this.skuList = res.datas || []
         this.pageTotal = res.total || 0
       })
@@ -146,12 +140,13 @@ export default {
 
     // 查看详情
     lookContent(item) {
-      this.$router.replace({
-        path: '/inventory/queryInventory/lwPage',
+      this.$emit('jumpPage')
+      this.$router.push({
+        path: '/inventory/queryInventory/lwSkuContent',
         query: {
-          type: 'sku',
-          ownerCode: this.tabActive,
+          ownerCode: item.ownerCode,
           skuCode: item.skuCode,
+          groupKeyValue: item.groupKeyValue,
         }
       })
     }