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

package/src/components/page/outbound/bale/aloneBale/index/index.vue

@@ -6,9 +6,10 @@
 <template>
   <div>
 
-    <lw-nav-bar :title="$lwLanguage.get('','独立件捆包')"/>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.aloneBale.index.bovwtmwq','独立件捆包')"/>
 
     <div class="lw-global-page-box">
+      <check-pack-config :need-bind="false"/>
 
       <div class="lw-global-tab-box">
 
@@ -21,18 +22,32 @@
 
           <van-tab
             name="ing"
-            :title="$lwLanguage.get('','捆包中')"
+            :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.aloneBale.index.eigimnqb','捆包中')"
           >
-            <store-info/>
+            <store-info
+              v-for="(i,k) in baleIng"
+              :key="k"
+              :item="i"
+              :index="k"
+              @btnClick="baleIngBtnClick(i)"
+            />
+
+            <lw-not-data v-if="!baleIng.length"/>
           </van-tab>
 
           <van-tab
             name="over"
-            :title="$lwLanguage.get('','已捆包')"
+            :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.aloneBale.index.kynhtubi','已捆包')"
           >
             <store-info
+              v-for="(i,k) in baleOver"
+              :key="k"
+              :item="i"
+              :index="k"
               is-over
+              @btnClick="baleOverBtnClick(i)"
             />
+            <lw-not-data v-if="!baleOver.length"/>
           </van-tab>
 
         </van-tabs>
@@ -43,7 +58,7 @@
     <lw-bottom-bar>
 
       <lw-button @click="newBale">
-        {{ $lwLanguage.get('','新捆包') }}
+        {{ $lwLanguage.get('wms_project.pda.components.page.outbound.bale.aloneBale.index.mswiafde','新捆包') }}
       </lw-button>
 
     </lw-bottom-bar>
@@ -52,23 +67,62 @@
 </template>
 
 <script>
+import checkPackConfig from "../../components/checkPackConfig/index.vue";
 import storeInfo from './../../components/storeInfo/index.vue'
+import {
+  projectWmsOutboundQueryAlonePackedBox,
+  projectWmsOutboundQueryAlonePackingBox
+} from "../../../../../../api/outbound/bale/aloneBale";
+import {projectWmsGetPrintBoxData} from "../../../../../../api/outbound/bale/checkBale/action";
 
 export default {
   name: "lwOutboundAloneBaleIndexPage",
   components:{
-    storeInfo
+    storeInfo,
+    checkPackConfig,
   },
   data() {
     return {
       // tab集货项
-      tabActive: 'ing'
+      tabActive: 'ing',
+
+      // 捆包中的数据
+      baleIng:[],
+
+      // 已捆包的数据
+      baleOver:[],
+
+      // 打印机数据
+      printData:{}
     }
   },
+  mounted() {
+    this.tabChange()
+  },
   methods: {
     // tab改变
     tabChange(){
 
+      if (this.tabActive === 'ing'){
+        !this.baleIng.length && this.getBaleIng()
+      }else {
+        !this.baleOver.length && this.getBaleOver()
+      }
+
+    },
+
+    // 获取捆包中的数据
+    getBaleIng() {
+      projectWmsOutboundQueryAlonePackingBox().then(res=>{
+        this.baleIng = res || []
+      })
+    },
+
+    // 获取已捆包的数据
+    getBaleOver() {
+      projectWmsOutboundQueryAlonePackedBox().then(res=>{
+        this.baleOver = res || []
+      })
     },
 
     // 新捆包
@@ -76,7 +130,44 @@ export default {
       this.$router.push({
         path: '/outbound/aloneBale/lwNewBale'
       })
-    }
+    },
+
+    // 捆包中的数据点击
+    baleIngBtnClick(item){
+      this.$router.push({
+        path: '/outbound/aloneBale/lwAction',
+        query:{
+          lwBoxNo: item.boxNo
+        }
+      })
+    },
+
+    // 已捆包的数据点击
+    async baleOverBtnClick(item){
+
+      if (!Object.keys(this.printData).length){
+        // 判断当前是否配置了打印机
+        const {success,printData} = this.$lwPrint.test(
+          'OUTBOUND_BOX_LABEL',
+          this.$lwLanguage.get('','出库箱票标签')
+        )
+        if (!success)return
+
+        this.printData = printData
+
+      }
+
+      try {
+        const res = await projectWmsGetPrintBoxData({
+          boxId: item.boxId,
+          printDeviceId: this.printData.printId
+        })
+
+        await this.$lwPrint.bluetoothPrint({taskId:res.id})
+      }catch (e){
+        console.log(e)
+      }
+    },
   }
 }
 </script>

package/src/components/page/outbound/bale/aloneBale/newBale/index.vue

@@ -6,19 +6,35 @@
 <template>
   <div>
 
-    <lw-nav-bar :title="$lwLanguage.get('','独立捆包')"/>
+    <lw-nav-bar :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.aloneBale.newBale.awififyt','独立捆包')"/>
 
     <div class="lw-global-page-box">
 
       <div class="lw-global-model-box">
 
+
+        <check-pack-config
+          class="lw-global-row-start"
+          :show-model="false"
+          :need-bind="false"
+        />
+
         <lw-input
-          :title="$lwLanguage.get('','拣选容器号')"
+          :title="$lwLanguage.get('wms_project.pda.components.page.outbound.bale.aloneBale.newBale.plbisxki','拣选容器号')"
           v-model="container.value"
           :get-focus.sync="container.focus"
+          rule-key="boxNo"
           @confirm="containerConfirm"
         />
 
+        <lw-button
+          style="margin-top: 10px"
+          block
+          @click="containerConfirm"
+        >
+          {{$lwLanguage.get('','确定')}}
+        </lw-button>
+
       </div>
 
     </div>
@@ -27,9 +43,13 @@
 </template>
 
 <script>
+import checkPackConfig from "../../components/checkPackConfig/index.vue";
 
 export default {
   name: "lwOutboundAloneBaleNewBalePage",
+  components:{
+    checkPackConfig
+  },
   data() {
     return {
       container:{
@@ -40,8 +60,21 @@ export default {
   },
   methods: {
     containerConfirm(){
+      const lwBoxNo = this.container.value
+
+      if (!lwBoxNo){
+        this.container.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.bale.aloneBale.newBale.ywwxkduj','拣选容器号不能为空')
+        )
+        return
+      }
+
       this.$router.push({
-        path: '/outbound/aloneBale/lwAction'
+        path: '/outbound/aloneBale/lwAction',
+        query:{
+          lwBoxNo
+        }
       })
     }
   }

package/src/components/page/outbound/bale/baleChange/action/index.js

@@ -0,0 +1,11 @@
+/*
+* 捆包箱调整 - 执行页
+* @author: 张文
+* @date  2022-07-08
+* */
+
+import lwOutboundBaleChangeActionPage from "./index.vue";
+
+lwOutboundBaleChangeActionPage.install = Vue => Vue.component(lwOutboundBaleChangeActionPage.name, lwOutboundBaleChangeActionPage)
+
+export default lwOutboundBaleChangeActionPage