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 +++++--
src/components/tools/EquipmentSelection.vue | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/components/tools/EquipmentSelection.vue b/src/components/tools/EquipmentSelection.vue
index 45db249..7418288 100644
--- a/src/components/tools/EquipmentSelection.vue
+++ b/src/components/tools/EquipmentSelection.vue
@@ -38,7 +38,7 @@
</div>
<a-row :gutter="24">
<a-col :md="16" :sm="12">
- <a-table ref="table" :scroll="{ x: true, y: true }" size="middle" rowKey="id" bordered :columns="columns"
+ <a-table ref="table" size="middle" rowKey="id" bordered :columns="columns"
:dataSource="dataSource" :pagination="false" :rowSelection="rowSelection" :loading="loading"
@change="handleTableChange">
<template slot="equipmentPhoto" slot-scope="text,record">
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