From 367fa6386662343af4b4e4c733733edb2830211a Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 1 Apr 2025 09:51:06 +0800
Subject: [PATCH] =?UTF-8?q?4/1=20=E6=89=8B=E5=8A=A8=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IoReturnOrderBiz.vue    |  6 +----
 src/views/collect/IoReturncllectOrder.vue |  7 ++++--
 src/views/collect/PannelOrderBiz.vue      | 28 +++++++++++++++--------
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/views/collect/IoReturnOrderBiz.vue b/src/views/collect/IoReturnOrderBiz.vue
index 4fe205d2..479e2037 100644
--- a/src/views/collect/IoReturnOrderBiz.vue
+++ b/src/views/collect/IoReturnOrderBiz.vue
@@ -26,11 +26,7 @@
       <el-table-column label="应扫码数量" prop="scanActCount">
         <template v-slot="scope">
           <div :style="getCellStyle(scope.row)" style="display: flex; align-items: center; height: 100%; min-height: 40px;">
-            {{
-               scope.row.shouldCount === 0
-                ? '无需扫码'
-                : `${scope.row.scanCount}/${scope.row.shouldCount}`
-            }}
+            {{ scope.row.scanCount }}/{{ scope.row.shouldCount }}
           </div>
         </template>
       </el-table-column>
diff --git a/src/views/collect/IoReturncllectOrder.vue b/src/views/collect/IoReturncllectOrder.vue
index f1ca6455..e7194306 100644
--- a/src/views/collect/IoReturncllectOrder.vue
+++ b/src/views/collect/IoReturncllectOrder.vue
@@ -533,7 +533,6 @@ export default {
                   item => /^YPCFTF/.test(item.documentTypeCode || "") // 正则匹配前缀
                 );
                 this.formData.busType = this.formDataVisible.documentTypeCode
-                console.log("djdjjdj",this.formData.busType)
                 //scanType
                 // 1.扫码生成业务单
                 // 2.按单校验三期
@@ -932,7 +931,9 @@ export default {
           this.curRow = this.formData
           this.$refs.inputRef.focus()
           this.refreshCodesPanel(this)
-        }else {
+        }else if(res.code == 502){
+          return this.$message.error("非此单追溯码")
+        } else{
           return this.$message.error(res.message)
         }
       }).catch(() => {
@@ -1000,6 +1001,7 @@ export default {
           const audio = new Audio(require('@/assets/audioFiles/order.mp3'))
           audio.play()
           this.reset()
+          return this.$message.success("退货成功")
           if (this.formDataVisible.scanType != 1) {
             this.findCurOrder()
           }
@@ -1112,6 +1114,7 @@ export default {
       this.formData = row
       this.formData.workPlaceCode = this.workplaceId
       this.startDeal()
+      this.selectPrescriptionVisible = false
       // this.generateBarcode()
     },
 
diff --git a/src/views/collect/PannelOrderBiz.vue b/src/views/collect/PannelOrderBiz.vue
index bc3e3d8d..afdb3747 100644
--- a/src/views/collect/PannelOrderBiz.vue
+++ b/src/views/collect/PannelOrderBiz.vue
@@ -137,12 +137,11 @@
       </el-table-column>
       <el-table-column label="应扫码数量" prop="scanActCount">
         <template v-slot="scope">
-          <div :style="getCellStyle(scope.row)" style="display: flex; align-items: center; height: 100%; min-height: 40px;">
-            {{
-              scope.row.shouldCount === 0
-                ? '无需扫码'
-                : `${scope.row.scanCount}/${scope.row.shouldCount}`
-            }}
+          <div v-if="scope.row.autoTagStatus == 2" :style="getCellStyle1(scope.row)" style="display: flex; align-items: center; height: 100%; min-height: 40px;">
+            无需扫码
+          </div>
+          <div :style="getCellStyle(scope.row)" style="display: flex; align-items: center; height: 100%; min-height: 40px;" v-else>
+            {{ scope.row.scanCount }}/{{ scope.row.shouldCount }}
           </div>
         </template>
       </el-table-column>
@@ -384,6 +383,14 @@ export default {
       return rowBackground
     },
 
+    getCellStyle1(row) {
+      let cellStyle = {}
+      if (row.autoTagStatus == 2) {
+        cellStyle.fontSize = '30px'
+        cellStyle.color = '#E6A23C'
+        return cellStyle
+      }
+    },
     getCellStyle(row) {
       let cellStyle = {
         fontSize: '50px'
@@ -404,13 +411,14 @@ export default {
     //     return { height: '60px' };
     // },
     getTagColor(row) {
+    if (row.autoTagStatus == 2) {
+        this.codingStatus = '预赋码'
+        return 'warning' // 黄色
+      }
       if (row.scanActCount < row.count) {
         this.codingStatus = '未赋码'
         return 'danger' // 红色
-      } else if (row.autoTagStatus == 2) {
-        this.codingStatus = '预赋码'
-        return 'warning' // 黄色
-      } else if (row.scanActCount >= row.count) {
+      }  else if (row.scanActCount >= row.count) {
         this.codingStatus = '已赋码'
         return 'success' // 绿色
       }