From 10bd1c0bbba80d86313b86559546557b2bdbc920 Mon Sep 17 00:00:00 2001 From: spring <2396852758@qq.com> Date: 星期四, 20 二月 2025 10:21:13 +0800 Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev --- src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue | 52 ++++++++++++++++++++++++---------------------------- 1 files changed, 24 insertions(+), 28 deletions(-) diff --git a/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue b/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue index c28c5b0..bf6d838 100644 --- a/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue +++ b/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue @@ -17,9 +17,9 @@ </el-upload> </div> <div v-if="filesDialogVisible"> - <lims-table :tableData="tableData" :column="column" - @pagination="pagination" height="500px" key="tableData" - :page="page" :tableLoading="tableLoading"></lims-table> + <lims-table :tableData="tableDataFile" :column="columnFile" + @pagination="paginationFile" height="500px" key="tableDataFile" + :page="pageFile" :tableLoading="tableLoadingFile"></lims-table> </div> </el-dialog> </div> @@ -48,20 +48,18 @@ data() { // 杩欓噷瀛樻斁鏁版嵁 return { - tableData: [], - tableLoading: false, - column: [ + tableDataFile: [], + tableLoadingFile: false, + columnFile: [ { dataType: 'tag', label: '绫诲瀷', prop: 'type', formatData: (params) => { if (params == 1) { - return '鍚堟牸' - } else if (params == 0) { - return '涓嶅悎鏍�' - } else if (params == 3) { - return '涓嶅垽瀹�' + return '鍥剧墖' + } else if (params == 2) { + return '鏂囦欢' } else { return '' } @@ -69,11 +67,9 @@ formatType: (params) => { if (params == 1) { return 'success' - } else if (params == 0) { - return 'danger' - } else if (params == 3) { - return '' - } else { + } else if (params == 2) { + return 'warning' + } else { return '' } } @@ -104,7 +100,7 @@ ] } ], - page: { + pageFile: { total:0, size:10, current:1 @@ -127,37 +123,37 @@ } }, mounted() { - this.refreshTable() + this.getFileList() }, // 鏂规硶闆嗗悎 methods: { // 鍒囨崲鏁版嵁鏌ョ湅tab鏍� handleDataVisibleTab (m, i) { this.dataVisibleIndex = i - this.refreshTable() + this.getFileList() }, // 鏌ヨ鍥炶皟 - refreshTable() { + getFileList() { if (this.dataVisibleIndex === 0) { this.entity.insOrderId = this.filesLookInfo.enterOrderId } else { this.entity.insOrderId = this.filesLookInfo.quarterOrderId } - this.tableLoading = true + this.tableLoadingFile = true const params = {...this.entity} getFileList(params).then(res => { - this.tableLoading = false + this.tableLoadingFile = false if (res.code === 200) { - this.tableData = res.data.records - this.page.total = res.data.total + this.tableDataFile = res.data.records + this.pageFile.total = res.data.total } }).catch(err => { - this.tableLoading = false + this.tableLoadingFile = false }) }, - pagination (page) { - this.page.size = page.limit - this.refreshTable() + paginationFile (page) { + this.pageFile.size = page.limit + this.getFileList() }, // 涓嬭浇 handleDown(row){ -- Gitblit v1.9.3