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

package/src/views/wms/page/outbound/lpnPack/action/index.vue

@@ -1,7 +1,7 @@
- <!--
-  打托 - 执行打托
-  @author: 张文
-  @date: 2022-08-22
+<!--
+ 打托 - 执行打托
+ @author: 张文
+ @date: 2022-08-22
 -->
 <template>
   <div>
@@ -14,7 +14,7 @@
         is-action
         :item="lpnData"
         show-print
-        @print="printClick"
+        @print="printClick(true)"
       >
 
         <div
@@ -183,7 +183,7 @@
         v-model="overLpnPopup.palletUseContainer.value"
         :get-focus.sync="overLpnPopup.palletUseContainer.focus"
         rule-key="containerKey"
-        :create-rule="$lwScanRule.create('打托 - 完成打托 - 捆包容器','CONTAINER')"
+        :create-rule="$lwScanRule.create('打托-完成打托-捆包容器','CONTAINER')"
         :required="packTableConfig.palletNeedUseContainerConf === '1'"
         @confirm="overLpnConfirm"
       />
@@ -273,17 +273,9 @@ export default {
     this.init()
   },
   methods: {
-    async init(){
-      // 判断当前是否配置了打印机
-      const {success,printData} = this.$lwPrint.test(
-        'OUTBOUND_PALLET_LABEL',
-        this.$lwLanguage.get('wms_project.pda.components.page.outbound.lpnPack.action.index.dpwjkhcb','出库打托标签')
-      )
-      if (!success){
-        history.go(-1)
-        return
-      }
-      this.printData = printData
+    async init() {
+
+      this.printCheck()
 
       this.packTableConfig = await projectWmsOutboundMobileGetPackConfig()
 
@@ -291,7 +283,7 @@ export default {
     },
 
     // 获取托盘数据
-    getLpnData(){
+    getLpnData() {
       projectWmsOutboundPalletQueryDetail({
         palletNo: this.$route.query.lpnNo
       }).then(res=>{
@@ -361,10 +353,10 @@ export default {
     },
     // 完成打托 - 弹框关闭
     overLpnPopupOff(){
-      this.overLpnPopup.length = ''
-      this.overLpnPopup.width = ''
-      this.overLpnPopup.height = ''
-      this.overLpnPopup.weight = ''
+      this.overLpnPopup.length.value = ''
+      this.overLpnPopup.width.value = ''
+      this.overLpnPopup.height.value = ''
+      this.overLpnPopup.weight.value = ''
     },
     // 输入框校验
     overLpnInputCheck(key){
@@ -435,32 +427,50 @@ export default {
     // 删除箱号
     boxDel(item){
       this.$lwDialog.confirm({
-        title: this.$lwLanguage.get('wms_project.pda.components.page.outbound.lpnPack.action.index.dxkbblmd','提示'),
-        message: this.$lwLanguage.get('wms_project.pda.components.page.outbound.lpnPack.action.index.xebvurnm','确认删除箱号：') + item.boxNo
-      }).then(()=>{
+        title: this.$lwLanguage.get('wms_project.pda.components.page.outbound.lpnPack.action.index.dxkbblmd', '提示'),
+        message: this.$lwLanguage.get('wms_project.pda.components.page.outbound.lpnPack.action.index.xebvurnm', '确认删除箱号：') + item.boxNo
+      }).then(() => {
         projectWmsOutboundPalletRemoveBox({
           palletId: this.lpnData.palletId,
           boxId: item.boxId
-        }).then(res=>{
+        }).then(res => {
           this.lpnData = res.palletData
           this.$lwToast.success(
-            this.$lwLanguage.get('wms_project.pda.components.page.outbound.lpnPack.action.index.lmwmsohk','已删除')
+            this.$lwLanguage.get('wms_project.pda.components.page.outbound.lpnPack.action.index.lmwmsohk', '已删除')
           )
         })
-      }).catch(()=>{})
+      }).catch(() => {
+      })
     },
 
 
+    // 打印机配置检查
+    printCheck(needCheck) {
+
+      if (this.printData.printId) return true
+
+      const {printData, success} = this.$lwPrint.test(
+        'OUTBOUND_PALLET_LABEL',
+        this.$lwLanguage.get('wms_project.pda.components.page.outbound.lpnPack.action.index.dpwjkhcb', '出库打托标签'),
+        needCheck
+      )
+
+      this.printData = printData
+      return success
+    },
     // 打印
-    async printClick(){
+    async printClick(needCheck) {
+
+      if (!this.printCheck(needCheck)) return
+
       try {
         const res = await projectWmsSubmitPrintPallet({
           palletId: this.lpnData.palletId,
           printDeviceId: this.printData.printId
         })
 
-        await this.$lwPrint.bluetoothPrint({taskId:res.id})
-      }catch (e){
+        await this.$lwPrint.bluetoothPrint({taskId: res.id})
+      } catch (e) {
         console.log(e)
       }
     }

package/src/views/wms/page/outbound/lpnPack/index/index.vue

@@ -201,16 +201,15 @@ export default {
       if (this.printData.printId) return true
 
       // 判断当前是否配置了打印机
-      const {success,printData} = this.$lwPrint.test(
+      const {success, printData} = this.$lwPrint.test(
         'OUTBOUND_PALLET_LABEL',
-        this.$lwLanguage.get('wms_project.pda.components.page.outbound.lpnPack.index.index.cgwkoirb','出库打托标签')
+        this.$lwLanguage.get('wms_project.pda.components.page.outbound.lpnPack.index.index.cgwkoirb', '出库打托标签'),
+        true
       )
-      if (success) {
-        this.printData = printData
-        return true
-      }
 
-      return false
+      this.printData = printData
+      return success
+
     },
     // 补打标签
     async printLabel(item) {

package/src/views/wms/page/outbound/lpnPack/over/index.vue

@@ -64,12 +64,13 @@ export default {
   methods: {
     // 打印标签
     async printLabel(){
-      if (!Object.keys(this.printData).length){
+      if (!this.printData.printId) {
         const {success, printData} = this.$lwPrint.test(
           'OUTBOUND_PALLET_LABEL',
-          this.$lwLanguage.get('wms_project.pda.components.page.outbound.lpnPack.over.index.rngxtwoc','出库打托标签')
+          this.$lwLanguage.get('wms_project.pda.components.page.outbound.lpnPack.over.index.rngxtwoc', '出库打托标签'),
+          true
         )
-        if(!success) return
+        if (!success) return
         this.printData = printData
       }