From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突
---
src/views/basic/param/param-form.vue | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/src/views/basic/param/param-form.vue b/src/views/basic/param/param-form.vue
index fa7f914..2f1fe1d 100644
--- a/src/views/basic/param/param-form.vue
+++ b/src/views/basic/param/param-form.vue
@@ -13,7 +13,7 @@
class="l-mes"
>
<el-form-item label="鍙傛暟缂栧彿" prop="code">
- <el-input v-model="dataForm.code" placeholder="鍙傛暟缂栧彿"></el-input>
+ <el-input v-model="dataForm.code" placeholder="鍙傛暟缂栧彿" disabled></el-input>
</el-form-item>
<el-form-item label="鍙傛暟椤�" prop="parameterItem">
<el-input
@@ -99,9 +99,6 @@
dict: ''
},
dataRule: {
- code: [
- { required: true, message: '鍙傛暟缂栧彿涓嶈兘涓虹┖', trigger: 'blur' }
- ],
parameterItem: [
{ required: true, message: '鍙傛暟椤逛笉鑳戒负绌�', trigger: 'blur' }
],
--
Gitblit v1.9.3