From 35b80008382aa2e0f0046d7292ac0eca32d4b72c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 31 七月 2024 16:58:47 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master

---
 src/components/do/b1-ins-order/add.vue |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index bc59989..328cd5b 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -429,9 +429,9 @@
         <el-table-column prop="proNum" label="寰呮椤规暟閲�" width="105" align="center"></el-table-column>
       </el-table>
       <el-table class="el-table" ref="productTable" :data="productList" height="380px" tooltip-effect="dark" border
-        @selection-change="selectProduct" style="margin-bottom: 10px;" @select="upProductSelect"
+        @selection-change="selectProduct" style="margin-bottom: 10px;" @select="upProductSelect" :row-key="rowKey"
         :row-class-name="tableRowClassName" v-loading="getProductLoad" @select-all="handleAll">
-        <el-table-column type="selection" width="65" :selectable="selectable" v-if="active==1"></el-table-column>
+        <el-table-column type="selection" width="65" :selectable="selectable" v-if="active==1" :reserve-selection="true"></el-table-column>
         <el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip>
           <template slot="header" slot-scope="scope">
             <div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
@@ -1075,7 +1075,8 @@
         temperatureTestNum: '',
         isShowInput: false,
         temId: '',
-        sonLaboratoryList:[]
+        sonLaboratoryList:[],
+        selectiveEcho: [], // 妫�楠屼笅鍗曠殑鏃跺�欏嬀閫夋楠岄」鐩�,濡傛灉浣跨敤绛涢�夋彁浜ゆ樉绀烘楠岄」鐩负绌� 鍥炴樉鍒楄〃
       }
     },
     watch: {
@@ -2051,6 +2052,9 @@
         })
         this.$refs.sampleTable.doLayout()
       },
+      rowKey (row) {
+      return row.id;
+    },
       selectProduct(val) {
         this.productListSelected = val
         this.productIds = []

--
Gitblit v1.9.3