From f15747ff8d49d6bf8f11b087f4e6fa8d349413bc Mon Sep 17 00:00:00 2001
From: taozi <1362265981@qq.com>
Date: Thu, 8 Jan 2026 14:03:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=87=BA=E5=BA=93=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/approvalProcessDialog.vue      |  9 +++-
 src/views/firstOrder/components/outDialog.vue | 16 +++---
 .../firstOrder/components/recordDialog.vue    |  6 +--
 src/views/firstOrder/inbound.vue              |  4 ++
 src/views/materials/index.vue                 |  4 ++
 .../secondOrder/components/categoryDialog.vue | 52 ++++++-------------
 .../secondOrder/components/outDialog.vue      | 20 +------
 7 files changed, 45 insertions(+), 66 deletions(-)

diff --git a/src/views/firstOrder/components/approvalProcessDialog.vue b/src/views/firstOrder/components/approvalProcessDialog.vue
index 002be0f..6555a49 100644
--- a/src/views/firstOrder/components/approvalProcessDialog.vue
+++ b/src/views/firstOrder/components/approvalProcessDialog.vue
@@ -89,9 +89,16 @@ export default {
 }
 
 .teps-con {
-  margin: 0 auto 0
+  margin: 0 auto 0;
+  :deep(.el-step) {
+    margin-bottom: 10px; 
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
 }
 
+
 // :deep(.el-dialog__body) {
 //   height: 300px;
 // }
diff --git a/src/views/firstOrder/components/outDialog.vue b/src/views/firstOrder/components/outDialog.vue
index 849305d..fa85953 100644
--- a/src/views/firstOrder/components/outDialog.vue
+++ b/src/views/firstOrder/components/outDialog.vue
@@ -594,20 +594,22 @@ export default {
     },
     getStatistics() {
       getStatistics(this.sizeForm.inTableData).then((res) => {
-        this.statisticsList = res.data.result;
+        this.statisticsList = res.data.result
         this.statisticsList = this.statisticsList.map((stat) => {
           const detail = this.sizeForm.inTableData.find(
             (item) => item.materialCode === stat.materialCode
-          );
-          console.log("detail", detail, stat);
+          )
+          console.log("detail", detail, stat)
           return {
             ...stat,
             theOutboundQuantity: detail.theOutboundQuantity, //本次出库数量
             unitPrice: detail.unitPrice,
             totalQuantity: stat.num - detail.theOutboundQuantity,
-          };
-        });
-      });
+            department: detail.department, // 部门ID
+            departmentName: detail.departmentName || this.getDepartmentName(detail.department),
+          }
+        })
+      })
     },
     changeDepartment(){
       this.getStatistics()
@@ -618,7 +620,7 @@ export default {
     selectionChange(row) {
       this.batchSelectionVisible = false;
       this.sizeForm.inTableData = row;
-       this.getStatistics();
+      this.getStatistics();
     },
     confirm(allSelectedList) {
       this.consumableVisible = false;
diff --git a/src/views/firstOrder/components/recordDialog.vue b/src/views/firstOrder/components/recordDialog.vue
index bb83b87..e7e2346 100644
--- a/src/views/firstOrder/components/recordDialog.vue
+++ b/src/views/firstOrder/components/recordDialog.vue
@@ -5,13 +5,12 @@
     :visible.sync="openShow"
     width="50%"
     @close="closeDialog"
-    :style="{ height: '600px' }" 
   >
     <el-tabs v-model="transactionType" @tab-click="handleTabClick">
       <el-tab-pane label="入库" name="2"></el-tab-pane>
       <el-tab-pane label="出库" name="1"></el-tab-pane>
     </el-tabs>
-
+    <div style="height: 400px; overflow: hidden;">
     <avue-crud
       :data="data"
       :option="dynamicOption"
@@ -23,6 +22,7 @@
       @search-reset="searchReset"
       :page.sync="page"
     ></avue-crud>
+    </div>
   </el-dialog>
 </template>
 
@@ -44,7 +44,7 @@ export default {
   data() {
     return {
       openShow: false,
-      transactionType: "1",
+      transactionType: "2",
       tableData: [],
       purchaseTitle: "记录",
       data: [],
diff --git a/src/views/firstOrder/inbound.vue b/src/views/firstOrder/inbound.vue
index e3b1c37..f75edd9 100644
--- a/src/views/firstOrder/inbound.vue
+++ b/src/views/firstOrder/inbound.vue
@@ -236,6 +236,10 @@ export default {
                 label: "已审批",
                 value: 3,
               },
+              {
+                label: "审批失败",
+                value: 4,
+              },
             ],
           },
         ],
diff --git a/src/views/materials/index.vue b/src/views/materials/index.vue
index 36ad135..b2175df 100644
--- a/src/views/materials/index.vue
+++ b/src/views/materials/index.vue
@@ -76,12 +76,14 @@ export default {
             search: true,
             headerAlign: "center",
             align: "center",
+            rules: [{ required: true, message: "请输入物资名称", trigger: "blur" }]
           },
           {
             label: "规格/型号",
             prop: "model",
             headerAlign: "center",
             align: "center",
+            rules: [{ required: true, message: "请输入规格/型号", trigger: "blur" }]
           },
           {
             label: "物资编码",
@@ -95,12 +97,14 @@ export default {
               value: "value",
             },
             dataType: "string",
+            rules: [{ required: true, message: "请选择物资编码", trigger: "change" }]
           },
           {
             label: "单位",
             prop: "unit",
             headerAlign: "center",
             align: "center",
+            rules: [{ required: true, message: "请输入单位", trigger: "blur" }]
           },
           {
             label: "描述",
diff --git a/src/views/secondOrder/components/categoryDialog.vue b/src/views/secondOrder/components/categoryDialog.vue
index 9e0f06e..2a4f5f3 100644
--- a/src/views/secondOrder/components/categoryDialog.vue
+++ b/src/views/secondOrder/components/categoryDialog.vue
@@ -41,7 +41,6 @@
 <script>
 import { getList } from "@/api/secondOrder/list.js";
 import { getList as fetchDurableApi } from "@/api/materials/expend";
-
 export default {
   props: {
     categoryVisible: {
@@ -53,7 +52,7 @@ export default {
       default: "",
     },
     departmentId: {
-      type: [String, Number],
+      type: String,
       default: "",
     },
     selectionData: {
@@ -196,26 +195,18 @@ export default {
     // 更新当前页面的勾选状态
     updateCurrentPageSelection() {
       if (!this.$refs.crud || !this.data) return;
-
       this.isUpdatingSelection = true;
-
       const currentPageData = this.data || [];
-
-      // 先清除所有选择
       this.$refs.crud.toggleSelection();
-
-      // 检查当前页面的数据中有哪些在 allSelectedList 中
+      console.log(this.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;
@@ -225,66 +216,55 @@ export default {
 
     //勾选选中
     selectionChange(selection,row) {
-
       let isSelectedInfo = selection.filter(
         (item) => item.id==row.id
       );
       if (this.isUpdatingSelection) {
         return;
       }
-
-      // 获取当前页面的数据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, // 当前页面新勾选的数据
-      ];
+        ...otherPageSelected, 
+        ...currentSelected, 
+      ]
 
-      // 去重并更新 allSelectedList
       this.allSelectedList = this.uniqueById(combinedSelection);
-
-      if(isSelectedInfo.length<=0){
-        this.allSelectedList=this.allSelectedList.filter(
-          (item) => item.id!==row.id
+      if(isSelectedInfo.length <= 0){
+        this.allSelectedList = this.allSelectedList.filter(
+          (item) => item.id !== row.id
         );
       }
-      console.log('isSelectedInfo', this.allSelectedList);
       this.allSelectedList.forEach(item=>{
-        item.num = 0
+        item.num = 1
       })
-      // console.log("更新后的allSelectedList:", this.allSelectedList);
     },
 
+
     //去重
     uniqueById(arr) {
       const uniqueObj = {};
       arr.forEach((item) => {
         if (item.id && !uniqueObj[item.id]) {
-          uniqueObj[item.id] = item;
+          uniqueObj[item.id] = item
         }
-      });
-      return Object.values(uniqueObj);
+      })
+      return Object.values(uniqueObj)
     },
 
     //点击确定
     handleConfirm() {
       const uniqueList = this.uniqueById(this.allSelectedList);
       this.$emit("confirm", uniqueList);
+      this.allSelectedList = []
     },
-
-
-
     selectionClear() {
       this.allSelectedList = [];
       if (this.$refs.crud) {
@@ -336,7 +316,7 @@ export default {
         })
         .finally(() => {
           this.loading = false;
-        });
+        })
     },
 
     handleCancel() {
diff --git a/src/views/secondOrder/components/outDialog.vue b/src/views/secondOrder/components/outDialog.vue
index c36aa3e..91fd159 100644
--- a/src/views/secondOrder/components/outDialog.vue
+++ b/src/views/secondOrder/components/outDialog.vue
@@ -411,27 +411,9 @@ export default {
       this.categoryVisible = true;
     },
     confirm(allSelectedList) {
-      console.log("allSelectedList-------", allSelectedList);
-      // this.selectionData = allSelectedList
-      allSelectedList.map((item) => {
-        this.selectionData.push(item);
-      });
+      this.selectionData = allSelectedList
       this.categoryVisible = false;
-      // 去重：过滤已存在的物资
-      const newItems = allSelectedList.filter(
-        (newItem) =>
-          !this.sizeForm.ldTwoOutStorageDetailList.some(
-            (oldItem) => oldItem.id === newItem.id
-          )
-      );
-      // 追加数据
       this.sizeForm.ldTwoOutStorageDetailList = allSelectedList;
-      console.log(
-        "ldTwoOutStorageDetailList--------",
-        this.sizeForm.ldTwoOutStorageDetailList
-      );
-      // 同步库存汇总表
-      // this.summaryTableData();
       this.getStatistics();
     },
     // 删除表格行数据