From 9ea5ff67655241271bdf04bb50ca3a8d60c4e22a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 15:07:02 +0800
Subject: [PATCH] fix: 用河南鹤壁代码覆盖山西长治
---
src/views/productionPlan/productionPlan/index.vue | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/views/productionPlan/productionPlan/index.vue b/src/views/productionPlan/productionPlan/index.vue
index 01a513b..fd56e89 100644
--- a/src/views/productionPlan/productionPlan/index.vue
+++ b/src/views/productionPlan/productionPlan/index.vue
@@ -143,6 +143,7 @@
<template #footer>
<span class="dialog-footer">
<el-button type="primary"
+ :loading="mergeSubmitLoading"
@click="handleMergeSubmit">纭畾涓嬪彂</el-button>
<el-button @click="isShowNewModal = false">鍙栨秷</el-button>
</span>
@@ -303,6 +304,13 @@
return params == "閿�鍞�" ? "閿�鍞�" : "鍐呴儴";
},
},
+ {
+ label: "閿�鍞悎鍚屽彿",
+ prop: "salesContractNo",
+ width: "200px",
+ dataType: "slot",
+ slot: "salesContractNo",
+ },
{
label: "浜у搧鍚嶇О",
@@ -328,7 +336,6 @@
label: "鎵�闇�鏁伴噺",
prop: "qtyRequired",
width: "150px",
- align: "right",
dataType: "slot",
slot: "qtyRequired",
className: "volume-cell",
@@ -377,13 +384,7 @@
className: "date-cell",
formatData: cell => (cell ? dayjs(cell).format("YYYY-MM-DD") : ""),
},
- {
- label: "閿�鍞悎鍚屽彿",
- prop: "salesContractNo",
- width: "200px",
- dataType: "slot",
- slot: "salesContractNo",
- },
+
{
label: "瀹㈡埛鍚嶇О",
prop: "customerName",
@@ -466,6 +467,7 @@
// 鍚堝苟涓嬪彂寮圭獥鎺у埗
const isShowNewModal = ref(false);
+ const mergeSubmitLoading = ref(false);
// 鍚堝苟涓嬪彂琛ㄥ崟鏁版嵁
const mergeForm = reactive({
productName: "",
@@ -778,6 +780,7 @@
const payload = {
...mergeForm,
};
+ mergeSubmitLoading.value = true;
productionPlanCombine(payload)
.then(res => {
if (res.code === 200) {
@@ -793,6 +796,9 @@
.catch(err => {
console.error("鍚堝苟涓嬪彂寮傚父锛�", err);
ElMessage.error("绯荤粺寮傚父锛屽悎骞朵笅鍙戝け璐�");
+ })
+ .finally(() => {
+ mergeSubmitLoading.value = false;
});
// 鍙互閫夋嫨鍒锋柊鍒楄〃鎴栧叾浠栨搷浣�
};
--
Gitblit v1.9.3