From 3c38a9fbad595a4c35d5928f77ccfc9cfa5e3f58 Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期一, 08 九月 2025 11:23:22 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
culture/src/views/strain-library/breeding-record/index.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/culture/src/views/strain-library/breeding-record/index.vue b/culture/src/views/strain-library/breeding-record/index.vue
index 7a7fd43..75e5ee4 100644
--- a/culture/src/views/strain-library/breeding-record/index.vue
+++ b/culture/src/views/strain-library/breeding-record/index.vue
@@ -49,6 +49,10 @@
<span>{{ scope.row.preserveSource === 1 ? '来源菌株' : '来源物资' }}</span>
</template>
</el-table-column>
+ <el-table-column prop="strainName" label="菌株名称">
+ </el-table-column>
+ <el-table-column prop="sourceMaterialTimeBatchNumber" label="来源物资、时间及批号">
+ </el-table-column>
<el-table-column prop="cultureMedium" label="培养基"></el-table-column>
<el-table-column prop="temperature" label="培养温度"></el-table-column>
<el-table-column prop="aerobicType" label="需氧类型">
@@ -64,7 +68,7 @@
<template slot-scope="scope">
<el-button style="margin-right: 10px" type="text" @click="handleDetail(scope.row)">详情</el-button>
<el-button style="margin-right: 10px" type="text" @click="handleEdit(scope.row)"
- v-if="([1].includes(roleType) || ([1, 4].includes(roleType) && currentType != 'list'))">编辑</el-button>
+ v-if="([1,4].includes(roleType) || ([1, 4].includes(roleType) && currentType != 'list'))">编辑</el-button>
<el-button type="text" @click="handleDelete(scope.row)"
v-if="[1].includes(roleType) || ([1, 4].includes(roleType) && currentType != 'list')">删除</el-button>
</template>
--
Gitblit v1.7.1