From d63b25e478a891967fb35b56da470af9e1bc629a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Fri, 25 Oct 2024 16:43:00 +0800
Subject: [PATCH] =?UTF-8?q?PC=E6=89=93=E5=8D=B0=202024/8/4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/fg/receiptByPlan.vue | 53 ++++++++++++++++++++++-----
 src/pages/fg/receiptNoPlan.vue | 66 +++++++++++++++++++++++++++-------
 2 files changed, 98 insertions(+), 21 deletions(-)

diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue
index bb14e08b..e8ee8d3b 100644
--- a/src/pages/fg/receiptByPlan.vue
+++ b/src/pages/fg/receiptByPlan.vue
@@ -100,10 +100,14 @@
 <script setup lang="ts">
 import { ref, getCurrentInstance, nextTick } from 'vue'
 import { onLoad, onShow, onNavigationBarButtonTap, onReady, onBackPress, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
-import { isCheckMesCode, planReceiptSubmit, createPutawayRequestByPlan, createInspectRequestByPlan, getPlanByNumber } from '@/api/request2.js'
+import { isCheckMesCode, planReceiptSubmit,
+  createPutawayRequestByPlan, createInspectRequestByPlan,
+  getPlanByNumber,getBalanceToPackage,
+  batchPrintingLable } from '@/api/request2.js'
 import { calc } from '@/common/calc.js'
-
-import { getRemoveOption, deepCopyData, getCurrDateTime, compare,getSwitchInfoByCode } from '@/common/basic.js'
+import storage from '@/common/utils/storage.js'
+import { getRemoveOption, deepCopyData,
+  getCurrDateTime, compare,getSwitchInfoByCode} from '@/common/basic.js'
 import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 import comBlankView from '@/mycomponents/common/comBlankView.vue'
 import comReceiptPopup from '@/pages/fg/coms/comReceiptPopup.vue'
@@ -390,13 +394,46 @@ const scanPopupLoseFocus = () => {
     scanPopup.value.losefocus()
   }
 }
+const getH5BatchPrintingLable = (number)=> {
+  batchPrintingLable(number).then(resLable => {
+    console.log('batchPrintingLable', resLable)
+    const webUrl = `${import.meta.env.VITE_JMREPORT_BASE_URL}/jmreport/view/922734157577715712`
+    const webData = {
+      token: storage.getStorage(storage.constant.token),
+      asn_number: resLable.data
+    }
+    uni.redirectTo({
+      url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}`
+    });
+  })
+}
+const print = (pointData)=> {
+  // #ifdef APP
+  if (pointData.length > 0) {
+    uni.navigateTo({
+      url: `/pages/point/index?points=${JSON.stringify(pointData)}`
+    });
+  }
+  // #endif
+  // #ifdef H5
+  let packingNumber = []
+  pointData.forEach(item=>{
+    packingNumber.push(item.packageCode)
+  })
+  getBalanceToPackage({
+    packingNumber: packingNumber.join(',')
+  }).then(res => {
+    console.log('PC打印', res)
+    getH5BatchPrintingLable(res.data.number)
+
+  }).catch(error => {
+    showErrorMessage(error)
+  })
+  // #endif
+}
 const showCommitSuccessMessage = (hint, pointData) => {
   comMessageRef.value.showSuccessMessage(hint, (res) => {
-    if (pointData.length > 0) {
-      uni.navigateTo({
-        url: `/pages/point/index?points=${JSON.stringify(pointData)}`
-      })
-    }
+    print(pointData)
   })
 }
 const showErrorMessage = (message) => {
diff --git a/src/pages/fg/receiptNoPlan.vue b/src/pages/fg/receiptNoPlan.vue
index 3f5d8f9b..6da232c6 100644
--- a/src/pages/fg/receiptNoPlan.vue
+++ b/src/pages/fg/receiptNoPlan.vue
@@ -100,12 +100,14 @@ import {
   planReceiptSubmit,
   createPutawayRequestByPlan,
   createInspectRequestByPlan,
-  getPlanByNumber
+  getPlanByNumber,
+  getBalanceToPackage,
+  batchPrintingLable
 } from '@/api/request2.js';
 import {
   calc
 } from '@/common/calc.js';
-
+import storage from '@/common/utils/storage.js'
 import {
   getRemoveOption,
   deepCopyData,
@@ -411,20 +413,58 @@ export default {
         this.$refs.scanPopup.losefocus();
       }
     },
+    getH5BatchPrintingLable( number) {
+      let _this = this
+      batchPrintingLable(number).then(resLable => {
+        console.log('batchPrintingLable', resLable)
+        const webUrl = `${import.meta.env.VITE_JMREPORT_BASE_URL}/jmreport/view/922734157577715712`
+        const webData = {
+          token: storage.getStorage(storage.constant.token),
+          asn_number: resLable.data
+        }
+        uni.redirectTo({
+          url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}`
+        });
+      })
+    },
+
+    print(pointData){
+      let _this = this
+      // #ifdef APP
+      if (pointData.length > 0) {
+        if (this.scanedQty + this.showList.length == this.dataContent.planQty) {
+          uni.redirectTo({
+            url: `/pages/point/index?points=${JSON.stringify(pointData)}`
+          });
+        } else {
+          uni.navigateTo({
+            url: `/pages/point/index?points=${JSON.stringify(pointData)}`
+          });
+        }
+      }
+      // #endif
+      // #ifdef H5
+      let packingNumber = []
+      pointData.forEach(item=>{
+        packingNumber.push(item.packageCode)
+      })
+      getBalanceToPackage({
+        packingNumber: packingNumber.join(',')
+      }).then(res => {
+        console.log('PC打印', res)
+        _this.getH5BatchPrintingLable(res.data.number)
+
+      }).catch(error => {
+        _this.showErrorMessage(error)
+      })
+      // #endif
+
+    },
 
     showCommitSuccessMessage(hint, pointData) {
       this.$refs.comMessage.showSuccessMessage(hint, res => {
-        if (pointData.length > 0) {
-          if (this.scanedQty + this.showList.length == this.dataContent.planQty) {
-            uni.redirectTo({
-              url: `/pages/point/index?points=${JSON.stringify(pointData)}`
-            });
-          } else {
-            uni.navigateTo({
-              url: `/pages/point/index?points=${JSON.stringify(pointData)}`
-            });
-          }
-        }
+        this.print(pointData)
+
       })
     },