From cb55a2b6c4b2626fd6d2d431a97cf6c63f7cfbb5 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 8 Jan 2025 20:49:28 +0800
Subject: [PATCH] =?UTF-8?q?1/8=20=E7=A0=81=E6=A0=A1=E9=AA=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/DialogCheckCode.vue       | 6 +++++-
 src/views/collect/IocCollectOrderVerify.vue | 9 +++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/collect/DialogCheckCode.vue b/src/views/collect/DialogCheckCode.vue
index c8e68d79..8918a458 100644
--- a/src/views/collect/DialogCheckCode.vue
+++ b/src/views/collect/DialogCheckCode.vue
@@ -128,7 +128,7 @@
           :total="resultTotal"
           :limit.sync="codeQuery.limit"
           :page.sync="codeQuery.page"
-          @pagination="getResultDetailList"
+          @pagination="getPage()"
         ></pagination>
         <!-- 在表格下方添加说明 -->
 
@@ -427,6 +427,10 @@ export default {
       // 如果没有任何条件满足，返回 false
       return false
     },
+    getPage(){
+      this.codeQuery.selectType = 1
+      this.getResultDetailList()
+    },
     getResultDetailList() {
       this.codeQuery.billNo = this.orderData.billNo
       getCodeEndList(this.codeQuery).then((res) => {
diff --git a/src/views/collect/IocCollectOrderVerify.vue b/src/views/collect/IocCollectOrderVerify.vue
index 28d72653..0d41ad3c 100644
--- a/src/views/collect/IocCollectOrderVerify.vue
+++ b/src/views/collect/IocCollectOrderVerify.vue
@@ -491,7 +491,7 @@ export default {
         if (data.status == 1) {
           this.scanResultType = 'success'
           this.result = this.result + (isBlank(this.result) ? '' : ';') + vailCodeResultResponses[i].code + ':' + vailCodeResultResponses[i].sucMsg
-        } else if (data.status == 2) {
+        } else if (data.status == 2 || data.status == 3) {
           this.errResult = this.errResult + '\n' + vailCodeResultResponses[i].code + ':' + vailCodeResultResponses[i].errMsg
         } else if (data.status == 5) {
           this.scanResultType = 'warning'
@@ -557,7 +557,7 @@ export default {
     commit() {
       commitCheckCodeOrder(this.filterQuery).then(res => {
         if (res.code == 20000) {
-          this.init
+          this.init()
           this.$message.success('校验完成')
         } else {
           // if (this.orderData.checkCodeConfirm == 1) {
@@ -584,6 +584,10 @@ export default {
       this.placeholder = '请输入单据号进行扫码校验'
       this.scanTitle = '扫码结果:'
       this.curRow = null
+      this.successVisible = true
+      this.errVisible = false
+      this.errResult =  ''
+      this.result =  '\n'
       this.orderQuery = {
         page: 1,
         limit: 10,
@@ -610,6 +614,7 @@ export default {
       if (this.$route.query.busType != null) {
         this.busType = this.$route.query.busType
       }
+      this.panelALive = false
     },
     clear() {
       this.init()