From 7453288b2e8e7bfa4b71f9fdaa6bbe8b11409b22 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 9 Sep 2024 16:57:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=AB=E6=8F=8F2024/7/20?=
 =?UTF-8?q?=2013:52:36?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/count/job/fuzzyCountDetail.vue       | 18 ++++++++++++++----
 .../productReceipt/job/productReceiptJob.vue   |  8 ++++++++
 src/pages/repleinsh/job/repleinshJob.vue       | 12 +++++++++++-
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/pages/count/job/fuzzyCountDetail.vue b/src/pages/count/job/fuzzyCountDetail.vue
index e13615dc..3162d615 100644
--- a/src/pages/count/job/fuzzyCountDetail.vue
+++ b/src/pages/count/job/fuzzyCountDetail.vue
@@ -40,8 +40,14 @@
 
     <view class="page-footer" v-if="detailSource.length > 0">
       <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">
+        <view class="uni-flex u-col-center space-between padding_10">
+          <view> 已扫描: </view>
+          <view class="card_packing_code" style="padding: 5px; font-weight: bold; font-size: 40rpx">
+            {{ detailSource.length }}
+          </view>
+          <view> (箱) </view>
+        </view>
+        <view class="uni-flex uni-row space-between">
           <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
         </view>
       </view>
@@ -285,13 +291,17 @@ export default {
     getScanResult(result) {
       const that = this
       const packInfo = result.package
+      const detail = this.createDetailInfo(packInfo)
+      this.detailSource.unshift(detail)
+      this.scanPopupGetFocus()
+      return
       if (this.itemRangeValue != '') {
         const index = this.itemRangeValue.indexOf(packInfo.itemCode)
         if (index < 0) {
           this.afterScanLocation(`物料代码【${packInfo.itemCode}】,不在盘点范围【${this.itemRangeValue}】内`)
-        } else {
-          this.onScan(packInfo)
+          return
         }
+        this.onScan(packInfo)
       } else {
         this.onScan(packInfo)
       }
diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue
index 02a290ef..d14b6db5 100644
--- a/src/pages/productReceipt/job/productReceiptJob.vue
+++ b/src/pages/productReceipt/job/productReceiptJob.vue
@@ -65,6 +65,7 @@ const status = ref('1,2') // 待处理 、进行中
 const detailOptions = ref([])
 const detailGiveupOptions = ref([])
 const scanMessage = ref('')
+const scanMessage = ref('')
 const filter = ref()
 const comMessageRef = ref()
 const jobInfoPopupRef = ref()
@@ -163,6 +164,7 @@ const openJobDetail = (item, scanMessage = '') => {
       url: `./scrapReceiptDetail?id=${item.masterId}&status=${item.status}&scanMessage=${scanMessage}&title=${title.value}`
     })
   }
+  scanMessage.value = ''
 }
 
 const showItemList = (itemList) => {
@@ -319,6 +321,11 @@ const getScanResult = (result) => {
         column: 'status',
         action: 'in',
         value: '1,2'
+      },
+      {
+        column: 'accept_user_id',
+        action: '==',
+        value: store.id
       }
       // {
       // 	column: 'fromLocationCode',
@@ -332,6 +339,7 @@ const getScanResult = (result) => {
       pageSize: 100
     })
       .then((res) => {
+        scanMessage.value = result.scanMessage
         const resultList = res.data.list
         if (resultList.length > 0) {
           resultList.forEach((item) => {
diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue
index 7d89faa2..1792ca3f 100644
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@@ -246,6 +246,11 @@ const getDataListByType = (code) => {
     action: '==',
     value: code
   })
+  filters.push({
+    column: 'accept_user_id',
+    action: '==',
+    value: store.id
+  })
   const params = {
     filters,
     pageNo: 1,
@@ -258,7 +263,7 @@ const getDataListByType = (code) => {
       uni.hideLoading()
       if (res.data.list.length == 0) {
         showMessage('未查找到' + `【${code}】的补料任务`)
-      } else if (res.data.list.length == 1) {
+      } else {
         openJobDetail(res.data.list[0])
       }
     })
@@ -306,6 +311,11 @@ const getScanResult = (result) => {
         column: 'itemCode',
         action: '==',
         value: result.label.itemCode
+      },
+      {
+        column: 'accept_user_id',
+        action: '==',
+        value: store.id
       }
     ]
     getRepleinshJobList({