Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

1 month ago · 223253535e
parent b5b089f331 3abe136618
commit 223253535e
1 changed files with 2 additions and 1 deletions
--- a/src/views/collect/device/DevicesCollectFinishOrderBackupDetail.vue
+++ b/src/views/collect/device/DevicesCollectFinishOrderBackupDetail.vue
@ -1,6 +1,7 @@
 <template>
  <div>
-    <el-table v-loading="preLoading" :data="preDetailList" style="width: 100%" border :row-style="rowStyle">
+    <!--//:row-style="rowStyle"-->
+    <el-table v-loading="preLoading" :data="preDetailList" style="width: 100%" border >
      <template v-for="(item, index) in tableHeader1">
        <el-table-column
          v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"