From ba067924020f4fc1091b8b04c748a76e9be200ad Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Wed, 11 Feb 2026 11:55:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/firstOrder/components/outDialog.vue |  6 ++++-
 src/views/secondOrder/components/inDialog.vue | 22 +++++++++++--------
 .../secondOrder/components/outDialog.vue      |  1 +
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/views/firstOrder/components/outDialog.vue b/src/views/firstOrder/components/outDialog.vue
index f1d8d80..5ed3c09 100644
--- a/src/views/firstOrder/components/outDialog.vue
+++ b/src/views/firstOrder/components/outDialog.vue
@@ -580,6 +580,7 @@ export default {
                 item.materialCode === stat.materialCode &&
                 item.materialName === stat.materialName
             );
+            console.log(898989,detailList)
             detail.theOutboundQuantity = detailList.reduce(
               (acc, cur) => acc + cur.num,
               0
@@ -904,13 +905,16 @@ export default {
           const deptId = row.department;
           const dept = this.list.find((item) => item.departmentId === deptId);
           const oneFormId = row.id;
+          let select = this.materials.find(
+            (item) => item.materialId === row.materialId
+          );
           return {
             ...row,
             department:
               this.sizeForm.options == "1" ? arr.departmentId : deptId,
             departmentName:
               this.sizeForm.options == "1" ? arr.department : dept.department,
-            oneFormId: oneFormId,
+            oneFormId: select.id,
           };
         }
       );
diff --git a/src/views/secondOrder/components/inDialog.vue b/src/views/secondOrder/components/inDialog.vue
index 81e519d..c94c2bf 100644
--- a/src/views/secondOrder/components/inDialog.vue
+++ b/src/views/secondOrder/components/inDialog.vue
@@ -18,14 +18,14 @@
       >
         <div class="form-title">基本信息</div>
         <el-row>
-          <el-col :span="12">
+          <!-- <el-col :span="12" v-if="sizeForm.ldTwoPutStorage.warehouseName">
             <el-form-item label="仓库名称">
               <el-input
                 v-model="sizeForm.ldTwoPutStorage.warehouseName"
                 :disabled="true"
               ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="入库单号">
               <el-input
@@ -117,13 +117,13 @@ export default {
     return {
       inDialogVisible: false,
       sizeForm: {
-        code: "", //入库单号
-        applyNmae: "", //审批人
-        submitName: "", //填报人
-        waNmae: "", //仓库名称
-        argument: "", //事由
-        inTableData: [],
-        userInfoVO: {},
+        // code: "", //入库单号
+        // applyNmae: "", //审批人
+        // submitName: "", //填报人
+        // waNmae: "", //仓库名称
+        // argument: "", //事由
+        // inTableData: [],
+        // userInfoVO: {},
       },
     };
   },
@@ -140,6 +140,7 @@ export default {
   mounted() {
     this.inDialogVisible = this.repairVisible;
      this.sizeForm.userInfoVO = this.userInfo;
+     console.log(this.userInfo,'userInfo');
     if (this.inDialogType == "add") {
       this.addInit();
     } else {
@@ -151,6 +152,7 @@ export default {
     inInit() {
       getDetails({ twoPutStorageId: this.inDialogData.id }).then((res) => {
         this.sizeForm = res.data.result;
+        this.sizeForm.userInfoVO = this.userInfo;
       });
     },
     addInit() {
@@ -175,7 +177,9 @@ export default {
     sumbit() {
       let query = {
         ...this.sizeForm,
+        userInfoVO:this.sizeForm.userInfoVO,
       };
+      console.log("提交参数：", this.sizeForm);
       submit(query).then((res) => {
         this.$message({
           type: "success",
diff --git a/src/views/secondOrder/components/outDialog.vue b/src/views/secondOrder/components/outDialog.vue
index b2ede06..a99da17 100644
--- a/src/views/secondOrder/components/outDialog.vue
+++ b/src/views/secondOrder/components/outDialog.vue
@@ -504,6 +504,7 @@ export default {
       this.inInit();
     }
     this.sizeForm.userInfoVO = this.userInfo;
+    console.log(this.userInfo,'userInfo');
     this.getDetailedItems();
     this.getOutGroupName();
   },