From f79bb27a83f3de364b586d7a2a515f92ef9e29dd Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 07 三月 2025 11:25:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/modules/equipmentNew/EquipmentModal.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index c3d98d7..02ef678 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -488,6 +488,8 @@
style='width: 100%;'
v-model='model.acceptanceCheckDate'
@change='dateChange'
+ valueFormat="YYYY-MM-DD"
+ format="YYYY-MM-DD"
/>
</a-form-model-item>
</a-col>
@@ -1209,12 +1211,13 @@
if (res.success) {
that.$message.success(res.message)
that.$emit('ok')
+ that.close()
} else {
- that.$message.warning(res.message)
+ that.$message.error(res.message)
}
}).finally(() => {
that.confirmLoading = false
- that.close()
+ // that.close()
})
} else {
return false
--
Gitblit v1.9.3