From 013c63b6a07231bb4456106e31715b0982167abd Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期三, 04 六月 2025 09:38:46 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory

---
 culture/src/views/pedigree-chart/progenitorComponents/AddSublevelForm.vue |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/culture/src/views/pedigree-chart/progenitorComponents/AddSublevelForm.vue b/culture/src/views/pedigree-chart/progenitorComponents/AddSublevelForm.vue
index 10d2e37..7eb9844 100644
--- a/culture/src/views/pedigree-chart/progenitorComponents/AddSublevelForm.vue
+++ b/culture/src/views/pedigree-chart/progenitorComponents/AddSublevelForm.vue
@@ -31,7 +31,7 @@
         <el-col :span="10">
           <el-form-item label="接种菌种编号" prop="strainCode">
             <el-input
-              :disabled="!dialogTitle.includes('新增')"
+              :disabled="dialogTitle.includes('详情')"
               v-model="form.strainCode"
               placeholder="请输入"
             ></el-input>
@@ -40,7 +40,7 @@
         <el-col :span="10">
           <el-form-item label="接种菌种名称" prop="strainName">
             <el-input
-              :disabled="!dialogTitle.includes('新增')"
+              :disabled="dialogTitle.includes('详情')"
               v-model="form.strainName"
               placeholder="请输入"
             ></el-input>
@@ -65,7 +65,7 @@
             prop="remark"
           >
             <el-input
-              :disabled="!dialogTitle.includes('新增')"
+              :disabled="dialogTitle.includes('详情')"
               v-model="form.remark"
               placeholder="请输入"
             ></el-input>
@@ -92,7 +92,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <div v-if="dialogTitle.includes('新增')" class="dialog-footer">
+    <div v-if="!dialogTitle.includes('详情')" class="dialog-footer">
       <el-button type="primary" @click="handleSubmit">提交</el-button>
     </div>
   </el-dialog>
@@ -124,7 +124,6 @@
   },
   methods: {
     openInitData(value) {
-      console.log(value);
 
       this.dialogTitle = value.title;
       // 获取用户信息
@@ -142,12 +141,16 @@
       this.form = {
         ...this.form,
         ...value.form,
+        strainCode1: value.strainCode1,
+        strainName1: value.strainName1,
+        formStatus:value.formStatus,
         thisName: userInfo.nickName || "",
         thisTime: value.form.vaccinateTime
           ? value.form.vaccinateTime
           : formatTime,
         type: 1,
       };
+      
       this.dialogVisible = true;
     },
     closeDialog() {
@@ -161,7 +164,7 @@
       });
     },
     handleStatus(status) {
-      if (!this.dialogTitle.includes("新增")) return;
+      if (this.dialogTitle.includes("详情")) return;
       this.form.status = status;
       this.$forceUpdate();
     },

--
Gitblit v1.7.1