From d95aa93bec19ad8981de9e2b8450fd71904cc978 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 21 Feb 2025 17:03:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/ConfirmDrugDealOrder.vue | 30 +++++++++++++++++-----
 src/views/collect/PannelOrderBizCard.vue   |  4 +--
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/views/collect/ConfirmDrugDealOrder.vue b/src/views/collect/ConfirmDrugDealOrder.vue
index b54779f3..68fdcedd 100644
--- a/src/views/collect/ConfirmDrugDealOrder.vue
+++ b/src/views/collect/ConfirmDrugDealOrder.vue
@@ -4,6 +4,7 @@
       <!-- 左侧面板 -->
       <div class="content-left">
         <el-card style="  height: 800px;">
+          <el-descriptions :title="scanTip" :column="2" border style="margin-top: 15px"></el-descriptions>
           <el-form :model="formData" class="order-el-form" ref="formData" label-width="120px" @submit.native.prevent>
 
           <!--  <el-alert-->
@@ -167,8 +168,8 @@
 
           <div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px">
             <el-row :gutter="0" style="margin-top: 5px">
-              <el-col :span="16">
-                <el-form-item prop="code" :label="scanTip" label-width="80px">
+              <el-col :span="18">
+                <el-form-item prop="code"  label-width="0px">
                   <el-input
                     id="inputer"
                     @focus="getInputFocus($event)"
@@ -182,7 +183,7 @@
                   <!--                       :disabled="scanDisabled"-->
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-button-group style="display: flex;">
                   <el-button
                     type="primary"
@@ -310,7 +311,13 @@
             <el-descriptions-item label="单据时间">{{ formData.billTime }}</el-descriptions-item>
             <el-descriptions-item label="单据备注">{{ formData.remark }}</el-descriptions-item>
           </el-descriptions>
+
+
         </el-form>
+
+          <el-descriptions title="灯组信息" :column="2" border style="margin-top: 15px">
+            <i class="el-icon-s-opportunity"></i>
+          </el-descriptions>
       </el-card>
     </div>
 
@@ -599,7 +606,7 @@ export default {
       needSplitConfirm: false,
       workplaceId: null,
       ws: null,
-      scanTip: "单据录入:",
+      scanTip: "单据录入",
       scanSplit: false,
       info: {},
       //
@@ -641,7 +648,18 @@ export default {
         }
       })
     },
-
+    colorStyle(ledNum) {
+      switch (ledNum) {
+        case 1:
+          return { color: 'red' };
+        case 2:
+          return { color: '#ec951f' };
+        case 3:
+          return { color: 'blue' };
+        case 4:
+          return { color: 'green' };
+      }
+    },
     //是否拆零的组件调用父级方法
     fifoSplitResult(data,info){
       this.info = info
@@ -650,7 +668,7 @@ export default {
       if (data.needSplitConfirm){//需要
         this.needSplitConfirm = data.needSplitConfirm
         this.scanTitle = "拆零扫码结果:";
-        this.scanTip = "拆零扫码:";
+        this.scanTip = "拆零扫码";
         this.result = "";
         return;
       }else {//不需要
diff --git a/src/views/collect/PannelOrderBizCard.vue b/src/views/collect/PannelOrderBizCard.vue
index 961c0795..fa816f8d 100644
--- a/src/views/collect/PannelOrderBizCard.vue
+++ b/src/views/collect/PannelOrderBizCard.vue
@@ -27,8 +27,8 @@
               <div class="count-display">
                 <h1 class="count" :class="{ 'confirmed': info.getConfirm }">{{ info.count }}</h1>
                 <div class="light-info">
-                  <i class="el-icon-s-opportunity"></i>
-                  <span :style="colorStyle(info)">{{ info.colorName }}</span>
+<!--                  <i class="el-icon-s-opportunity"></i>-->
+<!--                  <span :style="colorStyle(info)">{{ info.colorName }}</span>-->
                 </div>
               </div>
               <div class="count-display-right">