From cb34c0e8a06c30bf7908f27f043495d999e9271e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Wed, 30 Oct 2024 18:46:08 +0800
Subject: [PATCH] =?UTF-8?q?page/package/record=20=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=208/8-10/25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/record/mergePackageRecord.vue     |  4 +--
 .../package/record/overPackageRecord.vue      | 27 +++++++++----------
 .../package/record/splitPackageRecord.vue     |  6 ++---
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/pages/package/record/mergePackageRecord.vue b/src/pages/package/record/mergePackageRecord.vue
index 79a8cde6..dcfd99f0 100644
--- a/src/pages/package/record/mergePackageRecord.vue
+++ b/src/pages/package/record/mergePackageRecord.vue
@@ -144,7 +144,7 @@ export default {
           const newDetail = createDetailInfo(balance, pack)
           item.subList.push(newDetail)
         } else if (detail.scaned == true) {
-          this.showErrorMessage(`箱码[${balance.packingNumber}批次[${balance.batch}]已经在列表中`)
+          this.showErrorMessage(`箱码[${balance.packingNumber}批次[${balance.batch}]重复扫描`)
         }
       }
       this.calcHandleQty()
@@ -215,7 +215,7 @@ export default {
           .then((res) => {
             uni.hideLoading()
             if (res.data) {
-              this.showCommitSuccessMessage(`提交成功<br>生成合包记录<br>${res.data}`)
+              this.showCommitSuccessMessage(`提交成功\n生成合包记录\n${res.data}`)
             } else {
               this.showErrorMessage(`提交失败[${res.msg}]`)
             }
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index 7954a682..f612b3f9 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -114,21 +114,12 @@ const scanLocationCode = ref()
 const toPackUnit = ref()
 const comMessageRef = ref()
 const printService = ref()
-onLoad(() => {
-  getBusinessType()
-  // nextTick(() => {
-  //   if (uni.getStorageSync('overPackageRecordPointParams')) {
-  //     const overPackageRecordPointParams = uni.getStorageSync('overPackageRecordPointParams')
-  //     dataContent.value.printerUuid = overPackageRecordPointParams.printDeafult.value
-  //     dataContent.value.modelCode = overPackageRecordPointParams.templateDeafult.value
-  //     printService.value.setDefaultData(overPackageRecordPointParams.printDeafult, overPackageRecordPointParams.templateDeafult)
-  //   }
-  // })
-})
+
 onLoad((option) => {
   uni.setNavigationBarTitle({
     title: option.title
   })
+  getBusinessType()
 })
 onNavigationBarButtonTap((e) => {
   if (e.index === 0) {
@@ -247,7 +238,7 @@ const setData = (result) => {
       item.subList.push(newDetail)
       scanPopupGetFocus()
     } else if (detail.scaned == true) {
-      showErrorMessage(`箱码[${detail.packingNumber}批次[${balance.batch}]已经在列表中`)
+      showErrorMessage(`箱码[${detail.packingNumber}批次[${balance.batch}]重复扫描`)
     }
   }
   calcHandleQty1()
@@ -316,6 +307,10 @@ const commit = () => {
       showErrorMessage('请选择目标包装规格')
       return
     }
+    if(fromPackUnit.value == toPackUnit.value){
+      showErrorMessage("来源包装规格与目标包装规格一致,不能进行翻包操作")
+      return;
+    }
     checkSubmit()
   } else {
     showErrorMessage('没有要扫描的数据')
@@ -385,7 +380,7 @@ const submitJob = () => {
             barcodeBase64: '',
           })
         })
-        showCommitSuccessMessage("提交成功<br>生成翻包记录<br>", list)
+        showCommitSuccessMessage("提交成功\n生成翻包记录\n", list)
       } else {
         showErrorMessage("提交失败[" + res.msg + "]")
       }
@@ -463,12 +458,16 @@ const showCommitSuccessMessage = (hint, pointData) => {
   comMessageRef.value.showSuccessMessage(hint, (res) => {
     if (res) {
       detailSource.value = []
-      fromLocationCode.value = ''
+      let fromLocationCode = ''
+      // fromLocationCode.value = ''
       dataContent.value = {}
       itemCode.value = ''
       toPackUnitShow.value = '请选择'
       toPackQty.value = ''
       if (pointData.length > 0) {
+        pointData.forEach(item=>{
+          item.fromLocationCode = fromLocationCode
+        })
         uni.navigateTo({
           url: `/pages/point/index?points=${JSON.stringify(pointData)}`
         })
diff --git a/src/pages/package/record/splitPackageRecord.vue b/src/pages/package/record/splitPackageRecord.vue
index ab6b7b0a..d1d61c97 100644
--- a/src/pages/package/record/splitPackageRecord.vue
+++ b/src/pages/package/record/splitPackageRecord.vue
@@ -24,7 +24,7 @@
         <view class="uni-flex u-col-center space-between padding_10" style="background-color: ghostwhite; width: 100%">
           <view class=""> </view>
           <view class="uni-flex uni-row">
-            <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+            <button class="btn_single_commit" hover-class="btn_commit_after" @click="$throttle(commit,2000,this)()">提交</button>
           </view>
         </view>
       </view>
@@ -191,7 +191,7 @@ export default {
           item.subList.push(newDetail)
           this.closeScanPopup()
         } else if (detail.scaned == true) {
-          this.showErrorMessage(`箱码[${detail.packingNumber}批次[${balance.batch}]已经在列表中`)
+          this.showErrorMessage(`箱码[${detail.packingNumber}批次[${balance.batch}]重复扫描`)
         }
       }
       this.calcHandleQty()
@@ -274,7 +274,7 @@ export default {
                   barcodeBase64: ''
                 })
               })
-              this.showCommitSuccessMessage('提交成功<br>生成拆包记录<br>', list)
+              this.showCommitSuccessMessage('提交成功\n生成拆包记录\n', list)
             } else {
               this.showErrorMessage(`提交失败[${res.msg}]`)
             }