From 18f1fdd774bc416794e2dcdd66e8f178b42191f1 Mon Sep 17 00:00:00 2001
From: hejianhao <15708179461@qq.com>
Date: 星期三, 14 五月 2025 14:59:35 +0800
Subject: [PATCH] 谱系图弹窗
---
culture/src/views/pedigree-chart/progenitorComponents/AddAncestor.vue | 20 ++++++++++
culture/src/views/pedigree-chart/addProgenitor.vue | 17 ++++++++
culture/src/assets/public/require.png | 0
culture/src/views/pedigree-chart/components/ParentForm.vue | 12 ++++++
culture/src/views/pedigree-chart/components/AddSublevelForm.vue | 20 ++++++++++
culture/src/router/index.js | 4 +-
culture/src/components/Table/index.vue | 2
culture/src/views/pedigree-chart/progenitorComponents/AddSublevelForm.vue | 20 ++++++++++
culture/src/views/pedigree-chart/add.vue | 18 +++++++++
9 files changed, 110 insertions(+), 3 deletions(-)
diff --git a/culture/src/assets/public/require.png b/culture/src/assets/public/require.png
new file mode 100644
index 0000000..9110e5c
--- /dev/null
+++ b/culture/src/assets/public/require.png
Binary files differ
diff --git a/culture/src/components/Table/index.vue b/culture/src/components/Table/index.vue
index ddc06cf..82bc91c 100644
--- a/culture/src/components/Table/index.vue
+++ b/culture/src/components/Table/index.vue
@@ -1,5 +1,5 @@
<template>
- <div class="table-container">
+ <div class="table-container" style="width: 100%;">
<el-table border v-bind="$attrs" v-on="$listeners" :height="height">
<slot></slot>
</el-table>
diff --git a/culture/src/router/index.js b/culture/src/router/index.js
index 07d302e..e36888f 100644
--- a/culture/src/router/index.js
+++ b/culture/src/router/index.js
@@ -227,7 +227,7 @@
path: 'add-progenitor',
name: 'AddProgenitor',
meta: {
- title: "新增母代菌种传代生产谱系图",
+ title: "新增祖代菌种传代生产谱系图",
hide: true
},
component: () => import("../views/pedigree-chart/addProgenitor"),
@@ -244,7 +244,7 @@
{
path: 'breeding-record',
name: 'BreedingRecord',
- meta: {
+ meta: {
title: "菌种选育保藏记录",
},
component: () => import("../views/strain-library/breeding-record"),
diff --git a/culture/src/views/pedigree-chart/add.vue b/culture/src/views/pedigree-chart/add.vue
index 9813c17..eaa0f4b 100644
--- a/culture/src/views/pedigree-chart/add.vue
+++ b/culture/src/views/pedigree-chart/add.vue
@@ -23,6 +23,24 @@
</el-form-item>
</div>
</div>
+ <div class="card" style="margin-top: 30px;">
+ <Table :height="null" :total="0" :tableData="tableData">
+ <el-table-column label="接种操作人" prop="strainSource" />
+ <el-table-column label="接种操作时间" prop="strainNo" />
+ <el-table-column label="传代菌种编号" prop="strainName" />
+ <el-table-column label="传代菌种名称" prop="strainName" />
+ <el-table-column label="接种菌种编号" prop="strainName" />
+ <el-table-column label="接种菌种名称" prop="strainName" />
+ <el-table-column label="入库总数" prop="strainName" />
+ <el-table-column label="保存/废弃" prop="strainName" />
+ <el-table-column label="入库时间" prop="strainName" />
+ <el-table-column label="操作">
+ <template #default="{ row }">
+ <el-button type="text">确认入库</el-button>
+ </template>
+ </el-table-column>
+ </Table>
+ </div>
<div class="chart">
<div class="header">
<div class="title">菌种传代生产谱系图</div>
diff --git a/culture/src/views/pedigree-chart/addProgenitor.vue b/culture/src/views/pedigree-chart/addProgenitor.vue
index b2ca28a..8868373 100644
--- a/culture/src/views/pedigree-chart/addProgenitor.vue
+++ b/culture/src/views/pedigree-chart/addProgenitor.vue
@@ -11,6 +11,23 @@
</el-form-item>
</div>
</div>
+ <div class="card" style="margin-top: 30px;">
+ <Table :height="null" :total="0" :tableData="tableData">
+ <el-table-column label="菌株类型" prop="strainSource" />
+ <el-table-column label="来源获得/菌落编号" prop="strainNo" />
+ <el-table-column label="菌种编号" prop="strainName" />
+ <el-table-column label="菌种名称" prop="strainName" />
+ <el-table-column label="入库总数" prop="strainName" />
+ <el-table-column label="保存/废弃" prop="strainName" />
+ <el-table-column label="菌种入库时间" prop="strainName" />
+ <el-table-column label="接种操作人" prop="strainName" />
+ <el-table-column label="操作">
+ <template #default="{ row }">
+ <el-button type="text">确认入库</el-button>
+ </template>
+ </el-table-column>
+ </Table>
+ </div>
<div class="chart">
<div class="header">
<div class="title">菌种传代生产谱系图</div>
diff --git a/culture/src/views/pedigree-chart/components/AddSublevelForm.vue b/culture/src/views/pedigree-chart/components/AddSublevelForm.vue
index a23f333..3b54d91 100644
--- a/culture/src/views/pedigree-chart/components/AddSublevelForm.vue
+++ b/culture/src/views/pedigree-chart/components/AddSublevelForm.vue
@@ -44,11 +44,31 @@
</el-form-item>
<el-row :gutter="20">
<el-col :span="10">
+ <el-form-item v-if="!form.isDiscarded" label="废弃原因说明" required>
+ <el-input :disabled="!dialogTitle.includes('新增')" v-model="form.discardReason"
+ placeholder="请输入"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="10">
<el-form-item label="菌种入库时间" prop="inTime">
<el-input disabled v-model="form.inTime"></el-input>
</el-form-item>
</el-col>
</el-row>
+ <el-row v-if="!dialogTitle.includes('新增')" :gutter="20">
+ <el-col :span="10">
+ <el-form-item label="接种操作人签字">
+ <el-image />
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
+ <el-form-item label="菌种保藏人签字">
+ <el-image />
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<div v-if="dialogTitle.includes('新增')" class="dialog-footer">
<el-button type="primary" @click="handleSubmit">提交</el-button>
diff --git a/culture/src/views/pedigree-chart/components/ParentForm.vue b/culture/src/views/pedigree-chart/components/ParentForm.vue
index 8291b43..d7bf108 100644
--- a/culture/src/views/pedigree-chart/components/ParentForm.vue
+++ b/culture/src/views/pedigree-chart/components/ParentForm.vue
@@ -27,6 +27,18 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row v-if="parentForm.status === 'detail'" :gutter="20">
+ <el-col :span="10">
+ <el-form-item label="接种操作人签字">
+ <el-image />
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
+ <el-form-item label="菌种保藏人签字">
+ <el-image />
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<div v-if="parentForm.status !== 'detail'" class="dialog-footer">
<el-button type="primary" @click="handleAddParent">提交</el-button>
diff --git a/culture/src/views/pedigree-chart/progenitorComponents/AddAncestor.vue b/culture/src/views/pedigree-chart/progenitorComponents/AddAncestor.vue
index 60db2a2..dbd5ba7 100644
--- a/culture/src/views/pedigree-chart/progenitorComponents/AddAncestor.vue
+++ b/culture/src/views/pedigree-chart/progenitorComponents/AddAncestor.vue
@@ -54,6 +54,14 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row :gutter="20" v-if="!planForm.isDiscarded">
+ <el-col :span="10">
+ <el-form-item label="废弃原因说明" required>
+ <el-input :disabled="planForm.status != 'add'" v-model="planForm.discardReason"
+ placeholder="请输入"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-row :gutter="20">
<el-col :span="10">
<el-form-item label="菌种入库时间">
@@ -61,6 +69,18 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row v-if="planForm.status != 'add'" :gutter="20">
+ <el-col :span="10">
+ <el-form-item label="接种操作人签字">
+ <el-image />
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
+ <el-form-item label="菌种保藏人签字">
+ <el-image />
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<div v-if="planForm.status == 'add'" class="dialog-footer">
<el-button>保存草稿</el-button>
diff --git a/culture/src/views/pedigree-chart/progenitorComponents/AddSublevelForm.vue b/culture/src/views/pedigree-chart/progenitorComponents/AddSublevelForm.vue
index a23f333..3b54d91 100644
--- a/culture/src/views/pedigree-chart/progenitorComponents/AddSublevelForm.vue
+++ b/culture/src/views/pedigree-chart/progenitorComponents/AddSublevelForm.vue
@@ -44,11 +44,31 @@
</el-form-item>
<el-row :gutter="20">
<el-col :span="10">
+ <el-form-item v-if="!form.isDiscarded" label="废弃原因说明" required>
+ <el-input :disabled="!dialogTitle.includes('新增')" v-model="form.discardReason"
+ placeholder="请输入"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="10">
<el-form-item label="菌种入库时间" prop="inTime">
<el-input disabled v-model="form.inTime"></el-input>
</el-form-item>
</el-col>
</el-row>
+ <el-row v-if="!dialogTitle.includes('新增')" :gutter="20">
+ <el-col :span="10">
+ <el-form-item label="接种操作人签字">
+ <el-image />
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
+ <el-form-item label="菌种保藏人签字">
+ <el-image />
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<div v-if="dialogTitle.includes('新增')" class="dialog-footer">
<el-button type="primary" @click="handleSubmit">提交</el-button>
--
Gitblit v1.7.1