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/api/lims/dataInterface.js | 27 +
src/api/lims/sample.js | 22 +
src/api/lims/experiment.js | 32 +
src/views/lims/dataInterfaceManagement/index.vue | 247 ++++++++++++
src/api/lims/experimentResource.js | 26 +
src/api/lims/experimentStep.js | 26 +
src/api/lims/sampleStockRecord.js | 26 +
src/views/lims/experimentManagement/index.vue | 358 +++++++++++++++++++
src/views/lims/sampleManagement/index.vue | 238 ++++++++++++
src/api/lims/interfaceField.js | 26 +
src/api/lims/interfaceLog.js | 26 +
src/api/lims/sampleStatusLog.js | 26 +
12 files changed, 1,031 insertions(+), 49 deletions(-)
diff --git a/src/api/lims/dataInterface.js b/src/api/lims/dataInterface.js
index ff20ba6..91087c1 100644
--- a/src/api/lims/dataInterface.js
+++ b/src/api/lims/dataInterface.js
@@ -44,3 +44,30 @@
data: ids
})
}
+
+// ===== 绗簩鎵归渶姹傛柊澧� =====
+
+// 娴嬭瘯杩炴帴
+export function testInterface(id) {
+ return request({ url: '/lims/dataInterface/test/' + id, method: 'post' })
+}
+
+// 绔嬪嵆閲囬泦涓�娆�
+export function collectInterface(id) {
+ return request({ url: '/lims/dataInterface/collect/' + id, method: 'post' })
+}
+
+// 鏌ヨ瀛楁鏄犲皠
+export function listInterfaceFields(interfaceId) {
+ return request({ url: '/lims/dataInterface/fields/' + interfaceId, method: 'get' })
+}
+
+// 鎵归噺淇濆瓨瀛楁鏄犲皠
+export function saveInterfaceFields(data) {
+ return request({ url: '/lims/dataInterface/field/saveBatch', method: 'post', data: data })
+}
+
+// 鏌ヨ璋冪敤鏃ュ織
+export function listInterfaceLogs(query) {
+ return request({ url: '/lims/dataInterface/logs', method: 'get', params: query })
+}
\ No newline at end of file
diff --git a/src/api/lims/experiment.js b/src/api/lims/experiment.js
index bf3224f..4fa1ff8 100644
--- a/src/api/lims/experiment.js
+++ b/src/api/lims/experiment.js
@@ -44,3 +44,35 @@
data: ids
})
}
+
+// ===== 绗簩鎵归渶姹傛柊澧� =====
+
+// 瀹為獙璇︽儏锛堝惈娴佺▼鑺傜偣涓庤祫婧愬垎閰嶏級
+export function getExperimentDetail(id) {
+ return request({ url: '/lims/experiment/detail/' + id, method: 'get' })
+}
+
+// 鎵归噺淇濆瓨瀹為獙娴佺▼鑺傜偣
+export function saveExperimentSteps(data) {
+ return request({ url: '/lims/experiment/step/saveBatch', method: 'post', data: data })
+}
+
+// 瀹屾垚瀹為獙姝ラ
+export function completeExperimentStep(data) {
+ return request({ url: '/lims/experiment/step/complete', method: 'post', data: data })
+}
+
+// 涓哄疄楠屽垎閰嶈祫婧�
+export function assignExperimentResource(data) {
+ return request({ url: '/lims/experiment/assignResource', method: 'post', data: data })
+}
+
+// 绉婚櫎瀹為獙璧勬簮
+export function removeExperimentResource(id) {
+ return request({ url: '/lims/experiment/resource/' + id, method: 'delete' })
+}
+
+// 鑾峰彇娴佺▼妯℃澘
+export function getStepTemplate(type) {
+ return request({ url: '/lims/experiment/stepTemplate', method: 'get', params: { type } })
+}
\ No newline at end of file
diff --git a/src/api/lims/experimentResource.js b/src/api/lims/experimentResource.js
new file mode 100644
index 0000000..082f38d
--- /dev/null
+++ b/src/api/lims/experimentResource.js
@@ -0,0 +1,26 @@
+// 瀹為獙璧勬簮鍒嗛厤鎺ュ彛
+import request from '@/utils/request'
+
+export function listExperimentResource(query) {
+ return request({ url: '/lims/experimentResource/listPage', method: 'get', params: query })
+}
+
+export function listAllExperimentResource(query) {
+ return request({ url: '/lims/experimentResource/listAll', method: 'get', params: query })
+}
+
+export function getExperimentResource(id) {
+ return request({ url: '/lims/experimentResource/' + id, method: 'get' })
+}
+
+export function addExperimentResource(data) {
+ return request({ url: '/lims/experimentResource/add', method: 'post', data: data })
+}
+
+export function updateExperimentResource(data) {
+ return request({ url: '/lims/experimentResource/update', method: 'post', data: data })
+}
+
+export function delExperimentResource(ids) {
+ return request({ url: '/lims/experimentResource/delete', method: 'delete', data: ids })
+}
\ No newline at end of file
diff --git a/src/api/lims/experimentStep.js b/src/api/lims/experimentStep.js
new file mode 100644
index 0000000..6c620b3
--- /dev/null
+++ b/src/api/lims/experimentStep.js
@@ -0,0 +1,26 @@
+// 瀹為獙娴佺▼鑺傜偣鎺ュ彛
+import request from '@/utils/request'
+
+export function listExperimentStep(query) {
+ return request({ url: '/lims/experimentStep/listPage', method: 'get', params: query })
+}
+
+export function listAllExperimentStep(query) {
+ return request({ url: '/lims/experimentStep/listAll', method: 'get', params: query })
+}
+
+export function getExperimentStep(id) {
+ return request({ url: '/lims/experimentStep/' + id, method: 'get' })
+}
+
+export function addExperimentStep(data) {
+ return request({ url: '/lims/experimentStep/add', method: 'post', data: data })
+}
+
+export function updateExperimentStep(data) {
+ return request({ url: '/lims/experimentStep/update', method: 'post', data: data })
+}
+
+export function delExperimentStep(ids) {
+ return request({ url: '/lims/experimentStep/delete', method: 'delete', data: ids })
+}
\ No newline at end of file
diff --git a/src/api/lims/interfaceField.js b/src/api/lims/interfaceField.js
new file mode 100644
index 0000000..2a336cf
--- /dev/null
+++ b/src/api/lims/interfaceField.js
@@ -0,0 +1,26 @@
+// 鎺ュ彛瀛楁鏄犲皠鎺ュ彛
+import request from '@/utils/request'
+
+export function listInterfaceField(query) {
+ return request({ url: '/lims/interfaceField/listPage', method: 'get', params: query })
+}
+
+export function listAllInterfaceField(query) {
+ return request({ url: '/lims/interfaceField/listAll', method: 'get', params: query })
+}
+
+export function getInterfaceField(id) {
+ return request({ url: '/lims/interfaceField/' + id, method: 'get' })
+}
+
+export function addInterfaceField(data) {
+ return request({ url: '/lims/interfaceField/add', method: 'post', data: data })
+}
+
+export function updateInterfaceField(data) {
+ return request({ url: '/lims/interfaceField/update', method: 'post', data: data })
+}
+
+export function delInterfaceField(ids) {
+ return request({ url: '/lims/interfaceField/delete', method: 'delete', data: ids })
+}
\ No newline at end of file
diff --git a/src/api/lims/interfaceLog.js b/src/api/lims/interfaceLog.js
new file mode 100644
index 0000000..dae66af
--- /dev/null
+++ b/src/api/lims/interfaceLog.js
@@ -0,0 +1,26 @@
+// 鎺ュ彛璋冪敤鏃ュ織鎺ュ彛
+import request from '@/utils/request'
+
+export function listInterfaceLog(query) {
+ return request({ url: '/lims/interfaceLog/listPage', method: 'get', params: query })
+}
+
+export function listAllInterfaceLog(query) {
+ return request({ url: '/lims/interfaceLog/listAll', method: 'get', params: query })
+}
+
+export function getInterfaceLog(id) {
+ return request({ url: '/lims/interfaceLog/' + id, method: 'get' })
+}
+
+export function addInterfaceLog(data) {
+ return request({ url: '/lims/interfaceLog/add', method: 'post', data: data })
+}
+
+export function updateInterfaceLog(data) {
+ return request({ url: '/lims/interfaceLog/update', method: 'post', data: data })
+}
+
+export function delInterfaceLog(ids) {
+ return request({ url: '/lims/interfaceLog/delete', method: 'delete', data: ids })
+}
\ No newline at end of file
diff --git a/src/api/lims/sample.js b/src/api/lims/sample.js
index 2a221c4..291f9eb 100644
--- a/src/api/lims/sample.js
+++ b/src/api/lims/sample.js
@@ -44,3 +44,25 @@
data: ids
})
}
+
+// ===== 绗簩鎵归渶姹傛柊澧� =====
+
+// 鏍峰搧璇︽儏锛堝惈鍑哄叆搴撴祦姘翠笌鐘舵�佸彉鏇村巻鍙诧級
+export function getSampleDetail(id) {
+ return request({ url: '/lims/sample/detail/' + id, method: 'get' })
+}
+
+// 鏍峰搧鍑哄簱
+export function outStockSample(data) {
+ return request({ url: '/lims/sample/outStock', method: 'post', data: data })
+}
+
+// 鏍峰搧鍏ュ簱
+export function inStockSample(data) {
+ return request({ url: '/lims/sample/inStock', method: 'post', data: data })
+}
+
+// 鏍峰搧鐘舵�佹祦杞�
+export function changeSampleStatus(data) {
+ return request({ url: '/lims/sample/changeStatus', method: 'post', data: data })
+}
\ No newline at end of file
diff --git a/src/api/lims/sampleStatusLog.js b/src/api/lims/sampleStatusLog.js
new file mode 100644
index 0000000..39bf1a1
--- /dev/null
+++ b/src/api/lims/sampleStatusLog.js
@@ -0,0 +1,26 @@
+// 鏍峰搧鐘舵�佸彉鏇村巻鍙叉帴鍙�
+import request from '@/utils/request'
+
+export function listSampleStatusLog(query) {
+ return request({ url: '/lims/sampleStatusLog/listPage', method: 'get', params: query })
+}
+
+export function listAllSampleStatusLog(query) {
+ return request({ url: '/lims/sampleStatusLog/listAll', method: 'get', params: query })
+}
+
+export function getSampleStatusLog(id) {
+ return request({ url: '/lims/sampleStatusLog/' + id, method: 'get' })
+}
+
+export function addSampleStatusLog(data) {
+ return request({ url: '/lims/sampleStatusLog/add', method: 'post', data: data })
+}
+
+export function updateSampleStatusLog(data) {
+ return request({ url: '/lims/sampleStatusLog/update', method: 'post', data: data })
+}
+
+export function delSampleStatusLog(ids) {
+ return request({ url: '/lims/sampleStatusLog/delete', method: 'delete', data: ids })
+}
\ No newline at end of file
diff --git a/src/api/lims/sampleStockRecord.js b/src/api/lims/sampleStockRecord.js
new file mode 100644
index 0000000..5a96267
--- /dev/null
+++ b/src/api/lims/sampleStockRecord.js
@@ -0,0 +1,26 @@
+// 鏍峰搧鍑哄叆搴撴祦姘存帴鍙�
+import request from '@/utils/request'
+
+export function listSampleStockRecord(query) {
+ return request({ url: '/lims/sampleStockRecord/listPage', method: 'get', params: query })
+}
+
+export function listAllSampleStockRecord(query) {
+ return request({ url: '/lims/sampleStockRecord/listAll', method: 'get', params: query })
+}
+
+export function getSampleStockRecord(id) {
+ return request({ url: '/lims/sampleStockRecord/' + id, method: 'get' })
+}
+
+export function addSampleStockRecord(data) {
+ return request({ url: '/lims/sampleStockRecord/add', method: 'post', data: data })
+}
+
+export function updateSampleStockRecord(data) {
+ return request({ url: '/lims/sampleStockRecord/update', method: 'post', data: data })
+}
+
+export function delSampleStockRecord(ids) {
+ return request({ url: '/lims/sampleStockRecord/delete', method: 'delete', data: ids })
+}
\ No newline at end of file
diff --git a/src/views/lims/dataInterfaceManagement/index.vue b/src/views/lims/dataInterfaceManagement/index.vue
index 820ba78..26c11d8 100644
--- a/src/views/lims/dataInterfaceManagement/index.vue
+++ b/src/views/lims/dataInterfaceManagement/index.vue
@@ -204,6 +204,88 @@
</template>
</el-dialog>
</div>
+
+ <!-- ===== 瀛楁鏄犲皠寮圭獥 ===== -->
+ <el-dialog v-model="fieldVisible" :title="'瀛楁鏄犲皠 鈥斺�� ' + (fieldInterface.interfaceName || '')" width="1000px">
+ <el-alert type="info" :closable="false" style="margin-bottom: 12px">
+ <template #title>
+ 璁惧杩斿洖 JSON 鏃讹紝鐢ㄣ�孞SON 璺緞銆嶅彇鍊硷紙濡� $.data.temperature锛夛紱杩斿洖绾枃鏈椂鍙渶濉�屾簮瀛楁鍚嶃�嶏紝鏁存鏂囨湰浼氫綔涓哄�笺��
+ </template>
+ </el-alert>
+ <el-table :data="fieldData" border size="small" max-height="420">
+ <el-table-column label="婧愬瓧娈靛悕" width="150">
+ <template #default="{ row }"><el-input v-model="row.sourceField" placeholder="濡� temp" size="small" /></template>
+ </el-table-column>
+ <el-table-column label="JSON 璺緞" width="180">
+ <template #default="{ row }"><el-input v-model="row.sourcePath" placeholder="濡� $.data.temp" size="small" /></template>
+ </el-table-column>
+ <el-table-column label="鐩爣瀛楁" width="140">
+ <template #default="{ row }">
+ <el-select v-model="row.targetField" size="small" style="width: 100%">
+ <el-option v-for="t in TARGET_FIELDS" :key="t.value" :label="t.label" :value="t.value" />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column label="杞崲鏂瑰紡" width="130">
+ <template #default="{ row }">
+ <el-select v-model="row.transformType" size="small" style="width: 100%">
+ <el-option v-for="t in TRANSFORM_TYPES" :key="t.value" :label="t.label" :value="t.value" />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column label="杞崲鍙傛暟" width="130">
+ <template #default="{ row }"><el-input v-model="row.transformValue" placeholder="绯绘暟/鍋忕Щ/鏄犲皠JSON" size="small" /></template>
+ </el-table-column>
+ <el-table-column label="榛樿鍊�" width="110">
+ <template #default="{ row }"><el-input v-model="row.defaultValue" size="small" /></template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" width="70" align="center">
+ <template #default="{ $index }">
+ <el-button link type="danger" @click="removeFieldRow($index)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <template #footer>
+ <el-button @click="addFieldRow">鏂板涓�琛�</el-button>
+ <el-button @click="fieldVisible = false">鍙栨秷</el-button>
+ <el-button type="primary" @click="saveFields">淇濆瓨鏄犲皠</el-button>
+ </template>
+ </el-dialog>
+
+ <!-- ===== 璋冪敤鏃ュ織鎶藉眽 ===== -->
+ <el-drawer v-model="logVisible" title="鎺ュ彛璋冪敤鏃ュ織" size="900px" destroy-on-close>
+ <el-table :data="logData" :loading="logLoading" border size="small" max-height="620">
+ <el-table-column prop="invokeTime" label="鏃堕棿" width="160" />
+ <el-table-column prop="interfaceName" label="鎺ュ彛" width="160" show-overflow-tooltip />
+ <el-table-column prop="invokeType" label="绫诲瀷" width="80">
+ <template #default="{ row }">{{ { test: "娴嬭瘯", manual: "鎵嬪姩", auto: "瀹氭椂" }[row.invokeType] || row.invokeType }}</template>
+ </el-table-column>
+ <el-table-column prop="success" label="缁撴灉" width="70">
+ <template #default="{ row }">
+ <el-tag :type="row.success === '1' ? 'success' : 'danger'" size="small">{{ row.success === "1" ? "鎴愬姛" : "澶辫触" }}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="durationMs" label="鑰楁椂" width="80">
+ <template #default="{ row }">{{ row.durationMs }} ms</template>
+ </el-table-column>
+ <el-table-column prop="recordCount" label="鍐欏叆" width="70" />
+ <el-table-column prop="errorMsg" label="閿欒淇℃伅 / 鍝嶅簲鎽樿" show-overflow-tooltip>
+ <template #default="{ row }">{{ row.errorMsg || row.responseData || "鈥�" }}</template>
+ </el-table-column>
+ <el-table-column prop="operator" label="瑙﹀彂浜�" width="90" />
+ </el-table>
+ <div style="margin-top: 12px; text-align: right">
+ <el-pagination
+ v-model:current-page="logQuery.pageNum"
+ v-model:page-size="logQuery.pageSize"
+ :total="logTotal"
+ :page-sizes="[20, 50, 100]"
+ layout="total, sizes, prev, pager, next"
+ @current-change="loadLogs"
+ @size-change="loadLogs"
+ />
+ </div>
+ </el-drawer>
</template>
<script setup>
@@ -216,8 +298,9 @@
listDataInterface,
updateDataInterface,
} from "@/api/lims/dataInterface.js";
-import { ElMessageBox } from "element-plus";
+import { ElMessage, ElMessageBox, ElLoading } from "element-plus";
import { userListNoPage } from "@/api/system/user.js";
+import { testInterface, collectInterface, listInterfaceFields, saveInterfaceFields, listInterfaceLogs } from "@/api/lims/dataInterface";
import useUserStore from "@/store/modules/user";
const { proxy } = getCurrentInstance();
const userStore = useUserStore();
@@ -273,22 +356,39 @@
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',
+ width: 300,
+ operation: [
+ {
+ name: "娴嬭瘯",
+ type: "text",
+ clickFun: (row) => { doTest(row); },
},
- disabled: (row) => {
- return row.maintainer !== userStore.nickName
- }
- },
- ],
+ {
+ name: "閲囬泦",
+ type: "text",
+ clickFun: (row) => { doCollect(row); },
+ },
+ {
+ name: "瀛楁鏄犲皠",
+ type: "text",
+ clickFun: (row) => { openFields(row); },
+ },
+ {
+ name: "鏃ュ織",
+ type: "text",
+ clickFun: (row) => { openLogs(row); },
+ },
+ {
+ name: "缂栬緫",
+ type: "text",
+ clickFun: (row) => { openForm("edit", row); },
+ disabled: (row) => row.maintainer !== userStore.nickName,
+ },
+ ],
},
]);
const tableData = ref([]);
@@ -471,6 +571,121 @@
return `${year}-${month}-${day}`;
}
+// ==================== 绗簩鎵归渶姹傦細娴嬭瘯/閲囬泦/瀛楁鏄犲皠/鏃ュ織 ====================
+const fieldVisible = ref(false);
+const fieldData = ref([]);
+const fieldInterface = ref({});
+const logVisible = ref(false);
+const logData = ref([]);
+const logLoading = ref(false);
+const logTotal = ref(0);
+const logQuery = ref({ pageNum: 1, pageSize: 20 });
+const collecting = ref(false);
+
+const TARGET_FIELDS = [
+ { value: "collectionValue", label: "閲囬泦鏁板��" },
+ { value: "deviceName", label: "璁惧鍚嶇О" },
+ { value: "deviceCode", label: "璁惧缂栧彿" },
+ { value: "dataType", label: "鏁版嵁绫诲瀷" },
+ { value: "unit", label: "璁¢噺鍗曚綅" },
+ { value: "rawData", label: "鍘熷鏁版嵁" },
+ { value: "processedData", label: "澶勭悊鍚庢暟鎹�" },
+];
+const TRANSFORM_TYPES = [
+ { value: "none", label: "鐩存帴浣跨敤" },
+ { value: "multiply", label: "涔樹互绯绘暟" },
+ { value: "divide", label: "闄や互绯绘暟" },
+ { value: "offset", label: "鍔犲亸绉婚噺" },
+ { value: "map", label: "瀛楀吀鏄犲皠" },
+];
+
+// 娴嬭瘯杩炴帴
+const doTest = (row) => {
+ const loading = ElLoading.service({ text: "姝e湪娴嬭瘯杩炴帴鈥�", background: "rgba(0,0,0,0.3)" });
+ testInterface(row.id).then((res) => {
+ loading.close();
+ ElMessageBox.alert(res.msg || "杩炴帴鎴愬姛", "娴嬭瘯缁撴灉", { type: "success" });
+ }).catch((e) => {
+ loading.close();
+ const m = (e && e.msg) || (e && e.response && e.response.data && e.response.data.msg) || "杩炴帴澶辫触";
+ ElMessageBox.alert(m, "娴嬭瘯缁撴灉", { type: "error" });
+ });
+};
+
+// 绔嬪嵆閲囬泦
+const doCollect = (row) => {
+ ElMessageBox.confirm(`纭瀵广��${row.interfaceName}銆嶇珛鍗抽噰闆嗕竴娆℃暟鎹紵`, "鎻愮ず", { type: "info" }).then(() => {
+ collecting.value = true;
+ const loading = ElLoading.service({ text: "姝e湪閲囬泦鈥�", background: "rgba(0,0,0,0.3)" });
+ collectInterface(row.id).then((res) => {
+ loading.close();
+ collecting.value = false;
+ const d = res.data || {};
+ let msg = res.msg || "閲囬泦瀹屾垚";
+ if (d.rawLength !== undefined) msg += `\n鍝嶅簲闀垮害锛�${d.rawLength} 瀛楃`;
+ if (d.warnings && d.warnings.length) msg += "\n鎻愮ず锛�" + d.warnings.join("锛�");
+ ElMessageBox.alert(msg.replace(/\n/g, "<br/>"), "閲囬泦缁撴灉", {
+ type: "success",
+ dangerouslyUseHTMLString: true,
+ });
+ }).catch((e) => {
+ loading.close();
+ collecting.value = false;
+ const m = (e && e.msg) || "閲囬泦澶辫触";
+ ElMessageBox.alert(m, "閲囬泦缁撴灉", { type: "error" });
+ });
+ }).catch(() => {});
+};
+
+// 瀛楁鏄犲皠
+const openFields = (row) => {
+ fieldInterface.value = row;
+ fieldData.value = [];
+ fieldVisible.value = true;
+ listInterfaceFields(row.id).then((res) => {
+ const list = res.data || [];
+ fieldData.value = list.length ? list.map((x) => ({ ...x })) : [newFieldRow()];
+ });
+};
+const newFieldRow = () => ({
+ sourceField: "",
+ sourcePath: "",
+ targetField: "collectionValue",
+ transformType: "none",
+ transformValue: "",
+ defaultValue: "",
+ remark: "",
+});
+const addFieldRow = () => { fieldData.value.push(newFieldRow()); };
+const removeFieldRow = (i) => { fieldData.value.splice(i, 1); };
+const saveFields = () => {
+ const rows = fieldData.value.filter((r) => r.sourceField && r.sourceField.trim());
+ if (!rows.length) { ElMessage.warning("鑷冲皯閰嶇疆涓�鏉″瓧娈垫槧灏�"); return; }
+ saveInterfaceFields({
+ interfaceId: fieldInterface.value.id,
+ fields: rows.map((r, i) => ({ ...r, interfaceCode: fieldInterface.value.interfaceCode, sortNo: i + 1 })),
+ }).then((res) => {
+ ElMessage.success(res.msg || "宸蹭繚瀛�");
+ fieldVisible.value = false;
+ });
+};
+
+// 璋冪敤鏃ュ織
+const openLogs = (row) => {
+ logQuery.value = { pageNum: 1, pageSize: 20, interfaceId: row ? row.id : undefined };
+ logData.value = [];
+ logVisible.value = true;
+ loadLogs();
+};
+const loadLogs = () => {
+ logLoading.value = true;
+ listInterfaceLogs(logQuery.value).then((res) => {
+ logLoading.value = false;
+ logData.value = res.data.records || [];
+ logTotal.value = res.data.total || 0;
+ }).catch(() => (logLoading.value = false));
+};
+
onMounted(() => {
getList();
});
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();
});
diff --git a/src/views/lims/sampleManagement/index.vue b/src/views/lims/sampleManagement/index.vue
index e22c4ec..966a71e 100644
--- a/src/views/lims/sampleManagement/index.vue
+++ b/src/views/lims/sampleManagement/index.vue
@@ -38,6 +38,7 @@
</div>
<div>
<el-button type="primary" @click="openForm('add')">鏂板鏍峰搧</el-button>
+ <el-button type="warning" plain @click="openOutStock()">鍑哄簱</el-button>
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
</div>
@@ -249,6 +250,93 @@
</template>
</el-dialog>
</div>
+
+ <!-- ===== 鏍峰搧璇︽儏鎶藉眽锛氬嚭鍏ュ簱娴佹按 + 鐘舵�佸彉鏇村巻鍙� ===== -->
+ <el-drawer v-model="detailVisible" title="鏍峰搧璇︽儏" size="820px" destroy-on-close>
+ <div v-if="detailData.sample" style="padding: 0 12px">
+ <el-descriptions :column="3" border size="small" title="鍩烘湰淇℃伅">
+ <el-descriptions-item label="鏍峰搧缂栧彿">{{ detailData.sample.sampleCode }}</el-descriptions-item>
+ <el-descriptions-item label="鏍峰搧鍚嶇О">{{ detailData.sample.sampleName }}</el-descriptions-item>
+ <el-descriptions-item label="绫诲瀷">{{ detailData.sample.sampleType }}</el-descriptions-item>
+ <el-descriptions-item label="瑙勬牸">{{ detailData.sample.specification }}</el-descriptions-item>
+ <el-descriptions-item label="鏁伴噺">{{ detailData.sample.quantity }} {{ detailData.sample.unit }}</el-descriptions-item>
+ <el-descriptions-item label="褰撳墠鐘舵��">
+ <el-tag :type="statusTagType(detailData.sample.sampleStatus)" size="small">{{ statusText(detailData.sample.sampleStatus) }}</el-tag>
+ </el-descriptions-item>
+ <el-descriptions-item label="瀛樺偍浣嶇疆">{{ detailData.sample.storageLocation }}</el-descriptions-item>
+ <el-descriptions-item label="鍏ュ簱鏃ユ湡">{{ detailData.sample.inStockDate }}</el-descriptions-item>
+ <el-descriptions-item label="鏈夋晥鏈熻嚦">{{ detailData.sample.validityDate }}</el-descriptions-item>
+ </el-descriptions>
+
+ <el-divider content-position="left">鍑哄叆搴撴祦姘达紙{{ (detailData.stockRecords || []).length }} 鏉★級</el-divider>
+ <el-table :data="detailData.stockRecords || []" border size="small" max-height="300">
+ <el-table-column prop="operateTime" label="鏃堕棿" width="160" />
+ <el-table-column prop="recordType" label="绫诲瀷" width="80">
+ <template #default="{ row }">
+ <el-tag :type="row.recordType === 'in' ? 'success' : 'warning'" size="small">{{ recordTypeText(row.recordType) }}</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="quantity" label="鏁伴噺" width="90" />
+ <el-table-column label="鐘舵�佸彉鍖�" width="150">
+ <template #default="{ row }">{{ statusText(row.beforeStatus) }} 鈫� {{ statusText(row.afterStatus) }}</template>
+ </el-table-column>
+ <el-table-column prop="operator" label="缁忔墜浜�" width="100" />
+ <el-table-column prop="recipient" label="棰嗙敤鏂�" width="110" show-overflow-tooltip />
+ <el-table-column prop="purpose" label="浜嬬敱" show-overflow-tooltip />
+ </el-table>
+
+ <el-divider content-position="left">鐘舵�佸彉鏇村巻鍙诧紙{{ (detailData.statusLogs || []).length }} 鏉★級</el-divider>
+ <el-timeline v-if="(detailData.statusLogs || []).length">
+ <el-timeline-item
+ v-for="log in detailData.statusLogs"
+ :key="log.id"
+ :timestamp="log.operateTime"
+ placement="top"
+ >
+ <div>{{ statusText(log.fromStatus) }} <b>鈫�</b> {{ statusText(log.toStatus) }}</div>
+ <div style="color: #909399; font-size: 12px">{{ log.changeReason || "鈥�" }}銆�鎿嶄綔浜猴細{{ log.operator || "鈥�" }}</div>
+ </el-timeline-item>
+ </el-timeline>
+ <el-empty v-else description="鏆傛棤鐘舵�佸彉鏇磋褰�" :image-size="60" />
+ </div>
+ </el-drawer>
+
+ <!-- ===== 鏍峰搧鍑哄簱寮圭獥 ===== -->
+ <el-dialog v-model="outStockVisible" title="鏍峰搧鍑哄簱" width="560px">
+ <el-form :model="outForm" label-position="top">
+ <el-form-item label="鏍峰搧">
+ <el-input :model-value="outForm.sampleName + '锛�' + outForm.sampleCode + '锛岀幇鏈� ' + (outForm.stock ?? 0) + (outForm.unit || '') + '锛�'" disabled />
+ </el-form-item>
+ <el-row :gutter="16">
+ <el-col :span="12">
+ <el-form-item label="鍑哄簱鏁伴噺">
+ <el-input-number v-model="outForm.quantity" :precision="4" :min="0.0001" :max="outForm.stock || 999999" style="width: 100%" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="棰嗙敤鏂�/鎺ユ敹浜�">
+ <el-input v-model="outForm.recipient" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-form-item label="鍘诲悜 / 鏂板瓨鍌ㄤ綅缃�">
+ <el-input v-model="outForm.toLocation" placeholder="濡傦細妫�娴嬪 A / 瀹㈡埛鐜板満" />
+ </el-form-item>
+ <el-form-item label="鍑哄簱浜嬬敱">
+ <el-input v-model="outForm.purpose" placeholder="濡傦細閫佹銆佺暀鏍疯浆绉汇�侀攢姣佸墠澶勭悊" />
+ </el-form-item>
+ <el-form-item label="鍏宠仈瀹為獙缂栧彿锛堝彲閫夛級">
+ <el-input v-model="outForm.relatedExperiment" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item label="澶囨敞">
+ <el-input v-model="outForm.remark" type="textarea" :rows="2" />
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <el-button @click="outStockVisible = false">鍙栨秷</el-button>
+ <el-button type="primary" @click="submitOutStock">纭鍑哄簱</el-button>
+ </template>
+ </el-dialog>
</template>
<script setup>
@@ -261,8 +349,9 @@
listSample,
updateSample,
} from "@/api/lims/sample.js";
-import { ElMessageBox } from "element-plus";
+import { ElMessage, ElMessageBox } from "element-plus";
import { userListNoPage } from "@/api/system/user.js";
+import { getSampleDetail, outStockSample } from "@/api/lims/sample";
import useUserStore from "@/store/modules/user";
const { proxy } = getCurrentInstance();
const userStore = useUserStore();
@@ -328,22 +417,36 @@
width: 100,
},
{
- dataType: "action",
- label: "鎿嶄綔",
- align: "center",
- fixed: 'right',
- operation: [
- {
- name: "缂栬緫",
- type: "text",
- clickFun: (row) => {
- openForm("edit", row);
- },
- disabled: (row) => {
- return row.maintainer !== userStore.nickName
- }
- },
- ],
+ dataType: "action",
+ label: "鎿嶄綔",
+ align: "center",
+ fixed: 'right',
+ operation: [
+ {
+ name: "璇︽儏",
+ type: "text",
+ clickFun: (row) => {
+ openDetail(row);
+ },
+ },
+ {
+ name: "鍑哄簱",
+ type: "text",
+ clickFun: (row) => {
+ openOutStock(row);
+ },
+ },
+ {
+ name: "缂栬緫",
+ type: "text",
+ clickFun: (row) => {
+ openForm("edit", row);
+ },
+ disabled: (row) => {
+ return row.maintainer !== userStore.nickName
+ }
+ },
+ ],
},
]);
const tableData = ref([]);
@@ -531,6 +634,107 @@
return `${year}-${month}-${day}`;
}
+// ==================== 绗簩鎵归渶姹傦細璇︽儏 / 鍑哄簱 ====================
+const detailVisible = ref(false);
+const detailData = ref({ sample: null, stockRecords: [], statusLogs: [] });
+const outStockVisible = ref(false);
+const outForm = ref({ sampleId: null, sampleCode: "", sampleName: "", stock: 0, unit: "", quantity: null });
+
+const STATUS_MAP = {
+ inStock: "鍦ㄥ簱",
+ outStock: "鍑哄簱",
+ testing: "妫�娴嬩腑",
+ destroyed: "宸查攢姣�",
+};
+const RECORD_TYPE_MAP = {
+ in: "鍏ュ簱",
+ out: "鍑哄簱",
+ destroy: "閿�姣�",
+ return: "閫�搴�",
+ transfer: "杞Щ",
+};
+const statusText = (s) => STATUS_MAP[s] || s || "鈥�";
+const recordTypeText = (t) => RECORD_TYPE_MAP[t] || t || "鈥�";
+const statusTagType = (s) => {
+ if (s === "inStock") return "success";
+ if (s === "testing") return "warning";
+ if (s === "destroyed") return "danger";
+ return "info";
+};
+
+// 鎵撳紑璇︽儏鎶藉眽
+const openDetail = (row) => {
+ detailData.value = { sample: null, stockRecords: [], statusLogs: [] };
+ detailVisible.value = true;
+ getSampleDetail(row.id).then((res) => {
+ detailData.value = res.data || { sample: null, stockRecords: [], statusLogs: [] };
+ });
+};
+
+// 鎵撳紑鍑哄簱寮圭獥锛堜笉浼� row 鏃剁敤琛ㄦ牸閫変腑琛岋級
+const openOutStock = (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];
+ }
+ if (target.sampleStatus === "destroyed") {
+ ElMessage.warning("鏍峰搧宸查攢姣侊紝涓嶈兘鍑哄簱");
+ return;
+ }
+ if (target.sampleStatus === "outStock") {
+ ElMessage.warning("鏍峰搧宸叉槸鍑哄簱鐘舵��");
+ return;
+ }
+ outForm.value = {
+ sampleId: target.id,
+ sampleCode: target.sampleCode,
+ sampleName: target.sampleName,
+ stock: Number(target.quantity || 0),
+ unit: target.unit || "",
+ quantity: null,
+ recipient: "",
+ toLocation: "",
+ purpose: "",
+ relatedExperiment: "",
+ remark: "",
+ };
+ outStockVisible.value = true;
+};
+
+// 鎻愪氦鍑哄簱
+const submitOutStock = () => {
+ const f = outForm.value;
+ if (!f.quantity || f.quantity <= 0) {
+ ElMessage.warning("璇疯緭鍏ュ嚭搴撴暟閲�");
+ return;
+ }
+ if (f.quantity > f.stock) {
+ ElMessage.warning("鍑哄簱鏁伴噺瓒呰繃褰撳墠搴撳瓨锛堢幇鏈� " + f.stock + (f.unit || "") + "锛�");
+ return;
+ }
+ outStockSample({
+ sampleId: f.sampleId,
+ quantity: f.quantity,
+ recipient: f.recipient,
+ toLocation: f.toLocation,
+ purpose: f.purpose,
+ relatedExperiment: f.relatedExperiment,
+ remark: f.remark,
+ }).then((res) => {
+ ElMessage.success(res.msg || "鍑哄簱鎴愬姛");
+ outStockVisible.value = false;
+ getList();
+ });
+};
+
onMounted(() => {
getList();
});
--
Gitblit v1.9.3