From c578b157ef626fd3562b90ea8dca69cb32e6128d Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 9 Sep 2024 10:19:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=92=8C=E4=BB=BB=E5=8A=A1=E7=AD=9B=E9=80=89=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=89=BF=E6=8E=A5=E4=BA=BA=202024/7/15=2017:15:05?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/count/job/countJob.vue              | 20 ++++++++++++++-----
 src/pages/issue/job/issueJob.vue              |  4 ++--
 .../productPutaway/job/productPutawayJob.vue  | 15 +++++++++++---
 .../productReceipt/job/productReceiptJob.vue  |  4 ++--
 .../job/productionReceiptJob.vue              |  4 ++--
 src/pages/purchaseReceipt/job/receiptJob.vue  | 15 +++++++++++---
 src/pages/purchaseReturn/job/returnJob.vue    |  6 +++++-
 src/pages/putaway/job/putawayJob.vue          | 17 ++++++++++++----
 src/pages/repleinsh/job/repleinshJob.vue      |  4 ++--
 src/pages/unPlanned/coms/comReceiptRecord.vue |  2 +-
 10 files changed, 66 insertions(+), 25 deletions(-)

diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue
index f3c7d40f..e93b6538 100644
--- a/src/pages/count/job/countJob.vue
+++ b/src/pages/count/job/countJob.vue
@@ -135,11 +135,11 @@ const getList = (type) => {
     action: '==',
     value: 'locationCode'
   })
-  // filters.push({
-  //   column: 'accept_user_id',
-  //   action: '==',
-  //   value: store.id
-  // })
+  filters.push({
+    column: 'accept_user_id',
+    action: '==',
+    value: store.id
+  })
   const params = {
     filters,
     pageNo: pageNo.value,
@@ -271,6 +271,11 @@ const getDataListByType = (code) => {
     action: '==',
     value: 'locationCode'
   })
+  filters.push({
+    column: 'accept_user_id',
+    action: '==',
+    value: store.id
+  })
   const params = {
     filters,
     pageNo: 1,
@@ -319,6 +324,11 @@ const getScanResult = (result) => {
     action: '==',
     value: result.label.code
   })
+  filters.push({
+    column: 'accept_user_id',
+    action: '==',
+    value: store.id
+  })
 
   const params = {
     filters,
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index b6d5f5d7..35bb882a 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -379,11 +379,11 @@ const getScanResult = (result) => {
             selectItem(list[0])
           }
         } else {
-          showMessage(`物料号[${result.label.itemCode}]批次[${result.label.batch}]未查找到任务`)
+          showMessage(`物料号[${result.label.itemCode}]批次[${result.label.batch}]` + '未查找到任务<br>' + `扫描[${result.scanMessage}]`)
         }
       })
       .catch((error) => {
-        showMessage(error)
+        showMessage(`${error}<br>扫描[${result.scanMessage}]`)
       })
   } catch (e) {
     showMessage(e.message)
diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue
index d25a2f99..ea028fb8 100644
--- a/src/pages/productPutaway/job/productPutawayJob.vue
+++ b/src/pages/productPutaway/job/productPutawayJob.vue
@@ -233,7 +233,11 @@ const getDataListByType = (code) => {
     action: '==',
     value: code
   })
-
+  filters.push({
+    column: 'accept_user_id',
+    action: '==',
+    value: store.id
+  })
   const params = {
     filters,
     pageNo: 1,
@@ -298,6 +302,11 @@ const getScanResult = (result) => {
         column: 'status',
         action: 'in',
         value: '1,2'
+      },
+      {
+        column: 'accept_user_id',
+        action: '==',
+        value: store.id
       }
       // {
       //   column: 'fromLocationCode',
@@ -329,11 +338,11 @@ const getScanResult = (result) => {
             selectItem(list[0])
           }
         } else {
-          showMessage('未查找到任务')
+          showMessage('未查找到任务<br>' + `扫描[${result.scanMessage}]`)
         }
       })
       .catch((error) => {
-        showMessage(error)
+        showMessage(`${error}<br>扫描[${result.scanMessage}]`)
       })
   } catch (e) {
     showMessage(e.message)
diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue
index 423b5e63..192f44ff 100644
--- a/src/pages/productReceipt/job/productReceiptJob.vue
+++ b/src/pages/productReceipt/job/productReceiptJob.vue
@@ -344,14 +344,14 @@ const getScanResult = (result) => {
             selectItem(list[0])
           }
         } else {
-          showMessage('未查找到任务')
+          showMessage('未查找到任务<br>' + `扫描[${result.scanMessage}]`)
         }
       })
       .catch((error) => {
         showMessage(error)
       })
   } catch (e) {
-    showMessage(e.message)
+    showMessage(`${error}<br>扫描[${result.scanMessage}]`)
   }
 }
 defineExpose({
diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue
index 691119a1..3c52ceb1 100644
--- a/src/pages/productionReceipt/job/productionReceiptJob.vue
+++ b/src/pages/productionReceipt/job/productionReceiptJob.vue
@@ -312,11 +312,11 @@ const getScanResult = (result) => {
             selectItem(list[0])
           }
         } else {
-          showMessage('未查找到任务')
+          showMessage('未查找到任务<br>' + `扫描[${result.scanMessage}]`)
         }
       })
       .catch((error) => {
-        showMessage(error)
+        showMessage(`${error}<br>扫描[${result.scanMessage}]`)
       })
   } catch (e) {
     showMessage(e.message)
diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue
index 6a91c172..98941502 100644
--- a/src/pages/purchaseReceipt/job/receiptJob.vue
+++ b/src/pages/purchaseReceipt/job/receiptJob.vue
@@ -187,7 +187,11 @@ const getDataListByType = (code, type) => {
       value: code
     })
   }
-
+  filters.push({
+    column: 'accept_user_id',
+    action: '==',
+    value: store.id
+  })
   const params = {
     filters,
     pageNo: 1,
@@ -344,6 +348,11 @@ const getScanResult = (result) => {
         // }
       ]
     }
+    filters.push({
+      column: 'accept_user_id',
+      action: '==',
+      value: store.id
+    })
     getPurchaseReceiptJobList({
       filters,
       pageNo: 1,
@@ -369,14 +378,14 @@ const getScanResult = (result) => {
             selectItem(list[0], result.scanMessage.indexOf('ASN') > -1)
           }
         } else {
-          showMessage('未查找到任务')
+          showMessage('未查找到任务<br>' + `扫描[${result.scanMessage}]`)
         }
       })
       .catch((error) => {
         showMessage(error)
       })
   } catch (e) {
-    showMessage(e.message)
+    showMessage(`${error}<br>扫描[${result.scanMessage}]`)
   }
 }
 defineExpose({
diff --git a/src/pages/purchaseReturn/job/returnJob.vue b/src/pages/purchaseReturn/job/returnJob.vue
index 37ff72eb..5a7bac0b 100644
--- a/src/pages/purchaseReturn/job/returnJob.vue
+++ b/src/pages/purchaseReturn/job/returnJob.vue
@@ -234,7 +234,11 @@ const getDataListByType = (code) => {
       value: code
     })
   }
-
+  filters.push({
+    column: 'accept_user_id',
+    action: '==',
+    value: store.id
+  })
   const params = {
     filters,
     pageNo: 1,
diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue
index 2c2b3220..abca65d5 100644
--- a/src/pages/putaway/job/putawayJob.vue
+++ b/src/pages/putaway/job/putawayJob.vue
@@ -236,7 +236,11 @@ const getDataListByType = (code) => {
     action: '==',
     value: code
   })
-
+  filters.push({
+    column: 'accept_user_id',
+    action: '==',
+    value: store.id
+  })
   const params = {
     filters,
     pageNo: 1,
@@ -300,6 +304,11 @@ const getScanResult = (result) => {
         column: 'status',
         action: 'in',
         value: '1,2'
+      },
+      {
+        column: 'accept_user_id',
+        action: '==',
+        value: store.id
       }
       // {
       //   column: 'fromLocationCode',
@@ -331,14 +340,14 @@ const getScanResult = (result) => {
             selectItem(list[0])
           }
         } else {
-          showMessage('未查找到任务')
+          showMessage('未查找到任务<br>' + `扫描[${result.scanMessage}]`)
         }
       })
       .catch((error) => {
-        showMessage(error)
+        showMessage(`${error}<br>扫描[${result.scanMessage}]`)
       })
   } catch (e) {
-    showMessage(e.message)
+    showMessage(`${e}<br>扫描[${result.scanMessage}]`)
   }
 }
 </script>
diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue
index b585a8aa..4e751368 100644
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@@ -330,11 +330,11 @@ const getScanResult = (result) => {
             selectItem(list[0])
           }
         } else {
-          showMessage(`物料号[${result.label.itemCode}]批次[${result.label.batch}]未查找到任务`)
+          showMessage(`物料号[${result.label.itemCode}]批次[${result.label.batch}]未查找到任务<br>` + `扫描[${result.scanMessage}]`)
         }
       })
       .catch((error) => {
-        showMessage(error)
+        showMessage(`${error}<br>扫描[${result.scanMessage}]`)
       })
   } catch (e) {
     showMessage(e.message)
diff --git a/src/pages/unPlanned/coms/comReceiptRecord.vue b/src/pages/unPlanned/coms/comReceiptRecord.vue
index 309fa247..cfa029d4 100644
--- a/src/pages/unPlanned/coms/comReceiptRecord.vue
+++ b/src/pages/unPlanned/coms/comReceiptRecord.vue
@@ -24,7 +24,7 @@
 					</uni-swipe-action>
 				</view> -->
         <u-swipe-action :show="detail.show" :index="index" v-for="(detail, index) in dataContent.subList" :key="index" :options="detail.scaned ? scanOptions : detailOptions" bg-color="rgba(255,255,255,0)" class="u-m-b-20" @click="(...event) => swipeClick(event, detail)">
-          <balance :dataContent="detail" :isShowStdPack="false" :isShowStatus="true" :isShowPack="true" :isShowFromLocation="false" :isShowToLocation="false"></balance>
+          <balance :dataContent="item" :isShowStdPack="false" :isShowStatus="false" :isShowPack="true" :isShowFromLocation="false" :isShowToLocation="false"></balance>
         </u-swipe-action>
       </u-collapse-item>
     </u-collapse>