From b1cb0925184e4426b93306cb4c290586126383c7 Mon Sep 17 00:00:00 2001
From: 13404089107 <puwei@sinata.cn>
Date: 星期一, 02 六月 2025 17:44:10 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory

---
 culture/src/views/pedigree-chart/components/AddSublevelPlan.vue |   34 ++++++++++++++++------------------
 1 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/culture/src/views/pedigree-chart/components/AddSublevelPlan.vue b/culture/src/views/pedigree-chart/components/AddSublevelPlan.vue
index 830193e..3a2d43d 100644
--- a/culture/src/views/pedigree-chart/components/AddSublevelPlan.vue
+++ b/culture/src/views/pedigree-chart/components/AddSublevelPlan.vue
@@ -5,23 +5,23 @@
         <el-form :model="planForm" :rules="planRules" ref="planForm" label-position="top">
             <el-row :gutter="20">
                 <el-col :span="10">
-                    <el-form-item label="传代菌种编号" prop="strainCode">
-                        <el-input disabled v-model="planForm.strainCode"></el-input>
+                    <el-form-item label="传代菌种编号" prop="strainCode1">
+                        <el-input disabled v-model="planForm.strainCode1"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="10">
-                    <el-form-item label="传代菌种名称" prop="strainName">
-                        <el-input disabled v-model="planForm.strainName"></el-input>
+                    <el-form-item label="传代菌种名称" prop="strainName1">
+                        <el-input disabled v-model="planForm.strainName1"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="10">
-                    <el-form-item label="接种菌种编号" prop="inoculateNo">
-                        <el-input disabled v-model="planForm.inoculateNo" placeholder="请输入"></el-input>
+                    <el-form-item label="接种菌种编号">
+                        <el-input disabled v-model="planForm.strainCode" placeholder="请输入"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="10">
-                    <el-form-item label="接种菌种名称" prop="inoculateName">
-                        <el-input disabled v-model="planForm.inoculateName" placeholder="请输入"></el-input>
+                    <el-form-item label="接种菌种名称">
+                        <el-input disabled v-model="planForm.strainName" placeholder="请输入"></el-input>
                     </el-form-item>
                 </el-col>
             </el-row>
@@ -38,7 +38,7 @@
             <el-row :gutter="20">
                 <el-col :span="10">
                     <el-form-item label="菌种入库时间">
-                        <el-input disabled v-model="planForm.inTime"></el-input>
+                        <el-input disabled v-model="planForm.confirmTime"></el-input>
                     </el-form-item>
                 </el-col>
             </el-row>
@@ -66,11 +66,10 @@
                 status: '1',
                 strainCode: '',
                 strainName: '',
-                inoculateNo: '',
-                inoculateName: '',
+                strainCode1: '',
+                strainName1: '',
                 generationCount: 1,
                 isDiscarded: true,
-                inTime: ''
             },
             planRules: {
                 strainCode: [
@@ -79,10 +78,10 @@
                 strainName: [
                     { required: true, message: '请输入传代菌种名称', trigger: 'blur' }
                 ],
-                inoculateNo: [
+                strainCode1: [
                     { required: true, message: '请输入接种菌种编号', trigger: 'blur' }
                 ],
-                inoculateName: [
+                strainName1: [
                     { required: true, message: '请输入接种菌种名称', trigger: 'blur' }
                 ],
                 generationCount: [
@@ -109,11 +108,10 @@
                 status: '1',
                 strainCode: '',
                 strainName: '',
-                inoculateNo: '',
-                inoculateName: '',
+                strainCode1: '',
+                strainName1: '',
                 generationCount: 1,
                 isDiscarded: true,
-                inTime: ''
             }
             // 重置表单验证
             this.$refs.planForm && this.$refs.planForm.resetFields()
@@ -126,7 +124,7 @@
             })
         },
         handleStatus(status) {
-            if (this.planForm.status === 'detail') return
+            if (this.planForm.formStatus === 'detail') return
             this.planForm.isDiscarded = status === 'save'
             this.$forceUpdate()
         }

--
Gitblit v1.7.1