From ee6f8c315926a871f11a96a69702efcef4d0b49f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 26 五月 2025 13:49:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/procurementManagement/paymentLedger/index.vue | 162 +++++++++++++++++++++++++++++------------------------
1 files changed, 89 insertions(+), 73 deletions(-)
diff --git a/src/views/procurementManagement/paymentLedger/index.vue b/src/views/procurementManagement/paymentLedger/index.vue
index e7a576c..18c0176 100644
--- a/src/views/procurementManagement/paymentLedger/index.vue
+++ b/src/views/procurementManagement/paymentLedger/index.vue
@@ -2,7 +2,7 @@
<div class="app-container">
<div class="search_form">
<div>
- <span class="search_title">浠樻鍙拌处锛�</span>
+ <span class="search_title">渚涘簲鍟嗗悕绉�:</span>
<el-input
v-model="searchForm.supplierNameOrContractNo"
style="width: 240px"
@@ -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,41 +122,19 @@
});
const total = ref(0);
const isShowSummary = ref(true);
-const tableData = ref([]);
const { searchForm } = toRefs(data);
-
-
-import {getInfo} from "@/api/login.js";
-const rowClick = async (row) => {
- /* let res = await getInfo(row.id)
- if (res.code === 200) {
- proxy.$modal.msgSuccess("鑾峰彇鎴愬姛")
- if(res.data == "" || res.data == null){
- proxy.$modal.msgError("娌℃湁鏁版嵁")
- return
- }
- rightShow.value = !rightShow.value
- form.value = res.data
-
- } else {
- proxy.$modal.msgError(res.msg)
- } */
- tableDataSon.value.push(row);
- if(tableDataSon.value.length > 10) {
- tableDataSon.value = []
- }
-}
-
-
+const rowClick = (row) => {
+ tableDataSon.value = Array.isArray(row.details) ? row.details : [];
+};
// 瀛愭ā鍧�
const tableColumnSon = ref([
{
- label: "渚涘簲鍟嗗悕绉�",
- prop: "supplierName",
+ label: "浠樻鏃ユ湡",
+ prop: "paymentDate",
},
{
- label: "鍙戠エ閲戦(鍏�)",
- prop: "invoiceAmount",
+ label: "寮�绁ㄦ暟",
+ prop: "voteCount",
},
{
label: "浠樻閲戦(鍏�)",
@@ -136,54 +147,40 @@
]);
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);
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
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 = () => {
tableLoading.value = false;
- paymentLedgerList({ ...searchForm.value, ...page }).then((res) => {
- let result = res.data
+ paymentLedgerList({
+ ...searchForm.value,
+ ...page,
+ detailPageNum: detailPageNum.value, // 鏂板
+ detailPageSize: detailPageSize.value, // 鏂板
+ }).then((res) => {
+ let result = res.data;
tableLoading.value = false;
- tableData.value = result;
- total.value = result.total;
+ tableData.value = result.records || [];
+ 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 {
@@ -196,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