From 19636a3507391a5ac137bb1f46a413ff662e1177 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期四, 29 十月 2026 14:33:10 +0800
Subject: [PATCH] feat(LIMS): 样品/实验/数据接口三页面增强
---
src/views/lims/experimentManagement/index.vue | 358 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 342 insertions(+), 16 deletions(-)
diff --git a/src/views/lims/experimentManagement/index.vue b/src/views/lims/experimentManagement/index.vue
index e06a900..cd7330d 100644
--- a/src/views/lims/experimentManagement/index.vue
+++ b/src/views/lims/experimentManagement/index.vue
@@ -38,6 +38,7 @@
</div>
<div>
<el-button type="primary" @click="openForm('add')">鏂板瀹為獙</el-button>
+ <el-button type="success" plain @click="openResource()">鍒嗛厤璧勬簮</el-button>
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
</div>
@@ -248,6 +249,153 @@
</template>
</el-dialog>
</div>
+
+ <!-- ===== 瀹為獙璇︽儏鎶藉眽锛氭祦绋嬭妭鐐� + 璧勬簮鍒嗛厤 ===== -->
+ <el-drawer v-model="detailVisible" title="瀹為獙璇︽儏" size="900px" destroy-on-close>
+ <div v-if="detailData.experiment" style="padding: 0 12px">
+ <el-descriptions :column="3" border size="small" title="鍩烘湰淇℃伅">
+ <el-descriptions-item label="瀹為獙缂栧彿">{{ detailData.experiment.experimentCode }}</el-descriptions-item>
+ <el-descriptions-item label="瀹為獙鍚嶇О">{{ detailData.experiment.experimentName }}</el-descriptions-item>
+ <el-descriptions-item label="瀹為獙绫诲瀷">{{ detailData.experiment.experimentType }}</el-descriptions-item>
+ <el-descriptions-item label="瀹為獙鏍囧噯">{{ detailData.experiment.experimentStandard }}</el-descriptions-item>
+ <el-descriptions-item label="璐熻矗浜�">{{ detailData.experiment.responsiblePerson }}</el-descriptions-item>
+ <el-descriptions-item label="鐘舵��">
+ <el-tag :type="expStatusTag(detailData.experiment.experimentStatus)" size="small">{{ expStatusText(detailData.experiment.experimentStatus) }}</el-tag>
+ </el-descriptions-item>
+ <el-descriptions-item label="璁″垝鏃堕棿" :span="2">{{ detailData.experiment.planStartDate }} ~ {{ detailData.experiment.planEndDate }}</el-descriptions-item>
+ <el-descriptions-item label="娴佺▼杩涘害">
+ <el-progress :percentage="detailData.progress || 0" :stroke-width="14" style="width: 160px" />
+ <span style="margin-left: 8px; color: #909399">{{ detailData.stepCompleted || 0 }}/{{ detailData.stepTotal || 0 }} 姝�</span>
+ </el-descriptions-item>
+ </el-descriptions>
+
+ <el-divider content-position="left">
+ 瀹為獙娴佺▼鑺傜偣锛坽{ (detailData.steps || []).length }} 姝ワ級
+ <el-button link type="primary" style="margin-left: 8px" @click="openStepEditor">缂栬緫娴佺▼</el-button>
+ </el-divider>
+ <el-timeline v-if="(detailData.steps || []).length">
+ <el-timeline-item
+ v-for="s in detailData.steps"
+ :key="s.id"
+ :timestamp="'绗� ' + s.stepNo + ' 姝ャ��' + (s.actualEndTime || s.planStartTime || '')"
+ :type="s.stepStatus === 'completed' ? 'success' : s.stepStatus === 'running' ? 'warning' : 'info'"
+ placement="top"
+ >
+ <div style="font-weight: 600">{{ s.stepName }}
+ <el-tag :type="stepStatusTag(s.stepStatus)" size="small" style="margin-left: 8px">{{ stepStatusText(s.stepStatus) }}</el-tag>
+ <el-button v-if="s.stepStatus !== 'completed'" link type="primary" size="small" style="margin-left: 8px" @click="doCompleteStep(s)">鏍囪瀹屾垚</el-button>
+ </div>
+ <div style="color: #606266; font-size: 13px; margin-top: 4px; white-space: pre-wrap">{{ s.stepContent }}</div>
+ <div v-if="s.stepResult" style="color: #67c23a; font-size: 12px; margin-top: 4px">鎵ц缁撴灉锛歿{ s.stepResult }}</div>
+ <div v-if="s.executor" style="color: #909399; font-size: 12px">鎵ц浜猴細{{ s.executor }}</div>
+ </el-timeline-item>
+ </el-timeline>
+ <el-empty v-else description="灏氭湭閰嶇疆娴佺▼鑺傜偣锛岀偣鍙充笂銆岀紪杈戞祦绋嬨�嶆垨濂楃敤妯℃澘" :image-size="60" />
+
+ <el-divider content-position="left">宸插垎閰嶈祫婧愶紙{{ (detailData.resources || []).length }} 椤癸級</el-divider>
+ <el-table :data="detailData.resources || []" border size="small" max-height="260">
+ <el-table-column prop="resourceType" label="绫诲瀷" width="90">
+ <template #default="{ row }">{{ resTypeText(row.resourceType) }}</template>
+ </el-table-column>
+ <el-table-column prop="resourceName" label="鍚嶇О" show-overflow-tooltip />
+ <el-table-column prop="quantity" label="鏁伴噺" width="90" />
+ <el-table-column prop="unit" label="鍗曚綅" width="70" />
+ <el-table-column prop="usageTime" label="浣跨敤鏃舵" width="150" show-overflow-tooltip />
+ <el-table-column prop="status" label="鐘舵��" width="90">
+ <template #default="{ row }">{{ resStatusText(row.status) }}</template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" width="80" align="center">
+ <template #default="{ row }">
+ <el-button link type="danger" @click="doRemoveResource(row)">绉婚櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-drawer>
+
+ <!-- ===== 璧勬簮鍒嗛厤寮圭獥 ===== -->
+ <el-dialog v-model="resourceVisible" title="涓哄疄楠屽垎閰嶈祫婧�" width="600px">
+ <el-form :model="resForm" label-position="top">
+ <el-form-item label="瀹為獙">
+ <el-input :model-value="resForm.experimentName + '锛�' + resForm.experimentCode + '锛�'" disabled />
+ </el-form-item>
+ <el-form-item label="璧勬簮绫诲瀷">
+ <el-radio-group v-model="resForm.resourceType" @change="onResTypeChange">
+ <el-radio-button label="instrument">浠櫒璁惧</el-radio-button>
+ <el-radio-button label="reagent">璇曞墏鑰楁潗</el-radio-button>
+ <el-radio-button label="personnel">鍙備笌浜哄憳</el-radio-button>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item v-if="resForm.resourceType !== 'personnel'" :label="resForm.resourceType === 'instrument' ? '閫夋嫨浠櫒' : '閫夋嫨璇曞墏/鑰楁潗'">
+ <el-select v-model="resForm.resourceId" filterable style="width: 100%" placeholder="璇烽�夋嫨" @change="onResSelect">
+ <el-option
+ v-for="o in resOptions"
+ :key="o.id"
+ :label="resOptionLabel(o)"
+ :value="o.id"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item v-else label="浜哄憳濮撳悕">
+ <el-input v-model="resForm.resourceName" placeholder="璇疯緭鍏ュ弬涓庝汉" />
+ </el-form-item>
+ <el-row :gutter="16">
+ <el-col :span="12">
+ <el-form-item :label="resForm.resourceType === 'reagent' ? '棰嗙敤鏁伴噺锛堜細鎵e噺搴撳瓨锛�' : '鏁伴噺'">
+ <el-input-number v-model="resForm.quantity" :precision="4" :min="0" style="width: 100%" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍗曚綅">
+ <el-input v-model="resForm.unit" placeholder="濡� 鍙� / mL / 浜�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-form-item label="浣跨敤鏃舵">
+ <el-input v-model="resForm.usageTime" placeholder="濡� 2026-10-29 09:00~12:00" />
+ </el-form-item>
+ <el-form-item label="澶囨敞">
+ <el-input v-model="resForm.remark" type="textarea" :rows="2" />
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <el-button @click="resourceVisible = false">鍙栨秷</el-button>
+ <el-button type="primary" @click="submitResource">纭鍒嗛厤</el-button>
+ </template>
+ </el-dialog>
+
+ <!-- ===== 娴佺▼缂栬緫寮圭獥 ===== -->
+ <el-dialog v-model="stepEditorVisible" title="缂栬緫瀹為獙娴佺▼" width="900px">
+ <div style="margin-bottom: 12px">
+ <el-select v-model="templateType" placeholder="濂楃敤娴佺▼妯℃澘" style="width: 240px" clearable @change="applyTemplate">
+ <el-option label="鍖栧鍒嗘瀽锛堥�氱敤锛�" value="chemicalAnalysis" />
+ <el-option label="鐗╃悊娴嬭瘯锛堥�氱敤锛�" value="physicalTest" />
+ <el-option label="寰敓鐗╂娴嬶紙閫氱敤锛�" value="microbialTest" />
+ </el-select>
+ <el-button type="primary" plain style="margin-left: 10px" @click="addStepRow">鏂板姝ラ</el-button>
+ </div>
+ <el-table :data="stepEditorData" border size="small" max-height="420">
+ <el-table-column type="index" label="搴忓彿" width="60" align="center" />
+ <el-table-column label="姝ラ鍚嶇О" width="180">
+ <template #default="{ row }"><el-input v-model="row.stepName" placeholder="璇疯緭鍏�" /></template>
+ </el-table-column>
+ <el-table-column label="鏍囧噯鎿嶄綔鍐呭锛圫OP锛�">
+ <template #default="{ row }"><el-input v-model="row.stepContent" type="textarea" :rows="2" placeholder="璇疯緭鍏�" /></template>
+ </el-table-column>
+ <el-table-column label="鑰楁椂(鍒嗛挓)" width="110">
+ <template #default="{ row }"><el-input-number v-model="row.expectedDuration" :min="0" controls-position="right" style="width: 100%" /></template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" width="70" align="center">
+ <template #default="{ $index }">
+ <el-button link type="danger" @click="removeStepRow($index)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <template #footer>
+ <el-button @click="stepEditorVisible = false">鍙栨秷</el-button>
+ <el-button type="primary" @click="saveSteps">淇濆瓨娴佺▼</el-button>
+ </template>
+ </el-dialog>
</template>
<script setup>
@@ -260,8 +408,11 @@
listExperiment,
updateExperiment,
} from "@/api/lims/experiment.js";
-import { ElMessageBox } from "element-plus";
+import { ElMessage, ElMessageBox } from "element-plus";
import { userListNoPage } from "@/api/system/user.js";
+import { getExperimentDetail, assignExperimentResource, saveExperimentSteps, completeExperimentStep, getStepTemplate } from "@/api/lims/experiment";
+import { listInstrument } from "@/api/lims/instrument";
+import { listReagent } from "@/api/lims/reagent";
import useUserStore from "@/store/modules/user";
const { proxy } = getCurrentInstance();
const userStore = useUserStore();
@@ -317,22 +468,36 @@
width: 100,
},
{
- dataType: "action",
- label: "鎿嶄綔",
- align: "center",
- fixed: 'right',
- operation: [
- {
- name: "缂栬緫",
- type: "text",
- clickFun: (row) => {
- openForm("edit", row);
+ dataType: "action",
+ label: "鎿嶄綔",
+ align: "center",
+ fixed: 'right',
+ operation: [
+ {
+ name: "璇︽儏",
+ type: "text",
+ clickFun: (row) => {
+ openDetail(row);
+ },
},
- disabled: (row) => {
- return row.maintainer !== userStore.nickName
- }
- },
- ],
+ {
+ name: "鍒嗛厤璧勬簮",
+ type: "text",
+ clickFun: (row) => {
+ openResource(row);
+ },
+ },
+ {
+ name: "缂栬緫",
+ type: "text",
+ clickFun: (row) => {
+ openForm("edit", row);
+ },
+ disabled: (row) => {
+ return row.maintainer !== userStore.nickName
+ }
+ },
+ ],
},
]);
const tableData = ref([]);
@@ -518,6 +683,167 @@
return `${year}-${month}-${day}`;
}
+// ==================== 绗簩鎵归渶姹傦細璇︽儏 / 姝ラ / 璧勬簮 ====================
+const detailVisible = ref(false);
+const detailData = ref({ experiment: null, steps: [], resources: [], progress: 0, stepTotal: 0, stepCompleted: 0 });
+const resourceVisible = ref(false);
+const resOptions = ref([]);
+const resForm = ref({});
+const stepEditorVisible = ref(false);
+const stepEditorData = ref([]);
+const templateType = ref("");
+
+const EXP_STATUS_MAP = { planned: "璁″垝涓�", inProgress: "杩涜涓�", completed: "宸插畬鎴�", cancelled: "宸插彇娑�" };
+const STEP_STATUS_MAP = { pending: "寰呮墽琛�", running: "鎵ц涓�", completed: "宸插畬鎴�", skipped: "宸茶烦杩�", failed: "澶辫触" };
+const RES_TYPE_MAP = { instrument: "浠櫒璁惧", reagent: "璇曞墏鑰楁潗", personnel: "鍙備笌浜哄憳" };
+const RES_STATUS_MAP = { planned: "宸插畨鎺�", inuse: "浣跨敤涓�", returned: "宸插綊杩�", consumed: "宸叉秷鑰�" };
+const expStatusText = (s) => EXP_STATUS_MAP[s] || s || "鈥�";
+const stepStatusText = (s) => STEP_STATUS_MAP[s] || s || "鈥�";
+const resTypeText = (s) => RES_TYPE_MAP[s] || s || "鈥�";
+const resStatusText = (s) => RES_STATUS_MAP[s] || s || "鈥�";
+const expStatusTag = (s) => (s === "completed" ? "success" : s === "inProgress" ? "warning" : s === "cancelled" ? "danger" : "info");
+const stepStatusTag = (s) => (s === "completed" ? "success" : s === "running" ? "warning" : s === "failed" ? "danger" : "info");
+
+// 璇︽儏
+const openDetail = (row) => {
+ detailData.value = { experiment: null, steps: [], resources: [], progress: 0, stepTotal: 0, stepCompleted: 0 };
+ detailVisible.value = true;
+ getExperimentDetail(row.id).then((res) => {
+ detailData.value = res.data || detailData.value;
+ });
+};
+
+// 鍒嗛厤璧勬簮
+const openResource = (row) => {
+ let target = row;
+ if (!target) {
+ if (!selectedRows.value.length) { ElMessage.warning("璇峰厛閫夋嫨瀹為獙"); return; }
+ if (selectedRows.value.length > 1) { ElMessage.warning("涓�娆″彧鑳界粰涓�涓疄楠屽垎閰嶈祫婧�"); return; }
+ target = selectedRows.value[0];
+ }
+ resForm.value = {
+ experimentId: target.id,
+ experimentCode: target.experimentCode,
+ experimentName: target.experimentName,
+ resourceType: "instrument",
+ resourceId: null,
+ resourceName: "",
+ quantity: null,
+ unit: "",
+ usageTime: "",
+ remark: "",
+ };
+ resOptions.value = [];
+ loadResOptions("instrument");
+ resourceVisible.value = true;
+};
+const loadResOptions = (type) => {
+ if (type === "instrument") {
+ listInstrument({ pageNum: 1, pageSize: 500 }).then((r) => { resOptions.value = r.data.records || []; });
+ } else if (type === "reagent") {
+ listReagent({ pageNum: 1, pageSize: 500 }).then((r) => { resOptions.value = r.data.records || []; });
+ } else {
+ resOptions.value = [];
+ }
+};
+const onResTypeChange = (t) => {
+ resForm.value.resourceId = null;
+ resForm.value.resourceName = "";
+ loadResOptions(t);
+};
+const onResSelect = (id) => {
+ const o = resOptions.value.find((x) => x.id === id);
+ if (!o) return;
+ if (resForm.value.resourceType === "reagent") {
+ resForm.value.unit = o.unit || "";
+ resForm.value.quantity = null;
+ } else {
+ resForm.value.unit = "鍙�";
+ resForm.value.quantity = 1;
+ }
+};
+const resOptionLabel = (o) => {
+ if (resForm.value.resourceType === "reagent") {
+ return `${o.reagentName}锛堝簱瀛� ${o.currentStock ?? 0}${o.unit || ""}锛塦;
+ }
+ return `${o.instrumentName}锛�${o.instrumentCode}锛塦;
+};
+const submitResource = () => {
+ const f = resForm.value;
+ if (f.resourceType !== "personnel" && !f.resourceId) { ElMessage.warning("璇烽�夋嫨璧勬簮"); return; }
+ if (f.resourceType === "personnel" && !f.resourceName) { ElMessage.warning("璇疯緭鍏ヤ汉鍛樺鍚�"); return; }
+ assignExperimentResource({ ...f }).then((res) => {
+ ElMessage.success(res.msg || "璧勬簮宸插垎閰�");
+ resourceVisible.value = false;
+ if (detailVisible.value) openDetail({ id: f.experimentId });
+ });
+};
+const doRemoveResource = (row) => {
+ ElMessageBox.confirm("纭绉婚櫎璇ヨ祫婧愬垎閰嶏紵", "鎻愮ず", { type: "warning" }).then(() => {
+ removeExperimentResource(row.id).then(() => {
+ ElMessage.success("宸茬Щ闄�");
+ openDetail({ id: row.experimentId });
+ });
+ }).catch(() => {});
+};
+
+// 姝ラ
+const openStepEditor = () => {
+ const steps = detailData.value.steps || [];
+ stepEditorData.value = steps.length
+ ? steps.map((s) => ({ stepName: s.stepName, stepContent: s.stepContent, expectedDuration: s.expectedDuration }))
+ : [];
+ templateType.value = "";
+ stepEditorVisible.value = true;
+};
+const addStepRow = () => {
+ stepEditorData.value.push({ stepName: "", stepContent: "", expectedDuration: null });
+};
+const removeStepRow = (i) => { stepEditorData.value.splice(i, 1); };
+const saveSteps = () => {
+ const exp = detailData.value.experiment;
+ if (!exp) { ElMessage.warning("瀹為獙涓嶅瓨鍦�"); return; }
+ const steps = stepEditorData.value
+ .filter((s) => s.stepName && s.stepName.trim())
+ .map((s, i) => ({
+ stepNo: i + 1,
+ stepName: s.stepName,
+ stepContent: s.stepContent,
+ expectedDuration: s.expectedDuration,
+ stepStatus: "pending",
+ }));
+ if (!steps.length) { ElMessage.warning("鑷冲皯闇�瑕佷竴涓楠�"); return; }
+ saveExperimentSteps({ experimentId: exp.id, steps }).then((res) => {
+ ElMessage.success(res.msg || "娴佺▼宸蹭繚瀛�");
+ stepEditorVisible.value = false;
+ openDetail({ id: exp.id });
+ });
+};
+const applyTemplate = (type) => {
+ if (!type) return;
+ getStepTemplate(type).then((res) => {
+ const list = res.data || [];
+ stepEditorData.value = list.map((s) => ({
+ stepName: s.stepName,
+ stepContent: s.stepContent,
+ expectedDuration: s.expectedDuration,
+ }));
+ ElMessage.success("宸插鐢ㄦā鏉匡紝鍏� " + list.length + " 姝�");
+ });
+};
+const doCompleteStep = (s) => {
+ ElMessageBox.prompt("鍙~鍐欐墽琛岀粨鏋滐紙閫夊~锛�", "瀹屾垚姝ラ锛�" + s.stepName, {
+ inputPlaceholder: "濡� 娴嬪畾瀹屾垚锛岀粨鏋� 45.2",
+ confirmButtonText: "纭瀹屾垚",
+ cancelButtonText: "鍙栨秷",
+ }).then(({ value }) => {
+ completeExperimentStep({ stepId: s.id, stepResult: value }).then(() => {
+ ElMessage.success("姝ラ宸插畬鎴�");
+ openDetail({ id: s.experimentId });
+ });
+ }).catch(() => {});
+};
+
onMounted(() => {
getList();
});
--
Gitblit v1.9.3