From 0b46902b9a7e2a1357e5f6b46edbe3366cb8f785 Mon Sep 17 00:00:00 2001 From: spring <2396852758@qq.com> Date: 星期一, 01 九月 2025 16:17:07 +0800 Subject: [PATCH] Merge branch 'dev_huangjin' into dev --- src/views/inventoryManagement/index.vue | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/views/inventoryManagement/index.vue b/src/views/inventoryManagement/index.vue index 5e97bcb..f371e26 100644 --- a/src/views/inventoryManagement/index.vue +++ b/src/views/inventoryManagement/index.vue @@ -127,18 +127,18 @@ <pagination :total="total" layout="total, sizes, prev, pager, next, jumper" :page="page.current" :limit="page.size" @pagination="paginationChange" /> </div> - <Modal ref="modalRef" @success="handleQuery"></Modal> - <files-dia ref="filesDia"></files-dia> + <!-- <Modal ref="modalRef" @success="handleQuery"></Modal> --> + <!-- <files-dia ref="filesDia"></files-dia> --> </div> </template> <script setup> import { ref, onMounted, reactive, toRefs, nextTick, getCurrentInstance } from 'vue' import dayjs from "dayjs"; -import Modal from "./Modal.vue"; -import FilesDia from "./filesDia.vue"; +// import Modal from "./Modal.vue"; +// import FilesDia from "./filesDia.vue"; import Pagination from "@/components/Pagination/index.vue"; -import {lavorIssueListPage, deleteLedger, update} from "@/api/lavorissce/ledger.js"; +import {listPage, deleteLedger, update} from "@/api/lavorissce/ledger.js"; import {ElMessageBox, ElMessage} from "element-plus"; const { proxy } = getCurrentInstance(); import { getCurrentMonth } from "@/utils/util" @@ -162,7 +162,7 @@ const { searchForm } = toRefs(data); const modalRef = ref(); -const filesDia = ref(); +// const filesDia = ref(); const multipleList = ref([]); const jidu = ref([ { @@ -192,7 +192,7 @@ const getList = async () => { tableLoading.value = true; const params = { ...searchForm.value, ...page.value }; - lavorIssueListPage(params).then(res => { + listPage(params).then(res => { tableLoading.value = false; tableData.value = res.data.records; total.value = res.data.total; @@ -256,11 +256,11 @@ }) } // 鎵撳紑闄勪欢寮规 -const openFilesFormDia = (row) => { - nextTick(() => { - filesDia.value?.openDialog( row,'鏀跺叆') - }) -}; +// const openFilesFormDia = (row) => { +// nextTick(() => { +// filesDia.value?.openDialog( row,'鏀跺叆') +// }) +// }; // 浜嬩欢澶勭悊鍑芥暟 const handleSelectionChange = (selection) => { multipleList.value = selection; -- Gitblit v1.9.3