From f443b27dd9dcf5af1339439689531536e85836c7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 12 三月 2024 15:55:48 +0800
Subject: [PATCH] 合并冲突
---
src/views/technology/completeproductstructure/completeproductstructure-form.vue | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/views/technology/completeproductstructure/completeproductstructure-form.vue b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
index 93e1376..1be7ec1 100644
--- a/src/views/technology/completeproductstructure/completeproductstructure-form.vue
+++ b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
@@ -7,7 +7,7 @@
<h2 v-if="!editable">鏌ョ湅-瀹屾暣浜у搧缁撴瀯</h2>
</div>
<div class="btn-group header-right" v-if="editable">
- <el-button :disabled="isSubmit" v-thinclick="`dataFormSubmit`"
+ <el-button type="primary" :disabled="isSubmit" v-thinclick="`dataFormSubmit`"
>淇濆瓨</el-button
>
</div>
@@ -40,6 +40,7 @@
</el-form-item>
<el-form-item label="闆朵欢鍚�" prop="partName">
+ <el-tooltip class="item" effect="dark" :content="treeForm.partName" >
<el-input
v-model="treeForm.partName"
placeholder="闆朵欢鍚�"
@@ -47,6 +48,7 @@
disabled
>
</el-input>
+ </el-tooltip>
</el-form-item>
<el-form-item label="绫诲瀷" prop="bomTypeDb">
--
Gitblit v1.9.3