From ae3ad906ed4b09f72fc716957c4dbbe16341b38f Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 26 十二月 2023 11:39:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/eam/modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer.vue b/src/views/eam/modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer.vue
index c00c9ee..24095c1 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer.vue
@@ -16,7 +16,7 @@
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- label="璁惧缂栫爜"
+ label="缁熶竴缂栫爜"
class="hightColor"
>
<span
@@ -343,7 +343,7 @@
return "background-color:rgba(127, 127, 127,0.08)";
},
handleCancel() {
- this.$emit('ok');
+ // this.$emit('ok');
this.alterFlag = new Date();
this.close()
},
--
Gitblit v1.9.3