diff --git a/src/api/secondOrder/list.js b/src/api/secondOrder/list.js
index bf17413..3c01272 100644
--- a/src/api/secondOrder/list.js
+++ b/src/api/secondOrder/list.js
@@ -1,6 +1,7 @@
 import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
+  console.log(params, 'apiparams')
   return request({
     url: '/smartpark/consumerForm/list',
     method: 'get',
diff --git a/src/views/firstOrder/components/consumableDialog.vue b/src/views/firstOrder/components/consumableDialog.vue
index 5ac547a..d354c13 100644
--- a/src/views/firstOrder/components/consumableDialog.vue
+++ b/src/views/firstOrder/components/consumableDialog.vue
@@ -359,8 +359,8 @@ export default {
         },
 
         handleCancel() {
-            // this.$emit('handleCloseDetail');
-            this.consumableVisible 
+            this.$emit('handleCloseDetail');
+            
         }
     },
 }
diff --git a/src/views/firstOrder/components/outDialog.vue b/src/views/firstOrder/components/outDialog.vue
index bb16b9e..43b3abc 100644
--- a/src/views/firstOrder/components/outDialog.vue
+++ b/src/views/firstOrder/components/outDialog.vue
@@ -999,7 +999,9 @@ export default {
       this.sizeForm.optionType = "";
       this.inBatchDialogVisible = false;
       this.consumableVisible = false;
+      this.inBatchDialogVisible = false;
       this.batchSelectionVisible = false;
+      this.sizeForm.optionType = '';
       this.batchTableData = [];
       if (this.sizeForm.options === 1) {
         this.getQuarterList();
diff --git a/src/views/materials/expend.vue b/src/views/materials/expend.vue
index ff78957..3e8e298 100644
--- a/src/views/materials/expend.vue
+++ b/src/views/materials/expend.vue
@@ -110,6 +110,12 @@ export default {
         searchMenuPosition: "right",
         menuWidth: 140,
         column: [
+          {
+            label: "部门",
+            prop: "department",
+            headerAlign: "center",
+            align: "center",
+          },
           {
             label: "编号",
             prop: "materialCode",
@@ -165,6 +171,7 @@ export default {
             headerAlign: "center",
             align: "center",
           },
+          
           // {
           //   label: "金额",
           //   prop: "amount",
diff --git a/src/views/secondOrder/components/categoryDialog copy.vue b/src/views/secondOrder/components/categoryDialog copy.vue
new file mode 100644
index 0000000..a35a87f
--- /dev/null
+++ b/src/views/secondOrder/components/categoryDialog copy.vue	
@@ -0,0 +1,262 @@
+<template>
+    <el-dialog :close-on-click-modal="false" :title="categoryDialogTitle" :visible.sync="categoryVisible"
+        :append-to-body="true" width="70%" @close="handleCloseDetail" fullscreen>
+        <el-tabs v-model="transactionType" @tab-click="handleTabClick">
+            <el-tab-pane label="易耗品" name="YH"></el-tab-pane>
+            <el-tab-pane label="耐用品" name="NY"></el-tab-pane>
+        </el-tabs>
+        <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form" :page.sync="page"
+            :permission="permissionList" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
+            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+            @refresh-change="refreshChange" @on-load="onLoad" @row-change="handleRowChange">
+        </avue-crud>
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="handleCancel">取消</el-button>
+            <el-button type="primary" @click="handleConfirm">确定</el-button>
+        </div>
+    </el-dialog>
+</template>
+<script>
+import { getList } from "@/api/secondOrder/list.js";
+import { getList as fetchDurableApi } from "@/api/materials/expend";
+
+export default {
+    props: {
+        categoryVisible: {
+            type: Boolean,
+            default: false
+        },
+        categoryDialogTitle: {
+            type: String,
+            default: ''
+        },
+        departmentId: {
+            type: String,
+            default: ''
+        },
+        selectionData: {
+            type: Object,
+            default: []
+        }
+    },
+    data() {
+        return {
+            form: {},
+            selectionList: [],
+            newselection: [],
+            query: {},
+            loading: true,
+            page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0,
+            },
+            option: {
+                reserveSelection: true,
+                calcHeight: 30,
+                tip: false,
+                searchShow: true,
+                searchMenuSpan: 18,
+                border: true,
+                index: true,
+                selection: true,
+                viewBtn: true,
+                dialogClickModal: false,
+                menu: false,
+                addBtn: false,
+                printBtn: false,
+                refreshBtn: false,
+                gridBtn: false,
+                gridBackgroundImage: false,
+                gridSpan: false,
+                filterBtn: false,
+                columnBtn: false,
+                menuAlign: "left",
+                searchMenuPosition: "right",
+                menuWidth: 80,
+                selectable: (row, index) => row.num !== 0,
+                column: [
+                    {
+                        label: "存货编号",
+                        prop: "materialCode",
+                        headerAlign: "center",
+                        align: "center",
+                    },
+                    {
+                        label: "存货名称",
+                        prop: "materialName",
+                        search: true,
+                        headerAlign: "center",
+                        align: "left",
+                    },
+                    {
+                        label: "规格型号",
+                        prop: "model",
+                        headerAlign: "center",
+                        align: "left",
+                    },
+                    {
+                        label: "类别",
+                        prop: "type",
+                        search: false,
+                        type: "select",
+                        headerAlign: "center",
+                        align: "center",
+                        value: "NY",
+                        disabled: true,
+                        dicData: [
+                            {
+                                label: "易耗品",
+                                value: "YH",
+                            },
+                            {
+                                label: "耐用品",
+                                value: "NY",
+                            },
+                        ],
+                    },
+                    {
+                        label: "计量单位",
+                        prop: "unit",
+                        headerAlign: "center",
+                        align: "center",
+                    },
+                    {
+                        label: "数量",
+                        prop: "num",
+                        headerAlign: "center",
+                        align: "center",
+                    },
+                    {
+                        label: "单价",
+                        prop: "unitPrice",
+                        headerAlign: "center",
+                        align: "center",
+                        formatter: (row, column) => {
+                            const value = row.unitPrice;
+                            if (value === null || value === undefined || value === "") {
+                                return "-";
+                            }
+                            return value;
+                        }
+                    },
+                ],
+            },
+            data: [],
+            dialogLogVisible: false,
+            transactionType: "YH",
+            tableData: [],
+            ckTable: [],
+            rkTable: [],
+            currentRow: null,
+            allSelectedList: [],
+            isUpdatingSelection: false,
+        }
+    },
+    mounted() {
+        this.onLoad(this.page);
+    },
+    methods: {
+        //清空搜索
+        searchReset() {
+            this.query = {};
+            this.onLoad(this.page);
+        },
+        searchChange(params, done) {
+            this.query = params;
+            this.page.currentPage = 1;
+            this.onLoad(this.page, params);
+            done();
+        },
+
+        //勾选选中
+        selectionChange(selection) {
+            console.log(this.selectionData, '---selectionData')
+            const currentPageIds = this.selectionData.map(item => item.id)
+            let arr = selection.filter(item => !currentPageIds.includes(item.id)) //未选择的数据
+            const selectionWithTwoInventoryId = arr.map(item => ({
+                ...item,
+                twoInventoryId: item.id
+            }))
+            this.allSelectedList.push(...selectionWithTwoInventoryId);
+            this.allSelectedList = this.uniqueById(this.allSelectedList);
+        },
+        //去重
+        uniqueById(arr) {
+            const uniqueObj = {};
+            arr.forEach(item => {
+                if (item.id && !uniqueObj[item.id]) {
+                    uniqueObj[item.id] = item;
+                }
+            });
+            return Object.values(uniqueObj);
+        },
+        //点击确定 
+        handleConfirm() {
+            const uniqueList = this.uniqueById(this.allSelectedList);
+            this.$emit("confirm", uniqueList);
+        },
+        handleCloseDetail() {
+            this.$emit('handleCloseDetail')
+        },
+        selectionClear() {
+            this.allSelectedList = []
+            if (this.$refs.crud) {
+                this.$refs.crud.toggleSelection()
+            }
+        },
+        currentChange(currentPage) {
+            this.page.currentPage = currentPage;
+            this.onLoad(this.page, this.query);
+        },
+
+        sizeChange(pageSize) {
+            this.page.pageSize = pageSize;
+            this.onLoad(this.page, this.query);
+        },
+        refreshChange() {
+            this.onLoad(this.page, this.query);
+        },
+        handleTabClick() {
+            this.page.currentPage = 1;
+            this.onLoad(this.page);
+        },
+        
+        onLoad(page, params = {}) {
+            this.loading = true;
+            const requestParams = Object.assign({}, params, this.query, {
+                num: 0,
+                departmentId: this.departmentId
+            });
+            const apiPromise = this.transactionType === "YH"
+                ? getList(page.currentPage, page.pageSize, requestParams)
+                : fetchDurableApi(page.currentPage, page.pageSize, requestParams);
+            apiPromise.then((res) => {
+                this.data = res.data.result.list;
+                this.page.total = res.data.result.total;
+            }).catch(error => {
+                this.$message.error('加载数据失败: ' + error.message);
+            }).finally(() => {
+                this.loading = false;
+            });
+        },
+        handleCancel() {
+            this.categoryVisible = false
+        }
+    },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep.el-dialog__footer {
+    position: fixed !important;
+    bottom: 0 !important;
+    right: 0 !important;
+}
+
+::v-deep.dialog-content {
+    max-height: calc(100vh - 200px);
+    overflow-y: auto;
+    padding-right: 10px;
+    overflow-x: hidden;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/secondOrder/components/categoryDialog.vue b/src/views/secondOrder/components/categoryDialog.vue
new file mode 100644
index 0000000..7857dae
--- /dev/null
+++ b/src/views/secondOrder/components/categoryDialog.vue
@@ -0,0 +1,328 @@
+<template>
+    <el-dialog :close-on-click-modal="false" :title="categoryDialogTitle" :visible.sync="categoryVisible"
+        :append-to-body="true" width="70%" @close="handleCloseDetail" fullscreen>
+        <el-tabs v-model="transactionType" @tab-click="handleTabClick">
+            <el-tab-pane label="易耗品" name="YH"></el-tab-pane>
+            <el-tab-pane label="耐用品" name="NY"></el-tab-pane>
+        </el-tabs>
+        <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form" :page.sync="page"
+            :permission="permissionList" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
+            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+            @refresh-change="refreshChange" @on-load="onLoad" @row-change="handleRowChange">
+        </avue-crud>
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="handleCancel">取消</el-button>
+            <el-button type="primary" @click="handleConfirm">确定</el-button>
+        </div>
+    </el-dialog>
+</template>
+<script>
+import { getList } from "@/api/secondOrder/list.js";
+import { getList as fetchDurableApi } from "@/api/materials/expend";
+
+export default {
+    props: {
+        categoryVisible: {
+            type: Boolean,
+            default: false
+        },
+        categoryDialogTitle: {
+            type: String,
+            default: ''
+        },
+        departmentId: {
+            type: [String, Number],
+            default: ''
+        },
+        selectionData: {
+            type: Array,
+            default: () => []
+        }
+    },
+    data() {
+        return {
+            form: {},
+            selectionList: [],
+            newselection: [],
+            query: {},
+            loading: true,
+            page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0,
+            },
+            option: {
+                reserveSelection: true,
+                calcHeight: 30,
+                tip: false,
+                searchShow: true,
+                searchMenuSpan: 18,
+                border: true,
+                index: true,
+                selection: true,
+                viewBtn: true,
+                dialogClickModal: false,
+                menu: false,
+                addBtn: false,
+                printBtn: false,
+                refreshBtn: false,
+                gridBtn: false,
+                gridBackgroundImage: false,
+                gridSpan: false,
+                filterBtn: false,
+                columnBtn: false,
+                menuAlign: "left",
+                searchMenuPosition: "right",
+                menuWidth: 80,
+                selectable: (row, index) => row.num !== 0,
+                column: [
+                    {
+                        label: "存货编号",
+                        prop: "materialCode",
+                        headerAlign: "center",
+                        align: "center",
+                    },
+                    {
+                        label: "存货名称",
+                        prop: "materialName",
+                        search: true,
+                        headerAlign: "center",
+                        align: "left",
+                    },
+                    {
+                        label: "规格型号",
+                        prop: "model",
+                        headerAlign: "center",
+                        align: "left",
+                    },
+                    {
+                        label: "类别",
+                        prop: "type",
+                        search: false,
+                        type: "select",
+                        headerAlign: "center",
+                        align: "center",
+                        value: "NY",
+                        disabled: true,
+                        dicData: [
+                            {
+                                label: "易耗品",
+                                value: "YH",
+                            },
+                            {
+                                label: "耐用品",
+                                value: "NY",
+                            },
+                        ],
+                    },
+                    {
+                        label: "计量单位",
+                        prop: "unit",
+                        headerAlign: "center",
+                        align: "center",
+                    },
+                    {
+                        label: "数量",
+                        prop: "num",
+                        headerAlign: "center",
+                        align: "center",
+                    },
+                    {
+                        label: "单价",
+                        prop: "unitPrice",
+                        headerAlign: "center",
+                        align: "center",
+                        formatter: (row, column) => {
+                            const value = row.unitPrice;
+                            if (value === null || value === undefined || value === "") {
+                                return "-";
+                            }
+                            return value;
+                        }
+                    },
+                ],
+            },
+            data: [],
+            dialogLogVisible: false,
+            transactionType: "YH",
+            tableData: [],
+            ckTable: [],
+            rkTable: [],
+            currentRow: null,
+            allSelectedList: [],
+            isUpdatingSelection: false,
+        }
+    },
+    mounted() {
+        // 初始化时使用传入的selectionData
+        this.allSelectedList = [...this.selectionData];
+        this.onLoad(this.page);
+    },
+    methods: {
+        //清空搜索
+        searchReset() {
+            this.query = {};
+            this.onLoad(this.page);
+        },
+        searchChange(params, done) {
+            this.query = params;
+            this.page.currentPage = 1;
+            this.onLoad(this.page, params);
+            done();
+        },
+
+        // 更新当前页面的勾选状态
+        updateCurrentPageSelection() {
+            if (!this.$refs.crud || !this.data) return;
+            
+            this.isUpdatingSelection = true;
+            
+            const currentPageData = this.data || [];
+            
+            // 先清除所有选择
+            this.$refs.crud.toggleSelection();
+            
+            // 检查当前页面的数据中有哪些在 allSelectedList 中
+            currentPageData.forEach((item) => {
+                const isSelected = this.allSelectedList.some(selectedItem => 
+                    selectedItem.id === item.id
+                );
+
+                if (isSelected) {
+                    this.$refs.crud.toggleRowSelection(item, true);
+                }
+            });
+            
+            // 延迟 确保选择状态已完全更新
+            this.$nextTick(() => {
+                setTimeout(() => {
+                    this.isUpdatingSelection = false
+                }, 100);
+            });
+        },
+
+        //勾选选中
+        selectionChange(selection) {
+            if (this.isUpdatingSelection) {
+                return;
+            }
+            
+            console.log('当前选择:', selection)
+            console.log('当前页面数据:', this.data)
+            console.log('当前全部勾选:', this.allSelectedList)
+            
+            // 获取当前页面的数据ID
+            const currentPageIds = this.data.map(item => item.id);
+            
+            const otherPageSelected = this.allSelectedList.filter(item => 
+                !currentPageIds.includes(item.id)
+            );
+            
+            const currentSelected = selection.map(item => ({
+                ...item,
+                twoInventoryId: item.id
+            }));
+            
+            // 组合所有勾选数据
+            const combinedSelection = [
+                ...otherPageSelected,    // 其他页面的数据
+                ...currentSelected       // 当前页面新勾选的数据
+            ];
+            
+            // 去重并更新 allSelectedList
+            this.allSelectedList = this.uniqueById(combinedSelection)
+            
+            console.log('更新后的allSelectedList:', this.allSelectedList)
+        },
+        
+        //去重
+        uniqueById(arr) {
+            const uniqueObj = {};
+            arr.forEach(item => {
+                if (item.id && !uniqueObj[item.id]) {
+                    uniqueObj[item.id] = item;
+                }
+            });
+            return Object.values(uniqueObj);
+        },
+        
+        //点击确定 
+        handleConfirm() {
+            const uniqueList = this.uniqueById(this.allSelectedList)
+            this.$emit("confirm", uniqueList)
+        },
+        
+        handleCloseDetail() {
+            this.$emit('handleCloseDetail')
+        },
+        
+        selectionClear() {
+            this.allSelectedList = []
+            if (this.$refs.crud) {
+                this.$refs.crud.toggleSelection()
+            }
+        },
+        
+        currentChange(currentPage) {
+            this.page.currentPage = currentPage;
+            this.onLoad(this.page, this.query)
+        },
+
+        sizeChange(pageSize) {
+            this.page.pageSize = pageSize;
+            this.onLoad(this.page, this.query)
+        },
+        
+        refreshChange() {
+            this.onLoad(this.page, this.query)
+        },
+        
+        handleTabClick() {
+            this.page.currentPage = 1
+            this.onLoad(this.page)
+        },
+        
+        onLoad(page, params = {}) {
+            this.loading = true
+            const requestParams = Object.assign({}, params, this.query, {
+                num: 0,
+                departmentId: this.departmentId
+            });
+            const apiPromise = this.transactionType === "YH"
+                ? getList(page.currentPage, page.pageSize, requestParams)
+                : fetchDurableApi(page.currentPage, page.pageSize, requestParams)
+            apiPromise.then((res) => {
+                this.data = res.data.result.list
+                this.page.total = res.data.result.total
+                
+                // 数据加载完成后，更新当前页面的勾选状态
+                this.$nextTick(() => {
+                    this.updateCurrentPageSelection()
+                });
+            }).catch(error => {
+                this.$message.error('加载数据失败: ' + error.message)
+            }).finally(() => {
+                this.loading = false;
+            })
+        },
+        
+        handleCancel() {
+            this.categoryVisible = false
+        }
+    },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep.el-dialog__footer {
+    position: fixed !important;
+    bottom: 0 !important;
+    right: 0 !important;
+}
+
+::v-deep.dialog-content {
+    max-height: calc(100vh - 200px);
+    overflow-y: auto;
+    padding-right: 10px;
+    overflow-x: hidden;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/secondOrder/components/outDialog.vue b/src/views/secondOrder/components/outDialog.vue
index d2a73ab..bdd1459 100644
--- a/src/views/secondOrder/components/outDialog.vue
+++ b/src/views/secondOrder/components/outDialog.vue
@@ -1,56 +1,30 @@
 <template>
   <div>
-    <el-dialog
-      :close-on-click-modal="false"
-      :title="outDialogTiltle"
-      :visible.sync="outDialogVisible"
-      :append-to-body="true"
-      @close="handleCloseDetail"
-      fullscreen
-    >
+    <el-dialog :close-on-click-modal="false" :title="outDialogTiltle" :visible.sync="outDialogVisible"
+      :append-to-body="true" @close="handleCloseDetail" fullscreen>
       <div class="dialog-content">
         <!-- 基本信息 -->
-        <el-form
-          :model="sizeForm"
-          ref="dynamicValidateForm"
-          label-width="100px"
-          class="demo-dynamic"
-          :rules="dynamicRules"
-        >
+        <el-form :model="sizeForm" ref="dynamicValidateForm" label-width="100px" class="demo-dynamic"
+          :rules="dynamicRules">
           <div class="form-title">基本信息</div>
           <el-row>
             <el-col :span="12">
               <el-form-item label="出库申请时间">
-                <el-date-picker
-                  v-model="sizeForm.ldTwoOutStorage.outDate"
-                  type="date"
-                  placeholder="选择日期"
-                  style="width: 100%"
-                  disabled
-                >
+                <el-date-picker v-model="sizeForm.ldTwoOutStorage.outDate" type="date" placeholder="选择日期"
+                  style="width: 100%" disabled>
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="事由" prop="ldTwoOutStorage.reason">
-                <el-input
-                  v-model="sizeForm.ldTwoOutStorage.reason"
-                  :disabled="outDialogType != 'add'"
-                  placeholder="请输入"
-                ></el-input>
+                <el-input v-model="sizeForm.ldTwoOutStorage.reason" :disabled="outDialogType != 'add'"
+                  placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item
-                label="物资类型"
-                prop="ldTwoOutStorage.materialType"
-              >
-                <el-select
-                  v-model="sizeForm.ldTwoOutStorage.materialType"
-                  placeholder="请选择"
-                  style="width: 100%"
-                  :disabled="outDialogType != 'add'"
-                >
+              <el-form-item label="物资类型" prop="ldTwoOutStorage.materialType">
+                <el-select v-model="sizeForm.ldTwoOutStorage.materialType" placeholder="请选择" style="width: 100%"
+                  :disabled="outDialogType != 'add'">
                   <el-option label="办公室物资" value="1"></el-option>
                   <el-option label="其他物资" value="2"></el-option>
                 </el-select>
@@ -58,127 +32,84 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="部门" prop="ldTwoOutStorage.departmentInfo">
-                <el-select
-                  v-model="sizeForm.ldTwoOutStorage.departmentInfo"
-                  placeholder="请选择"
-                  style="width: 100%"
-                  :disabled="outDialogType != 'add'"
-                  @change="deptChange"
-                  clearable
-                  filterable
-                  value-key="departmentId"
-                >
-                  <el-option
-                    v-for="item in departmentOptions"
-                    :key="item.departmentId"
-                    :label="item.department"
-                    :value="item"
-                  ></el-option>
+                <el-select v-model="sizeForm.ldTwoOutStorage.departmentInfo" placeholder="请选择" style="width: 100%"
+                  :disabled="outDialogType != 'add'" @change="deptChange" clearable filterable value-key="departmentId">
+                  <el-option v-for="item in departmentOptions" :key="item.departmentId" :label="item.department"
+                    :value="item"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="领用人" prop="ldTwoOutStorage.proposerInfo">
-                <el-select
-                  v-model="sizeForm.ldTwoOutStorage.proposerInfo"
-                  placeholder="请选择"
-                  style="width: 100%"
-                  :disabled="
-                    sizeForm.departmentId == '' || outDialogType == 'details'
-                  "
-                  clearable
-                  filterable
-                  value-key="userId"
-                  @change="proposerChange"
-                >
-                  <el-option
-                    v-for="item in userOptions"
-                    :key="item.userId"
-                    :label="item.name"
-                    :value="item"
-                  >
+                <el-select v-model="sizeForm.ldTwoOutStorage.proposerInfo" placeholder="请选择" style="width: 100%"
+                  :disabled="sizeForm.departmentId == '' || outDialogType == 'details'
+                    " clearable filterable value-key="userId" @change="proposerChange">
+                  <el-option v-for="item in userOptions" :key="item.userId" :label="item.name" :value="item">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="outDialogType == 'details'">
               <el-form-item label="填报人">
-                <el-input
-                  v-model="sizeForm.ldTwoOutStorage.shipperName"
-                  :disabled="outDialogType != 'add'"
-                ></el-input>
+                <el-input v-model="sizeForm.ldTwoOutStorage.shipperName" :disabled="outDialogType != 'add'"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <div class="form-title">{{ outDateInfo }} 出库信息：</div>
-          <el-button
+          <!-- <el-button
             type="primary"
             size="mini"
             style="margin-bottom: 18px"
             @click="inTableAdd()"
             v-if="outDialogType != 'details'"
             >新增</el-button
-          >
-          <el-table
-            :data="sizeForm.ldTwoOutStorageDetailList"
-            border
-            style="width: 100%"
-          >
-            <el-table-column prop="materialCode" label="物资编码" >
+          > -->
+          <el-button type="primary" size="mini" style="margin-bottom: 18px" @click="categoryHandle"
+            v-if="outDialogType != 'details'">新增</el-button>
+          <el-table :data="sizeForm.ldTwoOutStorageDetailList" border style="width: 100%">
+            <el-table-column prop="materialCode" label="物资编码">
             </el-table-column>
-            <el-table-column prop="str2" label="物资名称">
+            <!-- <el-table-column prop="str2" label="物资名称">
               <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.materialitem"
-                  placeholder="请选择物"
-                  style="width: 100%"
-                  @change="
-                    handleMaterialChange(scope.row.materialitem, scope.$index)
-                  "
-                  v-if="outDialogType != 'details'"
-                  value-key="id"
-                >
-                  <el-option
-                    v-for="item in materials"
-                    :key="item.materialId"
-                    :label="item.materialName"
-                    :value="item"
-                  >
+                <el-select v-model="scope.row.materialitem" placeholder="请选择物资名称" style="width: 100%" @change="
+                  handleMaterialChange(scope.row.materialitem, scope.$index)
+                  " v-if="outDialogType != 'details'" value-key="id">
+                  <el-option v-for="item in materials" :key="item.materialId" :label="item.materialName" :value="item">
                   </el-option>
                 </el-select>
                 <span v-else> {{ scope.row.materialName }}</span>
               </template>
-            </el-table-column>
+</el-table-column> -->
+            <el-table-column prop="materialName" label="物资名称"></el-table-column>
             <el-table-column prop="model" label="规格/型号"> </el-table-column>
             <!-- <el-table-column prop="type" label="类别"> </el-table-column> -->
             <el-table-column prop="type" label="类别">
-                <template slot-scope="scope">
-                  {{ scope.row.type === "NY" ? "耐用品" : (scope.row.type === "YH" ? "易耗品" : "") }}
-                </template>
-              </el-table-column>
+              <template slot-scope="scope">
+                {{ scope.row.type === "NY" ? "耐用品" : (scope.row.type === "YH" ? "易耗品" : "") }}
+              </template>
+            </el-table-column>
             <el-table-column prop="unit" label="单位"> </el-table-column>
             <el-table-column prop="num" label="数量">
               <template slot-scope="scope">
-                <el-input-number
-                  size="mini"
-                  v-model="scope.row.num"
-                  :min="1"
-                  style="width: 100%"
-                  :disabled="outDialogType != 'add'"
-                  @change="(newValue) => handleQuantityChange(newValue, scope.$index)"
-                ></el-input-number>
+                <el-input-number size="mini" v-model="scope.row.num" :min="1" style="width: 100%"
+                  :disabled="outDialogType != 'add' || scope.row.type === 'NY'"
+                  @change="(newValue) => handleQuantityChange(newValue, scope.$index)"></el-input-number>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" style="text-align: center;" v-if="outDialogType != 'details'">
+              <template slot-scope="scope">
+                <div style="text-align: center;" :disabled="outDialogType == 'details'">
+                  <el-button type="text" size="mini" @click="handleDelete(scope.$index, scope.row)">
+                    删除
+                  </el-button>
+                </div>
               </template>
             </el-table-column>
           </el-table>
           <div class="form-title" v-if="outDialogType != 'details'">
             出库账目表格：
           </div>
-          <el-table
-            :data="sizeForm.inAccountsTableData"
-            border
-            style="width: 100%"
-            v-if="outDialogType != 'details'"
-          >
+          <el-table :data="sizeForm.inAccountsTableData" border style="width: 100%" v-if="outDialogType != 'details'">
             <el-table-column prop="date" label="当前库存">
               <el-table-column prop="materialCode" label="编码">
               </el-table-column>
@@ -201,18 +132,17 @@
 
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleCloseDetail()">取 消</el-button>
-        <el-button
-          v-if="outDialogType != 'details'"
-          type="primary"
-          @click="sumbit()"
-          >确 定</el-button
-        >
+        <el-button v-if="outDialogType != 'details'" type="primary" @click="sumbit()">确 定</el-button>
       </span>
     </el-dialog>
+    <categoryDialog v-if="categoryVisible" :categoryVisible='categoryVisible' :selectionData="selectionData"
+      :departmentId="sizeForm.ldTwoOutStorage.departmentId" :categoryDialogTitle="categoryDialogTitle"
+      @confirm="confirm" @handleCloseDetail="handleCloseDetail"></categoryDialog>
   </div>
 </template>
 <script>
 import { getDetailedItems } from "@/api/firstOrder/outbound";
+import categoryDialog from './categoryDialog.vue'
 import {
   getUserList,
   getMaterialList,
@@ -220,6 +150,9 @@ import {
   getDetails,
 } from "@/api/secondOrder/outbound";
 export default {
+  components: {
+    categoryDialog
+  },
   props: {
     repairVisible: {
       type: Boolean,
@@ -266,6 +199,10 @@ export default {
   data() {
     return {
       outDialogVisible: false,
+      categoryVisible: false,
+      categoryDialogTitle: '出库',
+      allSelectedList:[],
+      selectionData:[],
       sizeForm: {
         ldTwoOutStorage: {
           outDate: "",
@@ -278,6 +215,7 @@ export default {
           submitName: "", //填报人
           departmentInfo: null,
           proposerInfo: null,
+          optionType: 'YH'
         },
         ldTwoOutStorageDetailList: [], //出库单详情
         inAccountsTableData: [], //库存汇总
@@ -340,20 +278,71 @@ export default {
     this.getDetailedItems();
   },
   methods: {
+    categoryHandle() {
+      this.categoryVisible = true
+    },
+    confirm(allSelectedList) {
+      console.log('allSelectedList-------',allSelectedList)
+      // this.selectionData = allSelectedList
+      allSelectedList.map(item =>{
+        this.selectionData.push(item)
+      })
+      this.categoryVisible = false;
+      // 去重：过滤已存在的物资
+      const newItems = allSelectedList.filter(newItem =>
+        !this.sizeForm.ldTwoOutStorageDetailList.some(
+          oldItem => oldItem.id === newItem.id
+        )
+      );
+      // 追加数据
+      this.sizeForm.ldTwoOutStorageDetailList = [
+        ...this.sizeForm.ldTwoOutStorageDetailList,
+        ...newItems
+      ];
+      console.log('ldTwoOutStorageDetailList--------',this.sizeForm.ldTwoOutStorageDetailList)
+      // 同步库存汇总表
+      this.summaryTableData();
+    },
+    categoryHandle() {
+      this.categoryVisible = true;
+   
+    },
+    // 删除表格行数据
+    handleDelete(index, row) {
+      this.sizeForm.ldTwoOutStorageDetailList.splice(index, 1)
+    },
     // 初始化  汇总库存 inAccountsTableData
     summaryTableData() {
       this.sizeForm.inAccountsTableData = JSON.parse(JSON.stringify(this.sizeForm.ldTwoOutStorageDetailList))
     },
+    // handleQuantityChange(newValue, index) {
+    //   const currentRow = this.sizeForm.ldTwoOutStorageDetailList[index];
+    //   console.log(currentRow,'c')
+    //   if (currentRow.materialCode != '') {
+    //     currentRow.oldNum = currentRow.materialitem.num
+    //     currentRow.num = currentRow.num
+    //     currentRow.newNum = currentRow.materialitem.num - currentRow.num
+    //   }
+    //   this.$set(this.sizeForm.inAccountsTableData, index, currentRow)
+    //   this.sizeForm.inAccountsTableData[index] = currentRow
+    // },
     handleQuantityChange(newValue, index) {
       const currentRow = this.sizeForm.ldTwoOutStorageDetailList[index];
-      if (currentRow.materialCode != '') {
-        currentRow.oldNum =  currentRow.materialitem.num
-        currentRow.num =  currentRow.num
-        currentRow.newNum =  currentRow.materialitem.num - currentRow.num
+      if (!currentRow) return;
+      if (currentRow.type === "NY") {
+        currentRow.num = 1;
+        this.$set(this.sizeForm.ldTwoOutStorageDetailList, index, currentRow);
+        this.$set(this.sizeForm.inAccountsTableData, index, { ...currentRow });
+        return;
       }
-      this.$set(this.sizeForm.inAccountsTableData,index,currentRow)
-      this.sizeForm.inAccountsTableData[index] = currentRow
+      const stockNum = currentRow.num // 原始库存数量
+      currentRow.oldNum = stockNum // 出库前库存
+      currentRow.num = newValue // 出库数量
+      currentRow.newNum = stockNum - newValue // 出库后库存
+      this.$set(this.sizeForm.ldTwoOutStorageDetailList, index, currentRow)
+      this.$set(this.sizeForm.inAccountsTableData, index, { ...currentRow })
     },
+
     // 更新全局总计
     updateGlobalTotal() {
       let totalAmount = 0;
@@ -366,7 +355,6 @@ export default {
     },
     // 选中物资获取数据
     handleMaterialChange(row, index) {
-      console.log(99999,row)
       this.sizeForm.ldTwoOutStorageDetailList[index].materialId =
         row.materialId;
       this.sizeForm.ldTwoOutStorageDetailList[index].model = row.model;
@@ -405,6 +393,7 @@ export default {
       this.sizeForm.ldTwoOutStorage.department = value.department;
       this.getUserList(value.departmentId);
       this.getMaterialList(value.departmentId);
+      this.sizeForm.ldTwoOutStorageDetailList = []
     },
     // 领用人选中
     proposerChange(value) {
@@ -414,6 +403,7 @@ export default {
     },
     handleCloseDetail() {
       this.outDialogVisible = false;
+      this.categoryVisible = false
       this.$emit("handleCloseDetail");
     },
     inInit() {
@@ -442,11 +432,7 @@ export default {
       const day = String(now.getDate()).padStart(2, "0");
       this.sizeForm.ldTwoOutStorage.outDate = `${year}-${month}-${day} 00:00:00`; //入库时间
     },
-    handleCloseDetail() {
-      this.inDialogVisible = false;
-      this.$emit("handleCloseDetail");
-    },
-    // 添加入库数据
+    // 添加入库数据 ,点击新增
     inTableAdd() {
       this.sizeForm.ldTwoOutStorageDetailList.push({});
       this.summaryTableData()
@@ -473,6 +459,7 @@ export default {
 .form-title {
   margin: 20px 0;
 }
+
 ::v-deep.el-dialog__footer {
   position: fixed !important;
   bottom: 0 !important;
@@ -480,8 +467,10 @@ export default {
 }
 
 ::v-deep.dialog-content {
-  max-height: calc(100vh - 200px); /* 减去标题栏和底部按钮的高度 */
+  max-height: calc(100vh - 200px);
+  /* 减去标题栏和底部按钮的高度 */
   overflow-y: auto;
-  padding-right: 10px; /* 预留滚动条空间 */
+  padding-right: 10px;
+  /* 预留滚动条空间 */
 }
 </style>