From 6184b5e667e8f3088bdb129dd957af8e6049792b Mon Sep 17 00:00:00 2001
From: zhang_12370 <z2864490065@outlook.com>
Date: 星期二, 24 六月 2025 13:55:14 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/zd-before into dev
---
src/views/warehouseManagement/index.vue | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/views/warehouseManagement/index.vue b/src/views/warehouseManagement/index.vue
index 8905e20..706cb1d 100644
--- a/src/views/warehouseManagement/index.vue
+++ b/src/views/warehouseManagement/index.vue
@@ -491,6 +491,7 @@
}
return acc;
}, []);
+ mergeForm.value.type = 2
merge(mergeForm.value).then(() => {
cancel()
proxy.$modal.msgSuccess('鍚堝苟鎴愬姛')
@@ -512,6 +513,7 @@
delete form.value.registrationTime
delete form.value.createTime
delete form.value.updateTime
+ form.value.type = 1
form.value.fieldValue = filteredList.value.map(item => ({
[item.fields]: form.value[item.fields]
}))
--
Gitblit v1.9.3