diff --git a/klp-ui/src/views/aps/planSheet/PlanDetailForm.vue b/klp-ui/src/views/aps/planSheet/PlanDetailForm.vue
index d8763436..ffb3ddcc 100644
--- a/klp-ui/src/views/aps/planSheet/PlanDetailForm.vue
+++ b/klp-ui/src/views/aps/planSheet/PlanDetailForm.vue
@@ -1,221 +1,217 @@
 <template>
   <div>
-    <el-form ref="form" :model="formData" :rules="rules" label-width="60px" :disabled="readonly">
-      <el-collapse v-model="activeNames" :accordion="false">
-        <!-- 订单信息组 -->
-        <el-collapse-item title="订单信息" name="1">
-          <template slot="title">
-            <!-- 在这里选择订单后快速填写相关信息 -->
-            <span>订单信息</span>
-            <el-button @click.stop="openOrderDialog" style="margin-left: 10px;" plain
+    <el-form ref="form" :model="formData" :rules="rules" label-width="80px" :disabled="readonly">
+      <!-- 订单信息组 -->
+      <div class="section-block">
+        <div class="section-header">
+          <span class="section-title">订单信息</span>
+          <div class="section-actions">
+            <el-button @click.stop="openOrderDialog" size="small" plain
               :type="formData.orderId ? 'success' : 'default'">
               {{ formData.orderId ? formData.contractCode : '选择订单' }}
             </el-button>
-            <div v-if="formData.orderId" @click.stop="openOrderAttachmentDialog"
-              style="margin-left: 10px; cursor: pointer; color: #409eff;" type="primary">
+            <span v-if="formData.orderId" @click.stop="openOrderAttachmentDialog"
+              class="attachment-link">
               查看附件
-            </div>
-          </template>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="订单号" prop="orderCode">
-                <el-input v-model="formData.orderCode" placeholder="请输入订单号" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="合同号" prop="contractCode">
-                <el-input v-model="formData.contractCode" placeholder="请输入合同号" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="客户" prop="customerName">
-                <el-input v-model="formData.customerName" placeholder="请输入客户名称" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="业务员" prop="salesman">
-                <el-input v-model="formData.salesman" placeholder="请输入业务员姓名" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-collapse-item>
+            </span>
+          </div>
+        </div>
+        <el-row :gutter="12">
+          <el-col :span="6">
+            <el-form-item label="订单号" prop="orderCode">
+              <el-input v-model="formData.orderCode" placeholder="请输入订单号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="合同号" prop="contractCode">
+              <el-input v-model="formData.contractCode" placeholder="请输入合同号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="客户" prop="customerName">
+              <el-input v-model="formData.customerName" placeholder="请输入客户名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员" prop="salesman">
+              <el-input v-model="formData.salesman" placeholder="请输入业务员姓名" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
 
-        <!-- 原料信息组 -->
-        <el-collapse-item title="原料信息" name="2">
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="厂家" prop="rawManufacturer">
-                <el-input v-model="formData.rawManufacturer" placeholder="请输入原料厂家" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="材质" prop="rawMaterial">
-                <el-input v-model="formData.rawMaterial" placeholder="请输入原料材质" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="厚度" prop="rawThick">
-                <el-input v-model="formData.rawThick" placeholder="请输入原料厚度(mm)" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="宽度" prop="rawWidth">
-                <el-input v-model="formData.rawWidth" placeholder="请输入原料宽度(mm)" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-collapse-item>
+      <!-- 原料信息组 -->
+      <div class="section-block">
+        <div class="section-header">
+          <span class="section-title">原料信息</span>
+        </div>
+        <el-row :gutter="12">
+          <el-col :span="6">
+            <el-form-item label="厂家" prop="rawManufacturer">
+              <el-input v-model="formData.rawManufacturer" placeholder="请输入原料厂家" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="材质" prop="rawMaterial">
+              <el-input v-model="formData.rawMaterial" placeholder="请输入原料材质" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="厚度" prop="rawThick">
+              <el-input v-model="formData.rawThick" placeholder="请输入原料厚度(mm)" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="宽度" prop="rawWidth">
+              <el-input v-model="formData.rawWidth" placeholder="请输入原料宽度(mm)" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
 
-        <!-- 成品信息组 -->
-        <el-collapse-item title="成品信息" name="3">
-          <template slot="title">
-            <!-- 如果已经绑定了订单，可以在这里选择订单明细来快速录入要生产的成品信息 -->
-            <span>成品信息</span>
-            <el-button type="primary" plain v-if="formData.orderId" style="margin-left: 10px;"
+      <!-- 成品信息组 -->
+      <div class="section-block">
+        <div class="section-header">
+          <span class="section-title">成品信息</span>
+          <div class="section-actions">
+            <el-button type="primary" plain size="small" v-if="formData.orderId"
               @click.stop="openOrderItemDialog">选择订单明细</el-button>
-          </template>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="成品名称" prop="productName">
-                <el-input v-model="formData.productName" placeholder="请输入成品名称" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="材质" prop="productMaterial">
-                <el-input v-model="formData.productMaterial" placeholder="请输入成品材质" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="镀层(g)" prop="coatingG">
-                <el-input v-model="formData.coatingG" placeholder="请输入镀层重量" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="成品宽度" prop="productWidth">
-                <el-input v-model="formData.productWidth" placeholder="请输入成品宽度" />
-              </el-form-item>
-            </el-col>
+          </div>
+        </div>
+        <el-row :gutter="12">
+          <el-col :span="6">
+            <el-form-item label="成品名称" prop="productName">
+              <el-input v-model="formData.productName" placeholder="请输入成品名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="材质" prop="productMaterial">
+              <el-input v-model="formData.productMaterial" placeholder="请输入成品材质" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="镀层(g)" prop="coatingG">
+              <el-input v-model="formData.coatingG" placeholder="请输入镀层重量" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="成品宽度" prop="productWidth">
+              <el-input v-model="formData.productWidth" placeholder="请输入成品宽度" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="轧制厚度" prop="rollingThick">
+              <el-input v-model="formData.rollingThick" placeholder="请输入轧制厚度" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标签厚度" prop="markCoatThick">
+              <el-input v-model="formData.markCoatThick" placeholder="请输入标签厚度" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="吨钢长度区间" prop="tonSteelLengthRange">
+              <el-input v-model="formData.tonSteelLengthRange" placeholder="请输入吨钢长度区间(m)" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="数量" prop="planQty">
+              <el-input v-model="formData.planQty" placeholder="请输入成品数量" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重量" prop="planWeight">
+              <el-input v-model="formData.planWeight" placeholder="请输入成品重量" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="表面处理" prop="surfaceTreatment">
+              <MemoInput storageKey="surfaceTreatmentDesc" v-model="formData.surfaceTreatment"
+                placeholder="请输入表面处理" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="切边要求" prop="widthReq">
+              <el-select v-model="formData.widthReq" placeholder="请输入切边要求" style="width: 100%">
+                <el-option label="净边料" value="净边料" />
+                <el-option label="毛边料" value="毛边料" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="包装要求" prop="productPackaging">
+              <el-select v-model="formData.productPackaging" placeholder="请选择包装要求" style="width: 100%">
+                <el-option label="裸包" value="裸包" />
+                <el-option label="普包" value="普包" />
+                <el-option label="简包" value="简包" />
+                <el-option label="精包" value="精包" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="宽度要求" prop="productEdgeReq">
+              <el-input v-model="formData.productEdgeReq" placeholder="请输入宽度要求" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="用途" prop="usageReq">
+              <el-input v-model="formData.usageReq" placeholder="请输入成品用途" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
 
-            <el-col :span="12">
-              <el-form-item label="轧制厚度" prop="rollingThick">
-                <el-input v-model="formData.rollingThick" placeholder="请输入轧制厚度" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="标签厚度" prop="markCoatThick">
-                <el-input v-model="formData.markCoatThick" placeholder="请输入标签厚度" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="24">
-              <el-form-item label="吨钢长度区间" prop="tonSteelLengthRange">
-                <el-input v-model="formData.tonSteelLengthRange" placeholder="请输入吨钢长度区间(m)" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="数量" prop="planQty">
-                <el-input v-model="formData.planQty" placeholder="请输入成品数量" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="重量" prop="planWeight">
-                <el-input v-model="formData.planWeight" placeholder="请输入成品重量" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="表面处理" prop="surfaceTreatment">
-                <MemoInput storageKey="surfaceTreatmentDesc" v-model="formData.surfaceTreatment"
-                  placeholder="请输入表面处理" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="切边要求" prop="widthReq">
-                <el-select v-model="formData.widthReq" placeholder="请输入切边要求" style="width: 100%">
-                  <el-option label="净边料" value="净边料" />
-                  <el-option label="毛边料" value="毛边料" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="包装要求" prop="productPackaging">
-                <el-select v-model="formData.productPackaging" placeholder="请选择包装要求" style="width: 100%">
-                  <el-option label="裸包" value="裸包" />
-                  <el-option label="普包" value="普包" />
-                  <el-option label="简包" value="简包" />
-                  <el-option label="精包" value="精包" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="宽度要求" prop="productEdgeReq">
-                <el-input v-model="formData.productEdgeReq" placeholder="请输入宽度要求" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="用途" prop="usageReq">
-                <el-input v-model="formData.usageReq" placeholder="请输入成品用途" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-collapse-item>
-
-        <!-- 其他信息组 -->
-        <el-collapse-item title="生产信息" name="4">
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="开始时间" prop="startTime">
-                <el-date-picker clearable v-model="formData.startTime" style="width: 100%" type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择生产开始时间">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="结束时间" prop="endTime">
-                <el-date-picker clearable v-model="formData.endTime" style="width: 100%" type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择生产结束时间">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="后处理" prop="postProcess">
-                <el-input v-model="formData.postProcess" placeholder="请输入后处理要求" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="下工序" prop="nextProcess">
-                <el-input v-model="formData.nextProcess" placeholder="请输入下工序" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="取样" prop="sampleReq">
-                <el-input v-model="formData.sampleReq" placeholder="请输入取样要求" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="序号" prop="bizSeqNo">
-                <el-input v-model="formData.bizSeqNo" placeholder="请输入序号" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="备注" prop="remark">
-                <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注信息" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-collapse-item>
-      </el-collapse>
+      <!-- 生产信息组 -->
+      <div class="section-block">
+        <div class="section-header">
+          <span class="section-title">生产信息</span>
+        </div>
+        <el-row :gutter="12">
+          <el-col :span="6">
+            <el-form-item label="开始时间" prop="startTime">
+              <el-date-picker clearable v-model="formData.startTime" style="width: 100%" type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择生产开始时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="结束时间" prop="endTime">
+              <el-date-picker clearable v-model="formData.endTime" style="width: 100%" type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择生产结束时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="后处理" prop="postProcess">
+              <el-input v-model="formData.postProcess" placeholder="请输入后处理要求" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="下工序" prop="nextProcess">
+              <el-input v-model="formData.nextProcess" placeholder="请输入下工序" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="取样" prop="sampleReq">
+              <el-input v-model="formData.sampleReq" placeholder="请输入取样要求" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="序号" prop="bizSeqNo">
+              <el-input v-model="formData.bizSeqNo" placeholder="请输入序号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注信息" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
     </el-form>
 
     <el-dialog title="选择订单" :visible.sync="dialogVisible" width="80%" append-to-body>
       <div class="order-dialog-content">
-        <!-- 筛选条件 -->
         <el-form :model="orderQueryParams" ref="orderQueryForm" size="small" :inline="true" label-width="80px">
           <el-form-item label="合同号" prop="contractCode">
             <el-input v-model="orderQueryParams.contractCode" placeholder="请输入合同号" style="width: 180px" />
@@ -232,7 +228,6 @@
           </el-form-item>
         </el-form>
 
-        <!-- 订单列表 -->
         <el-table v-loading="orderLoading" :data="orderList" style="width: 100%" @row-click="handleOrderSelect">
           <el-table-column type="selection" width="55" />
           <el-table-column prop="contractCode" label="合同号" width="150" />
@@ -250,7 +245,6 @@
           </el-table-column>
         </el-table>
 
-        <!-- 分页 -->
         <div class="pagination-container">
           <el-pagination background layout="prev, pager, next, jumper" :total="orderTotal"
             :page-size="orderQueryParams.pageSize" :current-page.sync="orderQueryParams.pageNum"
@@ -267,35 +261,20 @@
         <el-table-column label="成品规格" align="center" prop="finishedProductSpec" />
         <el-table-column label="宽度公差" align="center" prop="widthTolerance" />
         <el-table-column label="厚度公差" align="center" prop="thicknessTolerance" />
-
         <el-table-column label="材质" align="center" prop="material" />
         <el-table-column label="重量" align="center" prop="weight" />
-        <!-- <el-table-column label="含税单价（元/吨）" align="center" prop="contractPrice" />
-        <el-table-column label="含税总额" align="center">
-          <template slot-scope="scope">             
-            {{ scope.row.weight * scope.row.contractPrice }}
-          </template>
-        </el-table-column>
-        <el-table-column label="无税单价（元/吨）" align="center" prop="itemAmount" /> -->
         <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="specialRequire" />
-
         <el-table-column label="备注" align="center" prop="remark" />
       </el-table>
     </el-dialog>
 
     <el-dialog title="合同附件" :visible.sync="attachmentOpen" width="50%" append-to-body>
       <div class="attachment-section" v-loading="loading">
-        <!-- <div class="attachment-item">
-              <h4>商务附件</h4>
-              <FileList :oss-ids="contractAttachment" />
-            </div> -->
         <div class="attachment-item">
           <h4>技术附件</h4>
           <FileList :oss-ids="contract.techAnnex" />
@@ -347,8 +326,6 @@ export default {
   },
   data() {
     return {
-      // 折叠面板默认展开项（全部打开）
-      activeNames: ['1', '2', '3', '4'],
       // 表单校验
       rules: {
         planSheetId: [
@@ -500,6 +477,43 @@ export default {
 </script>
 
 <style scoped>
+.section-block {
+  margin-bottom: 4px;
+  border: 1px solid #ebeef5;
+  border-radius: 4px;
+}
+
+.section-header {
+  padding: 10px 16px;
+  background-color: #fafafa;
+  border-bottom: 1px solid #ebeef5;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.section-title {
+  font-weight: 600;
+  font-size: 14px;
+  color: #303133;
+}
+
+.section-actions {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.section-block .el-row {
+  padding: 12px 8px 4px;
+}
+
+.attachment-link {
+  cursor: pointer;
+  color: #409eff;
+  font-size: 13px;
+}
+
 .order-dialog-content {
   padding: 10px 0;
 }
diff --git a/klp-ui/src/views/aps/planSheet/detail.vue b/klp-ui/src/views/aps/planSheet/detail.vue
index 7f7aeef9..0ec8414d 100644
--- a/klp-ui/src/views/aps/planSheet/detail.vue
+++ b/klp-ui/src/views/aps/planSheet/detail.vue
@@ -23,25 +23,17 @@
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="planDetailList" @selection-change="handleSelectionChange"
+    <el-table v-loading="loading" :data="planDetailList" :height="height" @selection-change="handleSelectionChange"
       @row-click="handleRowClick">
       <el-table-column label="序号" align="center" prop="bizSeqNo" width="50" />
       <el-table-column label="订单号" align="center" prop="orderCode" />
-      <!-- <el-table-column label="客户" align="center" prop="customerName" /> -->
-      <!-- <el-table-column label="业务员" align="center" prop="salesman" /> -->
       <el-table-column label="原料信息" align="center" prop="rawManufacturer">
         <template slot-scope="scope">
           {{ formatterRaw(scope.row) }}
         </template>
       </el-table-column>
-      <!-- <el-table-column label="原料材质" align="center" prop="rawMaterial" />
-      <el-table-column label="原料厚度" align="center" prop="rawThick" />
-      <el-table-column label="原料宽度" align="center" prop="rawWidth" /> -->
       <el-table-column label="成品名称" align="center" prop="productName" />
       <el-table-column label="用途" align="center" prop="usageReq" />
-      <el-table-column label="后处理" align="center" prop="postProcess" />
-      <!-- <el-table-column label="下工序" align="center" prop="nextProcess" /> -->
-      <el-table-column label="取样" align="center" prop="sampleReq" />
       <el-table-column label="开始时间" align="center" prop="startTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, '{y}.{m}.{d}') }} ~ {{ parseTime(scope.row.endTime, '{y}.{m}.{d}')
@@ -87,6 +79,10 @@ export default {
     readonly: {
       type: Boolean,
       default: false
+    },
+    height: {
+      type: [String, Number],
+      default: undefined
     }
   },
   data() {
diff --git a/klp-ui/src/views/aps/planSheet/read.vue b/klp-ui/src/views/aps/planSheet/read.vue
index cb4ad160..7a503e1c 100644
--- a/klp-ui/src/views/aps/planSheet/read.vue
+++ b/klp-ui/src/views/aps/planSheet/read.vue
@@ -1,108 +1,102 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="8">
-      <el-col :span="16">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-          label-width="68px">
-          <el-form-item label="排产日期" prop="planDate">
-            <el-date-picker clearable v-model="queryParams.planDate" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择排产日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="产线名称" prop="lineName">
-            <el-input v-model="queryParams.lineName" placeholder="请输入产线名称" clearable
-              @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="排产单号" prop="planCode">
-            <el-input v-model="queryParams.planCode" placeholder="请输入排产单号" clearable
-              @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="排产人" prop="scheduler">
-            <el-input v-model="queryParams.scheduler" placeholder="请输入排产人" clearable
-              @keyup.enter.native="handleQuery" />
-          </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>
-            <!-- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button> -->
-            <!-- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button> -->
-          </el-form-item>
-        </el-form>
+    <!-- 第一行：筛选 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+      label-width="68px">
+      <el-form-item label="排产日期" prop="planDate">
+        <el-date-picker clearable v-model="queryParams.planDate" type="date" value-format="yyyy-MM-dd"
+          placeholder="请选择排产日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="产线名称" prop="lineName">
+        <el-input v-model="queryParams.lineName" placeholder="请输入产线名称" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="排产单号" prop="planCode">
+        <el-input v-model="queryParams.planCode" placeholder="请输入排产单号" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="排产人" prop="scheduler">
+        <el-input v-model="queryParams.scheduler" placeholder="请输入排产人" clearable
+          @keyup.enter.native="handleQuery" />
+      </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>
+      </el-form-item>
+    </el-form>
 
-        <el-table v-loading="loading" :data="planSheetList" height="400px" @row-click="handleRowClick">
+    <!-- 第二行：排产单和排产明细左右布局（同高） -->
+    <el-row :gutter="4" class="table-section">
+      <el-col :span="12">
+        <el-table v-loading="loading" :data="planSheetList" height="280px" @row-click="handleRowClick">
           <el-table-column label="排产日期" align="center" prop="planDate" width="140">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.planDate, '{y}-{m}-{d}') }}</span>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="产线ID" align="center" prop="lineId" /> -->
           <el-table-column label="产线名称" align="center" prop="lineName" />
           <el-table-column label="排产单号" align="center" prop="planCode" />
-          <!-- <el-table-column label="排产类型" align="center" prop="planType" /> -->
           <el-table-column label="排产人" align="center" prop="scheduler" />
           <el-table-column label="备注" align="center" prop="remark" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-download" @click="handleExport(scope.row)">导出</el-button>
-              <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
-              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.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" />
-
-        <PlanDetail v-if="currentPlanSheetId" ref="planDetail" :readonly="true" :planSheetId="currentPlanSheetId"
-          @change="handlePlanDetailChange" />
-        <el-empty v-else class="appempty" description="选择排产单查看详情" />
-
-        <!-- 添加或修改排产单对话框 -->
-        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-          <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-            <el-form-item label="排产日期" prop="planDate">
-              <el-date-picker clearable v-model="form.planDate" type="date" value-format="yyyy-MM-dd"
-                placeholder="请选择排产日期">
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="产线名称" prop="lineName">
-              <el-select v-model="form.lineName" placeholder="请选择产线名称" filterable clearable>
-                <el-option v-for="item in dict.type.sys_lines" :key="item.value" :label="item.label"
-                  :value="item.value" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="排产单号" prop="planCode">
-              <el-input v-model="form.planCode" placeholder="请输入排产单号" />
-            </el-form-item>
-            <el-form-item label="排产人" prop="scheduler">
-              <el-input v-model="form.scheduler" placeholder="请输入排产人" />
-            </el-form-item>
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" 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-col>
-
-      <el-col :span="8">
-        <div class="detail-form-container">
-          <div v-if="currentPlanDetail.planDetailId" class="detail-card">
-            <div class="card-header">
-              <span>排产明细信息</span>
-              <!-- <el-button type="primary" size="mini" @click="submitDetail">保存变更</el-button> -->
-            </div>
-            <div class="card-body">
-              <PlanDetailForm v-model="currentPlanDetail" :plan-sheet-id="currentPlanSheetId" :readonly="true" />
-            </div>
-          </div>
-          <el-empty v-else description="选择排产单和明细行查看详情" />
-        </div>
+      <el-col :span="12">
+        <PlanDetail v-if="currentPlanSheetId" ref="planDetail" :readonly="true" :planSheetId="currentPlanSheetId"
+          :height="280" @change="handlePlanDetailChange" />
+        <el-empty v-else class="appempty" description="选择排产单查看详情" />
       </el-col>
     </el-row>
+
+    <!-- 第三行：排产明细表单横向平铺 -->
+    <div class="bottom-section" v-if="currentPlanDetail.planDetailId">
+      <div class="detail-card">
+        <div class="card-header">
+          <span>排产明细信息</span>
+        </div>
+        <div class="card-body">
+          <PlanDetailForm v-model="currentPlanDetail" :plan-sheet-id="currentPlanSheetId" :readonly="true" />
+        </div>
+      </div>
+    </div>
+    <el-empty v-else class="appempty" description="选择排产单和明细行查看详情" />
+
+    <!-- 添加或修改排产单对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="排产日期" prop="planDate">
+          <el-date-picker clearable v-model="form.planDate" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择排产日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="产线名称" prop="lineName">
+          <el-select v-model="form.lineName" placeholder="请选择产线名称" filterable clearable>
+            <el-option v-for="item in dict.type.sys_lines" :key="item.value" :label="item.label"
+              :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="排产单号" prop="planCode">
+          <el-input v-model="form.planCode" placeholder="请输入排产单号" />
+        </el-form-item>
+        <el-form-item label="排产人" prop="scheduler">
+          <el-input v-model="form.scheduler" placeholder="请输入排产人" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" 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>
   </div>
 </template>
 
@@ -343,9 +337,12 @@ export default {
 </script>
 
 <style scoped>
-.detail-form-container {
-  height: 100%;
-  padding: 8px;
+.table-section {
+  margin-bottom: 16px;
+}
+
+.bottom-section {
+  margin-top: 8px;
 }
 
 .detail-card {
@@ -353,9 +350,6 @@ export default {
   border-radius: 4px;
   box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
   overflow: hidden;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
 }
 
 .card-header {
@@ -369,8 +363,6 @@ export default {
 
 .card-body {
   padding: 16px;
-  flex: 1;
-  overflow-y: auto;
 }
 
 .appempty {
diff --git a/klp-ui/src/views/mes/eqp/check/part.vue b/klp-ui/src/views/mes/eqp/check/part.vue
index 093014ee..d3d7b6bd 100644
--- a/klp-ui/src/views/mes/eqp/check/part.vue
+++ b/klp-ui/src/views/mes/eqp/check/part.vue
@@ -125,13 +125,13 @@
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
         <el-form-item label="产线" prop="productionLine">
-          <el-input v-model="form.productionLine" placeholder="请输入产线" />
+          <el-input v-model="form.productionLine" placeholder="请输入产线" clearable />
         </el-form-item>
         <el-form-item label="产线段" prop="lineSection">
-          <el-input v-model="form.lineSection" placeholder="请输入产线段" />
+          <el-input v-model="form.lineSection" placeholder="请输入产线段" clearable />
         </el-form-item>
         <el-form-item label="负责人" prop="responsiblePerson">
-          <el-input v-model="form.responsiblePerson" placeholder="请输入负责人" />
+          <el-input v-model="form.responsiblePerson" placeholder="请输入负责人" clearable />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
diff --git a/klp-ui/src/views/wms/hrm/attendance/drag.vue b/klp-ui/src/views/wms/hrm/attendance/drag.vue
index 7a4a9014..c9f74b38 100644
--- a/klp-ui/src/views/wms/hrm/attendance/drag.vue
+++ b/klp-ui/src/views/wms/hrm/attendance/drag.vue
@@ -42,6 +42,15 @@
       </div>
     </div>
 
+    <!-- 排班统计 -->
+    <div class="schedule-stats" v-if="scheduleData.length > 0">
+      <span class="stat-item">排班人数：<strong>{{ scheduleStats.totalPeople }}</strong></span>
+      <span class="stat-item">排班项数：<strong>{{ scheduleStats.totalItems }}</strong></span>
+      <span v-for="(count, name) in scheduleStats.shiftCounts" :key="name" class="stat-item">
+        {{ name }}：<strong>{{ count }}</strong>
+      </span>
+    </div>
+
     <!-- 排班表格 -->
     <div class="schedule-table-wrapper">
       <el-table v-loading="loading" :data="scheduleData" border stripe height="calc(100vh - 200px)">
@@ -486,6 +495,26 @@ export default {
         dept: emp.dept || ''
       }))
     },
+    scheduleStats() {
+      const stats = {
+        totalPeople: this.scheduleData.length,
+        totalItems: 0,
+        shiftCounts: {}
+      }
+      this.scheduleData.forEach(row => {
+        this.dateList.forEach(date => {
+          if (row[date]) {
+            stats.totalItems++
+            const shiftName = row[date].shiftName || '未知'
+            if (!stats.shiftCounts[shiftName]) {
+              stats.shiftCounts[shiftName] = 0
+            }
+            stats.shiftCounts[shiftName]++
+          }
+        })
+      })
+      return stats
+    },
     batchSelectedCount() {
       return Object.keys(this.batchCellSelection).length
     },
@@ -1368,6 +1397,29 @@ export default {
   overflow-x: auto;
 }
 
+.schedule-stats {
+  display: flex;
+  align-items: center;
+  gap: 20px;
+  margin-bottom: 12px;
+  padding: 8px 16px;
+  background: #f0f9eb;
+  border: 1px solid #c2e7b0;
+  border-radius: 4px;
+  flex-wrap: wrap;
+  font-size: 14px;
+  color: #606266;
+}
+
+.schedule-stats .stat-item {
+  white-space: nowrap;
+}
+
+.schedule-stats .stat-item strong {
+  color: #67c23a;
+  font-size: 16px;
+}
+
 .schedule-cell {
   padding: 4px;
   min-height: 60px;