diff --git a/.env.development b/.env.development
index 4358f3b..4ffe842 100644
--- a/.env.development
+++ b/.env.development
@@ -13,5 +13,5 @@ VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":54,"调拨入库":55,"
 #VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file
 
 # 正式oa
-VUE_APP_OA_URL = http://192.168.60.18:2021
-VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":54,"调拨入库":55,"领用出库":56,"处置出库":57,"调令出库":53}'
+#VUE_APP_OA_URL = http://192.168.60.18:2021
+#VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":54,"调拨入库":55,"领用出库":56,"处置出库":57,"调令出库":53}'
diff --git a/src/api/monitor.js b/src/api/monitor.js
index 444fffc..cfc5275 100644
--- a/src/api/monitor.js
+++ b/src/api/monitor.js
@@ -1,9 +1,10 @@
 import request from '@/utils/request'
 
-export function getGasConfig() {
+export function getGasConfig(params) {
   return request({
     url: '/api/admin/gas-config/index',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 
diff --git a/src/api/system/stocktaking.js b/src/api/system/stocktaking.js
index ce6819f..506bb9a 100644
--- a/src/api/system/stocktaking.js
+++ b/src/api/system/stocktaking.js
@@ -51,6 +51,14 @@ export function getStocktakingPlanLinkList(data) {
   })
 }
 
+// 删除盘点计划物资关联
+export function deleteStocktakingPlanLink(params) {
+  return request({
+    url: '/api/admin/material-infos-plan-link/destroy',
+    method: 'get',
+    params
+  })
+}
 // 获取单个盘点计划详情
 export function getStocktakingPlanLinkDetail(params) {
   return request({
diff --git a/src/views/inventorys/index.vue b/src/views/inventorys/index.vue
index a335362..74a90b6 100644
--- a/src/views/inventorys/index.vue
+++ b/src/views/inventorys/index.vue
@@ -573,32 +573,63 @@
             window.open('/admin/#/myprint?ids=' + this.printArr, '_blank')
           },
           async exportExcel(sheetName) {
+            const export_fields = {
+              'wuzibianma': '物资编码',
+              'wuzibianma_material_infos_wuzibianma_relation.fenlei_detail.name': '所属种类',
+              'zichanmingcheng': '物资名称',
+              'wuzileixing': '物资类型',
+              'guigexinghao': '物资型号',
+              'wuziguige': '物资规格',
+              'wuzibianma_material_infos_wuzibianma_relation.jiliangdanwei': '单位',
+              'rukupici': '入库批次',
+              'zaikushuliang': '在库数量',
+              'shunxuhao': '顺序号',
+              'wuzizhuangtai_detail.value': '物资状态',
+              'chubeifangshi_detail.value': '储备方式',
+              'materialstorages.cangkumingcheng': '所在仓库',
+              'shelfs.huojiamingcheng': '所在货架',
+              'huojiaceng': '所在货架层',
+              'dengjifenlei_detail.value': '等级分类',
+              'chanquanxinxi_detail.value': '产权信息',
+              'shifouweigudingzichan': '是否为固定资产',
+              'gudingzichanbianma': '固定资产编码',
+              'chubeinnianxian': '储备年限',
+              'cunfangyaoqiu': '存放要求',
+              'weihuyaoqiu': '维护要求',
+              'equipment_maintain_configs_id_relation.name': '保养频次',
+            }
             const res = await index(Object.assign(this.select, {
               page: 1,
               page_size: 9999,
-              table_name: 'inventorys'
+              table_name: 'inventorys',
+              is_export: 1,
+              "export_fields[wuzibianma]": '物资编码',
+              "export_fields[wuzibianma_material_infos_wuzibianma_relation.material_info_type]": '一级分类',
+              "export_fields[wuzibianma_material_infos_wuzibianma_relation.material_info_type]": '二级分类',
+              "export_fields[wuzibianma_material_infos_wuzibianma_relation.fenlei_detail.name]": '所属种类',
+              "export_fields[zichanmingcheng]": '物资名称',
+              "export_fields[wuzileixing]": '物资类型',
+              "export_fields[guigexinghao]": '物资型号',
+              "export_fields[wuziguige]": '物资规格',
+              "export_fields[wuzibianma_material_infos_wuzibianma_relation.jiliangdanwei]": '单位',
+              "export_fields[rukupici]": '入库批次',
+              "export_fields[zaikushuliang]": '在库数量',
+              "export_fields[shunxuhao]": '顺序号', 
+              "export_fields[wuzizhuangtai_detail.value]": '物资状态',
+              "export_fields[chubeifangshi_detail.value]": '储备方式',
+              "export_fields[materialstorages.cangkumingcheng]": '所在仓库',
+              "export_fields[shelfs.huojiamingcheng]": '所在货架',
+              "export_fields[huojiaceng]": '所在货架层',
+              "export_fields[dengjifenlei_detail.value]": '等级分类',
+              "export_fields[chanquanxinxi_detail.value]": '产权信息',
+              "export_fields[shifouweigudingzichan]": '是否为固定资产',
+              "export_fields[gudingzichanbianma]": '固定资产编码',
+              "export_fields[chubeinnianxian]": '储备年限',
+              "export_fields[cunfangyaoqiu]": '存放要求',
+              "export_fields[weihuyaoqiu]": '维护要求',
+              "export_fields[equipment_maintain_configs_id_relation.name]": '保养频次',
             }),true)
-            if (res.data) {
-              const headers = this.form.map(i => {
-                return {
-                  key: i.field,
-                  title: i.name
-                }
-              })
-              const data = res.data.map(row => headers.map(header => row[header.key]))
-              data.unshift(headers.map(header => header.title))
-              const wb = XLSX.utils.book_new()
-              const ws = XLSX.utils.aoa_to_sheet(data)
-              XLSX.utils.book_append_sheet(wb, ws, sheetName)
-              const wbout = XLSX.write(wb, {
-                bookType: 'xlsx',
-                bookSST: true,
-                type: 'array'
-              })
-              saveAs(new Blob([wbout], {
-                type: 'application/octet-stream'
-              }), `自管物资${sheetName}.xlsx`)
-            }
+            
           },
           showCode(e, row) {
             console.log(e, row)
diff --git a/src/views/inventorys/stocktaking.vue b/src/views/inventorys/stocktaking.vue
index 9f1d83d..bfe4e94 100644
--- a/src/views/inventorys/stocktaking.vue
+++ b/src/views/inventorys/stocktaking.vue
@@ -11,19 +11,22 @@
       <div class="search-filters">
         <div class="filter-item">
           <span class="selector-item__label">关键词:</span>
-          <Input v-model="planSearch.keyword" style="width: 180px" :clearable="true" placeholder="计划名称/编号" />
+          <Input
+            v-model="planSearch.keyword"
+            style="width: 180px"
+            :clearable="true"
+            placeholder="计划名称/编号"
+          />
         </div>
         <div class="filter-item">
           <span class="selector-item__label">计划日期:</span>
-          <DatePicker v-model="planSearch.dateRange" type="daterange" split-panels style="width: 200px" :clearable="true" />
-        </div>
-        <div class="filter-item">
-          <span class="selector-item__label">状态:</span>
-          <Select v-model="planSearch.status" style="width: 120px" :clearable="true">
-            <Option value="0">未开始</Option>
-            <Option value="1">进行中</Option>
-            <Option value="2">已完成</Option>
-          </Select>
+          <DatePicker
+            v-model="planSearch.dateRange"
+            type="daterange"
+            split-panels
+            style="width: 200px"
+            :clearable="true"
+          />
         </div>
         <div class="filter-item">
           <Button type="primary" @click="searchPlans">查询</Button>
@@ -40,12 +43,28 @@
           <Progress :percent="getPlanProgress(row)" :stroke-width="15" />
         </template>
         <template slot="action" slot-scope="{ row }">
-          <div style="display: flex; gap: 8px; justify-content: center;">
-            <Button type="primary" size="small" style="border-radius: 6px;" @click="showInventorySelectModal(row.id)">选择对象</Button>
-            <Button v-if="row.status === 2" type="success" size="small" style="border-radius: 6px;" ghost @click="showSummaryModal(row)">盘点小结</Button>
+          <div style="display: flex; gap: 8px; justify-content: center">
+            <Button
+              type="primary"
+              size="small"
+              style="border-radius: 6px"
+              @click="showInventorySelectModal(row.id)"
+              >选择对象</Button
+            >
+            <!-- <Button
+              v-if="row.status === 2"
+              type="success"
+              size="small"
+              style="border-radius: 6px"
+              ghost
+              @click="showSummaryModal(row)"
+              >盘点小结</Button
+            > -->
             <template v-if="row.status === 2">
               <el-dropdown trigger="hover" @command="command => handleMoreCommand(command, row)">
-                <Button type="info" size="small" style="border-radius: 6px;" ghost>更多<i class="el-icon-arrow-down el-icon--right" /></Button>
+                <Button type="info" size="small" style="border-radius: 6px" ghost
+                  >更多<i class="el-icon-arrow-down el-icon--right"
+                /></Button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="edit">编辑</el-dropdown-item>
                   <el-dropdown-item command="delete">删除</el-dropdown-item>
@@ -54,9 +73,30 @@
               </el-dropdown>
             </template>
             <template v-else>
-              <Button type="primary" size="small" style="border-radius: 6px;" ghost @click="showPlanModal('edit', row)">编辑</Button>
-              <Button type="error" size="small" style="border-radius: 6px;" ghost @click="deletePlan(row.id)">删除</Button>
-              <Button type="info" size="small" style="border-radius: 6px;" ghost @click="viewPlanDetail(row)">查看</Button>
+              <Button
+                type="primary"
+                size="small"
+                style="border-radius: 6px"
+                ghost
+                @click="showPlanModal('edit', row)"
+                >编辑</Button
+              >
+              <Button
+                type="error"
+                size="small"
+                style="border-radius: 6px"
+                ghost
+                @click="deletePlan(row.id)"
+                >删除</Button
+              >
+              <Button
+                type="info"
+                size="small"
+                style="border-radius: 6px"
+                ghost
+                @click="viewPlanDetail(row)"
+                >查看</Button
+              >
             </template>
           </div>
         </template>
@@ -76,22 +116,107 @@
       </div>
     </div>
 
-    <!-- 盘点列表 Section -->
+    <!-- 历史盘点计划 Section -->
     <div class="content-wrapper" style="margin-top: 20px">
       <div class="page-header">
-        <h1 class="page-title">盘点列表</h1>
+        <h1 class="page-title">历史盘点计划</h1>
       </div>
 
+      <Tabs v-model="historyTab" @on-click="handleHistoryTabChange">
+        <!-- 计划内 Tab -->
+        <TabPane label="计划内" name="plan">
+          <!-- Plan Search Filters -->
+          <div class="search-filters">
+            <div class="filter-item">
+              <span class="selector-item__label">关键词:</span>
+              <Input
+                v-model="historyPlanSearch.keyword"
+                style="width: 180px"
+                :clearable="true"
+                placeholder="计划名称/编号"
+              />
+            </div>
+            <div class="filter-item">
+              <span class="selector-item__label">计划日期:</span>
+              <DatePicker
+                v-model="historyPlanSearch.dateRange"
+                type="daterange"
+                split-panels
+                style="width: 200px"
+                :clearable="true"
+              />
+            </div>
+            <div class="filter-item">
+              <Button type="primary" @click="searchHistoryPlans">查询</Button>
+              <Button style="margin-left: 10px" @click="resetHistoryPlanSearch">重置</Button>
+            </div>
+          </div>
+
+          <!-- Plan Table -->
+          <Table :columns="planColumns" :data="historyPlanList" :loading="historyPlanLoading">
+            <template slot="status" slot-scope="{ row }">
+              <Tag :color="getStatusColor(row.status)">{{ getStatusText(row.status) }}</Tag>
+            </template>
+            <template slot="progress" slot-scope="{ row }">
+              <Progress :percent="getPlanProgress(row)" :stroke-width="15" />
+            </template>
+            <template slot="action" slot-scope="{ row }">
+              <div style="display: flex; gap: 8px; justify-content: center">
+                <Button
+                  type="success"
+                  size="small"
+                  style="border-radius: 6px"
+                  ghost
+                  @click="showSummaryModal(row)"
+                  >盘点小结</Button
+                >
+                <el-dropdown trigger="hover" @command="command => handleMoreCommand(command, row)">
+                  <Button type="info" size="small" style="border-radius: 6px" ghost
+                    >更多<i class="el-icon-arrow-down el-icon--right"
+                  /></Button>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item command="edit">编辑</el-dropdown-item>
+                    <el-dropdown-item command="delete">删除</el-dropdown-item>
+                    <el-dropdown-item command="view">查看</el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </div>
+            </template>
+          </Table>
+
+          <!-- Plan Pagination -->
+          <div class="pagination-container">
+            <el-pagination
+              :current-page="historyPlanSearch.pageIndex"
+              :page-sizes="[10, 20, 50, 100]"
+              :page-size="historyPlanSearch.pageSize"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="historyPlanTotal"
+              @size-change="handleHistoryPlanPageSizeChange"
+              @current-change="handleHistoryPlanPageChange"
+            />
+          </div>
+        </TabPane>
+
+        <!-- 计划外 Tab -->
+        <TabPane label="计划外" name="outside">
       <!-- List Search Filters -->
       <div class="search-filters">
         <div class="filter-item">
           <span class="selector-item__label">关键词:</span>
-          <Input v-model="listSearch.keyword" :clearable="true" style="width: 180px" placeholder="单号/计划/区域/执行人" />
+              <Input
+                v-model="listSearch.keyword"
+                :clearable="true"
+                style="width: 180px"
+                placeholder="单号/计划/区域/执行人"
+              />
         </div>
         <div class="filter-item">
           <span class="selector-item__label">所属计划:</span>
           <Select v-model="listSearch.planId" style="width: 180px" :clearable="true">
-            <Option v-for="plan in planList" :key="plan.id" :value="plan.id">{{ plan.name }}</Option>
+                <Option v-for="plan in planList" :key="plan.id" :value="plan.id">{{
+                  plan.name
+                }}</Option>
           </Select>
         </div>
         <div class="filter-item">
@@ -125,11 +250,19 @@
           {{ row.material_infos_plan ? row.material_infos_plan.end_date : '-' }}
         </template>
         <template slot="status" slot-scope="{ row }">
-          <Tag :color="getInventoryStatusColor(row.status)">{{ getInventoryStatusText(row.status) }}</Tag>
+              <Tag :color="getInventoryStatusColor(row.status)">{{
+                getInventoryStatusText(row.status)
+              }}</Tag>
         </template>
         <template slot="action" slot-scope="{ row }">
-          <div style="display: flex; gap: 8px; justify-content: center;">
-            <Button type="primary" size="small" style="border-radius: 6px;" @click="viewInventoryDetail(row)">查看</Button>
+              <div style="display: flex; gap: 8px; justify-content: center">
+                <Button
+                  type="primary"
+                  size="small"
+                  style="border-radius: 6px"
+                  @click="viewInventoryDetail(row)"
+                  >查看</Button
+                >
           </div>
         </template>
       </Table>
@@ -146,6 +279,8 @@
           @current-change="handleListPageChange"
         />
       </div>
+        </TabPane>
+      </Tabs>
     </div>
 
     <!-- Plan Create/Edit Modal -->
@@ -172,7 +307,12 @@
           </Select>
         </FormItem>
         <FormItem label="备注" prop="remark">
-          <Input v-model="planModal.form.remark" type="textarea" :rows="3" placeholder="请输入备注信息" />
+          <Input
+            v-model="planModal.form.remark"
+            type="textarea"
+            :rows="3"
+            placeholder="请输入备注信息"
+          />
         </FormItem>
       </Form>
       <template slot="footer">
@@ -182,63 +322,173 @@
     </Modal>
 
     <!-- Inventory Selection Modal -->
-    <Modal v-model="materialModal.visible" title="选择盘点物资" width="900">
-      <div class="material-search">
-        <Input v-model="materialModal.keyword" placeholder="物资名称" style="width: 180px; margin-right: 10px;" />
-        <Select v-model="materialModal.storehouses_id" clearable placeholder="仓库类型" style="width: 120px; margin-right: 10px;" @on-change="onStorehouseTypeChange">
-          <Option v-for="item in storehouseTypeOptions" :key="item.value" :value="item.value">{{ item.label }}</Option>
-        </Select>
-        <Select v-model="materialModal.area" clearable placeholder="所在区域" style="width: 120px; margin-right: 10px;" @on-change="onAreaChange">
-          <Option v-for="item in areaOptions" :key="item.value" :value="item.value">{{ item.value }}</Option>
-        </Select>
-        <Select v-model="materialModal.warehouseName" clearable placeholder="仓库名称" style="width: 140px; margin-right: 10px;">
-          <Option v-for="item in warehouseNameOptions" :key="item.value" :value="item.value">{{ item.label }}</Option>
-        </Select>
-        <Button type="primary" style="margin-left: 10px" @click="searchMaterials">查询</Button>
-        <Button style="margin-left: 10px" @click="resetMaterialSearch">重置</Button>
+    <Modal
+      v-model="materialModal.visible"
+      title="选择盘点物资"
+      width="70%"
+      @on-cancel="handleMaterialModalClose"
+    >
+      <div style="display: flex; justify-content: flex-start; flex-wrap: wrap">
+        <div class="selector-item">
+          <el-input
+            v-model="materialModal.keyword"
+            style="width: 120px; margin-right: 10px"
+            placeholder="物资名称搜索"
+          />
+      </div>
+        <div class="selector-item">
+          <el-cascader
+            v-model="materialModal.fenlei"
+            placeholder="请选择所属种类"
+            ref="cascaders"
+            clearable
+            popper-class="select_popper"
+            style="margin-right: 10px; flex-basis: 20%"
+            :options="fenleiList"
+            :props="{ label: 'name', value: 'id' }"
+            @change="
+              e => {
+                changeFenlei(e)
+              }
+            "
+          />
+        </div>
+        <div class="selector-item">
+          <el-select
+            clearable
+            v-model="materialModal.suozaicangku"
+            style="width: 100%"
+            placeholder="请选择所在仓库"
+          >
+            <el-option
+              v-for="item in cangkuList"
+              :key="item.id"
+              :label="item.cangkumingcheng"
+              :value="item.id"
+            />
+          </el-select>
+        </div>
+        <div class="selector-item">
+          <el-date-picker
+            type="daterange"
+            range-separator="至"
+            start-placeholder="入库日期开始"
+            end-placeholder="入库日期结束"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            v-model="materialModal.rukuriqi"
+          ></el-date-picker>
+        </div>
+        <div class="selector-item">
+          <el-date-picker
+            format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="生产日期开始"
+            end-placeholder="生产日期结束"
+            value-format="yyyy-MM-dd"
+            v-model="materialModal.shengchanriqi"
+          ></el-date-picker>
+        </div>
+        <div class="selector-item">
+          <el-select
+            clearable
+            v-model="materialModal.wuzizhuangtai"
+            style="width: 100%"
+            placeholder="请选择物资状态"
+          >
+            <el-option
+              v-for="item in paraOptions.materials_status"
+              :key="item.id"
+              :label="item.value"
+              :value="item.id"
+            />
+          </el-select>
+        </div>
+        <div class="selector-item">
+          <el-select
+            clearable
+            v-model="materialModal.chanquanxinxi"
+            style="width: 100%"
+            placeholder="请选择产权信息"
+          >
+            <el-option
+              v-for="item in paraOptions.materials_property"
+              :key="item.id"
+              :label="item.value"
+              :value="item.id"
+            />
+          </el-select>
+        </div>
+        <div class="selector-item">
+          <el-select
+            clearable
+            v-model="materialModal.chubeifangshi"
+            style="width: 100%"
+            placeholder="请选择储备方式"
+          >
+            <el-option
+              v-for="item in paraOptions.material_reserve"
+              :key="item.id"
+              :label="item.value"
+              :value="item.id"
+            />
+          </el-select>
+        </div>
+        <div class="selector-item">
+          <el-select
+            clearable
+            v-model="materialModal.dengjifenlei"
+            style="width: 100%"
+            placeholder="请选择等级分类"
+          >
+            <el-option
+              v-for="item in paraOptions.dengjifenlei"
+              :key="item.id"
+              :label="item.value"
+              :value="item.id"
+            />
+          </el-select>
+        </div>
+        <div>
+          <el-button type="primary" style="margin-left: 10px" @click="searchMaterials"
+            >查询</el-button
+          >
+          <el-button type="primary" style="margin-left: 10px" @click="resetMaterialSearch"
+            >重置</el-button
+          >
+        </div>
       </div>
-      <el-table
+      <xy-table
         ref="materialTable"
+        :key="materialModal.tableKey"
         v-loading="materialModal.loading"
-        :data="materialList"
-        row-key="id"
-        @select="handleSelect"
-        @select-all="handleSelectAll"
+        :pageSize="materialModal.pageSize"
+        :pageIndex="materialModal.pageIndex"
+        :span-method="objectSpanMethod"
+        :list="materialList"
+        :total="materialModal.total"
+        :table-item="materialTable"
+        :auths="[]"
+        :default-selections="getSelectedRows()"
+        @selection-change="selectionChange"
+        @pageSizeChange="handleMaterialPageSizeChange"
+        @pageIndexChange="handleMaterialPageChange"
       >
+        <template v-slot:btns>
         <el-table-column
-          type="selection"
-          width="55"
-        />
-        <el-table-column
-          prop="zichanmingcheng"
-          label="物资名称"
-        />
-        <el-table-column
-          prop="guigexinghao"
-          label="物资型号"
-        />
-        <el-table-column
-          prop="jiliangdanwei"
-          label="单位"
-        />
-        <el-table-column
-          prop="inventorys_total"
-          label="当前库存"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.inventorys_total === null ? '0' : scope.row.inventorys_total }}
-          </template>
-        </el-table-column>
-        <el-table-column
+            fixed="right"
+            align="center"
           label="操作"
-          width="100"
+            width="120"
+            header-align="center"
         >
           <template slot-scope="scope">
-            <div style="display: flex; gap: 8px; justify-content: center;">
+              <div style="display: flex; gap: 8px; justify-content: center">
               <el-button
                 :type="isSelected(scope.row) ? 'warning' : 'success'"
                 size="small"
-                style="border-radius: 6px;"
+                  style="border-radius: 6px"
                 @click="toggleMaterialSelection(scope.row, scope.$index)"
               >
                 {{ isSelected(scope.row) ? '移出计划' : '加入计划' }}
@@ -246,31 +496,16 @@
             </div>
           </template>
         </el-table-column>
-      </el-table>
-      <div class="pagination-container">
-        <el-pagination
-          :current-page="materialModal.pageIndex"
-          :page-sizes="[10, 20, 50, 100]"
-          :page-size="materialModal.pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="materialModal.total"
-          @size-change="handleMaterialPageSizeChange"
-          @current-change="handleMaterialPageChange"
-        />
-      </div>
+        </template>
+      </xy-table>
       <template slot="footer">
-        <Button @click="materialModal.visible = false">取消</Button>
+        <Button @click="handleMaterialModalClose">取消</Button>
         <Button type="primary" @click="handleMaterialSubmit">确定</Button>
       </template>
     </Modal>
 
     <!-- 盘点任务详情弹窗 -->
-    <Modal
-      v-model="detailModal.visible"
-      title="盘点任务详情"
-      width="1000"
-      :mask-closable="true"
-    >
+    <Modal v-model="detailModal.visible" title="盘点任务详情" width="1000" :mask-closable="true">
       <div v-if="detailModal.data" class="detail-content">
         <div class="detail-header">
           <div class="detail-item">
@@ -312,7 +547,11 @@
           <div class="material-info-content">
             <div class="info-item">
               <span class="label">物资名称：</span>
-              <span class="value">{{ detailModal.data.material_info && detailModal.data.material_info.zichanmingcheng || '-' }}</span>
+              <span class="value">{{
+                (detailModal.data.material_info &&
+                  detailModal.data.material_info.zichanmingcheng) ||
+                '-'
+              }}</span>
             </div>
            <!-- <div class="info-item">
               <span class="label">物资代码：</span>
@@ -320,15 +559,25 @@
             </div> -->
             <div class="info-item">
               <span class="label">物资型号：</span>
-              <span class="value">{{ detailModal.data.material_info && detailModal.data.material_info.guigexinghao || '-' }}</span>
+              <span class="value">{{
+                (detailModal.data.material_info && detailModal.data.material_info.guigexinghao) ||
+                '-'
+              }}</span>
             </div>
             <div class="info-item">
               <span class="label">计量单位：</span>
-              <span class="value">{{ detailModal.data.material_info && detailModal.data.material_info.jiliangdanwei || '-' }}</span>
+              <span class="value">{{
+                (detailModal.data.material_info && detailModal.data.material_info.jiliangdanwei) ||
+                '-'
+              }}</span>
             </div>
             <div class="info-item">
               <span class="label">当前库存：</span>
-              <span class="value">{{ detailModal.data.material_info && detailModal.data.material_info.inventorys_total || '0' }}</span>
+              <span class="value">{{
+                (detailModal.data.material_info &&
+                  detailModal.data.material_info.inventorys_total) ||
+                '0'
+              }}</span>
             </div>
           </div>
         </div>
@@ -342,12 +591,14 @@
             border
           >
             <template slot="status" slot-scope="{ row }">
-              <Tag :color="getInventoryStatusColor(row.status)">{{ getInventoryStatusText(row.status) }}</Tag>
+              <Tag :color="getInventoryStatusColor(row.status)">{{
+                getInventoryStatusText(row.status)
+              }}</Tag>
             </template>
             <template slot="photos" slot-scope="{ row }">
               <div v-if="row.files && row.files.length" class="photo-list">
                 <div v-for="(file, index) in row.files.slice(0, 3)" :key="index" class="photo-item">
-                  <img :src="file.url" @click="previewImage(file.url)">
+                  <img :src="file.url" @click="previewImage(file.url)" />
                 </div>
                 <div v-if="row.files.length > 3" class="photo-more">
                   +{{ row.files.length - 3 }}
@@ -376,7 +627,7 @@
 
     <!-- 预览弹窗 -->
     <div v-if="previewUrl" class="image-preview-modal" @click="closePreview">
-      <img :src="previewUrl" class="image-preview-large">
+      <img :src="previewUrl" class="image-preview-large" />
     </div>
 
     <!-- Plan Detail Modal -->
@@ -427,12 +678,14 @@
             border
           >
             <template slot="status" slot-scope="{ row }">
-              <Tag :color="getInventoryStatusColor(row.status)">{{ getInventoryStatusText(row.status) }}</Tag>
+              <Tag :color="getInventoryStatusColor(row.status)">{{
+                getInventoryStatusText(row.status)
+              }}</Tag>
             </template>
             <template slot="photos" slot-scope="{ row }">
               <div v-if="row.files && row.files.length" class="photo-list">
                 <div v-for="(file, index) in row.files.slice(0, 3)" :key="index" class="photo-item">
-                  <img :src="file.url" @click="previewImage(file.url)">
+                  <img :src="file.url" @click="previewImage(file.url)" />
                 </div>
                 <div v-if="row.files.length > 3" class="photo-more">
                   +{{ row.files.length - 3 }}
@@ -460,14 +713,12 @@
     </Modal>
 
     <!-- 盘点小结 Modal -->
-    <Modal
-      v-model="summaryModal.visible"
-      title="盘点小结"
-      width="800"
-    >
+    <Modal v-model="summaryModal.visible" title="盘点小结" width="800">
       <div>
         <div id="print-table">
-          <div style="text-align: center; font-size: 20px; font-weight: bold; margin-bottom: 12px;">盘点小结</div>
+          <div style="text-align: center; font-size: 20px; font-weight: bold; margin-bottom: 12px">
+            盘点小结
+          </div>
           <table class="summary-table">
             <tr>
               <td>盘点计划名称</td>
@@ -500,31 +751,34 @@
             <tr>
               <td class="sign-cell">签字区</td>
               <td style="text-align: center">
-
+                <img :src="summaryModal.signImage" alt="" style="max-width: 200px; max-height: 100px; border: 1px solid #eee; cursor: pointer">
               </td>
             </tr>
           </table>
         </div>
-        <div style="margin: 24px 0 8px 0;">
-          <span style="font-weight: bold;">签字图片上传：</span>
-          <div v-if="summaryModal.signImage" style="margin-top: 8px;">
-            <div style="position: relative; display: inline-block;">
+        <div style="margin: 24px 0 8px 0">
+          <span style="font-weight: bold">签字图片上传：</span>
+          <div v-if="summaryModal.signImage" style="margin-top: 8px">
+            <div style="position: relative; display: inline-block">
               <img
                 :src="summaryModal.signImage"
-                style="max-width: 200px; max-height: 100px; border: 1px solid #eee; cursor: pointer;"
+                style="max-width: 200px; max-height: 100px; border: 1px solid #eee; cursor: pointer"
                 @click="previewImage(summaryModal.signImage)"
-              >
+              />
               <Button
                 type="error"
                 size="small"
-                style="position: absolute; top: 5px; right: 5px;"
-                @click.stop="summaryModal.signImage = null; summaryModal.signImageId = null"
+                style="position: absolute; top: 5px; right: 5px"
+                @click.stop="
+                  summaryModal.signImage = null
+                  summaryModal.signImageId = null
+                "
               >
                 重新上传
               </Button>
             </div>
           </div>
-          <div v-else style="margin-top: 8px;">
+          <div v-else style="margin-top: 8px">
             <Upload
               :before-upload="beforeSignUpload"
               :on-success="handleSignUpload"
@@ -538,17 +792,25 @@
       </div>
       <template slot="footer">
         <Button v-print="'#print-table'">打印</Button>
-        <Button type="primary" style="margin-left: 8px;" @click="handleSummarySubmit">提交</Button>
+        <Button type="primary" style="margin-left: 8px" @click="handleSummarySubmit">提交</Button>
       </template>
     </Modal>
   </div>
 </template>
 
 <script>
-import { saveStocktakingPlan, getStocktakingPlanList, deleteStocktakingPlan, getStocktakingPlanLinkList, getStocktakingHistoryList } from '@/api/system/stocktaking'
-import { getStorehouseTypeList } from '@/api/system/storehouseType'
-import { getparameteritem } from '@/api/system/dictionary'
-import { index as getWarehouseList } from '@/api/system/baseForm'
+import {
+  saveStocktakingPlan,
+  getStocktakingPlanList,
+  deleteStocktakingPlan,
+  getStocktakingPlanLinkList,
+  getStocktakingHistoryList,
+  deleteStocktakingPlanLink
+} from '@/api/system/stocktaking'
+import { index } from '@/api/inventory.js'
+import { index as getFenleilist } from '@/api/fenlei.js'
+import { index as baseFormIndex } from '@/api/system/baseForm.js'
+import { getparameteritemMore } from '@/api/system/dictionary.js'
 import qs from 'qs'
 import request from '@/utils/request'
 
@@ -559,7 +821,6 @@ export default {
       planSearch: {
         keyword: '',
         dateRange: [],
-        status: '',
         pageIndex: 1,
         pageSize: 10
       },
@@ -610,6 +871,16 @@ export default {
       inventoryList: [],
       listTotal: 0,
       listLoading: false,
+      historyTab: 'plan',
+      historyPlanSearch: {
+        keyword: '',
+        dateRange: [],
+        pageIndex: 1,
+        pageSize: 10
+      },
+      historyPlanList: [],
+      historyPlanTotal: 0,
+      historyPlanLoading: false,
       listColumns: [
         { title: '盘点单号', key: 'no' },
         {
@@ -684,42 +955,241 @@ export default {
         visible: false,
         loading: false,
         keyword: '',
-        storehouses_id: '',
-        area: '',
-        warehouseName: '',
+        fenlei: '',
+        wuzizhuangtai: '',
+        chanquanxinxi: '',
+        chubeifangshi: '',
+        suozaicangku: '',
+        rukuriqi: '',
+        shengchanriqi: '',
+        dengjifenlei: '',
         currentPlanId: '',
         pageIndex: 1,
-        pageSize: 10,
+        pageSize: 40,
         total: 0,
         selectedMaterialIds: new Set(),
-        isInitialLoad: true
+        selectedMaterialData: new Map(), // 存储选中物资的详细数据 {inventorys_id: {id, inventorys_id}}
+        isInitialLoad: true,
+        isUpdatingSelection: false, // 标志是否正在程序更新选中状态
+        tableKey: 0 // 用于强制重新渲染表格
       },
       materialList: [],
-      materialColumns: [
-        { type: 'selection', width: 60 },
-        { title: '物资名称', key: 'zichanmingcheng' },
-        { title: '物资型号', key: 'guigexinghao' },
-        { title: '单位', key: 'jiliangdanwei' },
+      fenleiList: [],
+      cangkuList: [],
+      paraOptions: {
+        materials_status: [],
+        material_reserve: [],
+        materials_property: [],
+        dengjifenlei: []
+      },
+      materialTable: [
         {
-          title: '当前库存',
-          key: 'inventorys_total',
-          render: (h, params) => {
-            return h('span', params.row.inventorys_total === null ? '0' : params.row.inventorys_total)
-          }
+          type: 'selection',
+          fixed: 'left',
+          selectable: (row, index) => {
+            // 根据选中状态返回是否可选
+            return true
+          },
+          reserveSelection: true // 保留选中状态
         },
         {
-          title: '操作',
-          slot: 'action',
-          width: 100
+          label: '物资信息',
+          align: 'left',
+          prop: 'wuzibianma_material_infos_wuzibianma_relation',
+          multiHd: [
+            {
+              label: '一级分类',
+              width: 120,
+              prop: 'wuzibianma_material_infos_wuzibianma_relation.material_info_type',
+              align: 'center',
+              formatter: (cell, data, value) => {
+                return value ? value.split('-')[0] : ''
+              }
+            },
+            {
+              label: '二级分类',
+              width: 120,
+              prop: 'wuzibianma_material_infos_wuzibianma_relation.material_info_type',
+              align: 'center',
+              formatter: (cell, data, value) => {
+                return value
+                  ? value.split('-').length > 1
+                    ? value.split('-')[1]
+                    : value.split('-')[0]
+                  : ''
+              }
+            },
+            {
+              label: '所属种类',
+              width: 120,
+              prop: 'wuzibianma_material_infos_wuzibianma_relation.fenlei_detail.name',
+              align: 'center'
+            },
+            {
+              label: '物资名称',
+              prop: 'zichanmingcheng',
+              align: 'center',
+              width: 180,
+              fixed: 'left'
+            },
+            {
+              label: '物资类型',
+              width: 120,
+              prop: 'wuzileixing',
+              align: 'center'
+            },
+            {
+              label: '物资型号',
+              prop: 'wuzibianma_material_infos_wuzibianma_relation.guigexinghao',
+              align: 'center',
+              width: 180
+            },
+            {
+              label: '物资规格',
+              prop: 'wuzibianma_material_infos_wuzibianma_relation.wuziguige',
+              align: 'center',
+              width: 180
+            },
+            {
+              label: '单位',
+              width: 120,
+              prop: 'wuzibianma_material_infos_wuzibianma_relation.jiliangdanwei',
+              align: 'center'
+            }
+          ]
+        },
+        {
+          label: '库存信息',
+          prop: 'kucun',
+          align: 'left',
+          multiHd: [
+            {
+              label: '入库批次',
+              width: 120,
+              prop: 'rukupici'
+            },
+            {
+              label: '在库数量',
+              width: 120,
+              prop: 'zaikushuliang',
+              customFn: row => {
+                return (
+                  <span>
+                    {row.row.zaikushuliang}
+                    {row.row.jiliangdanwei ? row.row.jiliangdanwei : ''}
+                  </span>
+                )
+              }
+            },
+            {
+              label: '顺序号',
+              width: 180,
+              prop: 'shunxuhao',
+              customFn: row => {
+                return <span>{row.row.shunxuhao ? row.row.shunxuhao : ''}</span>
+              }
+            },
+            {
+              label: '待出库',
+              width: 120,
+              prop: 'wait_num'
+            }
+          ]
+        },
+        {
+          label: '物资明细',
+          prop: 'stocks_items_info',
+          align: 'left',
+          multiHd: [
+            {
+              label: '生产日期',
+              width: 120,
+              prop: 'shengchanriqi'
+            },
+            {
+              label: '入库日期',
+              width: 120,
+              prop: 'rukuriqi'
+            },
+            {
+              label: '物资状态',
+              width: 120,
+              prop: 'wuzizhuangtai_detail.value'
+            },
+            {
+              label: '储备方式',
+              width: 120,
+              prop: 'chubeifangshi_detail.value'
+            },
+            {
+              label: '所在仓库',
+              width: 120,
+              prop: 'materialstorages.cangkumingcheng'
+            },
+            {
+              label: '所在货架',
+              width: 120,
+              prop: 'shelfs.huojiamingcheng'
+            },
+            {
+              label: '所在货架层',
+              width: 120,
+              prop: 'huojiaceng'
+            },
+            {
+              label: '等级分类',
+              width: 120,
+              prop: 'dengjifenlei_detail.value'
+            },
+            {
+              label: '产权信息',
+              width: 120,
+              prop: 'chanquanxinxi_detail.value'
+            },
+            {
+              label: '是否为固定资产',
+              width: 120,
+              prop: 'shifouweigudingzichan'
+            },
+            {
+              label: '固定资产编码',
+              width: 120,
+              prop: 'gudingzichanbianma'
+            },
+            {
+              label: '储备年限',
+              width: 120,
+              prop: 'chubeinianxian'
+            },
+            {
+              label: '存放要求',
+              width: 120,
+              prop: 'cunfangyaoqiu'
+            },
+            {
+              label: '维护要求',
+              width: 120,
+              prop: 'weihuyaoqiu'
+            },
+            {
+              label: '保养频次',
+              width: 120,
+              prop: 'equipment_maintain_config.name'
+            }
+          ]
         }
       ],
+      spanArr: [], // 存储合并规则的数组
+      position: 0, // 记录当前合并的起始位置
+      // 定义需要合并的列索引范围（从selection列开始计数）
+      mergeColumnRange: {
+        start: 1, // 基础信息分组的起始列索引
+        end: 8 // 基础信息分组的结束列索引
+      },
       planMaterials: {
-        'P202504001': ['M002', 'M004'],
-        'P202505001': ['M001', 'M003', 'M006']
+        P202504001: ['M002', 'M004'],
+        P202505001: ['M001', 'M003', 'M006']
       },
-      storehouseTypeOptions: [],
-      areaOptions: [],
-      warehouseNameOptions: [],
       selectedRows: [],
       detailModal: {
         visible: false,
@@ -774,12 +1244,55 @@ export default {
         inventoryList: []
       },
       planDetailColumns: [
+        {
+          title: '一级分类',
+          key: 'yijifenlei',
+          width: 120,
+          render: (h, params) => {
+            if (!params.row.inventory || !params.row.inventory.wuzibianma_material_infos_wuzibianma_relation) {
+              return h('span', '-')
+            }
+            const materialInfoType = params.row.inventory.wuzibianma_material_infos_wuzibianma_relation.material_info_type
+            const value = materialInfoType ? materialInfoType.split('-')[0] : ''
+            return h('span', value || '-')
+          }
+        },
+        {
+          title: '二级分类',
+          key: 'erjifenlei',
+          width: 120,
+          render: (h, params) => {
+            if (!params.row.inventory || !params.row.inventory.wuzibianma_material_infos_wuzibianma_relation) {
+              return h('span', '-')
+            }
+            const materialInfoType = params.row.inventory.wuzibianma_material_infos_wuzibianma_relation.material_info_type
+            let value = ''
+            if (materialInfoType) {
+              const parts = materialInfoType.split('-')
+              value = parts.length > 1 ? parts[1] : parts[0]
+            }
+            return h('span', value || '-')
+          }
+        },
+        {
+          title: '所属种类',
+          key: 'suoshuzhonglei',
+          width: 120,
+          render: (h, params) => {
+            if (!params.row.inventory || !params.row.inventory.wuzibianma_material_infos_wuzibianma_relation) {
+              return h('span', '-')
+            }
+            const fenleiDetail = params.row.inventory.wuzibianma_material_infos_wuzibianma_relation.fenlei_detail
+            const value = fenleiDetail ? fenleiDetail.name : ''
+            return h('span', value || '-')
+          }
+        },
         {
           title: '物资名称',
           key: 'zichanmingcheng',
           minWidth: 150,
           render: (h, params) => {
-            return h('span', params.row.material_info ? params.row.material_info.zichanmingcheng : '-')
+            return h('span', params.row.inventory ? params.row.inventory.zichanmingcheng : '-')
           }
         },
         {
@@ -787,7 +1300,15 @@ export default {
           key: 'guigexinghao',
           width: 120,
           render: (h, params) => {
-            return h('span', params.row.material_info ? params.row.material_info.guigexinghao : '-')
+            return h('span', params.row.inventory ? params.row.inventory.guigexinghao : '-')
+          }
+        },
+        {
+          title: '物资规格',
+          key: 'wuziguige',
+          width: 120,
+          render: (h, params) => {
+            return h('span', params.row.inventory ? params.row.inventory.wuziguige : '-')
           }
         },
         {
@@ -795,9 +1316,22 @@ export default {
           key: 'jiliangdanwei',
           width: 80,
           render: (h, params) => {
-            return h('span', params.row.material_info ? params.row.material_info.jiliangdanwei : '-')
+            return h('span', params.row.inventory ? params.row.inventory.jiliangdanwei : '-')
           }
         },
+        {
+          title: '原库存数量',
+          key: 'chushishuliang',
+          width: 120,
+          render: (h, params) => {
+            return h('span', params.row.inventory ? params.row.inventory.chushishuliang : '-')
+          }
+        },
+        {
+          title: '状态',
+          slot: 'status',
+          width: 100
+        },
         {
           title: '盘点人',
           key: 'responsible_admin_name',
@@ -817,20 +1351,15 @@ export default {
           width: 150
         },
         {
-          title: '状态',
-          slot: 'status',
-          width: 100
+          title: '照片',
+          slot: 'photos',
+          width: 150
         },
         {
           title: '备注',
           key: 'remark',
           minWidth: 150,
           tooltip: true
-        },
-        {
-          title: '照片',
-          slot: 'photos',
-          width: 150
         }
       ],
       summaryModal: {
@@ -843,56 +1372,54 @@ export default {
     }
   },
   watch: {
-    'materialModal.loading': {
-      handler(newVal, oldVal) {
-        // 当loading从true变为false时，说明表格加载完成
-        if (oldVal === true && newVal === false) {
+    // 监听物资列表变化，确保选中状态正确显示
+    materialList: {
+      handler(newList, oldList) {
+        console.log('materialList 发生变化，新数据长度:', newList.length)
           this.$nextTick(() => {
-            if (this.$refs.materialTable) {
-              this.materialList.forEach((item, index) => {
-                if (this.materialModal.selectedMaterialIds.has(item.id)) {
-                  this.$refs.materialTable.toggleRowSelection(item, true)
-                }
-              })
-            }
-          })
-        }
-      }
+          setTimeout(() => {
+            this.updateTableSelection()
+          }, 100)
+        })
+      },
+      deep: true
     }
   },
   mounted() {
     this.searchPlans()
-    this.searchList()
-    this.initMaterialSelectOptions()
+    this.searchHistoryPlans()
+    this.getFenlei()
+    this.getCangku()
+    this.getData()
   },
   methods: {
     getStatusColor(status) {
       const colors = {
-        '0': 'red',
-        '1': 'orange',
-        '2': 'green'
+        0: 'red',
+        1: 'orange',
+        2: 'green'
       }
       return colors[status] || 'default'
     },
     getStatusText(status) {
       const texts = {
-        '0': '未开始',
-        '1': '进行中',
-        '2': '已完成'
+        0: '未开始',
+        1: '进行中',
+        2: '已完成'
       }
       return texts[status] || status
     },
     getInventoryStatusColor(status) {
       const colors = {
-        '0': 'red',
-        '1': 'green'
+        0: 'red',
+        1: 'green'
       }
       return colors[status] || 'default'
     },
     getInventoryStatusText(status) {
       const texts = {
-        '0': '未盘点',
-        '1': '已盘点'
+        0: '未盘点',
+        1: '已盘点'
       }
       return texts[status] || status
     },
@@ -904,25 +1431,25 @@ export default {
         formData.append('page', this.planSearch.pageIndex)
         formData.append('page_size', this.planSearch.pageSize)
 
+        // 添加 wherein 参数，使用 filter 格式
+        formData.append('filter[0][key]', 'status')
+        formData.append('filter[0][op]', 'wherein')
+        formData.append('filter[0][value][0]', '0')
+        formData.append('filter[0][value][1]', '1')
+
         // 只添加非空的搜索条件
         if (this.planSearch.keyword) {
           formData.append('keyword', this.planSearch.keyword)
         }
 
-        // 添加状态过滤
-        if (this.planSearch.status) {
-          const filterIndex = this.planSearch.keyword ? 1 : 0
-          formData.append(`filter[${filterIndex}][key]`, 'status')
-          formData.append(`filter[${filterIndex}][op]`, 'eq')
-          formData.append(`filter[${filterIndex}][value]`, this.planSearch.status)
-        }
-
         // 确保日期范围有效且不为空
-        if (this.planSearch.dateRange &&
+        if (
+          this.planSearch.dateRange &&
             this.planSearch.dateRange.length === 2 &&
             this.planSearch.dateRange[0] &&
-            this.planSearch.dateRange[1]) {
-          const formatDate = (date) => {
+          this.planSearch.dateRange[1]
+        ) {
+          const formatDate = date => {
             const d = new Date(date)
             if (isNaN(d.getTime())) return null // 检查日期是否有效
             const year = d.getFullYear()
@@ -935,11 +1462,11 @@ export default {
           const endDate = formatDate(this.planSearch.dateRange[1])
 
           // 只有当两个日期都有效时才添加过滤条件
+          // filter[0] 已被 wherein 占用，所以日期范围从 filter[1] 开始
           if (startDate && endDate) {
-            const filterIndex = (this.planSearch.keyword ? 1 : 0) + (this.planSearch.status ? 1 : 0)
-            formData.append(`filter[${filterIndex}][key]`, 'start_date')
-            formData.append(`filter[${filterIndex}][op]`, 'range')
-            formData.append(`filter[${filterIndex}][value]`, startDate + ',' + endDate)
+            formData.append('filter[1][key]', 'start_date')
+            formData.append('filter[1][op]', 'range')
+            formData.append('filter[1][value]', startDate + ',' + endDate)
           }
         }
 
@@ -959,7 +1486,6 @@ export default {
       this.planSearch = {
         keyword: '',
         dateRange: [],
-        status: '',
         pageIndex: 1,
         pageSize: 10
       }
@@ -1009,21 +1535,21 @@ export default {
       })
     },
     async handlePlanSubmit() {
-      this.$refs.planForm.validateField('dateRange', (errorMessage) => {
+      this.$refs.planForm.validateField('dateRange', errorMessage => {
         if (errorMessage) {
           this.$Message.error(errorMessage)
           return
         }
       })
 
-      this.$refs.planForm.validate(async(valid) => {
+      this.$refs.planForm.validate(async valid => {
         if (!valid) {
           this.$Message.error('请完整填写必填项')
           return
         }
 
-        const { id, name, dateRange,type, remark } = this.planModal.form
-        const formatDate = (date) => {
+        const { id, name, dateRange, type, remark } = this.planModal.form
+        const formatDate = date => {
           const d = new Date(date)
           const year = d.getFullYear()
           const month = String(d.getMonth() + 1).padStart(2, '0')
@@ -1034,22 +1560,25 @@ export default {
         // 获取当前计划选中的物资ID
         const selectedMaterialIds = this.planMaterials[id] || []
 
-        // 构建 formdata 格式的数据
-        const formData = new FormData()
-        formData.append('name', name)
-        formData.append('start_date', formatDate(dateRange[0]))
-        formData.append('end_date', formatDate(dateRange[1]))
-        formData.append('type', type)
-        if (remark) formData.append('remark', remark)
-        if (id) formData.append('id', id)
-
-        // 添加选中的物资ID数组
-        selectedMaterialIds.forEach((materialId, index) => {
-          formData.append(`material_infos_plan_links[${index}][material_info_id]`, materialId)
-        })
+        // 构建参数对象
+        const params = {
+          name,
+          start_date: formatDate(dateRange[0]),
+          end_date: formatDate(dateRange[1]),
+          type,
+          material_infos_plan_links: selectedMaterialIds.map(materialId => ({
+            id: null, // 新建计划时都是新的关联记录
+            inventorys_id: materialId
+          }))
+        }
+
+        if (remark) params.remark = remark
+        if (id) params.id = id
+
+        console.log('提交计划参数:', params)
 
         try {
-          await saveStocktakingPlan(formData)
+          await saveStocktakingPlan(params)
           this.$Message.success('保存成功')
           this.planModal.visible = false
           this.$refs.planForm.resetFields()
@@ -1060,15 +1589,17 @@ export default {
       })
     },
     deletePlan(id) {
-      this.$confirm('确认要删除该计划吗？', '提示', {
+      this.$confirm('删除计划的同时会删除盘点记录，确认是否删除？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(async() => {
+      })
+        .then(async() => {
         await deleteStocktakingPlan({ id })
         this.$message.success('删除成功')
         this.searchPlans()
-      }).catch(() => {})
+        })
+        .catch(() => {})
     },
 
     async searchList() {
@@ -1078,6 +1609,9 @@ export default {
         formData.append('page', this.listSearch.pageIndex)
         formData.append('page_size', this.listSearch.pageSize)
 
+        // 添加计划外筛选参数
+        formData.append('has_material_infos_plan_id', '0')
+
         // 只添加非空的搜索条件
         if (this.listSearch.keyword) {
           formData.append('keyword', this.listSearch.keyword)
@@ -1130,6 +1664,88 @@ export default {
       this.listSearch.pageIndex = 1
       this.searchList()
     },
+    handleHistoryTabChange(name) {
+      if (name === 'plan') {
+        this.searchHistoryPlans()
+      } else if (name === 'outside') {
+        this.searchList()
+      }
+    },
+    async searchHistoryPlans() {
+      this.historyPlanLoading = true
+      try {
+        const formData = new FormData()
+        formData.append('page', this.historyPlanSearch.pageIndex)
+        formData.append('page_size', this.historyPlanSearch.pageSize)
+
+        // 添加状态过滤 status:2
+        formData.append('filter[0][key]', 'status')
+        formData.append('filter[0][op]', 'eq')
+        formData.append('filter[0][value]', '2')
+
+        // 只添加非空的搜索条件
+        if (this.historyPlanSearch.keyword) {
+          formData.append('keyword', this.historyPlanSearch.keyword)
+        }
+
+        // 确保日期范围有效且不为空
+        if (
+          this.historyPlanSearch.dateRange &&
+            this.historyPlanSearch.dateRange.length === 2 &&
+            this.historyPlanSearch.dateRange[0] &&
+          this.historyPlanSearch.dateRange[1]
+        ) {
+          const formatDate = date => {
+            const d = new Date(date)
+            if (isNaN(d.getTime())) return null // 检查日期是否有效
+            const year = d.getFullYear()
+            const month = String(d.getMonth() + 1).padStart(2, '0')
+            const day = String(d.getDate()).padStart(2, '0')
+            return `${year}-${month}-${day}`
+          }
+
+          const startDate = formatDate(this.historyPlanSearch.dateRange[0])
+          const endDate = formatDate(this.historyPlanSearch.dateRange[1])
+
+          // 只有当两个日期都有效时才添加过滤条件
+          if (startDate && endDate) {
+            const filterIndex = this.historyPlanSearch.keyword ? 1 : 0
+            formData.append(`filter[${filterIndex}][key]`, 'start_date')
+            formData.append(`filter[${filterIndex}][op]`, 'range')
+            formData.append(`filter[${filterIndex}][value]`, startDate + ',' + endDate)
+          }
+        }
+
+        const res = await getStocktakingPlanList(formData)
+        if (res && res.list) {
+          this.historyPlanList = res.list.data
+          this.historyPlanTotal = res.list.total
+        }
+      } catch (error) {
+        this.$Message.error('获取历史盘点计划列表失败')
+        console.error('获取历史盘点计划列表失败:', error)
+      } finally {
+        this.historyPlanLoading = false
+      }
+    },
+    resetHistoryPlanSearch() {
+      this.historyPlanSearch = {
+        keyword: '',
+        dateRange: [],
+        pageIndex: 1,
+        pageSize: 10
+      }
+      this.searchHistoryPlans()
+    },
+    handleHistoryPlanPageChange(page) {
+      this.historyPlanSearch.pageIndex = page
+      this.searchHistoryPlans()
+    },
+    handleHistoryPlanPageSizeChange(size) {
+      this.historyPlanSearch.pageSize = size
+      this.historyPlanSearch.pageIndex = 1
+      this.searchHistoryPlans()
+    },
     async viewInventoryDetail(row) {
       this.detailModal.loading = true
       this.detailModal.visible = true
@@ -1185,138 +1801,203 @@ export default {
       }
     },
 
-    showInventorySelectModal(planId) {
+    async showInventorySelectModal(planId) {
       this.materialModal.currentPlanId = planId
       this.materialModal.visible = true
       this.materialModal.pageIndex = 1
       this.materialModal.selectedMaterialIds = new Set()
-      this.searchMaterials()
-    },
-    isSelected(item) {
-      return this.materialModal.selectedMaterialIds.has(item.id)
-    },
-    handleSelect(selection, item) {
-      console.log('handleSelect called', selection, item)
 
-      // 更新选中状态集合
-      const planId = this.materialModal.currentPlanId
-      if (planId) {
-        if (selection.includes(item)) {
-          this.materialModal.selectedMaterialIds.add(item.id)
-        } else {
-          this.materialModal.selectedMaterialIds.delete(item.id)
-        }
-
-        // 更新界面
-        this.$nextTick(() => {
-          if (this.$refs.materialTable) {
-            this.materialList.forEach(row => {
-              this.$refs.materialTable.toggleRowSelection(row, this.materialModal.selectedMaterialIds.has(row.id))
-            })
-          }
-        })
-      }
-    },
-    handleSelectAll(selection) {
-      console.log('handleSelectAll called', selection)
+      // 获取当前计划的已关联物资ID
+      try {
+        const formData = new FormData()
+        formData.append('page', 1)
+        formData.append('page_size', 9999) // 获取所有关联数据
+        formData.append('filter[0][key]', 'material_infos_plan_id')
+        formData.append('filter[0][op]', 'eq')
+        formData.append('filter[0][value]', planId)
 
-      const planId = this.materialModal.currentPlanId
-      if (planId) {
-        // 更新选中状态集合
-        if (selection.length > 0) {
-          // 全选：将所有当前页的项添加到选中集合
-          this.materialList.forEach(item => {
-            this.materialModal.selectedMaterialIds.add(item.id)
-          })
-        } else {
-          // 取消全选：从选中集合中移除当前页的所有项
-          this.materialList.forEach(item => {
-            this.materialModal.selectedMaterialIds.delete(item.id)
+        const res = await getStocktakingPlanLinkList(formData)
+        if (res && res.list && res.list.data) {
+          // 从关联数据中提取已选中的 inventorys_id
+          console.log('API返回的关联数据:', res.list.data)
+          res.list.data.forEach(link => {
+            if (link.inventorys_id) {
+              // 确保ID类型一致，转换为字符串
+              const inventorysId = String(link.inventorys_id)
+              this.materialModal.selectedMaterialIds.add(inventorysId)
+              // 保存关联记录的详细数据
+              this.materialModal.selectedMaterialData.set(inventorysId, {
+                id: link.id, // 关联记录的ID
+                inventorys_id: link.inventorys_id
+              })
+              console.log('添加选中ID:', inventorysId, '关联记录ID:', link.id)
+            }
           })
+          console.log('已选中的物资ID:', this.materialModal.selectedMaterialIds)
+          console.log('选中物资的关联数据:', this.materialModal.selectedMaterialData)
         }
-
-        // 更新界面
-        this.$nextTick(() => {
-          if (this.$refs.materialTable) {
-            // 更新复选框状态
-            this.materialList.forEach(row => {
-              this.$refs.materialTable.toggleRowSelection(row, this.materialModal.selectedMaterialIds.has(row.id))
-            })
-          }
-        })
+      } catch (error) {
+        console.error('获取计划关联数据失败:', error)
       }
+
+      this.searchMaterials()
+    },
+    isSelected(item) {
+      const itemId = String(item.id)
+      const selected = this.materialModal.selectedMaterialIds.has(itemId)
+      console.log(
+        `检查物资 ${item.id} (类型: ${typeof item.id}, 转换后: ${itemId}) 是否选中:`,
+        selected
+      )
+      console.log('当前选中集合:', this.materialModal.selectedMaterialIds)
+      return selected
     },
-    toggleMaterialSelection(item, index) {
+    async toggleMaterialSelection(item, index) {
       console.log('toggleMaterialSelection called', item, index)
+      const itemId = String(item.id)
 
       // 更新选中状态
       if (!this.isSelected(item)) {
-        console.log('Adding to plan')
-        this.materialModal.selectedMaterialIds.add(item.id)
+        console.log('Adding to plan:', itemId)
+        this.materialModal.selectedMaterialIds.add(itemId)
+        // 新添加的物资没有关联记录ID
+        this.materialModal.selectedMaterialData.set(itemId, {
+          id: null, // 新添加的没有ID
+          inventorys_id: item.id
+        })
+        item.selected = true
+        } else {
+        console.log('Removing from plan:', itemId)
+
+        // 检查是否是之前已选择的（有关联记录ID）
+        const materialData = this.materialModal.selectedMaterialData.get(itemId)
+        if (materialData && materialData.id) {
+          // 有关联记录ID，需要确认删除
+          const confirmed = await this.$confirm('确认要将此物资移出计划吗？', '确认移出', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+            .then(() => true)
+            .catch(() => false)
+
+          if (confirmed) {
+            try {
+              // 调用删除接口
+              await deleteStocktakingPlanLink({ id: materialData.id })
+              this.$Message.success('已移出计划')
+
+              // 从选中状态中移除
+              this.materialModal.selectedMaterialIds.delete(itemId)
+              this.materialModal.selectedMaterialData.delete(itemId)
+              item.selected = false
+            } catch (error) {
+              this.$Message.error('移出计划失败')
+              console.error('删除关联记录失败:', error)
+              return // 如果删除失败，不更新界面状态
+            }
+          } else {
+            // 用户取消了删除操作，不做任何处理
+            return
+          }
       } else {
-        console.log('Removing from plan')
-        this.materialModal.selectedMaterialIds.delete(item.id)
+          // 没有关联记录ID，直接移除
+          this.materialModal.selectedMaterialIds.delete(itemId)
+          this.materialModal.selectedMaterialData.delete(itemId)
+          item.selected = false
+        }
       }
 
-      // 更新界面
+      // 更新表格选中状态
       this.$nextTick(() => {
-        if (this.$refs.materialTable) {
-          this.materialList.forEach(row => {
-            this.$refs.materialTable.toggleRowSelection(row, this.materialModal.selectedMaterialIds.has(row.id))
-          })
-        }
+        this.updateTableSelection()
       })
     },
     async searchMaterials() {
       this.materialModal.loading = true
       this.materialModal.isInitialLoad = true // 重置标志
       try {
-        const data = {
+        const res = await index({
           page_size: this.materialModal.pageSize,
           page: this.materialModal.pageIndex,
-          'materialstorages_cangkumingcheng': this.materialModal.warehouseName || '',
-          'materialstorages_suozaiquyu': this.materialModal.area || '',
-          'storehouses_id': this.materialModal.storehouses_id || '',
-          'filter[0][key]': 'zichanmingcheng',
-          'filter[0][op]': 'like',
-          'filter[0][value]': this.materialModal.keyword || '',
-          'filter[1][key]': 'wuzileixing',
-          'filter[1][op]': 'eq',
-          'filter[1][value]': '一物一码'
-        }
-        const res = await request({
-          url: '/api/admin/material-infos/index',
-          method: 'post',
-          data: qs.stringify(data),
-          headers: {
-            'Content-Type': 'application/x-www-form-urlencoded'
-          }
+          table_name: 'inventorys',
+          sort_type: 'DESC',
+          sort_name: 'wuzibianma',
+          fenlei: this.materialModal.fenlei,
+          wuzizhuangtai: this.materialModal.wuzizhuangtai,
+          chanquanxinxi: this.materialModal.chanquanxinxi,
+          chubeifangshi: this.materialModal.chubeifangshi,
+          suozaicangku: this.materialModal.suozaicangku,
+          start_rukuriqi: this.materialModal.rukuriqi ? this.materialModal.rukuriqi[0] : '',
+          end_rukuriqi: this.materialModal.rukuriqi ? this.materialModal.rukuriqi[1] : '',
+          start_shengchanriqi: this.materialModal.shengchanriqi
+            ? this.materialModal.shengchanriqi[0]
+            : '',
+          end_shengchanriqi: this.materialModal.shengchanriqi
+            ? this.materialModal.shengchanriqi[1]
+            : '',
+          dengjifenlei: this.materialModal.dengjifenlei,
+          filter: [
+            {
+              key: 'zichanmingcheng',
+              op: 'like',
+              value: this.materialModal.keyword
+            }
+          ]
         })
-        if (res && res.data) {
-          this.materialList = res.data
-          this.materialModal.total = res.total || 0
-
-          // 初始化选中状态
-          const planId = this.materialModal.currentPlanId
-          if (planId) {
-            // 如果是第一次加载，初始化选中状态
-            if (this.materialModal.selectedMaterialIds.size === 0) {
-              this.materialList.forEach(item => {
-                if (item.material_infos_plan_link && item.material_infos_plan_link.length > 0) {
-                  // 遍历物资绑定的所有盘点计划
-                  const hasMatchingPlan = item.material_infos_plan_link.some(link =>
-                    link.material_infos_plan_id === planId
-                  )
-                  if (hasMatchingPlan) {
-                    console.log('item.id', item.id)
-                    this.materialModal.selectedMaterialIds.add(item.id)
-                  }
-                }
-              })
+
+        if (res && res.list) {
+          this.materialList = res.list.data.map(item => {
+            const itemId = String(item.id)
+            const isSelected = this.materialModal.selectedMaterialIds.has(itemId)
+            return {
+              ...item,
+              selected: isSelected,
+              _checked: isSelected, // 尝试不同的选中标记
+              checked: isSelected // 再尝试另一种标记
             }
+          })
+          this.materialModal.total = res.list.total
+          this.handleDataChange()
+
+          // 选中状态已在 showInventorySelectModal 中初始化
+          console.log('当前选中的物资ID:', this.materialModal.selectedMaterialIds)
+          console.log(
+            '物资列表数据:',
+            this.materialList.map(item => ({
+              id: item.id,
+              idType: typeof item.id,
+              selected: item.selected,
+              name: item.zichanmingcheng
+            }))
+          )
+
+          // 强制重新渲染表格
+          this.materialModal.tableKey++
+
+          // 手动设置表格的选中状态
+          this.$nextTick(() => {
+            // 延迟一点时间确保DOM完全渲染
+            setTimeout(() => {
+              this.updateTableSelection()
+              // 强制更新组件以确保按钮状态正确
+              this.$forceUpdate()
+            }, 100)
+          })
 
-            console.log('this.materialModal.selectedMaterialIds', this.materialModal.selectedMaterialIds)
-          }
+          // 同时尝试通过事件触发选中状态
+          this.$nextTick(() => {
+            setTimeout(() => {
+              this.triggerSelectionByEvent()
+            }, 200)
+          })
+
+          // 最后尝试直接操作DOM
+          this.$nextTick(() => {
+            setTimeout(() => {
+              this.forceCheckboxSelection()
+            }, 400)
+          })
         }
       } finally {
         this.materialModal.loading = false
@@ -1360,79 +2041,21 @@ export default {
       this.$Message.success(`已批量移出 ${selection.length} 项物资`)
       this.searchMaterials()
     },
-    async initMaterialSelectOptions() {
-      // 仓库类型
-      try {
-        const res = await getStorehouseTypeList({ page: 1, page_size: 999 })
-        this.storehouseTypeOptions = (res.data || []).map(item => ({
-          value: item.id,
-          label: item.name
-        }))
-      } catch (e) {
-        this.storehouseTypeOptions = []
-      }
-      // 区域
-      try {
-        const res = await getparameteritem('area')
-        this.areaOptions = (res.detail || []).map(item => ({
-          value: item.value,
-          label: item.label
-        }))
-      } catch (e) {
-        this.areaOptions = []
-      }
-      // 仓库名称
-      try {
-        const res = await getWarehouseList({
-          page: 1,
-          page_size: 999,
-          table_name: 'materialstorages'
-        })
-        this.warehouseNameOptions = (res.data || []).map(item => ({
-          value: item.id,
-          label: item.cangkumingcheng
-        }))
-      } catch (e) {
-        this.warehouseNameOptions = []
-      }
-    },
     resetMaterialSearch() {
       this.materialModal.keyword = ''
-      this.materialModal.storehouses_id = ''
-      this.materialModal.area = ''
-      this.materialModal.warehouseName = ''
+      this.materialModal.fenlei = ''
+      this.materialModal.wuzizhuangtai = ''
+      this.materialModal.chanquanxinxi = ''
+      this.materialModal.chubeifangshi = ''
+      this.materialModal.suozaicangku = ''
+      this.materialModal.rukuriqi = ''
+      this.materialModal.shengchanriqi = ''
+      this.materialModal.dengjifenlei = ''
       this.materialModal.pageIndex = 1
       this.searchMaterials()
     },
-    async onStorehouseTypeChange(val) {
-      this.materialModal.storehouses_id = val
-      await this.updateWarehouseNameOptions()
-    },
-    async onAreaChange(val) {
-      this.materialModal.area = val
-      await this.updateWarehouseNameOptions()
-    },
-    async updateWarehouseNameOptions() {
-      // 联动过滤仓库名称
-      try {
-        const res = await getWarehouseList({
-          page: 1,
-          page_size: 999,
-          table_name: 'materialstorages',
-          filter: [
-            { key: 'storehouses_id', op: 'eq', value: this.materialModal.storehouses_id || '' },
-            { key: 'quyu_id', op: 'eq', value: this.materialModal.area || '' }
-          ]
-        })
-        this.warehouseNameOptions = (res.data || []).map(item => ({
-          value: item.id,
-          label: item.cangkumingcheng
-        }))
-      } catch (e) {
-        this.warehouseNameOptions = []
-      }
-    },
     handleMaterialPageChange(page) {
+      console.log('页面切换到:', page)
       this.materialModal.pageIndex = page
       this.searchMaterials()
     },
@@ -1448,25 +2071,59 @@ export default {
         return
       }
 
-      // 获取当前选中的物资ID
-      const selectedMaterialIds = Array.from(this.materialModal.selectedMaterialIds)
-
-      // 构建formdata
-      const formData = new FormData()
-      formData.append('id', planId)
-      selectedMaterialIds.forEach((materialId, index) => {
-        formData.append(`material_infos_plan_links[${index}][material_info_id]`, materialId)
+      // 构建新的数据结构
+      const materialInfosPlanLinks = []
+      this.materialModal.selectedMaterialData.forEach((data, inventorysId) => {
+        materialInfosPlanLinks.push({
+          id: data.id, // 如果是新添加的为null，已存在的有ID
+          inventorys_id: data.inventorys_id
+        })
       })
 
+      console.log('提交的数据结构:', materialInfosPlanLinks)
+
+      // 构建参数对象
+      const params = {
+        id: planId,
+        material_infos_plan_links: materialInfosPlanLinks
+      }
+
+      console.log('提交物资关联参数:', params)
+
       try {
-        await saveStocktakingPlan(formData)
+        await saveStocktakingPlan(params)
         this.$Message.success('物资关联成功')
-        this.materialModal.visible = false
+        this.handleMaterialModalClose()
         this.searchPlans()
       } catch (e) {
         this.$Message.error('物资关联失败')
+        console.error('提交失败:', e)
       }
     },
+
+    // 处理物资选择弹窗关闭
+    handleMaterialModalClose() {
+      this.materialModal.visible = false
+      // 清除所有数据和状态
+      this.materialModal.currentPlanId = ''
+      this.materialModal.selectedMaterialIds = new Set()
+      this.materialModal.selectedMaterialData = new Map()
+      this.materialModal.pageIndex = 1
+      this.materialModal.keyword = ''
+      this.materialModal.fenlei = ''
+      this.materialModal.wuzizhuangtai = ''
+      this.materialModal.chanquanxinxi = ''
+      this.materialModal.chubeifangshi = ''
+      this.materialModal.suozaicangku = ''
+      this.materialModal.rukuriqi = ''
+      this.materialModal.shengchanriqi = ''
+      this.materialModal.dengjifenlei = ''
+      this.materialModal.isUpdatingSelection = false
+      this.materialModal.tableKey = 0
+      this.materialList = []
+      this.materialModal.total = 0
+      console.log('物资选择弹窗已关闭，数据已清除')
+    },
     handleDetailPageChange(page) {
       this.detailModal.pageIndex = page
       this.viewInventoryDetail(this.detailModal.data.id)
@@ -1485,11 +2142,14 @@ export default {
     getPlanProgress(row) {
       // 根据状态值判断进度
       const status = row.status
-      if (status === 0) { // 未开始
+      if (status === 0) {
+        // 未开始
         return 0
-      } else if (status === 1) { // 进行中
+      } else if (status === 1) {
+        // 进行中
         return 50
-      } else if (status === 2) { // 已完成
+      } else if (status === 2) {
+        // 已完成
         return 100
       }
       return 0
@@ -1503,20 +2163,24 @@ export default {
     async loadPlanDetailData() {
       this.planDetailModal.loading = true
       try {
-        const formData = new FormData()
-        formData.append('page', this.planDetailModal.pageIndex)
-        formData.append('page_size', this.planDetailModal.pageSize)
-        formData.append('filter[0][key]', 'material_infos_plan_id')
-        formData.append('filter[0][op]', 'eq')
-        formData.append('filter[0][value]', this.planDetailModal.data.id)
+        const params = {
+          page: this.planDetailModal.pageIndex,
+          page_size: this.planDetailModal.pageSize,
+          'filter[0][key]': 'material_infos_plan_id',
+          'filter[0][op]': 'eq',
+          'filter[0][value]': this.planDetailModal.data.id
+        }
 
-        const res = await getStocktakingPlanLinkList(formData)
+        console.log('获取计划详情参数:', params)
+        const res = await getStocktakingPlanLinkList(qs.stringify(params))
         if (res && res.list) {
           this.planDetailModal.inventoryList = res.list.data
           this.planDetailModal.total = res.list.total
+          console.log('计划详情数据:', res.list.data)
         }
       } catch (e) {
         this.$Message.error('获取盘点物资列表失败')
+        console.error('获取计划详情失败:', e)
       } finally {
         this.planDetailModal.loading = false
       }
@@ -1532,7 +2196,8 @@ export default {
     },
     showSummaryModal(row) {
       // 从原始列表数据中查找完整的计划信息
-      const planData = this.planList.find(plan => plan.id === row.id)
+      console.log("this.planList",this.historyPlanList)
+      const planData = this.historyPlanList.find(plan => plan.id === row.id)
       if (!planData) {
         this.$Message.error('未找到计划数据')
         return
@@ -1549,7 +2214,7 @@ export default {
         actualCount: planData.chart_done || '-'
       }
       this.summaryModal.signImageId = planData.sign_id || null
-      this.summaryModal.signImage = planData.sign.url || null
+      this.summaryModal.signImage = planData.sign?planData.sign.url:null
       this.summaryModal.visible = true
     },
     beforeSignUpload(file) {
@@ -1579,16 +2244,322 @@ export default {
       try {
         const params = {
           id: this.summaryModal.data.id,
-          sign_id: this.summaryModal.signImageId,
+          sign_id: this.summaryModal.signImageId
         }
 
         await saveStocktakingPlan(params)
         this.$Message.success('提交成功')
         this.summaryModal.visible = false
-        this.searchPlans() // 刷新列表
+        this.searchHistoryPlans() // 刷新列表
       } catch (error) {
         this.$Message.error('提交失败：' + (error.message || '未知错误'))
       }
+    },
+
+    // 获取仓库
+    async getCangku() {
+      const res = await baseFormIndex({
+        page_size: 999,
+        page: 1,
+        table_name: 'materialstorages',
+        sort_name: 'sort',
+        sort_type: 'ASC',
+        filter: [
+          {
+            key: 'shifouzili',
+            op: 'eq',
+            value: '是'
+          }
+        ]
+      })
+      this.cangkuList = res.data
+    },
+
+    // 获取数据字典
+    async getData() {
+      const res = await getparameteritemMore({
+        'number[0]': 'materials_status', // 物资状态
+        'number[1]': 'material_reserve', // 储备方式
+        'number[2]': 'materials_property', // 产权信息
+        'number[3]': 'dengjifenlei' // 等级分类
+      })
+      for (var k in this.paraOptions) {
+        res.map(item => {
+          if (item.number === k) {
+            this.paraOptions[k] = item.detail
+          }
+        })
+      }
+    },
+
+    async getFenlei() {
+      const res = await getFenleilist({
+        tree: 1,
+        sort_type: 'ASC',
+        sort_name: 'sort'
+      })
+      this.fenleiList = this.removeEmptyChildren(res)
+    },
+
+    changeFenlei(e, row) {
+      console.log('e', e)
+      if (e) {
+        this.materialModal.fenlei = e[e.length - 1]
+      } else {
+        this.materialModal.fenlei = ''
+      }
+    },
+
+    // 移除children=[]
+    removeEmptyChildren(node) {
+      if (Array.isArray(node)) {
+        return node.map(child => {
+          if (child.children) {
+            // 递归处理子节点
+            child.children = this.removeEmptyChildren(child.children)
+            // 若处理后 children 为空，删除该属性
+            if (child.children.length === 0) {
+              delete child.children
+            }
+          }
+          return child
+        })
+      }
+      return []
+    },
+
+    // filterSpans
+    getSpanArr(data) {
+      // 生成合并规则数组（保持不变）
+      this.spanArr = []
+      this.position = 0
+
+      data.forEach((item, index) => {
+        if (index === 0) {
+          this.spanArr.push(1)
+          this.position = 0
+        } else {
+          if (
+            item.wuzibianma ===
+            data[this.position].wuzibianma_material_infos_wuzibianma_relation.wuzibianma
+          ) {
+            this.spanArr[this.position] += 1
+            this.spanArr.push(0)
+          } else {
+            this.spanArr.push(1)
+            this.position = index
+          }
+        }
+      })
+    },
+
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      // 通过列索引范围判断是否需要合并
+      if (columnIndex >= this.mergeColumnRange.start && columnIndex <= this.mergeColumnRange.end) {
+        const _row = this.spanArr[rowIndex]
+        const _col = _row > 0 ? 1 : 0
+        return {
+          rowspan: _row,
+          colspan: _col
+        }
+      }
+      // 其他列保持默认
+      return {
+        rowspan: 1,
+        colspan: 1
+      }
+    },
+
+    handleDataChange() {
+      this.getSpanArr(this.materialList)
+    },
+
+    selectionChange(e) {
+      console.log('selectionChange', e, '是否正在程序更新:', this.materialModal.isUpdatingSelection)
+
+      // 如果是程序更新选中状态，忽略此事件
+      if (this.materialModal.isUpdatingSelection) {
+        console.log('忽略程序触发的选中变化事件')
+        return
+      }
+
+      // 更新选中状态集合 - 支持跨页选择
+      const planId = this.materialModal.currentPlanId
+      if (planId) {
+        // 获取当前页面所有行的ID
+        const currentPageIds = this.materialList.map(item => String(item.id))
+
+        // 从选中集合中移除当前页面的所有ID
+        currentPageIds.forEach(id => {
+          this.materialModal.selectedMaterialIds.delete(id)
+        })
+
+        // 添加新选中的项（来自当前页面）
+        e.forEach(item => {
+          const itemId = String(item.id)
+          this.materialModal.selectedMaterialIds.add(itemId)
+          // 如果不存在关联数据，添加新的（表示新选中的）
+          if (!this.materialModal.selectedMaterialData.has(itemId)) {
+            this.materialModal.selectedMaterialData.set(itemId, {
+              id: null, // 新选中的没有关联记录ID
+              inventorys_id: item.id
+            })
+          }
+          console.log('通过表格选中添加ID:', itemId)
+        })
+
+        // 更新当前页面数据的selected状态
+        this.materialList.forEach(item => {
+          const itemId = String(item.id)
+          item.selected = this.materialModal.selectedMaterialIds.has(itemId)
+        })
+
+        console.log('更新后的选中集合:', this.materialModal.selectedMaterialIds)
+      }
+    },
+
+    // 为 xy-table 提供选中状态判断
+    getSelectedRows() {
+      return this.materialList.filter(item =>
+        this.materialModal.selectedMaterialIds.has(String(item.id))
+      )
+    },
+
+    // 通过事件方式触发选中状态
+    triggerSelectionByEvent() {
+      console.log('尝试通过事件方式触发选中状态')
+      const selectedRows = this.getSelectedRows()
+      console.log(
+        '应该选中的行:',
+        selectedRows.map(row => ({ id: row.id, name: row.zichanmingcheng }))
+      )
+
+      if (selectedRows.length > 0) {
+        // 模拟选中事件
+        this.materialModal.isUpdatingSelection = true
+        this.selectionChange(selectedRows)
+        setTimeout(() => {
+          this.materialModal.isUpdatingSelection = false
+        }, 100)
+      }
+    },
+
+    // 通过DOM操作直接勾选复选框
+    forceCheckboxSelection() {
+      console.log('尝试通过DOM操作直接勾选复选框')
+      this.$nextTick(() => {
+        setTimeout(() => {
+          // 查找所有复选框
+          const checkboxes = document.querySelectorAll('.el-table .el-checkbox__input')
+          console.log('找到复选框数量:', checkboxes.length)
+
+          this.materialList.forEach((row, index) => {
+            const itemId = String(row.id)
+            if (this.materialModal.selectedMaterialIds.has(itemId)) {
+              // 找到对应的复选框（跳过表头的复选框）
+              const checkbox = checkboxes[index + 1]
+              if (checkbox && !checkbox.classList.contains('is-checked')) {
+                console.log('直接点击复选框:', itemId)
+                checkbox.click()
+              }
+            }
+          })
+        }, 300)
+      })
+    },
+
+    // 更新表格选中状态
+    updateTableSelection(retryCount = 0) {
+      console.log(
+        `开始更新表格选中状态 (重试次数: ${retryCount})，当前选中ID:`,
+        this.materialModal.selectedMaterialIds
+      )
+
+      // 尝试多种方式获取表格引用
+      let table = null
+
+      if (this.$refs.materialTable) {
+        console.log('materialTable ref 存在')
+
+        // 方式1：直接通过 $refs.table
+        if (this.$refs.materialTable.$refs && this.$refs.materialTable.$refs.table) {
+          table = this.$refs.materialTable.$refs.table
+          console.log('通过 $refs.table 找到表格')
+        }
+        // 方式2：通过子组件
+        else if (
+          this.$refs.materialTable.$children &&
+          this.$refs.materialTable.$children.length > 0
+        ) {
+          for (let child of this.$refs.materialTable.$children) {
+            if (child.$refs && child.$refs.table) {
+              table = child.$refs.table
+              console.log('通过子组件找到表格')
+              break
+            }
+            // 深度查找
+            if (child.$children && child.$children.length > 0) {
+              for (let grandChild of child.$children) {
+                if (grandChild.$refs && grandChild.$refs.table) {
+                  table = grandChild.$refs.table
+                  console.log('通过孙子组件找到表格')
+                  break
+                }
+              }
+              if (table) break
+            }
+          }
+        }
+        // 方式3：通过 $el 查找
+        else if (this.$refs.materialTable.$el) {
+          const tableEl = this.$refs.materialTable.$el.querySelector('.el-table')
+          if (tableEl && tableEl.__vue__) {
+            table = tableEl.__vue__
+            console.log('通过 DOM 元素找到表格')
+          }
+        }
+      }
+
+      if (table && typeof table.clearSelection === 'function') {
+        console.log('找到表格组件，开始设置选中状态')
+
+        // 设置标志，表示正在程序更新选中状态
+        this.materialModal.isUpdatingSelection = true
+
+        // 清除所有选中状态
+        table.clearSelection()
+
+        // 设置选中状态
+        let selectedCount = 0
+        this.materialList.forEach(row => {
+          const rowId = String(row.id)
+          if (this.materialModal.selectedMaterialIds.has(rowId)) {
+            console.log('设置行选中:', rowId, row.zichanmingcheng)
+            table.toggleRowSelection(row, true)
+            selectedCount++
+          }
+        })
+
+        console.log(`当前页面设置了 ${selectedCount} 行选中状态`)
+
+        // 重置标志
+        setTimeout(() => {
+          this.materialModal.isUpdatingSelection = false
+          console.log('表格选中状态更新完成，重置标志')
+        }, 200)
+      } else {
+        console.log('未找到表格组件引用或表格方法不可用')
+
+        // 最多重试3次
+        if (retryCount < 3) {
+          console.log(`将在500ms后进行第${retryCount + 1}次重试`)
+          setTimeout(() => {
+            this.updateTableSelection(retryCount + 1)
+          }, 500)
+        } else {
+          console.error('重试3次后仍未找到表格组件，放弃更新选中状态')
+        }
+      }
     }
   }
 }
@@ -1602,7 +2573,7 @@ export default {
     background: rgba(0, 0, 0, 0.5);
     width: 100%;
     height: 100%;
-    z-index: 9999
+  z-index: 9999;
   }
 
   #qrCode {
@@ -1616,7 +2587,7 @@ export default {
   background-color: #fff;
   padding: 20px;
   border-radius: 8px;
-  box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
 }
 
 .page-header {
@@ -1836,8 +2807,11 @@ export default {
 .image-preview-modal {
   position: fixed;
   z-index: 2000;
-  left: 0; top: 0; right: 0; bottom: 0;
-  background: rgba(0,0,0,0.7);
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.7);
   display: flex;
   align-items: center;
   justify-content: center;
@@ -1847,7 +2821,7 @@ export default {
   max-width: 90vw;
   max-height: 90vh;
   border-radius: 8px;
-  box-shadow: 0 4px 24px rgba(0,0,0,0.3);
+  box-shadow: 0 4px 24px rgba(0, 0, 0, 0.3);
   background: #fff;
 }
 
@@ -1910,4 +2884,9 @@ export default {
   font-weight: bold;
   width: 160px;
 }
+
+.selector-item {
+  margin-right: 10px;
+  margin-bottom: 5px;
+}
 </style>
diff --git a/src/views/myprint/index.vue b/src/views/myprint/index.vue
index 231ae3d..ed19685 100644
--- a/src/views/myprint/index.vue
+++ b/src/views/myprint/index.vue
@@ -274,7 +274,7 @@ export default {
         const xinghao = item.guigexinghao ? '型号:' + item.guigexinghao : '型号'
         const pici = item.rukupici ? '批次:' + item.rukupici : '批次'
         const total_num =
-          item.wuzileixing === '一物一码' ? '同批数量:' + item.total_num : '数量:' + item.total_num
+          item.wuzileixing === '一物一码' ? '同批数量:' + item.chushishuliang : '数量:' + item.chushishuliang
         const piciNum = pici + ' ' + total_num
         const shunxuhao = item.wuzileixing === '一物一码' ? '批内序号:' + item.shunxuhao : '  '
         let hexId = parseInt(item.id, 10).toString(16).toUpperCase()
diff --git a/src/views/xukou/monitor.vue b/src/views/xukou/monitor.vue
index 93c7553..8459154 100644
--- a/src/views/xukou/monitor.vue
+++ b/src/views/xukou/monitor.vue
@@ -3,26 +3,33 @@
     <!-- Camera Section -->
     <el-row :gutter="20" class="camera-section">
       <el-col v-for="camera in cameras" :key="camera.id" :span="8">
-        <el-card shadow="never">
-          <div slot="header" class="clearfix">
+        <el-card shadow="hover">
+          <div slot="header" class="clearfix" @click="handleCameraClick(camera.camera_url)">
             <span>{{ camera.name }}</span>
-            <el-button style="float: right; padding: 3px 0" type="text" :class="camera.status === '离线' ? 'offline' : ''">{{ camera.status }}</el-button>
+            <!-- <el-button style="float: right; padding: 3px 0" type="text" :class="camera.status === '离线' ? 'offline' : ''">{{ camera.status }}</el-button> -->
           </div>
-          <div class="camera-body">
+          <div class="camera-body" @click="handleCameraClick(camera.camera_url)">
             <el-image
-              style="width: 100%; height: 180px; background-color: #000; display: flex; align-items: center; justify-content: center;"
-              :src="camera.image"
+              style="
+                width: 100%;
+                height: 180px;
+                background-color: #000;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+              "
+              :src="camera.image?camera.image.url:''"
               fit="cover"
             >
-              <div slot="error" class="image-slot">
-                <i class="el-icon-picture-outline" style="font-size: 40px; color: #ccc;" />
-                <div style="color: #ccc;">EZVIZ</div>
+              <!-- <div slot="error" class="image-slot">
+                <i class="el-icon-picture-outline" style="font-size: 40px; color: #ccc" />
+                <div style="color: #ccc">EZVIZ</div>
               </div>
               <div slot="placeholder" class="image-slot">
-                <i class="el-icon-loading" style="font-size: 40px; color: #ccc;" />
-              </div>
+                <i class="el-icon-loading" style="font-size: 40px; color: #ccc" />
+              </div> -->
             </el-image>
-            <div class="camera-info">视频通道: {{ camera.channel }}</div>
+            <div class="camera-info">点击跳转：账号admin，密码abc125634</div>
           </div>
         </el-card>
       </el-col>
@@ -37,16 +44,27 @@
             <div class="environment-card" :class="getCardClass(point.status)">
               <div class="env-header">
                 <span>{{ point.name }}</span>
-                <el-tag size="small" :type="getTagType(point.status)" effect="dark" class="status-tag">
-                  <i v-if="point.status === '正常'" class="el-icon-success" style="margin-right: 4px;" />
+                <!-- <el-tag
+                  size="small"
+                  :type="getTagType(point.status)"
+                  effect="dark"
+                  class="status-tag"
+                >
+                  <i
+                    v-if="point.status === '正常'"
+                    class="el-icon-success"
+                    style="margin-right: 4px"
+                  />
                   {{ point.status }}
-                </el-tag>
+                </el-tag> -->
               </div>
               <el-row class="env-data">
                 <el-col :span="12">
                   <div class="data-item">
                     <div class="label">CO浓度</div>
-                    <div class="value" :class="point.status === '预警' ? 'warning-value' : ''">{{ point.coConcentration }}</div>
+                    <div class="value" :class="point.status === '预警' ? 'warning-value' : ''">
+                      {{ point.coConcentration }}
+                    </div>
                   </div>
                 </el-col>
                 <el-col :span="12">
@@ -85,29 +103,7 @@ export default {
   name: 'MonitorPage',
   data() {
     return {
-      cameras: [
-        {
-          id: 1,
-          name: '摄像头1',
-          status: '离线',
-          image: 'https://img.freepik.com/free-vector/cctv-surveillance-system-concept_23-2148529272.jpg',
-          channel: '[DS-2CD2225XM-LGLSE(AE1005192)- AE1005192]'
-        },
-        {
-          id: 2,
-          name: '摄像头2',
-          status: '离线',
-          image: 'https://img.freepik.com/premium-photo/security-camera-perspective-hallway-corridor-monitoring-space-3d-rendering_172660-215.jpg',
-          channel: '[DS-2CD2225XM-LGLSE(AE1005068)- AE1005068]'
-        },
-        {
-          id: 3,
-          name: '摄像头3',
-          status: '离线',
-          image: 'https://img.freepik.com/premium-photo/video-surveillance-camera-record-street-cctv-camera-work-building_169016-21553.jpg',
-          channel: '[DS-2CD2225XM-LGLSE(AE1005197)- AE1005197]'
-        }
-      ],
+      cameras: [],
       environmentPoints: []
     }
   },
@@ -117,26 +113,48 @@ export default {
   methods: {
     async loadEnvironmentPoints() {
       try {
-        const response = await getGasList()
+        const response = await getGasList({
+          // show_relation:['image']
+        })
         const list = response.data ? response.data : []
         console.log('原始数据:', list)
         // 只保留node_id为1,3,5的
         const wantedNodeIds = ['1', '3', '5']
-        const filtered = wantedNodeIds.map(nodeId => {
-          const group = list.filter(item => String(item.node_id) === nodeId)
-          if (group.length === 0) return null
-          group.sort((a, b) => new Date(b.update_time || b.created_at || 0) - new Date(a.update_time || a.created_at || 0))
-          return group[0]
-        }).filter(Boolean)
+        const filtered = wantedNodeIds
+          .map(nodeId => {
+            const group = list.filter(item => String(item.node_id) === nodeId)
+            if (group.length === 0) return null
+            group.sort(
+              (a, b) =>
+                new Date(b.record_time) -
+                new Date(a.record_time)
+            )
+            return group[0]
+          })
+          .filter(Boolean)
+          console.log('filtered:', filtered)
         this.environmentPoints = filtered.map(item => ({
           id: item.id,
-          name: item.gas_config && item.gas_config.name ? item.gas_config.name : `监控点${item.node_id}`,
+          name:
+            item.gas_config && item.gas_config.name
+              ? item.gas_config.name
+              : `监控点${item.node_id}`,
           status: item.status || '正常',
-          coConcentration: item.co_concentration != null && item.co_concentration !== '' ? `${item.co_concentration} ppm` : '-',
-          temperature: item.temperature != null && item.temperature !== '' ? `${item.temperature} ℃` : '-',
+          coConcentration:
+            item.co_concentration != null && item.co_concentration !== ''
+              ? `${item.co_concentration} ppm`
+              : '-',
+          temperature:
+            item.temperature != null && item.temperature !== '' ? `${item.temperature} ℃` : '-',
           humidity: item.humidity != null && item.humidity !== '' ? `${item.humidity} %` : '-',
           updateTime: item.record_time || ''
         }))
+        this.cameras = filtered.map(item => ({
+          id: item.id,
+          name: item.gas_config.camera_name,
+          camera_url: item.gas_config.camera_url,
+          image: item.gas_config.image
+        }))
       } catch (error) {
         console.error('环境检测数据获取失败:', error)
         this.$message && this.$message.error('环境检测数据获取失败')
@@ -154,6 +172,14 @@ export default {
       if (status === '正常') return 'success'
       if (status === '预警') return 'warning'
       return 'info'
+    },
+    handleCameraClick(cameraUrl) {
+      // console.log(cameraUrl)
+      if (cameraUrl) {
+        window.open(cameraUrl, '_blank')
+      } else {
+        this.$message.error('摄像头URL为空')
+      }
     }
   }
 }
@@ -171,31 +197,32 @@ export default {
 
 .el-card {
   border: none; // Remove default card border if desired
+  cursor: pointer;
 }
 
 .clearfix:before,
 .clearfix:after {
   display: table;
-  content: "";
+  content: '';
 }
 .clearfix:after {
-  clear: both
+  clear: both;
 }
 
 .camera-body {
   text-align: center;
   .el-image {
-      margin-bottom: 10px;
-      border-radius: 4px;
-      overflow: hidden;
-      box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
-      .image-slot {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
-        height: 100%;
-      }
+    margin-bottom: 10px;
+    border-radius: 4px;
+    overflow: hidden;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+    .image-slot {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      height: 100%;
+    }
   }
   .camera-info {
     font-size: 12px;
@@ -208,7 +235,7 @@ export default {
 }
 
 .offline {
-    color: #F56C6C; // Style for offline button
+  color: #f56c6c; // Style for offline button
 }
 
 .environment-section {
@@ -225,14 +252,15 @@ export default {
   color: #fff; // Default text color for cards
 
   &.status-normal-blue {
-    background-color: #409EFF; // Blue for normal status
+    background-color: #409eff; // Blue for normal status
   }
   &.status-warning {
-    background-color: #E6A23C; // Yellow for warning status
+    background-color: #e6a23c; // Yellow for warning status
+  }
+  &.status-normal-green {
+    // Assuming point C has a distinct 'green normal' status
+    background-color: #67c23a; // Green for normal status
   }
-   &.status-normal-green { // Assuming point C has a distinct 'green normal' status
-     background-color: #67C23A; // Green for normal status
-   }
 
   .env-header {
     display: flex;
@@ -246,8 +274,14 @@ export default {
       border-radius: 10px; // Make tag more pill-shaped
       border: none;
       // Match background to card, or use Element UI types
-       &.el-tag--success { background-color: rgba(255, 255, 255, 0.2); color: #fff;}
-       &.el-tag--warning { background-color: rgba(255, 255, 255, 0.2); color: #fff;}
+      &.el-tag--success {
+        background-color: rgba(255, 255, 255, 0.2);
+        color: #fff;
+      }
+      &.el-tag--warning {
+        background-color: rgba(255, 255, 255, 0.2);
+        color: #fff;
+      }
     }
   }
 
@@ -267,12 +301,12 @@ export default {
         font-size: 20px;
         font-weight: bold;
         &.warning-value {
-           color: #fdf6ec; // Slightly different color for warning value if needed
+          color: #fdf6ec; // Slightly different color for warning value if needed
+        }
+        &.date {
+          font-size: 14px; // Smaller font for date
+          font-weight: normal;
         }
-         &.date {
-           font-size: 14px; // Smaller font for date
-           font-weight: normal;
-         }
       }
     }
   }
diff --git a/src/views/xukou/warningSetting.vue b/src/views/xukou/warningSetting.vue
index 97bd9a5..d817ead 100644
--- a/src/views/xukou/warningSetting.vue
+++ b/src/views/xukou/warningSetting.vue
@@ -20,6 +20,7 @@
           </div>
 
           <!-- 视频与设备信息两行两列布局 -->
+         
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="监控点名称">
@@ -38,19 +39,36 @@
                 <el-input v-model="point.videoName" placeholder="请输入摄像头名称" />
               </el-form-item>
             </el-col>
+            
             <el-col :span="12">
               <el-form-item label="设备地址">
                 <el-input v-model="point.deviceAddress" placeholder="请输入设备地址" />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="节点ID">
                 <el-input v-model="point.nodeId" placeholder="请输入节点ID" />
               </el-form-item>
             </el-col>
           </el-row>
+    
+          <el-row :gutter="20">
+            <el-col :span="24">
+              <el-form-item label="摄像头封面">
+                <el-upload
+                  class="upload-demo"
+                  :action="uploadAction"
+                  :on-success="(response, file, fileList) => handleImageSuccess(response, file, fileList, index)"
+                  :on-remove="(file, fileList) => handleImageRemove(file, fileList, index)"
+                  :limit="1"
+                  :file-list="point.imageFileList"
+                  list-type="picture-card"
+                >
+                  <i class="el-icon-plus" />
+                </el-upload>
+              </el-form-item>
+            </el-col>
+          </el-row>
 
           <!-- 环境监测阈值 -->
           <el-divider content-position="left">环境监测阈值（超过此值将触发预警）</el-divider>
@@ -196,7 +214,8 @@ export default {
           { phone: '13900139000', name: '李四' }
         ]
       },
-      saveLoading: false
+      saveLoading: false,
+      uploadAction: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`
     }
   },
   mounted() {
@@ -207,22 +226,32 @@ export default {
     // 加载监控点配置
     async loadMonitorConfig() {
       try {
-        const response = await getGasConfig()
+        const response = await getGasConfig({
+          show_relation:['image']
+        })
         // 适配分页结构
         const list = response.data ? response.data : []
-        this.monitorPoints = list.map(item => ({
-          id: item.id,
-          name: item.name || `监控点${item.id}`,
-          videoUrl: item.camera_url,
-          videoName: item.camera_name,
-          coThreshold: Number(item.co_threshold),
-          tempMinThreshold: Number(item.temperature_low_threshold),
-          tempMaxThreshold: Number(item.temperature_high_threshold),
-          humidityMinThreshold: Number(item.humidity_low_threshold),
-          humidityMaxThreshold: Number(item.humidity_high_threshold),
-          deviceAddress: item.device_id,
-          nodeId: item.node_id
-        }))
+        this.monitorPoints = list.map(item => {
+          const imageFileList = []
+          if (item.image_id && item.image) {
+            imageFileList.push(item.image)
+          }
+          return {
+            id: item.id,
+            name: item.name || `监控点${item.id}`,
+            videoUrl: item.camera_url,
+            videoName: item.camera_name,
+            coThreshold: Number(item.co_threshold),
+            tempMinThreshold: Number(item.temperature_low_threshold),
+            tempMaxThreshold: Number(item.temperature_high_threshold),
+            humidityMinThreshold: Number(item.humidity_low_threshold),
+            humidityMaxThreshold: Number(item.humidity_high_threshold),
+            deviceAddress: item.device_id,
+            nodeId: item.node_id,
+            image_id: item.image_id || '',
+            imageFileList: imageFileList
+          }
+        })
       } catch (error) {
         console.error('加载监控点配置失败:', error)
         this.$message.error('加载监控点配置失败')
@@ -322,13 +351,25 @@ export default {
         tempMinThreshold: 15,
         tempMaxThreshold: 30,
         humidityMinThreshold: 30,
-        humidityMaxThreshold: 70
+        humidityMaxThreshold: 70,
+        image_id: '',
+        imageFileList: []
       })
     },
     async saveMonitorSettings(index) {
       this.saveLoading = true
       try {
         const point = this.monitorPoints[index]
+        // 获取图片ID
+        let imageId = ''
+        if (point.imageFileList && point.imageFileList.length > 0) {
+          const file = point.imageFileList[0]
+          if (file.response) {
+            imageId = file.response.id
+          } else if (file.id) {
+            imageId = file.id
+          }
+        }
         const param = {
           id: point.id,
           name: point.name,
@@ -340,7 +381,8 @@ export default {
           humidity_low_threshold: point.humidityMinThreshold,
           humidity_high_threshold: point.humidityMaxThreshold,
           device_id: point.deviceAddress,
-          node_id: point.nodeId
+          node_id: point.nodeId,
+          image_id: imageId
         }
         await saveGasConfig(param)
         this.$message({
@@ -355,6 +397,20 @@ export default {
         this.saveLoading = false
       }
     },
+    handleImageSuccess(response, file, fileList, index) {
+      // 上传成功后更新文件列表
+      this.monitorPoints[index].imageFileList = fileList
+      // 保存图片ID
+      if (response && response.id) {
+        this.monitorPoints[index].image_id = response.id
+      }
+    },
+    handleImageRemove(file, fileList, index) {
+      // 删除图片后更新文件列表
+      this.monitorPoints[index].imageFileList = fileList
+      // 清空图片ID
+      this.monitorPoints[index].image_id = ''
+    },
     async deleteMonitorPoint(index) {
       try {
         await this.$confirm('确定要删除此监控点吗？', '提示', {