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

package/src/views/wms/page/config/masterLocation/masterLocationQuery/action/queryByLocationCode.vue

@@ -6,99 +6,136 @@
 <template>
   <div>
 
-    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.action.queryByLocationCode.knnnxllw','主库位查询')"/>
-    <div class="lw-global-page-box">
-      <div v-if="locationInfoList&&locationInfoList.length>0">
-        <div class="lw-global-flex-between lw-global-model-box">
-          <div>
-            {{ locationInfoList[tabActive].masterLocationCode }}
-          </div>
-          <lw-tag
-            color="red"
-          >
-            {{ $lwDict.getDictLabel('abc_type', locationInfoList[tabActive].masterLocationAbcType) }}
-          </lw-tag>
+    <lw-nav-bar
+      :title="$lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.action.queryByLocationCode.knnnxllw','主库位查询')"/>
+
+    <lw-page-body-module>
+
+      <div class="lw-global-model-box lw-global-flex-between">
+
+        <div class="lw-global-value-bold">{{ $route.query.lwLocationCode }}</div>
+
+        <div>
+
           <lw-tag
+            type="danger"
             plain
           >
-            {{ $lwDict.getDictLabel('hight_low_type_choice', locationInfoList[tabActive].masterLocationHightLowType) }}
+            {{ locationInfo.abc_type_label }}
+          </lw-tag>
+          <lw-tag plain>
+            {{ locationInfo.hight_low_type_label }}
+          </lw-tag>
+          <lw-tag type="danger">
+            {{ locationInfo.w_location_type_label }}
           </lw-tag>
 
-          <span style="color: red">
-        {{ $lwDict.getDictLabel('w_location_type_choice', locationInfoList[tabActive].masterLocationWLocationType) }}
-      </span>
         </div>
 
-        <lw-tab-box style="margin-top: 10px">
-          <van-tabs
-            type="card"
-            animated
-            @change="tabChange"
-            v-model="tabActive"
-          >
-            <van-tab
-              v-for="(locationInfo,index) in locationInfoList" :key="index"
-              :title="locationInfo.ownerCode+':'+locationInfo.belongCompanyCode"
-              :name=index
+      </div>
+
+      <div class="lw-global-model-box lw-global-model-box-3px">
+        <lw-input
+          ref="searchInput"
+          v-model="skuSearch"
+          :title="$lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.action.queryByLocationCode.ostcfzea','商品条码')"
+          :placeholder="$lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.action.queryByLocationCode.svujvkon','输入商品代码/扫描商品条码过滤')"
+          rule-key="sku"
+          :create-rule="$lwScanRule.create('主库位查询-库位查询-商品条码','SKU')"
+          :show-bottom-border="false"
+          @confirm="skuSearchConfirm"
+          @clear="skuSearchConfirm"
+        >
+
+          <template #button>
+            <lw-button
+              mini
+              round
+              @click="searchBtnClick"
             >
-              <div class="lw-global-model-box">
-                <lw-input
-                  v-model="filterSkuCode[index]"
-                  :title="$lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.action.queryByLocationCode.ostcfzea','商品条码')"
-                  :show-keyboard="false"
-                  :placeholder="$lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.action.queryByLocationCode.svujvkon','输入商品代码/扫描商品条码过滤')"
-                ></lw-input>
+              {{ $lwLanguage.get('', '搜索') }}
+            </lw-button>
+          </template>
 
-              </div>
+        </lw-input>
+      </div>
 
-              <div v-for="(skuInfo,index) in getFilterSku(locationInfo.querySkuVo,index)" :key="index"
-                   class="lw-global-model-box">
-                <div class="lw-global-flex-between">
-                  {{ skuInfo.skuCode }}
-                  <lw-tag
-                    v-if="skuInfo.skuAbcType"
-                    color='red'
-                  >
-                    {{ skuInfo.skuAbcType }}
-                  </lw-tag>
+      <div
+        class="lw-global-model-box lw-global-row-box"
+        v-for="(i,k) in sku.data"
+        :key="k"
+      >
 
-                </div>
-                <div>
-                  {{ skuInfo.skuName }}
+        <div class="lw-global-flex-between">
 
-                </div>
-                <div>
-                  <lw-tag v-for="(label,index)  in skuInfo.skuLabel"
-                          plain
-                          :key="index">
-                    {{ label }}
-                  </lw-tag>
+          <lw-title-value-cell
+            :title="$lwLanguage.get('', '分仓')"
+            :value="i.belongCompanyCode"
+            :is-row="false"
+            val-bold
+          />
 
-                </div>
+          <lw-tag
+            plain
+            type="danger"
+          >
+            {{ i.skuAbcType }}
+          </lw-tag>
 
+        </div>
 
-              </div>
+        <div class="lw-global-flex-start">
 
+          <div class="lw-global-title">
+            {{ $lwLanguage.get('', '货主') }}
+          </div>
+          <div class="lw-global-value">
+            <span class="lw-global-value-bold">{{ $lwCheckVal(i.ownerCode) }} / </span>
+            {{ $lwCheckVal(i.ownerName) }}
+          </div>
 
-            </van-tab>
+        </div>
 
+        <div class="lw-global-flex-start-start">
 
-          </van-tabs>
+          <div class="lw-global-title">
+            {{ $lwLanguage.get('', '商品') }}
+          </div>
+          <div style="margin-top: 2px" class="lw-global-value">
+            <div class="lw-global-value-bold">{{ i.skuCode }}</div>
+            <div>{{ i.skuName }}</div>
+          </div>
 
-        </lw-tab-box>
+        </div>
 
+        <div>
+          <lw-tag
+            v-for="(label,index)  in i.skuLabel"
+            plain
+            :key="index"
+          >
+            {{ label }}
+          </lw-tag>
 
+        </div>
       </div>
-      <lw-not-data v-else/>
+      <lw-pagination
+        v-model="sku.pageNum"
+        :page-total="sku.pageTotal"
+        :page-size.sync="sku.pageSize"
+        @change="pageChange"
+      />
+      <lw-not-data v-if="!sku.pageTotal"/>
 
-    </div>
+    </lw-page-body-module>
 
 
   </div>
 </template>
 <script>
 import {
-  WmsProjectMobileQuerySkuLocationConfigByLocationCode,
+  wmsProjectMobileLocationQuery,
+  wmsProjectMobileMasterLocationQueryByLoc,
 } from "../../../../../api/config/masterLocation/masterLocationQuery/action.js";
 
 
@@ -107,53 +144,55 @@ export default {
   components: {},
   data() {
     return {
-      filterSkuCode:[],
-      tabActive: 0,
-      locationCode: '',
-      locationInfoList: [],
-
+      locationInfo: {},
+      skuSearch: '',
+      sku: {
+        pageSize: 10,
+        pageNum: 1,
+        pageTotal: 0,
+        data: []
+      }
     }
   },
-
   mounted() {
-    this.pageInit()
-
-  },
-
+    const locationCode = this.$route.query.lwLocationCode
+    wmsProjectMobileLocationQuery({locationCode}).then(res => {
+      if (!res || !res.extendFieldData) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '没有查询到库位【{loc}】的任何数据，请检查库位是否输入正确，或联系系统管理员', {loc: locationCode})
+        )
+        history.go(-1)
+        return
+      }
 
+      this.locationInfo = res.extendFieldData
+      this.pageChange()
+    }).catch(() => history.go(-1))
 
+  },
   methods: {
 
-
-    getFilterSku(skuVoList,index){
-      let filterSKuCode = this.filterSkuCode[index];
-      if(!filterSKuCode){
-        return skuVoList
-      }
-
-      let filterVoList=[]
-      skuVoList.forEach(skuVo=>{
-        if(skuVo.skuCode&&skuVo.skuCode.includes(filterSKuCode)){
-          filterVoList.push(skuVo)
-        }
-      })
-      return filterVoList
+    // 商品搜索确认
+    skuSearchConfirm() {
+      this.sku.pageNum = 1
+      this.pageChange()
     },
-
-
-    pageInit() {
-      this.locationCode = this.$route.query.lwLocationCode
-      let data = {"locationCode": this.locationCode}
-      WmsProjectMobileQuerySkuLocationConfigByLocationCode(data).then(res => {
-        console.log(res)
-        this.locationInfoList = res
-
-      })
+    // 搜索按钮点击
+    searchBtnClick() {
+      this.$refs.searchInput.confirm()
     },
 
-    tabChange() {
-      console.log(this.tabActive)
-
+    // 分页改变
+    pageChange() {
+      wmsProjectMobileMasterLocationQueryByLoc({
+        locationCode: this.$route.query.lwLocationCode,
+        pageSize: this.sku.pageSize,
+        pageNum: this.sku.pageNum,
+        skuCode: this.skuSearch
+      }).then(res => {
+        this.sku.pageTotal = res.total || 0
+        this.sku.data = res.datas || []
+      })
     },
 
   }

package/src/views/wms/page/config/masterLocation/masterLocationQuery/action/queryBySkuCode.vue

@@ -8,108 +8,111 @@
     <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.action.queryBySkuCode.ytukkjmh','主库位查询')"/>
 
     <div class="lw-global-page-box">
-      <div v-if="masterLocationConfig&&masterLocationConfig.length>0">
-        <lw-tab-box>
-
-          <van-tabs
-            type="card"
-            animated
-            @change="tabChange"
-            v-model="tabActive"
+      <lw-tab-box>
+
+        <van-tabs
+          type="card"
+          animated
+          v-model="tabActive"
+        >
+          <van-tab
+            v-for="(locationConfig,index) in masterLocationConfig"
+            :key="index"
+            :title="(locationConfig.ownerCode?locationConfig.ownerCode:'')+':'+(locationConfig.belongCompanyCode?locationConfig.belongCompanyCode:'')"
           >
-            <van-tab
-              v-for="(locationConfig,index) in masterLocationConfig"
-              :key="index"
-              :title="(locationConfig.ownerCode?locationConfig.ownerCode:'')+':'+(locationConfig.belongCompanyCode?locationConfig.belongCompanyCode:'')"
-            >
-              <div class="lw-global-model-box ">
-                <div class="lw-global-row-start lw-global-flex-between">
-                  <div>
-                    {{ locationConfig.skuCode }}
-                  </div>
-                  <lw-tag
-                    v-if="locationConfig.skuAbcType"
-                    color="red"
-                  >
-                    {{ locationConfig.skuAbcType }}
-                  </lw-tag>
-                </div>
+            <div class="lw-global-model-box ">
+              <div class="lw-global-row-start lw-global-flex-between">
                 <div>
-                  {{ locationConfig.skuName }}
-
+                  {{ locationConfig.skuCode }}
                 </div>
-                <lw-tag v-for="(skuLabel,index) in locationConfig.skuLabel" :key="index">
-                  {{ skuLabel }}
+                <lw-tag
+                  v-if="locationConfig.skuAbcType"
+                  color="red"
+                >
+                  {{ locationConfig.skuAbcType }}
                 </lw-tag>
               </div>
+              <div>
+                {{ locationConfig.skuName }}
 
+              </div>
+              <lw-tag v-for="(skuLabel,index) in locationConfig.skuLabel" :key="index">
+                {{ skuLabel }}
+              </lw-tag>
+            </div>
 
-              <div class="lw-global-model-box ">
-                <lw-cell
-                  :is-link="false"
-                  :title="$lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.action.queryBySkuCode.gxjhmmtv','主库位')"
-                  :value="locationConfig.masterLocationCode"
-                />
-
-                <div class="lw-global-flex-between">
-                  <div>
-                    {{ $lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.action.queryBySkuCode.tfypjygd','容量限制:') }}{{ locationConfig.masterMinQty }}-{{
-                      locationConfig.masterMaxQty
-                    }}
-                  </div>
 
-                  <lw-tag color="red" v-if="locationConfig.masterLocationAbcType">
-                    {{ locationConfig.masterLocationAbcType }}
-                  </lw-tag>
-                  <lw-tag plain v-if="locationConfig.masterLocationHightLowType">
-                    {{ locationConfig.masterLocationHightLowType }}
-                  </lw-tag>
-
-                </div>
+            <div class="lw-global-model-box ">
+              <lw-cell
+                :is-link="false"
+                :title="$lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.action.queryBySkuCode.gxjhmmtv','主库位')"
+                :value="locationConfig.masterLocationCode"
+              />
 
+              <div class="lw-global-flex-between">
                 <div>
-                  {{ $lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.action.queryBySkuCode.muypxoyg','高') }}：
-                  {{ locationConfig.masterLocationLength }}*{{ locationConfig.masterLocationWidth }}*
-                  {{ locationConfig.masterLocationHeight }}
+                  {{
+                    $lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.action.queryBySkuCode.tfypjygd', '容量限制:')
+                  }}{{ locationConfig.masterMinQty }}-{{
+                    locationConfig.masterMaxQty
+                  }}
                 </div>
-              </div>
 
-              <div class="lw-global-model-box">
-                <div>
-                  {{ $lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.action.queryBySkuCode.pqbwirks','共享区：') }}
-                </div>
-                <div>
-                  {{ $lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.action.queryBySkuCode.andusuad','容量限制：') }}{{ locationConfig.totalMinQty }}-{{ locationConfig.totalMaxQty }}
-                </div>
-                <div>
-                  {{ locationConfig.shareZoneCodeList ? locationConfig.shareZoneCodeList.join(',') : '' }}
-                </div>
+                <lw-tag color="red" v-if="locationConfig.masterLocationAbcType">
+                  {{ locationConfig.masterLocationAbcType }}
+                </lw-tag>
+                <lw-tag plain v-if="locationConfig.masterLocationHightLowType">
+                  {{ locationConfig.masterLocationHightLowType }}
+                </lw-tag>
 
+              </div>
 
+              <div>
+                {{
+                  $lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.action.queryBySkuCode.muypxoyg', '高')
+                }}：
+                {{ locationConfig.masterLocationLength }}*{{ locationConfig.masterLocationWidth }}*
+                {{ locationConfig.masterLocationHeight }}
               </div>
+            </div>
 
+            <div class="lw-global-model-box">
+              <div>
+                {{
+                  $lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.action.queryBySkuCode.pqbwirks', '共享区：')
+                }}
+              </div>
+              <div>
+                {{
+                  $lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.action.queryBySkuCode.andusuad', '容量限制：')
+                }}{{ locationConfig.totalMinQty }}-{{ locationConfig.totalMaxQty }}
+              </div>
+              <div>
+                {{ locationConfig.shareZoneCodeList ? locationConfig.shareZoneCodeList.join(',') : '' }}
+              </div>
 
-              <div class="lw-global-model-box">
-                <div>
-                  {{ $lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.action.queryBySkuCode.bnkrkwnb','溢出区：') }}
-                </div>
-                <div>
-                  {{ locationConfig.spillZoneCodeList ? locationConfig.spillZoneCodeList.join(',') : '' }}
-                </div>
 
+            </div>
 
-              </div>
 
-            </van-tab>
+            <div class="lw-global-model-box">
+              <div>
+                {{
+                  $lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.action.queryBySkuCode.bnkrkwnb', '溢出区：')
+                }}
+              </div>
+              <div>
+                {{ locationConfig.spillZoneCodeList ? locationConfig.spillZoneCodeList.join(',') : '' }}
+              </div>
 
 
-          </van-tabs>
-        </lw-tab-box>
+            </div>
 
-      </div>
-      <lw-not-data v-else/>
+          </van-tab>
 
 
+        </van-tabs>
+      </lw-tab-box>
     </div>
 
 
@@ -143,21 +146,21 @@ export default {
   methods: {
 
     pageInit() {
+      const {lwSkuId, lwSkuCode} = this.$route.query
+      WmsProjectMobileQuerySkuLocationConfigBySkuCode({
+        skuId: lwSkuId,
+        skuCode: lwSkuCode
+      }).then(res => {
+        if (!res || !res.length) {
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('', '没有查询到商品【{sku}】的任何数据，请检查商品信息是否输入正确，或联系系统管理员', {sku: lwSkuCode})
+          )
+          history.go(-1)
+          return
+        }
 
-      this.skuCode = this.$route.query.lwSkuCode
-      let data = {"skuCode": this.skuCode}
-      WmsProjectMobileQuerySkuLocationConfigBySkuCode(data).then(res => {
-        console.log(res)
         this.masterLocationConfig = res
-
-      })
-
-
-    },
-
-
-    tabChange() {
-
+      }).catch(() => history.go(-1))
     },
 
   }