二级库出库调整

src/views/firstOrder/components/outDialog.vue

@@ -554,22 +554,26 @@ export default {
       return department ? department.department : '';
     },
     //获取单条选择的物资名称列表
-    async getMaterialList() {
+  async getMaterialList() {
-      this.loading = true
+  this.loading = true
-      this.consumableVisible = false;
+  this.consumableVisible = false; // 默认先隐藏
-      try {
+  try {
-        if (this.sizeForm.optionType === "NY" && this.outDialogType !== 'details') {
+    // 只在单项选择且是耐用品时才显示弹窗
-          this.consumableVisible = true
+    if (this.sizeForm.optionType === "NY" && 
-        } else {
+        this.outDialogType !== 'details' && 
-          const res = await getMaterialList({ optionType: this.sizeForm.optionType })
+        this.sizeForm.options === 2) {
-          this.materials = res.data.result
+      this.consumableVisible = true
-        }
+    } else if (this.sizeForm.optionType === "YH" && this.outDialogType !== 'details') {
-      } catch (error) {
+      // 易耗品时获取物资列表
-        this.$message.error("获取数据来源失败，请重试");
+      const res = await getMaterialList({ optionType: this.sizeForm.optionType })
-      } finally {
+      this.materials = res.data.result
-        this.loading = false;
+    }
-      }
+  } catch (error) {
-    },
+    this.$message.error("获取数据来源失败，请重试");
+  } finally {
+    this.loading = false;
+  }
+},
     // 处理物资选择变化
     handleMaterialChange(row, index) {
       this.sizeForm.inTableData[index].materialId = row.materialId
@@ -693,16 +697,16 @@ export default {
     // 选项选择
     radioChange() {
       this.sizeForm.inTableData = []
-      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()
         this.inBatchDialogVisible = true
         this.inBatchForm.batchType = '',
-          this.inBatchForm.department = ''
+        this.inBatchForm.department = ''
         this.inBatchForm.optionType = ''
       }
     },

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>

src/views/secondOrder/components/categoryDialog.vue

@@ -33,12 +33,17 @@ export default {
         departmentId: {
             type: [String, Number],
             default: ''
+        },
+        selectionData: {
+            type: Array,
+            default: () => []
         }
     },
     data() {
         return {
             form: {},
             selectionList: [],
+            newselection: [],
             query: {},
             loading: true,
             page: {
@@ -139,17 +144,18 @@ export default {
             },
             data: [],
             dialogLogVisible: false,
-            transactionType: "YH", // 初始值改为YH（易耗品），匹配标签页name
+            transactionType: "YH",
             tableData: [],
             ckTable: [],
             rkTable: [],
             currentRow: null,
-            allSelectedList: [], //存储所有勾选的数据
+            allSelectedList: [],
-            isUpdatingSelection: false, // 修正：将此属性移到 data 中
+            isUpdatingSelection: false,
         }
     },
     mounted() {
-        // 页面初始化时调用易耗品接口
+        // 初始化时使用传入的selectionData
+        this.allSelectedList = [...this.selectionData];
         this.onLoad(this.page);
     },
     methods: {
@@ -165,74 +171,141 @@ export default {
             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) {
-            console.log("勾选选中", 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);
-            this.allSelectedList = this.allSelectedList.filter(item =>
+            
+            const otherPageSelected = this.allSelectedList.filter(item => 
                 !currentPageIds.includes(item.id)
             );
-            const selectionWithTwoInventoryId = selection.map(item => ({
+            
+            const currentSelected = selection.map(item => ({
                 ...item,
-                twoInventoryId: item.twoInventoryId || item.id
+                twoInventoryId: item.id
             }));
-            this.allSelectedList.push(...selectionWithTwoInventoryId);
+            
+            // 组合所有勾选数据
+            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() {
-            this.$emit("confirm", this.allSelectedList);
+            const uniqueList = this.uniqueById(this.allSelectedList)
+            this.$emit("confirm", uniqueList)
         },
+        
         handleCloseDetail() {
             this.$emit('handleCloseDetail')
         },
+        
         selectionClear() {
-            this.allSelectedList = []; // 清空所有选中的数据
+            this.allSelectedList = []
             if (this.$refs.crud) {
-                this.$refs.crud.toggleSelection(); // 清空表格选择
+                this.$refs.crud.toggleSelection()
             }
         },
+        
         currentChange(currentPage) {
             this.page.currentPage = currentPage;
-            this.onLoad(this.page, this.query);
+            this.onLoad(this.page, this.query)
         },
 
         sizeChange(pageSize) {
             this.page.pageSize = pageSize;
-            this.onLoad(this.page, this.query);
+            this.onLoad(this.page, this.query)
         },
         
         refreshChange() {
-            this.onLoad(this.page, this.query);
+            this.onLoad(this.page, this.query)
         },
         
-        // 切换标签页时触发
         handleTabClick() {
-            // 切换标签后重置页码为第1页，重新加载对应类型数据
+            this.page.currentPage = 1
-            this.page.currentPage = 1;
+            this.onLoad(this.page)
-            this.onLoad(this.page);
-            // 清空当前页的勾选状态（可选，根据业务需求）
-            this.selectionClear();
         },
         
-
         onLoad(page, params = {}) {
-            this.loading = true;
+            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);
+                : fetchDurableApi(page.currentPage, page.pageSize, requestParams)
             apiPromise.then((res) => {
-                this.data = res.data.result.list;
+                this.data = res.data.result.list
-                this.page.total = res.data.result.total;
+                this.page.total = res.data.result.total
+                
+                // 数据加载完成后，更新当前页面的勾选状态
+                this.$nextTick(() => {
+                    this.updateCurrentPageSelection()
+                });
             }).catch(error => {
-                this.$message.error('加载数据失败: ' + error.message);
+                this.$message.error('加载数据失败: ' + error.message)
             }).finally(() => {
                 this.loading = false;
-            });
+            })
         },
+        
         handleCancel() {
             this.categoryVisible = false
         }

src/views/secondOrder/components/outDialog.vue

@@ -79,7 +79,7 @@
                 </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> -->
@@ -135,7 +135,7 @@
         <el-button v-if="outDialogType != 'details'" type="primary" @click="sumbit()">确 定</el-button>
       </span>
     </el-dialog>
-    <categoryDialog v-if="categoryVisible" :categoryVisible='categoryVisible'
+    <categoryDialog v-if="categoryVisible" :categoryVisible='categoryVisible' :selectionData="selectionData"
       :departmentId="sizeForm.ldTwoOutStorage.departmentId" :categoryDialogTitle="categoryDialogTitle"
       @confirm="confirm" @handleCloseDetail="handleCloseDetail"></categoryDialog>
   </div>
@@ -201,6 +201,8 @@ export default {
       outDialogVisible: false,
       categoryVisible: false,
       categoryDialogTitle: '出库',
+      allSelectedList:[],
+      selectionData:[],
       sizeForm: {
         ldTwoOutStorage: {
           outDate: "",
@@ -280,17 +282,32 @@ export default {
       this.categoryVisible = true
     },
     confirm(allSelectedList) {
+      console.log('allSelectedList-------',allSelectedList)
+      // this.selectionData = allSelectedList
+      allSelectedList.map(item =>{
+        this.selectionData.push(item)
+      })
       this.categoryVisible = false;
-      const formattedList = allSelectedList.map(item => ({
+      // 去重：过滤已存在的物资
-        ...item,
+      const newItems = allSelectedList.filter(newItem =>
-        // oldNum: item.num , 
+        !this.sizeForm.ldTwoOutStorageDetailList.some(
-        // newNum: item.num , 
+          oldItem => oldItem.id === newItem.id
-        num: item.type === "NY" ? 1 : item.num // 耐用品默认1，易耗品可选
+        )
-      }));
+      );
-      this.sizeForm.ldTwoOutStorageDetailList = formattedList;
+      // 追加数据
-      this.sizeForm.inAccountsTableData = JSON.parse(JSON.stringify(formattedList));
+      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)
     },
@@ -309,7 +326,7 @@ export default {
     //   this.$set(this.sizeForm.inAccountsTableData, index, currentRow)
     //   this.sizeForm.inAccountsTableData[index] = currentRow
     // },
-      handleQuantityChange(newValue, index) {
+    handleQuantityChange(newValue, index) {
       const currentRow = this.sizeForm.ldTwoOutStorageDetailList[index];
       if (!currentRow) return;
       if (currentRow.type === "NY") {
@@ -324,7 +341,7 @@ export default {
       currentRow.newNum = stockNum - newValue // 出库后库存
       this.$set(this.sizeForm.ldTwoOutStorageDetailList, index, currentRow)
       this.$set(this.sizeForm.inAccountsTableData, index, { ...currentRow })
-  },
+    },
 
     // 更新全局总计
     updateGlobalTotal() {