From c94535b792e9df0d3bbeffa10f427624c7c10ee4 Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期四, 29 五月 2025 13:54:21 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory

---
 culture/src/views/strain-library/validation/primitive-cell/EditConditionDialog.vue |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/culture/src/views/strain-library/validation/primitive-cell/EditConditionDialog.vue b/culture/src/views/strain-library/validation/primitive-cell/EditConditionDialog.vue
index a841893..10a410a 100644
--- a/culture/src/views/strain-library/validation/primitive-cell/EditConditionDialog.vue
+++ b/culture/src/views/strain-library/validation/primitive-cell/EditConditionDialog.vue
@@ -2,17 +2,18 @@
   <el-dialog :visible.sync="visible"  width="800px" @close="handleClose">
     <el-form label-width="120px" label-position="top">
       <el-form-item label="菌种培养工艺条件">
-        <el-input v-model="form.condition" :disabled="isFixed" placeholder="请输入" />
+        <el-input v-model="form.conditions" :disabled="isFixed || value.isDetail" placeholder="请输入" />
       </el-form-item>
       <el-form-item label="菌种培养工艺实况记录">
-        <el-input type="textarea" v-model="form.record" :rows="7" placeholder="请输入文本内容" />
+        <el-input type="textarea" :disabled="value.isDetail" v-model="form.record" :rows="7" placeholder="请输入文本内容" />
       </el-form-item>
       <el-form-item label="菌种培养标准工艺">
-        <el-input type="textarea" v-model="form.process" :rows="7" placeholder="请输入文本内容" />
+        <el-input type="textarea" :disabled="value.isDetail" v-model="form.workmanship" :rows="7" placeholder="请输入文本内容" />
       </el-form-item>
     </el-form>
     <div style="text-align: center; margin-top: 24px;">
-      <el-button type="primary" @click="handleOk">保存</el-button>
+      <el-button v-if="value.isDetail" @click="handleClose">关闭</el-button>
+      <el-button type="primary" v-if="!value.isDetail" @click="handleOk">保存</el-button>
     </div>
   </el-dialog>
 </template>
@@ -26,12 +27,12 @@
     isFixed: Boolean, // true: 固定的8个条件,false: 新增条件
     value: {
       type: Object,
-      default: () => ({ condition: '', record: '', process: '' })
+      default: () => ({ conditions: '', record: '', workmanship: '' })
     }
   },
   data() {
     return {
-      form: { condition: '', record: '', process: '' }
+      form: { conditions: '', record: '', workmanship: '' }
     }
   },
   watch: {
@@ -43,7 +44,7 @@
     },
     visible(val) {
       if (!val) {
-        this.form = { condition: '', record: '', process: '' }
+        this.form = { conditions: '', record: '', workmanship: '' }
       }
     }
   },

--
Gitblit v1.7.1