From a60dc30be50598fe2d1acb42f8171ec69e37b436 Mon Sep 17 00:00:00 2001
From: 13404089107 <puwei@sinata.cn>
Date: 星期三, 28 五月 2025 17:29:05 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
culture/src/views/pedigree-chart/progenitorComponents/PlanForm.vue | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/culture/src/views/pedigree-chart/progenitorComponents/PlanForm.vue b/culture/src/views/pedigree-chart/progenitorComponents/PlanForm.vue
index 5c624c4..08b34c8 100644
--- a/culture/src/views/pedigree-chart/progenitorComponents/PlanForm.vue
+++ b/culture/src/views/pedigree-chart/progenitorComponents/PlanForm.vue
@@ -1,27 +1,32 @@
<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="16">
<el-form-item label="菌株类型">
- <div class="activeType">{{ ['原始祖代菌株SO', '分离菌落 CO', '祖代菌株 O'][planForm.activeType - 1] }}</div>
+ <div class="activeType">{{ ['原始祖代菌株SO', '分离菌落 CO', '祖代菌株 O'][planForm.strainType - 1] }}</div>
</el-form-item>
</el-col>
- <el-col :span="20">
+ <el-col :span="20" v-if="planForm.strainType == '1'">
<el-form-item label="来源获得" prop="source">
<el-input disabled v-model="planForm.source" 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-col :span="10" v-else>
+ <el-form-item label="菌落编号" prop="colonyNumber">
+ <el-input disabled v-model="planForm.colonyNumber" placeholder="请输入"></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="菌种名称" prop="strainName">
+ <el-input disabled v-model="planForm.strainName" placeholder="请输入"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
+ <el-form-item label="菌种编号" prop="strainCode">
+ <el-input disabled v-model="planForm.strainCode" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -35,20 +40,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="count">
- <el-input-number :disabled="planForm.status === 'detail'" v-model="planForm.count"
+ <el-form-item label="传代计划数" prop="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="handleAddPlan">提交签字</el-button>
</div>
</el-dialog>
@@ -60,7 +65,7 @@
planDialogVisible: false,
planForm: {},
planRules: {
- count: [
+ generationCount: [
{ required: true, message: '请输入传代计划数', trigger: 'blur' }
]
}
@@ -69,7 +74,7 @@
methods: {
openInitData(value) {
this.planForm = value
- this.openDialog()
+ this.openDialog()
},
openDialog() {
this.planDialogVisible = true
@@ -80,7 +85,7 @@
handleAddPlan() {
this.$refs.planForm.validate((valid) => {
if (valid) {
- this.$emit('addNodeSign', this.planForm, 2)
+ this.$emit('addNodeSign', {...this.planForm,type: 2}, 2)
}
})
}
--
Gitblit v1.7.1