diff --git a/src/views/modules/shopOrder/productionReport/searchProductionLineOutputReport.vue b/src/views/modules/shopOrder/productionReport/searchProductionLineOutputReport.vue
index fb3cbb6..8072d34 100644
--- a/src/views/modules/shopOrder/productionReport/searchProductionLineOutputReport.vue
+++ b/src/views/modules/shopOrder/productionReport/searchProductionLineOutputReport.vue
@@ -1,1002 +1,591 @@
 <template>
   <div class="mod-config">
-    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
-      <el-form-item :label="labels.reportDate">
-        <el-date-picker
-          style="width: 130px"
-          v-model="searchData.date1"
-          value-format="yyyy-MM-dd"
-          :placeholder="labels.placeholder">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item :label="labels.to">
-        <el-date-picker
-          style="width: 130px"
-          v-model="searchData.date2"
-          value-format="yyyy-MM-dd"
-          :placeholder="labels.placeholder">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item >
-        <span slot="label" style="" @click="getBaseList(5)"><a herf="#">{{labels.partNo}}</a></span>
-        <el-input v-model="searchData.partNo" style="width: 130px"></el-input>
-      </el-form-item>
-      <el-form-item :label="labels.partDescription">
-        <el-input v-model="searchData.partDescription" style="width: 130px"></el-input>
-      </el-form-item>
-      <el-form-item >
-        <span slot="label" style="" @click="getBaseList(18)"><a herf="#">{{labels.site}}</a></span>
-        <el-input v-model="searchData.site" style="width: 130px"></el-input>
-      </el-form-item>
-
-    </el-form>
-    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
-      <el-form-item :label="labels.orderNo">
-        <el-input v-model="searchData.orderNo" style="width: 273px"></el-input>
-      </el-form-item>
-      <el-form-item >
-        <span slot="label" style="" @click="getBaseList(26)"><a herf="#">{{labels.operatorID}}</a></span>
-        <el-input v-model="searchData.operatorID" style="width: 130px"></el-input>
-      </el-form-item>
-      <el-form-item >
-        <span slot="label" style="" @click="getBaseList(24)"><a herf="#">{{labels.workCenterNo}}</a></span>
-        <el-input v-model="searchData.workCenterNo" style="width: 130px"></el-input>
-      </el-form-item>
-      <el-form-item >
-        <span slot="label" style="" @click="getBaseList(88)"><a herf="#">{{labels.sResourceID}}</a></span>
-        <el-input v-model="searchData.sResourceID" style="width: 130px"></el-input>
-        <el-button @click="getData()" type="primary" style="margin-left: 2px;margin-top: 0px">{{buttons.search}}</el-button>
-        <download-excel
-          :fields="fields()"
-          :data="exportData"
-          type="xls"
-          :name="exportName"
-          :header="exportHeader"
-          :footer="exportFooter"
-          :fetch="createExportData"
-          :before-generate="startDownload"
-          :before-finish="finishDownload"
-          worksheet="导出信息"
-          class="el-button el-button--primary el-button--medium">
-          {{ buttons.download }}
-        </download-excel>
-      </el-form-item>
-
-    </el-form>
+    <!-- 条件查询 -->
+    <el-card :class="['search-card', { 'collapsed': !searchExpanded }]" shadow="hover">
+      <div slot="header" class="search-header">
+        <div class="header-left">
+          <i class="el-icon-search"></i>
+          <span class="header-title">产线产量采集报表</span>
+        </div>
+        <div class="header-right">
+          <el-button
+            type="text"
+            size="small"
+            @click="toggleSearchExpand"
+            class="collapse-btn">
+            <i :class="searchExpanded ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i>
+            {{ searchExpanded ? '收起' : '展开' }}
+          </el-button>
+        </div>
+      </div>
+
+      <el-form
+        :inline="true"
+        label-position="top"
+        :model="searchData"
+        class="search-form"
+        @keyup.enter.native="getData">
+
+        <!-- 所有查询条件 -->
+        <template v-if="searchExpanded">
+          <!-- 第一行 -->
+          <el-row :gutter="16">
+            <el-col :span="4">
+              <el-form-item label="工厂编码">
+                <el-input v-model="searchData.site" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="生产订单号">
+                <el-input v-model="searchData.orderNo" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="产成品编码">
+                <el-input v-model="searchData.partNo" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="产品名称">
+                <el-input v-model="searchData.partDescription" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="操作员ID">
+                <el-input v-model="searchData.operatorID" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="加工中心">
+                <el-input v-model="searchData.workCenterNo" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <!-- 第二行 -->
+          <el-row :gutter="16">
+            <el-col :span="4">
+              <el-form-item label="派工机台">
+                <el-input v-model="searchData.sResourceID" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="报告日期">
+                <div style="display: flex; align-items: center;">
+                  <el-date-picker
+                    v-model="searchData.date1"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="开始日期"
+                    style="flex: 1">
+                  </el-date-picker>
+                  <span style="margin: 0 8px; color: #DCDFE6;">~</span>
+                  <el-date-picker
+                    v-model="searchData.date2"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="结束日期"
+                    style="flex: 1">
+                  </el-date-picker>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </template>
+
+        <!-- 操作按钮区域 -->
+        <el-row :gutter="16">
+          <el-col :span="24">
+            <div class="search-actions">
+              <div class="action-left">
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  :loading="searchLoading"
+                  @click="getData">
+                  查询
+                </el-button>
+                <el-button
+                  icon="el-icon-refresh-left"
+                  @click="resetSearch">
+                  重置
+                </el-button>
+                <el-button
+                  type="success"
+                  icon="el-icon-download"
+                  :loading="exportLoading"
+                  @click="handleExport">
+                  导出
+                </el-button>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <!-- 主信息列表 -->
+    <div class="section-title-bar">
+      <i class="el-icon-document"></i>
+      <span>产量报告列表</span>
+      <span class="total-count">（共 {{ totalCount }} 条）</span>
+    </div>
     <el-table
-      :height="height"
+      ref="mainTable"
+      :height="tableHeight"
       :data="dataList"
       border
       v-loading="dataListLoading"
       style="width: 100%;">
       <el-table-column
-        v-for="(item,index) in columnList" :key="index"
-        :sortable="item.columnSortable"
+        type="index"
+        header-align="center"
+        align="center"
+        width="60"
+        label="序号">
+      </el-table-column>
+      <el-table-column
+        v-for="(item, index) in columnList"
+        :key="index"
         :prop="item.columnProp"
         :header-align="item.headerAlign"
-        :show-overflow-tooltip="item.showOverflowTooltip"
+        :show-overflow-tooltip="true"
         :align="item.align"
-        :fixed="item.fixed==''?false:item.fixed"
-        :width="item.columnWidth"
+        :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
-          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                             style="width: 100px; height: 80px"/></span>
+          <span>{{ scope.row[item.columnProp] }}</span>
         </template>
       </el-table-column>
     </el-table>
-    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+    <el-pagination
+      style="margin-top: 0px"
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 200, 500]"
+      :page-size="pageSize"
+      :total="totalCount"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
   </div>
 </template>
 
 <script>
 import {
-  saveTableDefaultList,
-  getTableDefaultListLanguage,
-  getTableUserListLanguage,
-  removerDefault,
-  removerUser
-} from "@/api/table.js"
-  import {
-    searchProductionLineOutputReport
-  } from "@/api/shopOrder/productionReport.js"
-  import Chooselist from '@/views/modules/common/Chooselist'
-  import {
-
-    searchFunctionButtonList,
-
-  } from "@/api/sysLanguage.js"
-  var functionId='104003003';
-  export default {
-    //查询-产线产量报告
-    name: "searchProductionLineOutputReport",
-    components: {
-      Chooselist
-    },
-    watch: {
+  searchProductionLineOutputReport
+} from "@/api/shopOrder/productionReport.js"
+import excel from "@/utils/excel-util.js"
+
+export default {
+  name: "searchProductionLineOutputReport",
+  data() {
+    return {
+      searchExpanded: true,
+      searchLoading: false,
+      dataListLoading: false,
+      exportLoading: false,
       searchData: {
-        deep: true,
-        handler: function (newV, oldV) {
-          this.searchData.partNo = this.searchData.partNo.toUpperCase()
-          this.searchData.orderNo = this.searchData.orderNo.toUpperCase()
-          this.searchData.operatorID = this.searchData.operatorID.toUpperCase()
-          this.searchData.sResourceID = this.searchData.sResourceID.toUpperCase()
-          this.searchData.workCenterNo = this.searchData.workCenterNo.toUpperCase()
-        }
+        site: '',
+        partNo: '',
+        partDescription: '',
+        orderNo: '',
+        operatorID: '',
+        sResourceID: '',
+        workCenterNo: '',
+        date1: '',
+        date2: '',
+        user: this.$store.state.user.name
+      },
+      dataList: [],
+      pageIndex: 1,
+      pageSize: 50,
+      totalCount: 0,
+      tableHeight: 400,
+      exportName: "产线产量报告" + this.dayjs().format('YYYYMMDDHHmmss'),
+      columnList: [
+        { columnProp: "reportDate", columnLabel: "报告日期", columnWidth: 100, headerAlign: "center", align: "center" },
+        { columnProp: "workCenterNo", columnLabel: "加工中心", columnWidth: 80, headerAlign: "center", align: "left" },
+        { columnProp: "workCenterDesc", columnLabel: "加工中心名称", columnWidth: 120, headerAlign: "center", align: "left" },
+        { columnProp: "operatorID", columnLabel: "操作员", columnWidth: 80, headerAlign: "center", align: "left" },
+        { columnProp: "operatorName", columnLabel: "姓名", columnWidth: 80, headerAlign: "center", align: "left" },
+        { columnProp: "orderNo", columnLabel: "订单号", columnWidth: 100, headerAlign: "center", align: "left" },
+        { columnProp: "reportQty", columnLabel: "报告数量", columnWidth: 80, headerAlign: "center", align: "right" },
+        { columnProp: "approveQty", columnLabel: "合格数量", columnWidth: 80, headerAlign: "center", align: "right" },
+        { columnProp: "defectQty", columnLabel: "不合格数量", columnWidth: 90, headerAlign: "center", align: "right" },
+        { columnProp: "reportedSetupTime", columnLabel: "准备时间", columnWidth: 80, headerAlign: "center", align: "right" },
+        { columnProp: "reportedManfTime", columnLabel: "制造时间", columnWidth: 80, headerAlign: "center", align: "right" },
+        { columnProp: "reportedCleanupTime", columnLabel: "清理时间", columnWidth: 80, headerAlign: "center", align: "right" },
+        { columnProp: "scrapReason", columnLabel: "报废原因", columnWidth: 100, headerAlign: "center", align: "left" },
+        { columnProp: "downTimeReason", columnLabel: "停机原因", columnWidth: 100, headerAlign: "center", align: "left" },
+        { columnProp: "remark", columnLabel: "备注", columnWidth: 120, headerAlign: "center", align: "left" },
+        { columnProp: "itemNo", columnLabel: "工序号", columnWidth: 70, headerAlign: "center", align: "center" },
+        { columnProp: "seqNo", columnLabel: "报告次序", columnWidth: 80, headerAlign: "center", align: "center" },
+        { columnProp: "reverseflag", columnLabel: "取消", columnWidth: 60, headerAlign: "center", align: "center" },
+        { columnProp: "partNo", columnLabel: "物料编码", columnWidth: 120, headerAlign: "center", align: "left" },
+        { columnProp: "partDescription", columnLabel: "物料名称/规格", columnWidth: 200, headerAlign: "center", align: "left" },
+        { columnProp: "needDate", columnLabel: "要求完工日期", columnWidth: 110, headerAlign: "center", align: "center" },
+        { columnProp: "site", columnLabel: "工厂编号", columnWidth: 80, headerAlign: "center", align: "center" },
+        { columnProp: "starttime", columnLabel: "开工时间", columnWidth: 140, headerAlign: "center", align: "center" },
+        { columnProp: "finishtime", columnLabel: "完工时间", columnWidth: 140, headerAlign: "center", align: "center" },
+        { columnProp: "downtime", columnLabel: "停机时间", columnWidth: 80, headerAlign: "center", align: "right" },
+        { columnProp: "assJobSeqNo", columnLabel: "派工单单号", columnWidth: 100, headerAlign: "center", align: "left" },
+        { columnProp: "qtyRequired", columnLabel: "派工单需求数量", columnWidth: 110, headerAlign: "center", align: "right" },
+        { columnProp: "sResourceID", columnLabel: "派工机台", columnWidth: 100, headerAlign: "center", align: "left" },
+        { columnProp: "operationDesc", columnLabel: "工序名称", columnWidth: 120, headerAlign: "center", align: "left" },
+        { columnProp: "customerName", columnLabel: "客户名称", columnWidth: 120, headerAlign: "center", align: "left" },
+        { columnProp: "custPartNo", columnLabel: "客户产品料号", columnWidth: 120, headerAlign: "center", align: "left" },
+        { columnProp: "actRunRate", columnLabel: "实际生产速度", columnWidth: 100, headerAlign: "center", align: "right" },
+        { columnProp: "scheduledDate", columnLabel: "排程日期", columnWidth: 100, headerAlign: "center", align: "center" },
+        { columnProp: "scheduledShiftNo", columnLabel: "排程班次", columnWidth: 80, headerAlign: "center", align: "center" },
+        { columnProp: "firstReportFlag", columnLabel: "首次报告", columnWidth: 80, headerAlign: "center", align: "center" },
+        { columnProp: "reportedSetupDowntime", columnLabel: "停机时间-调机", columnWidth: 110, headerAlign: "center", align: "right" },
+        { columnProp: "reportedManfDowntime", columnLabel: "停机时间-生产", columnWidth: 110, headerAlign: "center", align: "right" }
+      ]
+    }
+  },
+  watch: {
+    searchData: {
+      deep: true,
+      handler: function (newV) {
+        this.searchData.partNo = this.searchData.partNo.toUpperCase()
+        this.searchData.orderNo = this.searchData.orderNo.toUpperCase()
+        this.searchData.operatorID = this.searchData.operatorID.toUpperCase()
+        this.searchData.sResourceID = this.searchData.sResourceID.toUpperCase()
+        this.searchData.workCenterNo = this.searchData.workCenterNo.toUpperCase()
       }
+    }
+  },
+  created() {
+    this.setDefaultDates();
+    this.calculateTableHeight();
+    window.addEventListener('resize', this.calculateTableHeight);
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.calculateTableHeight);
+  },
+  methods: {
+    // 设置默认日期（本月）
+    setDefaultDates() {
+      const now = new Date();
+      const firstDay = new Date(now.getFullYear(), now.getMonth(), 1);
+      const lastDay = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+      this.searchData.date1 = this.formatDate(firstDay);
+      this.searchData.date2 = this.formatDate(lastDay);
     },
-    data() {
-      return {
-        visible: false,
-        queryTable: {
-          functionId: this.$route.meta.menuId,
-          tableId: "104003003Table",
-          languageCode: this.$i18n.locale
-        },
-        // 用户table 查询参数
-        queryTableUser: {
-          userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          tableId: "104003003Table",
-          status: true,
-          languageCode: this.$i18n.locale
-        },
-        labels: {
-          reportDate:'报告日期:',
-          placeholder:'选择日期',
-          to:'至:',
-          partNo:'产成品编码:',
-          partDescription:'产品名称:',
-          site:'工厂编码:',
-          orderNo:'生产订单号:',
-          operatorID:'操作员ID:',
-          workCenterNo:'加工中心:',
-          sResourceID:'派工机台编号:',
-        },
-        buttons:{
-          search:'查询',
-          download:'导出',
-        },
-        queryButton: {
-          functionId: functionId,
-          table_id: '*',
-          languageCode: this.$i18n.locale,
-          objectType: 'button'
-        },
-        queryLabel: {
-          functionId: functionId,
-          table_id: '*',
-          languageCode: this.$i18n.locale,
-          objectType: 'label'
-        },
-        tagNo:'',
-        // 导出 start
-        exportData: [],
-        exportName: "产线产量报告"+this.dayjs().format('YYYYMMDDHHmmss'),
-        exportHeader: ["产线产量报告"],
-        exportFooter: [],
-        // 导出 end
-        height: 200,
-        modelFlag:false,
-        modelInputFlag:true,
-        selectList:[],
-        searchData: {
-          site:'',
-          partNo:'',
-          partDescription:'',
-          orderNo:'',
-          operatorID:'',
-          sResourceID:'',
-          workCenterNo:'',
-          date1:'',
-          date2:'',
-          user:this.$store.state.user.name
-        },
-        dataList:[],
-        dataListLoading: false,
-        columnList: [
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableReportDate',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "reportDate",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "报告日期",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableWorkCenterNo',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "workCenterNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "加工中心",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableWorkCenterDesc',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "workCenterDesc",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "加工中心名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableOperatorID',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "operatorID",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "操作员",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableOperatorName',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "operatorName",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "姓名",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableOrderNo',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "orderNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "订单号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableReportQty',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "reportQty",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "报告数量",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableApproveQty',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "approveQty",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "合格数量",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableDefectQty',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "defectQty",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "不合格数量",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableReportedSetupTime',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "reportedSetupTime",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "准备时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableReportedManfTime',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "reportedManfTime",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "制造时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableReportedCleanupTime',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "reportedCleanupTime",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "清理时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableScrapReason',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "scrapReason",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "报废原因",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableDownTimeReason',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "downTimeReason",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "停机原因",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableRemark',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "remark",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "备注",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableItemNo',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "itemNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "工序号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableSeqNo',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "seqNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "报告次序",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableReverseflag',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "reverseflag",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "取消",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 60
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TablePartNo',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "partNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "物料编码",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TablePartDescription',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "partDescription",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "物料名称/规格",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 300
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableNeedDate',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "needDate",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "要求完工日期",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableSite',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "site",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "工厂编号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableStarttime',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "starttime",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "开工时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableFinishtime',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "finishtime",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "完工时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableDowntime',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "downtime",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "停机时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableAssJobSeqNo',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "assJobSeqNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "派工单单号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableQtyRequired',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "qtyRequired",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "派工单需求数量",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableSResourceID',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "sResourceID",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "派工机台",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableOperationDesc',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "operationDesc",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "工序名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 150
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableCustomerName',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "customerName",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "客户名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableCustPartNo',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "custPartNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "客户产品料号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableActRunRate',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "actRunRate",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "实际生产速度",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableScheduledDate',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "scheduledDate",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "排程日期",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableScheduledShiftNo',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "scheduledShiftNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "排程班次",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableFirstReportFlag',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "firstReportFlag",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "首次报告",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableReportedSetupDowntime',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "reportedSetupDowntime",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "停机时间-调机",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 104003003,
-            serialNumber: '104003003TableReportedManfDowntime',
-            tableId: "104003003Table",
-            tableName: "查询产线产量报告表",
-            columnProp: "reportedManfDowntime",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "停机时间-生产",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          }
-        ],
-      }
+    formatDate(date) {
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0');
+      const day = String(date.getDate()).padStart(2, '0');
+      return `${year}-${month}-${day}`;
     },
-    mounted() {
+    // 计算表格高度
+    calculateTableHeight() {
       this.$nextTick(() => {
-        this.height = window.innerHeight - 185;
-      })
+        const windowHeight = window.innerHeight;
+        const headerHeight = this.searchExpanded ? 306 : 186;
+        this.tableHeight = windowHeight - headerHeight - 105;
+      });
     },
-    methods: {
-      getBaseData(val){
-        if (this.tagNo === 5){
-          this.searchData.partNo = val.PartNo
-        }
-        if (this.tagNo === 18){
-          this.searchData.site = val.Site
-        }
-        if (this.tagNo === 26){
-          this.searchData.operatorID = val.OperatorID
-        }
-        if (this.tagNo === 24){
-          this.searchData.workCenterNo = val.WorkCenterNo
-        }
-        if (this.tagNo === 88){
-          this.searchData.sResourceID = val.ResourceID
-        }
-      },
-      // 获取基础数据列表
-      getBaseList(val){
-        this.tagNo = val
-        this.$nextTick(() => {
-          let strVal = "";
-          if (val === 5){
-            strVal = this.searchData.partNo
-          }
-          if (val === 18){
-            strVal = this.searchData.site
-          }
-          if (val === 26){
-            strVal = this.searchData.operatorID
-          }
-          if (val === 24){
-            strVal = this.searchData.workCenterNo
-          }
-          if (val === 88){
-            strVal = this.searchData.sResourceID
-          }
-          this.$refs.baseList.init(val,strVal)
-        })
-      },
-      getData(){
-        searchProductionLineOutputReport(this.searchData).then(({data}) => {
-          this.dataList = data.rows
-        })
-      },
-      //导出excel
-      createExportData() {
-
-        return this.dataList;
-
-      },
-      startDownload() {
-        //  this.exportData = this.dataList
+    // 切换查询条件展开/收起
+    toggleSearchExpand() {
+      this.searchExpanded = !this.searchExpanded;
+      this.calculateTableHeight();
+    },
+    // 查询数据
+    getData() {
+      this.searchLoading = true;
+      this.dataListLoading = true;
 
-      },
-      finishDownload() {
+      const params = {
+        ...this.searchData,
+        page: this.pageIndex,
+        limit: this.pageSize
+      };
 
-      },
-      fields() {
-        let json = "{"
-        this.columnList.forEach((item, index) => {
-          if (index == this.columnList.length - 1) {
-            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
-          } else {
-            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
-          }
-        })
-        json += "}"
-        let s = eval("(" + json + ")")
-
-        return s
-      },
-      // 导出 end
-      //多语言
-      getMultiLanguageList() {
-        //首先查询当前按钮的多语言
-        searchFunctionButtonList(this.queryButton).then(({data}) => {
-          if (data && data.code == 0) {
-            this.buttons = data.data
-          } else {
-            // saveButtonList(this.buttonList).then(({data}) => {
-            // })
-          }
-        });
-        //其次查询当前标签的多语言
-        searchFunctionButtonList(this.queryLabel).then(({data}) => {
-          if (data && data.code == 0) {
-            this.labels = data.data
-          } else {
-            // saveButtonList(this.buttonList).then(({data}) => {
-            // })
-          }
-        });
-      },
-      getTableUserColumn(tableId) {
-        console.log(tableId)
-        getTableUserListLanguage(this.queryTableUser).then(({data}) => {
-          if (data.rows.length > 0) {
-            //this.columnList = []
-            this.columnList = data.rows
-          } else {
-            this.getColumnList()
-          }
-        })
-      },
-      // 获取 tableDefault 列
-      getColumnList() {
-        getTableDefaultListLanguage(this.queryTable).then(({data}) => {
-          if (!data.rows.length == 0) {
-            // this.showDefault = false
-            this.columnList = data.rows
-          } else {
-            // this.showDefault = true
-          }
-        })
-      },
+      searchProductionLineOutputReport(params).then(({ data }) => {
+        if (data && data.page) {
+          this.dataList = data.page.list || [];
+          this.totalCount = data.page.totalCount || 0;
+        } else if (data && data.rows) {
+          // 兼容旧接口
+          this.dataList = data.rows || [];
+          this.totalCount = data.rows.length || 0;
+        } else {
+          this.dataList = [];
+          this.totalCount = 0;
+        }
+      }).catch(error => {
+        this.dataList = [];
+        this.totalCount = 0;
+        this.$message.error('查询失败: ' + (error.message || '未知错误'));
+      }).finally(() => {
+        this.searchLoading = false;
+        this.dataListLoading = false;
+      });
+    },
+    // 重置查询条件
+    resetSearch() {
+      this.searchData = {
+        site: '',
+        partNo: '',
+        partDescription: '',
+        orderNo: '',
+        operatorID: '',
+        sResourceID: '',
+        workCenterNo: '',
+        date1: '',
+        date2: '',
+        user: this.$store.state.user.name
+      };
+      this.setDefaultDates();
+      this.pageIndex = 1;
+    },
+    // 每页数变化
+    sizeChangeHandle(val) {
+      this.pageSize = val;
+      this.pageIndex = 1;
+      this.getData();
+    },
+    // 当前页变化
+    currentChangeHandle(val) {
+      this.pageIndex = val;
+      this.getData();
     },
-    created() {
-      // this.getMultiLanguageList()//刷新按钮
-      // this.getTableUserColumn()
+    // 导出数据
+    handleExport() {
+      if (this.dataList.length === 0) {
+        this.$message.warning('没有数据可导出，请先查询');
+        return;
+      }
+      this.exportLoading = true;
+      const params = {
+        ...this.searchData,
+        page: 1,
+        limit: -1  // 导出全部数据
+      };
+
+      excel.exportTable({
+        url: "/productionReport/searchProductionLineOutputReport",
+        columnMapping: this.columnList,
+        mergeSetting: [],
+        params: params,
+        fileName: this.exportName + ".xlsx",
+        rowFetcher: res => res.data,
+        columnFormatter: [],
+        dropColumns: [],
+      });
+      // exportTable 是异步的，但没有返回 Promise，设置延时关闭 loading
+      setTimeout(() => {
+        this.exportLoading = false;
+      }, 2000);
     }
   }
+}
 </script>
 
-<style >
-  .el-textarea__inner {
-    padding: 5px 5px;
+<style scoped>
+/* 搜索卡片样式 */
+.search-card {
+  margin-bottom: 16px;
+  border-radius: 8px;
+  overflow: hidden;
+  transition: all 0.3s ease;
+}
+
+.search-card:hover {
+  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.08);
+}
+
+.search-card /deep/ .el-card__header {
+  padding: 5px 20px;
+  background: linear-gradient(135deg, #9ac3d0 20%, #b6c7dd 80%);
+  border-bottom: none;
+}
+
+.search-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.header-left {
+  display: flex;
+  align-items: center;
+  color: #fff;
+}
+
+.header-left i {
+  font-size: 16px;
+  margin-right: 8px;
+}
+
+.header-title {
+  font-size: 14px;
+  font-weight: 600;
+  letter-spacing: 0.5px;
+}
+
+.header-right {
+  color: #fff;
+}
+
+.collapse-btn {
+  color: #fff;
+  font-weight: 500;
+  transition: all 0.3s ease;
+}
+
+.collapse-btn:hover {
+  color: #f0f0f0;
+  transform: translateY(-1px);
+}
+
+.collapse-btn i {
+  transition: transform 0.3s ease;
+}
+
+/* 搜索表单样式 */
+.search-form {
+  padding: 6px 0;
+  min-height: 0;
+}
+
+/* 卡片主体样式 */
+.search-card /deep/ .el-card__body {
+  padding: 10px;
+  transition: all 0.3s ease;
+}
+
+/* 收起时的样式 */
+.search-card.collapsed /deep/ .el-card__body {
+  padding: 10px 20px;
+}
+
+.search-form /deep/ .el-form-item {
+  margin-bottom: 12px;
+}
+
+.search-form /deep/ .el-form-item__label {
+  font-weight: 500;
+  color: #606266;
+  padding-bottom: 4px;
+}
+
+.search-form /deep/ .el-input__inner,
+.search-form /deep/ .el-textarea__inner {
+  border-radius: 6px;
+  border: 1px solid #DCDFE6;
+  transition: all 0.3s ease;
+}
+
+.search-form /deep/ .el-input__inner:focus,
+.search-form /deep/ .el-textarea__inner:focus {
+  border-color: #9ac3d0;
+  box-shadow: 0 0 0 2px rgba(154, 195, 208, 0.1);
+}
+
+.search-form /deep/ .el-select {
+  width: 100%;
+}
+
+/* 操作按钮区域 */
+.search-actions {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 8px 0 2px 0;
+}
+
+/* 展开时显示上边框 */
+.search-card:not(.collapsed) .search-actions {
+  border-top: 1px solid #f0f0f0;
+  margin-top: 6px;
+}
+
+/* 收起时不显示上边框和上边距 */
+.search-card.collapsed .search-actions {
+  border-top: none;
+  margin-top: 0;
+  padding-top: 0;
+}
+
+.action-left {
+  display: flex;
+  gap: 8px;
+  align-items: center;
+}
+
+.search-actions .el-button {
+  border-radius: 4px;
+  padding: 5px 10px;
+  font-size: 12px;
+  font-weight: 500;
+  transition: all 0.3s ease;
+}
+
+.search-actions .el-button:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+}
+
+.search-actions .el-button--primary {
+  background: #60aeff;
+  border-color: #60aeff;
+}
+
+.search-actions .el-button--primary:hover {
+  background: #7dbdff;
+  border-color: #7dbdff;
+}
+
+/* 区域标题栏样式 */
+.section-title-bar {
+  display: flex;
+  align-items: center;
+  padding: 8px 12px;
+  background: linear-gradient(135deg, #f5f7fa 0%, #e4e7eb 100%);
+  border-radius: 4px;
+  margin-bottom: 8px;
+  font-size: 14px;
+  font-weight: 600;
+  color: #303133;
+}
+
+.section-title-bar i {
+  font-size: 16px;
+  margin-right: 8px;
+  color: #409eff;
+}
+
+.section-title-bar .total-count {
+  margin-left: 10px;
+  font-size: 12px;
+  font-weight: normal;
+  color: #909399;
+}
+
+/* 表格样式 */
+/deep/ .el-table th {
+  background-color: #f5f7fa;
+  color: #303133;
+  font-weight: 600;
+}
+
+/deep/ .el-table tr:hover > td {
+  background-color: #f5f7fa !important;
+}
+
+/* 响应式设计 */
+@media (max-width: 1200px) {
+  .search-actions {
+    flex-direction: column;
+    gap: 10px;
+  }
+
+  .action-left {
+    width: 100%;
+    justify-content: center;
   }
+}
 </style>