From eff6968666db6d5efb56135884c24d572d3b9b7c Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 08 八月 2026 16:17:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_祥雨远见科技' into dev_长治_祥雨远见科技
---
src/views/qualityManagement/processInspection/components/formDia.vue | 11 ++++++++++-
src/views/qualityManagement/finalInspection/components/formDia.vue | 11 ++++++++++-
src/views/qualityManagement/rawMaterialInspection/components/formDia.vue | 11 ++++++++++-
src/views/productionManagement/workOrderManagement/index.vue | 10 ++++++++++
4 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/src/views/productionManagement/workOrderManagement/index.vue b/src/views/productionManagement/workOrderManagement/index.vue
index 1082f08..9a76761 100644
--- a/src/views/productionManagement/workOrderManagement/index.vue
+++ b/src/views/productionManagement/workOrderManagement/index.vue
@@ -172,6 +172,7 @@
<template #footer>
<span class="dialog-footer">
<el-button type="primary"
+ :loading="reportSubmitting"
@click="handleReport">纭畾</el-button>
<el-button @click="reportDialogVisible = false">鍙栨秷</el-button>
</span>
@@ -316,6 +317,7 @@
const transferCardQrUrl = ref("");
const transferCardRowData = ref(null);
const reportDialogVisible = ref(false);
+ const reportSubmitting = ref(false);
const workOrderFilesRef = ref(null);
const reportFormRef = ref(null);
const userOptions = ref([]);
@@ -575,6 +577,9 @@
};
const handleReport = () => {
+ if (reportSubmitting.value) {
+ return;
+ }
reportFormRef.value?.validate(valid => {
if (!valid) {
return false;
@@ -642,6 +647,8 @@
productMainId: reportForm.productMainId,
};
+ reportSubmitting.value = true;
+
addProductMain(params)
.then(res => {
proxy.$modal.msgSuccess("鎶ュ伐鎴愬姛");
@@ -652,6 +659,9 @@
// ElMessageBox.alert("鎶ュ伐澶辫触", "鎻愮ず", {
// confirmButtonText: "纭畾",
// });
+ })
+ .finally(() => {
+ reportSubmitting.value = false;
});
});
};
diff --git a/src/views/qualityManagement/finalInspection/components/formDia.vue b/src/views/qualityManagement/finalInspection/components/formDia.vue
index 5f4c975..ff2040c 100644
--- a/src/views/qualityManagement/finalInspection/components/formDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/formDia.vue
@@ -114,7 +114,7 @@
</PIMTable>
<template #footer>
<div class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭</el-button>
+ <el-button type="primary" :loading="submitting" @click="submitForm">纭</el-button>
<el-button @click="closeDia">鍙栨秷</el-button>
</div>
</template>
@@ -134,6 +134,7 @@
const emit = defineEmits(['close'])
const dialogFormVisible = ref(false);
+const submitting = ref(false);
const operationType = ref('')
const data = reactive({
form: {
@@ -343,6 +344,9 @@
}
// 鎻愪氦浜у搧琛ㄥ崟
const submitForm = () => {
+ if (submitting.value) {
+ return;
+ }
proxy.$refs.formRef.validate(valid => {
if (valid) {
form.value.inspectType = 2
@@ -352,15 +356,20 @@
})
}
const data = {...form.value, qualityInspectParams: tableData.value}
+ submitting.value = true;
if (operationType.value === "add") {
qualityInspectAdd(data).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeDia();
+ }).catch(() => {}).finally(() => {
+ submitting.value = false;
})
} else {
qualityInspectUpdate(data).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeDia();
+ }).catch(() => {}).finally(() => {
+ submitting.value = false;
})
}
}
diff --git a/src/views/qualityManagement/processInspection/components/formDia.vue b/src/views/qualityManagement/processInspection/components/formDia.vue
index c1185d2..3bc94c0 100644
--- a/src/views/qualityManagement/processInspection/components/formDia.vue
+++ b/src/views/qualityManagement/processInspection/components/formDia.vue
@@ -123,7 +123,7 @@
</PIMTable>
<template #footer>
<div class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭</el-button>
+ <el-button type="primary" :loading="submitting" @click="submitForm">纭</el-button>
<el-button @click="closeDia">鍙栨秷</el-button>
</div>
</template>
@@ -146,6 +146,7 @@
const dialogFormVisible = ref(false);
+const submitting = ref(false);
const operationType = ref('')
const data = reactive({
form: {
@@ -373,6 +374,9 @@
// 宸ュ簭鍙樺寲澶勭悊
// 鎻愪氦浜у搧琛ㄥ崟
const submitForm = () => {
+ if (submitting.value) {
+ return;
+ }
proxy.$refs.formRef.validate(valid => {
if (valid) {
form.value.inspectType = 1
@@ -387,15 +391,20 @@
process: processName, // 淇濈暀 process 瀛楁浠ュ吋瀹瑰悗绔�
qualityInspectParams: tableData.value
}
+ submitting.value = true;
if (operationType.value === "add") {
qualityInspectAdd(data).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeDia();
+ }).catch(() => {}).finally(() => {
+ submitting.value = false;
})
} else {
qualityInspectUpdate(data).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeDia();
+ }).catch(() => {}).finally(() => {
+ submitting.value = false;
})
}
}
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index 7e373bf..7c5c0d7 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -136,7 +136,7 @@
</PIMTable>
<template #footer>
<div class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭</el-button>
+ <el-button type="primary" :loading="submitting" @click="submitForm">纭</el-button>
<el-button @click="closeDia">鍙栨秷</el-button>
</div>
</template>
@@ -157,6 +157,7 @@
const emit = defineEmits(['close'])
const dialogFormVisible = ref(false);
+const submitting = ref(false);
const operationType = ref('')
const data = reactive({
form: {
@@ -382,6 +383,9 @@
// 鎻愪氦浜у搧琛ㄥ崟
const submitForm = () => {
+ if (submitting.value) {
+ return;
+ }
proxy.$refs.formRef.validate(valid => {
if (valid) {
form.value.inspectType = 0
@@ -391,15 +395,20 @@
})
}
const data = {...form.value, qualityInspectParams: tableData.value}
+ submitting.value = true;
if (operationType.value === "add") {
qualityInspectAdd(data).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeDia();
+ }).catch(() => {}).finally(() => {
+ submitting.value = false;
})
} else {
qualityInspectUpdate(data).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeDia();
+ }).catch(() => {}).finally(() => {
+ submitting.value = false;
})
}
}
--
Gitblit v1.9.3