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/qualityManagement/rawMaterialInspection/components/filesDia.vue | 55 +++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 37 insertions(+), 18 deletions(-) diff --git a/src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue index cdce2c5..9907fbe 100644 --- a/src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue +++ b/src/views/qualityManagement/rawMaterialInspection/components/filesDia.vue @@ -29,27 +29,30 @@ :tableLoading="tableLoading" :isSelection="true" @selection-change="handleSelectionChange" - height="600" + height="500" > </PIMTable> + <pagination + style="margin: 10px 0" + v-show="total > 0" + @pagination="paginationSearch" + :total="total" + :page="page.current" + :limit="page.size" + /> <template #footer> <div class="dialog-footer"> <el-button @click="closeDia">鍙栨秷</el-button> </div> </template> </el-dialog> + <filePreview ref="filePreviewRef" /> </div> </template> <script setup> import {ref} from "vue"; -import {getStaffJoinInfo, staffJoinAdd, staffJoinUpdate} from "@/api/personnelManagement/onboarding.js"; -import {Search} from "@element-plus/icons-vue"; -import { - qualityInspectParamDel, - qualityInspectParamInfo, - qualityInspectParamUpdate -} from "@/api/qualityManagement/qualityInspectParam.js"; +import filePreview from '@/components/filePreview/index.vue' import {ElMessageBox} from "element-plus"; import {getToken} from "@/utils/auth.js"; import { @@ -57,6 +60,7 @@ qualityInspectFileDel, qualityInspectFileListPage } from "@/api/qualityManagement/qualityInspectFile.js"; +import Pagination from "@/components/PIMTable/Pagination.vue"; const { proxy } = getCurrentInstance() const emit = defineEmits(['close']) @@ -68,14 +72,6 @@ label: "鏂囦欢鍚嶇О", prop: "name", }, - // { - // label: "涓婁紶浜�", - // prop: "createUser", - // }, - // { - // label: "涓婁紶鏃堕棿", - // prop: "createTime", - // }, { dataType: "action", label: "鎿嶄綔", @@ -87,13 +83,26 @@ clickFun: (row) => { downLoadFile(row); }, - } + }, + { + name: "棰勮", + type: "text", + clickFun: (row) => { + lookFile(row); + }, + } ], }, ]); +const page = reactive({ + current: 1, + size: 100, +}); +const total = ref(0); const tableData = ref([]); const fileList = ref([]); const tableLoading = ref(false); +const filePreviewRef = ref() const headers = ref({ Authorization: "Bearer " + getToken(), }); @@ -105,9 +114,15 @@ currentId.value = row.id; getList() } +const paginationSearch = (obj) => { + page.current = obj.page; + page.size = obj.limit; + getList(); +}; const getList = () => { - qualityInspectFileListPage({inspectId: currentId.value}).then(res => { + qualityInspectFileListPage({inspectId: currentId.value, ...page}).then(res => { tableData.value = res.data.records; + total.value = res.data.total; }) } // 琛ㄦ牸閫夋嫨鏁版嵁 @@ -147,6 +162,10 @@ const downLoadFile = (row) => { proxy.$download.name(row.url); } +// 棰勮闄勪欢 +const lookFile = (row) => { + filePreviewRef.value.open(row.url) +} // 鍒犻櫎 const handleDelete = () => { let ids = []; -- Gitblit v1.9.3