一级库出库调整

src/views/firstOrder/components/batchSelectionDialog.vue

@@ -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,10 +148,8 @@ export default {
             
             // this.$emit('handleCloseDetail')
             this.$emit('selectionChange', this.selectedRows);
-
         },
         
-        
     },
     mounted() {
         console.log(9999999,this.inBatchForm)

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: "金额",
+                    //     label: "金额",
-                        prop: "amount",
+                    //     prop: "amount",
-                        headerAlign: "center",
+                    //     headerAlign: "center",
-                        align: "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()
@@ -283,8 +361,6 @@ export default {
         },
     },
 }
-
-
 </script>
 <style lang="scss" scoped>
 ::v-deep.el-dialog__footer {

src/views/firstOrder/components/outDialog.vue

@@ -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">
@@ -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"  
+      :batchSelectionTitle="batchSelectionTitle" :tableData="batchTableData" @batchclose="batchclose"
-      @batchclose="batchclose" :inBatchForm="inBatchForm"   @confirm-selection="handleConfirmSelection" @selectionChange="selectionChange"></batchSelectionDialog>
+      :inBatchForm="inBatchForm" @confirm-selection="handleConfirmSelection" @selectionChange="selectionChange">
+    </batchSelectionDialog>
   </div>
 
 </template>
@@ -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
@@ -776,8 +788,6 @@ async batchSubmit() {
           // materialld: '',//物资Id
           this.$set(this.sizeForm, 'inTableData', res.data.result.ldOneOutStorageDetails)
           console.log(this.sizeForm, '111')
-
-
         })
       }
     },

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: "金额",
+          //   label: "金额",
-            prop: "amount",
+          //   prop: "amount",
-            headerAlign: "center",
+          //   headerAlign: "center",
-            align: "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; // 有值时显示原内容
+            }
           },
         ],
       },

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: "仓库类型",

src/views/secondOrder/list.vue

@@ -135,18 +135,18 @@ export default {
             headerAlign: "center",
             align: "center",
           },
-          {
+          // {
-            label: "单价",
+          //   label: "单价",
-            prop: "unitPrice",
+          //   prop: "unitPrice",
-            headerAlign: "center",
+          //   headerAlign: "center",
-            align: "center",
+          //   align: "center",
-          },
+          // },
-          {
+          // {
-            label: "金额",
+          //   label: "金额",
-            prop: "amount",
+          //   prop: "amount",
-            headerAlign: "center",
+          //   headerAlign: "center",
-            align: "center",
+          //   align: "center",
-          },
+          // },
         ],
       },
       data: [],