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/quality/teststandard/standard-form.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/quality/teststandard/standard-form.vue b/src/views/quality/teststandard/standard-form.vue
index 4cc5f4c..45b2db6 100644
--- a/src/views/quality/teststandard/standard-form.vue
+++ b/src/views/quality/teststandard/standard-form.vue
@@ -32,7 +32,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="宸ュ簭" prop="operationName">
+ <!-- <el-form-item label="宸ュ簭" prop="operationName">
<el-input v-model="dataForm.operationName" placeholder="璇烽�夋嫨宸ュ簭">
<el-button
slot="append"
@@ -40,7 +40,7 @@
@click="openOperationDialog()"
></el-button>
</el-input>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="dataForm.remark" placeholder=""></el-input>
</el-form-item>
--
Gitblit v1.9.3