From bc26fc90143306e858e8547cbe45da17eedd5931 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 05 三月 2025 09:12:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/eam/modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer.vue b/src/views/eam/modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer.vue
index c00c9ee..1c5c156 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
@@ -154,7 +154,7 @@
</div>
</a-tab-pane>
<a-tab-pane
- tab='妫�瀹氳褰�'
+ tab='閴村畾璁板綍'
key="6"
>
<div
@@ -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