From 1a61525947d43fd7c8a6df637bf5c1c8f9cc37f3 Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期四, 26 六月 2025 14:24:32 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
culture/src/views/strainReportLibrary/reportLibraryOneFour/index.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/culture/src/views/strainReportLibrary/reportLibraryOneFour/index.vue b/culture/src/views/strainReportLibrary/reportLibraryOneFour/index.vue
index d170a47..130dd44 100644
--- a/culture/src/views/strainReportLibrary/reportLibraryOneFour/index.vue
+++ b/culture/src/views/strainReportLibrary/reportLibraryOneFour/index.vue
@@ -71,14 +71,14 @@
</el-table-column>
<el-table-column label="操作">
<template #default="{ row }">
- <el-button type="text" v-if="row.status == 1 && [1, 2].includes(roleType)"
+ <el-button type="text" style="margin-right: 10px;" v-if="row.status == 1 && [1, 2].includes(roleType)"
@click="handleAudit(row)">审核</el-button>
- <el-button type="text" v-if="row.status == 2 && [1, 2].includes(roleType)"
+ <el-button type="text" style="margin-right: 10px;" v-if="row.status == 2 && [1, 2].includes(roleType)"
@click="handleEvaluate(row)">评定</el-button>
- <el-button type="text" v-if="row.status != 1" @click="viewDetail(row)">详情</el-button>
- <el-button type="text" v-if="roleType == 3 && row.status == 4 || isDraft"
+ <el-button type="text" style="margin-right: 10px;" v-if="row.status != 1" @click="viewDetail(row)">详情</el-button>
+ <el-button type="text" style="margin-right: 10px;" v-if="roleType == 3 && row.status == 4 || isDraft"
@click="handleDetail(row)">编辑</el-button>
- <el-button type="text" v-if="roleType == 3 && isDraft" @click="handleDelete(row)">删除</el-button>
+ <el-button type="text" style="margin-right: 10px;" v-if="roleType == 3 && isDraft" @click="handleDelete(row)">删除</el-button>
<el-button type="text" v-if="row.status == 1 && roleType == 3&&!isDraft"
@click="handleRevoke(row)">撤销审批</el-button>
</template>
@@ -226,7 +226,7 @@
time: this.form.date.length ? moment(this.form.date[0]).format('YYYY-MM-DD 00:00:00') + ' - ' + moment(this.form.date[1]).format('YYYY-MM-DD 23:59:59') : '',
status: this.form.status,
isDraft: this.isDraft ? 1 : 0,
- reportType: 3
+ reportType: 4
}
getList(params).then(res => {
if (res.code === 200) {
@@ -282,7 +282,7 @@
})
},
handleDetail(row) {
- this.$router.push(`/strainReportLibrary/detail?id=${row.id}`)
+ this.$router.push(`/strainReportLibrary/detailFour?id=${row.id}`)
},
handleExperimentChange(val) {
this.getLists()
--
Gitblit v1.7.1