From c94535b792e9df0d3bbeffa10f427624c7c10ee4 Mon Sep 17 00:00:00 2001 From: 董国庆 <364620639@qq.com> Date: 星期四, 29 五月 2025 13:54:21 +0800 Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory --- culture/src/views/strain-library/validation/primitive-cell/index.vue | 48 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 36 insertions(+), 12 deletions(-) diff --git a/culture/src/views/strain-library/validation/primitive-cell/index.vue b/culture/src/views/strain-library/validation/primitive-cell/index.vue index 3f4d3fa..cfe00d5 100644 --- a/culture/src/views/strain-library/validation/primitive-cell/index.vue +++ b/culture/src/views/strain-library/validation/primitive-cell/index.vue @@ -11,7 +11,7 @@ <el-form-item label="鉴别菌株名称:"> <el-input v-model="form.identifyingStrainName" placeholder="请输入"></el-input> </el-form-item> - <el-form-item label="验证实验编号:"> + <el-form-item label="验证实验编号:" v-if="roleType != 4"> <el-input v-model="form.validationExperimentCode" placeholder="请输入"></el-input> </el-form-item> @@ -28,11 +28,11 @@ <div class="title" :class="{ active: currentType === 'list' }" @click="handleTypeChange('list')"> 原始细胞库验证资料 </div> - <div class="drafts" :class="{ active: currentType === 'draft' }" @click="handleTypeChange('draft')"> + <div class="drafts" v-if="roleType==4" :class="{ active: currentType === 'draft' }" @click="handleTypeChange('draft')"> 草稿箱 </div> </div> - <div class="flex a-center"> + <div class="flex a-center" v-if="roleType == 4"> <el-button @click="handleNewStrain" class="el-icon-plus" type="primary" style="margin-right: 12px">新增原始细胞库资料</el-button> </div> @@ -54,18 +54,21 @@ </el-table-column> <el-table-column label="操作" width="200"> <template #default="{ row }"> - <el-button type="text" @click="$router.push('/strain/validation/confirm-detail')">确认</el-button> + <el-button type="text" + v-if="row.status == 1 && roleType == 3" + @click="$router.push('/strain/validation/confirm-detail?id=' + row.id)">确认</el-button> <el-button type="text" @click="handleDetail(row)">详情</el-button> <el-button type="text" @click="handleDetail2(row)">详情</el-button> <el-button type="text" @click="handleEdit(row)">编辑</el-button> - <el-button type="text" @click="handleRecord(row)">删除</el-button> + <el-button type="text" @click="handleDelete(row)">删除</el-button> </template> </el-table-column> </template> </TableCustom> <PrimitiveCellDetailDialog :visible.sync="detailVisible" :detail="currentDetail" /> - <DetailConditionDialog :visible.sync="detailDialogVisible" :value="detailDialogValue" /> + <DetailConditionDialog @viewDetail="viewDetail" :visible.sync="detailDialogVisible" :value="detailDialogValue" /> <EditConditionDialog :visible.sync="editDialogVisible" :value="editDialogValue" /> + <ShowDelConfirm :show="showDelConfirm" @close="showDelConfirm = false" @confirm="handleDelConfirm" /> </div> </template> @@ -74,7 +77,7 @@ import DetailConditionDialog from "./DetailConditionDialog.vue"; import EditConditionDialog from "./EditConditionDialog.vue"; -import { getList } from "./service"; +import { getList, delTwo } from "./service"; export default { name: "PrimitiveCell", components: { @@ -89,7 +92,11 @@ dialogVisible: false, currentType: "list", detailVisible: false, + editDialogVisible: false, + showDelConfirm: false, + editDialogValue: {}, currentDetail: {}, + roleType: JSON.parse(sessionStorage.getItem("userInfo")).roleType, form: { identifyingStrainCode: "", identifyingStrainName: "", @@ -118,6 +125,11 @@ }, handleViewMore() { this.dialogVisible = true; + }, + viewDetail(row) { + row.isDetail = true; + this.editDialogValue = row; + this.editDialogVisible = true; }, resetForm() { this.form = { @@ -154,15 +166,27 @@ // Implement batch add logic }, handleEdit(row) { - // Implement edit logic - }, - handleRecord(row) { this.$router.push({ - path: "/strain-library/strain-library-manage/record", + path: "/strain/validation/edit-primitive-cell", query: { - id: row.strainNo, + id: row.id, }, }); + // Implement edit logic + }, + handleDelete(row) { + this.currentDetail = row; + this.showDelConfirm = true; + }, + handleDelConfirm() { + delTwo({ id: this.currentDetail.id }).then(res => { + this.$message.success('删除成功') + this.showDelConfirm = false + if (this.tableData.length == 1 && this.queryForm.pageNum > 1) { + this.queryForm.pageNum -= 1; + } + this.searchData() + }) }, handleCurrentChange(page) { this.queryForm.pageNum = page; -- Gitblit v1.7.1