From e637c7f1cb8b2ba27f896d92d476ebe7e84084b6 Mon Sep 17 00:00:00 2001
From: taozi <1362265981@qq.com>
Date: Tue, 6 Jan 2026 11:01:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E7=BA=A7=E5=BA=93=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/batchSelectionDialog.vue       |   6 +-
 .../components/consumableDialog.vue           | 106 ++++++++--
 src/views/firstOrder/components/outDialog.vue | 196 +++++++++---------
 src/views/materials/expend.vue                |  30 ++-
 src/views/secondOrder/inbound.vue             |   7 +
 src/views/secondOrder/list.vue                |  24 +--
 6 files changed, 237 insertions(+), 132 deletions(-)

diff --git a/src/views/firstOrder/components/batchSelectionDialog.vue b/src/views/firstOrder/components/batchSelectionDialog.vue
index f0eb431..d1a9b74 100644
--- a/src/views/firstOrder/components/batchSelectionDialog.vue
+++ b/src/views/firstOrder/components/batchSelectionDialog.vue
@@ -43,7 +43,7 @@
             <el-table-column label="部门" prop="departmentName"  />
             <el-table-column label="单位" prop="unit"  />
         </el-table>
-         <div style="text-align: right; margin-top: 20px">
+            <div style="text-align: right; margin-top: 20px">
             <el-button @click="handleConfirmSelect">确认选择</el-button>
         </div>
     </el-dialog>
@@ -107,7 +107,7 @@ export default {
         // 监听嵌套表格的勾选事件
         handleSelectionChange(selection, parentRow) {
             console.log('666666',selection, parentRow)
-            // 为勾选的数据补充父行关联信息（可选，根据业务需要）
+            // 为勾选的数据补充父行关联信息
             const selectionWithParent = selection.map(item => ({
                 ...item,
                 parentMaterialId: parentRow.materialId, // 关联父行的物料ID
@@ -148,9 +148,7 @@ export default {
             
             // this.$emit('handleCloseDetail')
             this.$emit('selectionChange', this.selectedRows);
-
         },
-       
         
     },
     mounted() {
diff --git a/src/views/firstOrder/components/consumableDialog.vue b/src/views/firstOrder/components/consumableDialog.vue
index d66afe6..2071594 100644
--- a/src/views/firstOrder/components/consumableDialog.vue
+++ b/src/views/firstOrder/components/consumableDialog.vue
@@ -50,7 +50,7 @@ export default {
                 selection: true,
                 viewBtn: true,
                 dialogClickModal: false,
-                menu: true,
+                menu: false,
                 printBtn: false,
                 refreshBtn: false,
                 gridBtn: false,
@@ -61,6 +61,7 @@ export default {
                 menuAlign: "left",
                 searchMenuPosition: "right",
                 menuWidth: 80,
+                selectable: (row, index) => row.num !== 0,
                 column: [
                     {
                         label: "存货编号",
@@ -84,7 +85,7 @@ export default {
                     {
                         label: "类别",
                         prop: "type",
-                        search: true,
+                        search: false,
                         type: "select",
                         headerAlign: "center",
                         align: "center",
@@ -112,6 +113,9 @@ export default {
                         prop: "num",
                         headerAlign: "center",
                         align: "center",
+                        // selectDisabled: (row) => {
+                        //     return row.num === 0 || row.num === null || row.num === undefined;
+                        // },
                     },
                     {
                         label: "单价",
@@ -119,12 +123,12 @@ export default {
                         headerAlign: "center",
                         align: "center",
                     },
-                    {
-                        label: "金额",
-                        prop: "amount",
-                        headerAlign: "center",
-                        align: "center",
-                    },
+                    // {
+                    //     label: "金额",
+                    //     prop: "amount",
+                    //     headerAlign: "center",
+                    //     align: "center",
+                    // },
                     {
                         label: "描述",
                         prop: "remark",
@@ -250,11 +254,85 @@ export default {
             this.$refs.crud.toggleSelection();
         },
         handleRowChange(row, index, data) {
-            console.log('Selected data:', data);
-            console.log('select row', row)
-            // 切换页面要判断当前页面数据是否在已勾选的数据中，如果在则勾选，否则不勾选
-
+            // 切换页面保持勾选状态（仅保留有效行）
+            this.$nextTick(() => {
+                const currentPageData = this.data
+                console.log(this.data,0)
+                this.$refs.crud.toggleAllSelection(false);
+                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 === '')
+                    );
+                    if (isSelected) {
+                        this.$refs.crud.toggleRowSelection(item, true);
+                    }
+                });
+            });
         },
+        //         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()
@@ -273,7 +351,7 @@ export default {
                 page.currentPage,
                 page.pageSize,
                 Object.assign(params, this.query)
-                
+
             ).then((res) => {
                 this.data = res.data.result.list
                 this.loading = false;
@@ -283,8 +361,6 @@ export default {
         },
     },
 }
-
-
 </script>
 <style lang="scss" scoped>
 ::v-deep.el-dialog__footer {
diff --git a/src/views/firstOrder/components/outDialog.vue b/src/views/firstOrder/components/outDialog.vue
index 6452c9c..ca00c9d 100644
--- a/src/views/firstOrder/components/outDialog.vue
+++ b/src/views/firstOrder/components/outDialog.vue
@@ -36,7 +36,7 @@
               <el-form-item label="选项">
                 <el-radio-group v-model="sizeForm.options" @change="radioChange()"
                   :disabled="outDialogType == 'details'">
-                  <el-radio :label="1" :disabled="sizeForm.type == 2"><span >批量选择</span></el-radio>
+                  <el-radio :label="1" :disabled="sizeForm.type == 2"><span>批量选择</span></el-radio>
                   <el-radio :label="2">单项选择</el-radio>
                 </el-radio-group>
               </el-form-item>
@@ -92,7 +92,7 @@
               :key="'account-dept-' + sizeForm.options">
               <template slot-scope="scope">
                 <el-select v-model="scope.row.department" placeholder="请选择部门名称" style="width: 100%;"
-                  v-if='inDialogType != "details"'>
+                  v-if='outDialogType != "details"'>
                   <el-option v-for="item in list" :key="item.departmentId" :label="item.department"
                     :value="item.departmentId">
                   </el-option>
@@ -100,6 +100,17 @@
                 <span v-else> {{ scope.row.departmentName }}</span>
               </template>
             </el-table-column>
+            <!-- <el-table-column prop="departmentName" label="部门" :key="'account-dept-' + sizeForm.options">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.department" placeholder="请选择部门名称" style="width: 100%;"
+                  v-if='outDialogType != "details" && sizeForm.options === 2 && sizeForm.optionType'>
+                  <el-option v-for="item in list" :key="item.departmentId" :label="item.department"
+                    :value="item.departmentId">
+                  </el-option>
+                </el-select>
+                <span v-else>{{ scope.row.departmentName }}</span>
+              </template>
+            </el-table-column> -->
             <el-table-column prop="applicationQuantity" label="申请数量" v-if="sizeForm.options == 1">
             </el-table-column>
             <!-- <el-table-column prop="outboundQuantity" label="已出库数量" v-if="sizeForm.options == 1">
@@ -111,7 +122,7 @@
               <template slot-scope="scope">
                 <el-input-number size="mini" v-model="scope.row.theOutboundQuantity" :min="0" style="width: 100%;"
                   @change="syncInboundQuantity(scope.row)" :disabled="outDialogType == 'details'"
-                  v-if="sizeForm.optionType === 'YH' ||inBatchForm.optionType === 'YH'"></el-input-number>
+                  v-if="sizeForm.optionType === 'YH' || inBatchForm.optionType === 'YH'"></el-input-number>
                 <span v-else>{{ scope.row.theOutboundQuantity = 1 }}</span>
               </template>
             </el-table-column>
@@ -219,9 +230,11 @@
     <consumableDialog v-if="consumableVisible" :consumableVisible='consumableVisible'
       :demandDialogTitle="demandDialogTitle" @handleCloseDetail="handleCloseDetail" @confirm="confirm">
     </consumableDialog>
+    <!-- 批量耐用品弹窗 -->
     <batchSelectionDialog v-if="batchSelectionVisible" :batchSelectionVisible='batchSelectionVisible'
-      :batchSelectionTitle="batchSelectionTitle" :tableData="batchTableData"  
-      @batchclose="batchclose" :inBatchForm="inBatchForm"   @confirm-selection="handleConfirmSelection" @selectionChange="selectionChange"></batchSelectionDialog>
+      :batchSelectionTitle="batchSelectionTitle" :tableData="batchTableData" @batchclose="batchclose"
+      :inBatchForm="inBatchForm" @confirm-selection="handleConfirmSelection" @selectionChange="selectionChange">
+    </batchSelectionDialog>
   </div>
 
 </template>
@@ -319,7 +332,7 @@ export default {
     }
   },
   mounted() {
-    
+
     this.outDialogVisible = this.repairVisible
     if (this.outDialogType == 'add') {
       this.addInit()
@@ -333,9 +346,9 @@ export default {
     batchclose() {
       this.batchSelectionVisible = false
     },
-    selectionChange(row){
+    selectionChange(row) {
       this.batchSelectionVisible = false
-      this.sizeForm.inTableData=row
+      this.sizeForm.inTableData = row
     },
     confirm(allSelectedList) {
       this.consumableVisible = false
@@ -552,79 +565,79 @@ export default {
     //   }
 
     // },
-async batchSubmit() {
-  if (!this.inBatchForm.batchType) {
-    this.$message.error('请选择需求单');
-    return;
-  }
-  if (!this.inBatchForm.department) {
-    this.$message.error('请选择部门');
-    return;
-  }
-  if (!this.inBatchForm.optionType) {
-    this.$message.error('请选择类别');
-    return;
-  }
+    async batchSubmit() {
+      if (!this.inBatchForm.batchType) {
+        this.$message.error('请选择需求单');
+        return;
+      }
+      if (!this.inBatchForm.department) {
+        this.$message.error('请选择部门');
+        return;
+      }
+      if (!this.inBatchForm.optionType) {
+        this.$message.error('请选择类别');
+        return;
+      }
 
-  const requestParams = {
-    ids: this.inBatchForm.batchType,
-    departmentId: this.inBatchForm.department,
-    optionType: this.inBatchForm.optionType,
-  };
+      const requestParams = {
+        ids: this.inBatchForm.batchType,
+        departmentId: this.inBatchForm.department,
+        optionType: this.inBatchForm.optionType,
+      };
 
-  try {
-    let res;
-    if (this.inBatchForm.optionType === 'YH') {
-      res = await getDetailedList(requestParams);
-    } else if (this.inBatchForm.optionType === 'NY') {
-      res = await batchList(requestParams);
-    }
+      try {
+        let res;
+        if (this.inBatchForm.optionType === 'YH') {
+          res = await getDetailedList(requestParams);
+        } else if (this.inBatchForm.optionType === 'NY') {
+          res = await batchList(requestParams);
+        }
 
-    if (res.data && res.data.result) {
-      this.sizeForm.inTableData = res.data.result;
-      const selectedDept = this.departmentList.find(
-        dept => dept.departmentId === this.inBatchForm.department
-      );
-      const deptName = selectedDept ? selectedDept.department : '';
-      
-      this.sizeForm.inTableData = res.data.result.map(item => ({
-        ...item,
-        IdDemandEndld: this.inBatchForm.batchType,
-        department: deptName
-      }));
-      
-      // 关闭批量选择弹窗
-      this.inBatchDialogVisible = false;
-      
-      // 设置需求单名称
-      const selectedQuarter = this.quarterList.find(
-        item => item.ids === this.inBatchForm.batchType
-      );
-      if (selectedQuarter) {
-        this.sizeForm.demandEndInfo = selectedQuarter.quarterName;
-      }
+        if (res.data && res.data.result) {
+          this.sizeForm.inTableData = res.data.result;
+          const selectedDept = this.departmentList.find(
+            dept => dept.departmentId === this.inBatchForm.department
+          );
+          const deptName = selectedDept ? selectedDept.department : '';
 
-      // 耐用品特殊处理（打开批量选择弹窗）
-      if (this.inBatchForm.optionType === 'NY') {
-        console.log(this.inBatchForm.optionType, 'this.inBatchForm.optionType')
-        this.batchSelectionVisible = true;
-        this.dialogVisible = true;
-        console.log(1)
-        this.batchTableData = res.data.result;
-      }
+          this.sizeForm.inTableData = res.data.result.map(item => ({
+            ...item,
+            IdDemandEndld: this.inBatchForm.batchType,
+            department: deptName
+          }));
 
-      // 强制更新视图
-      this.$nextTick(() => {
-        this.$forceUpdate();
-      });
-    } else {
-      this.$message.warning('未获取到详细数据');
-    }
-  } catch (error) {
-    this.$message.error(`获取${this.inBatchForm.optionType === 'YH' ? '易耗品' : '耐用品'}数据失败：${error.message}`);
-    console.error('批量提交接口调用失败：', error);
-  }
-},
+          // 关闭批量选择弹窗
+          this.inBatchDialogVisible = false;
+
+          // 设置需求单名称
+          const selectedQuarter = this.quarterList.find(
+            item => item.ids === this.inBatchForm.batchType
+          );
+          if (selectedQuarter) {
+            this.sizeForm.demandEndInfo = selectedQuarter.quarterName;
+          }
+
+          // 耐用品特殊处理（打开批量选择弹窗）
+          if (this.inBatchForm.optionType === 'NY') {
+            console.log(this.inBatchForm.optionType, 'this.inBatchForm.optionType')
+            this.batchSelectionVisible = true;
+            this.dialogVisible = true;
+            console.log(1)
+            this.batchTableData = res.data.result;
+          }
+
+          // 强制更新视图
+          this.$nextTick(() => {
+            this.$forceUpdate();
+          });
+        } else {
+          this.$message.warning('未获取到详细数据');
+        }
+      } catch (error) {
+        this.$message.error(`获取${this.inBatchForm.optionType === 'YH' ? '易耗品' : '耐用品'}数据失败：${error.message}`);
+        console.error('批量提交接口调用失败：', error);
+      }
+    },
     //批量选择耐用品选择回调函数
     goodsListSelectionChange(val) {
       this.goodsSelectList = val
@@ -754,7 +767,6 @@ async batchSubmit() {
         editList(this.id).then(res => {
           console.log(res.data.result, '详情数据')
           const { ldOneOutStorage, ldOneOutStorageDetails } = res.data.result || {};
-          
           // this.sizeForm = res.data.result.ldOneOutStorage
           this.sizeForm.inTableData = res.data.result.ldOneOutStorageDetails
           this.sizeForm.orderNo = ldOneOutStorage.orderNo
@@ -763,21 +775,19 @@ async batchSubmit() {
           this.sizeForm.outDate = ldOneOutStorage.outDate
           this.sizeForm.options = Number(ldOneOutStorage.options)
 
-        // reason: '',//事由
-        // inAccountsTableData: [],//总计
-        // inTableData: [],
-        // ldOneOutStorageDetailVOList: [],
-        // demandEndInfo: '',//需求单名称
-        // outDate: '',//出库时间
-        // options: 2,//出库类型
-        // optionType: '', // 1易耗品 2耐用品
-        // materialType: '1',//物资类型
-        // status: '',//1暂存 2提交
-        // materialld: '',//物资Id
-          this.$set(this.sizeForm,'inTableData',res.data.result.ldOneOutStorageDetails)
+          // reason: '',//事由
+          // inAccountsTableData: [],//总计
+          // inTableData: [],
+          // ldOneOutStorageDetailVOList: [],
+          // demandEndInfo: '',//需求单名称
+          // outDate: '',//出库时间
+          // options: 2,//出库类型
+          // optionType: '', // 1易耗品 2耐用品
+          // materialType: '1',//物资类型
+          // status: '',//1暂存 2提交
+          // materialld: '',//物资Id
+          this.$set(this.sizeForm, 'inTableData', res.data.result.ldOneOutStorageDetails)
           console.log(this.sizeForm, '111')
-
-
         })
       }
     },
@@ -822,7 +832,7 @@ async batchSubmit() {
         this.getQuarterList()
         this.inBatchDialogVisible = true
         this.inBatchForm.batchType = '',
-        this.inBatchForm.department = ''
+          this.inBatchForm.department = ''
         this.inBatchForm.optionType = ''
       }
     },
@@ -833,7 +843,7 @@ async batchSubmit() {
     //   this.sizeForm.inTableData = []
     //   this.getQuarterList()
     //   this.inBatchDialogVisible = true
-      
+
     //   // this.sizeForm.inTableData = []   
     // },
     // 删除表格行数据
diff --git a/src/views/materials/expend.vue b/src/views/materials/expend.vue
index f940025..df19ab9 100644
--- a/src/views/materials/expend.vue
+++ b/src/views/materials/expend.vue
@@ -156,11 +156,11 @@ export default {
             dicDta: [
               {
                 label: "易耗品",
-                value: "1",
+                value: "YH",
               },
               {
                 label: "耐用品",
-                value: "2",
+                value: "NY",
               },
             ],
           },
@@ -182,12 +182,12 @@ export default {
             headerAlign: "center",
             align: "center",
           },
-          {
-            label: "金额",
-            prop: "amount",
-            headerAlign: "center",
-            align: "center",
-          },
+          // {
+          //   label: "金额",
+          //   prop: "amount",
+          //   headerAlign: "center",
+          //   align: "center",
+          // },
           {
             label: "状态",
             prop: "isBorrow",
@@ -208,12 +208,26 @@ export default {
                 value: "2",
               },
             ],
+            formatter: (row, column) => {
+              const value = row.purchaseEndInfo;
+              if (value === null || value === undefined || value === "") {
+                return "无"; // 空值时显示“无”
+              }
+              return value; // 有值时显示原内容
+            }
           },
           {
             label: "归还时间",
             prop: "returnTime",
             headerAlign: "center",
             align: "center",
+            formatter: (row, column) => {
+              const value = row.returnTime;
+              if (value === null || value === undefined || value === "") {
+                return "无"; // 空值时显示“无”
+              }
+              return value; // 有值时显示原内容
+            }
           },
         ],
       },
diff --git a/src/views/secondOrder/inbound.vue b/src/views/secondOrder/inbound.vue
index 7df0c9a..518ae67 100644
--- a/src/views/secondOrder/inbound.vue
+++ b/src/views/secondOrder/inbound.vue
@@ -111,6 +111,13 @@ export default {
             width: 180,
             headerAlign: "center",
             align: "center",
+            formatter: (row, column) => {
+              const value = row.demandEndInfo;
+              if (value === null || value === undefined || value === "") {
+                return "无"; // 空值时显示“无”
+              }
+              return value; // 有值时显示原内容
+            }
           },
           // {
           //   label: "仓库类型",
diff --git a/src/views/secondOrder/list.vue b/src/views/secondOrder/list.vue
index 1e5d7e1..7283a13 100644
--- a/src/views/secondOrder/list.vue
+++ b/src/views/secondOrder/list.vue
@@ -135,18 +135,18 @@ export default {
             headerAlign: "center",
             align: "center",
           },
-          {
-            label: "单价",
-            prop: "unitPrice",
-            headerAlign: "center",
-            align: "center",
-          },
-          {
-            label: "金额",
-            prop: "amount",
-            headerAlign: "center",
-            align: "center",
-          },
+          // {
+          //   label: "单价",
+          //   prop: "unitPrice",
+          //   headerAlign: "center",
+          //   align: "center",
+          // },
+          // {
+          //   label: "金额",
+          //   prop: "amount",
+          //   headerAlign: "center",
+          //   align: "center",
+          // },
         ],
       },
       data: [],