From 1c16c1fc8904b917c5f0fee3f82845d9e26d29f9 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 26 五月 2025 13:46:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/procurementManagement/paymentLedger/index.vue | 114 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 71 insertions(+), 43 deletions(-)
diff --git a/src/views/procurementManagement/paymentLedger/index.vue b/src/views/procurementManagement/paymentLedger/index.vue
index 7ee2a3f..18c0176 100644
--- a/src/views/procurementManagement/paymentLedger/index.vue
+++ b/src/views/procurementManagement/paymentLedger/index.vue
@@ -15,25 +15,49 @@
>鎼滅储</el-button
>
</div>
- <div>
- </div>
+ <div></div>
</div>
<el-row>
<el-col :span="14">
<div class="table_list">
- <PIMTable
- :column="tableColumn"
- :tableData="tableData"
- :page="page"
- :isSelection="false"
- :handleSelectionChange="handleSelectionChange"
- :tableLoading="tableLoading"
- @pagination="pagination"
- :total="total"
- :rowClick="rowClick"
- :isShowSummary="isShowSummary"
+ <el-table
+ ref="multipleTable"
+ v-loading="tableLoading"
+ :data="tableData"
+ :header-cell-style="{ background: '#F0F1F5', color: '#333333' }"
+ height="calc(100vh - 18.5em)"
:highlight-current-row="true"
- ></PIMTable>
+ style="width: 100%"
+ tooltip-effect="dark"
+ @row-click="rowClick"
+ :show-summary="isShowSummary"
+ class="lims-table"
+ >
+ <el-table-column
+ align="center"
+ label="搴忓彿"
+ type="index"
+ width="60"
+ />
+ <el-table-column
+ v-for="(item, index) in tableColumn"
+ :key="index"
+ :column-key="item.columnKey"
+ :filter-method="item.filterHandler"
+ :filter-multiple="item.filterMultiple"
+ :filtered-value="item.filteredValue"
+ :filters="item.filters"
+ :fixed="item.fixed"
+ :label="item.label"
+ :prop="item.prop"
+ show-overflow-tooltip
+ :align="item.align"
+ :sortable="!!item.sortable"
+ :type="item.type"
+ :width="item.width"
+ >
+ </el-table-column>
+ </el-table>
</div>
</el-col>
<el-col :span="10">
@@ -44,12 +68,20 @@
:page="pageSon"
:isSelection="false"
:tableLoading="tableLoadingSon"
- @pagination="paginationSon"
- :total="totalSon"
:isShowSummary="isShowSummarySon"
></PIMTable>
</div>
</el-col>
+ <div class="el-pagination">
+ <pagination
+ v-show="total > 0"
+ @pagination="paginationSearch"
+ :total="total"
+ :layout="page.layout"
+ :page="page.current"
+ :limit="page.size"
+ />
+ </div>
</el-row>
</div>
</template>
@@ -77,6 +109,7 @@
prop: "payableAmount",
},
]);
+const tableData = ref([]);
const tableLoading = ref(false);
const data = reactive({
searchForm: {
@@ -89,16 +122,10 @@
});
const total = ref(0);
const isShowSummary = ref(true);
-const tableData = ref([]);
const { searchForm } = toRefs(data);
-
-
-import {getInfo} from "@/api/login.js";
const rowClick = (row) => {
tableDataSon.value = Array.isArray(row.details) ? row.details : [];
};
-
-
// 瀛愭ā鍧�
const tableColumnSon = ref([
{
@@ -120,11 +147,6 @@
]);
const tableDataSon = ref([]);
const tableLoadingSon = ref(false);
-const pageSon = reactive({
- current: 1,
- size: 10,
-});
-const totalSon = ref(0);
const isShowSummarySon = ref(true);
const detailPageNum = ref(1);
const detailPageSize = ref(10);
@@ -134,14 +156,10 @@
page.current = 1;
getList();
};
-const pagination = ({ current, limit }) => {
+const paginationSearch = ({ current, limit }) => {
page.current = current;
page.size = limit;
- getList();
-};
-const paginationSon = ({ current, limit }) => {
- pageSon.current = current;
- pageSon.size = limit;
+ tableDataSon.value = [];
getList();
};
const getList = () => {
@@ -150,7 +168,7 @@
...searchForm.value,
...page,
detailPageNum: detailPageNum.value, // 鏂板
- detailPageSize: detailPageSize.value // 鏂板
+ detailPageSize: detailPageSize.value, // 鏂板
}).then((res) => {
let result = res.data;
tableLoading.value = false;
@@ -158,20 +176,11 @@
total.value = result.total || 0;
});
};
-// 琛ㄦ牸閫夋嫨鏁版嵁
-const handleSelectionChange = (selection) => {
- selectedRows.value = selection;
-};
getList();
</script>
<style scoped lang="scss">
-/* 閫変腑鏌愯鏃剁殑鑳屾櫙鑹�*/
-/* .el-table__body tr.current-row > td {
- color: #c0c0c0;
- background: #F6F7FB !important;
-} */
.el-row {
.el-col-14 {
.table_list {
@@ -184,4 +193,23 @@
}
}
}
+.el-pagination {
+ width: 100%;
+ height: 55px;
+ display: flex;
+ justify-content: flex-end;
+ float: right;
+ flex-direction: row;
+ align-items: center;
+ background: #fff;
+ margin: -20px 0 0 0;
+ padding: 0 20px;
+}
+.pagination-container {
+ margin-top: 0;
+}
+.table_list {
+ height: calc(100vh - 13.5em);
+ overflow: auto;
+}
</style>
--
Gitblit v1.9.3