From 221d087166eb1359614cebc9944bd471a4029bcb Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Mon, 25 May 2026 17:36:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=95=B0=E6=8D=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/firstOrder/components/inDialog.vue | 58 +++++++++++++++-----
 1 file changed, 43 insertions(+), 15 deletions(-)

diff --git a/src/views/firstOrder/components/inDialog.vue b/src/views/firstOrder/components/inDialog.vue
index 2190604..c0d9375 100644
--- a/src/views/firstOrder/components/inDialog.vue
+++ b/src/views/firstOrder/components/inDialog.vue
@@ -155,7 +155,6 @@
               label="已入库数量"
               v-if="sizeForm.option == 1"
             >
-
             </el-table-column>
             <el-table-column prop="theInboundQuantity" label="本次入库数量">
               <template slot-scope="scope">
@@ -392,8 +391,12 @@
       </div>
       <span slot="footer" class="dialog-footer" v-if="!allDisabled">
         <el-button @click="handleCloseDetail()">取 消</el-button>
-        <el-button type="primary" @click="submit(1)" :loading="isSubmitting">暂存</el-button>
-        <el-button type="primary" @click="submit(2)" :loading="isSubmitting">提交</el-button>
+        <el-button type="primary" @click="submit(1)" :loading="isSubmitting"
+          >暂存</el-button
+        >
+        <el-button type="primary" @click="submit(2)" :loading="isSubmitting"
+          >提交</el-button
+        >
       </span>
     </el-dialog>
 
@@ -465,7 +468,7 @@ export default {
   },
   data() {
     return {
-      isSubmitting:false,
+      isSubmitting: false,
       inDialogVisible: false,
       sizeForm: {
         orderNo: "", //入库单号
@@ -526,11 +529,24 @@ export default {
             (item) =>
               item.materialCode === stat.materialCode && item.type === stat.type
           );
+          
+          if (stat.type == "YH") {
+            stat.theInboundQuantity = detail.theInboundQuantity; //本次入库数量
+            stat.totalQuantity = stat.num + detail.theInboundQuantity;
+            stat.unitPrice = detail.unitPrice;
+          }
+          if (stat.type == "NY" && stat.num == 0) {
+            stat.theInboundQuantity = detail.theInboundQuantity; //本次入库数量
+            stat.totalQuantity = stat.num + detail.theInboundQuantity;
+            stat.unitPrice = detail.unitPrice;
+          } else {
+            stat.theInboundQuantity = 0; //本次入库数
+            stat.unitPrice = stat.unitPrice;
+            stat.totalQuantity = stat.num + detail.theInboundQuantity;
+          }
+
           return {
             ...stat,
-            theInboundQuantity: detail.theInboundQuantity, //本次入库数量
-            unitPrice: detail.unitPrice,
-            totalQuantity: stat.num + detail.theInboundQuantity,
           };
         });
       });
@@ -544,11 +560,23 @@ export default {
             (item) =>
               item.materialId === stat.materialId && item.type === stat.type
           );
+            if (stat.type == "YH") {
+            stat.theInboundQuantity = detail.theInboundQuantity; //本次入库数量
+            stat.totalQuantity = stat.num + detail.theInboundQuantity;
+            stat.unitPrice = detail.unitPrice;
+          }
+          if (stat.type == "NY" && stat.num == 0) {
+            stat.theInboundQuantity = detail.theInboundQuantity; //本次入库数量
+            stat.totalQuantity = stat.num + detail.theInboundQuantity;
+            stat.unitPrice = detail.unitPrice;
+          } else {
+            stat.theInboundQuantity = 0; //本次入库数
+            stat.unitPrice = stat.unitPrice;
+            stat.totalQuantity = stat.num + detail.theInboundQuantity;
+          }
+
           return {
             ...stat,
-            theInboundQuantity: detail.theInboundQuantity, //本次入库数量
-            unitPrice: detail.unitPrice,
-            totalQuantity: stat.num + detail.theInboundQuantity,
           };
         });
       });
@@ -844,7 +872,7 @@ export default {
       }
 
       // status == 1 暂存 ，2提交
-      this.isSubmitting = true
+      this.isSubmitting = true;
       this.sizeForm.status = index;
       if (this.sizeForm.option == 1) {
         // this.sizeForm.singleData = [];
@@ -868,13 +896,13 @@ export default {
           // 提交成功后通知父组件更新页面
           this.$emit("submitSuccess");
           this.handleCloseDetail();
-          this.isSubmitting = false
+          this.isSubmitting = false;
         } else {
           this.$message.error(res.data.message);
-          this.isSubmitting = false
+          this.isSubmitting = false;
         }
       } catch (error) {
-        this.isSubmitting = false
+        this.isSubmitting = false;
         this.$message.error(error.message);
       }
     },
@@ -884,7 +912,7 @@ export default {
       this.batchType = "";
       this.sizeForm.inTableData = [];
       this.sizeForm.singleData = [];
-       this.sizeForm.purchaseEndInfo = "";
+      this.sizeForm.purchaseEndInfo = "";
       if (this.sizeForm.option == 1) {
         this.inBatchDialogVisible = true;
       }