From 564086c72a109babe216453df46a1501231fad6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Wed, 25 Mar 2026 17:22:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(wms=E6=8A=A5=E8=A1=A8):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8DfetchLossList=E5=8F=82=E6=95=B0=E4=BC=A0=E9=80=92?=
 =?UTF-8?q?=E5=8F=8A=E8=A7=84=E6=A0=BC=E5=88=86=E5=89=B2=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复fetchLossList函数未正确处理传入的actionTypes参数问题，并添加时间参数。同时处理规格分割时的空值情况，避免报错。
---
 klp-ui/src/views/wms/coil/do/correntAll.vue | 1494 +++++++++++++++++++
 klp-ui/src/views/wms/report/js/fetch.js     |    8 +-
 2 files changed, 1499 insertions(+), 3 deletions(-)
 create mode 100644 klp-ui/src/views/wms/coil/do/correntAll.vue

diff --git a/klp-ui/src/views/wms/coil/do/correntAll.vue b/klp-ui/src/views/wms/coil/do/correntAll.vue
new file mode 100644
index 00000000..56611c9b
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/do/correntAll.vue
@@ -0,0 +1,1494 @@
+<template>
+  <div class="app-container acid-do-container">
+    <div class="search-section">
+      <h3 class="page-title">综合钢卷修正</h3>
+      <el-form :model="materialQueryParams" ref="materialQueryForm" size="small" :inline="true" class="search-form">
+        <el-form-item label="入场钢卷号" prop="enterCoilNo">
+          <el-input v-model="materialQueryParams.enterCoilNo" placeholder="请输入入场钢卷号" clearable
+            @keyup.enter.native="handleMaterialQuery" style="width: 200px;" />
+        </el-form-item>
+        <el-form-item label="当前钢卷号" prop="currentCoilNo">
+          <el-input v-model="materialQueryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
+            @keyup.enter.native="handleMaterialQuery" style="width: 200px;" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleMaterialQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" @click="resetMaterialQuery">重置</el-button>
+        </el-form-item>
+        <el-form-item>
+          <span class="search-tip">提示：请至少填写其中一个钢卷号进行搜索</span>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <!-- 未搜索状态 -->
+    <div v-if="!searched" class="empty-search-state">
+      <i class="el-icon-search"></i>
+      <p>请先输入钢卷号进行搜索</p>
+    </div>
+
+    <!-- 搜索结果区域 -->
+    <div v-else>
+      <!-- 上部：钢卷信息 -->
+      <div class="section-card material-section mb20">
+        <div class="section-header">
+          <h3 class="section-title">钢卷信息</h3>
+        </div>
+
+        <!-- 钢卷信息卡片 -->
+        <div v-loading="materialLoading" class="coil-info-container">
+          <div v-if="materialCoilList.length === 0" class="empty-state">
+            <i class="el-icon-box"></i>
+            <p>未找到钢卷数据</p>
+          </div>
+          <div v-for="(item, index) in materialCoilList" :key="item.coilId || index" class="material-card"
+            :style="getBorderStyle(item)">
+            <div class="card-header">
+              <div class="header-left">
+                <current-coil-no :current-coil-no="item.currentCoilNo"></current-coil-no>
+                <el-tag type="info" size="small" class="coil-no-tag" :style="getBorderStyle(item)">{{
+                  getTypeLabel(item) }}</el-tag>
+                <span class="material-type">{{ item.materialType || '原料' }}</span>
+                <el-popover placement="top" width="280" trigger="hover" popper-class="material-params-popover">
+                  <div class="material-params-content">
+                    <div class="params-title">
+                      {{ item.itemName || '—' }}
+                    </div>
+                    <div class="params-list">
+                      <div class="param-item">
+                        <div class="param-row" v-if="item.specification">
+                          <span class="param-label">规格：</span>
+                          <span class="param-value">{{ item.specification }}</span>
+                        </div>
+                        <div class="param-row" v-if="item.material">
+                          <span class="param-label">材质：</span>
+                          <span class="param-value">{{ item.material }}</span>
+                        </div>
+
+                        <div class="param-row" v-if="item.surfaceTreatmentDesc">
+                          <span class="param-label">表面处理：</span>
+                          <span class="param-value">{{ item.surfaceTreatmentDesc }}</span>
+                        </div>
+                        <div class="param-row" v-if="item.zincLayer">
+                          <span class="param-label">镀层质量：</span>
+                          <span class="param-value">{{ item.zincLayer }}</span>
+                        </div>
+                        <div class="param-row" v-if="item.manufacturer">
+                          <span class="param-label">厂家：</span>
+                          <span class="param-value">{{ item.manufacturer }}</span>
+                        </div>
+                      </div>
+                      <div class="param-divider"></div>
+                      <div class="param-item">
+                        <div class="param-row" v-if="item.qualityStatus">
+                          <span class="param-label">质量状态：</span>
+                          <span class="param-value">{{ item.qualityStatus }}</span>
+                        </div>
+                        <div class="param-row" v-if="item.trimmingRequirement">
+                          <span class="param-label">切边要求：</span>
+                          <span class="param-value">{{ item.trimmingRequirement }}</span>
+                        </div>
+                        <div class="param-row" v-if="item.packingStatus">
+                          <span class="param-label">打包状态：</span>
+                          <span class="param-value">{{ item.packingStatus }}</span>
+                        </div>
+                        <div class="param-row" v-if="item.packagingRequirement">
+                          <span class="param-label">包装要求：</span>
+                          <span class="param-value">{{ item.packagingRequirement }}</span>
+                        </div>
+                        <div class="param-row" v-if="item.grossWeight">
+                          <span class="param-label">毛重：</span>
+                          <span class="param-value">{{ item.grossWeight }}t</span>
+                        </div>
+                        <div class="param-row" v-if="item.netWeight">
+                          <span class="param-label">净重：</span>
+                          <span class="param-value">{{ item.netWeight }}t</span>
+                        </div>
+                        <div class="param-row" v-if="item.length">
+                          <span class="param-label">长度：</span>
+                          <span class="param-value">{{ item.length }}</span>
+                        </div>
+                        <div class="param-row" v-if="item.actualLength">
+                          <span class="param-label">实测长度：</span>
+                          <span class="param-value">{{ item.actualLength }}</span>
+                        </div>
+                        <div class="param-row" v-if="item.actualWidth">
+                          <span class="param-label">实测宽度：</span>
+                          <span class="param-value">{{ item.actualWidth }}</span>
+                        </div>
+                        <div class="param-row" v-if="item.temperGrade">
+                          <span class="param-label">调制度：</span>
+                          <span class="param-value">{{ item.temperGrade }}</span>
+                        </div>
+                        <div class="param-row" v-if="item.coatingType">
+                          <span class="param-label">镀层种类：</span>
+                          <span class="param-value">{{ item.coatingType }}</span>
+                        </div>
+                        <div class="param-row" v-if="item.team">
+                          <span class="param-label">班组：</span>
+                          <span class="param-value">{{ item.team }}</span>
+                        </div>
+                        <div class="param-row" v-if="item.updateTime">
+                          <span class="param-label">更新时间：</span>
+                          <span class="param-value">{{ parseTime(item.updateTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+                        </div>
+                        <div class="param-row" v-if="item.updateBy">
+                          <span class="param-label">更新人：</span>
+                          <span class="param-value">{{ item.updateBy }}</span>
+                        </div>
+                        <div class="param-row" v-if="item.remark">
+                          <span class="param-label">备注：</span>
+                          <span class="param-value">{{ item.remark }}</span>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <i slot="reference" class="el-icon-setting param-icon"></i>
+                </el-popover>
+
+                <i class="el-icon-view param-icon" @click="handlePreviewLabel(item)" title="查看标签"></i>
+
+                <i class="el-icon-time param-icon" @click="handleTrace(item)" title="追溯"></i>
+              </div>
+            </div>
+
+            <div class="card-body" style="position: relative;">
+              <div class="info-list">
+                <div class="info-item">
+                  <span class="info-label">入场：</span>
+                  <span class="info-value" :title="item.enterCoilNo">{{ item.enterCoilNo || '—' }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">厂家：</span>
+                  <span class="info-value" :title="item.supplierCoilNo">{{ item.supplierCoilNo || '—' }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">库位：</span>
+                  <span class="info-value" :title="item.warehouseName">{{ item.warehouseName || '—' }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">库区：</span>
+                  <span class="info-value" :title="item.actualWarehouseName">{{ item.actualWarehouseName || '—'
+                  }}</span>
+                </div>
+                <div class="info-item">
+                  <span class="info-label">重量：</span>
+                  <span class="info-value">{{ item.netWeight || '—' }}t</span>
+                </div>
+              </div>
+              <el-button v-if="item.dataType == 1 && item.status == 0"
+                style="position: absolute; bottom: 10px; right: 10px;" type="success" icon="el-icon-refresh"
+                size="mini" @click="handleRestoreMaterial(item)" :loading="item.cancelling"
+                class="action-btn">回滚</el-button>
+              <el-button v-if="item.dataType == 10 && item.status == 0"
+                style="position: absolute; bottom: 10px; right: 10px;" type="success" icon="el-icon-refresh"
+                size="mini" @click="handleForceInMaterial(item)" :loading="item.cancelling"
+                class="action-btn">强制入库</el-button>
+            </div>
+
+            <div class="card-footer">
+              <el-button type="primary" icon="el-icon-check" size="mini" @click="handleCorrectMaterial(item)"
+                :loading="item.picking" class="action-btn">修正</el-button>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- 下部：操作记录 -->
+      <div class="section-card action-section">
+        <div class="section-header">
+          <h3 class="section-title">操作记录</h3>
+          <div class="section-actions">
+            <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+              @click="handleDeleteAction">删除</el-button>
+            <el-button type="warning" plain icon="el-icon-refresh" size="mini" @click="handleRefreshAction"
+              :disabled="buttonLoading" v-loading="buttonLoading">刷新</el-button>
+            <el-checkbox style="margin-left: 10px;" v-model="rubbish" label="1" @change="getActionList">查看被删除操作</el-checkbox>
+          </div>
+        </div>
+
+        <!-- 操作记录搜索 -->
+        <el-form :model="actionQueryParams" ref="actionQueryForm" size="small" :inline="true" class="query-form mb10">
+          <el-form-item label="操作类型" prop="actionType">
+            <el-select v-model="actionQueryParams.actionType" placeholder="请选择操作类型" clearable filterable>
+              <el-option v-for="item in dict.type.action_type" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="操作状态" prop="actionStatus">
+            <el-select v-model="actionQueryParams.actionStatus" placeholder="请选择操作状态" clearable>
+              <el-option label="待处理" :value="0" />
+              <el-option label="处理中" :value="1" />
+              <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="handleActionQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetActionQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <!-- 操作记录表格 -->
+        <div v-loading="actionLoading" class="action-list-container">
+          <el-table :data="actionList" style="width: 100%" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="操作类型" align="center" prop="actionType" width="160">
+              <template slot-scope="scope">
+                <span v-if="scope.row.actionType === 401">入库/收货操作</span>
+                <span v-else-if="scope.row.actionType === 402">发货操作</span>
+                <span v-else-if="scope.row.actionType === 403">移库操作</span>
+                <span v-else-if="scope.row.actionType === 404">通过库区编辑钢卷</span>
+                <span v-else-if="scope.row.actionType === 405">钢卷打包</span>
+                <dict-tag v-else :options='dict.type.action_type' :value="scope.row.actionType"></dict-tag>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="操作状态" align="center" prop="actionStatus" width="120">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.actionStatus" placeholder="请选择操作状态" @change="handleStatusChange(scope.row)">
+                  <el-option label="待处理" :value="0" />
+                  <el-option label="处理中" :value="1" />
+                  <el-option label="已完成" :value="2" />
+                  <el-option label="已取消" :value="3" />
+                </el-select>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="优先级" align="center" prop="priority" width="90">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.priority === 0" type="info" size="mini">普通</el-tag>
+                <el-tag v-else-if="scope.row.priority === 1" type="warning" size="mini">重要</el-tag>
+                <el-tag v-else-if="scope.row.priority === 2" type="danger" size="mini">紧急</el-tag>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="来源" align="center" prop="sourceType" width="80">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.sourceType === 'scan'" type="success" size="mini">
+                  <i class="el-icon-mobile"></i> 扫码
+                </el-tag>
+                <el-tag v-else type="info" size="mini">
+                  <i class="el-icon-edit-outline"></i> 手动
+                </el-tag>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="新增时间" align="center" prop="createTime" width="155" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="操作人" align="center" prop="updateBy" width="100" />
+            <el-table-column label="创建人" align="center" prop="createByName" width="140">
+              <template slot-scope="scope">
+                <el-select @change="handleProcessTimeChange(scope.row)" v-model="scope.row.createBy" placeholder="请选择创建人" filterable>
+                  <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userName" />
+                </el-select>
+              </template>
+            </el-table-column>
+            
+            <el-table-column label="完成时间" align="center" prop="completeTime" width="220" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <el-date-picker @change="handleProcessTimeChange(scope.row)" value-format="yyyy-MM-dd HH:mm:ss"
+                  style="width: 200px" v-model="scope.row.completeTime" type="datetime" placeholder="选择完成时间" />
+              </template>
+            </el-table-column>
+
+            <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+
+            <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
+              <template slot-scope="scope">
+                <!-- 已完成或已取消状态显示删除按钮 -->
+                <template v-if="scope.row.actionStatus === 2 || scope.row.actionStatus === 3">
+                  <el-button v-if="scope.row.delFlag == 0" size="mini" type="danger" icon="el-icon-delete"
+                    @click="handleDeleteAction(scope.row)">删除</el-button>
+                  <el-button v-if="scope.row.delFlag == 2" size="mini" type="success" icon="el-icon-refresh"
+                    @click="handleRestoreAction(scope.row)">还原</el-button>
+                </template>
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <!-- 分页 -->
+          <pagination v-show="actionTotal > 0" :total="actionTotal" :page.sync="actionQueryParams.pageNum"
+            :limit.sync="actionQueryParams.pageSize" @pagination="getActionList" />
+        </div>
+      </div>
+    </div>
+
+    <!-- 标签预览弹窗 -->
+    <el-dialog title="标签预览" :visible.sync="labelRender.visible" append-to-body>
+      <label-render :content="labelRender.data" :labelType="labelRender.type" />
+    </el-dialog>
+
+    <!-- 钢卷修正对话框 -->
+    <el-dialog :title="title" :visible.sync="correctVisible" width="600px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="入场钢卷号" prop="enterCoilNo">
+          <el-input v-model="form.enterCoilNo" placeholder="请输入入场钢卷号" :disabled="form.coilId" />
+        </el-form-item>
+        <el-form-item label="当前钢卷号" prop="currentCoilNo">
+          <el-input v-model="form.currentCoilNo" placeholder="请输入当前钢卷号" />
+        </el-form-item>
+        <el-form-item label="厂家原料卷号" prop="supplierCoilNo">
+          <el-input v-model="form.supplierCoilNo" placeholder="请输入厂家原料卷号" />
+        </el-form-item>
+        <el-form-item label="所在库位" prop="warehouseId">
+          <warehouse-select v-model="form.warehouseId" placeholder="请选择仓库/库区/库位" style="width: 100%;" clearable />
+        </el-form-item>
+        <el-form-item label="实际库区" prop="actualWarehouseId">
+          <actual-warehouse-select v-model="form.actualWarehouseId" placeholder="请选择实际库区" style="width: 100%;"
+            clearable />
+        </el-form-item>
+        <el-form-item label="班组" prop="team">
+          <el-select v-model="form.team" placeholder="请选择班组" style="width: 100%">
+            <el-option key="甲" label="甲" value="甲" />
+            <el-option key="乙" label="乙" value="乙" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="材料类型" prop="materialType">
+          <el-select v-model="form.materialType" placeholder="请选择材料类型" @change="handleMaterialTypeChange">
+            <el-option label="成品" value="成品" />
+            <el-option label="原料" value="原料" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="getItemLabel" prop="itemId">
+          <product-select v-if="form.itemType == 'product'" v-model="form.itemId" placeholder="请选择成品"
+            style="width: 100%;" clearable />
+          <raw-material-select v-else-if="form.itemType == 'raw_material'" v-model="form.itemId" placeholder="请选择原料"
+            style="width: 100%;" clearable />
+          <div v-else>请先选择材料类型</div>
+        </el-form-item>
+        <el-form-item label="质量状态" prop="qualityStatus">
+          <el-select v-model="form.qualityStatus" placeholder="请选择质量状态" style="width: 100%">
+            <el-option v-for="item in dict.type.coil_quality_status" :key="item.value" :label="item.label"
+              :value="item.value" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="切边要求" prop="trimmingRequirement">
+          <el-select v-model="form.trimmingRequirement" placeholder="请选择切边要求" style="width: 100%">
+            <el-option label="净边料" value="净边料" />
+            <el-option label="毛边料" value="毛边料" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="打包状态" prop="packingStatus">
+          <el-input v-model="form.packingStatus" placeholder="请输入打包状态">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="包装要求" prop="packagingRequirement">
+          <el-select v-model="form.packagingRequirement" placeholder="请选择包装要求" style="width: 100%">
+            <el-option label="裸包" value="裸包" />
+            <el-option label="普包" value="普包" />
+            <el-option label="简包" value="简包" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="毛重" prop="grossWeight">
+          <el-input v-model="form.grossWeight" placeholder="请输入毛重" />
+        </el-form-item>
+        <el-form-item label="净重" prop="netWeight">
+          <el-input v-model="form.netWeight" placeholder="请输入净重" />
+        </el-form-item>
+        <el-form-item label="长度" prop="length">
+          <el-input v-model="form.length" placeholder="请输入长度" />
+        </el-form-item>
+        <el-form-item label="实测长度(m)" prop="actualLength">
+          <el-input-number :controls="false" v-model="form.actualLength" placeholder="请输入实测长度" type="number"
+            :step="0.01" />
+        </el-form-item>
+        <el-form-item label="实测宽度(m)" prop="actualWidth">
+          <el-input-number :controls="false" v-model="form.actualWidth" placeholder="请输入实测宽度" type="number"
+            :step="0.01" />
+        </el-form-item>
+        <el-form-item label="调制度" prop="temperGrade">
+          <el-input v-model="form.temperGrade" placeholder="请输入调制度" />
+        </el-form-item>
+        <el-form-item label="镀层种类" prop="coatingType">
+          <MemoInput storageKey="coatingType" v-model="form.coatingType" placeholder="请输入镀层种类" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 钢卷追溯对话框 -->
+    <el-dialog title="钢卷追溯" :visible.sync="traceOpen" width="90%" append-to-body>
+      <coil-trace-result v-loading="traceLoading" :trace-result="traceResult"></coil-trace-result>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listMaterialCoil, getMaterialCoilTrace, updateMaterialCoilSimple, checkCoilNo, restoreMaterialCoil } from '@/api/wms/coil'
+import { listPendingAction, getPendingAction, delPendingAction, addPendingAction, updatePendingAction, startProcess, cancelAction, restorePendingAction } from '@/api/wms/pendingAction'
+import { listUser } from '@/api/system/user'
+import { parseTime } from '@/utils/klp'
+import LabelRender from '../panels/LabelRender/index.vue'
+import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
+import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
+import ProductSelect from "@/components/KLPService/ProductSelect";
+import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
+import CoilTraceResult from "../panels/CoilTraceResult.vue";
+import CoilSelector from '@/components/CoilSelector';
+import CoilNo from '@/components/KLPService/Renderer/CoilNo.vue';
+import { getCoilTagPrintType } from '@/views/wms/coil/js/coilPrint'
+
+export default {
+  name: 'CorrentAllPage',
+  dicts: ['action_type', 'coil_quality_status'],
+  components: {
+    LabelRender,
+    WarehouseSelect,
+    ActualWarehouseSelect,
+    ProductSelect,
+    RawMaterialSelect,
+    CoilTraceResult,
+    CoilSelector,
+    CoilNo
+  },
+  data() {
+    return {
+      // 追溯相关
+      traceOpen: false,
+      traceLoading: false,
+      traceResult: null,
+
+      // 搜索状态
+      searched: false,
+      
+      // 钢卷类型
+      coilType: 'all',
+      title: '钢卷信息修正',
+      
+      // 物料列表相关
+      materialLoading: false,
+      materialCoilList: [],
+      materialTotal: 0,
+      materialQueryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        enterCoilNo: null,
+        currentCoilNo: null,
+        warehouseId: null,
+      },
+      
+      // 标签预览相关
+      labelRender: {
+        visible: false,
+        data: {},
+        type: '2'
+      },
+
+      // 表单相关
+      form: {},
+      correctVisible: false,
+      buttonLoading: false,
+      userList: [],
+      
+      // 操作记录相关
+      actionDialogVisible: false,
+      actionLoading: false,
+      actionList: [],
+      actionTotal: 0,
+      currentCoilId: null,
+      actionQueryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        actionType: null,
+        actionStatus: null
+      },
+      // 操作记录表单
+      actionForm: {},
+      actionOpen: false,
+      actionTitle: '',
+      // 操作记录选择相关
+      ids: [],
+      single: true,
+      multiple: true,
+      rubbish: false,
+      // 钢卷选择器可见性
+      coilSelectorVisible: false,
+      
+      // 表单校验
+      rules: {
+        enterCoilNo: [
+          { required: true, message: "入场钢卷号不能为空", trigger: "blur" },
+          {
+            validator: (rule, value, callback) => {
+              if (this.form.coilId) {
+                callback();
+              } else {
+                checkCoilNo({ enterCoilNo: value }).then(res => {
+                  const { duplicateType } = res.data;
+                  if (duplicateType === 'enter' || duplicateType === 'both') {
+                    callback(new Error('入场钢卷号重复，请重新输入'));
+                  } else {
+                    callback();
+                  }
+                })
+              }
+            }, trigger: 'blur'
+          },
+        ],
+        currentCoilNo: [
+          { required: true, message: "当前钢卷号不能为空", trigger: "blur" },
+        ],
+        materialType: [
+          { required: true, message: "材料类型不能为空", trigger: "change" }
+        ],
+        itemId: [
+          { required: true, message: "物品ID不能为空", trigger: "blur" }
+        ],
+        itemType: [
+          { required: true, message: "物品类型不能为空", trigger: "change" }
+        ],
+        netWeight: [
+          { required: true, message: "净重不能为空", trigger: "blur" }
+        ],
+        grossWeight: [
+          { required: true, message: "毛重不能为空", trigger: "blur" }
+        ],
+      },
+      // 操作记录表单校验
+      actionRules: {
+        coilId: [
+          { required: true, message: '请选择钢卷', trigger: 'blur' }
+        ],
+        actionType: [
+          { required: true, message: '请选择操作类型', trigger: 'change' }
+        ]
+      },
+    }
+  },
+  computed: {
+    // 动态显示标签
+    getItemLabel() {
+      if (this.form.materialType === '成品') {
+        return '产品类型';
+      } else if (this.form.materialType === '原料') {
+        return '原料类型';
+      }
+      return '物品类型';
+    },
+    // 分条操作列表（100-199）
+    splitTypes() {
+      if (!this.dict.type.action_type) return [];
+      return this.dict.type.action_type.filter(item => {
+        const value = parseInt(item.value);
+        return value >= 100 && value <= 199;
+      });
+    },
+    // 合卷操作列表（200-299）
+    mergeTypes() {
+      if (!this.dict.type.action_type) return [];
+      return this.dict.type.action_type.filter(item => {
+        const value = parseInt(item.value);
+        return value >= 200 && value <= 299;
+      });
+    },
+    // 其他操作列表（200-299等）
+    otherTypes() {
+      if (!this.dict.type.action_type) return [];
+      return this.dict.type.action_type.filter(item => {
+        const value = parseInt(item.value);
+        return value < 100 || value > 299;
+      });
+    }
+  },
+  created() {
+    // 加载用户列表
+    this.getUsers()
+  },
+  methods: {
+    parseTime,
+    
+    /** 查询用户列表 */
+    getUsers() {
+      listUser({ pageNum: 1, pageSize: 1000 }).then(response => {
+        this.userList = response.rows || []
+      })
+    },
+    
+    // 处理材料类型变化
+    handleMaterialTypeChange(value) {
+      // 清空物品选择
+      this.form.itemId = null;
+
+      // 根据材料类型设置物品类型
+      if (value === '成品') {
+        this.form.itemType = 'product';
+      } else if (value === '原料') {
+        this.form.itemType = 'raw_material';
+      }
+    },
+    
+    /** 预览标签 */
+    handlePreviewLabel(row) {
+      this.labelRender.visible = true;
+      const type = getCoilTagPrintType(row);
+      this.labelRender.type = type;
+      this.labelRender.data = {
+        ...row,
+        updateTime: row.updateTime?.split(' ')[0] || '',
+      };
+    },
+    
+    /** 追溯按钮操作 */
+    handleTrace(row) {
+      this.traceOpen = true;
+      this.traceLoading = true;
+      this.traceResult = null; // 清空历史数据
+      getMaterialCoilTrace({
+        coilId: row.coilId,
+        currentCoilNo: row.currentCoilNo,
+      }).then(res => {
+        this.traceResult = res.data; // 将结果传递给组件
+      }).catch(err => {
+        console.error('溯源查询失败：', err);
+        this.$message.error('溯源查询失败，请重试');
+      }).finally(() => {
+        this.traceLoading = false;
+      });
+    },
+    
+    /** 查看操作记录 */
+    handleViewActions(row) {
+      this.currentCoilId = row.coilId;
+      this.actionDialogVisible = true;
+      this.actionQueryParams.pageNum = 1;
+      this.getActionList();
+    },
+    
+    /** 查询操作记录 */
+    getActionList() {
+      this.actionLoading = true;
+      const payload = {
+        ...this.actionQueryParams,
+        coilId: this.currentCoilId,
+        includeDeleted: this.rubbish ? 2 : 0
+      };
+      listPendingAction(payload).then(response => {
+        this.actionList = response.rows || [];
+        this.actionTotal = response.total || 0;
+        this.actionLoading = false;
+      }).catch(() => {
+        this.actionLoading = false;
+      });
+    },
+    
+    /** 操作记录搜索 */
+    handleActionQuery() {
+      this.actionQueryParams.pageNum = 1;
+      this.getActionList();
+    },
+    
+    /** 重置操作记录搜索 */
+    resetActionQuery() {
+      this.resetForm('actionQueryForm');
+      this.actionQueryParams.actionType = null;
+      this.actionQueryParams.actionStatus = null;
+      this.handleActionQuery();
+    },
+    
+    // ========== 物料列表相关方法 ==========
+    /** 查询物料列表 */
+    getMaterialCoil() {
+      this.materialLoading = true
+      const payload = { ...this.materialQueryParams }
+      if (this.coilType == 'now') {
+        payload.dataType = 1;
+        payload.status = 0;
+      } else if (this.coilType == 'history') {
+        payload.dataType = 0;
+      } else if (this.coilType == 'trans') {
+        payload.status = 1;
+      } else if (this.coilType == 'unIn') {
+        payload.dataType = 10;
+      }
+      listMaterialCoil(payload).then(response => {
+        this.materialCoilList = response.rows || []
+        this.materialTotal = response.total || 0
+        this.materialLoading = false
+        
+        // 如果有钢卷数据，自动获取第一个钢卷的操作记录
+        if (this.materialCoilList.length > 0) {
+          this.currentCoilId = this.materialCoilList[0].coilId;
+          this.getActionList();
+        } else {
+          // 清空操作记录
+          this.actionList = [];
+          this.actionTotal = 0;
+        }
+      }).catch(() => {
+        this.materialLoading = false
+      })
+    },
+    
+    /** 物料搜索 */
+    handleMaterialQuery() {
+      // 检查是否至少填写了一个钢卷号
+      if (!this.materialQueryParams.enterCoilNo && !this.materialQueryParams.currentCoilNo) {
+        this.$message.warning('请至少填写一个钢卷号进行搜索');
+        return;
+      }
+      
+      this.materialQueryParams.pageNum = 1;
+      this.searched = true;
+      this.getMaterialCoil();
+      
+      // 同时获取操作记录
+      if (this.materialCoilList.length > 0) {
+        this.currentCoilId = this.materialCoilList[0].coilId;
+        this.getActionList();
+      }
+    },
+    
+    /** 重置物料搜索 */
+    resetMaterialQuery() {
+      this.resetForm('materialQueryForm');
+      this.materialQueryParams.enterCoilNo = null;
+      this.materialQueryParams.currentCoilNo = null;
+      this.searched = false;
+      this.materialCoilList = [];
+      this.actionList = [];
+    },
+    
+    /** 回滚操作 */
+    handleRestoreMaterial(row) {
+      this.$modal.confirm('是否要将改钢卷还原到上次加工的状态（会删除该钢卷并将上一步的历史钢卷还原）').then(_ => {
+        const loading = this.$loading({
+          lock: true,
+          text: '处理中...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        restoreMaterialCoil(row.coilId).then(_ => {
+          this.$modal.msgSuccess("还原成功");
+          this.getMaterialCoil();
+        }).finally(() => {
+          loading.close()
+        })
+      })
+    },
+    
+    /** 强制入库操作 */
+    handleForceInMaterial(row) {
+      this.$modal.confirm('是否要强制入库改钢卷？').then(_ => {
+        const loading = this.$loading({
+          lock: true,
+          text: '处理中...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        updateMaterialCoilSimple({
+          ...row,
+          dataType: 1,
+        }).then(_ => {
+          this.$modal.msgSuccess("强制入库成功");
+          this.getMaterialCoil();
+        }).finally(() => {
+          loading.close()
+        })
+      })
+    },
+    
+    /** 修正按钮操作 */
+    handleCorrectMaterial(row) {
+      this.form = {
+        ...row,
+      };
+      this.title = "钢卷信息修正";
+      this.correctVisible = true
+    },
+    
+    /** 取消按钮 */
+    cancel() {
+      this.correctVisible = false
+    },
+    
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (!valid) {
+          this.$message.error('请填写完整信息')
+          return
+        }
+        this.buttonLoading = true;
+        // 更新钢卷信息
+        updateMaterialCoilSimple(this.form).then(_ => {
+          this.$modal.msgSuccess("修正成功");
+          this.correctVisible = false;
+          this.getMaterialCoil();
+        }).finally(() => {
+          this.buttonLoading = false;
+        });
+      })
+    },
+    
+    // ========== 操作记录相关方法 ==========
+    /** 处理操作状态变化 */
+    handleStatusChange(row) {
+      updatePendingAction(row).then(response => {
+        this.$message.success('操作状态更新成功');
+        this.getActionList();
+      });
+    },
+    
+    /** 完成时间改变时触发 */
+    handleProcessTimeChange(row) {
+      updatePendingAction(row).then(response => {
+        this.$message.success('更新成功');
+      });
+    },
+    
+    /** 多选框选中数据 */
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.actionId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    
+    /** 新增操作 */
+    handleAddAction() {
+      this.resetActionForm();
+      this.actionOpen = true;
+      this.actionTitle = '添加操作记录';
+    },
+    
+    /** 修改操作 */
+    handleUpdateAction(row) {
+      this.resetActionForm();
+      const actionId = row.actionId || this.ids;
+      getPendingAction(actionId).then(response => {
+        this.actionForm = response.data;
+        this.actionOpen = true;
+        this.actionTitle = '修改操作记录';
+      });
+    },
+    
+    /** 删除操作 */
+    handleDeleteAction(row) {
+      const actionIds = row.actionId || this.ids;
+      this.$confirm('是否确认删除该操作记录?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        return delPendingAction(actionIds);
+      }).then(() => {
+        this.getActionList();
+        this.$message.success('删除成功');
+      }).catch(() => { });
+    },
+    
+    /** 还原操作 */
+    handleRestoreAction(row) {
+      const actionId = row.actionId;
+      this.$modal.confirm('是否确认还原该操作记录?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        restorePendingAction(actionId).then(response => {
+          this.$message.success('还原成功');
+          this.getActionList();
+        });
+      });
+    },
+    
+    /** 刷新操作记录 */
+    handleRefreshAction() {
+      this.getActionList();
+      this.$message.success('刷新成功');
+    },
+    
+    /** 显示钢卷选择器 */
+    showCoilSelector() {
+      this.coilSelectorVisible = true;
+    },
+    
+    /** 钢卷选择回调 */
+    handleCoilSelect(coil) {
+      this.actionForm.coilId = coil.coilId;
+      this.actionForm.currentCoilNo = coil.currentCoilNo;
+    },
+    
+    /** 提交操作表单 */
+    submitActionForm() {
+      this.$refs['actionForm'].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.actionForm.actionId != null) {
+            updatePendingAction(this.actionForm).then(response => {
+              this.$message.success('修改成功');
+              this.actionOpen = false;
+              this.getActionList();
+              this.buttonLoading = false;
+            });
+          } else {
+            addPendingAction(this.actionForm).then(response => {
+              this.$message.success('新增成功');
+              this.actionOpen = false;
+              this.getActionList();
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    
+    /** 取消操作表单 */
+    cancelAction() {
+      this.actionOpen = false;
+      this.resetActionForm();
+    },
+    
+    /** 重置操作表单 */
+    resetActionForm() {
+      this.actionForm = {
+        actionId: null,
+        coilId: null,
+        currentCoilNo: null,
+        actionType: null,
+        actionStatus: null,
+        priority: 0,
+        sourceType: 'manual',
+        remark: null
+      };
+      if (this.$refs['actionForm']) {
+        this.$refs['actionForm'].resetFields();
+      }
+    },
+    
+    /** 获取边框样式 */
+    getBorderStyle(row) {
+      // 已发货
+      if (row.status == 1) {
+        return { border: '1.5px solid #007bff' }
+      }
+      // 历史钢卷
+      if (row.dataType == 0 || row.dataType == 2) {
+        return { border: '1.5px solid #6c757d' }
+      }
+      // 当前钢卷
+      if (row.dataType == 1) {
+        return { border: '1.5px solid #28a745' }
+      }
+      // 还未入库的钢卷
+      if (row.dataType == 10) {
+        return { border: '1.5px solid #ffc107' }
+      }
+      return { border: '1.5px solid #e4e7ed' }
+    },
+    
+    /** 获取钢卷类型标签 */
+    getTypeLabel(row) {
+      if (row.status == 1) {
+        return '已发货'
+      }
+      if (row.dataType == 0 || row.dataType == 2) {
+        return '历史钢卷'
+      }
+      if (row.dataType == 1) {
+        return '当前钢卷'
+      }
+      if (row.dataType == 10) {
+        return '未入库'
+      }
+      return '未知'
+    },
+    
+    /** 根据操作类型获取图标 */
+    getActionIcon(actionType) {
+      const value = parseInt(actionType);
+      const iconMap = {
+        1: 'el-icon-connection',      // 合卷
+        2: 'el-icon-s-operation',      // 分条
+        3: 'el-icon-edit',             // 更新
+        4: 'el-icon-truck',            // 发货
+        5: 'el-icon-s-grid',           // 移库
+        101: 'el-icon-scissors',       // 纵剪分条
+        102: 'el-icon-s-operation',    // 横切分条
+        103: 'el-icon-s-unfold'        // 开卷分条
+      };
+      return iconMap[value] || 'el-icon-s-operation';
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.acid-do-container {
+  background-color: #f5f7fa;
+  padding: 20px;
+  min-height: calc(100vh - 84px);
+}
+
+// 搜索区域样式
+.search-section {
+  margin-bottom: 20px;
+  background-color: #ffffff;
+  border-radius: 4px;
+  padding: 20px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+  
+  .page-title {
+    margin: 0 0 16px 0;
+    font-size: 18px;
+    font-weight: 600;
+    color: #303133;
+  }
+  
+  .search-form {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    
+    .search-tip {
+      font-size: 12px;
+      color: #909399;
+      margin-left: 12px;
+    }
+  }
+}
+
+// 未搜索状态
+.empty-search-state {
+  background-color: #ffffff;
+  border-radius: 4px;
+  padding: 80px 20px;
+  text-align: center;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+  
+  i {
+    font-size: 48px;
+    margin-bottom: 16px;
+    display: block;
+    color: #c0c4cc;
+  }
+  
+  p {
+    margin: 0;
+    font-size: 16px;
+    color: #909399;
+  }
+}
+
+.section-card {
+  background-color: #ffffff;
+  border: 1px solid #e4e7ed;
+  border-radius: 4px;
+  padding: 16px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+  display: flex;
+  flex-direction: column;
+}
+
+.section-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 16px;
+  padding-bottom: 12px;
+  border-bottom: 2px solid #e4e7ed;
+}
+
+.section-title {
+  margin: 0;
+  font-size: 16px;
+  font-weight: 600;
+  color: #303133;
+}
+
+.section-desc {
+  font-size: 12px;
+  color: #909399;
+}
+
+.material-section {
+  .section-header {
+    border-bottom-color: #409eff;
+  }
+
+  .section-title {
+    color: #409eff;
+  }
+}
+
+.action-section {
+  .section-header {
+    border-bottom-color: #67c23a;
+  }
+
+  .section-title {
+    color: #67c23a;
+  }
+}
+
+.query-form {
+  margin-bottom: 16px;
+  padding: 12px;
+  background-color: #fafafa;
+  border-radius: 4px;
+  border: 1px solid #e4e7ed;
+}
+
+.mb10 {
+  margin-bottom: 10px;
+}
+
+// 钢卷信息容器
+.coil-info-container {
+  flex: 1;
+  overflow-y: auto;
+  padding-right: 4px;
+  display: grid;
+  grid-template-columns: repeat(5, 1fr);
+  grid-gap: 12px;
+}
+
+// 操作记录容器
+.action-list-container {
+  flex: 1;
+  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
+  
+  &::-webkit-scrollbar {
+    width: 6px;
+  }
+
+  &::-webkit-scrollbar-track {
+    background: #f1f1f1;
+    border-radius: 3px;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background: #c1c1c1;
+    border-radius: 3px;
+
+    &:hover {
+      background: #a8a8a8;
+    }
+  }
+  
+  ::v-deep .el-table {
+    flex: 1;
+    min-height: 200px;
+  }
+  
+  ::v-deep .el-table__body-wrapper {
+    overflow-y: auto;
+  }
+}
+
+// 空状态
+.empty-state {
+  text-align: center;
+  padding: 60px 20px;
+  color: #909399;
+
+  i {
+    font-size: 48px;
+    margin-bottom: 16px;
+    display: block;
+    color: #c0c4cc;
+  }
+
+  p {
+    margin: 0;
+    font-size: 14px;
+  }
+}
+
+// 物料卡片
+.material-card {
+  background-color: #ffffff;
+  border: 1px solid #e4e7ed;
+  border-radius: 3px;
+  display: flex;
+  flex-direction: column;
+  transition: all 0.3s ease;
+  margin-bottom: 12px;
+
+  &:hover {
+    border-color: #409eff;
+    box-shadow: 0 2px 6px rgba(64, 158, 255, 0.12);
+  }
+
+  .card-header {
+    padding: 6px 8px;
+    border-bottom: 1px solid #e4e7ed;
+    background-color: #fafafa;
+
+    .header-left {
+      display: flex;
+      align-items: center;
+      gap: 6px;
+    }
+
+    .coil-no-tag {
+      font-weight: 600;
+      font-size: 11px;
+      padding: 2px 6px;
+    }
+
+    .material-type {
+      font-size: 11px;
+      color: #606266;
+      font-weight: 500;
+    }
+
+    .param-icon {
+      font-size: 13px;
+      color: #909399;
+      cursor: pointer;
+      transition: color 0.3s;
+
+      &:hover {
+        color: #409eff;
+      }
+    }
+  }
+
+  .card-body {
+    padding: 8px;
+    flex: 1;
+
+    .info-list {
+      .info-item {
+        display: flex;
+        align-items: center;
+        margin-bottom: 4px;
+        font-size: 11px;
+        line-height: 1.4;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+
+        .info-label {
+          color: #909399;
+          white-space: nowrap;
+          margin-right: 4px;
+          min-width: 40px;
+          font-size: 11px;
+        }
+
+        .info-value {
+          color: #303133;
+          flex: 1;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          font-size: 11px;
+        }
+      }
+    }
+  }
+
+  .card-footer {
+    padding: 6px 8px;
+    border-top: 1px solid #e4e7ed;
+    background-color: #fafafa;
+    display: flex;
+    justify-content: center;
+
+    .action-btn {
+      width: 100%;
+      padding: 5px 10px;
+      font-size: 11px;
+    }
+  }
+}
+
+// 分页样式
+::v-deep .pagination-container {
+  margin-top: 16px;
+  padding: 12px;
+  background-color: #fafafa;
+  border-radius: 4px;
+  border: 1px solid #e4e7ed;
+}
+
+// 参数弹出框样式
+::v-deep .material-params-popover {
+  .material-params-content {
+    .params-title {
+      font-size: 14px;
+      font-weight: 600;
+      color: #303133;
+      margin-bottom: 12px;
+      padding-bottom: 8px;
+      border-bottom: 1px solid #e4e7ed;
+    }
+
+    .params-list {
+      .param-item {
+        .param-row {
+          display: flex;
+          margin-bottom: 6px;
+          font-size: 12px;
+          line-height: 1.5;
+
+          &:last-child {
+            margin-bottom: 0;
+          }
+
+          .param-label {
+            color: #909399;
+            min-width: 70px;
+            margin-right: 8px;
+          }
+
+          .param-value {
+            color: #303133;
+            flex: 1;
+            word-break: break-all;
+          }
+        }
+      }
+
+      .param-divider {
+        height: 1px;
+        background-color: #e4e7ed;
+        margin: 10px 0;
+      }
+    }
+  }
+}
+
+/* 操作类型卡片样式 */
+.action-type-cards {
+  width: 100%;
+
+  .card-section {
+    margin-bottom: 24px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  .section-title {
+    font-size: 14px;
+    font-weight: 600;
+    color: #303133;
+    margin-bottom: 12px;
+    padding-left: 8px;
+    border-left: 3px solid #409eff;
+  }
+
+  // 分条操作区域的特殊样式
+  .card-section:first-child .section-title {
+    border-left-color: #e6a23c;
+  }
+
+  .action-cards-row {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(220px, 1fr));
+    gap: 12px;
+  }
+
+  .action-card {
+    min-width: 0;
+    padding: 16px;
+    border: 2px solid #dcdfe6;
+    border-radius: 8px;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    background: #fff;
+    display: flex;
+    align-items: center;
+    gap: 12px;
+
+    &:hover {
+      border-color: #409eff;
+      box-shadow: 0 2px 12px 0 rgba(64, 158, 255, 0.15);
+      transform: translateY(-2px);
+    }
+
+    &.active {
+      border-color: #409eff;
+      background: linear-gradient(135deg, #e3f2fd 0%, #f0f7ff 100%);
+      box-shadow: 0 2px 12px 0 rgba(64, 158, 255, 0.3);
+
+      .card-icon {
+        background: linear-gradient(135deg, #409eff 0%, #66b1ff 100%);
+        color: #fff;
+      }
+
+      .card-title {
+        color: #409eff;
+        font-weight: 600;
+      }
+    }
+
+    &.split-card {
+      &.active {
+        background: linear-gradient(135deg, #fff3e0 0%, #fff8f0 100%);
+        border-color: #e6a23c;
+
+        .card-icon {
+          background: linear-gradient(135deg, #e6a23c 0%, #f0ad4e 100%);
+        }
+
+        .card-title {
+          color: #e6a23c;
+        }
+      }
+
+      &:hover {
+        border-color: #e6a23c;
+        box-shadow: 0 2px 12px 0 rgba(230, 162, 60, 0.15);
+      }
+    }
+  }
+
+  .card-icon {
+    width: 48px;
+    height: 48px;
+    border-radius: 8px;
+    background: #f5f7fa;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 24px;
+    color: #909399;
+    transition: all 0.3s ease;
+    flex-shrink: 0;
+  }
+
+  .card-content {
+    flex: 1;
+  }
+
+  .card-title {
+    font-size: 16px;
+    font-weight: 500;
+    color: #303133;
+    margin-bottom: 4px;
+    transition: all 0.3s ease;
+  }
+
+  .card-desc {
+    font-size: 13px;
+    color: #909399;
+    line-height: 1.4;
+  }
+}
+
+// 操作记录对话框内容
+.action-dialog-content {
+  max-height: 600px;
+  overflow-y: auto;
+}
+</style>
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/report/js/fetch.js b/klp-ui/src/views/wms/report/js/fetch.js
index 243bb71a..3a9bb626 100644
--- a/klp-ui/src/views/wms/report/js/fetch.js
+++ b/klp-ui/src/views/wms/report/js/fetch.js
@@ -26,7 +26,7 @@ export async function fetchOutputList(queryParams) {
     (a, b) => new Date(b.createTime) - new Date(a.createTime)
   ).map(item => {
     // 计算宽度和厚度，将规格按照*分割，*前的是厚度，*后的是宽度
-    const [thickness, width] = item.specification.split('*')
+    const [thickness, width] = item.specification?.split('*') || [0, 0]
     return {
       ...item,
       computedThickness: parseFloat(thickness),
@@ -36,12 +36,14 @@ export async function fetchOutputList(queryParams) {
   return sortedList
 }
 
-export async function fetchLossList(queryParams) {
-  const resultList = await Promise.all(this.actionTypes.map(actionType => {
+export async function fetchLossList(actionTypes, queryParams) {
+  const resultList = await Promise.all(actionTypes.map(actionType => {
     return listPendingAction({
       ...queryParams,
       actionStatus: 2,
       actionType,
+      startTime: queryParams.byCreateTimeStart,
+      endTime: queryParams.byCreateTimeEnd,
       pageSize: 99999,
       pageNum: 1,
     })

From feb50e038ded0225fe936cccf68a5ceb07c05a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Thu, 26 Mar 2026 10:41:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor(ems/dashboard):=20=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E8=83=BD=E6=BA=90=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E4=B8=BA=E6=A0=87=E7=AD=BE=E9=A1=B5=E5=BD=A2=E5=BC=8F=E5=B9=B6?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将能源类型选择从下拉框改为标签页形式，提升用户体验
移除未使用的标签页代码，并设置默认选中的能源类型
---
 klp-ui/src/views/ems/dashboard/index.vue | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/klp-ui/src/views/ems/dashboard/index.vue b/klp-ui/src/views/ems/dashboard/index.vue
index 1340f8d1..2fc2a28f 100644
--- a/klp-ui/src/views/ems/dashboard/index.vue
+++ b/klp-ui/src/views/ems/dashboard/index.vue
@@ -1,11 +1,11 @@
 <template>
   <el-row>
     <el-col :span="4">
-      <div style="padding: 10px;">
+      <!-- <div style="padding: 10px;">
         <el-select v-model="energyType" placeholder="请选择能源类型" @change="refresh">
           <el-option v-for="item in energyTypeList" :key="item.energyTypeId" :label="item.name" :value="item.energyTypeId" />
         </el-select>
-      </div>
+      </div> -->
       
 
       <!-- 区域选择，默认展开，最高高度为60%的屏幕尺寸 -->
@@ -21,17 +21,20 @@
     </el-col>
 
     <el-col :span="20" v-if="showRight">
-      <el-tabs v-model="activeTab" type="card">
+      <!-- <el-tabs v-model="activeTab" type="card">
         <el-tab-pane label="环比概况" name="1"></el-tab-pane>
         <el-tab-pane label="近期趋势" name="2"></el-tab-pane>
         <el-tab-pane label="同比分析" name="3"></el-tab-pane>
         <el-tab-pane label="环比分析" name="4"></el-tab-pane>
+      </el-tabs> -->
+      <el-tabs v-model="energyType" type="card">
+        <el-tab-pane v-for="item in energyTypeList" :key="item.energyTypeId" :label="item.name" :name="item.energyTypeId"></el-tab-pane>
       </el-tabs>
 
-      <Overview ref="overview" v-if="activeTab === '1'" :unit="energyUnit" :energyName="energyName" :energyType="energyType" :locationId="locationId" :deviceId="deviceId" />
-      <RecentTrend ref="recentTrend" v-if="activeTab === '2'" :unit="energyUnit" :energyName="energyName" :energyType="energyType" :locationId="locationId" :deviceId="deviceId" />
-      <YearToYear ref="yearToYear" v-if="activeTab === '3'" :unit="energyUnit" :energyName="energyName" :energyType="energyType" :locationId="locationId" :deviceId="deviceId" />
-      <MonthToMonth ref="monthToMonth" v-if="activeTab === '4'" :unit="energyUnit" :energyName="energyName" :energyType="energyType" :locationId="locationId" :deviceId="deviceId" />
+      <Overview ref="overview" :unit="energyUnit" :energyName="energyName" :energyType="energyType" :locationId="locationId" :deviceId="deviceId" />
+      <RecentTrend ref="recentTrend" :unit="energyUnit" :energyName="energyName" :energyType="energyType" :locationId="locationId" :deviceId="deviceId" />
+      <YearToYear ref="yearToYear" :unit="energyUnit" :energyName="energyName" :energyType="energyType" :locationId="locationId" :deviceId="deviceId" />
+      <MonthToMonth ref="monthToMonth" :unit="energyUnit" :energyName="energyName" :energyType="energyType" :locationId="locationId" :deviceId="deviceId" />
     </el-col>
     <el-col :span="20" v-else>
       <el-empty description="请选择能源类型和区域"></el-empty>
@@ -90,6 +93,7 @@ export default {
     getEnergyTypeList() {
       listEnergyType({ pageNum: 1, pageSize: 9999 }).then(response => {
         this.energyTypeList = response.rows;
+        this.energyType = this.energyTypeList[0]?.energyTypeId;
       });
     },
     getLocationList() {