From 1308927c08ea5865f385e666ce7c95c06094f7cf Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 21 Feb 2025 19:18:07 +0800
Subject: [PATCH] =?UTF-8?q?2/21=20=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=961.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/ConfirmDrugDealOrder.vue | 10 ++++++++--
 src/views/collect/PannelOrderBizCard.vue   | 10 +++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/views/collect/ConfirmDrugDealOrder.vue b/src/views/collect/ConfirmDrugDealOrder.vue
index b00127ba..34f6ff04 100644
--- a/src/views/collect/ConfirmDrugDealOrder.vue
+++ b/src/views/collect/ConfirmDrugDealOrder.vue
@@ -261,7 +261,7 @@
 <!--          <el-descriptions-item label="来源系统">{{ formData.fromType }}</el-descriptions-item>-->
           <el-descriptions-item label="单据时间">{{ formData.billTime }}</el-descriptions-item>
 <!--          <el-descriptions-item label="单据备注">{{ formData.remark }}</el-descriptions-item>-->
-          <el-descriptions-item label="灯组信息">灯组信息</el-descriptions-item>
+          <el-descriptions-item label="灯组信息"><el-tag  type="danger">红色</el-tag></el-descriptions-item>
         </el-descriptions>
 
         <div style="margin-top: 18px">
@@ -334,7 +334,7 @@
         <!--          ></PanelOrderAllDetail>-->
         <!--        </el-tab-pane>-->
 
-      </el-card>
+      <!--</el-card>-->
 
       <el-dialog
         title="选入业务单据"
@@ -1628,6 +1628,7 @@ export default {
       this.scanTip = "单据录入:"
       this.placeholder = '请点击输入框进行选扫码'
     },
+
   },
   mounted() {
     this.$refs.inputRef.focus();
@@ -1714,4 +1715,9 @@ export default {
 .el-icon-arrow-down {
   font-size: 12px;
 }
+/*.custom-tag {*/
+/*  background-color: #ff0000; !* 自定义背景颜色 *!*/
+/*  color: #ffffff; !* 自定义文字颜色 *!*/
+/*  border: none; !* 移除边框 *!*/
+/*}*/
 </style>
diff --git a/src/views/collect/PannelOrderBizCard.vue b/src/views/collect/PannelOrderBizCard.vue
index 4afb85d4..92c97308 100644
--- a/src/views/collect/PannelOrderBizCard.vue
+++ b/src/views/collect/PannelOrderBizCard.vue
@@ -31,13 +31,13 @@
       <el-table :data="preDetailList"  :row-style="{ height: '50px',fontSize: '16px'}"  highlight-current-row="true" border ref="multipleTable">
         <el-table-column label="产品通用名" prop="cpmctymc" width="240"></el-table-column>
         <el-table-column label="制剂规格" prop="prepnSpec" width="280"></el-table-column>
-        <el-table-column label="包装规格" prop="ggxh" width="100"></el-table-column>
-        <el-table-column label="摆放位置" prop="queueCode" ></el-table-column>
+        <el-table-column label="包装规格" prop="spec" width="100"></el-table-column>
+        <el-table-column label="摆放位置" prop="productLocation" ></el-table-column>
 
-        <el-table-column label="操作" width="280" fixed="right">
+        <el-table-column label="操作" width="140" fixed="right">
           <template slot-scope="scope">
-              <el-button type="primary"  icon="el-icon-document" @click="codeHandleClick(scope.row)"  :disabled="!scope.row.getConfirm">赋码明细</el-button>
-              <el-button type="primary"   icon="el-icon-thumb" @click="handleClick(scope.row)"  :disabled="scope.row.getConfirm">确认取药</el-button>
+              <el-button type="primary"  icon="el-icon-document" @click="codeHandleClick(scope.row)"  v-if = "scope.row.getConfirm">赋码明细</el-button>
+              <el-button type="primary"   icon="el-icon-thumb" @click="handleClick(scope.row)"  v-if = "!scope.row.getConfirm">确认取药</el-button>
           </template>
         </el-table-column>
       </el-table>