From 0717d2ba704e2340beaf90b0aae4c24a49ef347a Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 7 Jan 2025 10:27:14 +0800
Subject: [PATCH] =?UTF-8?q?1/7=20=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/DealOrder.vue            | 12 ++++----
 src/views/collect/DialogScanCodeDetail.vue | 34 +++++++++++++++++++---
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index f2a7d530..1a15cd8a 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -23,12 +23,12 @@
                          @click.native="overdeleteCode"
               >结束剔除
               </el-button>
-              <el-button
-                type="primary"
-                :disabled="formData.billNo  || (this.formDataVisible != null &&  this.formDataVisible.scanType == 1)"
-                @click.native="nextCollectOrder()"
-              >下一单
-              </el-button>
+              <!--<el-button-->
+              <!--  type="primary"-->
+              <!--  :disabled="formData.billNo  || (this.formDataVisible != null &&  this.formDataVisible.scanType == 1)"-->
+              <!--  @click.native="nextCollectOrder()"-->
+              <!--&gt;下一单-->
+              <!--</el-button>-->
               <el-button
                 type="primary"
                 :disabled="formData.billNo ||(this.formDataVisible != null &&  this.formDataVisible.scanType == 1)"
diff --git a/src/views/collect/DialogScanCodeDetail.vue b/src/views/collect/DialogScanCodeDetail.vue
index 37220b9f..6dd0c3ee 100644
--- a/src/views/collect/DialogScanCodeDetail.vue
+++ b/src/views/collect/DialogScanCodeDetail.vue
@@ -13,7 +13,7 @@
       <el-table-column
         label="追溯码"
         prop="code"
-        width="280"
+        width="240"
         show-overflow-tooltip
       ></el-table-column>
       <!--      <el-table-column-->
@@ -71,6 +71,20 @@
         width="120"
         show-overflow-tooltip
       ></el-table-column>
+
+      <el-table-column
+        label="拆零标识"
+        prop="fifoSplit"
+        width="120"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <el-tag :type="getFifoSplitType(scope.row.fifoSplit)">
+            {{ fifoSplitMap[scope.row.fifoSplit] }}
+          </el-tag>
+        </template>
+      </el-table-column>
+
       <!--      <el-table-column-->
       <!--        label="供应商"-->
       <!--        prop="supName"-->
@@ -204,7 +218,13 @@ export default {
         selectType: 1,
         relId: ''
       },
-      codeTotal:0
+      codeTotal:0,
+      fifoSplitMap:{
+        1 : "自动拆零",
+        2 : "自动整取",
+        3 : "手动整取",
+        4 : "手动拆零"
+      }
     }
   },
   methods: {
@@ -354,11 +374,17 @@ export default {
       tQuery.action = this.orderFormData.action
       this.closeCodeDialog()
 
+    },
+    getFifoSplitType(fifoSplit){
+      if (fifoSplit == 1 || fifoSplit == 4){
+        return ""
+      }
+      if (fifoSplit == 2 || fifoSplit == 3){
+        return "success"
+      }
     }
-
   },
   created() {
-    console.log('hahhahahah', this.prescribeData)
     if (this.prescribeData.id != null) {
       this.getCodeList()
     }