Merge branch 'web-v2' of http://192.168.1.43:3000/git/sass-lab-web into web-v2

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/addDialog.vue

@@ -438,7 +438,7 @@
               <p class="reset-button-one" @click="deviceResetQueryLeft" style="width:60px;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table ref="leftDeviceTable" border :data="deviceTableListLeft" @selection-change="deviceChangeLeft" :row-key="getRowKeys">
+          <el-table ref="leftDeviceTable" border :data="deviceTableListLeft" @selection-change="deviceChangeLeft" :row-key="getDeviceRowKeys">
             <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
             <el-table-column label="名称" align="center" prop="chName" show-overflow-tooltip/>
             <el-table-column label="型号" align="center" prop="code" show-overflow-tooltip width="150"/>
@@ -488,7 +488,7 @@
               <p class="reset-button-one" @click="deviceResetQueryRight" style="width:60px;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table ref="rightDeviceTable" border :data="deviceTableListRight" @selection-change="deviceChangeRight" :row-key="getRowKeys">
+          <el-table ref="rightDeviceTable" border :data="deviceTableListRight" @selection-change="deviceChangeRight" :row-key="getDeviceRowKeys">
             <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
             <el-table-column label="名称" align="center" prop="chName" show-overflow-tooltip/>
             <el-table-column label="型号" align="center" prop="code" show-overflow-tooltip width="150"/>
@@ -1398,6 +1398,9 @@
       getSubRowKeys(row) {
         return row.subId
       },
+      getDeviceRowKeys(row) {
+        return row.id
+      },
       deptChange(selection){
         let self = this;
         this.deptNumLeft = selection.length;