From 0042dbfd410064ebfab00826f927ed73448db5ec Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 21 五月 2024 14:53:20 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master

---
 src/views/quality/teststandard/standard-form.vue |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/views/quality/teststandard/standard-form.vue b/src/views/quality/teststandard/standard-form.vue
index 4cc5f4c..061e4af 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>
@@ -93,12 +93,18 @@
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">鍙栨秷</el-button>
-      <el-button
+      <!-- <el-button
         type="primary"
         :disabled="isSubmit"
         v-thinclick="`dataFormSubmit`"
         v-if="editable"
         >纭畾</el-button
+      > -->
+      <el-button
+        type="primary"
+        :disabled="isSubmit"
+        v-thinclick="`dataFormSubmit`"
+        >纭畾</el-button
       >
     </span>
     <operationDialog

--
Gitblit v1.9.3