From d82e210c6de4163d5a528f385b5582d8822cb69f Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期五, 23 五月 2025 17:13:52 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
culture/src/views/strainReportLibrary/reportLibraryOneTWO/index.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/culture/src/views/strainReportLibrary/reportLibraryOneTWO/index.vue b/culture/src/views/strainReportLibrary/reportLibraryOneTWO/index.vue
index 8cefb4f..fce1689 100644
--- a/culture/src/views/strainReportLibrary/reportLibraryOneTWO/index.vue
+++ b/culture/src/views/strainReportLibrary/reportLibraryOneTWO/index.vue
@@ -20,9 +20,6 @@
<el-form-item label="报告名称：">
<el-input v-model="form.name" placeholder="请输入"></el-input>
</el-form-item>
- <el-form-item label="报告编号：">
- <el-input v-model="form.name" placeholder="请输入"></el-input>
- </el-form-item>
<el-form-item label="创建日期：">
<el-date-picker v-model="form.date" type="daterange" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
@@ -42,10 +39,10 @@
</template>
<template #setting>
<el-button @click="handleAddProject" class="el-icon-plus" type="primary">
- 新增可研报告</el-button>
+ 新增报告</el-button>
<div class="table-setting">
<div class="table-title">
- 可研报告库
+ 报告列表
</div>
<div class="table-tit">
草稿箱
@@ -57,6 +54,7 @@
<el-table-column prop="name" label="所属项目组" />
<el-table-column prop="age" label="报告编号" />
<el-table-column prop="age" label="报告名称" />
+ <el-table-column prop="age" label="菌种实验员" />
<el-table-column prop="age" label="创建人" />
<el-table-column prop="age" label="创建时间" />
<el-table-column prop="age" label="状态">
@@ -76,6 +74,8 @@
</TableCustom>
<Approval :visible="showApproval" @close="showApproval = false" />
+ <Evaluate :visible="showEvaluate" @close="showEvaluate = false" />
+ <ChoiceMethod :visible="showChoiceMethod" @close="showChoiceMethod = false" />
<ShowDelConfirm :show="showDelConfirm" @close="showDelConfirm = false" @confirm="handleDelConfirm" />
<ShowDelConfirm :title="changeStatusTitle" :tip="changeStatusTip" :show="changeStatus"
@close="changeStatus = false" @confirm="handleChangeStatusConfirm" />
@@ -84,11 +84,15 @@
<script>
import Approval from './components/approval'
+import Evaluate from './components/evaluate'
+import ChoiceMethod from './components/choiceMethod'
export default {
name: 'ProjectList',
components: {
- Approval
+ Approval,
+ Evaluate,
+ ChoiceMethod
},
data() {
return {
@@ -99,6 +103,8 @@
rowId: '',
changeStatus: false,
showApproval: false,
+ showEvaluate: false,
+ showChoiceMethod: false,
changeStatusTitle: '',
changeStatusTip: '',
queryForm: {
@@ -110,7 +116,7 @@
},
methods: {
handleAddProject() {
- this.$router.push('/reportLibrary/add')
+ this.$router.push('/strainReportLibrary/add')
},
handleDel(row) {
this.rowId = row.id
--
Gitblit v1.7.1