From c8f8a6a35a5c319b4b1e961208c8d47800afa829 Mon Sep 17 00:00:00 2001
From: zhangsiyu <q3183592900@qq.com>
Date: Fri, 1 Sep 2023 18:02:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tablecmt/tablecmt.vue               | 14 ++++++++++----
 .../goodsShelf/basicdataGoodsShelfView.vue         |  2 +-
 src/views/warehouse/warehouseWaybill.vue           |  1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index a8fceae2..28af091d 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -229,7 +229,7 @@ const tableRowClassName = ({
 })  => {
   let sfcheck=false
   selectarr.value.map(item=>{
-    if(item.id==row.id){
+    if(item==row){
       sfcheck=true
     }
   })
@@ -264,9 +264,15 @@ function copyalls(column:TableColumnType){
   let text = '';
   props.tableData.map((item,index)=>{
     if(index<props.tableData.length-1){
-      text+=`${item[column.prop]}\n`
+      if(item[column.prop]){
+        text+=`${item[column.prop]}\n`
+      }
     }else{
-      text+=`${item[column.prop]}`
+      if(item[column.prop]){
+        text+=`${item[column.prop]}`
+      }else{
+
+      }
     }
     
   })
@@ -518,7 +524,7 @@ watchEffect(()=>{
   font-size: 12px !important;
 }
 .table-SelectedRow-bgcolor {
-      td{
+    >td{
         background-color:#f7e8d7 !important;
       }
     }
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
index 170a6c74..d08248a4 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
@@ -82,7 +82,7 @@
                     <div class="fwhserveNub">
                       <div>服务号：</div>
                       <div v-for="it in ite.serveNub || []">
-                        {{ it }}
+                        {{ it.serviceNumber }}
                       </div>
                     </div>
                   </div>
diff --git a/src/views/warehouse/warehouseWaybill.vue b/src/views/warehouse/warehouseWaybill.vue
index 919fd5d5..cdbd4434 100644
--- a/src/views/warehouse/warehouseWaybill.vue
+++ b/src/views/warehouse/warehouseWaybill.vue
@@ -27,6 +27,7 @@
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
             <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+            <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
           </div>
         </div>