From 0d22dac3090ad057a5470610a321c936cdf0d535 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期四, 10 四月 2025 16:47:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region

---
 src/views/sampling/sampling/index.vue |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index 1b4d333..a2a25db 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -105,7 +105,7 @@
       </div>
       <div style="width: 50%">
         <!-- v-if="this.rightTabShow" -->
-        <el-table v-if="tableList.length > 0" v-loading="loading" :data="tableList" @selection-change="handleChange"
+        <el-table :key="tableKey" :row-key="getRowKey" v-if="tableList.length > 0" v-loading="loading" :data="tableList" @selection-change="handleChange"
           :span-method="objectSpanMethod" ref="tab1" :row-class-name="tableRowClassName" border height="520px">
           <el-table-column type="selection" width="40" align="center" />
           <!--  :selectable="selectEnable" -->
@@ -298,6 +298,7 @@
         proName: null,
       },
       startTime: "",
+     tableKey : "",
       pickerOptions: {
         shortcuts: [
           {
@@ -662,6 +663,10 @@
       console.log(`鏄惁绂佺敤閫夋嫨: ${this.disableSelections}`);
     },
 
+    getRowKey(row) {
+      return row.id; // 蹇呴』鍞竴涓旂ǔ瀹�
+    },
+
     fetchData(tjNumber) {
       return new Promise((resolve, reject) => {
         this.loading = true;
@@ -669,6 +674,7 @@
           .then((response) => {
             if (response.data) {
               this.tableList = response.data;
+              this.tableKey = Date.now()
               this.$nextTick(() => {
                 if (this.$refs.tab1) {
                   this.$refs.tab1.doLayout(); // 淇敼涓烘纭殑 ref 鍚嶇О
@@ -676,6 +682,7 @@
                 }
               });
               resolve(this.tableList);
+              this.loading = false;
             } else {
               this.tableList = [];
               this.selectList = [];
@@ -1079,7 +1086,7 @@
 
 <style>
 #ta .el-table__header-wrapper .el-checkbox {
-  /* display: none; */
+  display: none;
 }
 
 .el-table .warning-row {

--
Gitblit v1.8.0