diff --git a/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java b/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java
index 57b16b49..7b990455 100644
--- a/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java
+++ b/klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java
@@ -10,6 +10,7 @@ import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -368,6 +369,79 @@ public class SqlServerApiClient {
         );
     }
 
+    public ExecuteSqlResponse queryProSegByHotCoilId(String hotCoilId) {
+        // 先通过 HOT_COILID 从 PLTCM_PDI_PLAN 表查询到所有的 COILID
+        ExecuteSqlResponse planResponse = executeSql(
+                "oracle",
+                "select COILID from JXPLTCM.PLTCM_PDI_PLAN where HOT_COILID = :hotCoilId",
+                singletonParam("hotCoilId", hotCoilId)
+        );
+
+        List<Map<String, Object>> rows = (List<Map<String, Object>>) planResponse.getResult();
+        if (rows == null || rows.isEmpty()) {
+            // 如果没有找到对应的计划记录，返回空结果
+            return new ExecuteSqlResponse();
+        }
+
+        // 收集所有有效的 COILID
+        List<String> coilIds = new ArrayList<>();
+        for (Map<String, Object> row : rows) {
+            String coilId = (String) row.get("COILID");
+            if (coilId != null && !coilId.trim().isEmpty()) {
+                coilIds.add(coilId);
+            }
+        }
+
+        if (coilIds.isEmpty()) {
+            return new ExecuteSqlResponse();
+        }
+
+        // 用所有的 COILID 去查询 PLTCM_PRO_SEG 表的 ENCOILID
+        // 使用 IN 查询一次性获取所有数据
+        Map<String, Object> params = new java.util.HashMap<>();
+        StringBuilder sql = new StringBuilder("select * from JXPLTCM.PLTCM_PRO_SEG where ENCOILID IN (");
+        for (int i = 0; i < coilIds.size(); i++) {
+            if (i > 0) {
+                sql.append(", ");
+            }
+            String paramName = "coilId" + i;
+            sql.append(":").append(paramName);
+            params.put(paramName, coilIds.get(i));
+        }
+        sql.append(") order by ENCOILID, SEGNO");
+
+        return executeSql("oracle", sql.toString(), params);
+    }
+
+    public ExecuteSqlResponse queryExcoilList(int page, int pageSize) {
+        int endRow = page * pageSize;
+        int startRow = endRow - pageSize;
+        Map<String, Object> params = new java.util.HashMap<>();
+        params.put("startRow", startRow);
+        params.put("endRow", endRow);
+        return executeSql(
+                "oracle",
+                "select * from (select t.*, ROWNUM rn from (select * from JXPLTCM.PLTCM_PDO_EXCOIL order by END_DATE desc) t where ROWNUM <= :endRow) where rn > :startRow",
+                params
+        );
+    }
+
+    public ExecuteSqlResponse queryExcoilCount() {
+        return executeSql(
+                "oracle",
+                "select count(*) as total from JXPLTCM.PLTCM_PDO_EXCOIL",
+                emptyParams()
+        );
+    }
+
+    public ExecuteSqlResponse queryPresetSetupByCoilId(String coilId) {
+        return executeSql(
+                "oracle",
+                "select * from JXPLTCM.PLTCM_PRESET_SETUP where COILID = :coilId",
+                singletonParam("coilId", coilId)
+        );
+    }
+
     public ExecuteSqlResponse queryProSegByExcoilId(String excoilId) {
         return executeSql(
                 "oracle",
diff --git a/klp-admin/src/main/java/com/klp/framework/service/SqlServerApiBusinessService.java b/klp-admin/src/main/java/com/klp/framework/service/SqlServerApiBusinessService.java
index ef66dff2..f5c9544d 100644
--- a/klp-admin/src/main/java/com/klp/framework/service/SqlServerApiBusinessService.java
+++ b/klp-admin/src/main/java/com/klp/framework/service/SqlServerApiBusinessService.java
@@ -89,6 +89,13 @@ public class SqlServerApiBusinessService {
         return SegSeriesView.fromExecuteSqlResponse(encoilId, client.queryProSegByEncoilId(encoilId));
     }
 
+    /**
+     * 钢卷实际 SEG 查询：按入场卷号查询。
+     */
+    public SegSeriesView getSegByHotCoilId(String hotCoilId) {
+        return SegSeriesView.fromExecuteSqlResponse(hotCoilId, client.queryProSegByHotCoilId(hotCoilId));
+    }
+
     /**
      * 钢卷实际 SEG 查询：按出口卷号查询。
      */
@@ -119,6 +126,32 @@ public class SqlServerApiBusinessService {
         return client.queryShapeByMatId(matId);
     }
 
+    /**
+     * 出口卷实绩列表（分页），来自 PLTCM_PDO_EXCOIL。
+     */
+    public ExcoilPageView getExcoilList(int page, int pageSize) {
+        return new ExcoilPageView(asRowList(client.queryExcoilList(page, pageSize)));
+    }
+
+    /**
+     * 出口卷实绩总数。
+     */
+    public long getExcoilCount() {
+        List<Map<String, Object>> rows = asRowList(client.queryExcoilCount());
+        if (rows.isEmpty()) return 0L;
+        Number n = asNumber(rows.get(0).get("total"));
+        return n == null ? 0L : n.longValue();
+    }
+
+    /**
+     * 工艺预设参数，按钢卷号查询（PLTCM_PRESET_SETUP）。
+     */
+    public PresetSetupView getPresetSetupByCoilId(String coilId) {
+        List<Map<String, Object>> rows = asRowList(client.queryPresetSetupByCoilId(coilId));
+        Map<String, Object> firstRow = rows.isEmpty() ? Collections.<String, Object>emptyMap() : rows.get(0);
+        return new PresetSetupView(coilId, firstRow);
+    }
+
     /**
      * 实时数据总入口：一次性返回厚度与板形两类数据。
      */
@@ -354,6 +387,36 @@ public class SqlServerApiBusinessService {
         }
     }
 
+    public static class ExcoilPageView {
+        private final List<Map<String, Object>> rows;
+
+        public ExcoilPageView(List<Map<String, Object>> rows) {
+            this.rows = rows;
+        }
+
+        public List<Map<String, Object>> getRows() {
+            return rows;
+        }
+    }
+
+    public static class PresetSetupView {
+        private final String coilId;
+        private final Map<String, Object> data;
+
+        public PresetSetupView(String coilId, Map<String, Object> data) {
+            this.coilId = coilId;
+            this.data = data;
+        }
+
+        public String getCoilId() {
+            return coilId;
+        }
+
+        public Map<String, Object> getData() {
+            return data;
+        }
+    }
+
     public static class RollListView {
         private final List<Map<String, Object>> rows;
 
diff --git a/klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java b/klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java
index 14454bbd..fd7e144c 100644
--- a/klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java
+++ b/klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java
@@ -54,6 +54,14 @@ public class SqlServerApiController {
         return R.ok(businessService.getPlanByCoilId(coilId));
     }
 
+    /**
+     * 计划详情：按热卷号查询。
+     */
+    @GetMapping("/plans-by-hotcoil/{hotCoilId}")
+    public R<SqlServerApiBusinessService.PlanDetailView> planDetailByHotCoilId(@PathVariable String hotCoilId) {
+        return R.ok(businessService.getPlanByHotCoilId(hotCoilId));
+    }
+
     /**
      * 钢卷实际 SEG，按入口卷号查询。
      */
@@ -62,6 +70,14 @@ public class SqlServerApiController {
         return R.ok(businessService.getSegSeriesViewByEncoilId(encoilId));
     }
 
+    /**
+     * 钢卷实际 SEG，按入场卷号查询。
+     */
+    @GetMapping("/seg-by-hotcoil/{hotCoilId}")
+    public R<SqlServerApiBusinessService.SegSeriesView> segByHotCoilId(@PathVariable String hotCoilId) {
+        return R.ok(businessService.getSegByHotCoilId(hotCoilId));
+    }
+
     /**
      * 钢卷实际 SEG，按出口卷号查询。
      */
@@ -139,6 +155,34 @@ public class SqlServerApiController {
         return R.ok(businessService.getRollHistoryList(page, pageSize, rollId, standId));
     }
 
+    /**
+     * 出口卷实绩列表（分页），来自 PLTCM_PDO_EXCOIL。
+     */
+    @GetMapping("/excoil")
+    public R<SqlServerApiBusinessService.ExcoilPageView> excoilList(
+            @RequestParam(defaultValue = "1") int page,
+            @RequestParam(defaultValue = "50") int pageSize) {
+        return R.ok(businessService.getExcoilList(page, pageSize));
+    }
+
+    /**
+     * 出口卷实绩总数。
+     */
+    @GetMapping("/excoil/count")
+    public R<Map<String, Long>> excoilCount() {
+        Map<String, Long> result = new HashMap<>();
+        result.put("total", businessService.getExcoilCount());
+        return R.ok(result);
+    }
+
+    /**
+     * 工艺预设参数，按计划钢卷号查询（PLTCM_PRESET_SETUP）。
+     */
+    @GetMapping("/preset-setup/{coilId}")
+    public R<SqlServerApiBusinessService.PresetSetupView> presetSetup(@PathVariable String coilId) {
+        return R.ok(businessService.getPresetSetupByCoilId(coilId));
+    }
+
     /**
      * 换辊历史总条数。
      */
diff --git a/klp-ui/package.json b/klp-ui/package.json
index f6a6a48c..2a2d5e7b 100644
--- a/klp-ui/package.json
+++ b/klp-ui/package.json
@@ -50,6 +50,7 @@
     "dayjs": "^1.11.18",
     "dom-to-image": "^2.6.0",
     "echarts": "5.4.0",
+    "echarts-gl": "^2.0.9",
     "element-ui": "2.15.12",
     "exceljs": "^4.4.0",
     "file-saver": "2.0.5",
diff --git a/klp-ui/src/api/l2/timing.js b/klp-ui/src/api/l2/timing.js
index af5cbdeb..43ebc625 100644
--- a/klp-ui/src/api/l2/timing.js
+++ b/klp-ui/src/api/l2/timing.js
@@ -33,6 +33,22 @@ export function getTimingSegByEncoilId(encoilId) {
   })
 }
 
+export function getTimingSegByHotcoilId(encoilId) {
+  return request({
+    url: '/sql-server-api/seg-by-hotcoil/' + encoilId,
+    method: 'get'
+  })
+}
+
+// 根据热卷好查询计划详情
+export function getTimingPlanDetailByHotcoilId(hotcoilId) {
+  return request({
+    url: '/sql-server-api/plans-by-hotcoil/' + hotcoilId,
+    method: 'get'
+  })
+}
+
+
 // 钢卷实际 SEG，按出口卷号查询
 export function getTimingSegByExcoilId(excoilId) {
   return request({
@@ -101,3 +117,28 @@ export function getRollHistoryCount(rollId, standId) {
     params: { rollId, standId }
   })
 }
+
+// 出口卷实绩列表（分页），PLTCM_PDO_EXCOIL
+export function getExcoilList(page = 1, pageSize = 50) {
+  return request({
+    url: '/sql-server-api/excoil',
+    method: 'get',
+    params: { page, pageSize }
+  })
+}
+
+// 出口卷实绩总数
+export function getExcoilCount() {
+  return request({
+    url: '/sql-server-api/excoil/count',
+    method: 'get'
+  })
+}
+
+// 工艺预设参数，按计划钢卷号查询，PLTCM_PRESET_SETUP
+export function getPresetSetupByCoilId(coilId) {
+  return request({
+    url: '/sql-server-api/preset-setup/' + coilId,
+    method: 'get'
+  })
+}
diff --git a/klp-ui/src/assets/styles/element-ui.scss b/klp-ui/src/assets/styles/element-ui.scss
index 9a16eafb..8e0d00d7 100644
--- a/klp-ui/src/assets/styles/element-ui.scss
+++ b/klp-ui/src/assets/styles/element-ui.scss
@@ -947,7 +947,8 @@ body {
 .el-dialog.is-fullscreen {
   .el-dialog__body {
     padding: $--spacing-lg;
-    max-height: calc(100vh - 100px);
+    height: calc(100vh - 100px);
+    max-height: 100vh;
     overflow-y: auto;
   }
 }
diff --git a/klp-ui/src/components/CoilSelector/data.js b/klp-ui/src/components/CoilSelector/data.js
index 3bcbc004..1234331d 100644
--- a/klp-ui/src/components/CoilSelector/data.js
+++ b/klp-ui/src/components/CoilSelector/data.js
@@ -1,5 +1,4 @@
-export const defaultColumns = [
-  {
+export const defaultColumns = [{
     label: '入场卷号',
     align: 'center',
     prop: 'enterCoilNo',
@@ -30,6 +29,12 @@ export const defaultColumns = [
     prop: 'specification',
     width: '100'
   },
+  {
+    label: '重量(t)',
+    align: 'center',
+    prop: 'netWeight',
+    width: '100'
+  },
   {
     label: '材质',
     align: 'center',
@@ -42,12 +47,6 @@ export const defaultColumns = [
     prop: 'manufacturer',
     width: '100'
   },
-  {
-    label: '重量(t)',
-    align: 'center',
-    prop: 'netWeight',
-    width: '100'
-  },
   {
     label: '库区',
     align: 'center',
@@ -62,10 +61,10 @@ export const defaultColumns = [
     width: '100',
     showOverflowTooltip: true
   },
-  {
-    label: '备注',
-    align: 'center',
-    prop: 'remark',
-    showOverflowTooltip: true
-  }
-]
\ No newline at end of file
+  // {
+  //   label: '备注',
+  //   align: 'center',
+  //   prop: 'remark',
+  //   showOverflowTooltip: true
+  // }
+]
diff --git a/klp-ui/src/components/CoilSelector/index.vue b/klp-ui/src/components/CoilSelector/index.vue
index c072d6b6..26701f9c 100644
--- a/klp-ui/src/components/CoilSelector/index.vue
+++ b/klp-ui/src/components/CoilSelector/index.vue
@@ -19,179 +19,190 @@
 
     <el-dialog title="选择钢卷" :visible.sync="dialogVisible" :width="dialogWidth" :close-on-click-modal="false"
       @close="handleClose" append-to-body :fullscreen="orderBy">
-      <!-- 搜索区域 -->
-      <el-form v-if="!rangeMode" inline :model="queryParams" class="search-form">
-        <el-form-item label="入场卷号">
-          <el-input v-model="queryParams.enterCoilNo" placeholder="请输入入场卷号" clearable size="small"
-            @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item label="当前卷号">
-          <el-input v-model="queryParams.currentCoilNo" placeholder="请输入当前卷号" clearable size="small"
-            @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item label="物料类型">
-          <el-select v-model="queryParams.itemType" placeholder="请选择物料类型" size="small" clearable>
-            <el-option label="成品" value="product" />
-            <el-option label="原料" value="raw_material" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="物料名称" v-if="queryParams.itemType">
-          <muti-select v-model="queryParams.itemName" :options="dict.type.coil_itemname" placeholder="请选择物料名称"
-            clearable />
-        </el-form-item>
-        <el-form-item label="规格" v-if="queryParams.itemType">
-          <memo-input storageKey="coilSpec" v-model="queryParams.itemSpecification" placeholder="请输入规格" clearable
-            size="small" @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item label="材质" v-if="queryParams.itemType">
-          <muti-select v-model="queryParams.itemMaterial" :options="dict.type.coil_material" placeholder="请选择材质"
-            clearable />
-        </el-form-item>
-        <el-form-item label="厂家" v-if="queryParams.itemType">
-          <muti-select v-model="queryParams.itemManufacturer" :options="dict.type.coil_manufacturer" placeholder="请选择厂家"
-            clearable />
-        </el-form-item>
-        <el-form-item label="表面处理" v-if="queryParams.itemType">
-          <el-input v-model="queryParams.itemSurfaceTreatmentDesc" placeholder="请输入表面处理" clearable size="small" />
-        </el-form-item>
-        <el-form-item label="切边" prop="trimmingRequirement" v-if="orderBy">
-          <el-select v-model="queryParams.trimmingRequirement" placeholder="请选择切边" clearable style="width: 100%">
-            <el-option label="净边" value="净边" />
-            <el-option label="毛边" value="毛边" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="包装" prop="packagingRequirement" v-if="orderBy">
-          <el-select v-model="queryParams.packagingRequirement" placeholder="请选择包装" clearable style="width: 100%">
-            <el-option label="裸包" value="裸包" />
-            <el-option label="普包" value="普包" />
-            <el-option label="简包" value="简包" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="品质">
-          <muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status"
-            placeholder="请选择品质" clearable />
-        </el-form-item>
-        <el-form-item label="实际库区" v-if="orderBy">
-          <actual-warehouse-select v-model="queryParams.actualWarehouseId" placeholder="请选择实际库区" canSelectLevel2
-            canSelectDisabled :clearInput="false" clearable />
-        </el-form-item>
+      <div style="height: 100%; overflow-y: scroll; overflow-x: hidden; display: flex; flex-direction: column; padding: 10px;">
+        <!-- 搜索区域 -->
+        <el-form v-if="!rangeMode" inline :model="queryParams" class="search-form">
+          <el-form-item label="入场卷号">
+            <el-input v-model="queryParams.enterCoilNo" placeholder="请输入入场卷号" clearable size="small"
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+          <el-form-item label="当前卷号">
+            <el-input v-model="queryParams.currentCoilNo" placeholder="请输入当前卷号" clearable size="small"
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+          <el-form-item label="物料类型">
+            <el-select v-model="queryParams.itemType" placeholder="请选择物料类型" size="small" clearable>
+              <el-option label="成品" value="product" />
+              <el-option label="原料" value="raw_material" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="物料名称" v-if="queryParams.itemType">
+            <muti-select v-model="queryParams.itemName" :options="dict.type.coil_itemname" placeholder="请选择物料名称"
+              clearable />
+          </el-form-item>
+          <el-form-item label="规格" v-if="queryParams.itemType">
+            <memo-input storageKey="coilSpec" v-model="queryParams.itemSpecification" placeholder="请输入规格" clearable
+              size="small" @keyup.enter.native="handleQuery" />
+          </el-form-item>
+          <el-form-item label="材质" v-if="queryParams.itemType">
+            <muti-select v-model="queryParams.itemMaterial" :options="dict.type.coil_material" placeholder="请选择材质"
+              clearable />
+          </el-form-item>
+          <el-form-item label="厂家" v-if="queryParams.itemType">
+            <muti-select v-model="queryParams.itemManufacturer" :options="dict.type.coil_manufacturer"
+              placeholder="请选择厂家" clearable />
+          </el-form-item>
+          <el-form-item label="表面处理" v-if="queryParams.itemType">
+            <el-input v-model="queryParams.itemSurfaceTreatmentDesc" placeholder="请输入表面处理" clearable size="small" />
+          </el-form-item>
+          <el-form-item label="切边" prop="trimmingRequirement" v-if="orderBy">
+            <el-select v-model="queryParams.trimmingRequirement" placeholder="请选择切边" clearable style="width: 100%">
+              <el-option label="净边" value="净边" />
+              <el-option label="毛边" value="毛边" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="包装" prop="packagingRequirement" v-if="orderBy">
+            <el-select v-model="queryParams.packagingRequirement" placeholder="请选择包装" clearable style="width: 100%">
+              <el-option label="裸包" value="裸包" />
+              <el-option label="普包" value="普包" />
+              <el-option label="简包" value="简包" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="品质">
+            <muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status"
+              placeholder="请选择品质" clearable />
+          </el-form-item>
+          <el-form-item label="实际库区" v-if="orderBy">
+            <actual-warehouse-select v-model="queryParams.actualWarehouseId" placeholder="请选择实际库区" canSelectLevel2
+              canSelectDisabled :clearInput="false" clearable />
+          </el-form-item>
 
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
-          <el-checkbox v-if="orderBy" style="margin-left: 10px;" v-model="showCoilMap" size="small">显示钢卷地图</el-checkbox>
-          <el-checkbox v-if="orderBy && orderId" style="margin-left: 10px;" v-model="showOrderInfo"
-            size="small">显示订单详情</el-checkbox>
-        </el-form-item>
-      </el-form>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+            <el-button v-if="multiple" type="primary" size="small" icon="el-icon-check"
+              @click="handleSelectAllCurrentPage">全选当前卷</el-button>
+            <el-checkbox v-if="orderBy" style="margin-left: 10px;" v-model="showCoilMap"
+              size="small">显示钢卷地图</el-checkbox>
+            <el-checkbox v-if="orderBy && orderId" style="margin-left: 10px;" v-model="showOrderInfo"
+              size="small">显示订单详情</el-checkbox>
+          </el-form-item>
+        </el-form>
 
-      <div v-if="multiple" class="coil-selector-drag-panel">
-        <DragResizePanel direction="vertical" :initialSize="450" :minSize="200">
-          <template slot="panelA">
-            <div style="height: 100%; overflow-y: scroll; overflow-x: hidden;">
-              <!-- 数据表格 -->
-              <el-table v-loading="loading" :data="coilList" @row-click="handleRowClick"
-                style="width: 100%" :row-class-name="getRowClassName">
-                <!-- 自定义列 -->
-                <el-table-column v-for="column in renderColumns" :label="column.label" :align="column.align"
-                  :prop="column.prop" :width="column.width" :show-overflow-tooltip="column.showOverflowTooltip" />
-                <el-table-column v-if="orderBy" label="表面处理" prop="surfaceTreatmentDesc"></el-table-column>
-                <el-table-column v-if="orderBy" label="品质" prop="qualityStatus"></el-table-column>
-                <el-table-column v-if="orderBy" label="切边" prop="trimmingRequirement"></el-table-column>
-                <el-table-column v-if="orderBy" label="包装" prop="packagingRequirement"></el-table-column>
-                <el-table-column v-if="orderBy" label="镀层质量" prop="zincLayer"></el-table-column>
-              </el-table>
-
-              <!-- 分页 -->
-              <div
-                style="display: flex; justify-content: flex-end; align-items: flex-end; gap: 10px; padding-top: 10px;">
-                <span>
-                  总净重：{{ coilTrimStatistics.total_net_weight || 0 }}t
-                </span>
-
-                <pagination v-if="!rangeMode" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-                  :limit.sync="queryParams.pageSize" @pagination="getList" />
-              </div>
-            </div>
-
-          </template>
-          <template slot="panelB">
-            <div v-if="selectedCoils.length > 0" class="panel-b-container">
-              <div class="selected-stats">
-                <div class="stats-content">
-                  <div class="stat-item">
-                    <span class="stat-label">总卷数：</span>
-                    <span class="stat-value">{{ totalCoils }}</span>
-                  </div>
-                  <div class="stat-item">
-                    <span class="stat-label">总净重：</span>
-                    <span class="stat-value">{{ totalNetWeight }}t</span>
-                  </div>
-                </div>
-              </div>
-
-              <div class="selected-table-wrapper">
-                <el-table :data="selectedCoils" height="100%">
+        <div v-if="multiple" class="coil-selector-drag-panel">
+          <DragResizePanel direction="vertical" :initialSize="450" :minSize="200">
+            <template slot="panelA">
+              <div style="height: 100%; overflow-y: scroll; overflow-x: hidden;">
+                <!-- 数据表格 -->
+                <el-table v-loading="loading" :data="coilList" @row-click="handleRowClick" style="width: 100%"
+                  :row-class-name="getRowClassName">
+                  <!-- 自定义列 -->
                   <el-table-column v-for="column in renderColumns" :label="column.label" :align="column.align"
                     :prop="column.prop" :width="column.width" :show-overflow-tooltip="column.showOverflowTooltip" />
-                  <el-table-column v-if="orderBy" label="表面处理" prop="surfaceTreatmentDesc"></el-table-column>
                   <el-table-column v-if="orderBy" label="品质" prop="qualityStatus"></el-table-column>
+                  <el-table-column v-if="orderBy" label="表面处理" prop="surfaceTreatmentDesc"></el-table-column>
+                  <el-table-column label="备注" prop="remark"></el-table-column>
                   <el-table-column v-if="orderBy" label="切边" prop="trimmingRequirement"></el-table-column>
                   <el-table-column v-if="orderBy" label="包装" prop="packagingRequirement"></el-table-column>
                   <el-table-column v-if="orderBy" label="镀层质量" prop="zincLayer"></el-table-column>
-
-                  <el-table-column label="操作" width="50">
-                    <template slot-scope="scope">
-                      <el-button size="mini" @click="handleRemove(scope.row)">删除</el-button>
-                    </template>
-                  </el-table-column>
                 </el-table>
+
+                <!-- 分页 -->
+                <div
+                  style="display: flex; justify-content: flex-end; align-items: flex-end; gap: 10px; padding-top: 10px;">
+                  <span>
+                    总净重：{{ coilTrimStatistics.total_net_weight || 0 }}t
+                  </span>
+
+                  <pagination v-if="!rangeMode" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+                    :limit.sync="queryParams.pageSize" @pagination="getList" />
+                </div>
               </div>
-            </div>
 
-            <div v-else class="empty-panel">
-              <el-descriptions title="提示" :column="1" border>
-                <el-descriptions-item label="说明">
-                  请从上方表格中选择钢卷
-                </el-descriptions-item>
-                <el-descriptions-item label="操作方式">
-                  点击上方表格行进行选择，再次点击可取消选择
-                </el-descriptions-item>
-                <el-descriptions-item label="已选数量">
-                  {{ totalCoils }} 卷
-                </el-descriptions-item>
-              </el-descriptions>
-            </div>
-          </template>
-        </DragResizePanel>
-      </div>
+            </template>
+            <template slot="panelB">
+              <div v-if="selectedCoils.length > 0" class="panel-b-container">
+                <div class="selected-stats">
+                  <div class="stats-content">
+                    <div class="stat-item">
+                      <span class="stat-label">总卷数：</span>
+                      <span class="stat-value">{{ totalCoils }}</span>
+                    </div>
+                    <div class="stat-item">
+                      <span class="stat-label">总净重：</span>
+                      <span class="stat-value">{{ totalNetWeight }}t</span>
+                    </div>
+                  </div>
+                  <el-button type="danger" size="small" icon="el-icon-delete"
+                    @click="handleClearAllSelected">全部清除</el-button>
+                </div>
 
-      <!-- 非多选模式的原始布局 -->
-      <div v-else>
-        <!-- 数据表格 -->
-        <el-table v-loading="loading" :data="coilList" @row-click="handleRowClick" height="400px" style="width: 100%"
-          :row-class-name="getRowClassName">
-          <!-- 自定义列 -->
-          <el-table-column v-for="column in renderColumns" :label="column.label" :align="column.align"
-            :prop="column.prop" :width="column.width" :show-overflow-tooltip="column.showOverflowTooltip" />
-          <el-table-column v-if="orderBy" label="表面处理" prop="surfaceTreatmentDesc"></el-table-column>
-          <el-table-column v-if="orderBy" label="品质" prop="qualityStatus"></el-table-column>
-          <el-table-column v-if="orderBy" label="切边" prop="trimmingRequirement"></el-table-column>
-          <el-table-column v-if="orderBy" label="包装" prop="packagingRequirement"></el-table-column>
-          <el-table-column v-if="orderBy" label="镀层质量" prop="zincLayer"></el-table-column>
-        </el-table>
+                <div class="selected-table-wrapper">
+                  <el-table :data="selectedCoils" height="100%">
+                    <el-table-column v-for="column in renderColumns" :label="column.label" :align="column.align"
+                      :prop="column.prop" :width="column.width" :show-overflow-tooltip="column.showOverflowTooltip" />
+                    <el-table-column v-if="orderBy" label="品质" prop="qualityStatus"></el-table-column>
+                    <el-table-column v-if="orderBy" label="表面处理" prop="surfaceTreatmentDesc"></el-table-column>
+                    <el-table-column label="备注" prop="remark"></el-table-column>
+                    <el-table-column v-if="orderBy" label="切边" prop="trimmingRequirement"></el-table-column>
+                    <el-table-column v-if="orderBy" label="包装" prop="packagingRequirement"></el-table-column>
+                    <el-table-column v-if="orderBy" label="镀层质量" prop="zincLayer"></el-table-column>
 
-        <!-- 分页 -->
-        <div style="display: flex; justify-content: flex-end; align-items: flex-end; gap: 10px;">
-          <span>
-            总净重：{{ coilTrimStatistics.total_net_weight || 0 }}t
-          </span>
+                    <el-table-column label="操作" width="50">
+                      <template slot-scope="scope">
+                        <el-button size="mini" @click="handleRemove(scope.row)">删除</el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </div>
+              </div>
 
-          <pagination v-if="!rangeMode" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize" @pagination="getList" />
+              <div v-else class="empty-panel">
+                <el-descriptions title="提示" :column="1" border>
+                  <el-descriptions-item label="说明">
+                    请从上方表格中选择钢卷
+                  </el-descriptions-item>
+                  <el-descriptions-item label="操作方式">
+                    点击上方表格行进行选择，再次点击可取消选择
+                  </el-descriptions-item>
+                  <el-descriptions-item label="已选数量">
+                    {{ totalCoils }} 卷
+                  </el-descriptions-item>
+                </el-descriptions>
+              </div>
+            </template>
+          </DragResizePanel>
+        </div>
+
+        <!-- 单选模式 -->
+        <div v-else>
+          <!-- 数据表格 -->
+          <el-table v-loading="loading" :data="coilList" @row-click="handleRowClick" height="400px" style="width: 100%"
+            :row-class-name="getRowClassName">
+            <!-- 自定义列 -->
+            <el-table-column v-for="column in renderColumns" :label="column.label" :align="column.align"
+              :prop="column.prop" :width="column.width" :show-overflow-tooltip="column.showOverflowTooltip" />
+            <el-table-column v-if="orderBy" label="品质" prop="qualityStatus"></el-table-column>
+            <el-table-column v-if="orderBy" label="表面处理" prop="surfaceTreatmentDesc"></el-table-column>
+            <el-table-column label="备注" prop="remark"></el-table-column>
+            <el-table-column v-if="orderBy" label="切边" prop="trimmingRequirement"></el-table-column>
+            <el-table-column v-if="orderBy" label="包装" prop="packagingRequirement"></el-table-column>
+            <el-table-column v-if="orderBy" label="镀层质量" prop="zincLayer"></el-table-column>
+          </el-table>
+
+          <!-- 分页 -->
+          <div style="display: flex; justify-content: flex-end; align-items: flex-end; gap: 10px;">
+            <span>
+              总净重：{{ coilTrimStatistics.total_net_weight || 0 }}t
+            </span>
+
+            <pagination v-if="!rangeMode" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+              :limit.sync="queryParams.pageSize" @pagination="getList" />
+          </div>
         </div>
       </div>
 
+
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="handleConfirm">确认选择</el-button>
         <el-button @click="handleClose">取消</el-button>
@@ -503,6 +514,42 @@ export default {
       this.selectedCoils = this.selectedCoils.filter(item => item.coilId !== row.coilId);
     },
 
+    // 全选当前页
+    handleSelectAllCurrentPage() {
+      if (!this.multiple) return;
+
+      const warehouseIds = ['1988150210872930306', '1988150380649967617', '1988150800092950529', '1988151027466170370'];
+      const disabledOList = ['O', 'C+', 'C', 'C-', 'D+', 'D', 'D-'];
+
+      // 遍历当前页的所有钢卷
+      this.coilList.forEach(row => {
+        // 检查是否已选中
+        if (this.selectedCoils.some(item => item.coilId === row.coilId)) {
+          return;
+        }
+
+        // 禁用O卷检查逻辑
+        if (this.disableO) {
+          // 如果没有判级且不在指定库区，不能选择
+          if (!row.qualityStatus && !warehouseIds.includes(row.warehouseId)) {
+            return;
+          }
+          // 如果是禁用等级，不能选择
+          if (disabledOList.includes(row.qualityStatus)) {
+            return;
+          }
+        }
+
+        // 添加到已选列表
+        this.selectedCoils.push(row);
+      });
+    },
+
+    // 全部清除已选
+    handleClearAllSelected() {
+      this.selectedCoils = [];
+    },
+
     handleConfirm() {
       this.$emit('confirm', this.selectedCoils);
       this.selectedCoils = [];
@@ -526,7 +573,7 @@ export default {
         };
         queryPayload.selectType = queryPayload.itemType;
         const response = await listMaterialCoil(queryPayload);
-        const { pageNum, pageSize, excludeBound, orderBy, ...noPager } = queryPayload;
+        const { pageNum, pageSize, orderBy, ...noPager } = queryPayload;
         getCoilStatisticsList(noPager).then((res) => {
           console.log('钢卷统计数据:', res);
           this.coilTrimStatistics = res.data || {};
@@ -665,6 +712,13 @@ export default {
   gap: 8px;
 }
 
+.coil-selector-drag-panel {
+  flex: 1;
+  min-height: 0;
+  overflow: hidden;
+  box-sizing: border-box;
+}
+
 // 未选择状态样式
 .no-selection {
   padding: 8px 12px;
@@ -727,15 +781,11 @@ export default {
 }
 
 ::v-deep .el-dialog__body {
-  padding: 20px;
+  padding: 0 !important;
   max-height: calc(100vh - 200px);
-  overflow-y: auto;
-}
-
-// 多选模式拖拽面板容器样式
-.coil-selector-drag-panel {
-  height: 70vh;
-  max-height: 700px;
+  min-height: 500px;
+  overflow-y: hidden !important;
+  box-sizing: border-box;
 }
 
 // panelA容器样式
@@ -768,12 +818,19 @@ export default {
   flex-direction: column;
   height: 100%;
   overflow: hidden;
+  min-height: 0;
+  max-height: 100%;
+  box-sizing: border-box;
 }
 
 // 已选表格容器样式
 .selected-table-wrapper {
   flex: 1;
-  overflow: hidden;
+  overflow-y: hidden;
+  overflow-x: hidden;
+  min-height: 0;
+  max-height: calc(100% - 30px);
+  box-sizing: border-box;
 }
 
 // 空面板样式
@@ -815,6 +872,10 @@ export default {
 
 // 已选钢卷统计信息样式
 .selected-stats {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
   .stats-content {
     display: flex;
     gap: 24px;
diff --git a/klp-ui/src/views/aps/planSheet/index.vue b/klp-ui/src/views/aps/planSheet/index.vue
index 439065e8..4acda21c 100644
--- a/klp-ui/src/views/aps/planSheet/index.vue
+++ b/klp-ui/src/views/aps/planSheet/index.vue
@@ -9,6 +9,7 @@
         <h3>{{ currentPlanSheetInfo.planSheetName || '排产单详情' }}</h3>
         <div>
           <el-button type="primary" plain @click="handleAdd">新增明细</el-button>
+          <el-button type="success" plain @click="handleBatchAdd">批量新增</el-button>
           <el-button type="info" plain @click="getList">刷新</el-button>
         </div>
       </div>
@@ -287,6 +288,75 @@
         <el-table-column label="备注" align="center" prop="remark" />
       </el-table>
     </el-dialog>
+
+    <!-- 批量新增对话框 -->
+    <el-dialog title="批量新增" :visible.sync="batchAddDialogVisible" width="80%" append-to-body>
+      <div class="batch-add-content">
+        <!-- 合同选择 -->
+        <div class="contract-section">
+          <div class="section-title">选择合同</div>
+          <el-form :model="batchQueryParams" ref="batchQueryForm" size="small" :inline="true" label-width="80px">
+            <el-form-item label="合同号" prop="contractCode">
+              <el-input v-model="batchQueryParams.contractCode" placeholder="请输入合同号" style="width: 180px" />
+            </el-form-item>
+            <el-form-item label="客户">
+              <el-input v-model="batchQueryParams.customerName" placeholder="请输入客户名称" style="width: 180px" />
+            </el-form-item>
+            <el-form-item label="业务员">
+              <el-input v-model="batchQueryParams.salesman" placeholder="请输入业务员" style="width: 120px" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" @click="getBatchOrderList">搜索</el-button>
+              <el-button icon="el-icon-refresh" @click="resetBatchQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+          <el-table v-loading="batchOrderLoading" :data="batchOrderList" style="width: 100%" border @row-click="selectBatchContract"
+            highlight-current-row>
+            <el-table-column prop="contractCode" label="合同号" />
+            <el-table-column prop="signTime" label="签订时间" width="150" />
+            <el-table-column prop="signLocation" label="签订地点" />
+            <el-table-column prop="companyName" label="客户公司" />
+            <el-table-column prop="salesman" label="业务员" width="100" />
+            <el-table-column prop="deliveryDate" label="交货日期" width="150" />
+            <el-table-column label="操作" width="80" fixed="right">
+              <template slot-scope="scope">
+                <el-button type="text" size="small" @click.stop="selectBatchContract(scope.row)">选择</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="pagination-container">
+            <el-pagination background layout="prev, pager, next, jumper" :total="batchOrderTotal"
+              :page-size="batchQueryParams.pageSize" :current-page.sync="batchQueryParams.pageNum"
+              @current-change="getBatchOrderList" />
+          </div>
+        </div>
+
+        <!-- 明细选择 -->
+        <div class="item-section" v-if="selectedContract">
+          <div class="section-title">选择明细（多选）</div>
+          <el-table v-loading="batchItemLoading" :data="batchItemList" style="width: 100%" border
+            @selection-change="handleBatchItemSelectionChange">
+            <el-table-column type="selection" width="55" />
+            <el-table-column label="产品类型" align="center" prop="productType" />
+            <el-table-column label="成品宽度" align="center" prop="width" />
+            <el-table-column label="成品厚度" align="center" prop="thickness" />
+            <el-table-column label="成品规格" align="center" prop="finishedProductSpec" />
+            <el-table-column label="材质" align="center" prop="material" />
+            <el-table-column label="重量" align="center" prop="weight" />
+            <el-table-column label="卷数" align="center" prop="productNum" />
+            <el-table-column label="表面处理" align="center" prop="surfaceTreatment" />
+            <el-table-column label="包装要求" align="center" prop="packagingReq" />
+            <el-table-column label="切边要求" align="center" prop="edgeCuttingReq" />
+            <el-table-column label="用途" align="center" prop="purpose" />
+            <el-table-column label="备注" align="center" prop="remark" />
+          </el-table>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="batchAddDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="confirmBatchAdd" :disabled="selectedBatchItems.length === 0">确认新增</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -351,7 +421,31 @@ export default {
       // 订单明细加载状态
       orderItemLoading: false,
       // 当前编辑的行
-      currentEditingRow: null
+      currentEditingRow: null,
+      // 批量新增对话框
+      batchAddDialogVisible: false,
+      // 批量查询参数
+      batchQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        contractCode: undefined,
+        customerName: undefined,
+        salesman: undefined
+      },
+      // 批量订单列表
+      batchOrderList: [],
+      // 批量订单总数
+      batchOrderTotal: 0,
+      // 批量订单加载状态
+      batchOrderLoading: false,
+      // 批量明细列表
+      batchItemList: [],
+      // 批量明细加载状态
+      batchItemLoading: false,
+      // 选中的合同
+      selectedContract: null,
+      // 选中的明细
+      selectedBatchItems: []
     };
   },
   created() {
@@ -582,6 +676,98 @@ export default {
     // 处理订单行点击
     handleOrderSelect(row) {
       this.selectOrder(row);
+    },
+    // 打开批量新增对话框
+    handleBatchAdd() {
+      this.batchAddDialogVisible = true;
+      this.selectedContract = null;
+      this.selectedBatchItems = [];
+      this.getBatchOrderList();
+    },
+    // 获取批量订单列表
+    getBatchOrderList() {
+      this.batchOrderLoading = true;
+      listOrder(this.batchQueryParams).then(response => {
+        this.batchOrderList = response.rows;
+        this.batchOrderTotal = response.total;
+        this.batchOrderLoading = false;
+      });
+    },
+    // 重置批量查询参数
+    resetBatchQuery() {
+      this.batchQueryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        contractCode: undefined,
+        customerName: undefined,
+        salesman: undefined
+      };
+      this.getBatchOrderList();
+    },
+    // 选择批量合同
+    selectBatchContract(row) {
+      this.selectedContract = row;
+      this.selectedBatchItems = [];
+      this.batchItemLoading = true;
+      listOrderItem({ orderId: row.orderId }).then(res => {
+        this.batchItemList = res.rows;
+        this.batchItemLoading = false;
+      });
+    },
+    // 处理批量明细选择变更
+    handleBatchItemSelectionChange(selection) {
+      this.selectedBatchItems = selection;
+    },
+    // 确认批量新增
+    confirmBatchAdd() {
+      if (this.selectedBatchItems.length === 0) {
+        this.$message.warning('请至少选择一条明细');
+        return;
+      }
+
+      this.$confirm(`确认新增 ${this.selectedBatchItems.length} 条明细？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const currentMaxSeqNo = this.planDetailList.length > 0
+          ? Math.max(...this.planDetailList.map(item => parseInt(item.bizSeqNo) || 0))
+          : 0;
+
+        const addPromises = this.selectedBatchItems.map((item, index) => {
+          const newRow = {
+            planSheetId: this.currentPlanSheetId,
+            bizSeqNo: currentMaxSeqNo + index + 1,
+            orderCode: this.selectedContract.orderCode,
+            contractCode: this.selectedContract.contractCode,
+            customerName: this.selectedContract.companyName,
+            salesman: this.selectedContract.salesman,
+            orderId: this.selectedContract.orderId,
+            productName: item.productType,
+            productMaterial: item.material,
+            productWidth: item.width,
+            rollingThick: item.thickness,
+            markCoatThick: item.thickness,
+            tonSteelLengthRange: 0,
+            planQty: item.productNum,
+            planWeight: item.weight,
+            surfaceTreatment: item.surfaceTreatment,
+            productPackaging: item.packagingReq,
+            widthReq: item.edgeCuttingReq,
+            productEdgeReq: item.widthTolerance,
+            usageReq: item.purpose
+          };
+          return addPlanDetail(newRow);
+        });
+
+        Promise.all(addPromises).then(() => {
+          this.$message.success('批量新增成功');
+          this.batchAddDialogVisible = false;
+          this.getList();
+        }).catch(error => {
+          this.$message.error('批量新增失败');
+        });
+      });
     }
   }
 };
@@ -654,4 +840,25 @@ export default {
 /* ::v-deep .el-input__inner {
   padding: 0 1px;
 } */
+
+.batch-add-content {
+  padding: 10px 0;
+}
+
+.contract-section {
+  margin-bottom: 30px;
+  padding-bottom: 20px;
+  border-bottom: 1px solid #eee;
+}
+
+.item-section {
+  margin-top: 20px;
+}
+
+.section-title {
+  font-size: 14px;
+  font-weight: 600;
+  margin-bottom: 15px;
+  color: #303133;
+}
 </style>
diff --git a/klp-ui/src/views/crm/components/OrderObjection.vue b/klp-ui/src/views/crm/components/OrderObjection.vue
index 88d53e40..869153a8 100644
--- a/klp-ui/src/views/crm/components/OrderObjection.vue
+++ b/klp-ui/src/views/crm/components/OrderObjection.vue
@@ -42,6 +42,16 @@
           <el-tag v-else-if="scope.row.objectionStatus === 2" type="info">已关闭</el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="钢卷信息" align="center" prop="coilList" width="200" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <div v-if="scope.row.coilList && scope.row.coilList.length > 0">
+            <div v-for="(coil, index) in scope.row.coilList" :key="coil.coilId || index" style="margin-bottom: 4px;">
+              <CurrentCoilNo @click.native="handleClickCoil(coil)" :currentCoilNo="coil.currentCoilNo || coil.coilNo || ''" />
+            </div>
+          </div>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
       <el-table-column label="处理结果" align="center" prop="handleContent" show-overflow-tooltip>
         <template slot-scope="scope">
           <div class="cell-html" v-html="scope.row.handleContent"></div>
@@ -53,11 +63,6 @@
           <span>{{ parseTime(scope.row.handleTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="结案时间" align="center" prop="closeTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.closeTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column> -->
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -66,12 +71,6 @@
             v-if="scope.row.objectionStatus == 0"></el-button>
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
             v-if="scope.row.objectionStatus == 1"></el-button>
-          <!-- <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-check"
-            @click="handleFinish(scope.row)"
-          >结案</el-button> -->
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"></el-button>
         </template>
       </el-table-column>
@@ -113,28 +112,28 @@
             placeholder="请输入客户诉求"
           ></el-input>
         </el-form-item>
-        <!-- <el-form-item label="处理内容">
-          <editor v-model="form.handleContent" :min-height="192"/>
+        <el-form-item label="关联钢卷">
+          <div style="width: 100%;">
+            <CoilSelector
+              :multiple="true"
+              :rangeMode="true"
+              :rangeData="shippedCoils"
+              :orderBy="true"
+              @confirm="(coils) => handleCoilConfirm('form', coils)"
+              placeholder="选择钢卷">
+              <el-button type="primary" size="small">
+                <i class="el-icon-search"></i> 选择钢卷
+              </el-button>
+            </CoilSelector>
+            <div v-if="formCoilList.length > 0" style="margin-top: 10px; display: flex; flex-wrap: wrap; gap: 8px;">
+              <div v-for="(coil, index) in formCoilList" :key="coil.coilId || index" style="display: flex; align-items: center; gap: 4px;">
+                <CurrentCoilNo :currentCoilNo="coil.currentCoilNo || coil.coilNo || ''" />
+                <el-button type="text" icon="el-icon-close" size="mini" @click="removeCoil('form', index)"></el-button>
+              </div>
+            </div>
+            <span v-else style="color: #909399; font-size: 12px;">暂未选择钢卷</span>
+          </div>
         </el-form-item>
-        <el-form-item label="处理人" prop="handleUser">
-          <el-input v-model="form.handleUser" placeholder="请输入处理人" />
-        </el-form-item>
-        <el-form-item label="处理时间" prop="handleTime">
-          <el-date-picker clearable
-            v-model="form.handleTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择处理时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="结案时间" prop="closeTime">
-          <el-date-picker clearable
-            v-model="form.closeTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择结案时间">
-          </el-date-picker>
-        </el-form-item> -->
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
@@ -150,17 +149,6 @@
         <el-form-item label="处理内容">
           <editor v-model="checkForm.handleContent" :min-height="192" />
         </el-form-item>
-        <!-- <el-form-item label="处理人" prop="handleUser">
-          <el-input v-model="form.handleUser" placeholder="请输入处理人" />
-        </el-form-item>
-        <el-form-item label="处理时间" prop="handleTime">
-          <el-date-picker clearable
-            v-model="form.handleTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择处理时间">
-          </el-date-picker>
-        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitCheckForm">确 定</el-button>
@@ -180,6 +168,14 @@
         <el-descriptions-item label="处理内容" :span="2">
           <div v-html="viewForm.handleContent"></div>
         </el-descriptions-item>
+        <el-descriptions-item label="关联钢卷" :span="2">
+          <div v-if="viewForm.coilList && viewForm.coilList.length > 0" style="display: flex; flex-wrap: wrap; gap: 8px;">
+            <div v-for="(coil, index) in viewForm.coilList" :key="coil.coilId || index">
+              <CurrentCoilNo @click.native="handleClickCoil(coil)" :currentCoilNo="coil.currentCoilNo || coil.coilNo || ''" />
+            </div>
+          </div>
+          <span v-else>-</span>
+        </el-descriptions-item>
       </el-descriptions>
       <div slot="footer" class="dialog-footer">
         <el-button @click="viewOpen = false">关 闭</el-button>
@@ -190,9 +186,16 @@
 
 <script>
 import { listSalesObjection, getSalesObjection, delSalesObjection, addSalesObjection, updateSalesObjection } from "@/api/crm/salesObjection";
+import { listOrderPackaging } from "@/api/crm/order";
+import CoilSelector from "@/components/CoilSelector/index.vue";
+import CurrentCoilNo from "@/components/KLPService/Renderer/CurrentCoilNo.vue";
 
 export default {
   name: "SalesObjection",
+  components: {
+    CoilSelector,
+    CurrentCoilNo
+  },
   props: {
     order: {
       type: Object,
@@ -273,6 +276,11 @@ export default {
       checkOpen: false,
       viewForm: {},
       viewOpen: false,
+      // 钢卷选择相关
+      coilSelectorType: 'form', // form 或 check
+      formCoilList: [], // 表单中的钢卷列表
+      checkCoilList: [], // 处理中的钢卷列表
+      shippedCoils: [], // 订单已发货的钢卷（可选范围）
     };
   },
   methods: {
@@ -290,9 +298,11 @@ export default {
       this.open = false;
       this.reset();
     },
-    handleView(row) {
-      this.viewForm = row;
-      this.viewOpen = true;
+    // 点击钢卷
+    handleClickCoil(coil) {
+       this.$router.push({
+        path: '/wms/coil/' + coil.coilId,
+      });
     },
     // 表单重置
     reset() {
@@ -335,70 +345,6 @@ export default {
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-    handleDo(row) {
-      console.log(row, '处理')
-      this.checkForm = row;
-      this.checkOpen = true;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加销售异议管理";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const objectionId = row.objectionId || this.ids
-      getSalesObjection(objectionId).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改销售异议管理";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          if (this.form.objectionId != null) {
-            updateSalesObjection(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addSalesObjection(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
-      });
-    },
-    /** 提交处理按钮 */
-    submitCheckForm() {
-      this.buttonLoading = true;
-      updateSalesObjection({
-        ...this.checkForm,
-        handleUser: this.currentUserName,
-        handleTime: this.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
-        objectionStatus: 1,
-      }).then(response => {
-        this.$modal.msgSuccess("处理成功");
-        this.checkOpen = false;
-        this.getList();
-      }).finally(() => {
-        this.buttonLoading = false;
-      });
-    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const objectionIds = row.objectionId || this.ids;
@@ -419,6 +365,137 @@ export default {
       this.download('crm/salesObjection/export', {
         ...this.queryParams
       }, `salesObjection_${new Date().getTime()}.xlsx`)
+    },
+
+    // ==================== 钢卷相关方法 ====================
+    // 获取订单已发货的钢卷
+    getShippedCoils() {
+      if (this.orderId) {
+        listOrderPackaging(this.orderId).then(response => {
+          this.shippedCoils = response.data || [];
+        }).catch(() => {
+          this.shippedCoils = [];
+        });
+      } else {
+        this.shippedCoils = [];
+      }
+    },
+
+    // 钢卷选择确认
+    handleCoilConfirm(type, selectedCoils) {
+      if (type === 'form') {
+        this.formCoilList = [...selectedCoils];
+      } else if (type === 'check') {
+        this.checkCoilList = [...selectedCoils];
+      }
+    },
+
+    // 移除选中的钢卷
+    removeCoil(type, index) {
+      if (type === 'form') {
+        this.formCoilList.splice(index, 1);
+      } else if (type === 'check') {
+        this.checkCoilList.splice(index, 1);
+      }
+    },
+
+    // 将钢卷数组转换为CSV字符串
+    coilListToCsv(coilList) {
+      if (!coilList || coilList.length === 0) {
+        return '';
+      }
+      return coilList.map(coil => coil.coilId).join(',');
+    },
+
+    // 从coilIds CSV和coilList中恢复钢卷数据
+    // 重写handleAdd方法
+    handleAdd() {
+      this.reset();
+      this.formCoilList = []; // 清空钢卷列表
+      this.getShippedCoils(); // 获取可选择的钢卷
+      this.open = true;
+      this.title = "添加销售异议管理";
+    },
+
+    // 重写handleUpdate方法
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      this.getShippedCoils(); // 获取可选择的钢卷
+      const objectionId = row.objectionId || this.ids;
+      getSalesObjection(objectionId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        // 恢复钢卷列表
+        this.formCoilList = response.data.coilList || [];
+        this.open = true;
+        this.title = "修改销售异议管理";
+      });
+    },
+
+    // 重写handleDo方法
+    handleDo(row) {
+      console.log(row, '处理');
+      this.checkForm = row;
+      this.checkCoilList = row.coilList || []; // 恢复钢卷列表
+      this.getShippedCoils(); // 获取可选择的钢卷
+      this.checkOpen = true;
+    },
+
+    // 重写handleView方法
+    handleView(row) {
+      this.viewForm = row;
+      this.viewOpen = true;
+    },
+
+    // 重写submitForm方法，添加coilIds
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          // 添加coilIds
+          const formData = {
+            ...this.form,
+            coilIds: this.coilListToCsv(this.formCoilList)
+          };
+          
+          if (this.form.objectionId != null) {
+            updateSalesObjection(formData).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addSalesObjection(formData).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+
+    // 重写submitCheckForm方法，添加coilIds
+    submitCheckForm() {
+      this.buttonLoading = true;
+      updateSalesObjection({
+        ...this.checkForm,
+        handleUser: this.currentUserName,
+        handleTime: this.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
+        objectionStatus: 1,
+        coilIds: this.coilListToCsv(this.checkCoilList)
+      }).then(response => {
+        this.$modal.msgSuccess("处理成功");
+        this.checkOpen = false;
+        this.getList();
+      }).finally(() => {
+        this.buttonLoading = false;
+      });
     }
   }
 };
diff --git a/klp-ui/src/views/crm/objection/index.vue b/klp-ui/src/views/crm/objection/index.vue
index 329d85b1..0cb0f4fe 100644
--- a/klp-ui/src/views/crm/objection/index.vue
+++ b/klp-ui/src/views/crm/objection/index.vue
@@ -42,6 +42,16 @@
           <el-tag v-else-if="scope.row.objectionStatus === 2" type="info">已关闭</el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="钢卷信息" align="center" prop="coilList" width="200" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <div v-if="scope.row.coilList && scope.row.coilList.length > 0">
+            <div v-for="(coil, index) in scope.row.coilList" :key="coil.coilId || index" style="margin-bottom: 4px;">
+              <CurrentCoilNo @click.native="handleClickCoil(coil)" :currentCoilNo="coil.currentCoilNo || coil.coilNo || ''" />
+            </div>
+          </div>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="处理内容" align="center" prop="handleContent" /> -->
       <el-table-column label="处理人" align="center" prop="handleUser" />
       <el-table-column label="处理时间" align="center" prop="handleTime" width="180">
@@ -110,7 +120,29 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="订单编号">
-          <order-select v-model="form.orderId" placeholder="请选择订单" />
+          <order-select v-model="form.orderId" placeholder="请选择订单" @change="getShippedCoils" />
+        </el-form-item>
+        <el-form-item label="关联钢卷">
+          <div style="width: 100%;">
+            <CoilSelector
+              :multiple="true"
+              :rangeMode="true"
+              :rangeData="shippedCoils"
+              :orderBy="true"
+              @confirm="(coils) => handleCoilConfirm('form', coils)"
+              placeholder="选择钢卷">
+              <el-button type="primary" size="small">
+                <i class="el-icon-search"></i> 选择钢卷
+              </el-button>
+            </CoilSelector>
+            <div v-if="formCoilList.length > 0" style="margin-top: 10px; display: flex; flex-wrap: wrap; gap: 8px;">
+              <div v-for="(coil, index) in formCoilList" :key="coil.coilId || index" style="display: flex; align-items: center; gap: 4px;">
+                <CurrentCoilNo :currentCoilNo="coil.currentCoilNo || coil.coilNo || ''" />
+                <el-button type="text" icon="el-icon-close" size="mini" @click="removeCoil('form', index)"></el-button>
+              </div>
+            </div>
+            <span v-else style="color: #909399; font-size: 12px;">暂未选择钢卷</span>
+          </div>
         </el-form-item>
         <!-- <el-form-item label="处理内容">
           <editor v-model="form.handleContent" :min-height="192"/>
@@ -163,6 +195,14 @@
         <el-descriptions-item label="反馈日期">{{ parseTime(viewForm.returnDate, '{y}-{m}-{d}') }}</el-descriptions-item>
         <el-descriptions-item label="投诉情况" :span="2">{{ viewForm.complaintContent }}</el-descriptions-item>
         <el-descriptions-item label="客户诉求" :span="2">{{ viewForm.customerDemand }}</el-descriptions-item>
+        <el-descriptions-item label="关联钢卷" :span="2">
+          <div v-if="viewForm.coilList && viewForm.coilList.length > 0" style="display: flex; flex-wrap: wrap; gap: 8px;">
+            <div v-for="(coil, index) in viewForm.coilList" :key="coil.coilId || index">
+              <CurrentCoilNo @click.native="handleClickCoil(coil)" :currentCoilNo="coil.currentCoilNo || coil.coilNo || ''" />
+            </div>
+          </div>
+          <span v-else>-</span>
+        </el-descriptions-item>
         <el-descriptions-item label="处理人">{{ viewForm.handleUser }}</el-descriptions-item>
         <el-descriptions-item label="处理时间">{{ parseTime(viewForm.handleTime, '{y}-{m}-{d}') }}</el-descriptions-item>
         <el-descriptions-item label="处理内容" :span="2">
@@ -178,14 +218,19 @@
 
 <script>
 import { listSalesObjection, getSalesObjection, delSalesObjection, addSalesObjection, updateSalesObjection } from "@/api/crm/salesObjection";
+import { listOrderPackaging } from "@/api/crm/order";
 import OrderSelect from "@/components/KLPService/OrderSelect";
 import CustomerSelect from "@/components/KLPService/CustomerSelect";
+import CoilSelector from "@/components/CoilSelector/index.vue";
+import CurrentCoilNo from "@/components/KLPService/Renderer/CurrentCoilNo.vue";
 
 export default {
   name: "SalesObjection",
   components: {
     OrderSelect,
     CustomerSelect,
+    CoilSelector,
+    CurrentCoilNo
   },
   computed: {
     currentUserName() {
@@ -245,6 +290,11 @@ export default {
       checkOpen: false,
       viewForm: {},
       viewOpen: false,
+      // 钢卷选择相关
+      coilSelectorType: 'form', // form 或 check
+      formCoilList: [], // 表单中的钢卷列表
+      checkCoilList: [], // 处理中的钢卷列表
+      shippedCoils: [], // 订单已发货的钢卷（可选范围）
     };
   },
   methods: {
@@ -271,7 +321,7 @@ export default {
       this.form = {
         objectionId: undefined,
         objectionCode: undefined,
-        orderId: this.orderId,
+        orderId: undefined,
         productCategory: undefined,
         returnDate: undefined,
         complaintContent: undefined,
@@ -310,11 +360,13 @@ export default {
     handleDo(row) {
       console.log(row, '处理')
       this.checkForm = row;
+      this.checkCoilList = row.coilList || []; // 恢复钢卷列表
       this.checkOpen = true;
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.formCoilList = []; // 清空钢卷列表
       this.open = true;
       this.title = "添加销售异议管理";
     },
@@ -326,6 +378,12 @@ export default {
       getSalesObjection(objectionId).then(response => {
         this.loading = false;
         this.form = response.data;
+        // 恢复钢卷列表
+        this.formCoilList = response.data.coilList || [];
+        // 获取可选择的钢卷
+        if (this.form.orderId) {
+          this.getShippedCoils();
+        }
         this.open = true;
         this.title = "修改销售异议管理";
       });
@@ -335,8 +393,14 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
+          // 添加coilIds
+          const formData = {
+            ...this.form,
+            coilIds: this.coilListToCsv(this.formCoilList)
+          };
+          
           if (this.form.objectionId != null) {
-            updateSalesObjection(this.form).then(response => {
+            updateSalesObjection(formData).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -344,7 +408,7 @@ export default {
               this.buttonLoading = false;
             });
           } else {
-            addSalesObjection(this.form).then(response => {
+            addSalesObjection(formData).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -363,6 +427,7 @@ export default {
         handleUser: this.currentUserName,
         handleTime: this.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
         objectionStatus: 1,
+        coilIds: this.coilListToCsv(this.checkCoilList)
       }).then(response => {
         this.$modal.msgSuccess("处理成功");
         this.checkOpen = false;
@@ -391,6 +456,53 @@ export default {
       this.download('crm/salesObjection/export', {
         ...this.queryParams
       }, `salesObjection_${new Date().getTime()}.xlsx`)
+    },
+
+    // ==================== 钢卷相关方法 ====================
+    // 点击钢卷
+    handleClickCoil(coil) {
+       this.$router.push({
+        path: '/wms/coil/' + coil.coilId,
+      });
+    },
+    
+    // 获取订单已发货的钢卷
+    getShippedCoils() {
+      if (this.form.orderId) {
+        listOrderPackaging(this.form.orderId).then(response => {
+          this.shippedCoils = response.data || [];
+        }).catch(() => {
+          this.shippedCoils = [];
+        });
+      } else {
+        this.shippedCoils = [];
+      }
+    },
+
+    // 钢卷选择确认
+    handleCoilConfirm(type, selectedCoils) {
+      if (type === 'form') {
+        this.formCoilList = [...selectedCoils];
+      } else if (type === 'check') {
+        this.checkCoilList = [...selectedCoils];
+      }
+    },
+
+    // 移除选中的钢卷
+    removeCoil(type, index) {
+      if (type === 'form') {
+        this.formCoilList.splice(index, 1);
+      } else if (type === 'check') {
+        this.checkCoilList.splice(index, 1);
+      }
+    },
+
+    // 将钢卷数组转换为CSV字符串
+    coilListToCsv(coilList) {
+      if (!coilList || coilList.length === 0) {
+        return '';
+      }
+      return coilList.map(coil => coil.coilId).join(',');
     }
   }
 };
diff --git a/klp-ui/src/views/micro/pages/acid/components/ActualPerformance.vue b/klp-ui/src/views/micro/pages/acid/components/ActualPerformance.vue
new file mode 100644
index 00000000..eef9814f
--- /dev/null
+++ b/klp-ui/src/views/micro/pages/acid/components/ActualPerformance.vue
@@ -0,0 +1,960 @@
+<template>
+  <div class="actual-container">
+    <!-- 顶部实绩列表 (PLTCM_PDO_EXCOIL) -->
+    <div class="top-section">
+      <el-table
+        ref="excoilTable"
+        :data="excoilRows"
+        size="mini"
+        highlight-current-row
+        border
+        :height="topTableHeight"
+        style="width:100%"
+        @row-click="handleRowClick"
+      >
+        <el-table-column label="子卷号" min-width="110" show-overflow-tooltip>
+          <template slot-scope="{ row }">{{ row.EXCOILID || row.excoilid }}</template>
+        </el-table-column>
+        <el-table-column label="热卷号" min-width="100" show-overflow-tooltip>
+          <template slot-scope="{ row }">{{ row.HOT_COILID || row.hot_coilid || '—' }}</template>
+        </el-table-column>
+        <el-table-column label="班" width="40" align="center">
+          <template slot-scope="{ row }">{{ row.SHIFT || row.shift || '—' }}</template>
+        </el-table-column>
+        <el-table-column label="组" width="40" align="center">
+          <template slot-scope="{ row }">{{ row.CREW || row.crew || '—' }}</template>
+        </el-table-column>
+        <el-table-column label="钢种" min-width="80" show-overflow-tooltip>
+          <template slot-scope="{ row }">{{ row.ORDER_QUALITY || row.order_quality || row.GRADE || row.grade || '—' }}</template>
+        </el-table-column>
+        <el-table-column label="来料厚度" width="68" align="right">
+          <template slot-scope="{ row }">{{ row.ENTRY_THICK || row.entry_thick || '—' }}</template>
+        </el-table-column>
+        <el-table-column label="出口厚度" width="68" align="right">
+          <template slot-scope="{ row }">{{ row.EXIT_THICK || row.exit_thick || '—' }}</template>
+        </el-table-column>
+        <el-table-column label="偏差上限" width="60" align="right">
+          <template slot-scope="{ row }">{{ row.EXIT_POS_DEV || row.exit_pos_dev || '0' }}</template>
+        </el-table-column>
+        <el-table-column label="偏差下限" width="60" align="right">
+          <template slot-scope="{ row }">{{ row.EXIT_NEG_DEV || row.exit_neg_dev || '0' }}</template>
+        </el-table-column>
+        <el-table-column label="来料宽度" width="60" align="right">
+          <template slot-scope="{ row }">{{ row.ENTRY_WIDTH || row.entry_width || '—' }}</template>
+        </el-table-column>
+        <el-table-column label="出口宽度" width="60" align="right">
+          <template slot-scope="{ row }">{{ row.EXIT_WIDTH || row.exit_width || '—' }}</template>
+        </el-table-column>
+        <el-table-column label="来料重量" width="60" align="right">
+          <template slot-scope="{ row }">{{ row.USED_ENTRY_WEIGHT || row.used_entry_weight || row.ENTRY_WEIGHT || row.entry_weight || '—' }}</template>
+        </el-table-column>
+        <el-table-column label="称重重量" width="60" align="right">
+          <template slot-scope="{ row }">{{ row.MEAS_EXIT_WEIGHT || row.meas_exit_weight || '—' }}</template>
+        </el-table-column>
+        <el-table-column label="包装要求" width="60">
+          <template slot-scope="{ row }">{{ row.PARK_TYPE || row.park_type || '—' }}</template>
+        </el-table-column>
+        <el-table-column label="切边要求" width="60">
+          <template slot-scope="{ row }">{{ row.SIDE_TRIM || row.side_trim || '—' }}</template>
+        </el-table-column>
+        <el-table-column label="成品质量" width="58" align="right">
+          <template slot-scope="{ row }">{{ row.QUALITY || row.quality || '—' }}</template>
+        </el-table-column>
+        <el-table-column label="成品长度" width="60" align="right">
+          <template slot-scope="{ row }">{{ row.EXIT_LENGTH || row.exit_length || '—' }}</template>
+        </el-table-column>
+        <el-table-column label="吨钢长度" width="60" align="right">
+          <template slot-scope="{ row }">{{ calcLengthPerTon(row) }}</template>
+        </el-table-column>
+        <el-table-column label="下线时间" width="140">
+          <template slot-scope="{ row }">{{ formatDate(row.END_DATE || row.end_date) }}</template>
+        </el-table-column>
+        <el-table-column label="状态" width="68" align="center">
+          <template slot-scope="{ row }">
+            <el-tag type="primary" size="mini" effect="plain">{{ row.STATUS || row.status || '产出' }}</el-tag>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="table-pagination">
+        <el-pagination
+          small layout="total, prev, pager, next"
+          :total="pagination.total"
+          :page-size="pagination.pageSize"
+          :current-page="pagination.page"
+          @current-change="handlePageChange"
+        />
+      </div>
+    </div>
+
+    <!-- 底部图表区域 -->
+    <div class="bottom-section">
+      <div class="chart-section">
+        <el-tabs v-model="activeTab" size="small" class="chart-tabs" @tab-click="handleTabSwitch">
+
+          <!-- ① 趋势参数：左树形目录 + 右单图 -->
+          <el-tab-pane label="趋势参数" name="trend">
+            <div v-if="!selectedRow" class="no-data-hint">请在上方选择钢卷</div>
+            <div v-else-if="segLoading" class="no-data-hint">加载中…</div>
+            <div v-else-if="!segData" class="no-data-hint">暂无 SEG 数据</div>
+            <div v-else class="trend-layout">
+              <!-- 左侧目录树 -->
+              <div class="trend-tree">
+                <div v-for="group in trendGroups" :key="group.label" class="tree-group">
+                  <div class="tree-group-label" @click="toggleGroup(group.label)">
+                    <i :class="expandedGroups[group.label] ? 'el-icon-caret-bottom' : 'el-icon-caret-right'" />
+                    {{ group.label }}
+                  </div>
+                  <div v-show="expandedGroups[group.label]" class="tree-children">
+                    <div
+                      v-for="item in group.children"
+                      :key="item.col"
+                      class="tree-item"
+                      :class="{ active: selectedTrendParam && selectedTrendParam.col === item.col }"
+                      @click="selectTrendParam(item)"
+                    >{{ item.label }}</div>
+                  </div>
+                </div>
+              </div>
+              <!-- 右侧图表 -->
+              <div class="trend-chart-area">
+                <div v-if="!selectedTrendParam" class="no-data-hint">← 点击左侧参数查看曲线</div>
+                <!-- 保持 DOM 存在，仅用 v-show 控制显示，避免 ref 失效 -->
+                <div ref="trendSingleChart" :style="{ display: selectedTrendParam ? 'block' : 'none', height: '100%', width: '100%' }" />
+              </div>
+            </div>
+          </el-tab-pane>
+
+          <!-- ② 厚度曲线 -->
+          <el-tab-pane label="厚度曲线" name="thickness">
+            <div v-if="!selectedRow" class="no-data-hint">请在上方选择钢卷</div>
+            <div v-else-if="realtimeLoading" class="no-data-hint">加载中…</div>
+            <div v-else-if="!gaugeRows || !gaugeRows.length" class="no-data-hint">暂无厚度数据</div>
+            <div v-else class="charts-scroll charts-grid">
+              <div ref="chartGauge1" class="chart-box" />
+              <div ref="chartGauge2" class="chart-box" />
+              <div ref="chartGauge3" class="chart-box" />
+              <div ref="chartGauge4" class="chart-box" />
+            </div>
+          </el-tab-pane>
+
+          <!-- ③ 带钢板形 热力图 -->
+          <el-tab-pane label="带钢板形" name="flatness3d">
+            <div v-if="!selectedRow" class="no-data-hint">请在上方选择钢卷</div>
+            <div v-else-if="realtimeLoading" class="no-data-hint">加载中…</div>
+            <div v-else-if="!shapeRows || !shapeRows.length" class="no-data-hint">暂无板形数据</div>
+            <div v-else class="charts-scroll">
+              <div ref="chartFlatness3d" class="chart-box chart-box-tall" />
+            </div>
+          </el-tab-pane>
+
+          <!-- ④ 板形曲线：一行两图 -->
+          <el-tab-pane label="板形曲线" name="flatness">
+            <div v-if="!selectedRow" class="no-data-hint">请在上方选择钢卷</div>
+            <div v-else-if="realtimeLoading" class="no-data-hint">加载中…</div>
+            <div v-else-if="!shapeRows || !shapeRows.length" class="no-data-hint">暂无板形数据</div>
+            <div v-else class="charts-scroll charts-grid">
+              <div ref="chartFlatDev"  class="chart-box" />
+              <div ref="chartTilt"     class="chart-box" />
+              <div ref="chartWrBend"   class="chart-box" />
+              <div ref="chartIrBend"   class="chart-box" />
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+
+      <!-- 右侧查找面板 -->
+      <div class="search-panel">
+        <div class="panel-title">查找</div>
+        <div class="search-type-group">
+          <el-radio v-model="searchType" label="coil">按钢卷号</el-radio>
+          <div v-if="searchType === 'coil'" class="search-field">
+            <span class="search-label">钢卷号：</span>
+            <el-input v-model="searchCoilId" size="mini" style="width:140px" placeholder="EXCOILID" />
+          </div>
+        </div>
+        <div class="search-type-group">
+          <el-radio v-model="searchType" label="time">按时间</el-radio>
+          <template v-if="searchType === 'time'">
+            <div class="search-field">
+              <span class="search-label">开始时间：</span>
+              <el-date-picker v-model="searchStartDate" type="datetime" size="mini" style="width:160px"
+                value-format="yyyy-MM-dd HH:mm:ss" placeholder="开始时间" />
+            </div>
+            <div class="search-field">
+              <span class="search-label">结束时间：</span>
+              <el-date-picker v-model="searchEndDate" type="datetime" size="mini" style="width:160px"
+                value-format="yyyy-MM-dd HH:mm:ss" placeholder="结束时间" />
+            </div>
+          </template>
+        </div>
+        <div class="search-actions">
+          <el-button type="primary" size="mini" :loading="excoilLoading" @click="handleFindSearch">查找</el-button>
+          <el-button size="mini" @click="handleFindReset">重置</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import * as echarts from 'echarts'
+import 'echarts-gl'
+import {
+  getExcoilList,
+  getExcoilCount,
+  getTimingSegByEncoilId,
+  getTimingRealtimeData
+} from '@/api/l2/timing'
+
+// 趋势参数树结构，对应 PLTCM_PRO_SEG 列名
+const TREND_GROUPS = [
+  {
+    label: '张力',
+    children: [
+      { label: '开卷张力',     col: 'PORTENS' },
+      { label: '入口活套张力', col: 'ENLTENS' },
+      { label: '拉矫张力',     col: 'TLTENS' },
+      { label: '酸洗张力',     col: 'PLTENS' },
+      { label: '出口活套张力', col: 'CXLTENS' },
+      { label: '圆盘剪张力',   col: 'TRIMTENS' }
+    ]
+  },
+  {
+    label: '速度',
+    children: [
+      { label: '开卷速度',     col: 'PORSPEED' },
+      { label: '酸洗速度',     col: 'PLSPEED' },
+      { label: '圆盘剪速度',   col: 'TRIMSPEED' },
+      { label: '轧机入口速度', col: 'MILLENTRYSPEED' },
+      { label: '轧机出口速度', col: 'MILLEXITSPEED' }
+    ]
+  },
+  {
+    label: '拉矫机',
+    children: [
+      { label: '1#插入量', col: 'TLMESH1' },
+      { label: '2#插入量', col: 'TLMESH2' },
+      { label: '3#插入量', col: 'TLMESH3' },
+      { label: '延伸率',   col: 'TLELONG' }
+    ]
+  },
+  {
+    label: '酸洗段',
+    children: [
+      { label: '1#温度',   col: 'TK1TEMP' },
+      { label: '2#温度',   col: 'TK2TEMP' },
+      { label: '3#温度',   col: 'TK3TEMP' },
+      { label: '漂洗温度', col: 'RINSETEMP' }
+    ]
+  }
+]
+
+// V_VBDA_GAUGE 厚度曲线：4 个图，列名来自 DDL
+const GAUGE_COLS = [
+  { col: 'THICK0',     title: '入口测厚仪 [mm]' },
+  { col: 'THICK1',     title: '1架出口厚度 [mm]' },
+  { col: 'THICK4',     title: '末架出口厚度 [mm]' },
+  { col: 'EXIT_SPEED', title: '轧制速度 [m/min]' }
+]
+
+// V_VBDA_SHAPE 板形曲线：4 个图，列名来自 DDL
+const SHAPE_SCALAR_COLS = [
+  { col: 'ABSDEVIATION', title: '总板形偏差 [IU]' },
+  { col: 'TILT',         title: '末架倾斜量 [mm]' },
+  { col: 'WRBEND',       title: '工作辊弯辊力 [kN]' },
+  { col: 'IRBEND',       title: '中间辊弯辊力 [kN]' }
+]
+
+/**
+ * 从数据数组计算合理的 Y 轴范围（带 15% 上下边距）。
+ * echarts 默认 scale 在数据变化幅度极小时会把轴拉到很大范围，导致曲线看起来是横线。
+ */
+function calcYRange(vals) {
+  const nums = vals.filter(v => v != null && isFinite(Number(v))).map(Number)
+  if (!nums.length) return {}
+  const min = Math.min(...nums)
+  const max = Math.max(...nums)
+  if (min === max) {
+    const base = Math.abs(min) || 1
+    return { min: parseFloat((min - base * 0.2).toFixed(4)), max: parseFloat((max + base * 0.2).toFixed(4)) }
+  }
+  const pad = (max - min) * 0.15
+  return {
+    min: parseFloat((min - pad).toFixed(4)),
+    max: parseFloat((max + pad).toFixed(4))
+  }
+}
+
+function makeLine(title, xData, yData) {
+  const range = calcYRange(yData)
+  return {
+    title: { text: title, textStyle: { fontSize: 12, fontWeight: 'normal' }, top: 4, left: 8 },
+    tooltip: { trigger: 'axis' },
+    grid: { top: 36, bottom: 28, left: 8, right: 16, containLabel: true },
+    xAxis: {
+      type: 'category', data: xData,
+      name: 'pos(m)', nameTextStyle: { fontSize: 10 }, axisLabel: { fontSize: 10 }
+    },
+    yAxis: {
+      type: 'value',
+      min: range.min,
+      max: range.max,
+      nameTextStyle: { fontSize: 10 },
+      axisLabel: { fontSize: 10 }
+    },
+    dataZoom: [
+      { type: 'inside', xAxisIndex: 0, zoomOnMouseWheel: true, moveOnMouseMove: true },
+      { type: 'inside', yAxisIndex: 0, zoomOnMouseWheel: false, moveOnMouseWheel: true }
+    ],
+    series: [{
+      name: title, type: 'line', smooth: false, symbol: 'none',
+      lineStyle: { width: 1 }, data: yData
+    }]
+  }
+}
+
+function getRowVal(row, col) {
+  const v = row[col] !== undefined ? row[col] : row[col.toLowerCase()]
+  return v == null ? null : Number(v)
+}
+
+function xLocData(rows) {
+  return rows.map(r => {
+    const v = r.XLOCATION !== undefined ? r.XLOCATION : r.xlocation
+    return v == null ? '' : Number(v).toFixed(1)
+  })
+}
+
+export default {
+  name: 'ActualPerformance',
+  data() {
+    return {
+      excoilLoading: false,
+      segLoading: false,
+      realtimeLoading: false,
+      excoilRows: [],
+      selectedRow: null,
+      segData: null,
+      gaugeRows: null,
+      shapeRows: null,
+      activeTab: 'trend',
+      // 趋势参数树状态
+      trendGroups: TREND_GROUPS,
+      expandedGroups: { '张力': true, '速度': true, '拉矫机': true, '酸洗段': true },
+      selectedTrendParam: null,
+      trendChartInst: null,
+      // 查找
+      searchType: 'coil',
+      searchCoilId: '',
+      searchStartDate: '',
+      searchEndDate: '',
+      pagination: { page: 1, pageSize: 50, total: 0 },
+      topTableHeight: 'calc(40vh - 80px)',
+      chartInstances: [],
+      resizeHandler: null
+    }
+  },
+  created() {
+    this.loadExcoilCount()
+    this.loadExcoilList()
+  },
+  beforeDestroy() {
+    this.disposeAllCharts()
+  },
+  methods: {
+    async loadExcoilCount() {
+      try {
+        const res = await getExcoilCount()
+        this.pagination.total = res?.data?.total ?? 0
+      } catch (_) {}
+    },
+    async loadExcoilList() {
+      this.excoilLoading = true
+      try {
+        const res = await getExcoilList(this.pagination.page, this.pagination.pageSize)
+        this.excoilRows = res?.data?.rows || []
+      } finally {
+        this.excoilLoading = false
+      }
+    },
+    handlePageChange(page) {
+      this.pagination.page = page
+      this.loadExcoilList()
+    },
+    async handleRowClick(row) {
+      this.selectedRow = row
+      this.segData = null
+      this.gaugeRows = null
+      this.shapeRows = null
+      this.selectedTrendParam = null
+      this.disposeAllCharts()
+
+      // PLTCM_PRO_SEG 用 ENCOILID 查（主键前缀）
+      const encoilId = row.ENCOILID || row.encoilid
+      // V_VBDA_GAUGE / V_VBDA_SHAPE 用 EXCOILID 作为 MATID
+      const excoilId = row.EXCOILID || row.excoilid
+
+      await Promise.all([
+        encoilId ? this.loadSeg(encoilId) : Promise.resolve(),
+        excoilId ? this.loadRealtime(excoilId) : Promise.resolve()
+      ])
+
+      await this.$nextTick()
+      // 加载完成后自动选中第一个趋势参数
+      if (this.activeTab === 'trend' && this.segData) {
+        this.selectTrendParam(TREND_GROUPS[0].children[0])
+      } else {
+        this.renderCurrentTab()
+      }
+    },
+
+    async loadSeg(encoilId) {
+      this.segLoading = true
+      try {
+        const res = await getTimingSegByEncoilId(encoilId)
+        const rows = res?.data?.rows || []
+        this.segData = rows.length ? (res?.data?.series || null) : null
+      } catch (_) {
+      } finally {
+        this.segLoading = false
+      }
+    },
+
+    async loadRealtime(excoilId) {
+      this.realtimeLoading = true
+      try {
+        const res = await getTimingRealtimeData(excoilId)
+        const g = res?.data?.gauge?.result
+        const s = res?.data?.shape?.result
+        this.gaugeRows = Array.isArray(g) ? g : null
+        this.shapeRows = Array.isArray(s) ? s : null
+      } catch (_) {
+      } finally {
+        this.realtimeLoading = false
+      }
+    },
+
+    // ── 趋势参数树 ──────────────────────────────
+    toggleGroup(label) {
+      this.$set(this.expandedGroups, label, !this.expandedGroups[label])
+    },
+    isGroupExpanded(label) {
+      return !!this.expandedGroups[label]
+    },
+    selectTrendParam(item) {
+      this.selectedTrendParam = item
+      this.$nextTick(() => this.renderTrendSingleChart())
+    },
+    renderTrendSingleChart() {
+      if (!this.selectedTrendParam || !this.segData) return
+      const el = this.$refs.trendSingleChart
+      if (!el) return
+      // 复用已有实例，避免重复 init
+      if (!this.trendChartInst || this.trendChartInst.isDisposed()) {
+        this.trendChartInst = echarts.init(el)
+        // 滚轮缩放支持
+        const resizeFn = () => this.trendChartInst && !this.trendChartInst.isDisposed() && this.trendChartInst.resize()
+        window.addEventListener('resize', resizeFn)
+        this._trendResizeFn = resizeFn
+      }
+      const x = this.segX()
+      const yData = this.seg(this.selectedTrendParam.col)
+      this.trendChartInst.setOption(makeLine(this.selectedTrendParam.label, x, yData), true)
+    },
+
+    // ── Tab 切换 ────────────────────────────────
+    handleTabSwitch() {
+      this.$nextTick(() => {
+        if (this.activeTab === 'trend' && this.selectedTrendParam && this.segData) {
+          this.renderTrendSingleChart()
+        } else {
+          this.renderCurrentTab()
+        }
+      })
+    },
+    renderCurrentTab() {
+      this.disposeSideCharts()
+      if (this.activeTab === 'thickness'  && this.gaugeRows?.length)  this.renderGaugeCharts()
+      if (this.activeTab === 'flatness3d' && this.shapeRows?.length)  this.renderFlatness3d()
+      if (this.activeTab === 'flatness'   && this.shapeRows?.length)  this.renderFlatnessCharts()
+    },
+
+    // ── 销毁 ────────────────────────────────────
+    disposeSideCharts() {
+      if (this.resizeHandler) {
+        window.removeEventListener('resize', this.resizeHandler)
+        this.resizeHandler = null
+      }
+      this.chartInstances.forEach(c => { if (c && !c.isDisposed()) c.dispose() })
+      this.chartInstances = []
+    },
+    disposeAllCharts() {
+      this.disposeSideCharts()
+      if (this._trendResizeFn) {
+        window.removeEventListener('resize', this._trendResizeFn)
+        this._trendResizeFn = null
+      }
+      if (this.trendChartInst && !this.trendChartInst.isDisposed()) {
+        this.trendChartInst.dispose()
+        this.trendChartInst = null
+      }
+    },
+
+    // ── SEG 数据辅助 ─────────────────────────────
+    seg(col) {
+      const s = this.segData
+      // Oracle 返回大写列名，兼容小写
+      const arr = s[col] !== undefined ? s[col] : (s[col.toLowerCase()] || [])
+      return arr.map(v => v == null ? null : Number(Number(v).toFixed(3)))
+    },
+    segX() {
+      const s = this.segData
+      const arr = s['STARTPOS'] !== undefined ? s['STARTPOS'] : (s['startpos'] || [])
+      return arr.map(v => v == null ? '' : Number(v).toFixed(1))
+    },
+
+    // ── 图表初始化 ───────────────────────────────
+    makeChart(ref, option) {
+      const el = this.$refs[ref]
+      if (!el) return null
+      const chart = echarts.init(el)
+      chart.setOption(option)
+      return chart
+    },
+    setupResize() {
+      this.resizeHandler = () => this.chartInstances.forEach(c => {
+        if (c && !c.isDisposed()) c.resize()
+      })
+      window.addEventListener('resize', this.resizeHandler)
+    },
+
+    // ── 厚度曲线 (V_VBDA_GAUGE) ──────────────────
+    renderGaugeCharts() {
+      const rows = this.gaugeRows
+      if (!rows || !rows.length) return
+      const xData = xLocData(rows)
+      const refs = ['chartGauge1', 'chartGauge2', 'chartGauge3', 'chartGauge4']
+      const charts = refs.map((ref, i) => {
+        const { col, title } = GAUGE_COLS[i]
+        const yData = rows.map(r => {
+          const v = getRowVal(r, col)
+          return v == null ? null : parseFloat(v.toFixed(4))
+        })
+        return this.makeChart(ref, makeLine(title, xData, yData))
+      })
+      this.chartInstances = charts.filter(Boolean)
+      this.setupResize()
+    },
+
+    // ── 带钢板形 3D 线图 (V_VBDA_SHAPE) ────────────
+    // 每个通道画一条独立 line3D，通道之间不连面，形成镂空效果
+    renderFlatness3d() {
+      const rows = this.shapeRows
+      if (!rows || !rows.length) return
+      const firstRow = rows[0]
+      const high = parseInt(getRowVal(firstRow, 'HIGHZONEID')) || 26
+      const low  = parseInt(getRowVal(firstRow, 'LOWZONEID'))  || 1
+      const numZones = Math.min(Math.max(high - low + 1, 1), 26)
+      const zoneCols = Array.from({ length: numZones }, (_, i) =>
+        `VALUES${String(low + i).padStart(2, '0')}`
+      )
+      // X 方向降采样，最多 200 个点
+      const step = Math.max(1, Math.floor(rows.length / 200))
+      const sampled = rows.filter((_, i) => i % step === 0)
+      const numX = sampled.length
+
+      // X 轴标签（位置，单位 m）
+      const xLabels = sampled.map(r => {
+        const v = r.XLOCATION !== undefined ? r.XLOCATION : r.xlocation
+        return v == null ? '' : Number(v).toFixed(0)
+      })
+
+      // 收集值域用于 visualMap
+      let minV = Infinity, maxV = -Infinity
+      sampled.forEach(row => {
+        zoneCols.forEach(col => {
+          const v = getRowVal(row, col)
+          if (v != null) {
+            if (v < minV) minV = v
+            if (v > maxV) maxV = v
+          }
+        })
+      })
+      if (!isFinite(minV)) { minV = -30; maxV = 30 }
+      const absMax = Math.max(Math.abs(minV), Math.abs(maxV))
+
+      // ① 沿 X 方向网格线（每通道一条，按 Z 值着色）
+      const channelLines = zoneCols.map((col, yi) => ({
+        type: 'line3D',
+        coordinateSystem: 'cartesian3D',
+        data: sampled.map((row, xi) => {
+          const v = getRowVal(row, col)
+          return v == null ? null : [xi, yi, parseFloat(v.toFixed(2))]
+        }).filter(Boolean),
+        lineStyle: { width: 2, opacity: 1 }
+      }))
+
+      // ② 沿 Y 方向网格线（每隔若干位置连通各通道，按 Z 值着色）
+      const xStride = Math.max(1, Math.floor(numX / 60))
+      const crossLines = []
+      for (let xi = 0; xi < numX; xi += xStride) {
+        const pts = zoneCols.map((col, yi) => {
+          const v = getRowVal(sampled[xi], col)
+          return v == null ? null : [xi, yi, parseFloat(v.toFixed(2))]
+        }).filter(Boolean)
+        if (pts.length > 1) {
+          crossLines.push({
+            type: 'line3D',
+            coordinateSystem: 'cartesian3D',
+            data: pts,
+            lineStyle: { width: 1.5, opacity: 1 }
+          })
+        }
+      }
+
+      const series = [...channelLines, ...crossLines]
+
+      const option = {
+        title: { text: '实测平直度 [IU]', textStyle: { fontSize: 13, fontWeight: 'normal' }, top: 6, left: 10 },
+        tooltip: {},
+        visualMap: {
+          show: true,
+          dimension: 2,
+          min: -absMax,
+          max:  absMax,
+          calculable: true,
+          orient: 'vertical',
+          right: 10,
+          top: 'center',
+          textStyle: { fontSize: 10 },
+          inRange: {
+            // 负值红色 → 零值绿色 → 正值蓝紫
+            color: ['#8B0000','#CC2200','#E84C00','#F46D43',
+                    '#FDAE61','#FEE08B',
+                    '#66BD63','#1A9850','#006837',
+                    '#3288BD','#5E4FA2','#762A83']
+          }
+        },
+        grid3D: {
+          boxWidth: 200,
+          boxHeight: 60,
+          boxDepth: 80,
+          viewControl: {
+            projection: 'orthographic',
+            autoRotate: false,
+            rotateSensitivity: 1,
+            zoomSensitivity: 1
+          },
+          light: {
+            main: { intensity: 1.2, shadow: false },
+            ambient: { intensity: 0.3 }
+          }
+        },
+        xAxis3D: {
+          type: 'value',
+          name: '位置',
+          min: 0,
+          max: numX - 1,
+          nameTextStyle: { fontSize: 10 },
+          axisLabel: {
+            fontSize: 9,
+            formatter: v => xLabels[Math.round(v)] || ''
+          }
+        },
+        yAxis3D: {
+          type: 'value',
+          name: '通道',
+          min: 0,
+          max: numZones - 1,
+          nameTextStyle: { fontSize: 10 },
+          axisLabel: {
+            fontSize: 9,
+            formatter: v => String(low + Math.round(v))
+          }
+        },
+        zAxis3D: {
+          type: 'value',
+          name: 'IU',
+          nameTextStyle: { fontSize: 10 },
+          axisLabel: { fontSize: 9 }
+        },
+        series
+      }
+
+      const el = this.$refs.chartFlatness3d
+      if (!el) return
+      const chart = echarts.init(el)
+      chart.setOption(option)
+      this.chartInstances = [chart]
+      this.setupResize()
+    },
+
+    // ── 板形曲线 (V_VBDA_SHAPE) ──────────────────
+    renderFlatnessCharts() {
+      const rows = this.shapeRows
+      if (!rows || !rows.length) return
+      const xData = xLocData(rows)
+      const refs = ['chartFlatDev', 'chartTilt', 'chartWrBend', 'chartIrBend']
+      const charts = refs.map((ref, i) => {
+        const { col, title } = SHAPE_SCALAR_COLS[i]
+        const yData = rows.map(r => {
+          const v = getRowVal(r, col)
+          return v == null ? null : parseFloat(v.toFixed(3))
+        })
+        return this.makeChart(ref, makeLine(title, xData, yData))
+      })
+      this.chartInstances = charts.filter(Boolean)
+      this.setupResize()
+    },
+
+    // ── 查找 ─────────────────────────────────────
+    handleFindSearch() {
+      if (this.searchType === 'coil' && this.searchCoilId) {
+        const found = this.excoilRows.find(r =>
+          (r.EXCOILID || r.excoilid || '').includes(this.searchCoilId)
+        )
+        if (found) {
+          this.$refs.excoilTable && this.$refs.excoilTable.setCurrentRow(found)
+          this.handleRowClick(found)
+        } else {
+          this.$message.info('当前页未找到该卷号，请翻页查找')
+        }
+      } else {
+        this.pagination.page = 1
+        this.loadExcoilList()
+      }
+    },
+    handleFindReset() {
+      this.searchCoilId = ''
+      this.searchStartDate = ''
+      this.searchEndDate = ''
+      this.selectedRow = null
+      this.segData = null
+      this.gaugeRows = null
+      this.shapeRows = null
+      this.selectedTrendParam = null
+      this.disposeAllCharts()
+      this.pagination.page = 1
+      this.loadExcoilCount()
+      this.loadExcoilList()
+    },
+
+    calcLengthPerTon(row) {
+      const len = parseFloat(row.EXIT_LENGTH || row.exit_length)
+      const wt  = parseFloat(row.MEAS_EXIT_WEIGHT || row.meas_exit_weight)
+      if (!len || !wt || wt === 0) return '—'
+      return (len / wt).toFixed(2)
+    },
+    formatDate(v) {
+      if (!v) return '—'
+      return String(v).replace('T', ' ').substring(0, 19)
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.actual-container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  padding: 8px;
+  background: #f0f2f5;
+  gap: 6px;
+  box-sizing: border-box;
+}
+
+.top-section {
+  flex-shrink: 0;
+  background: #fff;
+  border-radius: 4px;
+  box-shadow: 0 1px 4px rgba(0,0,0,0.06);
+  overflow: hidden;
+}
+
+.table-pagination {
+  display: flex;
+  justify-content: flex-end;
+  padding: 4px 8px;
+  border-top: 1px solid #ebeef5;
+  background: #fafafa;
+}
+
+.bottom-section {
+  flex: 1;
+  min-height: 0;
+  display: flex;
+  gap: 6px;
+}
+
+.chart-section {
+  flex: 1;
+  min-height: 0;
+  background: #fff;
+  border-radius: 4px;
+  box-shadow: 0 1px 4px rgba(0,0,0,0.06);
+  padding: 8px;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+
+  .chart-tabs {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    min-height: 0;
+
+    ::v-deep .el-tabs__content {
+      flex: 1;
+      overflow: hidden;
+      min-height: 0;
+      padding: 0;
+    }
+    ::v-deep .el-tab-pane {
+      height: 100%;
+    }
+  }
+}
+
+/* ── 趋势参数：左树 + 右图 ── */
+.trend-layout {
+  display: flex;
+  height: 100%;
+  gap: 0;
+}
+
+.trend-tree {
+  width: 140px;
+  flex-shrink: 0;
+  overflow-y: auto;
+  border-right: 1px solid #ebeef5;
+  padding: 4px 0;
+
+  &::-webkit-scrollbar { width: 3px; }
+  &::-webkit-scrollbar-thumb { background: #dcdfe6; border-radius: 2px; }
+}
+
+.tree-group {
+  user-select: none;
+}
+
+.tree-group-label {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  padding: 5px 8px;
+  font-size: 12px;
+  font-weight: 600;
+  color: #303133;
+  cursor: pointer;
+
+  &:hover { background: #f5f7fa; }
+
+  i { font-size: 10px; color: #909399; }
+}
+
+.tree-children { padding-left: 4px; }
+
+.tree-item {
+  padding: 4px 8px 4px 18px;
+  font-size: 12px;
+  color: #606266;
+  cursor: pointer;
+  border-radius: 3px;
+  margin: 1px 4px;
+
+  &:hover { background: #ecf5ff; color: #409eff; }
+
+  &.active {
+    background: #ecf5ff;
+    color: #409eff;
+    font-weight: 500;
+  }
+}
+
+.trend-chart-area {
+  flex: 1;
+  min-width: 0;
+  height: 100%;
+  padding: 4px 4px 4px 8px;
+  display: flex;
+  align-items: stretch;
+}
+
+/* ── 其他图表 ── */
+.charts-scroll {
+  height: 100%;
+  overflow-y: auto;
+  padding: 4px;
+
+  &::-webkit-scrollbar { width: 4px; }
+  &::-webkit-scrollbar-thumb { background: #dcdfe6; border-radius: 2px; }
+}
+
+/* 一行两图 */
+.charts-grid {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 8px;
+  align-content: start;
+
+  .chart-box { margin-bottom: 0; }
+}
+
+.chart-box {
+  width: 100%;
+  height: 200px;
+  margin-bottom: 8px;
+}
+
+.chart-box-tall { height: 480px; }
+
+/* ── 查找面板 ── */
+.search-panel {
+  width: 210px;
+  flex-shrink: 0;
+  background: #fff;
+  border-radius: 4px;
+  box-shadow: 0 1px 4px rgba(0,0,0,0.06);
+  padding: 10px;
+  display: flex;
+  flex-direction: column;
+  gap: 14px;
+  overflow-y: auto;
+}
+
+.panel-title {
+  font-size: 13px;
+  font-weight: 600;
+  color: #303133;
+  padding-bottom: 6px;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.search-type-group { display: flex; flex-direction: column; gap: 8px; }
+
+.search-field {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  padding-left: 20px;
+}
+
+.search-label { font-size: 11px; color: #909399; }
+
+.search-actions {
+  display: flex;
+  gap: 8px;
+  margin-top: auto;
+}
+
+.no-data-hint {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 120px;
+  color: #c0c4cc;
+  font-size: 13px;
+}
+</style>
diff --git a/klp-ui/src/views/micro/pages/acid/components/Performance.vue b/klp-ui/src/views/micro/pages/acid/components/Performance.vue
index c80afd04..597014af 100644
--- a/klp-ui/src/views/micro/pages/acid/components/Performance.vue
+++ b/klp-ui/src/views/micro/pages/acid/components/Performance.vue
@@ -1,483 +1,628 @@
 <template>
-  <div class="app-container" style="width: 100%; height: 100%;">
+  <div class="plan-container">
+    <!-- 顶部筛选栏 -->
     <div class="filter-bar">
       <el-input
         v-model="queryForm.coilId"
-        placeholder="热卷号 / 成品卷号"
+        placeholder="冷卷号 / 热卷号"
         clearable
         size="small"
-        style="width: 220px"
+        style="width: 200px"
         @keyup.enter.native="handleSearch"
       />
+      <el-select v-model="queryForm.status" placeholder="状态" clearable size="small" style="width: 110px">
+        <el-option label="全部" value="" />
+        <el-option label="新建" value="NEW" />
+        <el-option label="准备好" value="READY" />
+        <el-option label="在线" value="ONLINE" />
+        <el-option label="生产中" value="PRODUCING" />
+        <el-option label="产出" value="PRODUCT" />
+      </el-select>
       <el-button size="small" type="primary" :loading="loading" @click="handleSearch">查询</el-button>
       <el-button size="small" @click="handleReset">重置</el-button>
+      <span class="total-hint">共 {{ pagination.total }} 条</span>
     </div>
 
-    <el-row :gutter="12" class="main-row">
-      <!-- 左侧计划列表 -->
-      <el-col :span="9">
-        <div class="left-card">
-          <el-table
-            ref="planTable"
-            :data="planRows"
-            size="mini"
-            highlight-current-row
-            :height="tableHeight"
-            @row-click="handlePlanRowClick"
-          >
-            <el-table-column prop="hot_coilid" label="热卷号" show-overflow-tooltip />
-            <el-table-column prop="coilid" label="原料卷号" show-overflow-tooltip />
-            <el-table-column label="状态">
-              <template slot-scope="{ row }">
-                <span :class="['status-dot', statusClass(row.status)]" />
-                <span class="status-text">{{ row.status || '—' }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="厚×宽">
-              <template slot-scope="{ row }">{{ row.entry_thick }}×{{ row.entry_width }}</template>
-            </el-table-column>
-            <el-table-column prop="exit_thick" label="出口厚" />
-            <el-table-column prop="entry_weight" label="重量(t)" />
-          </el-table>
+    <!-- 计划表格 -->
+    <div class="table-wrap">
+      <el-table
+        ref="planTable"
+        :data="planRows"
+        size="mini"
+        highlight-current-row
+        border
+        :height="tableHeight"
+        style="width: 100%"
+        @row-click="handleRowClick"
+      >
+        <el-table-column type="selection" width="36" />
+        <el-table-column prop="SEQID" label="序号" width="52" align="center">
+          <template slot-scope="{ row }">{{ row.SEQID || row.seqid }}</template>
+        </el-table-column>
+        <el-table-column label="冷卷号" min-width="110" show-overflow-tooltip>
+          <template slot-scope="{ row }">{{ row.EXIT_COILID || row.exit_coilid || row.COILID || row.coilid }}</template>
+        </el-table-column>
+        <el-table-column label="热卷号" min-width="100" show-overflow-tooltip>
+          <template slot-scope="{ row }">{{ row.HOT_COILID || row.hot_coilid }}</template>
+        </el-table-column>
+        <el-table-column label="钢种" min-width="80" show-overflow-tooltip>
+          <template slot-scope="{ row }">{{ row.ORDER_QUALITY || row.order_quality }}</template>
+        </el-table-column>
+        <el-table-column label="来料厚度" width="72" align="right">
+          <template slot-scope="{ row }">{{ row.ENTRY_THICK || row.entry_thick }}</template>
+        </el-table-column>
+        <el-table-column label="产品厚度" width="72" align="right">
+          <template slot-scope="{ row }">{{ row.EXIT_THICK || row.exit_thick }}</template>
+        </el-table-column>
+        <el-table-column label="偏差上限" width="72" align="right">
+          <template slot-scope="{ row }">{{ calcPosDev(row) }}</template>
+        </el-table-column>
+        <el-table-column label="偏差下限" width="72" align="right">
+          <template slot-scope="{ row }">{{ calcNegDev(row) }}</template>
+        </el-table-column>
+        <el-table-column label="来料宽度" width="72" align="right">
+          <template slot-scope="{ row }">{{ row.ENTRY_WIDTH || row.entry_width }}</template>
+        </el-table-column>
+        <el-table-column label="产品宽度" width="72" align="right">
+          <template slot-scope="{ row }">{{ row.EXIT_WIDTH || row.exit_width }}</template>
+        </el-table-column>
+        <el-table-column label="包装要求" width="72">
+          <template slot-scope="{ row }">{{ row.PARK_TYPE || row.park_type || '—' }}</template>
+        </el-table-column>
+        <el-table-column label="切边要求" width="72">
+          <template slot-scope="{ row }">{{ formatTrimming(row.TRIMMING !== undefined ? row.TRIMMING : row.trimming) }}</template>
+        </el-table-column>
+        <el-table-column label="轧制模式" width="82">
+          <template slot-scope="{ row }">{{ formatStratMode(row.STRAT_MODE !== undefined ? row.STRAT_MODE : row.strat_mode) }}</template>
+        </el-table-column>
+        <el-table-column label="分卷数" width="56" align="center">
+          <template slot-scope="{ row }">{{ row.SPLIT_NUM || row.split_num }}</template>
+        </el-table-column>
+        <el-table-column label="下工序" width="68">
+          <template slot-scope="{ row }">{{ formatNextUnit(row.NEXT_UNIT || row.next_unit) }}</template>
+        </el-table-column>
+        <el-table-column label="计划时间" width="140">
+          <template slot-scope="{ row }">{{ formatDate(row.ONLINE_DATE || row.online_date) }}</template>
+        </el-table-column>
+        <el-table-column label="状态" width="68" align="center">
+          <template slot-scope="{ row }">
+            <el-tag :type="statusTagType(row.STATUS || row.status)" size="mini" effect="plain">
+              {{ formatStatus(row.STATUS || row.status) }}
+            </el-tag>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
 
-          <div class="pagination-bar">
-            <el-pagination
-              small
-              layout="total, prev, pager, next"
-              :total="pagination.total"
-              :page-size="pagination.pageSize"
-              :current-page="pagination.page"
-              @current-change="handlePageChange"
-            />
-          </div>
-        </div>
-      </el-col>
+    <!-- 分页 -->
+    <div class="pagination-bar">
+      <el-pagination
+        small
+        layout="total, prev, pager, next, sizes"
+        :total="pagination.total"
+        :page-size="pagination.pageSize"
+        :page-sizes="[20, 50, 100]"
+        :current-page="pagination.page"
+        @current-change="handlePageChange"
+        @size-change="handleSizeChange"
+      />
+    </div>
 
-      <!-- 右侧详情 + 图表 -->
-      <el-col :span="15">
-        <div v-if="!selectedPlan" class="empty-hint">
-          <el-empty description="选择左侧计划" />
-        </div>
-
-        <template v-else>
+    <!-- 底部详情区域 -->
+    <div class="bottom-panels">
+      <!-- 计划详细 -->
+      <div class="detail-panel">
+        <div class="panel-title">计划详细</div>
+        <template v-if="selectedRow">
           <div class="detail-grid">
-            <div v-for="f in planFields" :key="f.key" class="detail-cell">
-              <span class="cell-label">{{ f.label }}</span>
-              <span class="cell-value">{{ selectedPlan[f.key] != null ? selectedPlan[f.key] : '—' }}</span>
+            <div class="detail-row">
+              <div class="detail-cell">
+                <span class="cell-label">钢卷号</span>
+                <span class="cell-value">{{ r('EXIT_COILID','exit_coilid') || r('COILID','coilid') }}</span>
+              </div>
+              <div class="detail-cell">
+                <span class="cell-label">来料厚度</span>
+                <span class="cell-value">{{ r('ENTRY_THICK','entry_thick') }}</span>
+                <span class="cell-unit">[mm]</span>
+              </div>
+              <div class="detail-cell">
+                <span class="cell-label">来料宽度</span>
+                <span class="cell-value">{{ r('ENTRY_WIDTH','entry_width') }}</span>
+                <span class="cell-unit">[mm]</span>
+              </div>
+              <div class="detail-cell">
+                <span class="cell-label">1#分卷</span>
+                <span class="cell-value">{{ r('EXIT_VALUE1','exit_value1','0') }}</span>
+                <span class="cell-unit">[t]</span>
+              </div>
+            </div>
+            <div class="detail-row">
+              <div class="detail-cell">
+                <span class="cell-label">钢种</span>
+                <span class="cell-value">{{ r('ORDER_QUALITY','order_quality') }}</span>
+              </div>
+              <div class="detail-cell">
+                <span class="cell-label">产品厚度</span>
+                <span class="cell-value">{{ r('EXIT_THICK','exit_thick') }}</span>
+                <span class="cell-unit">[mm]</span>
+              </div>
+              <div class="detail-cell">
+                <span class="cell-label">产品宽度</span>
+                <span class="cell-value">{{ r('EXIT_WIDTH','exit_width') }}</span>
+                <span class="cell-unit">[mm]</span>
+              </div>
+              <div class="detail-cell">
+                <span class="cell-label">2#分卷</span>
+                <span class="cell-value">{{ r('EXIT_VALUE2','exit_value2','0') }}</span>
+                <span class="cell-unit">[t]</span>
+              </div>
+            </div>
+            <div class="detail-row">
+              <div class="detail-cell">
+                <span class="cell-label">轧制模式</span>
+                <span class="cell-value">{{ formatStratMode(r('STRAT_MODE','strat_mode')) }}</span>
+              </div>
+              <div class="detail-cell">
+                <span class="cell-label">偏差上限</span>
+                <span class="cell-value">{{ calcPosDev(selectedRow) }}</span>
+                <span class="cell-unit">[mm]</span>
+              </div>
+              <div class="detail-cell">
+                <span class="cell-label">分卷数</span>
+                <span class="cell-value">{{ r('SPLIT_NUM','split_num') }}</span>
+              </div>
+              <div class="detail-cell">
+                <span class="cell-label">3#分卷</span>
+                <span class="cell-value">{{ r('EXIT_VALUE3','exit_value3','0') }}</span>
+                <span class="cell-unit">[t]</span>
+              </div>
+            </div>
+            <div class="detail-row">
+              <div class="detail-cell">
+                <span class="cell-label">状态</span>
+                <span class="cell-value">{{ formatStatus(r('STATUS','status')) }}</span>
+              </div>
+              <div class="detail-cell">
+                <span class="cell-label">偏差下限</span>
+                <span class="cell-value">{{ calcNegDev(selectedRow) }}</span>
+                <span class="cell-unit">[mm]</span>
+              </div>
+              <div class="detail-cell">
+                <span class="cell-label">下工序</span>
+                <span class="cell-value">{{ formatNextUnit(r('NEXT_UNIT','next_unit')) }}</span>
+              </div>
+              <div class="detail-cell">
+                <span class="cell-label">4#分卷</span>
+                <span class="cell-value">{{ r('EXIT_VALUE4','exit_value4','0') }}</span>
+                <span class="cell-unit">[t]</span>
+              </div>
+            </div>
+            <div class="detail-row">
+              <div class="detail-cell">
+                <span class="cell-label">下达时间</span>
+                <span class="cell-value" style="font-size:11px">{{ formatDate(r('ONLINE_DATE','online_date')) }}</span>
+              </div>
+              <div class="detail-cell">
+                <span class="cell-label">来料重量</span>
+                <span class="cell-value">{{ r('ENTRY_WEIGHT','entry_weight') }}</span>
+                <span class="cell-unit">[t]</span>
+              </div>
+              <div class="detail-cell">
+                <span class="cell-label">来料外径</span>
+                <span class="cell-value">{{ r('ENTRY_OUTER_DIAMETER','entry_outer_diameter') }}</span>
+                <span class="cell-unit">[mm]</span>
+              </div>
+              <div class="detail-cell">
+                <span class="cell-label">5#分卷</span>
+                <span class="cell-value">{{ r('EXIT_VALUE5','exit_value5','0') }}</span>
+                <span class="cell-unit">[t]</span>
+              </div>
+            </div>
+            <div class="detail-row">
+              <div class="detail-cell" /><div class="detail-cell" /><div class="detail-cell" />
+              <div class="detail-cell">
+                <span class="cell-label">6#分卷</span>
+                <span class="cell-value">{{ r('EXIT_VALUE6','exit_value6','0') }}</span>
+                <span class="cell-unit">[t]</span>
+              </div>
             </div>
           </div>
-
-          <div class="perf-header">
-            实轧实绩
-            <span v-if="hasPerfData" class="perf-count">({{ perfSegCount }} 段)</span>
-            <el-tag v-if="perfLoading" size="mini" type="info" style="margin-left:8px">加载中…</el-tag>
-          </div>
-
-          <div v-if="hasPerfData" class="charts-wrap">
-            <div ref="chartSpeed" class="chart-box" />
-            <div ref="chartMillSpeed" class="chart-box" />
-            <div ref="chartTension" class="chart-box" />
-            <div ref="chartPorSpeed" class="chart-box" />
-            <div ref="chartPorTens" class="chart-box" />
-            <div ref="chartTrim" class="chart-box" />
-            <div ref="chartTemp" class="chart-box" />
-            <div ref="chartMesh" class="chart-box" />
-            <div ref="chartElong" class="chart-box" />
-          </div>
-
-          <el-empty v-else-if="!perfLoading" description="暂无实绩数据" :image-size="56" style="margin-top: 24px" />
         </template>
-      </el-col>
-    </el-row>
+        <div v-else class="empty-hint">← 点击上方表格行查看详情</div>
+      </div>
+
+      <!-- 设定参数（PLTCM_PRESET_SETUP） -->
+      <div class="settings-panel">
+        <div class="panel-title">
+          设定参数
+          <el-tag v-if="setupLoading" size="mini" type="info" style="margin-left:6px">加载中…</el-tag>
+        </div>
+        <el-tabs v-model="settingsTab" size="small" class="settings-tabs">
+          <!-- 入口段 -->
+          <el-tab-pane label="入口段" name="entry">
+            <div v-if="!selectedRow" class="empty-hint">请先选择计划</div>
+            <div v-else class="param-grid">
+              <div class="param-row">
+                <span class="param-label">开卷机单位张力</span>
+                <span class="param-value">{{ s('POR_TEN') }}</span>
+                <span class="param-unit">[N/mm²]</span>
+              </div>
+              <div class="param-row">
+                <span class="param-label">入口活套单位张力</span>
+                <span class="param-value">{{ s('CEL_TEN') }}</span>
+                <span class="param-unit">[N/mm²]</span>
+              </div>
+              <div class="param-row">
+                <span class="param-label">矫直机1#辊插入量</span>
+                <span class="param-value">{{ s('FLAT_MESH_1') }}</span>
+                <span class="param-unit">[mm]</span>
+              </div>
+              <div class="param-row">
+                <span class="param-label">矫直机2#辊插入量</span>
+                <span class="param-value">{{ s('FLAT_MESH_2') }}</span>
+                <span class="param-unit">[mm]</span>
+              </div>
+              <div class="param-row">
+                <span class="param-label">矫直机3#辊插入量</span>
+                <span class="param-value">{{ s('FLAT_MESH_3') }}</span>
+                <span class="param-unit">[mm]</span>
+              </div>
+            </div>
+          </el-tab-pane>
+
+          <!-- 工艺段 -->
+          <el-tab-pane label="工艺段" name="process">
+            <div v-if="!selectedRow" class="empty-hint">请先选择计划</div>
+            <div v-else class="param-grid">
+              <div class="param-row">
+                <span class="param-label">拉弯矫直机单位张力</span>
+                <span class="param-value">{{ s('TLV_TEN') }}</span>
+                <span class="param-unit">[N/mm²]</span>
+              </div>
+              <div class="param-row">
+                <span class="param-label">拉弯矫直机延伸率</span>
+                <span class="param-value">{{ s('TLV_ELONG') }}</span>
+                <span class="param-unit">[%]</span>
+              </div>
+              <div class="param-row">
+                <span class="param-label">弯曲辊1#弯辊量</span>
+                <span class="param-value">{{ s('TLV_MESH_1') }}</span>
+                <span class="param-unit">[mm]</span>
+              </div>
+              <div class="param-row">
+                <span class="param-label">弯曲辊2#弯辊量</span>
+                <span class="param-value">{{ s('TLV_MESH_2') }}</span>
+                <span class="param-unit">[mm]</span>
+              </div>
+              <div class="param-row">
+                <span class="param-label">弯曲辊3#弯辊量</span>
+                <span class="param-value">{{ s('TLV_MESH_3') }}</span>
+                <span class="param-unit">[mm]</span>
+              </div>
+              <div class="param-row">
+                <span class="param-label">酸洗处理段单位张力</span>
+                <span class="param-value">{{ s('CPL_TEN') }}</span>
+                <span class="param-unit">[N/mm²]</span>
+              </div>
+              <div class="param-row">
+                <span class="param-label">处理段最大速度</span>
+                <span class="param-value">{{ s('CPL_MAX_SPEED') }}</span>
+                <span class="param-unit">[m/min]</span>
+              </div>
+            </div>
+          </el-tab-pane>
+
+          <!-- 出口段 -->
+          <el-tab-pane label="出口段" name="exit">
+            <div v-if="!selectedRow" class="empty-hint">请先选择计划</div>
+            <div v-else class="param-grid">
+              <div class="param-row">
+                <span class="param-label">酸洗出口张力辊张力</span>
+                <span class="param-value">{{ s('TR_TEN') }}</span>
+                <span class="param-unit">[N/mm²]</span>
+              </div>
+              <div class="param-row">
+                <span class="param-label">切边段单位张力</span>
+                <span class="param-value">{{ s('TRIM_TEN') }}</span>
+                <span class="param-unit">[N/mm²]</span>
+              </div>
+              <div class="param-row">
+                <span class="param-label">联机活套单位张力</span>
+                <span class="param-value">{{ s('TEL_TEN') }}</span>
+                <span class="param-unit">[N/mm²]</span>
+              </div>
+              <div class="param-row">
+                <span class="param-label">出口活套单位张力</span>
+                <span class="param-value">{{ s('CXL_TEN') }}</span>
+                <span class="param-unit">[N/mm²]</span>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
-import * as echarts from 'echarts'
 import {
   getTimingPlanList,
   getTimingPlanCount,
-  getTimingPlanDetail,
-  getTimingSegByEncoilId
+  getPresetSetupByCoilId
 } from '@/api/l2/timing'
 
-const PLAN_FIELDS = [
-  { key: 'status',        label: '状态' },
-  { key: 'process_code',  label: '工艺编码' },
-  { key: 'entry_thick',   label: '入口厚度(mm)' },
-  { key: 'entry_width',   label: '入口宽度(mm)' },
-  { key: 'entry_weight',  label: '入口重量(t)' },
-  { key: 'exit_thick',    label: '出口厚度(mm)' },
-  { key: 'exit_width',    label: '出口宽度(mm)' },
-  { key: 'exit_length',   label: '出口长度(m)' }
-]
-
-const STATUS_CLASS = {
-  READY:     'status-ready',
-  ONLINE:    'status-online',
-  PRODUCING: 'status-producing',
-  PRODUCT:   'status-product'
-}
-
-function makeLine(name, data) {
-  return { name, type: 'line', smooth: true, symbol: 'none', data }
-}
-
-function baseOption(title, xData, series, yName) {
-  return {
-    title: { text: title, textStyle: { fontSize: 12, fontWeight: 'normal' }, top: 4, left: 8 },
-    tooltip: { trigger: 'axis' },
-    legend: { top: 4, right: 8, textStyle: { fontSize: 11 } },
-    grid: { top: 36, bottom: 28, left: 8, right: 8, containLabel: true },
-    xAxis: {
-      type: 'category',
-      data: xData,
-      name: 'pos(m)',
-      nameTextStyle: { fontSize: 10 },
-      axisLabel: { fontSize: 10 }
-    },
-    yAxis: { type: 'value', name: yName, nameTextStyle: { fontSize: 10 }, axisLabel: { fontSize: 10 } },
-    series
-  }
-}
+const STATUS_MAP = { NEW: '新建', READY: '准备好', ONLINE: '在线', PRODUCING: '生产中', PRODUCT: '产出' }
+const STATUS_TAG = { NEW: 'info', READY: 'success', ONLINE: 'warning', PRODUCING: 'warning', PRODUCT: 'primary' }
+const NEXT_UNIT_MAP = { 'C000': '冷硬卷', 'G000': '连退', 'Z000': '镀锌', 'A000': '退火' }
 
 export default {
-  name: 'TimingAcidPage',
+  name: 'PlanManagement',
   data() {
     return {
       loading: false,
-      perfLoading: false,
-      queryForm: { coilId: '' },
+      setupLoading: false,
+      queryForm: { coilId: '', status: '' },
       planRows: [],
-      selectedPlan: null,
-      perfSeries: null,
-      perfSegCount: 0,
-      planFields: PLAN_FIELDS,
-      pagination: { page: 1, pageSize: 50, total: 0 },
-      tableHeight: 'calc(100vh - 210px)'
-    }
-  },
-  computed: {
-    hasPerfData() {
-      return this.perfSeries && this.perfSegCount > 0
+      selectedRow: null,
+      setupData: {},
+      settingsTab: 'exit',
+      pagination: { page: 1, pageSize: 20, total: 0 },
+      tableHeight: 'calc(100vh - 430px)'
     }
   },
   created() {
-    // plain instance property — Vue 2 does NOT proxy underscore-prefixed names
-    this.chartInstances = []
-    this.resizeHandler = null
-    this.loadPlanCount()
-    this.loadPlanList()
-  },
-  beforeDestroy() {
-    this.disposeCharts()
+    this.loadCount()
+    this.loadList()
   },
   methods: {
-    statusClass(status) {
-      return STATUS_CLASS[status] || 'status-default'
-    },
-    async loadPlanCount() {
+    async loadCount() {
       try {
         const res = await getTimingPlanCount()
         this.pagination.total = res?.data?.total ?? 0
       } catch (_) {}
     },
-    async loadPlanList() {
+    async loadList() {
       this.loading = true
       try {
-        const { page, pageSize } = this.pagination
-        const res = await getTimingPlanList(page, pageSize)
+        const res = await getTimingPlanList(this.pagination.page, this.pagination.pageSize)
         this.planRows = res?.data?.rows || []
       } finally {
         this.loading = false
       }
     },
+    async handleRowClick(row) {
+      this.selectedRow = row
+      this.setupData = {}
+      // COILID is the plan's primary key → matches PLTCM_PRESET_SETUP.COILID
+      const coilId = row.COILID || row.coilid
+      if (!coilId) return
+      this.setupLoading = true
+      try {
+        const res = await getPresetSetupByCoilId(coilId)
+        this.setupData = res?.data?.data || {}
+      } catch (_) {
+      } finally {
+        this.setupLoading = false
+      }
+    },
     handlePageChange(page) {
       this.pagination.page = page
-      this.loadPlanList()
+      this.loadList()
     },
-    async handleSearch() {
-      if (!this.queryForm.coilId) return this.loadPlanList()
-      this.loading = true
-      try {
-        const res = await getTimingPlanDetail(this.queryForm.coilId)
-        const row = res?.data?.firstRow || null
-        if (row) {
-          this.selectedPlan = row
-          await this.loadPerf(row)
-        }
-      } finally {
-        this.loading = false
-      }
+    handleSizeChange(size) {
+      this.pagination.pageSize = size
+      this.pagination.page = 1
+      this.loadList()
     },
-    async handlePlanRowClick(row) {
-      this.selectedPlan = row
-      this.perfSeries = null
-      this.perfSegCount = 0
-      this.disposeCharts()
-      await this.loadPerf(row)
-    },
-    async loadPerf(plan) {
-      const encoilId = plan.encoilid || plan.coilid
-      if (!encoilId) return
-      this.perfLoading = true
-      try {
-        const res = await getTimingSegByEncoilId(encoilId)
-        const keys = Object.keys(res?.data?.series || {})
-        console.log(keys)
-        
-        const series = res?.data?.series || null
-        const rows = res?.data?.rows || []
-        this.perfSegCount = rows.length
-        this.perfSeries = series
-        if (series && rows.length) {
-          await this.$nextTick()
-          this.renderCharts(series)
-        }
-      } catch (_) {
-        this.perfSeries = null
-        this.perfSegCount = 0
-      } finally {
-        this.perfLoading = false
-      }
-    },
-    disposeCharts() {
-      if (this.resizeHandler) {
-        window.removeEventListener('resize', this.resizeHandler)
-        this.resizeHandler = null
-      }
-      if (this.chartInstances && this.chartInstances.length) {
-        this.chartInstances.forEach(c => { if (c) c.dispose() })
-        this.chartInstances = []
-      }
-    },
-    renderCharts(series) {
-      this.disposeCharts()
-      const pick = key => (series[key] || []).map(v => v == null ? null : Number(v).toFixed(2))
-      const xData = (series.startpos || []).map(v => v == null ? '' : Number(v).toFixed(1))
-
-      const c1 = echarts.init(this.$refs.chartSpeed)
-      c1.setOption(baseOption(
-        '速度趋势 (m/min)', xData,
-        [
-          makeLine('轧制速度 plspeed', pick('plspeed')),
-          makeLine('剪切速度 trimspeed', pick('trimspeed'))
-        ],
-        'm/min'
-      ))
-
-      const c2 = echarts.init(this.$refs.chartMillSpeed)
-      c2.setOption(baseOption(
-        '轧机速度 (m/min)', xData,
-        [
-          makeLine('入口速度 millentryspeed', pick('millentryspeed')),
-          makeLine('出口速度 millexitspeed', pick('millexitspeed'))
-        ],
-        'm/min'
-      ))
-
-      const c3 = echarts.init(this.$refs.chartTension)
-      c3.setOption(baseOption(
-        '张力趋势 (N)', xData,
-        [
-          makeLine('出口张力 pltens', pick('pltens')),
-          makeLine('入口张力 enltens', pick('enltens')),
-          makeLine('cxltens', pick('cxltens'))
-        ],
-        'N'
-      ))
-
-      const c4 = echarts.init(this.$refs.chartPorSpeed)
-      c4.setOption(baseOption(
-        '开卷机速度 (m/min)', xData,
-        [
-          makeLine('开卷速度 porspeed', pick('porspeed')),
-          makeLine('最大 porspeedmax', pick('porspeedmax')),
-          makeLine('最小 porspeedmin', pick('porspeedmin'))
-        ],
-        'm/min'
-      ))
-
-      const c5 = echarts.init(this.$refs.chartPorTens)
-      c5.setOption(baseOption(
-        '开卷机张力 (N)', xData,
-        [
-          makeLine('开卷张力 portens', pick('portens')),
-          makeLine('最大 portensmax', pick('portensmax')),
-          makeLine('最小 portensmin', pick('portensmin'))
-        ],
-        'N'
-      ))
-
-      const c6 = echarts.init(this.$refs.chartTrim)
-      c6.setOption(baseOption(
-        '剪切参数', xData,
-        [
-          makeLine('剪切张力 trimtens', pick('trimtens')),
-          makeLine('剪切宽度 trimwidth', pick('trimwidth')),
-          makeLine('trtens', pick('trtens'))
-        ],
-        ''
-      ))
-
-      const c7 = echarts.init(this.$refs.chartTemp)
-      c7.setOption(baseOption(
-        '温度趋势 (℃)', xData,
-        [
-          makeLine('1号测温 tk1temp', pick('tk1temp')),
-          makeLine('2号测温 tk2temp', pick('tk2temp')),
-          makeLine('3号测温 tk3temp', pick('tk3temp')),
-          makeLine('4号测温 tk4temp', pick('tk4temp')),
-          makeLine('漂洗温度 rinsetemp', pick('rinsetemp'))
-        ],
-        '℃'
-      ))
-
-      const c8 = echarts.init(this.$refs.chartMesh)
-      c8.setOption(baseOption(
-        '轧辊参数', xData,
-        [
-          makeLine('轧辊1 tlmesh1', pick('tlmesh1')),
-          makeLine('轧辊2 tlmesh2', pick('tlmesh2')),
-          makeLine('轧辊3 tlmesh3', pick('tlmesh3'))
-        ],
-        ''
-      ))
-
-      const c9 = echarts.init(this.$refs.chartElong)
-      c9.setOption(baseOption(
-        '延伸率', xData,
-        [
-          makeLine('延伸率 tlelong', pick('tlelong')),
-          makeLine('总张力 tltens', pick('tltens')),
-          makeLine('teltens', pick('teltens'))
-        ],
-        ''
-      ))
-
-      this.chartInstances = [c1, c2, c3, c4, c5, c6, c7, c8, c9]
-      this.resizeHandler = () => this.chartInstances.forEach(c => { if (c) c.resize() })
-      window.addEventListener('resize', this.resizeHandler)
+    handleSearch() {
+      this.pagination.page = 1
+      this.loadList()
     },
     handleReset() {
-      this.queryForm.coilId = ''
-      this.selectedPlan = null
-      this.perfSeries = null
-      this.perfSegCount = 0
-      this.disposeCharts()
+      this.queryForm = { coilId: '', status: '' }
+      this.selectedRow = null
+      this.setupData = {}
       this.pagination.page = 1
-      this.loadPlanList()
+      this.loadCount()
+      this.loadList()
+    },
+    // get from selectedRow (upper or lower case key)
+    r(upper, lower, fallback = '—') {
+      if (!this.selectedRow) return fallback
+      const v = this.selectedRow[upper] !== undefined ? this.selectedRow[upper] : this.selectedRow[lower]
+      return v != null ? v : fallback
+    },
+    // get from setupData (PLTCM_PRESET_SETUP columns are uppercase from Oracle)
+    s(col) {
+      const v = this.setupData[col] !== undefined ? this.setupData[col] : this.setupData[col.toLowerCase()]
+      return v != null ? Number(v).toFixed(2) : '—'
+    },
+    formatDate(v) {
+      if (!v) return '—'
+      return String(v).replace('T', ' ').substring(0, 19)
+    },
+    formatStatus(s) { return STATUS_MAP[s] || s || '—' },
+    statusTagType(s) { return STATUS_TAG[s] || '' },
+    formatNextUnit(v) { return NEXT_UNIT_MAP[v] || v || '—' },
+    formatTrimming(v) {
+      if (v === 1 || v === '1') return '净边料'
+      if (v === 0 || v === '0') return '不切边'
+      return v || '—'
+    },
+    formatStratMode(v) {
+      const n = parseInt(v)
+      if (n === 0) return '延伸率模式'
+      if (n === 1) return '压下率模式'
+      return v || '—'
+    },
+    calcPosDev(row) {
+      const exit = parseFloat(row.EXIT_THICK || row.exit_thick || 0)
+      const max = parseFloat(row.MAX_EXIT_THICK || row.max_exit_thick || exit)
+      return isNaN(max - exit) ? '—' : (max - exit).toFixed(3)
+    },
+    calcNegDev(row) {
+      const exit = parseFloat(row.EXIT_THICK || row.exit_thick || 0)
+      const min = parseFloat(row.MIN_EXIT_THICK || row.min_exit_thick || exit)
+      return isNaN(min - exit) ? '—' : (min - exit).toFixed(3)
     }
   }
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+.plan-container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  padding: 8px;
+  background: #f0f2f5;
+  gap: 6px;
+  box-sizing: border-box;
+}
+
 .filter-bar {
   display: flex;
   align-items: center;
   gap: 8px;
-  margin-bottom: 10px;
-}
-
-.main-row {
-  margin: 0 !important;
-}
-
-.left-card {
   background: #fff;
-  border: 1px solid #ebeef5;
+  padding: 8px 10px;
   border-radius: 4px;
-  overflow: hidden;
+  box-shadow: 0 1px 4px rgba(0,0,0,0.06);
+  flex-shrink: 0;
+
+  .total-hint {
+    margin-left: auto;
+    font-size: 12px;
+    color: #909399;
+  }
 }
 
-.empty-hint {
-  display: flex;
-  justify-content: center;
-  padding-top: 80px;
+.table-wrap {
+  background: #fff;
+  border-radius: 4px;
+  box-shadow: 0 1px 4px rgba(0,0,0,0.06);
+  overflow: hidden;
+  flex-shrink: 0;
 }
 
 .pagination-bar {
   display: flex;
   justify-content: flex-end;
-  padding: 6px 8px;
-  border-top: 1px solid #ebeef5;
-  background: #fafafa;
+  padding: 4px 8px;
+  background: #fff;
+  border-radius: 4px;
+  box-shadow: 0 1px 4px rgba(0,0,0,0.06);
+  flex-shrink: 0;
 }
 
-.detail-grid {
+.bottom-panels {
+  display: flex;
+  gap: 6px;
+  flex: 1;
+  min-height: 0;
+}
+
+.detail-panel {
+  flex: 3;
+  background: #fff;
+  border-radius: 4px;
+  box-shadow: 0 1px 4px rgba(0,0,0,0.06);
+  padding: 8px;
+  overflow: auto;
+  display: flex;
+  flex-direction: column;
+}
+
+.settings-panel {
+  flex: 2;
+  background: #fff;
+  border-radius: 4px;
+  box-shadow: 0 1px 4px rgba(0,0,0,0.06);
+  padding: 8px;
+  overflow: auto;
+  display: flex;
+  flex-direction: column;
+}
+
+.panel-title {
+  font-size: 13px;
+  font-weight: 600;
+  color: #303133;
+  margin-bottom: 8px;
+  padding-bottom: 6px;
+  border-bottom: 1px solid #ebeef5;
+  flex-shrink: 0;
+  display: flex;
+  align-items: center;
+}
+
+.detail-grid { display: flex; flex-direction: column; }
+
+.detail-row {
   display: grid;
   grid-template-columns: repeat(4, 1fr);
-  border-top: 1px solid #ebeef5;
-  border-left: 1px solid #ebeef5;
-  margin-bottom: 16px;
+  border-bottom: 1px solid #ebeef5;
 }
 
 .detail-cell {
   display: flex;
-  flex-direction: column;
-  padding: 8px 10px;
+  align-items: center;
+  padding: 6px 10px;
+  gap: 6px;
   border-right: 1px solid #ebeef5;
-  border-bottom: 1px solid #ebeef5;
+  &:last-child { border-right: none; }
 }
 
 .cell-label {
   font-size: 11px;
   color: #909399;
-  margin-bottom: 3px;
+  white-space: nowrap;
+  flex-shrink: 0;
 }
 
 .cell-value {
   font-size: 13px;
-  color: #303133;
+  color: #409eff;
   font-weight: 500;
 }
 
-.perf-header {
-  font-size: 13px;
-  font-weight: 600;
-  color: #606266;
-  margin-bottom: 8px;
+.cell-unit { font-size: 11px; color: #909399; }
+
+.settings-tabs {
+  flex: 1;
+  ::v-deep .el-tabs__content { padding: 8px 0 0; }
+}
+
+.param-grid { display: flex; flex-direction: column; gap: 0; }
+
+.param-row {
   display: flex;
   align-items: center;
-  gap: 6px;
+  padding: 7px 8px;
+  border-bottom: 1px solid #f0f2f5;
+  gap: 8px;
 }
 
-.perf-count {
-  font-weight: normal;
-  color: #909399;
+.param-label {
   font-size: 12px;
+  color: #606266;
+  width: 130px;
+  flex-shrink: 0;
 }
 
-.charts-wrap {
-  /* display: flex; */
-  /* flex-direction: column;
-  gap: 12px; */
-  overflow-y: auto;
-  max-height: calc(100vh - 310px);
+.param-value {
+  font-size: 13px;
+  color: #409eff;
+  font-weight: 500;
+  flex: 1;
 }
 
-.chart-box {
-  width: 100%;
-  height: 200px;
-}
+.param-unit { font-size: 11px; color: #909399; }
 
-/* 状态指示点 */
-.status-dot {
-  display: inline-block;
-  width: 7px;
-  height: 7px;
-  border-radius: 50%;
-  margin-right: 4px;
-  vertical-align: middle;
+.empty-hint {
+  color: #c0c4cc;
+  font-size: 12px;
+  text-align: center;
+  padding: 20px 0;
 }
-.status-text {
-  font-size: 8px;
-  vertical-align: middle;
-}
-.status-ready    { background: #909399; }
-.status-online   { background: #67c23a; }
-.status-producing { background: #e6a23c; }
-.status-product  { background: #409eff; }
-.status-default  { background: #c0c4cc; }
 </style>
diff --git a/klp-ui/src/views/micro/pages/acid/index.vue b/klp-ui/src/views/micro/pages/acid/index.vue
index 3af3a2d6..c00337ca 100644
--- a/klp-ui/src/views/micro/pages/acid/index.vue
+++ b/klp-ui/src/views/micro/pages/acid/index.vue
@@ -27,7 +27,11 @@
           <span slot="title">品质</span>
         </el-menu-item>
         <el-menu-item index="performance">
-          <i class="el-icon-coin"></i>
+          <i class="el-icon-date"></i>
+          <span slot="title">计划</span>
+        </el-menu-item>
+        <el-menu-item index="actualPerformance">
+          <i class="el-icon-data-analysis"></i>
           <span slot="title">实绩</span>
         </el-menu-item>
         <el-menu-item index="rollConfig">
@@ -42,13 +46,9 @@
           <i class="el-icon-warning"></i>
           <span slot="title">停机</span>
         </el-menu-item>
-        <!-- <el-menu-item index="realTime">
-          <i class="el-icon-time"></i>
-          <span slot="title">实时</span>
-        </el-menu-item> -->
       </el-menu>
     </div>
-    <div style="flex: 1;">
+    <div style="flex: 1; overflow: hidden;">
       <component :is="currentComponent" />
     </div>
   </div>
@@ -61,7 +61,7 @@ import Report from './components/Report.vue';
 import Shipping from './components/Shipping.vue';
 import Quality from './components/Quality.vue';
 import Performance from './components/Performance.vue';
-import RealTime from './components/RealTime.vue';
+import ActualPerformance from './components/ActualPerformance.vue';
 import RollConfig from '@/views/timing/roll/index.vue';
 import RollHistory from '@/views/timing/roll/history.vue';
 import Stoppage from '@/views/timing/stoppage/index.vue';
@@ -75,7 +75,7 @@ export default {
     Shipping,
     Quality,
     Performance,
-    RealTime,
+    ActualPerformance,
     RollConfig,
     RollHistory,
     Stoppage
@@ -94,7 +94,7 @@ export default {
         shipping: 'Shipping',
         quality: 'Quality',
         performance: 'Performance',
-        realTime: 'RealTime',
+        actualPerformance: 'ActualPerformance',
         rollConfig: 'RollConfig',
         rollHistory: 'RollHistory',
         stoppage: 'Stoppage',
diff --git a/klp-ui/src/views/wms/coil/info.vue b/klp-ui/src/views/wms/coil/info.vue
index fda62694..c9c297da 100644
--- a/klp-ui/src/views/wms/coil/info.vue
+++ b/klp-ui/src/views/wms/coil/info.vue
@@ -766,7 +766,7 @@ import { listTransferOrderItem } from '@/api/wms/transferOrderItem'
 import { listCoilQualityRejudge } from '@/api/wms/coilQualityRejudge'
 // 引入 ECharts 和 L2 时序数据 API
 import * as echarts from 'echarts'
-import { getTimingSegByEncoilId } from '@/api/l2/timing'
+import { getTimingSegByEncoilId, getTimingPlanDetailByHotcoilId } from '@/api/l2/timing'
 
 import AbnormalTable from '@/views/wms/coil/components/AbnormalTable.vue';
 import FileList from "@/components/FileList";
@@ -1176,11 +1176,16 @@ export default {
     },
     // 加载生产数据
     async loadProductionData() {
-      const encoilId = this.coilInfo.currentCoilNo;
-      if (!encoilId) return;
+      const hotCoilId = this.coilInfo.enterCoilNo;
+      if (!hotCoilId) return;
       
       this.perfLoading = true;
       try {
+        // 先查询详情
+        const detail = await getTimingPlanDetailByHotcoilId(hotCoilId);
+        const encoilId = detail?.data?.firstRow?.coilid || '';
+        if (!encoilId) return;
+        
         const res = await getTimingSegByEncoilId(encoilId);
         const series = res?.data?.series || null;
         const rows = res?.data?.rows || [];
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index d0a5df23..086c9be2 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -607,6 +607,178 @@
         </div>
       </div>
     </el-dialog>
+
+    <!-- 钢卷暂存单据管理 -->
+    <el-card class="box-card" style="margin-top: 20px;" :body-style="{ padding: '20px' }">
+      <div slot="header" class="clearfix">
+        <span>钢卷暂存单据管理</span>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="createTempOrder">创建暂存单据</el-button>
+      </div>
+      
+      <!-- 暂存单据列表 -->
+      <el-table :data="tempOrderList" style="width: 100%" :height="'calc(100vh - 500px)'">
+        <el-table-column prop="orderName" label="单据名称">
+          <template slot-scope="scope">
+            <div style="display: flex; align-items: center; gap: 5px;">
+              <el-link type="primary" @click="viewSelectedCoils(scope.row)">{{ scope.row.orderName }}</el-link>
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="editOrderName(scope.row)"></el-button>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="创建时间"></el-table-column>
+        <el-table-column prop="coilCount" label="钢卷数量">
+          <template slot-scope="scope">
+            <el-tag size="small">{{ (scope.row.coils && scope.row.coils.length) ? scope.row.coils.length : 0 }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="totalWeight" label="总重量(t)">
+          <template slot-scope="scope">
+            {{ calculateTotalWeight(scope.row.coils || []).toFixed(3) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button size="mini" type="text" @click="openCoilSelection(scope.row)">选择钢卷</el-button>
+            <el-button size="mini" type="text" style="color: #f56c6c;" @click="deleteTempOrder(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      
+      <!-- 当没有数据时显示提示 -->
+      <div v-if="!tempOrderList || tempOrderList.length === 0" style="text-align: center; padding: 50px; color: #909399;">
+        <i class="el-icon-document" style="font-size: 48px; margin-bottom: 10px;"></i>
+        <div>暂无暂存单据</div>
+        <div style="font-size: 12px; margin-top: 5px;">点击右上角"创建暂存单据"开始使用</div>
+      </div>
+    </el-card>
+
+    <!-- 钢卷选择对话框 -->
+    <el-dialog title="选择钢卷" :visible.sync="coilSelectionVisible" width="95%" append-to-body>
+      <!-- 上方：查询条件 -->
+      <el-card class="query-card" style="margin-bottom: 15px;">
+        <el-form :model="coilQueryParams" size="small" :inline="true">
+          <el-form-item label="入场卷号">
+            <el-input v-model="coilQueryParams.enterCoilNo" placeholder="请输入入场钢卷号" clearable style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="当前卷号">
+            <el-input v-model="coilQueryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="产品名称">
+            <el-input v-model="coilQueryParams.itemName" placeholder="请选择物料" clearable style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="规格">
+            <el-input v-model="coilQueryParams.itemSpecification" placeholder="请选择规格" clearable style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="材质">
+            <el-input v-model="coilQueryParams.itemMaterial" placeholder="请选择材质" clearable style="width: 200px;" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="searchCoils">查询</el-button>
+            <el-button @click="resetCoilQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-card>
+      
+      <!-- 下方：钢卷列表 -->
+      <div style="height: 500px;">
+        <el-table v-loading="coilLoading" :data="availableCoils" @selection-change="handleCoilSelection" border height="450">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
+            <template slot-scope="scope">
+              <coil-no :coil-no="scope.row.enterCoilNo"></coil-no>
+            </template>
+          </el-table-column>
+          <el-table-column label="当前钢卷号" align="center" prop="currentCoilNo">
+            <template slot-scope="scope">
+              <current-coil-no :current-coil-no="scope.row.currentCoilNo"></current-coil-no>
+            </template>
+          </el-table-column>
+          <el-table-column label="净重" align="center" prop="netWeight" />
+          <el-table-column label="逻辑库位" align="center" prop="warehouseName" />
+          <el-table-column label="实际库区" align="center" prop="actualWarehouseName" />
+          <el-table-column label="产品类型" align="center" width="180">
+            <template slot-scope="scope">
+              <ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row" />
+              <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row" />
+            </template>
+          </el-table-column>
+          <el-table-column label="规格" prop="specification"></el-table-column>
+          <el-table-column label="物料" prop="itemName"></el-table-column>
+          <el-table-column label="材质" prop="material"></el-table-column>
+          <el-table-column label="厂家" prop="manufacturer"></el-table-column>
+          <el-table-column label="表面处理" prop="surfaceTreatmentDesc"></el-table-column>
+          <el-table-column label="品质" prop="qualityStatus"></el-table-column>
+          <el-table-column label="切边" prop="trimmingRequirement"></el-table-column>
+          <el-table-column label="包装" prop="packagingRequirement"></el-table-column>
+          <el-table-column label="状态" align="center" prop="status">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.status === 0" type="info" size="mini">未发货</el-tag>
+              <el-tag v-else type="success" size="mini">已发货</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
+        </el-table>
+        
+        <div style="margin-top: 10px; text-align: center;">
+          <el-pagination
+            @size-change="handleCoilSizeChange"
+            @current-change="handleCoilCurrentChange"
+            :current-page="coilQueryParams.pageNum"
+            :page-sizes="[10, 20, 50, 100]"
+            :page-size="coilQueryParams.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="coilTotal">
+          </el-pagination>
+        </div>
+      </div>
+      
+      <div slot="footer" class="dialog-footer">
+        <div style="margin-bottom: 10px;">
+          <span>已选择 {{ selectedCoils.length }} 个钢卷，总重量：{{ calculateSelectedWeight().toFixed(3) }}t</span>
+        </div>
+        <el-button @click="coilSelectionVisible = false">取消</el-button>
+        <el-button type="primary" @click="saveSelectedCoils">确认选择</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 已选钢卷列表对话框 -->
+    <el-dialog title="已选钢卷列表" :visible.sync="selectedCoilsVisible" width="90%" append-to-body>
+      <el-table :data="currentTempOrder ? (currentTempOrder.coils || []) : []" border>
+        <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
+          <template slot-scope="scope">
+            <coil-no :coil-no="scope.row.enterCoilNo"></coil-no>
+          </template>
+        </el-table-column>
+        <el-table-column label="当前钢卷号" align="center" prop="currentCoilNo">
+          <template slot-scope="scope">
+            <current-coil-no :current-coil-no="scope.row.currentCoilNo"></current-coil-no>
+          </template>
+        </el-table-column>
+        <el-table-column label="净重" align="center" prop="netWeight" />
+        <el-table-column label="逻辑库位" align="center" prop="warehouseName" />
+        <el-table-column label="实际库区" align="center" prop="actualWarehouseName" />
+        <el-table-column label="产品类型" align="center" width="180">
+          <template slot-scope="scope">
+            <ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row" />
+            <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row" />
+          </template>
+        </el-table-column>
+        <el-table-column label="规格" prop="specification"></el-table-column>
+        <el-table-column label="物料" prop="itemName"></el-table-column>
+        <el-table-column label="材质" prop="material"></el-table-column>
+        <el-table-column label="厂家" prop="manufacturer"></el-table-column>
+        <el-table-column label="表面处理" prop="surfaceTreatmentDesc"></el-table-column>
+        <el-table-column label="品质" prop="qualityStatus"></el-table-column>
+        <el-table-column label="切边" prop="trimmingRequirement"></el-table-column>
+        <el-table-column label="包装" prop="packagingRequirement"></el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
+        <el-table-column label="操作" align="center" width="100">
+          <template slot-scope="scope">
+            <el-button size="mini" type="text" style="color: #f56c6c;" @click="removeCoilFromOrder(scope.$index)">移除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
@@ -994,6 +1166,31 @@ export default {
       // 调拨记录弹窗
       transferRecordVisible: false,
       transferRecordList: [],
+      // 暂存单据管理相关数据
+      tempOrderList: [],
+      currentTempOrder: null,
+      coilSelectionVisible: false,
+      selectedCoilsVisible: false,
+      coilLoading: false,
+      availableCoils: [],
+      selectedCoils: [],
+      coilTotal: 0,
+      coilQueryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        enterCoilNo: '',
+        currentCoilNo: '',
+        itemName: '',
+        itemSpecification: '',
+        itemMaterial: '',
+        status: 0,
+        orderBy: true,
+        dataType: 1,
+        materialType: '成品',
+        itemType: 'product',
+        excludeBound: true,
+        selectType: 'product'
+      },
     };
   },
   computed: {
@@ -1021,8 +1218,257 @@ export default {
       this.warehouseIds = this.warehouseOptions.map(item => item.value).join(',');
     }
     this.getList();
+    // 初始化暂存单据列表
+    this.loadTempOrderList();
   },
   methods: {
+    // === 暂存单据管理相关方法 ===
+    // 加载暂存单据列表
+    loadTempOrderList() {
+      const savedOrders = localStorage.getItem('tempCoilOrders');
+      if (savedOrders) {
+        this.tempOrderList = JSON.parse(savedOrders);
+      } else {
+        this.tempOrderList = [];
+      }
+    },
+    
+    // 保存暂存单据列表到本地存储
+    saveTempOrderList() {
+      localStorage.setItem('tempCoilOrders', JSON.stringify(this.tempOrderList));
+    },
+    
+    // 创建暂存单据
+    createTempOrder() {
+      const orderName = `暂存单据_${new Date().toLocaleString().replace(/[/:]/g, '-')}`;
+      const newOrder = {
+        orderId: Date.now().toString(),
+        orderName: orderName,
+        createTime: new Date().toLocaleString(),
+        coils: []
+      };
+      
+      this.tempOrderList.unshift(newOrder);
+      this.saveTempOrderList();
+      
+      this.$message.success('暂存单据创建成功');
+    },
+    
+    // 删除暂存单据
+    deleteTempOrder(order) {
+      this.$confirm(`确认删除暂存单据"${order.orderName}"吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const index = this.tempOrderList.findIndex(item => item.orderId === order.orderId);
+        if (index > -1) {
+          this.tempOrderList.splice(index, 1);
+          this.saveTempOrderList();
+          this.$message.success('删除成功');
+        }
+      }).catch(() => {
+        this.$message.info('已取消删除');
+      });
+    },
+    
+    // 查看已选钢卷列表
+    viewSelectedCoils(order) {
+      this.currentTempOrder = order;
+      this.selectedCoilsVisible = true;
+    },
+    
+    // 编辑单据名称
+    editOrderName(order) {
+      this.$prompt('请输入新的单据名称', '编辑单据名称', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputValue: order.orderName,
+        inputValidator: (value) => {
+          if (!value || value.trim() === '') {
+            return '单据名称不能为空';
+          }
+          return true;
+        }
+      }).then(({ value }) => {
+        const newName = value.trim();
+        // 检查名称是否重复
+        const duplicateOrder = this.tempOrderList.find(item => 
+          item.orderId !== order.orderId && item.orderName === newName
+        );
+        
+        if (duplicateOrder) {
+          this.$message.warning('单据名称已存在，请使用其他名称');
+          return;
+        }
+        
+        // 更新单据名称
+        order.orderName = newName;
+        this.saveTempOrderList();
+        this.$message.success('单据名称修改成功');
+      }).catch(() => {
+        this.$message.info('已取消编辑');
+      });
+    },
+    
+    // 打开钢卷选择对话框
+    openCoilSelection(order) {
+      this.currentTempOrder = order;
+      this.coilSelectionVisible = true;
+      this.searchCoils();
+    },
+    
+    // 计算总重量
+    calculateTotalWeight(coils) {
+      if (!coils || coils.length === 0) return 0;
+      return coils.reduce((total, coil) => {
+        return total + (parseFloat(coil.netWeight) || 0);
+      }, 0);
+    },
+    
+    // 计算选中钢卷的总重量
+    calculateSelectedWeight() {
+      return this.calculateTotalWeight(this.selectedCoils);
+    },
+    
+    // 查询钢卷
+    async searchCoils() {
+      this.coilLoading = true;
+      try {
+        // 构建查询参数
+        const params = { ...this.coilQueryParams };
+        
+        // 移除空值参数
+        Object.keys(params).forEach(key => {
+          if (params[key] === '' || params[key] === null || params[key] === undefined) {
+            delete params[key];
+          }
+        });
+        
+        // 调用接口查询钢卷
+        const response = await listMaterialCoil(params);
+        this.availableCoils = response.rows || [];
+        this.coilTotal = response.total || 0;
+        
+        // 过滤掉所有单据中已选择的钢卷，确保钢卷在所有单据中唯一
+        const allExistingCoilIds = [];
+        this.tempOrderList.forEach(order => {
+          if (order.coils && Array.isArray(order.coils)) {
+            order.coils.forEach(coil => {
+              if (coil.coilId) {
+                allExistingCoilIds.push(coil.coilId);
+              }
+            });
+          }
+        });
+        
+        // 如果是当前正在编辑的单据，排除当前单据中的钢卷（因为它们已经在allExistingCoilIds中了）
+        // 这样可以确保其他单据不能选择当前单据已选的钢卷
+        this.availableCoils = this.availableCoils.filter(coil => !allExistingCoilIds.includes(coil.coilId));
+        
+      } catch (error) {
+        console.error('查询钢卷失败:', error);
+        this.$message.error('查询钢卷失败');
+      } finally {
+        this.coilLoading = false;
+      }
+    },
+    
+    // 重置钢卷查询条件
+    resetCoilQuery() {
+      this.coilQueryParams = {
+        pageNum: 1,
+        pageSize: 20,
+        enterCoilNo: '',
+        currentCoilNo: '',
+        itemName: '',
+        itemSpecification: '',
+        itemMaterial: '',
+        status: 0,
+        orderBy: true,
+        dataType: 1,
+        materialType: '成品',
+        itemType: 'product',
+        excludeBound: true,
+        selectType: 'product'
+      };
+      this.searchCoils();
+    },
+    
+    // 处理钢卷选择变化
+    handleCoilSelection(selection) {
+      this.selectedCoils = selection;
+    },
+    
+    // 保存选中的钢卷
+    saveSelectedCoils() {
+      if (!this.currentTempOrder) {
+        this.$message.error('请先选择暂存单据');
+        return;
+      }
+      
+      if (this.selectedCoils.length === 0) {
+        this.$message.warning('请选择要添加的钢卷');
+        return;
+      }
+      
+      // 确保coils数组存在
+      if (!this.currentTempOrder.coils) {
+        this.currentTempOrder.coils = [];
+      }
+      
+      // 由于在查询阶段已经过滤了所有重复的钢卷，这里不需要再次检查
+      // 但为了安全起见，保留基本的检查逻辑
+      if (this.currentTempOrder.coils && this.currentTempOrder.coils.length > 0) {
+        const existingCoilIds = this.currentTempOrder.coils.map(coil => coil.coilId);
+        const duplicateCoils = this.selectedCoils.filter(coil => existingCoilIds.includes(coil.coilId));
+        
+        if (duplicateCoils.length > 0) {
+          this.$message.warning(`钢卷 ${duplicateCoils.map(coil => coil.enterCoilNo).join(', ')} 已存在，不能重复添加`);
+          return;
+        }
+      }
+      
+      // 添加钢卷到当前单据
+      this.currentTempOrder.coils.push(...this.selectedCoils);
+      this.saveTempOrderList();
+      
+      this.$message.success(`成功添加 ${this.selectedCoils.length} 个钢卷`);
+      
+      // 关闭对话框并重置选择
+      this.coilSelectionVisible = false;
+      this.selectedCoils = [];
+    },
+    
+    // 从单据中移除钢卷
+    removeCoilFromOrder(index) {
+      if (!this.currentTempOrder || !this.currentTempOrder.coils || !this.currentTempOrder.coils[index]) return;
+      
+      this.$confirm('确认移除该钢卷吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.currentTempOrder.coils.splice(index, 1);
+        this.saveTempOrderList();
+        this.$message.success('移除成功');
+      }).catch(() => {
+        this.$message.info('已取消移除');
+      });
+    },
+    
+    // 钢卷分页相关方法
+    handleCoilSizeChange(val) {
+      this.coilQueryParams.pageSize = val;
+      this.coilQueryParams.pageNum = 1;
+      this.searchCoils();
+    },
+    
+    handleCoilCurrentChange(val) {
+      this.coilQueryParams.pageNum = val;
+      this.searchCoils();
+    },
+    
     // 进入数字钢卷页面
     handleNumberCoilClick(row) {
       this.$router.push({
diff --git a/klp-ui/src/views/wms/delivery/waybill/index.vue b/klp-ui/src/views/wms/delivery/waybill/index.vue
index 9a165f68..3859f3e3 100644
--- a/klp-ui/src/views/wms/delivery/waybill/index.vue
+++ b/klp-ui/src/views/wms/delivery/waybill/index.vue
@@ -47,6 +47,15 @@
                   :value="item.value" />
               </el-select>
             </el-form-item>
+            <el-form-item label="单据状态" prop="status">
+              <el-select v-model="queryParams.status" placeholder="请选择完成状态" @change="handleQuery">
+                <el-option label="已发货" :value="1" />
+                <el-option label="未发货" :value="0" />
+                <el-option label="已打印" :value="2" />
+                <el-option label="未打印" :value="3" />
+              </el-select>
+            </el-form-item>
+             
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
diff --git a/klp-ui/src/views/wms/processSpec/index.vue b/klp-ui/src/views/wms/processSpec/index.vue
index b41201fa..e284d4b0 100644
--- a/klp-ui/src/views/wms/processSpec/index.vue
+++ b/klp-ui/src/views/wms/processSpec/index.vue
@@ -1,601 +1,392 @@
 <template>
-  <div class="spec-page">
-    <!-- 规程类型 -->
-    <div class="dict-toolbar-row">
-      <div class="type-tab-bar">
-        <span
-          v-for="t in specTypeTab"
-          :key="'stype-' + (t.value === '' ? 'all' : t.value)"
-          :class="['type-tab', { active: activeSpecType === t.value }]"
-          @click="switchSpecType(t.value)"
-        >{{ t.label }}</span>
-      </div>
-      <dict-select
-        toolbar-only
-        :kisv="false"
-        :editable="true"
-        :refresh="false"
-        :dict-type="DICT_SPEC_TYPE"
-        panel-title="规程工艺类型字典"
-        @dict-updated="loadSpecTypeDict"
-      />
+  <div class="spec-version-page" v-loading="pageLoading">
+    <!-- 头部 -->
+    <div class="page-header">
+      <span class="page-title">规程版本管理</span>
+      <el-button
+        type="primary"
+        size="small"
+        icon="el-icon-plus"
+        style="margin-left:auto"
+        @click="openSpecDialog()"
+      >新建规程</el-button>
     </div>
 
-    <!-- 产线 -->
-    <div class="dict-toolbar-row line-row">
-      <div class="line-tab-bar">
-        <span
-          :class="['line-tab', { active: activeLineId === '' }]"
-          @click="switchLine('')"
-        >全部</span>
-        <span
-          v-for="line in lineOptions"
-          :key="'ln-' + line.lineId"
-          :class="['line-tab', { active: lineTabActive(line) }]"
-          @click="switchLine(line.lineId)"
-        >{{ line.lineName }}</span>
-      </div>
-      <dict-select
-        toolbar-only
-        :kisv="false"
-        :editable="true"
-        :refresh="false"
-        :dict-type="DICT_LINE"
-        panel-title="规程产线筛选项（字典值为产线 line_id）"
-        @dict-updated="loadLineOptions"
-      />
+    <!-- 规程列表 -->
+    <div class="section-wrapper">
+      <div class="section-title">规程列表</div>
+      <el-table
+        :data="specList"
+        size="small"
+        highlight-current-row
+        @row-click="onSpecRowClick"
+        :row-class-name="tableRowClassName"
+      >
+        <el-table-column label="规程编码" prop="specCode" width="150" />
+        <el-table-column label="规程名称" prop="specName" />
+        <el-table-column label="创建时间" prop="createTime" width="180" />
+        <el-table-column label="操作" align="right" width="180">
+          <template slot-scope="{ row }">
+            <el-button type="text" size="mini" @click.stop="openSpecDialog(row)">编辑</el-button>
+            <el-button type="text" size="mini" class="btn-danger" @click.stop="removeSpec(row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
     </div>
 
-    <!-- 工具栏 -->
-    <div class="toolbar">
-      <div class="toolbar-left">
-        <el-button type="primary" size="mini" icon="el-icon-plus" @click="handleAdd">新增</el-button>
-        <el-button size="mini" icon="el-icon-edit" :disabled="single" @click="handleUpdate()">修改</el-button>
-        <el-button size="mini" icon="el-icon-delete" :disabled="multiple" @click="handleDelete()">删除</el-button>
-      </div>
-      <div class="toolbar-right">
-        <el-input
-          v-model="queryParams.specName"
-          size="small"
-          placeholder="规程名称"
-          clearable
-          style="width:180px; margin-right:8px"
-          @keyup.enter.native="handleQuery"
-        />
-        <el-button size="mini" type="primary" @click="handleQuery">查询</el-button>
-        <el-button size="mini" @click="resetQuery">重置</el-button>
+    <!-- 版本列表 -->
+    <div class="section-wrapper" v-if="currentSpec">
+      <div class="section-title">
+        版本列表 - {{ currentSpec.specName }}
+        <el-button
+          type="primary"
+          size="mini"
+          icon="el-icon-plus"
+          @click="openVersionDialog()"
+        >新建版本</el-button>
       </div>
+      <el-table
+        :data="versionList"
+        size="small"
+        highlight-current-row
+        @row-click="onVersionRowClick"
+      >
+        <el-table-column label="版本号" prop="versionCode" />
+        <el-table-column label="状态" prop="status" />
+        <el-table-column label="创建时间" prop="createTime" />
+        <el-table-column label="生效" align="center">
+          <template slot-scope="{ row }">
+            <el-switch
+              :value="row.isActive === 1"
+              active-color="#5F7BA0"
+              @click.native.stop
+              @change="handleActiveChange(row, $event)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="right">
+          <template slot-scope="{ row }">
+            <el-button type="text" size="mini" @click.stop="openVersionDialog(row)">编辑</el-button>
+            <el-button type="text" size="mini" class="btn-danger" @click.stop="removeVersion(row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-empty v-if="!versionList.length && !versionLoading" description="暂无版本，请新建" style="padding:40px 0" />
     </div>
+    <div v-else class="empty-hint">请选择一个规程查看其版本</div>
 
-    <!-- 列表 -->
-    <el-table
-      v-loading="loading"
-      :data="dataList"
-      size="small"
-      highlight-current-row
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" />
-      <el-table-column label="规程编号" prop="specCode" show-overflow-tooltip />
-      <el-table-column label="规程名称" prop="specName" show-overflow-tooltip />
-      <el-table-column label="产品类型" prop="productType" show-overflow-tooltip />
-      <el-table-column label="创建时间" prop="createTime" />
-      <el-table-column label="启用" align="center">
-        <template slot-scope="{ row }">
-          <el-switch
-            :value="row.isEnabled === 1"
-            active-color="#5F7BA0"
-            @change="toggleEnabled(row, $event)"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="right">
-        <template slot-scope="{ row }">
-          <el-button type="text" size="mini" @click="goVersionManage(row)">版本与方案</el-button>
-          <el-button type="text" size="mini" @click="handleUpdate(row)">修改</el-button>
-          <el-button type="text" size="mini" class="btn-danger" @click="handleDelete(row)">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 新增/修改 -->
-    <el-dialog :title="dialogTitle" :visible.sync="open" width="520px" append-to-body @close="reset">
-      <el-form ref="form" :model="form" :rules="rules" label-width="88px" size="small">
-        <el-form-item label="规程编号" prop="specCode">
-          <el-input v-model="form.specCode" placeholder="唯一编号" maxlength="64" show-word-limit />
+    <!-- 新建/编辑规程 -->
+    <el-dialog :title="specTitle" :visible.sync="specOpen" width="500px" append-to-body @close="specForm = {}">
+      <el-form ref="specFormRef" :model="specForm" :rules="specRules" label-width="88px" size="small">
+        <el-form-item label="规程编码" prop="specCode">
+          <el-input v-model="specForm.specCode" placeholder="请输入规程编码" maxlength="64" />
         </el-form-item>
         <el-form-item label="规程名称" prop="specName">
-          <el-input v-model="form.specName" maxlength="200" show-word-limit />
+          <el-input v-model="specForm.specName" placeholder="请输入规程名称" maxlength="200" />
         </el-form-item>
-        <el-form-item label="规程类型" prop="specType">
-          <el-select v-model="form.specType" style="width:100%">
-            <el-option
-              v-for="t in specTypeOptionsForForm"
-              :key="t.dictValue"
-              :label="t.dictLabel"
-              :value="t.dictValue"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="产线" prop="lineId">
-          <el-select v-model="form.lineId" filterable placeholder="请选择" style="width:100%">
-            <el-option
-              v-for="line in lineOptionsForForm"
-              :key="line.lineId"
-              :label="lineOptLabel(line)"
-              :value="line.lineId"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="产品类型" prop="productType">
-          <el-input v-model="form.productType" maxlength="100" />
-        </el-form-item>
-        <el-form-item label="是否启用" prop="isEnabled">
-          <el-switch v-model="form.isEnabled" :active-value="1" :inactive-value="0" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" rows="2" maxlength="500" show-word-limit />
+        <el-form-item label="备注">
+          <el-input v-model="specForm.remark" type="textarea" rows="2" maxlength="500" show-word-limit />
         </el-form-item>
       </el-form>
       <div slot="footer">
-        <el-button size="small" @click="open = false">取消</el-button>
-        <el-button size="small" type="primary" :loading="btnLoading" @click="submitForm">确定</el-button>
+        <el-button size="small" @click="specOpen = false">取消</el-button>
+        <el-button size="small" type="primary" :loading="specSubmitLoading" @click="submitSpec">确定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 新建/编辑版本 -->
+    <el-dialog :title="versionTitle" :visible.sync="versionOpen" width="500px" append-to-body @close="versionForm = {}">
+      <el-form ref="versionFormRef" :model="versionForm" :rules="versionRules" label-width="88px" size="small">
+        <el-form-item label="版本号" prop="versionCode">
+          <el-input v-model="versionForm.versionCode" placeholder="如 V1.0" maxlength="64" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="versionForm.status" style="width:100%">
+            <el-option v-for="s in statusOptions" :key="s" :label="s" :value="s" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="保存后生效">
+          <el-switch v-model="versionForm.isActive" :active-value="1" :inactive-value="0" />
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="versionForm.remark" type="textarea" rows="2" maxlength="500" show-word-limit />
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button size="small" @click="versionOpen = false">取消</el-button>
+        <el-button size="small" type="primary" :loading="versionSubmitLoading" @click="submitVersion">确定</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { getDicts } from '@/api/system/dict/data'
-import { listProcessSpec, getProcessSpec, delProcessSpec, updateProcessSpec, addProcessSpec } from '@/api/wms/processSpec'
-import { listProductionLine } from '@/api/wms/productionLine'
-
-const DICT_SPEC_TYPE = 'wms_process_spec_type'
-const DICT_LINE = 'wms_process_spec_line'
-
-const DEFAULT_SPEC_TYPES = [
-]
+import { listProcessSpec, getProcessSpec, addProcessSpec, updateProcessSpec, delProcessSpec } from '@/api/wms/processSpec'
+import {
+  listProcessSpecVersion,
+  addProcessSpecVersion,
+  updateProcessSpecVersion,
+  delProcessSpecVersion,
+  activateProcessSpecVersion
+} from '@/api/wms/processSpecVersion'
 
 export default {
-  name: 'ProcessSpec',
+  name: 'SpecVersionManage',
   data() {
     return {
-      DICT_SPEC_TYPE,
-      DICT_LINE,
-      loading: false,
-      btnLoading: false,
-      total: 0,
-      dataList: [],
-      ids: [],
-      single: true,
-      multiple: true,
-      open: false,
-      dialogTitle: '',
-      specTypeRows: [],
-      lineOptions: [],
-      activeSpecType: '',
-      activeLineId: '',
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        specName: undefined,
-        specType: undefined,
-        lineId: undefined
+      pageLoading: false,
+      specList: [],
+      currentSpec: null,
+      currentSpecId: null,
+      versionList: [],
+      versionLoading: false,
+      statusOptions: ['DRAFT', 'PUBLISHED', 'OBSOLETE'],
+      
+      // 规程相关
+      specOpen: false,
+      specTitle: '',
+      specSubmitLoading: false,
+      specForm: {},
+      specRules: {
+        specCode: [{ required: true, message: '规程编码不能为空', trigger: 'blur' }],
+        specName: [{ required: true, message: '规程名称不能为空', trigger: 'blur' }]
       },
-      form: {},
-      rules: {
-        specCode: [{ required: true, message: '规程编号不能为空', trigger: 'blur' }],
-        specName: [{ required: true, message: '规程名称不能为空', trigger: 'blur' }],
-        specType: [{ required: true, message: '请选择规程类型', trigger: 'change' }],
-        lineId: [{ required: true, message: '请选择产线', trigger: 'change' }]
+      
+      // 版本相关
+      versionOpen: false,
+      versionTitle: '',
+      versionSubmitLoading: false,
+      versionForm: {},
+      versionRules: {
+        versionCode: [{ required: true, message: '版本号不能为空', trigger: 'blur' }],
+        status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
       }
     }
   },
-  computed: {
-    specTypeTab() {
-      const rows = this.mergeSpecTypeRowsWithDefaults()
-      const sorted = [...rows].sort((a, b) => (Number(a.dictSort) || 0) - (Number(b.dictSort) || 0))
-      return [{ label: '全部', value: '' }, ...sorted.map(r => ({ label: r.dictLabel, value: r.dictValue }))]
-    },
-    specTypeOptionsForForm() {
-      const rows = this.mergeSpecTypeRowsWithDefaults()
-      return [...rows].sort((a, b) => (Number(a.dictSort) || 0) - (Number(b.dictSort) || 0))
-    },
-    lineOptionsForForm() {
-      return this.lineOptions
-    }
-  },
   created() {
-    Promise.all([this.loadSpecTypeDict(), this.loadLineOptions()]).finally(() => {
-      this.getList()
-    })
+    this.loadSpecs()
   },
   methods: {
-    /**
-     * 工艺类型：默认 PROCESS/STANDARD 与字典合并。若仅有字典中存在的新项，仍可保留两行基础兜底；同 dict_value 以字典为准（可改名、调 sort）。
-     */
-    mergeSpecTypeRowsWithDefaults() {
-      const byVal = new Map()
-      DEFAULT_SPEC_TYPES.forEach(row => {
-        byVal.set(row.dictValue, { ...row })
-      })
-      for (const row of this.specTypeRows || []) {
-        if (!row || row.dictValue === undefined || row.dictValue === null || row.dictValue === '') continue
-        const v = String(row.dictValue)
-        const prev = byVal.get(v)
-        const sort = row.dictSort != null && row.dictSort !== ''
-          ? Number(row.dictSort)
-          : (prev && prev.dictSort != null ? prev.dictSort : 999)
-        const label = (row.dictLabel != null && String(row.dictLabel).trim() !== '')
-          ? row.dictLabel
-          : (prev && prev.dictLabel)
-        byVal.set(v, {
-          dictLabel: label,
-          dictValue: v,
-          dictSort: sort
-        })
-      }
-      return Array.from(byVal.values())
+    // 表格行样式
+    tableRowClassName({ row }) {
+      return row.specId === this.currentSpecId ? 'current-row' : ''
     },
-    /**
-     * 产线 ID 与字典值：用数字字符串，避免超过 Number.MAX_SAFE_INTEGER 时精度丢失（雪花 id）。
-     */
-    normalizeLineIdString(value) {
-      if (value === undefined || value === null || value === '') return ''
-      const s = String(value).trim()
-      return /^\d+$/.test(s) ? s : ''
-    },
-    /** Tab 高亮：雪花 id 一律按字符串比较 */
-    lineTabActive(line) {
-      if (this.activeLineId === '' || this.activeLineId === undefined) return false
-      return String(this.activeLineId) === String(line.lineId)
-    },
-    parseDictRows(res) {
-      const rows = (res.data || []).filter(d => d.status === '0' || d.status === undefined)
-      rows.sort((a, b) => (Number(a.dictSort) || 0) - (Number(b.dictSort) || 0))
-      return rows
-    },
-    async loadSpecTypeDict() {
-      try {
-        const res = await getDicts(DICT_SPEC_TYPE)
-        this.specTypeRows = this.parseDictRows(res)
-      } catch (err) {
-        console.error('规程工艺类型字典加载失败', err)
-        this.specTypeRows = []
-      }
-    },
-    /**
-     * 产线 Tab：产线主表 ∪ 字典中合法数字 line_id（字典独有也会显示 Tab）。
-     * line_id 全程用数字字符串，避免超过 Number.MAX_SAFE_INTEGER 时精度丢失；字典值须为数字 line_id。
-     */
-    async loadLineOptions() {
-      const previousOptions = Array.isArray(this.lineOptions) && this.lineOptions.length
-        ? this.lineOptions.map(o => ({ ...o }))
-        : []
-
-      let dictRows = []
-      try {
-        const res = await getDicts(DICT_LINE)
-        dictRows = this.parseDictRows(res)
-      } catch (err) {
-        console.error('规程产线字典加载失败', err)
-      }
-
-      const dictMeta = new Map()
-      for (const d of dictRows) {
-        const idStr = this.normalizeLineIdString(d.dictValue)
-        if (!idStr) continue
-        const sort = Number(d.dictSort) || 0
-        const label = (d.dictLabel != null && String(d.dictLabel).trim() !== '')
-          ? String(d.dictLabel).trim()
-          : idStr
-        dictMeta.set(idStr, { label, sort })
-      }
-
-      let tableLines = []
-      // try {
-      //   const res = await listProductionLine({ pageNum: 1, pageSize: 500 })
-      //   tableLines = (res.rows || []).map(p => {
-      //     const idStr = this.normalizeLineIdString(p.lineId) || (p.lineId != null ? String(p.lineId).trim() : '')
-      //     return {
-      //       lineId: idStr,
-      //       lineName: p.lineName,
-      //       lineCode: p.lineCode
-      //     }
-      //   }).filter(p => p.lineId)
-      // } catch (e2) {
-      //   console.error('产线列表加载失败', e2)
-      // }
-
-      const tableIdSet = new Set(tableLines.map(l => String(l.lineId)))
-      const next = []
-
-      for (const line of tableLines) {
-        const idStr = String(line.lineId)
-        const dm = dictMeta.get(idStr)
-        next.push({
-          lineId: idStr,
-          lineName: dm ? dm.label : line.lineName,
-          lineCode: line.lineCode
-        })
-      }
-
-      const dictOnly = []
-      for (const [idStr, meta] of dictMeta) {
-        if (!tableIdSet.has(idStr)) {
-          dictOnly.push({ lineId: idStr, lineName: meta.label, lineCode: undefined, _sort: meta.sort })
+    
+    // 加载规程列表
+    loadSpecs() {
+      this.pageLoading = true
+      listProcessSpec({ pageNum: 1, pageSize: 500 }).then(res => {
+        this.specList = res.rows || []
+        if (this.specList.length > 0 && !this.currentSpec) {
+          this.selectSpec(this.specList[0])
         }
-      }
-      dictOnly.sort((a, b) => a._sort - b._sort)
-      dictOnly.forEach(d => {
-        const { _sort, ...rest } = d
-        next.push(rest)
+      }).catch(e => console.error(e)).finally(() => { this.pageLoading = false })
+    },
+    
+    // 选择规程
+    selectSpec(spec) {
+      this.currentSpec = spec
+      this.currentSpecId = spec.specId
+      this.loadVersions()
+    },
+    
+    // 点击规程行
+    onSpecRowClick(row) {
+      this.selectSpec(row)
+    },
+    
+    // 加载版本列表
+    loadVersions() {
+      if (!this.currentSpecId) return
+      this.versionLoading = true
+      listProcessSpecVersion({ specId: this.currentSpecId, pageNum: 1, pageSize: 200 }).then(res => {
+        this.versionList = res.rows || []
+      }).catch(e => console.error(e)).finally(() => { this.versionLoading = false })
+    },
+    
+    // 点击版本行
+    onVersionRowClick(row) {
+      this.goPlanSpec(row)
+    },
+    
+    // 跳转到方案详情
+    goPlanSpec(row) {
+      const basePath = this.$route.path.replace(/\/[^/]*$/, '')
+      console.log(basePath)
+      this.$router.push({
+        path: `/process/processSpec/planSpec`,
+        query: { specId: this.currentSpecId, versionId: String(row.versionId), versionCode: row.versionCode }
       })
-
-      if (next.length === 0 && previousOptions.length > 0) {
-        console.warn('[规程产线] 本次未解析出有效筛选项（可能字典值非数字或产线接口异常），保留上一版 Tab')
+    },
+    
+    // 生效切换
+    handleActiveChange(row, val) {
+      if (!val) {
+        this.$message.info('请激活其他版本来替换当前生效版本')
         return
       }
-      this.lineOptions = next
-    },
-    lineOptLabel(line) {
-      if (line.lineCode) {
-        return `${line.lineName}（${line.lineCode}）`
-      }
-      return line.lineName
-    },
-    getList() {
-      this.loading = true
-      listProcessSpec(this.queryParams).then(res => {
-        this.dataList = res.rows || []
-        this.total = res.total || 0
-      }).finally(() => { this.loading = false })
-    },
-    switchSpecType(val) {
-      this.activeSpecType = val
-      this.queryParams.specType = val || undefined
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    switchLine(lineId) {
-      if (lineId === '' || lineId === undefined || lineId === null) {
-        this.activeLineId = ''
-      } else {
-        const s = this.normalizeLineIdString(lineId)
-        this.activeLineId = s || String(lineId).trim()
-      }
-      this.queryParams.lineId = this.activeLineId === '' ? undefined : this.activeLineId
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    resetQuery() {
-      this.queryParams.specName = undefined
-      this.handleQuery()
-    },
-    handleSelectionChange(sel) {
-      this.ids = sel.map(r => r.specId)
-      this.single = sel.length !== 1
-      this.multiple = !sel.length
-    },
-    defaultSpecType() {
-      const first = this.specTypeOptionsForForm[0]
-      return first ? first.dictValue : 'PROCESS'
-    },
-    reset() {
-      this.form = {
-        specId: undefined,
-        specCode: undefined,
-        specName: undefined,
-        specType: this.defaultSpecType(),
-        lineId: undefined,
-        productType: undefined,
-        isEnabled: 1,
-        remark: undefined
-      }
-      this.$refs.form && this.$refs.form.clearValidate()
-    },
-    handleAdd() {
-      this.reset()
-      this.dialogTitle = '新增规程'
-      this.open = true
-    },
-    handleUpdate(row) {
-      this.reset()
-      const specId = row ? row.specId : this.ids[0]
-      getProcessSpec(specId).then(res => {
-        this.form = res.data || {}
-        if (this.form.lineId != null && this.form.lineId !== '') {
-          const sid = this.normalizeLineIdString(this.form.lineId)
-          this.form.lineId = sid || String(this.form.lineId).trim()
-        }
-        this.dialogTitle = '修改规程'
-        this.open = true
-      })
-    },
-    submitForm() {
-      this.$refs.form.validate(valid => {
-        if (!valid) return
-        this.btnLoading = true
-        const req = this.form.specId ? updateProcessSpec(this.form) : addProcessSpec(this.form)
-        req.then(() => {
-          this.$modal.msgSuccess('保存成功')
-          this.open = false
-          this.getList()
-        }).finally(() => { this.btnLoading = false })
-      })
-    },
-    handleDelete(row) {
-      const ids = row ? row.specId : this.ids
-      this.$modal.confirm('确认删除所选规程？').then(() => {
-        this.loading = true
-        return delProcessSpec(ids)
+      this.$modal.confirm('确认将版本"' + row.versionCode + '"设为当前生效版本？').then(() => {
+        return activateProcessSpecVersion(row.versionId)
       }).then(() => {
-        this.$modal.msgSuccess('删除成功')
-        this.getList()
-      }).catch(() => {}).finally(() => { this.loading = false })
-    },
-    toggleEnabled(row, val) {
-      const updated = { ...row, isEnabled: val ? 1 : 0 }
-      updateProcessSpec(updated).then(() => {
-        row.isEnabled = updated.isEnabled
+        this.$modal.msgSuccess('已生效')
+        this.loadVersions()
       }).catch(() => {})
     },
-    goVersionManage(row) {
-      const pathCurrent = this.$route.path.replace(/\/$/, '')
-      const m = pathCurrent.match(/^(.*\/processSpec)(?:\/.*)?$/)
-      const base = m ? m[1] : pathCurrent
-      this.$router.push({ path: `${base}/version`, query: { specId: String(row.specId) } })
+    
+    // 规程对话框
+    openSpecDialog(row) {
+      this.specForm = row
+        ? { ...row }
+        : { specCode: undefined, specName: undefined, remark: undefined }
+      this.specTitle = row ? '编辑规程' : '新建规程'
+      this.specOpen = true
+      this.$nextTick(() => this.$refs.specFormRef && this.$refs.specFormRef.clearValidate())
+    },
+    
+    // 提交规程
+    submitSpec() {
+      this.$refs.specFormRef.validate(ok => {
+        if (!ok) return
+        this.specSubmitLoading = true
+        const req = this.specForm.specId ? updateProcessSpec(this.specForm) : addProcessSpec(this.specForm)
+        req.then(() => {
+          this.$modal.msgSuccess('保存成功')
+          this.specOpen = false
+          this.loadSpecs()
+        }).catch(e => console.error(e)).finally(() => { this.specSubmitLoading = false })
+      })
+    },
+    
+    // 删除规程
+    removeSpec(row) {
+      this.$modal.confirm('确认删除规程"' + row.specName + '"？').then(() => {
+        return delProcessSpec(row.specId)
+      }).then(() => {
+        this.$modal.msgSuccess('删除成功')
+        if (this.currentSpecId === row.specId) {
+          this.currentSpec = null
+          this.currentSpecId = null
+          this.versionList = []
+        }
+        this.loadSpecs()
+      }).catch(() => {})
+    },
+    
+    // 版本对话框
+    openVersionDialog(row) {
+      this.versionForm = row
+        ? { ...row }
+        : { specId: this.currentSpecId, versionCode: undefined, status: 'DRAFT', isActive: 0, remark: undefined }
+      this.versionTitle = row ? '编辑版本' : '新建版本'
+      this.versionOpen = true
+      this.$nextTick(() => this.$refs.versionFormRef && this.$refs.versionFormRef.clearValidate())
+    },
+    
+    // 提交版本
+    submitVersion() {
+      this.$refs.versionFormRef.validate(ok => {
+        if (!ok) return
+        this.versionSubmitLoading = true
+        const req = this.versionForm.versionId
+          ? updateProcessSpecVersion({ ...this.versionForm, specId: this.currentSpecId })
+          : addProcessSpecVersion({ ...this.versionForm, specId: this.currentSpecId })
+        req.then(() => {
+          this.$modal.msgSuccess('保存成功')
+          this.versionOpen = false
+          this.loadVersions()
+        }).catch(e => console.error(e)).finally(() => { this.versionSubmitLoading = false })
+      })
+    },
+    
+    // 删除版本
+    removeVersion(row) {
+      this.$modal.confirm('确认删除版本"' + row.versionCode + '"？').then(() => {
+        return delProcessSpecVersion(row.versionId)
+      }).then(() => {
+        this.$modal.msgSuccess('删除成功')
+        this.loadVersions()
+      }).catch(() => {})
     }
   }
 }
 </script>
 
 <style scoped>
-.spec-page {
+.spec-version-page {
   padding: 16px 20px;
-
   min-height: 100%;
 }
 
-/* ── 双色主题：默认=白底灰边，激活/主操作=深藏青 #5F7BA0 ── */
-
-.dict-toolbar-row {
+.page-header {
   display: flex;
-  flex-wrap: wrap;
   align-items: center;
-  gap: 8px 10px;
-  margin-bottom: 6px;
+  gap: 10px;
+  margin-bottom: 16px;
+  padding-bottom: 12px;
+  border-bottom: 1px solid #ebeef5;
 }
 
-.dict-toolbar-row.line-row {
+.page-title {
+  font-size: 15px;
+  font-weight: 600;
+  color: #303133;
+}
+
+.section-wrapper {
+  background: #fff;
+  border-radius: 4px;
+  padding: 12px;
+  margin-bottom: 16px;
+  border: 1px solid #ebeef5;
+}
+
+.section-title {
+  font-size: 13px;
+  font-weight: 600;
+  color: #606266;
   margin-bottom: 12px;
-}
-
-.type-tab-bar {
   display: flex;
-  flex: 0 1 auto;
-  flex-wrap: wrap;
-  gap: 0;
-  border-radius: 4px;
-  overflow: hidden;
-  border: 1px solid #dcdfe6;
-}
-
-.type-tab {
-  padding: 5px 14px;
-  font-size: 12px;
-  cursor: pointer;
-  color: #606266;
-  background: #fff;
-  border: none;
-  border-right: 1px solid #dcdfe6;
-  transition: color .15s, background .15s;
-  user-select: none;
-  line-height: 1;
-}
-
-.type-tab:last-child { border-right: none; }
-.type-tab:hover { color: #5F7BA0; }
-
-.type-tab.active {
-  color: #fff;
-  background: #5F7BA0;
-}
-
-.line-tab-bar {
-  display: flex;
-  flex-wrap: wrap;
-  flex: 0 1 auto;
   align-items: center;
-  gap: 6px;
-  padding: 10px 0;
-  min-width: 0;
-}
-
-.line-tab {
-  padding: 4px 12px;
-  border-radius: 4px;
-  font-size: 12px;
-  cursor: pointer;
-  color: #606266;
-  background: #fff;
-  border: 1px solid #dcdfe6;
-  transition: color .15s, background .15s, border-color .15s;
-  user-select: none;
-  line-height: 1;
-}
-
-.line-tab:hover { color: #5F7BA0; border-color: #5F7BA0; }
-
-.line-tab.active {
-  color: #fff;
-  background: #5F7BA0;
-  border-color: #5F7BA0;
-}
-
-.toolbar {
-  display: flex;
   justify-content: space-between;
-  align-items: center;
-  margin-bottom: 10px;
 }
 
-.toolbar-left,
-.toolbar-right {
-  display: flex;
-  align-items: center;
-  gap: 6px;
+.empty-hint {
+  text-align: center;
+  padding: 60px 0;
+  color: #909399;
+  font-size: 14px;
 }
 
 .el-table {
-  border-radius: 4px;
-  overflow: hidden;
+  border-radius: 0;
+}
+
+::v-deep .el-table .current-row {
+  background: #f0f7ff !important;
 }
 
-/* el-button：主操作类 → 深藏青；默认类 → 白底灰边 */
 ::v-deep .el-button--primary {
   color: #fff !important;
   background: #5F7BA0 !important;
   border-color: #5F7BA0 !important;
 }
 ::v-deep .el-button--primary:hover,
-::v-deep .el-button--primary:focus {
-  background: #4d6a8e !important;
-  border-color: #4d6a8e !important;
-}
+::v-deep .el-button--primary:focus { background: #4d6a8e !important; border-color: #4d6a8e !important; }
 ::v-deep .el-button--primary:active { background: #4a6585 !important; border-color: #4a6585 !important; }
 ::v-deep .el-button--primary.is-disabled { opacity: .5; }
 
-::v-deep .el-button:not(.el-button--primary):not(.el-button--text):not(.el-button--danger):not(.el-button--info) {
+::v-deep .el-button:not(.el-button--primary):not(.el-button--text):not(.el-button--danger) {
   color: #606266 !important;
   background: #fff !important;
   border-color: #dcdfe6 !important;
 }
-::v-deep .el-button:not(.el-button--primary):not(.el-button--text):not(.el-button--danger):not(.el-button--info):hover {
+::v-deep .el-button:not(.el-button--primary):not(.el-button--text):not(.el-button--danger):hover {
   color: #5F7BA0 !important;
   border-color: #5F7BA0 !important;
 }
-::v-deep .el-button:not(.el-button--primary):not(.el-button--text):not(.el-button--danger):not(.el-button--info).is-disabled { opacity: .5; }
 
 ::v-deep .el-button--text { background: transparent !important; border-color: transparent !important; }
 ::v-deep .el-button--text.btn-danger { color: #f56c6c !important; }
 
 .btn-danger { color: #f56c6c; }
-
-/* 与 Tab 同一行时，将齿轮框配色贴近规程主题 */
-::v-deep .dict-toolbar-row .el-icon-setting {
-  color: #5F7BA0;
-}
 </style>
diff --git a/klp-ui/src/views/wms/processSpec/planSpec.vue b/klp-ui/src/views/wms/processSpec/planSpec.vue
index 28dbc5c3..33729ea8 100644
--- a/klp-ui/src/views/wms/processSpec/planSpec.vue
+++ b/klp-ui/src/views/wms/processSpec/planSpec.vue
@@ -211,7 +211,7 @@
     </el-dialog>
 
     <!-- 模板导入 dialog -->
-    <el-dialog title="模板导入" :visible.sync="importOpen" width="800px" append-to-body @close="resetImport">
+    <el-dialog title="模板导入" :visible.sync="importOpen" width="800px" append-to-body>
       <div class="import-container">
         <!-- 文件上传区域 -->
         <div class="file-upload-area" :class="{ disabled: importStatus === 'processing' }">
diff --git a/klp-ui/src/views/wms/report/template/action.vue b/klp-ui/src/views/wms/report/template/action.vue
index 8124bac4..2c39118e 100644
--- a/klp-ui/src/views/wms/report/template/action.vue
+++ b/klp-ui/src/views/wms/report/template/action.vue
@@ -466,6 +466,7 @@ export default {
       const res = await listPendingAction({ ...this.queryParams, actionType: this.actionType, actionStatus: 2 });
       // 获取两层数据
       const lossIds = res.rows.filter(item => item.coilId).map(item => item.coilId);
+      const lossActionIds = res.rows.filter(item => item.actionId).map(item => item.actionId);
       // 使用new Set去重
       const outIds = [...new Set(res.rows.filter(item => item.processedCoilIds).map(item => item.processedCoilIds))];
 
@@ -479,7 +480,7 @@ export default {
       }
 
       const [lossRes, outRes] = await Promise.all([
-        listCoilWithIds({ ...this.queryParams, coilIds: lossIds.join(',') || '', startTime: '', endTime: '' }),
+        listCoilWithIds({ ...this.queryParams, actionIds: lossActionIds.join(',') || '', startTime: '', endTime: '' }),
         listCoilWithIds({ ...this.queryParams, coilIds: outIds.join(',') || '', startTime: '', endTime: '' }),
       ]);
 
diff --git a/klp-ui/src/views/wms/report/template/merge.vue b/klp-ui/src/views/wms/report/template/merge.vue
index 077e540f..f770b22c 100644
--- a/klp-ui/src/views/wms/report/template/merge.vue
+++ b/klp-ui/src/views/wms/report/template/merge.vue
@@ -240,6 +240,7 @@ export default {
       const res = await listPendingAction({ ...this.queryParams, actionType: this.actionType, actionStatus: 2 });
       // 获取两层数据
       const lossIds = res.rows.map(item => item.coilId);
+      const lossActionIds = res.rows.map(item => item.actionId);
       // 使用new Set去重
       const outIds = [...new Set(res.rows.map(item => item.processedCoilIds))];
 
@@ -253,7 +254,7 @@ export default {
       }
 
       const [lossRes, outRes] = await Promise.all([
-        listCoilWithIds({ ...this.queryParams, coilIds: lossIds.join(',') || '', startTime: '', endTime: '' }),
+        listCoilWithIds({ ...this.queryParams, actionIds: lossActionIds.join(',') || '', startTime: '', endTime: '' }),
         listCoilWithIds({ ...this.queryParams, coilIds: outIds.join(',') || '', startTime: '', endTime: '' }),
       ]);
       this.lossList = lossRes.rows.map(item => {