@logwire/logwire-wms-pda-ui 1.2.0 → 3.1.0

package/src/components/page/common/index.js

@@ -1,42 +1,45 @@
-/*
-* 公共页面组件导出入口
-* @author: 张文
-* @date  2022-04-29
-* */
-
-// 设备管理页
-import lwDevicePage from './Device';
-// 首页
-import lwHomePage from './Home';
-// 语言选择
-import lwLanguagePage from './Language';
-// 登录页
-import lwLoginPage from './Login';
-// 菜单页
-import lwMenuPage from './Menu';
-// 消息页
-import lwMsgPage from './Msg';
-// 我的管理页
-import lwMyPage from './My';
-// 打印设备管理页
-import lwPrintPage from './Print';
-// 任务页
-import lwTaskPage from './Task';
-// 仓库选择页
-import lwWarehousePage from './Warehouse';
-// 选择时区
-import lwTimezonePage from "./Timezone";
-
-export const common = [
-  lwDevicePage,
-  lwHomePage,
-  lwLanguagePage,
-  lwLoginPage,
-  lwMenuPage,
-  lwMsgPage,
-  lwMyPage,
-  lwPrintPage,
-  lwTaskPage,
-  lwWarehousePage,
-  lwTimezonePage,
-]
+/*
+* 公共页面组件导出入口
+* @author: 张文
+* @date  2022-04-29
+* */
+
+// 设备管理页
+import lwDevicePage from './Device';
+// 首页
+import lwHomePage from './Home';
+// 语言选择
+import lwLanguagePage from './Language';
+// 登录页
+import lwLoginPage from './Login';
+// 菜单页
+import lwMenuPage from './Menu';
+// 消息页
+import lwMsgPage from './Msg';
+// 我的管理页
+import lwMyPage from './My';
+// 打印设备管理页
+import lwPrintPage from './Print';
+// 任务页
+import lwTaskPage from './Task/index';
+// 任务页
+import lwSearchTaskPage from './Task/searchTask';
+// 仓库选择页
+import lwWarehousePage from './Warehouse';
+// 选择时区
+import lwTimezonePage from "./Timezone";
+
+export const common = [
+  lwDevicePage,
+  lwHomePage,
+  lwLanguagePage,
+  lwLoginPage,
+  lwMenuPage,
+  lwMsgPage,
+  lwMyPage,
+  lwPrintPage,
+  lwTaskPage,
+  lwSearchTaskPage,
+  lwWarehousePage,
+  lwTimezonePage,
+]

package/src/components/page/config/masterLocation/masterLocationConfig/action/index.vue

@@ -70,25 +70,25 @@
         <div v-if="!showSkuDetailInfo">
           <lw-cell
               title="裸件尺寸（长*宽*高：mm毫米）"
-              :value="skuInfo.skuLength+'*'+skuInfo.skuWidth+'*'+skuInfo.skuHeight"
+              :value="(skuInfo.skuLength || '-')+'*'+(skuInfo.skuWidth || '-')+'*'+(skuInfo.skuHeight || '-')"
               :is-link="false"
           />
 
           <lw-cell
               title="内装尺寸（长*宽*高：mm毫米）"
-              :value="skuInfo.innerLength+'*'+skuInfo.innerWidth+'*'+skuInfo.innerHeight"
+              :value="(skuInfo.innerLength || 0)+'*'+(skuInfo.innerWidth || 0)+'*'+(skuInfo.innerHeight || 0)"
               :is-link="false"
 
           />
           <lw-cell
               title="外装尺寸（长*宽*高：mm毫米）"
-              :value="skuInfo.caseLength+'*'+skuInfo.caseWidth+'*'+skuInfo.caseHeight"
+              :value="(skuInfo.caseLength || 0)+'*'+(skuInfo.caseWidth || 0)+'*'+(skuInfo.caseHeight || 0)"
               :is-link="false"
 
           />
           <lw-cell
               title="托盘尺寸（长*宽*高：mm毫米）"
-              :value="skuInfo.palletLength+'*'+skuInfo.palletWidth+'*'+skuInfo.palletHeight"
+              :value="(skuInfo.palletLength || 0)+'*'+(skuInfo.palletWidth || 0)+'*'+(skuInfo.palletHeight || 0)"
               :is-link="false"
 
           />
@@ -102,7 +102,7 @@
             />
             <lw-cell
                 title="裸件尺寸（长*宽*高：mm毫米）"
-                :value="skuInfo.skuLength+'*'+skuInfo.skuWidth+'*'+skuInfo.skuHeight"
+                :value="(skuInfo.skuLength || 0)+'*'+(skuInfo.skuWidth || 0)+'*'+(skuInfo.skuHeight || 0)"
                 :is-link="false"
 
             />
@@ -117,7 +117,7 @@
             />
             <lw-cell
                 title="内装尺寸（长*宽*高：mm毫米）"
-                :value="skuInfo.innerLength+'*'+skuInfo.innerWidth+'*'+skuInfo.innerHeight"
+                :value="(skuInfo.innerLength || 0)+'*'+(skuInfo.innerWidth || 0)+'*'+(skuInfo.innerHeight || 0)"
                 :is-link="false"
 
             />
@@ -132,7 +132,7 @@
             />
             <lw-cell
                 title="外装尺寸（长*宽*高：mm毫米）"
-                :value="skuInfo.caseLength+'*'+skuInfo.caseWidth+'*'+skuInfo.caseHeight"
+                :value="(skuInfo.caseLength || 0)+'*'+(skuInfo.caseWidth || 0)+'*'+(skuInfo.caseHeight || 0)"
                 :is-link="false"
 
             />
@@ -147,7 +147,7 @@
             />
             <lw-cell
                 title="托盘尺寸（长*宽*高：mm毫米）"
-                :value="skuInfo.palletLength+'*'+skuInfo.palletWidth+'*'+skuInfo.palletHeight"
+                :value="(skuInfo.palletLength || 0)+'*'+(skuInfo.palletWidth || 0)+'*'+(skuInfo.palletHeight || 0)"
                 :is-link="false"
 
             />
@@ -176,7 +176,7 @@
                 {{ $lwLanguage.get('', '外外装') }}
               </div>
               <div>
-                {{ skuInfo.palletQty }} ({{ skuInfo.palletHi }}*{{ skuInfo.palletTi }})
+                {{ (skuInfo.palletQty || 0) }} ({{ (skuInfo.palletHi || 0) }}*{{ (skuInfo.palletTi || 0) }})
               </div>
             </div>
           </div>
@@ -294,7 +294,7 @@
               />
 
 
-              <lw-cell-popup-radio
+              <lw-cell-popup-checkbox
                   :title="$lwLanguage.get('', '补货方式')"
                   v-model="masterLocationConfig.packHandleType"
                   dict-key="PackHandleType"
@@ -346,6 +346,7 @@
             :title="$lwLanguage.get('', '库位过滤')"
             v-model="queryMasterLocationCode"
             :placeholder="$lwLanguage.get('', '输入库位编码，过滤库位')"
+            @confirm="queryMasterLocation(tabMasterLocationConfig)"
         />
 
         <div style="height: 200px;overflow-y: scroll">
@@ -509,13 +510,20 @@
     </lw-popup>
 
     <lw-bottom-bar >
+
+      <lw-button
+        plain
+        type="last"
+        @click="searchOtherLocationConfig"
+      >
+        {{ $lwLanguage.get('','切换商品') }}
+      </lw-button>
+
       <lw-button @click="confirmMasterLocationConfig">
         {{ $lwLanguage.get('','确认库位配置') }}
       </lw-button>
 
-      <lw-button @click="searchOtherLocationConfig">
-        {{ $lwLanguage.get('','切换商品') }}
-    </lw-button>
+
     </lw-bottom-bar>
 
 
@@ -569,11 +577,7 @@ export default {
   methods: {
 
     searchOtherLocationConfig(){
-      this.$router.replace({
-        path:'/config/masterLocation/masterLocationConfig/lwIndex'
-
-      })
-
+      history.go(-1)
     },
 
     confirmMasterLocationConfig(){
@@ -592,7 +596,9 @@ export default {
 
       WmsProjectMobileConfirmSkuMasterLocationConfirm(data).then(res=>{
         console.log(res)
-
+        this.$toast.success(
+          this.$lwLanguage.get('wms_project.pda.config.locConfig.submitSuccess','操作成功')
+        )
         this.pageInit()
       })
 
@@ -761,6 +767,12 @@ export default {
         if (res) {
           this.skuInfo = res.locationConfigSkuInfo
           this.masterLocationConfigList = res.skuLocationConfigVoList
+          this.masterLocationConfigList.forEach(item=>{
+            if(item.packHandleType){
+              item.packHandleType=item.packHandleType.replaceAll(/[\[\]]/g,"").split(",")
+            }
+          })
+
           this.skuPackList = res.skuPackList
           this.skuId=this.skuInfo.skuId
           this.ownerId=this.skuInfo.ownerId
@@ -771,7 +783,8 @@ export default {
     }
 
 
-  }
+  },
+
 }
 </script>
 

package/src/components/page/config/masterLocation/masterLocationConfig/index/index.vue

@@ -1,112 +1,129 @@
-<!--
-  主库位配置 起始页
-  @author: 杨震天
-  @date: 2022-07-05
--->
-<template>
-  <div>
-
-    <lw-nav-bar
-        :title="$lwLanguage.get('', '库位分配')"
-
-    />
-
-    <div class="lw-global-page-box">
-      <div class="lw-global-model-box ">
-        <lw-input title="商品条码" required
-                  v-model="skuCode"
-                  @confirm="queryOwnerBySkuCode"/>
-      </div>
-
-        <div v-if="skuOwnerList&&skuOwnerList.length>0" class="lw-global-model-box">
-
-          <div v-for="(ownerInfo,index) in skuOwnerList" :key="index">
-            <lw-cell
-              :title="ownerInfo.ownerCode"
-              :value="ownerInfo.ownerName"
-              :is-link="true"
-              @click="searchMasterLocationInfo(ownerInfo)"
-            />
-          </div>
-        </div>
-        <lw-not-data v-else/>
-
-
-    </div>
-
-
-  </div>
-
-</template>
-
-<script>
-import {
-  WmsProjectMobileSkuLocationConfigGetOwnerOfSku
-} from "../../../../../../api/config/masterLocation/masterLocationConfig";
-
-
-export default {
-  name: "lwInnerMasterLocationConfigIndex",
-  components: {
-
-  },
-  data() {
-    return {
-      skuCode: "",
-      skuOwnerList: []
-
-    }
-  },
-
-  mounted() {
-
-
-  },
-  methods: {
-
-    queryOwnerBySkuCode(){
-      let data={"skuCode":this.skuCode}
-      this.skuOwnerList=[]
-      WmsProjectMobileSkuLocationConfigGetOwnerOfSku(data).then(res=>{
-        console.log(res)
-
-        if(res&&res.length===1){
-          let ownerInfo=res[0]
-          let data={
-            "lwOwnerId":ownerInfo.ownerId,
-            "lwSkuId":ownerInfo.skuId
-
-          }
-          this.$router.replace({ path: '/config/masterLocation/masterLocationConfig/lwAction', query:data })
-        }
-
-        if(res&&res.length>0){
-          this.skuOwnerList=res
-        }
-
-
-
-      })
-    },
-
-    searchMasterLocationInfo(ownerInfo){
-
-      let data={
-        "lwOwnerId":ownerInfo.ownerId,
-        "lwSkuId":ownerInfo.skuId
-
-      }
-      console.log(ownerInfo)
-      this.$router.replace({ path: '/config/masterLocation/masterLocationConfig/lwAction', query:data })
-
-    }
-
-
-
-  }
-}
-</script>
-
-<style scoped lang="less">
-
-</style>
+<!--
+  主库位配置 起始页
+  @author: 杨震天
+  @date: 2022-07-05
+-->
+<template>
+  <div>
+
+    <lw-nav-bar :title="$lwLanguage.get('', '库位分配')"/>
+
+    <div class="lw-global-page-box">
+      <div class="lw-global-model-box ">
+        <lw-input
+          title="商品条码"
+          required
+          v-model="skuCode"
+          :get-focus.sync="skuCodeFocus"
+          :show-bottom-border="false"
+          @confirm="queryOwnerBySkuCode"
+        />
+      </div>
+    </div>
+
+
+    <lw-popup
+      :title="$lwLanguage.get('','选择货主')"
+      v-model="selectPopup.show"
+    >
+
+      <div
+        v-for="(i,k) in selectPopup.list"
+        :key="k"
+        class="lw-global-flex-between lw-global-row lw-global-click-style"
+        @click="searchMasterLocationInfo(i)"
+      >
+
+        <div class="lw-global-flex-start">
+
+          <span class="lw-global-value-bold">{{i.ownerCode}} &nbsp;-&nbsp; </span>
+          <span class="lw-global-title"> {{i.ownerName}}</span>
+
+        </div>
+        <van-icon name="arrow" />
+      </div>
+
+    </lw-popup>
+
+  </div>
+
+</template>
+
+<script>
+import {
+  WmsProjectMobileSkuLocationConfigGetOwnerOfSku
+} from "../../../../../../api/config/masterLocation/masterLocationConfig";
+
+
+export default {
+  name: "lwInnerMasterLocationConfigIndex",
+  components: {
+
+  },
+  data() {
+    return {
+      skuCode: "",
+      skuCodeFocus: true,
+      selectPopup:{
+        show: false,
+        list:[]
+      }
+    }
+  },
+
+  mounted() {
+
+
+  },
+  methods: {
+
+    queryOwnerBySkuCode(){
+
+      WmsProjectMobileSkuLocationConfigGetOwnerOfSku({
+        "skuCode":this.skuCode
+      }).then(res=>{
+        console.log(res)
+
+        if (!res || !res.length){
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('','查询货主信息有误')
+          )
+          return
+        }
+
+        if(res.length===1){
+          this.$router.replace({
+            path: '/config/masterLocation/masterLocationConfig/lwAction',
+            query:{
+              "lwOwnerId":res[0].ownerId,
+              "lwSkuId":res[0].skuId
+            }
+          })
+          return
+        }
+
+
+        this.selectPopup.list = res || []
+        this.selectPopup.show = true
+
+      })
+    },
+
+    searchMasterLocationInfo(ownerInfo){
+
+      this.$router.push({
+        path: '/config/masterLocation/masterLocationConfig/lwAction',
+        query:{
+          "lwOwnerId":ownerInfo.ownerId,
+          "lwSkuId":ownerInfo.skuId
+        }
+      })
+    }
+
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/components/page/config/masterLocation/masterLocationQuery/action/queryBySkuCode.vue

@@ -28,6 +28,7 @@
                     {{ locationConfig.skuCode }}
                   </div>
                   <lw-tag
+                    v-if="locationConfig.skuAbcType"
                     color="red"
                   >
                     {{ locationConfig.skuAbcType }}

package/src/components/page/config/newProject/action/index.vue

@@ -695,7 +695,7 @@
                 </lw-cell>
               </div>
               <div class="lw-global-flex-center">
-                <lw-button @click="addQualityCard">添加品鉴卡</lw-button>
+                <lw-button @click="addQualityCard">添加品检卡</lw-button>
               </div>
             </div>
 
@@ -1163,29 +1163,18 @@
 
         </lw-cell>
 
-        <lw-cell
-          :is-link="false">
-          <template #title>
-            <div>
-              {{ $lwLanguage.get('', '托盘规格') }}
-            </div>
-          </template>
-          <template #value>
-            <lw-cell-popup-radio
-              :disabled="packInfoEditDisable"
-              v-model="editSkuPackInfo.palletContainerStdId"
-              :columns="containerStandardList"
-              value-key="id"
-              label-key="code"
-              @confirm="selectContainer"
-            >
-            </lw-cell-popup-radio>
-
-
-          </template>
+        <lw-cell-popup-radio
+          :title="$lwLanguage.get('', '托盘规格')"
+          :disabled="packInfoEditDisable"
+          v-model="editSkuPackInfo.palletContainerStdId"
+          :columns="containerStandardList"
+          value-key="id"
+          label-key="code"
+          @confirm="selectContainer"
+        >
+        </lw-cell-popup-radio>
 
 
-        </lw-cell>
 
       </template>
       <template #button>
@@ -1472,14 +1461,17 @@ export default {
 
     },
     addQualityCard() {
+
+      console.log("this.skuNewProjectSkuQualityCardInfoList",this.skuNewProjectSkuQualityCardInfoList)
+
       let newQualityCard = {}
 
       newQualityCard.frontImage = []
       newQualityCard.backImage = []
       newQualityCard.markingImage = []
       newQualityCard.beforeDamagedImage = []
-
-      let length = this.skuNewProjectSkuQualityCardInfoList.replace(newQualityCard)
+      let length=this.skuNewProjectSkuQualityCardInfoList.push(newQualityCard)
+      // let length = this.skuNewProjectSkuQualityCardInfoList.replace(newQualityCard)
       let index = length - 1
       this.qualitCardIndex = index
       this.qualityCardPopShow(index)

package/src/components/page/count/components/CountBoard.vue

@@ -13,7 +13,8 @@
         </div>
         <div>
           <div>{{ data.countedLineCount }}</div>
-          <div>{{$lwLanguage.get('wms_project.pda.components.page.count.components.vcyehper', '已盘库位')}}</div>
+          <div v-if="type === 'inv'">{{$lwLanguage.get('wms_project.pda.components.page.count.components.vcyehpev', '已盘明细')}}</div>
+          <div v-else>{{$lwLanguage.get('wms_project.pda.components.page.count.components.vcyehper', '已盘库位')}}</div>
         </div>
         <div>
           <div>{{ data.skuCount || '-'}}</div>
@@ -41,6 +42,10 @@ export default {
     showZones: {
       type: Boolean,
       default: true,
+    },
+    type: {
+      type: String,
+      default: 'loc',
     }
   }
 }