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/reportLibraryOne/index.vue | 148 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 115 insertions(+), 33 deletions(-)
diff --git a/culture/src/views/strainReportLibrary/reportLibraryOne/index.vue b/culture/src/views/strainReportLibrary/reportLibraryOne/index.vue
index b47dae4..521b23d 100644
--- a/culture/src/views/strainReportLibrary/reportLibraryOne/index.vue
+++ b/culture/src/views/strainReportLibrary/reportLibraryOne/index.vue
@@ -10,15 +10,15 @@
<p>2、在可行研究阶段，工艺开发升级，重新规划工艺研究路线，则以新规划的工艺路线方案来设定课题。</p>
</div>
</el-card>
- <TableCustom :queryForm="queryForm" :total="total" @currentChange="handleCurrentChange"
+ <TableCustom :tableData="tableData" :queryForm="queryForm" :total="total" @currentChange="handleCurrentChange"
@sizeChange="handleSizeChange">
<template #search>
<el-form :model="form" label-width="auto" inline>
<el-form-item label="所属项目组：">
- <el-input v-model="form.name" placeholder="请输入"></el-input>
+ <el-input v-model="form.teamName" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="报告名称：">
- <el-input v-model="form.name" placeholder="请输入"></el-input>
+ <el-input v-model="form.reportName" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="创建日期：">
<el-date-picker v-model="form.date" type="daterange" range-separator="至"
@@ -27,12 +27,23 @@
<el-form-item label="状态：">
<el-select v-model="form.status" placeholder="请选择">
<el-option label="待审核" value="1"></el-option>
- <el-option label="已通过" value="0"></el-option>
- <el-option label="已驳回" value="2"></el-option>
+ <el-option label="待评定" value="2"></el-option>
+ <el-option label="已评定" value="3"></el-option>
+ <el-option label="已驳回" value="4"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="菌种实验员：">
+ <el-select v-model="form.experimentName" placeholder="请选择" @change="handleExperimentChange">
+ <el-option
+ v-for="item in experimentList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.name">
+ </el-option>
</el-select>
</el-form-item>
<el-form-item label="" style="margin-left: 63px;">
- <el-button type="default" style="margin-right: 10px;">重置</el-button>
+ <el-button type="default" style="margin-right: 10px;" @click="resetForm">重置</el-button>
<el-button type="primary">查询</el-button>
</el-form-item>
</el-form>
@@ -41,39 +52,42 @@
<el-button @click="handleAddProject" class="el-icon-plus" type="primary">
新增报告</el-button>
<div class="table-setting">
- <div class="table-title">
+ <div class="table-tit" :class="!isDraft&&'table-title'" @click="handleTabChange(false)">
报告列表
</div>
- <div class="table-tit">
+ <div class="table-tit" :class="isDraft&&'table-title'" @click="handleTabChange(true)">
草稿箱
</div>
</div>
</template>
<template #table>
- <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="状态">
+ <el-table-column prop="teamName" label="所属项目组" />
+ <el-table-column prop="reportCode" label="报告编号" />
+ <el-table-column prop="reportName" label="报告名称" />
+ <el-table-column prop="experimentName" label="菌种实验员">
+ </el-table-column>
+ <el-table-column prop="createBy" label="创建人" />
+ <el-table-column prop="createTime" label="创建时间" />
+ <el-table-column prop="status" label="状态">
<template #default="{ row }">
- <el-tag v-if="row.status == 1" type="success">待审核</el-tag>
- <el-tag v-else-if="row.status == 0" type="success">已通过</el-tag>
- <el-tag v-else type="danger">已驳回</el-tag>
+ <el-tag v-if="row.status == 1" type="warning">待审核</el-tag>
+ <el-tag v-else-if="row.status == 2" type="info">待评定</el-tag>
+ <el-tag v-else-if="row.status == 3" type="success">已评定</el-tag>
+ <el-tag v-else-if="row.status == 4" type="danger">已驳回</el-tag>
</template>
</el-table-column>
- <el-table-column prop="age" label="操作">
+ <el-table-column label="操作">
<template #default="{ row }">
- <el-button type="text">审核</el-button>
- <el-button type="text">详情</el-button>
+ <el-button type="text" @click="handleAudit(row)">审核</el-button>
+ <el-button type="text" @click="handleDetail(row)">详情</el-button>
</template>
</el-table-column>
</template>
</TableCustom>
<Approval :visible="showApproval" @close="showApproval = false" />
+ <Evaluate :visible="showEvaluate" @close="showEvaluate = false" />
<ShowDelConfirm :show="showDelConfirm" @close="showDelConfirm = false" @confirm="handleDelConfirm" />
<ShowDelConfirm :title="changeStatusTitle" :tip="changeStatusTip" :show="changeStatus"
@close="changeStatus = false" @confirm="handleChangeStatusConfirm" />
@@ -82,29 +96,45 @@
<script>
import Approval from './components/approval'
+import Evaluate from './components/evaluate'
+import { getList } from './service'
export default {
name: 'ProjectList',
components: {
- Approval
+ Approval,
+ Evaluate
},
data() {
return {
form: {
- name: ''
+ teamName: '',
+ reportName: '',
+ date: [],
+ status: '',
+ experimentName: ''
},
+ tableData: [],
showDelConfirm: false,
rowId: '',
changeStatus: false,
showApproval: false,
+ showEvaluate: false,
changeStatusTitle: '',
changeStatusTip: '',
queryForm: {
pageSize: 10,
- pageNum: 1
+ pageNum: 1,
+
},
- total: 0
+ total: 0,
+ isDraft: false,
+ experimentList: []
}
+ },
+ mounted() {
+ this.getLists()
+ this.getExperimentList()
},
methods: {
handleAddProject() {
@@ -118,7 +148,7 @@
this.showDelConfirm = false
this.msgsuccess('删除成功')
this.rowId = ''
- this.getList()
+ this.getLists()
},
handleChangeStatus(row, status) {
this.rowId = row.id
@@ -132,18 +162,71 @@
this.rowId = ''
this.changeStatusTitle = ''
this.changeStatusTip = ''
- this.getList()
+ this.getLists()
},
handleCurrentChange(page) {
this.queryForm.pageNum = page
- this.getList()
+ this.getLists()
},
handleSizeChange(size) {
this.queryForm.pageSize = size
- this.getList()
+ this.getLists()
},
- getList() {
-
+ handleTabChange(isDraft) {
+ this.isDraft = isDraft
+ this.form.status = ''
+ this.getLists()
+ },
+ getLists() {
+ const params = {
+ pageNum: this.queryForm.pageNum,
+ pageSize: this.queryForm.pageSize,
+ teamName: this.form.teamName,
+ reportName: this.form.reportName,
+ startTime: this.form.date && this.form.date[0] ? this.form.date[0] : '',
+ endTime: this.form.date && this.form.date[1] ? this.form.date[1] : '',
+ status: this.form.status,
+ isDraft: this.isDraft ? 1 : 0,
+ reportType: 1
+ }
+ getList(params).then(res => {
+ if (res.code === 200) {
+ this.total = res.data.total
+ this.tableData = res.data.records
+ }
+ })
+ },
+ resetForm() {
+ this.form = {
+ teamName: '',
+ reportName: '',
+ date: [],
+ status: '',
+ experimentName: ''
+ }
+ this.getLists()
+ },
+ handleAudit(row) {
+ this.showApproval = true
+ },
+ handleDetail(row) {
+ // 这里可以添加查看详情的逻辑
+ },
+ handleExperimentChange(val) {
+ this.getLists()
+ },
+ handleExperimentEdit(row, val) {
+ // 这里可以添加编辑实验员的接口调用
+ console.log('编辑实验员', row, val)
+ },
+ // 获取实验员列表
+ getExperimentList() {
+ // 这里调用获取实验员列表的接口
+ this.experimentList = [
+ { id: 1, name: '实验员1' },
+ { id: 2, name: '实验员2' },
+ { id: 3, name: '实验员3' }
+ ]
}
}
}
@@ -194,7 +277,6 @@
border: 1px solid #DCDFE6;
width: 166px;
height: 50px;
- background: #FFFFFF;
border-radius: 8px 8px 0px 0px;
display: flex;
align-items: center;
@@ -203,7 +285,7 @@
font-family: SourceHanSansCN, SourceHanSansCN;
font-weight: bold;
font-size: 18px;
- color: #049C9A;
+ color: rgba(96, 98, 102, 1);
line-height: 27px;
}
--
Gitblit v1.7.1