From 3dc2d1a0dc94aeb2f056197f4f3f5cc2a78a98df Mon Sep 17 00:00:00 2001
From: taozi <1362265981@qq.com>
Date: Tue, 6 Jan 2026 14:46:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/firstOrder/outbound.js                |  13 ++
 .../components/batchSelectionDialog.vue       |   4 +-
 .../components/consumableDialog.vue           | 200 ++++++++++--------
 .../firstOrder/components/needDialog.vue      | 124 +++++++----
 src/views/firstOrder/components/outDialog.vue |  26 ++-
 src/views/firstOrder/inbound.vue              |   3 +-
 src/views/firstOrder/outbound.vue             |  21 +-
 src/views/materials/index.vue                 |   5 +-
 .../secondOrder/components/outDialog.vue      |  11 +-
 9 files changed, 245 insertions(+), 162 deletions(-)

diff --git a/src/api/firstOrder/outbound.js b/src/api/firstOrder/outbound.js
index 9ada133..1938af4 100644
--- a/src/api/firstOrder/outbound.js
+++ b/src/api/firstOrder/outbound.js
@@ -85,4 +85,17 @@ export const editList = (oneOutStorageId) => {
         cryptoToken: false,
         cryptoData: false
     })
+}
+export const getPutPurchaseList = (current, size, params) => {
+    return request({
+        url: '/smartpark/oneOutStorageDetail/getOneOutStorageDetailList',
+        method: 'get',
+        params: {
+            ...params,
+            pageSize: size,
+            pageNum: current,
+        },
+        cryptoToken: false,
+        cryptoData: false
+    })
 }
\ No newline at end of file
diff --git a/src/views/firstOrder/components/batchSelectionDialog.vue b/src/views/firstOrder/components/batchSelectionDialog.vue
index d1a9b74..375ca3a 100644
--- a/src/views/firstOrder/components/batchSelectionDialog.vue
+++ b/src/views/firstOrder/components/batchSelectionDialog.vue
@@ -38,8 +38,8 @@
             <el-table-column label="物料名称" prop="materialName"  />
             <el-table-column label="规格型号" prop="model"  />
             <el-table-column label="申请数量" prop="applicationQuantity"  />
-            
-            <el-table-column label="已出库数量" prop="outboundQuantity"  />
+            <el-table-column label="本此出库数量" prop="applicationQuantity"  />
+            <!-- <el-table-column label="已出库数量" prop="outboundQuantity"  /> -->
             <el-table-column label="部门" prop="departmentName"  />
             <el-table-column label="单位" prop="unit"  />
         </el-table>
diff --git a/src/views/firstOrder/components/consumableDialog.vue b/src/views/firstOrder/components/consumableDialog.vue
index 2071594..4c4b9e4 100644
--- a/src/views/firstOrder/components/consumableDialog.vue
+++ b/src/views/firstOrder/components/consumableDialog.vue
@@ -35,7 +35,7 @@ export default {
             query: { type: "NY" },
             loading: true,
             page: {
-                pageSize: 5,
+                pageSize: 10,
                 currentPage: 1,
                 total: 0,
             },
@@ -152,6 +152,7 @@ export default {
             rkTable: [],
             currentRow: null,
             allSelectedList: [], //存储所有勾选的数据
+            isUpdatingSelection: false, // 修正：将此属性移到 data 中
         }
     },
     computed: {
@@ -194,8 +195,8 @@ export default {
 
         handleTabClick() {
             this.loadTransactionData();
-
         },
+        
         async loadTransactionData() {
             if (!this.currentRow) return;
             const params = {
@@ -223,142 +224,155 @@ export default {
                 this.loading = false;
             }
         },
+        
         searchReset() {
             this.query = {};
             this.onLoad(this.page);
         },
+        
         searchChange(params, done) {
             this.query = params;
             this.page.currentPage = 1;
             this.onLoad(this.page, params);
             done();
         },
+        
         //勾选选中
-        selectionChange(list) {
-            console.log("勾选选中", list)
-            const currentPageIds = this.data.map(item => item.id)
-            console.log(currentPageIds, "currentPageIds")
-            this.allSelectedList = this.allSelectedList.filter(item => !currentPageIds.includes(item.id))
-            console.log(this.allSelectedList, '1')
-            this.allSelectedList.push(...list)
-            console.log('所有勾选数据:', this.allSelectedList)
+        selectionChange(selection) {
+            // 如果是程序自动更新选择状态，则不执行清理逻辑
+            if (this.isUpdatingSelection) {
+                return;
+            }
+            
+            console.log("勾选选中", selection);
+            const currentPageIds = this.data.map(item => item.id);
+            console.log(currentPageIds, "currentPageIds");
+
+            // 从allSelectedList中移除当前页面的数据（因为当前页面的数据状态以selection为准）
+            this.allSelectedList = this.allSelectedList.filter(item =>
+                !currentPageIds.includes(item.id)
+            );
+            console.log(this.allSelectedList, '1');
+
+            // 将当前页面选中的数据添加到allSelectedList
+            this.allSelectedList.push(...selection);
+            console.log('所有勾选数据:', this.allSelectedList);
         },
+        
         //点击确定 
         handleConfirm() {
-            console.log(6)
-            console.log(this.allSelectedList, 'chuan')
-            this.$emit("confirm", this.allSelectedList)
+            console.log(6);
+            console.log(this.allSelectedList, 'chuan');
+            this.$emit("confirm", this.allSelectedList);
         },
+        
         selectionClear() {
-            this.selectionList = [];
-            this.$refs.crud.toggleSelection();
+            this.allSelectedList = []; // 清空所有选中的数据
+            if (this.$refs.crud) {
+                this.$refs.crud.toggleSelection(); // 清空表格选择
+            }
         },
+        
         handleRowChange(row, index, data) {
-            // 切换页面保持勾选状态（仅保留有效行）
+            // 这个方法应该只处理行变化，分页勾选保持应该在 onLoad 中处理
+            // 但为了保持当前页面勾选状态，我们保留此逻辑
             this.$nextTick(() => {
-                const currentPageData = this.data
-                console.log(this.data,0)
-                this.$refs.crud.toggleAllSelection(false);
+                // 设置标志，表示正在程序化更新选择状态
+                this.isUpdatingSelection = true;
+                
+                const currentPageData = this.data || [];
+                // 清除当前页面的选中状态
+                this.$refs.crud.toggleSelection();
+
+                // 遍历当前页面的数据，检查是否在 allSelectedList 中
                 currentPageData.forEach((item) => {
-                    // 仅勾选数量非0的行
-                    const isSelected = this.allSelectedList.some(selectedItem => 
-                        selectedItem.id === item.id && !(item.num === 0 || item.num === null || item.num === undefined || item.num === '')
+                    const isSelected = this.allSelectedList.some(selectedItem =>
+                        selectedItem.id === item.id
                     );
+                    // 如果该项已经被选中，则勾选它
                     if (isSelected) {
                         this.$refs.crud.toggleRowSelection(item, true);
                     }
                 });
+                
+                // 延迟重置标志
+                setTimeout(() => {
+                    this.isUpdatingSelection = false;
+                }, 100);
             });
         },
-        //         handleRowChange(row, index, data) {
-        //             // 切换页面要判断当前页面数据是否在已勾选的数据中，如果在则勾选，否则不勾选
-        //             this.$nextTick(() => {
-        //                 // 获取当前页面的所有数据
-        //                 const currentPageData = this.data || [];
-        //                 // 清除当前页面的选中状态
-        //                 this.$refs.crud.toggleAllSelection(false);
-
-        //                 // 遍历当前页面的数据，检查是否在 allSelectedList 中
-        //                 currentPageData.forEach((item, index) => {
-        //                     const isSelected = this.allSelectedList.some(selectedItem =>
-        //                         selectedItem.id === item.id
-        //                     );
-        //                     // 如果该项已经被选中，则勾选它
-        //                     if (isSelected) {
-        //                         this.$refs.crud.toggleRowSelection(item, true);
-        //                     }
-        //                 });
-        //             });
-        //         },
-        //         currentChange(currentPage) {
-        //             console.log(currentPage, 1);
-        //             this.page.currentPage = currentPage;
-        //             // 切换页面时重新加载数据，会触发 onLoad，从而调用 handleRowChange
-        //             this.onLoad(this.page, this.query);
-        //         }, 
-        //         onLoad(page, params = {}) {
-        //     this.loading = true;
-        //     console.log(this.query, 2);
-        //     getList(
-        //         page.currentPage,
-        //         page.pageSize,
-        //         Object.assign(params, this.query)
-
-        //     ).then((res) => {
-        //         this.data = res.data.result.list;
-        //         this.loading = false;
-        //         this.page.total = res.data.result.total;
-
-        //         // 数据加载完成后，更新当前页面的勾选状态
-        //         this.$nextTick(() => {
-        //             this.updateCurrentPageSelection();
-        //         });
-        //     });
-        //     this.loading = false;
-        // },
-        // // 添加一个新方法来更新当前页面的选中状态
-        // updateCurrentPageSelection() {
-        //     if (!this.$refs.crud) return;
-
-        //     const currentPageData = this.data || [];
-
-        //     currentPageData.forEach((item) => {
-        //         const isSelected = this.allSelectedList.some(selectedItem => 
-        //             selectedItem.id === item.id
-        //         );
-
-        //         if (isSelected) {
-        //             this.$refs.crud.toggleRowSelection(item, true);
-        //         }
-        //     });
-        // },
-
+        
         currentChange(currentPage) {
-            console.log(currentPage, 1)
-            this.handleRowChange()
+            console.log(currentPage, 1);
             this.page.currentPage = currentPage;
+            // 切换页面时重新加载数据，会触发 onLoad
+            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);
         },
+        
         onLoad(page, params = {}) {
             this.loading = true;
-            console.log(this.query, 2)
+            console.log(this.query, 2);
             getList(
                 page.currentPage,
                 page.pageSize,
                 Object.assign(params, this.query)
-
             ).then((res) => {
-                this.data = res.data.result.list
+                this.data = res.data.result.list;
                 this.loading = false;
                 this.page.total = res.data.result.total;
-            })
-            this.loading = false;
+
+                // 数据加载完成后，更新当前页面的勾选状态
+                this.$nextTick(() => {
+                    this.updateCurrentPageSelection();
+                });
+            }).catch(error => {
+                this.loading = false;
+                this.$message.error('加载数据失败: ' + error.message);
+            });
         },
+        
+        // 添加一个新方法来更新当前页面的选中状态
+        updateCurrentPageSelection() {
+            if (!this.$refs.crud) return;
+            
+            // 设置标志，表示正在程序化更新选择状态
+            this.isUpdatingSelection = true;
+            
+            const currentPageData = this.data || [];
+            
+            // 先清除所有选择
+            this.$refs.crud.toggleSelection();
+            
+            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);
+            });
+        },
+        
+        handleCancel() {
+            this.$emit('handleCloseDetail');
+        }
     },
 }
 </script>
@@ -375,4 +389,4 @@ export default {
     padding-right: 10px;
     overflow-x: hidden;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/firstOrder/components/needDialog.vue b/src/views/firstOrder/components/needDialog.vue
index 4efd40e..9a9a2e1 100644
--- a/src/views/firstOrder/components/needDialog.vue
+++ b/src/views/firstOrder/components/needDialog.vue
@@ -1,59 +1,91 @@
 <template>
-    <el-dialog :title="purchaseTitle" append-to-body :visible.sync="openShow" width="70%" @close="closeDialog">
+  <el-dialog :title="purchaseTitle" append-to-body :visible.sync="openShow" width="70%" @close="closeDialog">
 
-        <avue-crud :data="data" :option="option"></avue-crud>
-        <!-- <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="closeDialog">取 消</el-button>
-                <el-button type="primary" @click="submit">确 定</el-button>
-            </span>
-        </template> -->
-    </el-dialog>
+    <avue-crud :data="data" :option="option" @current-change="currentChange" @size-change="sizeChange"
+      @refresh-change="refreshChange" :page.sync="page" @on-load="onLoad"></avue-crud>
+  </el-dialog>
 </template>
 <script>
+import { getPutPurchaseList } from "@/api/firstOrder/outbound";
 export default {
-    props: {
-        showDialog: {
-            type: Boolean,
-            default: false
-        },
-        purchaseTitle:{
-          type:String,
-          default:''
-        }
+  props: {
+    showDialog: {
+      type: Boolean,
+      default: false
     },
-    data() {
-        return {
-            openShow:false,
-            option:{
-              menu:false,
-              header:false,
-              align: 'center',
-              column:[
-                {
-                  label:'物品名称',
-                  prop:'wupinmingcheng'
-                }, {
-                  label:'需求数量',
-                  prop:'caigoushuliang'
-                },{
-                  label:'已出库数量',
-                  prop:'yirukushuliang'
-                }
-              ]
-            }
-        }
+    purchaseTitle: {
+      type: String,
+      default: ''
     },
-    mounted(){
-        this.openShow = this.showDialog
+    id: {
+      type: Number,
+      default: 0
+    }
+  },
+  data() {
+    return {
+      openShow: false,
+      data: [],
+      query: {},
+      loading: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      option: {
+        menu: false,
+        header: false,
+        align: 'center',
+        // page: true,
+        column: [
+          {
+            label: '物资名称',
+            prop: 'materialName'
+          }, {
+            label: '计划需求数量',
+            prop: 'requiredQuantity'
+          }, {
+            label: '已出库数量',
+            prop: 'outboundQuantity'
+          }
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.openShow = this.showDialog
 
+  },
+  methods: {
+    closeDialog() {
+      this.openShow = false
+      this.$emit('closeDialog');
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
     },
-    methods:{
-        closeDialog(){
-            this.openShow = false
-            this.$emit('closeDialog');
-        }
+    onLoad(page, params = {}) {
+      this.loading = true;
+      const queryParams = Object.assign(params, this.query, {
+        onePutStorageId: this.id
+      });
+      getPutPurchaseList(page.currentPage, page.pageSize, queryParams).then(res => {
+        console.log('采购单列表', res.data.result)
+        // const data = res.data.data;
+        this.data = res.data.result.list;
+        this.loading = false;
+        this.page.total = res.data.result.total;
+        // this.selectionClear();
+      });
     }
+  }
 }
 </script>
 <style lang="scss" scoped></style>
diff --git a/src/views/firstOrder/components/outDialog.vue b/src/views/firstOrder/components/outDialog.vue
index ca00c9d..ee6a4fb 100644
--- a/src/views/firstOrder/components/outDialog.vue
+++ b/src/views/firstOrder/components/outDialog.vue
@@ -88,7 +88,7 @@
             </el-table-column>
             <el-table-column prop="unit" label="单位">
             </el-table-column>
-            <el-table-column label="部门" prop="departmentName" v-if="sizeForm.options === 2 && sizeForm.optionType"
+            <el-table-column label="部门" prop="departmentName" v-if="sizeForm.options === 2 || sizeForm.optionType"
               :key="'account-dept-' + sizeForm.options">
               <template slot-scope="scope">
                 <el-select v-model="scope.row.department" placeholder="请选择部门名称" style="width: 100%;"
@@ -97,7 +97,7 @@
                     :value="item.departmentId">
                   </el-option>
                 </el-select>
-                <span v-else> {{ scope.row.departmentName }}</span>
+                <span v-else> {{ scope.row.departmentName || '无'}}</span>
               </template>
             </el-table-column>
             <!-- <el-table-column prop="departmentName" label="部门" :key="'account-dept-' + sizeForm.options">
@@ -112,12 +112,16 @@
               </template>
             </el-table-column> -->
             <el-table-column prop="applicationQuantity" label="申请数量" v-if="sizeForm.options == 1">
+              <template slot-scope="scope">
+                {{ scope.row.applicationQuantity || 0 }}
+              </template>
             </el-table-column>
-            <!-- <el-table-column prop="outboundQuantity" label="已出库数量" v-if="sizeForm.options == 1">
+            
+            <el-table-column prop="outboundQuantity" label="已出库数量" v-if="sizeForm.options == 1 ">
               <template slot-scope="scope">
                 {{ scope.row.outboundQuantity || 0 }}
               </template>
-            </el-table-column> -->
+            </el-table-column>
             <el-table-column prop="theOutboundQuantity" label="本次出库数量">
               <template slot-scope="scope">
                 <el-input-number size="mini" v-model="scope.row.theOutboundQuantity" :min="0" style="width: 100%;"
@@ -774,7 +778,7 @@ export default {
           this.sizeForm.demandEndInfo = ldOneOutStorage.demandEndInfo
           this.sizeForm.outDate = ldOneOutStorage.outDate
           this.sizeForm.options = Number(ldOneOutStorage.options)
-
+          // this.sizeForm.optionType = ldOneOutStorage.optionType
           // reason: '',//事由
           // inAccountsTableData: [],//总计
           // inTableData: [],
@@ -862,11 +866,13 @@ export default {
       }
     },
     'sizeForm.optionType': function (newVal) {
-      if (newVal) {
-        this.sizeForm.inTableData = []
-        // this.getMaterialList()
-      }
-    },
+    if (newVal && this.outDialogType === 'add') { 
+      this.sizeForm.inTableData = []
+      this.getMaterialList()
+    } else if (newVal && this.outDialogType !== 'add') {
+      this.getMaterialList()
+    }
+  },
   }
 }
 </script>
diff --git a/src/views/firstOrder/inbound.vue b/src/views/firstOrder/inbound.vue
index b460ef5..e3b1c37 100644
--- a/src/views/firstOrder/inbound.vue
+++ b/src/views/firstOrder/inbound.vue
@@ -17,7 +17,7 @@
       @on-load="onLoad"
     >
       <template slot-scope="scope" slot="menuLeft">
-        <el-button size="small"   type="primary"  @click="handleDesign()"
+        <el-button size="small"  type="primary"  @click="handleDesign()"
           >新增入库单
         </el-button>
       </template>
@@ -279,6 +279,7 @@ export default {
     },
     // 采购单
     purchaseFn(row) {
+      console.log(122)
       this.purchaseOpen = true;
       this.purchaseTitle = row.purchaseEndInfo + "采购单详情";
       this.id = row.id;
diff --git a/src/views/firstOrder/outbound.vue b/src/views/firstOrder/outbound.vue
index 7439531..7f6571b 100644
--- a/src/views/firstOrder/outbound.vue
+++ b/src/views/firstOrder/outbound.vue
@@ -11,10 +11,20 @@
         <!-- <el-button size="small" plain @click="handleExport()">出库单导出
         </el-button> -->
       </template>
-      <template slot-scope="scope" slot="purchaseEndInfo">
-        <el-button type="text" @click.stop="purchaseFn(scope.row)" v-if="scope.row.purchaseEndInfo != '无'">{{
-          scope.row.purchaseEndInfo }}</el-button>
-        <span>{{ scope.row.purchaseEndInfo || '无' }}</span>
+      <!-- <template slot-scope="scope" slot="purchaseEndInfo">
+        <el-button type="text" @click.stop="purchaseFn(scope.row)" 
+          v-if="scope.row.purchaseEndInfo != '无'">
+          {{scope.row.purchaseEndInfo }}</el-button>
+          <span>{{ scope.row.purchaseEndInfo || '无' }}</span>
+      </template> -->
+      <template slot-scope="scope" slot="demandEndInfo">
+        <el-button
+          type="text"
+          @click.stop="purchaseFn(scope.row)"
+          v-if="scope.row.demandEndInfo && scope.row.demandEndInfo !== ''"
+          >{{ scope.row.demandEndInfo }}</el-button
+        >
+        <span v-else>无</span>
       </template>
       <template #menu="scope">
         <el-button type="text" @click.stop="handleDetails(scope.row)">详情</el-button>
@@ -226,8 +236,9 @@ export default {
     },
     // 需求单
     purchaseFn(row) {
+      console.log('xuqiudanchuku')
       this.purchaseOpen = true
-      this.purchaseTitle = row.purchaseEndInfo + '需求单详情'
+      this.purchaseTitle = row.demandEndInfo + '需求单详情'
       this.id = row.id
     },
     closeDialog() {
diff --git a/src/views/materials/index.vue b/src/views/materials/index.vue
index 097f048..d5b4351 100644
--- a/src/views/materials/index.vue
+++ b/src/views/materials/index.vue
@@ -64,12 +64,13 @@ export default {
             align: "center",
           },
           {
-            label: "类别",
+            label: "物资编码",
             prop: "materialCode",
             type: "select",
             headerAlign: "center",
             align: "center",
-            dicData: [],
+            dicData: [
+            ],
             props: {
               label: "label",
               value: "value",
diff --git a/src/views/secondOrder/components/outDialog.vue b/src/views/secondOrder/components/outDialog.vue
index ca96a85..d2a73ab 100644
--- a/src/views/secondOrder/components/outDialog.vue
+++ b/src/views/secondOrder/components/outDialog.vue
@@ -124,9 +124,9 @@
             border
             style="width: 100%"
           >
-            <el-table-column prop="materialCode" label="物资编码" width="100">
+            <el-table-column prop="materialCode" label="物资编码" >
             </el-table-column>
-            <el-table-column prop="str2" label="物资名称" width="140">
+            <el-table-column prop="str2" label="物资名称">
               <template slot-scope="scope">
                 <el-select
                   v-model="scope.row.materialitem"
@@ -150,7 +150,12 @@
               </template>
             </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="类别"> </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>
             <el-table-column prop="unit" label="单位"> </el-table-column>
             <el-table-column prop="num" label="数量">
               <template slot-scope="scope">