diff --git a/src/api/orderIssure/soIssueNotify.js b/src/api/orderIssure/soIssueNotify.js
index 6eeab13..6987c7d 100644
--- a/src/api/orderIssure/soIssueNotify.js
+++ b/src/api/orderIssure/soIssueNotify.js
@@ -57,3 +57,6 @@ export const saveSOIssueNotifyOrderMateria = data => createAPI(`/orderIssure/iss
 
 export const getBomAlternativeParts = data => createAPI(`/orderIssure/issureNotify/getBomAlternativeParts`,'post',data)
 export const getWorkCenterList = data => createAPI(`/orderIssure/issureNotify/getWorkCenterList`,'post',data)
+
+// 生产领料任务通知报表查询
+export const searchIssueNotifyReport = data => createAPI(`/orderIssure/issureNotify/searchIssueNotifyReport`,'post',data)
diff --git a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue
index f087a13..586151a 100644
--- a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue
+++ b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue
@@ -1,1354 +1,707 @@
 <template>
-  <div class="mod-config yzz">
- <!--    <div>-->
-<!--        <span @click="favoriteFunction()">-->
-<!--         <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>-->
-<!--        </span>-->
-<!--    </div>-->
-    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
-      <el-form :inline="true" label-position="top" style="margin-top: 0px">
-        <el-form-item :label="'申请单号'">
-          <el-input v-model="searchData.notifyNo" style="width: 120px"></el-input>
-        </el-form-item>
-        <el-form-item :label="'申请账号'">
-          <el-input v-model="searchData.userName" style="width: 120px"></el-input>
-        </el-form-item>
-        <el-form-item :label="'申请单日期'">
-          <el-date-picker
-            style="width: 120px"
-            v-model="searchData.startDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item style="margin-top: 23px;">
-          <label style="margin-left: 0px;font-size: 19px">&#10142</label>
-        </el-form-item>
-        <el-form-item :label="' '">
-          <el-date-picker
-            style="width: 120px"
-            v-model="searchData.endDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item :label="'车间'">
-          <el-select v-model="searchData.workShopList" multiple collapse-tags clearable style="width: 360px">
-            <el-option
-              v-for = "i in workShopList"
-              :key = "i.workShopId"
-              :label = "i.workShopName"
-              :value = "i.workShopId">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="' '">
-          <el-button type="primary" @click="searchTable()">查询</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">
-            {{ '导出' }}
-          </download-excel>
-        </el-form-item>
+  <div class="mod-config">
+    <!-- 查询条件 -->
+    <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">Search</span>
+        </div>
+        <div class="header-right">
+          <el-button
+            type="text"
+            size="small"
+            @click="toggleSearchExpand"
+            class="collapse-btn">
+            <span>{{ searchExpanded ? '收起' : '展开' }}</span>
+            <i :class="searchExpanded ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i>
+          </el-button>
+        </div>
+      </div>
+
+      <el-form
+        label-position="top"
+        :model="searchData"
+        class="search-form"
+        @keyup.enter.native="searchTable">
+
+        <!-- 所有查询条件 - 可展开/收起 -->
+        <template v-if="searchExpanded">
+          <!-- 第一行 -->
+          <el-row :gutter="16">
+            <el-col :span="4">
+              <el-form-item label="通知单号">
+                <el-input v-model="searchData.notifyNo" placeholder="请输入通知单号" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="要求出库日期">
+                <el-date-picker
+                  v-model="searchData.startDate"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="开始日期"
+                  style="width: 44%">
+                </el-date-picker>
+                <span style="margin: 0 6px; color: #DCDFE6;">~</span>
+                <el-date-picker
+                  v-model="searchData.endDate"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="结束日期"
+                  style="width: 44%">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="单据状态">
+                <el-select v-model="searchData.status" clearable placeholder="请选择单据状态">
+                  <el-option label="待出库" value="待出库"></el-option>
+                  <el-option label="已出库" value="已出库"></el-option>
+                  <el-option label="已关闭" value="已关闭"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="工单号">
+                <el-input v-model="searchData.soOrderNo" placeholder="请输入工单号" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="BOM行号">
+                <el-input v-model="searchData.bomItemNo" placeholder="请输入BOM行号" 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.componentPartNo" placeholder="请输入物料编码" clearable style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="物料名称">
+                <el-input v-model="searchData.partDescription" placeholder="请输入物料名称" clearable style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="规格型号">
+                <el-input v-model="searchData.spec" placeholder="请输入规格型号" clearable style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="加工中心">
+                <el-select v-model="searchData.workCenterNoList" multiple collapse-tags clearable filterable placeholder="请选择加工中心" style="width: 100%">
+                  <el-option
+                    v-for="i in workCenterList"
+                    :key="i.workCenterNo"
+                    :label="i.workCenterNo + ' - ' + i.workCenterDesc"
+                    :value="i.workCenterNo">
+                  </el-option>
+                </el-select>
+              </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="dataListLoading"
+                  @click="searchTable">
+                  查询
+                </el-button>
+                <el-button
+                  icon="el-icon-refresh-left"
+                  @click="resetSearch">
+                  重置
+                </el-button>
+              </div>
+              <div class="action-right">
+                <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--default">
+                  <i class="el-icon-download"></i> 导出
+                </download-excel>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
       </el-form>
-    </el-form>
+    </el-card>
+
+    <!-- 列表 -->
     <el-table
       :data="dataList"
-      @row-click="changeData"
       :height="height"
       border
       highlight-current-row
       ref="mainTable"
       v-loading="dataListLoading"
-      style="width: 100%; ">
+      style="width: 100%;">
       <el-table-column
-        v-for="(item,index) in columnList1" :key="index"
+        v-for="(item, index) in columnList"
+        :key="index"
         :sortable="item.columnSortable"
         :prop="item.columnProp"
         :header-align="item.headerAlign"
         :show-overflow-tooltip="item.showOverflowTooltip"
         :align="item.align"
-        :fixed="item.fixed==''?false:item.fixed"
+        :fixed="item.fixed === '' ? false : item.fixed"
         :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 v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
         </template>
       </el-table-column>
-<!--      <el-table-column-->
-<!--        header-align="center"-->
-<!--        align="center"-->
-<!--        width="80"-->
-<!--        fixed="left"-->
-<!--        label="操作">-->
-<!--        <template slot-scope="scope">-->
-<!--          <a type="text" size="small" v-if="scope.row.status==='已下达'" @click="closeNotify(scope.row)">结束</a>-->
-<!--          <a type="text" size="small" v-if="scope.row.status==='已关闭'" @click="openNotify(scope.row)">打开</a>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
     </el-table>
-    <el-pagination
+
+    <!-- 分页 -->
+    <el-pagination style="margin-top: 0px"
       @size-change="sizeChangeHandle"
       @current-change="currentChangeHandle"
       :current-page="pageIndex"
-      :page-sizes="[20, 50, 100, 1000]"
+      :page-sizes="[20, 50, 100, 200, 500]"
       :page-size="pageSize"
       :total="totalPage"
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
-
-
-    <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName"  type="border-card"  @tab-click="tabClick">
-      <el-tab-pane label="派工单明细" name="detail">
-        <el-table
-          :data="dataList2"
-          :height="height"
-          border
-          v-loading="dataListLoading"
-          style="width: 100%; ">
-          <el-table-column
-            v-for="(item,index) in columnList2" :key="index"
-            :sortable="item.columnSortable"
-            :prop="item.columnProp"
-            :header-align="item.headerAlign"
-            :show-overflow-tooltip="item.showOverflowTooltip"
-            :align="item.align"
-            :fixed="item.fixed==''?false:item.fixed"
-            :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>
-            </template>
-          </el-table-column>
-<!--          <el-table-column-->
-<!--            header-align="center"-->
-<!--            align="center"-->
-<!--            width="80"-->
-<!--            fixed="left"-->
-<!--            label="操作">-->
-<!--            <template slot-scope="scope">-->
-<!--              <a type="text" size="small" v-if="currentRow.status==='已下达'" @click="deleteNotifySOSPlus(scope.row)">删除</a>-->
-
-<!--            </template>-->
-<!--          </el-table-column>-->
-        </el-table>
-
-      </el-tab-pane>
-      <el-tab-pane label="材料明细" name="sub">
-        <el-table
-          :data="dataList3"
-          :height="height"
-          border
-          :row-class-name="tableRowClassName"
-          v-loading="dataListLoading"
-          style="width: 100%; ">
-<!--          <el-table-column-->
-<!--            header-align="center"-->
-<!--            align="center"-->
-<!--            width="80"-->
-<!--            fixed="left"-->
-<!--            label="操作">-->
-<!--            <template slot-scope="scope">-->
-<!--              <a type="text" size="small" @click="printLabel(scope.row)">打印标签</a>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
-          <el-table-column
-            v-for="(item,index) in columnList3" :key="index"
-            :sortable="item.columnSortable"
-            :prop="item.columnProp"
-            :header-align="item.headerAlign"
-            :show-overflow-tooltip="item.showOverflowTooltip"
-            :align="item.align"
-            :fixed="item.fixed==''?false:item.fixed"
-            :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>
-            </template>
-          </el-table-column>
-<!--          <el-table-column-->
-<!--            header-align="center"-->
-<!--            align="center"-->
-<!--            width="80"-->
-<!--            fixed="left"-->
-<!--            label="操作">-->
-<!--            <template slot-scope="scope">-->
-<!--              <a type="text" size="small" v-if="currentRow.status==='已下达'" @click="deleteNotifyMaterial(scope.row)">删除</a>-->
-
-<!--            </template>-->
-<!--          </el-table-column>-->
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="材料汇总" name="sum">
-        <el-table
-          :data="dataList4"
-          :height="height"
-          border
-          v-loading="dataListLoading"
-          style="width: 100%; ">
-          <!--          <el-table-column-->
-          <!--            header-align="center"-->
-          <!--            align="center"-->
-          <!--            width="80"-->
-          <!--            fixed="left"-->
-          <!--            label="操作">-->
-          <!--            <template slot-scope="scope">-->
-          <!--              <a type="text" size="small" @click="printLabel(scope.row)">打印标签</a>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <el-table-column
-            v-for="(item,index) in columnList4" :key="index"
-            :sortable="item.columnSortable"
-            :prop="item.columnProp"
-            :header-align="item.headerAlign"
-            :show-overflow-tooltip="item.showOverflowTooltip"
-            :align="item.align"
-            :fixed="item.fixed==''?false:item.fixed"
-            :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>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-tab-pane>
-    </el-tabs>
-
-
-    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
   </div>
 </template>
 
 <script>
-  import {
-    searchNotifyHeader
-    ,searchNotifyOrderList
-    ,searchNotifyMaterialList
-    ,searchSumNotifyMaterialList
-    ,deleteNotifySOSPlus
-    ,updateNotifyStatus
-    ,deleteNotifyMaterial
-    ,getEamWorkShop
-  }from "@/api/orderIssure/soIssueNotify.js"
-  import Chooselist from '@/views/modules/common/Chooselist'
-  import {
-    getTableDefaultListLanguage,
-    getTableUserListLanguage,
-  } from "@/api/table.js"
-  import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
-  export default {
-    components: {
-      Chooselist
-    },
-    data() {
-      return {
-        height:200,
-        modelFlag:false,
-        activeName: 'detail',
-        dataList: [],
-        dataList2: [],
-        dataList3: [],
-        dataList4: [],
-        addOrUpdateVisible:false,
-        searchData: {
-          page: 1,
-          limit: 100,
-          site:this.$store.state.user.site,
-          userName: '',
-          notifyNo: '',
-          issueFlag: '',
-          issueResult: '',
-          workShopList: [],
-          startDate: this.dayjs().format("YYYY-MM-DD"),
-          endDate: this.dayjs().format("YYYY-MM-DD"),
-          sql: " and a.status='已下达' and (issueFlag='N' or issueResult='部分发料' ) ",
-        },
-        workShopList: [],
-        exportList:[],
-        pageIndex: 1,
-        pageSize: 100,
-        totalPage: 0,
-        dataListLoading: false,
-        currentRow:'',
-        headerData:'',
-        favorite: false,
-        columnList1:[
-          {
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table1NotifyNo',
-            tableId: "701003Table1",
-            tableName: "领料申请主表",
-            columnProp: "notifyNo",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "申请单单号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table1WorkShopName',
-            tableId: "701003Table1",
-            tableName: "领料申请主表",
-            columnProp: "workShopName",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "车间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table1NotifyDate',
-            tableId: "701003Table1",
-            tableName: "领料申请主表",
-            columnProp: "notifyDate",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "申请日期",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table1UserName',
-            tableId: "701003Table1",
-            tableName: "领料申请主表",
-            columnProp: "userName",
-            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: 701003,
-            serialNumber: '701003Table1UserName',
-            tableId: "701003Table1",
-            tableName: "领料申请主表",
-            columnProp: "userDisplay",
-            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: 701003,
-            serialNumber: '701003Table1IssueFlag',
-            tableId: "701003Table1",
-            tableName: "领料申请主表",
-            columnProp: "issueFlag",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "是否领料",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 60
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table1IssueResult',
-            tableId: "701003Table1",
-            tableName: "领料申请主表",
-            columnProp: "issueResult",
-            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: 701003,
-            serialNumber: '701003Table1Status',
-            tableId: "701003Table1",
-            tableName: "领料申请主表",
-            columnProp: "status",
-            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: 701003,
-            serialNumber: '701003Table1Remark',
-            tableId: "701003Table1",
-            tableName: "领料申请主表",
-            columnProp: "remark",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "备注",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 200
-          },
-        ],
-        columnList2:[
-          {
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table2ItemNo',
-            tableId: "701003Table2",
-            tableName: "申请单派工单明细表",
-            columnProp: "itemNo",
-            headerAlign: "center",
-            align: "right",
-            columnLabel: "序号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 40
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table2NeedDate',
-            tableId: "701003Table2",
-            tableName: "领料申请派工单子表",
-            columnProp: 'needDate',
-            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: 701003,
-            serialNumber: '701003Table2SOOrderNo',
-            tableId: "701003Table2",
-            tableName: "申请单派工单明细表",
-            columnProp: "sOOrderNo",
-            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: 701003,
-            serialNumber: '701003Table2OpsItemNo',
-            tableId: "701003Table2",
-            tableName: "申请单派工单明细表",
-            columnProp: "opsItemNo",
-            headerAlign: "center",
-            align: "right",
-            columnLabel: "工序",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 50
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table2ItemDesc',
-            tableId: "701003Table2",
-            tableName: "申请单派工单明细表",
-            columnProp: "itemDesc",
-            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: 701003,
-            serialNumber: '701003Table2SeqNo',
-            tableId: "701003Table2",
-            tableName: "申请单派工单明细表",
-            columnProp: "seqNo",
-            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: 701003,
-            serialNumber: '701003Table2FGPartNo',
-            tableId: "701003Table2",
-            tableName: "申请单派工单明细表",
-            columnProp: "fGPartNo",
-            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: 701003,
-            serialNumber: '701003Table2PartDesc',
-            tableId: "701003Table2",
-            tableName: "申请单派工单明细表",
-            columnProp: "partDesc",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "物料名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 200
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table2LocationNo',
-            tableId: "701003Table2",
-            tableName: "领料申请派工单子表",
-            columnProp: 'locationNo',
-            headerAlign: "center",
-            align: "left",
-            columnLabel: '库位编码',
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80,
-
+import {
+  searchIssueNotifyReport,
+  getWorkCenterList,
+  getSiteAndBuByUserName
+} from "@/api/orderIssure/soIssueNotify.js"
 
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table2IssureQty',
-            tableId: "701003Table2",
-            tableName: "申请单派工单明细表",
-            columnProp: "issureQty",
-            headerAlign: "center",
-            align: "right",
-            columnLabel: "发料数量",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-        ],
-        columnList3:[
-          {
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table3ItemNo',
-            tableId: "701003Table3",
-            tableName: "申请单材料明细表",
-            columnProp: "itemNo",
-            headerAlign: "center",
-            align: "right",
-            columnLabel: "申请单序号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table3NeedDate',
-            tableId: "701003Table3",
-            tableName: "申请单材料明细表",
-            columnProp: "needDate",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "需求时间",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 110
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table3ComponentPartNo',
-            tableId: "701003Table3",
-            tableName: "申请单材料明细表",
-            columnProp: "componentPartNo",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "材料编码",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table3PartDesc',
-            tableId: "701003Table3",
-            tableName: "申请单材料明细表",
-            columnProp: "partDesc",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "材料名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 130
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table3QtyToIssue',
-            tableId: "701003Table3",
-            tableName: "申请单材料明细表",
-            columnProp: "qtyToIssue",
-            headerAlign: "center",
-            align: "right",
-            columnLabel: "申请数量",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table3QtyToIssueOriginal',
-            tableId: "701003Table3",
-            tableName: "申请单材料明细表",
-            columnProp: "qtyToIssueOriginal",
-            headerAlign: "center",
-            align: "right",
-            columnLabel: "已发数量",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table3IssueType',
-            tableId: "701003Table3",
-            tableName: "申请单材料明细表",
-            columnProp: "issueType",
-            headerAlign: "center",
-            align: "right",
-            columnLabel: "类型",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table3Remark',
-            tableId: "701003Table3",
-            tableName: "申请单材料明细表",
-            columnProp: "remark",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "备注",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 160
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table3SOOrderNo',
-            tableId: "701003Table3",
-            tableName: "申请单材料明细表",
-            columnProp: "orderNo",
-            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: 701003,
-            serialNumber: '701003Table3OpsItemNo',
-            tableId: "701003Table3",
-            tableName: "申请单材料明细表",
-            columnProp: "opsItemNo",
-            headerAlign: "center",
-            align: "right",
-            columnLabel: "工序",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 50
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table3SeqNo',
-            tableId: "701003Table3",
-            tableName: "申请单材料明细表",
-            columnProp: "seqNo",
-            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: 701003,
-            serialNumber: '701003Table3LocationNo',
-            tableId: "701003Table3",
-            tableName: "申请单材料明细表",
-            columnProp: "locationNo",
-            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: 701003,
-            serialNumber: '701003Table3BOMItemNo',
-            tableId: "701003Table3",
-            tableName: "申请单材料明细表",
-            columnProp: "bOMItemNo",
-            headerAlign: "center",
-            align: "right",
-            columnLabel: "BOM序号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-        ],
-        columnList4:[
-          {
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table4IssueType',
-            tableId: "701003Table4",
-            tableName: "申请单材料明细表",
-            columnProp: "issueType",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "类型",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table4ComponentPartNo',
-            tableId: "701003Table4",
-            tableName: "申请单材料明细表",
-            columnProp: "componentPartNo",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "材料编码",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table4PartDesc',
-            tableId: "701003Table4",
-            tableName: "申请单材料明细表",
-            columnProp: "partDesc",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "材料名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 130
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table4QtyToIssue',
-            tableId: "701003Table4",
-            tableName: "申请单材料明细表",
-            columnProp: "qtyToIssue",
-            headerAlign: "center",
-            align: "right",
-            columnLabel: "合计申请数量",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },{
-            userId: this.$store.state.user.name,
-            functionId: 701003,
-            serialNumber: '701003Table4QtyToIssueOriginal',
-            tableId: "701003Table4",
-            tableName: "申请单材料明细表",
-            columnProp: "qtyToIssueOriginal",
-            headerAlign: "center",
-            align: "right",
-            columnLabel: "合计已发数量",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 80
-          },
-        ],
-        dataRole: {
-          partTypeDesc: [
-            {
-              required: true,
-              message: ' ',
-              trigger: 'change'
-            }
-          ],
-          partName: [
-            {
-              required: true,
-              message: ' ',
-              trigger: 'change'
-            }
-          ],
+export default {
+  data() {
+    return {
+      height: 400,
+      searchExpanded: true,
+      dataList: [],
+      dataListLoading: false,
+      userBuList: [],
+      searchData: {
+        page: 1,
+        limit: 50,
+        site: this.$store.state.user.site,
+        userName: this.$store.state.user.name,
+        notifyNo: '',
+        startDate: '',
+        endDate: '',
+        status: '待出库',
+        soOrderNo: '',
+        bomItemNo: '',
+        componentPartNo: '',
+        partDescription: '',
+        spec: '',
+        workCenterNoList: []
+      },
+      workCenterList: [],
+      pageIndex: 1,
+      pageSize: 50,
+      totalPage: 0,
+      columnList: [
+        {
+          columnProp: "notifyNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "通知单号",
+          columnHidden: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 120,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: "notifyDate",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "要求出库日期",
+          columnHidden: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 100,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: "status",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "单据状态",
+          columnHidden: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 80,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: "soOrderNo",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "工单号",
+          columnHidden: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 140,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: "bomItemNo",
+          headerAlign: "center",
+          align: "right",
+          columnLabel: "BOM行号",
+          columnHidden: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 80,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: "componentPartNo",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "物料编码",
+          columnHidden: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 120,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: "partDescription",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "物料名称",
+          columnHidden: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 180,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: "spec",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "规格型号",
+          columnHidden: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 150,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: "umName",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "单位",
+          columnHidden: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 60,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: "componentScrap",
+          headerAlign: "center",
+          align: "right",
+          columnLabel: "调机用量",
+          columnHidden: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 80,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: "firstInspectionQty",
+          headerAlign: "center",
+          align: "right",
+          columnLabel: "首检用量",
+          columnHidden: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 80,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: "standardDosage",
+          headerAlign: "center",
+          align: "right",
+          columnLabel: "标准用量",
+          columnHidden: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 80,
+          showOverflowTooltip: true
         },
-        // 导出 start
-        exportData: [],
-        exportName: '发料申请单'+this.dayjs().format('YYYYMMDDHHmmss'),
-        exportHeader: ["发料申请单"],
-        exportFooter: [],
-        // 导出 end
+        {
+          columnProp: "qtyToIssue",
+          headerAlign: "center",
+          align: "right",
+          columnLabel: "申请数量",
+          columnHidden: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 90,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: "actualOutQty",
+          headerAlign: "center",
+          align: "right",
+          columnLabel: "累计出库数量",
+          columnHidden: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 100,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: "workCenterNo",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "加工中心",
+          columnHidden: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 100,
+          showOverflowTooltip: true
+        }
+      ],
+      // 导出相关
+      exportData: [],
+      exportName: '生产领料任务通知' + this.dayjs().format('YYYYMMDDHHmmss'),
+      exportHeader: ["生产领料任务通知"],
+      exportFooter: []
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.height = window.innerHeight - 245
+      this.getSiteAndBuByUserName()
+      this.searchTable()
+    })
+  },
+  methods: {
+    // 展开/收起查询条件
+    toggleSearchExpand() {
+      this.searchExpanded = !this.searchExpanded
+    },
+    // 重置查询条件
+    resetSearch() {
+      this.searchData = {
+        page: 1,
+        limit: 50,
+        site: this.$store.state.user.site,
+        userName: this.$store.state.user.name,
+        notifyNo: '',
+        startDate: '',
+        endDate: '',
+        status: '待出库',
+        soOrderNo: '',
+        bomItemNo: '',
+        componentPartNo: '',
+        partDescription: '',
+        spec: '',
+        workCenterNoList: []
       }
+      this.pageIndex = 1
+      this.searchTable()
     },
-    mounted () {
-      this.$nextTick(() => {
-        this.height = (window.innerHeight- 260) / 2
-        this.searchTable()
-        getEamWorkShop({}).then(({data}) => {
-          if (data && data.code === 0) {
-            this.workShopList=data.rows
+    // 获取用户BU列表
+    getSiteAndBuByUserName() {
+      getSiteAndBuByUserName({
+        username: this.$store.state.user.name
+      }).then(({data}) => {
+        if (data && data.code === 0) {
+          this.userBuList = data.rows || []
+          if (this.userBuList.length > 0) {
+            this.loadWorkCenterList()
           }
-        })
+        }
       })
     },
-
-    // watch: {
-    //   searchData: {
-    //     deep: true,
-    //     handler: function (newV, oldV) {
-    //       this.searchData.partNo = this.searchData.partNo.toUpperCase()
-    //     }
-    //   },
-    // },
-    methods: {
-      // 获取基础数据列表S
-      getBaseList (val, type) {
-        this.tagNo = val
-        this.tagNo1 = type
-        this.$nextTick(() => {
-          let strVal = ''
-          if (val === 1013) {
-            if(type==23) {
-              strVal = this.modelData.supplierId
-            }
-          }
-          this.$refs.baseList.init(val, strVal)
-        })
-      },
-      /* 列表方法的回调 */
-      getBaseData (val) {
-        if (this.tagNo === 23) {
-          if(this.tagNo1==1) {
-            this.modelData.supplierId = val.SupplierID
-            this.modelData.supplierName = val.SupplierName
-          }
+    // 加载加工中心列表
+    loadWorkCenterList() {
+      if (this.userBuList.length === 0) return
+      const buNo = this.userBuList[0].buNo
+      const inData = {
+        site: buNo.split('_')[0],
+        buNo: buNo.split('_')[1]
+      }
+      getWorkCenterList(inData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.workCenterList = data.rows || []
         }
-      },
-      // 每页数
-      sizeChangeHandle (val) {
-        this.pageSize = val
-        this.pageIndex = 1
-        this.searchTable()
-      },
-      // 当前页
-      currentChangeHandle (val) {
-        this.pageIndex = val
-        this.searchTable()
-      },
-      tabClick (tab, event) {
-        // 刷新列表数据
-        this.refreshCurrentTabTable()
-      },
-      changeData(row){
-        this.currentRow = JSON.parse(JSON.stringify(row));
-        this.headerData=row;
-        this.refreshCurrentTabTable ();
-      },
-      refreshCurrentTabTable(){
-        if(this.currentRow===''||this.currentRow===null){
-          this.currentRow={site:'',notifyNo:''}
+      })
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.searchTable()
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.pageIndex = val
+      this.searchTable()
+    },
+    // 查询
+    searchTable() {
+      this.dataListLoading = true
+      this.searchData.limit = this.pageSize
+      this.searchData.page = this.pageIndex
+      searchIssueNotifyReport(this.searchData).then(({data}) => {
+        this.dataListLoading = false
+        if (data && data.code === 0) {
+          this.dataList = data.page.list || []
+          this.pageIndex = data.page.currPage
+          this.pageSize = data.page.pageSize
+          this.totalPage = data.page.totalCount
+        } else {
+          this.dataList = []
+          this.$message.error(data.msg || '查询失败')
+        }
+      }).catch(() => {
+        this.dataListLoading = false
+        this.dataList = []
+      })
+    },
+    // 导出相关方法
+    async createExportData() {
+      this.searchData.limit = -1
+      this.searchData.page = 1
+      const {data} = await searchIssueNotifyReport(this.searchData)
+      return data && data.page ? data.page.list : []
+    },
+    startDownload() {},
+    finishDownload() {},
+    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 + "\"" + ","
         }
-        if(this.activeName==='detail'){
-          searchNotifyOrderList(this.currentRow).then(({data}) => {
-            //区分请求成功和失败的状况
-            if (data && data.code == 0) {
-              this.dataList2 = data.rows
+      })
+      json += "}"
+      return eval("(" + json + ")")
+    }
+  }
+}
+</script>
 
-            } else {
-              this.dataList2 = [];
-            }
-          });
-        }else if(this.activeName==='sub'){
-          searchNotifyMaterialList(this.currentRow).then(({data}) => {
-            //区分请求成功和失败的状况
-            if (data && data.code == 0) {
-              this.dataList3 = data.rows
+<style scoped>
+.search-card {
+  margin-bottom: 16px;
+  border-radius: 8px;
+  overflow: hidden;
+  transition: all 0.3s ease;
+}
 
-            } else {
-              this.dataList3 = [];
-            }
-          });
-        }else {
-          searchSumNotifyMaterialList(this.currentRow).then(({data}) => {
-            //区分请求成功和失败的状况
-            if (data && data.code == 0) {
-              this.dataList4 = data.rows
+.search-card:hover {
+  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.08);
+}
 
-            } else {
-              this.dataList4 = [];
-            }
-          });
-        }
-      },
-      searchTable(){
-        this.searchData.limit = this.pageSize
-        this.searchData.page = this.pageIndex
-        searchNotifyHeader(this.searchData).then(({data}) => {
-          //区分请求成功和失败的状况
-          if (data && data.code == 0) {
-            this.dataList = data.page.list
-            this.pageIndex = data.page.currPage
-            this.pageSize = data.page.pageSize
-            this.totalPage = data.page.totalCount
-            if(this.dataList.length>0){
-              this.$refs.mainTable.setCurrentRow(this.dataList[0]);
-              this.changeData(this.dataList[0])
-            }else {
-              this.changeData(null)
-            }
-          } else {
-            this.dataList = [];
-          }
-        });
-      },
-      closeNotify(row){
-        this.$confirm('确认关闭?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-            let inData={
-              site:row.site,
-              notifyNo:row.notifyNo,
-              status:'已关闭',
-            }
-          updateNotifyStatus(inData).then(({data}) => {
-            if (data && data.code === 0) {
-              this.searchTable()
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {}
-              })
-            } else {
-              this.$alert(data.msg, '错误', {
-                confirmButtonText: '确定'
-              })
-            }
-          })
-        })
-      },
-      openNotify(row){
-        this.$confirm('确认打开?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          let inData={
-            site:row.site,
-            notifyNo:row.notifyNo,
-            status:'已下达',
-          }
-          updateNotifyStatus(inData).then(({data}) => {
-            if (data && data.code === 0) {
-              this.searchTable()
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {}
-              })
-            } else {
-              this.$alert(data.msg, '错误', {
-                confirmButtonText: '确定'
-              })
-            }
-          })
-        })
-      },
-      deleteNotifyMaterial(row){
-        this.$confirm('确认删除?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          deleteNotifyMaterial(row).then(({data}) => {
-            if (data && data.code === 0) {
-              this.refreshCurrentTabTable()
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {}
-              })
-            } else {
-              this.$alert(data.msg, '错误', {
-                confirmButtonText: '确定'
-              })
-            }
-          })
-        })
-      },
-      deleteNotifySOSPlus(row){
-        this.$confirm('确认删除?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          deleteNotifySOSPlus(row).then(({data}) => {
-            if (data && data.code === 0) {
-              this.refreshCurrentTabTable()
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {}
-              })
-            } else {
-              this.$alert(data.msg, '错误', {
-                confirmButtonText: '确定'
-              })
-            }
-          })
-        })
-      },
-      //导出excel
-      //导出excel
-      async createExportData() {
-        this.searchData.limit = -1
-        this.searchData.page = 1
-        await searchNotifyHeader(this.searchData).then(({data}) => {
-          this.exportList= data.page.list;
-        })
+.search-card /deep/ .el-card__header {
+  padding: 5px 20px;
+  background: linear-gradient(135deg, #9ac3d0 20%, #b6c7dd 80%);
+  border-bottom: none;
+}
 
-        return this.exportList;
-      },
-      startDownload() {
-        //  this.exportData = this.dataList
+.search-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
 
-      },
-      finishDownload() {
-      },
-      fields() {
-        let json = "{"
-        this.columnList1.forEach((item, index) => {
-          if (index == this.columnList1.length - 1) {
-            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
-          } else {
-            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
-          }
-        })
-        json += "}"
-        let s = eval("(" + json + ")")
+.header-left {
+  display: flex;
+  align-items: center;
+  color: #fff;
+}
 
-        return s
-      },
-      tableRowClassName ({row, rowIndex}) {
+.header-left i {
+  font-size: 16px;
+  margin-right: 8px;
+}
 
-        if (row.qtyToIssueOriginal<row.qtyToIssue&&new Date(row.needDate)<new Date(this.dayjs().format("YYYY-MM-DD HH:mm"))) {
-          return 'error-row'
-        }
+.header-title {
+  font-size: 14px;
+  font-weight: 600;
+  letter-spacing: 0.5px;
+}
 
-        return ''
-      },
+.header-right {
+  color: #fff;
+}
 
-      // 动态列开始 获取 用户保存的 格式列
-      async getTableUserColumn(tableId, columnId) {
-        let queryTableUser = {
-          userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          tableId: tableId,
-          status: true,
-          languageCode: this.$i18n.locale
-        }
-        await getTableUserListLanguage(queryTableUser).then(({data}) => {
-          if (data.rows.length > 0) {
-            //this.columnList1 = []
-            switch (columnId) {
-              case 1:
-                this.columnList1 = data.rows
-                break;
-              case 2:
-                this.columnList2 = data.rows
-                break;
-              case 3:
-                this.columnList3 = data.rows
-                break;
-              case 4:
-                this.columnList4 = data.rows
-                break;
-              // case 5:
-              //   this.columnList5 = data.rows
-              //   break;
-            }
-          } else {
-            this.getColumnList(tableId, columnId)
-          }
-        })
-      },
+.collapse-btn {
+  color: #fff;
+  font-weight: 500;
+  transition: all 0.3s ease;
+}
 
-      // 获取 tableDefault 列
-      async getColumnList (tableId, columnId) {
-        let queryTable= {
-          functionId: this.$route.meta.menuId,
-          tableId: tableId,
-          languageCode: this.$i18n.locale
-        }
-        await getTableDefaultListLanguage(queryTable).then(({data}) => {
-          if (!data.rows.length == 0) {
-            switch (columnId) {
-              case 1:
-                this.columnList1 = data.rows
-                break;
-              case 2:
-                this.columnList2 = data.rows
-                break;
-              case 3:
-                this.columnList3 = data.rows
-                break;
-              case 4:
-                this.columnList4 = data.rows
-                break;
-              // case 5:
-              //   this.columnList5 = data.rows
-              //   break;
-            }
-          } else {
-            // this.showDefault = true.
-          }
-        })
+.collapse-btn:hover {
+  color: #f0f0f0;
+  transform: translateY(-1px);
+}
 
-      },
-      // 校验用户是否收藏
-      favoriteIsOk () {
-        let userFavorite = {
-          userId: this.$store.state.user.id,
-          languageCode: this.$i18n.locale
-        }
-        userFavoriteList(userFavorite).then(({data}) => {
-          for (let i = 0; i < data.list.length; i++) {
-            if (this.$route.meta.menuId === data.list[i].menuId) {
-              this.favorite = true
-            }
-          }
-        })
-      },
+.collapse-btn i {
+  transition: transform 0.3s ease;
+}
 
-      // 收藏 OR 取消收藏
-      favoriteFunction () {
-        let userFavorite = {
-          userId: this.$store.state.user.id,
-          functionId: this.$route.meta.menuId,
-        }
-        if (this.favorite) {
-          removeUserFavorite(userFavorite).then(({data}) => {
-            this.$message.success(data.msg)
-            this.favorite = false
-          })
-        } else {
-          // 收藏
-          saveUserFavorite(userFavorite).then(({data}) => {
-            this.$message.success(data.msg)
-            this.favorite = true
-          })
-        }
-      },
+/* 搜索表单样式 */
+.search-form {
+  padding: 6px 0;
+  min-height: 0;
+}
 
-    },
-    created () {
-      // 按钮控制
-      // this.getButtonAuthData()
-      // 获取用户的 site 和 bu
-      // this.getSiteAndBuByUserName()
-      // 校验用户是否收藏
-      // this.favoriteIsOk()
-      //
-      // // 动态列
-      // this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
-      // this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
-      // this.getTableUserColumn(this.$route.meta.menuId+'table3',3)
-      // this.getTableUserColumn(this.$route.meta.menuId+'table4',4)
-      // if (!this.authSearch) {
-      //   // 获取数据列表
-      //   this.getDataList()
-      // }
-    },
-  }
-</script>
+/* 卡片主体样式 */
+.search-card /deep/ .el-card__body {
+  padding: 10px;
+  transition: all 0.3s ease;
+}
 
-<style scoped>
+/* 收起时的样式 */
+.search-card.collapsed /deep/ .el-card__body {
+  padding: 10px 20px;
+}
+
+.search-form /deep/ .el-form-item {
+  margin-bottom: 12px;
+  width: 100%;
+  display: block;
+}
+
+.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-form /deep/ .el-input {
+  width: 100%;
+}
+
+.search-form /deep/ .el-date-editor.el-input {
+  width: 100%;
+}
 
+.search-form /deep/ .el-form-item__content {
+  width: 100%;
+}
+
+/* 多选下拉框样式优化 */
+.search-form /deep/ .el-select .el-select__tags {
+  flex-wrap: nowrap;
+  overflow: hidden;
+}
+
+.search-form /deep/ .el-select .el-tag {
+  max-width: 80px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+/* 操作按钮区域 */
+.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,
+.action-right {
+  display: flex;
+  gap: 8px;
+}
+
+.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;
+}
+
+/* 响应式设计 */
+@media (max-width: 1200px) {
+  .search-actions {
+    flex-direction: column;
+    gap: 10px;
+  }
+
+  .action-left,
+  .action-right {
+    width: 100%;
+    justify-content: center;
+  }
+}
 </style>