From ac3d8906519954275fe7ff6254a0012c2bf4d7a5 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Wed, 1 Apr 2026 16:44:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=8E=9F=E6=9D=90=E6=96=99?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=B8=83=E5=B1=80=EF=BC=8C=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E5=88=97=E7=BB=93=E6=9E=84=E5=88=87=E6=8D=A2=E5=90=8E=E9=94=99?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erf/components/expRawMaterialList.vue       | 17 +++++++++++++++++
 src/views/modules/erf/expApplyList.vue          |  9 +++++++++
 2 files changed, 26 insertions(+)

diff --git a/src/views/modules/erf/components/expRawMaterialList.vue b/src/views/modules/erf/components/expRawMaterialList.vue
index a339bd1..1b2c04f 100644
--- a/src/views/modules/erf/components/expRawMaterialList.vue
+++ b/src/views/modules/erf/components/expRawMaterialList.vue
@@ -55,6 +55,7 @@
     <!-- 数据表格 -->
     <el-table
       ref="rawMaterialTable"
+      :key="`raw-material-${applyNo || 'empty'}-${canEdit ? 'edit' : 'view'}`"
       :data="rawMaterialList"
       v-loading="tableLoading"
       border
@@ -463,6 +464,8 @@ export default {
         this.loadRawMaterialList()
         this.loadChangeLogList()
       } else {
+        this.rawMaterialList = []
+        this.selectedRows = []
         this.changeLogList = []
         this.changeLogDrawerVisible = false
       }
@@ -482,6 +485,8 @@ export default {
       } else {
         this.processOptions = []
       }
+      this.selectedRows = []
+      this.refreshRawMaterialTableLayout()
     }
   },
 
@@ -528,6 +533,7 @@ export default {
         this.tableLoading = false
         if (data && data.code === 0) {
           this.rawMaterialList = data.list || []
+          this.refreshRawMaterialTableLayout()
         } else {
           this.rawMaterialList = []
           this.$message.error(data.msg || '查询原材料清单失败')
@@ -538,6 +544,17 @@ export default {
       })
     },
 
+    /**
+     * 刷新原材料表格布局，避免列结构切换后错位
+     */
+    refreshRawMaterialTableLayout() {
+      this.$nextTick(() => {
+        if (this.$refs.rawMaterialTable && this.$refs.rawMaterialTable.doLayout) {
+          this.$refs.rawMaterialTable.doLayout()
+        }
+      })
+    },
+
     /**
      * 加载原材料修改记录
      */
diff --git a/src/views/modules/erf/expApplyList.vue b/src/views/modules/erf/expApplyList.vue
index af33e01..e39f6b9 100644
--- a/src/views/modules/erf/expApplyList.vue
+++ b/src/views/modules/erf/expApplyList.vue
@@ -1434,6 +1434,15 @@ export default {
           }
         })
       }
+
+      // 切换到原材料清单tab时刷新表格布局，避免表头与内容错位
+      if (tab.name === 'rawMaterial' && this.currentRow.applyNo) {
+        this.$nextTick(() => {
+          if (this.$refs.rawMaterialList && this.$refs.rawMaterialList.refreshRawMaterialTableLayout) {
+            this.$refs.rawMaterialList.refreshRawMaterialTableLayout()
+          }
+        })
+      }
     },
 
     /**