From b7ec20b3ec22c858f2db3d9285c5e9d38bd8a48f Mon Sep 17 00:00:00 2001
From: 13404089107 <puwei@sinata.cn>
Date: 星期四, 08 五月 2025 16:17:19 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
laboratory/src/views/dataManagement/suspendExperiment/list.vue | 106 ++++++++++++++--------------------------------------
1 files changed, 29 insertions(+), 77 deletions(-)
diff --git a/culture/src/views/dataManagement/approvalPlan/list.vue b/laboratory/src/views/dataManagement/suspendExperiment/list.vue
similarity index 69%
rename from culture/src/views/dataManagement/approvalPlan/list.vue
rename to laboratory/src/views/dataManagement/suspendExperiment/list.vue
index 0551aef..d643cb0 100644
--- a/culture/src/views/dataManagement/approvalPlan/list.vue
+++ b/laboratory/src/views/dataManagement/suspendExperiment/list.vue
@@ -3,115 +3,62 @@
<TableCustom :queryForm="form" :tableData="tableData" :total="total">
<template #search>
<el-form :model="form" labelWidth="auto" inline>
- <el-form-item label="项目课题方案名称：">
+ <el-form-item label="所属项目课题方案：">
<el-input v-model="form.planName" placeholder="请输入"></el-input>
</el-form-item>
- <el-form-item label="项目课题方案编号：">
+ <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-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-form-item label="状态">
<el-input v-model="form.approver" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="">
<el-button type="default" @click="resetForm">重置</el-button>
- <el-button type="primary" @click="handleSearch">查询</el-button>
+ <el-button type="primary" @click="handleSearch" style="margin-left: 20px;">查询</el-button>
</el-form-item>
</el-form>
</template>
<template #setting>
<div class="tableTitle">
<div class="flex a-center">
- <div
- class="title"
- :class="{active:currentType === 'list'}"
- @click="handleTypeChange('list')"
- >项目课题方案列表</div>
- <div
- class="drafts"
- :class="{active:currentType === 'draft'}"
- @click="handleTypeChange('draft')"
- >草稿箱</div>
+ <div class="title" :class="{ active: currentType === 'list' }" @click="handleTypeChange('list')">申请中止试验方案列表
+ </div>
</div>
- <el-button @click="handleAddPlan" class="el-icon-plus" type="primary">
- 新增项目课题方案</el-button
- >
</div>
</template>
<template #table>
- <el-table-column
- prop="planCode"
- label="项目课题方案编号"
- ></el-table-column>
- <el-table-column
- prop="planName"
- label="项目课题方案名称"
- ></el-table-column>
- <el-table-column prop="stage" label="项目阶段"></el-table-column>
- <el-table-column prop="creator" label="创建人"></el-table-column>
- <el-table-column prop="createTime" label="创建日期"></el-table-column>
- <el-table-column prop="status" label="审批状态">
+ <el-table-column prop="planCode" label="所属项目课题方案"></el-table-column>
+ <el-table-column prop="planName" label="实验编号"></el-table-column>
+ <el-table-column prop="stage" label="实验名称"></el-table-column>
+ <el-table-column prop="creator" label="试验日期"></el-table-column>
+ <el-table-column prop="createTime" label="实验员"></el-table-column>
+ <el-table-column prop="approver" label="提交时间"></el-table-column>
+ <el-table-column prop="approveTime" label="提交人"></el-table-column>
+ <el-table-column prop="status" label="当前状态">
<template slot-scope="scope">
<el-tag :type="getStatusType(scope.row.status)">
{{ getStatusText(scope.row.status) }}
</el-tag>
</template>
</el-table-column>
- <el-table-column prop="approver" label="审批人"></el-table-column>
- <el-table-column prop="approveTime" label="审批时间"></el-table-column>
+
<el-table-column label="操作" width="250">
<template slot-scope="scope">
- <el-button
- v-if="scope.row.status === 'pending'"
- type="text"
- @click="handleApprove(scope.row)"
- >审批</el-button
- >
- <el-button
- v-if="scope.row.status === 'approved'"
- type="text"
- @click="handleRevokeApprove(scope.row)"
- >撤销审批</el-button
- >
- <el-button
- v-if="scope.row.status === 'rejected'"
- type="text"
- @click="handleEdit(scope.row)"
- >编辑</el-button
- >
- <el-button
- v-if="scope.row.status === 'rejected'"
- type="text"
- @click="handleDelete(scope.row)"
- >删除</el-button
- >
- <el-button type="text" @click="handleDetail(scope.row)"
- >详情</el-button
- >
+ <el-button v-if="scope.row.status === 'pending'" type="text"
+ @click="handleApprove(scope.row)">审批</el-button>
+
+ <el-button type="text" @click="handleDetail(scope.row)">详情</el-button>
</template>
</el-table-column>
</template>
</TableCustom>
<!-- 审批弹窗 -->
- <approval-dialog
- :visible.sync="approvalDialogVisible"
- :type="approvalDialogType"
- :data="currentApprovalData"
- @approve="handleApproveSubmit"
- @reject="handleRejectSubmit"
- />
+ <approval-dialog :visible.sync="approvalDialogVisible" :type="approvalDialogType" :data="currentApprovalData"
+ @approve="handleApproveSubmit" @reject="handleRejectSubmit" />
</div>
</template>
@@ -297,15 +244,18 @@
.list {
height: 100%;
}
+
.flex {
display: flex;
align-items: center;
}
+
.tableTitle {
display: flex;
padding-bottom: 20px;
justify-content: space-between;
align-items: center;
+
.title {
background: #fafafc;
border-radius: 8px 8px 0px 0px;
@@ -317,6 +267,7 @@
width: unset;
cursor: pointer;
}
+
.drafts {
padding: 16px 65px;
background: #fafafc;
@@ -328,7 +279,8 @@
margin-left: 16px;
cursor: pointer;
}
- .active{
+
+ .active {
color: #049c9a;
background: #ffffff;
border-radius: 8px 8px 0px 0px;
--
Gitblit v1.7.1