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/components/AddSublevelPlan.vue | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/culture/src/views/pedigree-chart/components/AddSublevelPlan.vue b/culture/src/views/pedigree-chart/components/AddSublevelPlan.vue
index 830193e..b95a85d 100644
--- a/culture/src/views/pedigree-chart/components/AddSublevelPlan.vue
+++ b/culture/src/views/pedigree-chart/components/AddSublevelPlan.vue
@@ -1,27 +1,27 @@
<template>
<!-- 设置传代计划数弹窗 -->
- <el-dialog :title="planForm.status === 'detail' ? '传代计划数详情' : '设置菌种传代计划数'" :visible.sync="planDialogVisible"
+ <el-dialog :title="planForm.formStatus === 'detail' ? '传代计划数详情' : '设置菌种传代计划数'" :visible.sync="planDialogVisible"
width="40%" :close-on-click-modal="false">
<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,20 +38,20 @@
<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>
<el-row :gutter="20">
<el-col :span="10">
<el-form-item label="传代计划数" prop="generationCount">
- <el-input-number :disabled="planForm.status === 'detail'" v-model="planForm.generationCount"
+ <el-input-number :disabled="planForm.formStatus === 'detail'" v-model="planForm.generationCount"
:controls="false" :min="1" placeholder="请输入" />
</el-form-item>
</el-col>
</el-row>
</el-form>
- <div v-if="planForm.status !== 'detail'" class="dialog-footer">
+ <div v-if="planForm.formStatus !== 'detail'" class="dialog-footer">
<el-button type="primary" @click="handleSubmit">提交签字</el-button>
</div>
</el-dialog>
@@ -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