From 0c445ac6d2a20153e5eac390555ba88f950d76b0 Mon Sep 17 00:00:00 2001 From: spring <2396852758@qq.com> Date: 星期四, 14 八月 2025 17:16:16 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev_7004' into dev_7004 --- src/views/equipmentManagement/measurementEquipment/index.vue | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/src/views/equipmentManagement/measurementEquipment/index.vue b/src/views/equipmentManagement/measurementEquipment/index.vue index bb163be..e983a99 100644 --- a/src/views/equipmentManagement/measurementEquipment/index.vue +++ b/src/views/equipmentManagement/measurementEquipment/index.vue @@ -44,6 +44,7 @@ </div> <form-dia ref="formDia" @close="handleQuery"></form-dia> <calibration-dia ref="calibrationDia" @close="handleQuery"></calibration-dia> + <files-dia ref="filesDia"></files-dia> </div> </template> @@ -57,6 +58,7 @@ measuringInstrumentDelete, measuringInstrumentListPage } from "@/api/equipmentManagement/measurementEquipment.js"; +import FilesDia from "./filesDia.vue"; const { proxy } = getCurrentInstance(); const userStore = useUserStore() @@ -136,6 +138,7 @@ dataType: "action", label: "鎿嶄綔", align: "center", + width: '130', fixed: 'right', operation: [ { @@ -149,7 +152,7 @@ name: "闄勪欢", type: "text", clickFun: (row) => { - openCalibrationDia("add", row); + openFilesFormDia(row); }, }, ], @@ -157,6 +160,7 @@ ]); const tableData = ref([]); const tableLoading = ref(false); +const filesDia = ref() const page = reactive({ current: 1, size: 100, @@ -164,6 +168,14 @@ }); const selectedRows = ref([]); +// 鎵撳紑闄勪欢寮规 +const openFilesFormDia = (row) => { + console.log(row) + nextTick(() => { + filesDia.value?.openDialog( row,'璁¢噺鍣ㄥ叿鍙拌处') + }) +}; + // 琛ㄦ牸閫夋嫨鏁版嵁 const handleSelectionChange = (selection) => { selectedRows.value = selection; -- Gitblit v1.9.3