From 87a55b07360cd3a542a37e77b3ab3c9b8e450a6b Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期一, 12 五月 2025 16:13:00 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
laboratory/src/views/dataManagement/sampleManage/list.vue | 84 +++++++++++++++++++++++-------------------
1 files changed, 46 insertions(+), 38 deletions(-)
diff --git a/laboratory/src/views/dataManagement/sampleManage/list.vue b/laboratory/src/views/dataManagement/sampleManage/list.vue
index 75e6e83..62c2e87 100644
--- a/laboratory/src/views/dataManagement/sampleManage/list.vue
+++ b/laboratory/src/views/dataManagement/sampleManage/list.vue
@@ -3,14 +3,14 @@
<TableCustom :queryForm="form" :tableData="tableData" :total="total">
<template #search>
<el-form :model="form" labelWidth="auto" inline>
- <el-form-item label="所属项目课题方案：">
- <el-input v-model="form.planName" placeholder="请输入"></el-input>
- </el-form-item>
<el-form-item label="实验编号：">
- <el-input v-model="form.planCode" placeholder="请输入"></el-input>
+ <el-input v-model="form.experimentCode" placeholder="请输入"></el-input>
</el-form-item>
- <el-form-item label="创建人：" v-if="isChemist">
- <el-input v-model="form.creator" placeholder="请输入"></el-input>
+ <el-form-item label="实验名称：">
+ <el-input v-model="form.experimentName" placeholder="请输入"></el-input>
+ </el-form-item>
+ <el-form-item label="所属项目课题方案：">
+ <el-input v-model="form.projectName" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="创建时间：">
<el-date-picker
@@ -22,11 +22,13 @@
value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
- <el-form-item label="状态：" v-if="!isChemist">
- <el-input v-model="form.approver" placeholder="请输入"></el-input>
- </el-form-item>
- <el-form-item label="实验名称：" v-if="isChemist">
- <el-input v-model="form.experimentName" placeholder="请输入"></el-input>
+ <el-form-item label="状态：">
+ <el-select v-model="form.status" placeholder="请选择">
+ <el-option label="草稿箱" :value="-1"></el-option>
+ <el-option label="已发送待提交" :value="1"></el-option>
+ <el-option label="已提交" :value="2"></el-option>
+ <el-option label="已封存" :value="3"></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="">
<el-button type="default" @click="resetForm">重置</el-button>
@@ -80,6 +82,7 @@
<script>
import ApprovalDialog from './components/approvalDialog.vue'
+import { getList } from './service'
export default {
name: "ProjectList",
@@ -91,15 +94,13 @@
userRole: 'chemist', // 用户角色
currentType: 'list', // 当前显示类型：list-列表，draft-草稿箱
form: {
- planName: "",
- planCode: "",
- creator: "",
- createTime: [],
- approver: "",
- status: "",
+ experimentCode: "",
experimentName: "",
- sampleCount: "",
- receivedStatus: ""
+ projectName: "",
+ createTime: [],
+ status: null,
+ pageNum: 1,
+ pageSize: 10
},
tableData: [],
total: 0,
@@ -232,20 +233,34 @@
},
resetForm() {
this.form = {
- planName: "",
- planCode: "",
- creator: "",
- createTime: [],
- approver: "",
- status: "",
+ experimentCode: "",
experimentName: "",
- sampleCount: "",
- receivedStatus: ""
+ projectName: "",
+ createTime: [],
+ status: null,
+ pageNum: 1,
+ pageSize: 10
};
+ this.handleSearch();
},
- handleSearch() {
- // 实现查询逻辑
- console.log("查询条件：", this.form);
+ async handleSearch() {
+ const params = {
+ experimentCode: this.form.experimentCode,
+ experimentName: this.form.experimentName,
+ projectName: this.form.projectName,
+ startTime: this.form.createTime[0] || null,
+ endTime: this.form.createTime[1] || null,
+ status: this.form.status,
+ pageNum: this.form.pageNum,
+ pageSize: this.form.pageSize
+ };
+ try {
+ const res = await getList(params)
+ this.tableData = res.records || [];
+ this.total = res.total || 0;
+ } catch (error) {
+ console.error("查询失败：", error);
+ }
},
getStatusType(status) {
const statusMap = {
@@ -316,14 +331,7 @@
this.getTableData();
},
getTableData() {
- // 根据currentType请求不同的数据
- if (this.currentType === 'list') {
- this.tableData = this.mockListData;
- this.total = this.mockListData.length;
- } else {
- this.tableData = this.mockDraftData;
- this.total = this.mockDraftData.length;
- }
+ this.handleSearch();
},
},
};
--
Gitblit v1.7.1