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/components/experimental-scheduling.vue | 78 +++++++++++++++++++++++++++++----------
1 files changed, 58 insertions(+), 20 deletions(-)
diff --git a/laboratory/src/views/dataManagement/sampleManage/components/experimental-scheduling.vue b/laboratory/src/views/dataManagement/sampleManage/components/experimental-scheduling.vue
index 83a6c4b..f173a8c 100644
--- a/laboratory/src/views/dataManagement/sampleManage/components/experimental-scheduling.vue
+++ b/laboratory/src/views/dataManagement/sampleManage/components/experimental-scheduling.vue
@@ -1,27 +1,31 @@
<template>
<div>
- <el-dialog title="选择项目组" :visible.sync="show" width="80%">
+ <el-dialog title="选择实验调度" :visible.sync="show" width="80%">
<TableCustom :queryForm="form" :tableData="tableData" :total="total" :height="null">
<template #search>
<el-form :model="form" label-width="140px" inline>
<el-form-item label="所属项目课题方案：">
- <el-input v-model="form.planName" placeholder="请输入"></el-input>
+ <el-input v-model="form.projectName" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="实验编号：">
- <el-input v-model="form.planCode" placeholder="请输入"></el-input>
- </el-form-item>
- <el-form-item label="实验名称：">
- <el-input v-model="form.creator" placeholder="请输入"></el-input>
+ <el-input v-model="form.experimentCode" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="通知时间：">
- <el-date-picker v-model="form.createTime" type="daterange" range-separator="至"
- start-placeholder="开始日期" end-placeholder="结束日期"
- value-format="yyyy-MM-dd"></el-date-picker>
+ <el-date-picker
+ v-model="form.createTime"
+ type="daterange"
+ range-separator="至"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ value-format="yyyy-MM-dd">
+ </el-date-picker>
</el-form-item>
<el-form-item label="状态：">
<el-select v-model="form.status" placeholder="请选择">
- <el-option label="待确认" value="待确认"></el-option>
- <el-option label="已确认" value="已确认"></el-option>
+ <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="" class="search-btn-box">
@@ -37,7 +41,7 @@
<el-table-column prop="planName" label="实验名称"></el-table-column>
<el-table-column prop="stage" label="通知时间"></el-table-column>
<el-table-column prop="stage" label="实验开始时间"></el-table-column>
- <el-table-column prop="stage" label="试验结束时间"></el-table-column>
+ <el-table-column prop="stage" label="实验结束时间"></el-table-column>
<el-table-column prop="stage" label="参加人员"></el-table-column>
<el-table-column prop="creator" label="状态"></el-table-column>
</template>
@@ -51,31 +55,65 @@
</template>
<script>
+import { getDispatchList } from '../service';
+
export default {
props: ['show'],
data() {
return {
- form: {},
+ form: {
+ projectName: "",
+ experimentCode: "",
+ createTime: [],
+ status: null,
+ pageNum: 1,
+ pageSize: 10
+ },
tableData: [],
total: 0
- }
+ };
},
methods: {
resetForm() {
-
+ this.form = {
+ projectName: "",
+ experimentCode: "",
+ createTime: [],
+ status: null,
+ pageNum: 1,
+ pageSize: 10
+ };
+ this.handleSearch();
},
- handleSearch() {
-
+ async handleSearch() {
+ const params = {
+ projectName: this.form.projectName,
+ experimentCode: this.form.experimentCode,
+ 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 getDispatchList(params);
+ this.tableData = res.records || [];
+ this.total = res.total || 0;
+ } catch (error) {
+ console.error("查询失败：", error);
+ }
}
}
-}
+};
</script>
<style lang="less" scoped>
.dialog-footer {
- display: flex
-;
+ display: flex;
justify-content: center;
gap: 10px;
}
+::v-deep .el-range-editor--small {
+ line-height: 30px !important;
+}
</style>
\ No newline at end of file
--
Gitblit v1.7.1