From 359cd02a560956e0136d6a7b33159338ce624edd Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Wed, 4 Feb 2026 16:39:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=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/inDialog.vue | 162 +++----------------
src/views/firstOrder/inbound.vue | 2 +-
2 files changed, 21 insertions(+), 143 deletions(-)
diff --git a/src/views/firstOrder/components/inDialog.vue b/src/views/firstOrder/components/inDialog.vue
index 4856f33..d6eed26 100644
--- a/src/views/firstOrder/components/inDialog.vue
+++ b/src/views/firstOrder/components/inDialog.vue
@@ -151,13 +151,11 @@
-
- {{ scope.row.inboundQuantity || 0 }}
-
+
@@ -272,6 +270,9 @@
label="已入库数量"
v-if="sizeForm.option == 1"
>
+
+ {{ scope.row.inboundQuantity || 0 }}
+
@@ -305,134 +306,6 @@
入库账目表格：
-
-
-
-
@@ -592,6 +465,7 @@ export default {
},
data() {
return {
+ isSubmitting:false,
inDialogVisible: false,
sizeForm: {
orderNo: "", //入库单号
@@ -816,7 +690,7 @@ export default {
this.sizeForm.inTableData = res.data.result;
this.sizeForm.inTableData.forEach((item) => {
// item.theInboundQuantity = 0;
- this.$set(item,'theInboundQuantity',0)
+ this.$set(item, "theInboundQuantity", 0);
if (item.type == "YH") {
item.unitPrice = 0;
}
@@ -919,11 +793,11 @@ export default {
return;
}
if (
- row.theInboundQuantity + row.inboundQuantity >
+ row.theInboundQuantity + row.yetInboundQuantity >
row.requiredQuantity &&
!row.remark
) {
- this.$message.error(
+ this.$message.warning(
row.materialName +
"本次入库数量不能大于采购单计划数量,请填写备注原因"
);
@@ -965,18 +839,19 @@ export default {
}
// status == 1 暂存 ，2提交
+ this.isSubmitting = true
this.sizeForm.status = index;
if (this.sizeForm.option == 1) {
- this.sizeForm.singleData = [];
+ // this.sizeForm.singleData = [];
this.sizeForm.ldOnePutStorageDetailVOList = this.sizeForm.inTableData;
this.sizeForm.options = this.sizeForm.option;
this.sizeForm.purchaseEndInfo = this.sizeForm.quarterName;
- this.sizeForm.option = "";
+ // this.sizeForm.option = "";
} else if (this.sizeForm.option == 2) {
this.sizeForm.inTableData = [];
this.sizeForm.ldOnePutStorageDetailVOList = this.sizeForm.singleData;
this.sizeForm.options = this.sizeForm.option;
- this.sizeForm.option = "";
+ // this.sizeForm.option = "";
}
try {
const res = await submitData(this.sizeForm);
@@ -988,11 +863,14 @@ export default {
// 提交成功后通知父组件更新页面
this.$emit("submitSuccess");
this.handleCloseDetail();
+ this.isSubmitting = false
} else {
- this.$message.error(res.data.message || "提交失败");
+ this.$message.error(res.data.message);
+ this.isSubmitting = false
}
} catch (error) {
- this.$message.error(error.message || "服务器错误");
+ this.isSubmitting = false
+ this.$message.error(error.message);
}
},
diff --git a/src/views/firstOrder/inbound.vue b/src/views/firstOrder/inbound.vue
index feb042b..2e9ae2e 100644
--- a/src/views/firstOrder/inbound.vue
+++ b/src/views/firstOrder/inbound.vue
@@ -342,7 +342,7 @@ export default {
},
//新增提交或暂存后更新页面
handleSubmitSuccess() {
- this.onLoad(this.page);
+ this.onLoad(this.page, this.query);
},
//请求列表数据
onLoad(page, params = {}) {