From 377c0a70c094d024aeb0bb94f4b791c6d5530c1e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 06 八月 2026 10:21:55 +0800
Subject: [PATCH] 新疆_马铃薯 1.不合格管理添加拒收逻辑
---
src/views/salesManagement/receiptPaymentLedger/index.vue | 459 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 309 insertions(+), 150 deletions(-)
diff --git a/src/views/salesManagement/receiptPaymentLedger/index.vue b/src/views/salesManagement/receiptPaymentLedger/index.vue
index 1c9b3bf..4c55846 100644
--- a/src/views/salesManagement/receiptPaymentLedger/index.vue
+++ b/src/views/salesManagement/receiptPaymentLedger/index.vue
@@ -1,175 +1,334 @@
<template>
<div class="app-container">
- <div class="search_form">
+ <div class="search_form"
+ style="margin-bottom: 20px;">
<div>
- <span class="search_title">鍥炴鍙拌处</span>
- <el-input
- v-model="searchForm.searchText"
- style="width: 240px"
- placeholder="杈撳叆瀹㈡埛鍚嶇О鎼滅储"
- @change="handleQuery"
- clearable
- :prefix-icon="Search"
- />
- <el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
+ <span class="search_title">瀹㈡埛鍚嶇О锛�</span>
+ <el-input v-model="searchForm.searchText"
+ style="width: 240px"
+ placeholder="杈撳叆瀹㈡埛鍚嶇О鎼滅储"
+ @change="handleQuery"
+ clearable
+ prefix-icon="Search" />
+ <el-button type="primary"
+ @click="handleQuery"
+ style="margin-left: 10px">鎼滅储</el-button>
</div>
</div>
- <div style="display: flex">
- <div class="table_list">
- <el-table :data="tableData" border v-loading="tableLoading"
- :row-key="row => row.id"
- show-summary
- :summary-method="summarizeMainTable"
- @row-click = "rowClickMethod"
- height="calc(100vh - 18.5em)">
- <el-table-column align="center" label="搴忓彿" type="index" width="60" />
- <el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" show-overflow-tooltip/>
- <el-table-column label="寮�绁ㄩ噾棰�" prop="invoiceTotal" show-overflow-tooltip :formatter="formattedNumber"/>
- <el-table-column label="鍥炴閲戦" prop="receiptPaymentAmount" show-overflow-tooltip :formatter="formattedNumber"/>
- <el-table-column label="鏈洖娆鹃噾棰�" prop="unReceiptPaymentAmount" show-overflow-tooltip :formatter="formattedNumber"/>
- </el-table>
- <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper" :page="page.current"
- :limit="page.size" @pagination="paginationChange" />
- </div>
- <div class="table_list">
- <el-table :data="receiptRecord" border
- :row-key="row => row.id"
- show-summary
- :summary-method="summarizeMainTable"
- height="calc(100vh - 18.5em)">
- <el-table-column align="center" label="搴忓彿" type="index" width="60" />
- <el-table-column label="鍙戠敓鏃ユ湡" prop="receiptPaymentDate" show-overflow-tooltip/>
- <el-table-column label="鍥炴閲戦" prop="receiptPaymentAmount" show-overflow-tooltip :formatter="formattedNumber"/>
- <el-table-column label="寰呮敹閲戦" prop="noReceiptAmount" show-overflow-tooltip :formatter="formattedNumber"/>
- <el-table-column label="搴旀敹閲戦" prop="invoiceTotal" show-overflow-tooltip :formatter="formattedNumber"/>
- </el-table>
- <pagination v-show="recordTotal > 0" :total="recordTotal" layout="total, sizes, prev, pager, next, jumper" :page="recordPage.current"
- :limit="recordPage.size" @pagination="recordPaginationChange" />
- </div>
- </div>
+ <el-row :gutter="20">
+ <!-- 宸︿晶瀹㈡埛鍒楄〃 -->
+ <el-col :span="8">
+ <div class="table_list"
+ style="width: 100%">
+ <el-table :data="tableData"
+ border
+ v-loading="tableLoading"
+ :row-key="(row) => row.customerId"
+ show-summary
+ :summary-method="summarizeMainTable"
+ @row-click="rowClickMethod"
+ highlight-current-row
+ height="calc(100vh - 18.5em)">
+ <el-table-column align="center"
+ label="搴忓彿"
+ type="index"
+ width="60" />
+ <el-table-column label="瀹㈡埛鍚嶇О"
+ prop="customerName"
+ show-overflow-tooltip
+ width="200" />
+ <el-table-column label="鍚堝悓閲戦(鍏�)"
+ prop="contractAmounts"
+ show-overflow-tooltip
+ :formatter="formattedNumber"
+ width="150" />
+ <el-table-column label="鏀舵閲戦(鍏�)"
+ prop="receiptPaymentAmount"
+ show-overflow-tooltip
+ :formatter="formattedNumber"
+ width="150" />
+ <el-table-column label="搴旀敹閲戦(鍏�)"
+ prop="receiptableAmount"
+ show-overflow-tooltip
+ width="150">
+ <template #default="{ row }">
+ <span :style="{ color: row.receiptableAmount > 0 ? '#f56c6c' : '#606266' }">
+ {{ formattedNumber(null, null, row.receiptableAmount) }}
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" width="100" align="center" fixed="right">
+ <template #default="{ row }">
+ <el-button type="primary" link size="small" @click="viewDetail(row)">鏌ョ湅鏄庣粏</el-button>
+ </template>
+ </el-table-column>
+<!-- <el-table-column label="搴旀敹閲戦(鍏�)"-->
+<!-- prop="receiptableAmount"-->
+<!-- show-overflow-tooltip-->
+<!-- width="150">-->
+<!-- <template #default="{ row, column }">-->
+<!-- <el-text type="danger">-->
+<!-- {{ formattedNumber(row, column, row.receiptableAmount) }}-->
+<!-- </el-text>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+ </el-table>
+ <pagination v-show="total > 0"
+ :total="total"
+ layout="total, sizes, prev, pager, next, jumper"
+ :page="page.current"
+ :limit="page.size"
+ @pagination="paginationChange" />
+ </div>
+ </el-col>
+ <!-- 鍙充晶璁㈠崟淇℃伅 -->
+ <el-col :span="16">
+ <div class="table_list"
+ style="width: 100%">
+
+ <el-table :data="orderRecord"
+ border
+ :row-key="(row) => row.id"
+ v-loading="orderLoading"
+ height="calc(100vh - 20em)">
+ <el-table-column align="center"
+ label="搴忓彿"
+ type="index"
+ width="60" />
+ <el-table-column label="璁㈠崟鍙�"
+ prop="salesContractNo"
+ show-overflow-tooltip
+ width="150" />
+ <el-table-column label="閿�鍞�诲悎鍚屽彿"
+ prop="masterContractNo"
+ show-overflow-tooltip
+ width="150" />
+ <!-- <el-table-column label="鍙戣揣璁㈠崟鍙�"
+ prop="shippingNo"
+ show-overflow-tooltip
+ width="150" /> -->
+ <el-table-column label="瀹㈡埛鍚嶇О"
+ prop="customerName"
+ show-overflow-tooltip
+ width="150" />
+ <el-table-column label="浜у搧鍚嶇О"
+ prop="productName"
+ show-overflow-tooltip
+ width="150" />
+ <el-table-column label="瑙勬牸鍨嬪彿"
+ prop="specificationModel"
+ show-overflow-tooltip
+ width="120" />
+ <el-table-column label="鍙戣揣鏃堕棿"
+ prop="shippingDate"
+ show-overflow-tooltip
+ width="110" />
+ <el-table-column label="鍙戣揣鏁伴噺"
+ prop="totalQuantity"
+ show-overflow-tooltip
+ width="100" />
+ <!-- <el-table-column label="鍙戣揣杞︾墝鍙�"
+ prop="shippingCarNumber"
+ show-overflow-tooltip
+ width="120" />
+ <el-table-column label="蹇�掑叕鍙�"
+ prop="expressCompany"
+ show-overflow-tooltip
+ width="120" />
+ <el-table-column label="蹇�掑崟鍙�"
+ prop="expressNumber"
+ show-overflow-tooltip
+ width="150" /> -->
+ <el-table-column label="鍙戣揣鐘舵��"
+ prop="status"
+ align="center"
+ width="100">
+ <template #default="{ row }">
+ <el-tag :type="getApprovalStatusType(row.status)">
+ {{ getApprovalStatusText(row.status) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍑哄簱鍗曞彿"
+ prop="outboundBatches"
+ show-overflow-tooltip
+ width="130" />
+ </el-table>
+ <pagination v-show="orderTotal > 0"
+ :total="orderTotal"
+ layout="total, sizes, prev, pager, next, jumper"
+ :page="orderPage.current"
+ :limit="orderPage.size"
+ @pagination="orderPaginationChange" />
+ </div>
+ </el-col>
+ </el-row>
</div>
</template>
<script setup>
-import { ref } from 'vue'
-import {
- invoiceLedgerSalesAccount,
-} from "../../../api/salesManagement/invoiceLedger.js";
-import {
- receiptPaymentListPage
-} from "../../../api/salesManagement/receiptPayment.js";
-import Pagination from "../../../components/PIMTable/Pagination.vue";
+ import { onMounted, ref, reactive, toRefs, getCurrentInstance } from "vue";
+ import { useRouter } from "vue-router";
+ import {
+ customewTransactions,
+ } from "@/api/salesManagement/indicatorStats.js";
+ import { deliveryLedgerListPage } from "@/api/salesManagement/deliveryLedger.js";
+ import Pagination from "../../../components/PIMTable/Pagination.vue";
-const tableData = ref([])
-const receiptRecord = ref([])
-const tableLoading = ref(false)
-const page = reactive({
- current: 1,
- size: 10,
-})
-const recordPage = reactive({
- current: 1,
- size: 10,
-})
-const total = ref(0)
-const recordTotal = ref(0)
-const data = reactive({
- searchForm: {
- searchText: '',
- invoiceDate:''
- }
-})
-const customerId = ref('')
-const { searchForm } = toRefs(data)
-// 鏌ヨ鍒楄〃
-/** 鎼滅储鎸夐挳鎿嶄綔 */
-const handleQuery = () => {
- page.current = 1
- getList()
-}
-const paginationChange = (obj) => {
- console.log('paginationChange', current,limit)
- page.current = obj.page;
- page.size = obj.limit;
- getList()
-}
-const getList = () => {
- tableLoading.value = true
- invoiceLedgerSalesAccount({...searchForm.value, ...page}).then(res => {
- tableLoading.value = false
- tableData.value = res.data.records;
- total.value = res.data.total;
- if(tableData.value.length > 0) {
- recordPage.current = 1
- customerId.value = tableData.value[0].id
- receiptPaymentList(customerId.value);
- }
- })
-}
-const formattedNumber = (row, column, cellValue) => {
- return parseFloat(cellValue).toFixed(2);
-};
-// 涓昏〃鍚堣鏂规硶
-const summarizeMainTable = (param) => {
- const { columns, data } = param;
- const sums = [];
- columns.forEach((column, index) => {
- if (index === 0) {
- sums[index] = '鍚堣';
- return;
- }
- const prop = column.property;
- if (['invoiceAmount','receiptPaymentAmount','unReceiptPaymentAmount'].includes(prop)) {
- const values = data.map(item => Number(item[prop]));
- if (!values.every(value => isNaN(value))) {
- sums[index] = values.reduce((acc, val) => (!isNaN(val) ? acc + val : acc), 0);
+ const { proxy } = getCurrentInstance();
+ const router = useRouter();
+ const tableData = ref([]);
+ const orderRecord = ref([]);
+ const tableLoading = ref(false);
+ const orderLoading = ref(false);
+ const page = reactive({
+ current: 1,
+ size: 100,
+ });
+ const orderPage = reactive({
+ current: 1,
+ size: 100,
+ });
+ const total = ref(0);
+ const orderTotal = ref(0);
+ const data = reactive({
+ searchForm: {
+ searchText: "",
+ invoiceDate: "",
+ },
+ });
+ const customerId = ref("");
+ const { searchForm } = toRefs(data);
+
+ // 鏌ヨ鍒楄〃
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ const handleQuery = () => {
+ page.current = 1;
+ getList();
+ };
+ const paginationChange = obj => {
+ page.current = obj.page;
+ page.size = obj.limit;
+ getList();
+ };
+ const getList = () => {
+ tableLoading.value = true;
+ customewTransactions({ ...searchForm.value, ...page }).then(res => {
+ tableLoading.value = false;
+ tableData.value = res.data.records;
+ total.value = res.data.total;
+ if (tableData.value.length > 0) {
+ orderPage.current = 1;
+ customerId.value = tableData.value[0].customerId;
+ getOrderList(customerId.value);
} else {
- sums[index] = '';
+ orderRecord.value = [];
+ customerId.value = "";
}
- } else {
- sums[index] = '';
+ });
+ };
+ const formattedNumber = (row, column, cellValue) => {
+ return cellValue ? parseFloat(cellValue).toFixed(2) : "0.00";
+ };
+ // 涓昏〃鍚堣鏂规硶
+ const summarizeMainTable = param => {
+ return proxy.summarizeTable(
+ param,
+ ["contractAmounts", "receiptableAmount"],
+ {
+ ticketsNum: { noDecimal: true },
+ futureTickets: { noDecimal: true },
+ }
+ );
+ };
+
+ // 鑾峰彇璁㈠崟鍒楄〃锛堟牴鎹鎴稩D鏌ヨ鍙戣揣鍙拌处锛�
+ const getOrderList = async (id) => {
+ orderLoading.value = true;
+ try {
+ // 浣跨敤 deliveryLedgerListPage 鎺ュ彛鏍规嵁 customerId 鏌ヨ
+ const res = await deliveryLedgerListPage({
+ customerId: id,
+ current: 1,
+ size: 1000,
+ });
+ let orders = [];
+ if (res.data) {
+ if (Array.isArray(res.data)) {
+ orders = res.data;
+ } else if (res.data.records && Array.isArray(res.data.records)) {
+ orders = res.data.records;
+ }
+ }
+
+ orderTotal.value = orders.length;
+ handleOrderPagination({ page: orderPage.current, limit: orderPage.size }, orders);
+ } catch (error) {
+ console.error('鑾峰彇璁㈠崟鍒楄〃澶辫触:', error);
+ orderRecord.value = [];
+ } finally {
+ orderLoading.value = false;
}
- })
- return sums;
-};
+ };
-const receiptPaymentList = (id) => {
- const param = {
- customerId:id,
- current: recordPage.current,
- size: recordPage.size,
- }
- console.log('param', param)
- receiptPaymentListPage(param).then(res => {
- receiptRecord.value = res.data.records;
- recordTotal.value = res.data.total;
+ // 璁㈠崟鍒楄〃鍒嗛〉
+ const orderPaginationChange = pagination => {
+ orderPage.current = pagination.page;
+ orderPage.size = pagination.limit;
+ getOrderList(customerId.value);
+ };
- })
-}
+ const handleOrderPagination = ({ page, limit }, allOrders) => {
+ const start = (page - 1) * limit;
+ const end = start + limit;
+ orderRecord.value = allOrders.slice(start, end);
+ };
-// 姹囨璁板綍鍒楄〃鍒嗛〉
-const recordPaginationChange = (obj) => {
- console.log('recordPaginationChange', obj );
- recordPage.current = obj.page;
- recordPage.size = obj.limit;
- console.log('recordPage',recordPage)
- receiptPaymentList(customerId.value);
-}
+ const rowClickMethod = row => {
+ customerId.value = row.customerId;
+ orderPage.current = 1;
+ getOrderList(customerId.value);
+ };
-const rowClickMethod = (row) => {
- customerId.value = row.id;
- receiptPaymentList(customerId.value);
-}
+ // 鏌ョ湅鏄庣粏
+ const viewDetail = (row) => {
+ router.push({
+ path: '/customer-transactions-detail',
+ query: { customerId: row.customerId }
+ });
+ };
+ // 瀹℃牳鐘舵�佹爣绛剧被鍨�
+ const getApprovalStatusType = (status) => {
+ const statusMap = {
+ '宸插彂璐�': 'success',
+ '瀹℃牳閫氳繃': 'success',
+ '瀹℃牳涓�': 'warning',
+ '瀹℃牳涓嶉�氳繃': 'danger',
+ };
+ return statusMap[status] || 'info';
+ };
-getList()
+ // 瀹℃牳鐘舵�佹枃鏈�
+ const getApprovalStatusText = (status) => {
+ const statusMap = {
+ '宸插彂璐�': '宸插彂璐�',
+ '瀹℃牳閫氳繃': '瀹℃牳閫氳繃',
+ '瀹℃牳涓�': '瀹℃牳涓�',
+ '瀹℃牳涓嶉�氳繃': '瀹℃牳涓嶉�氳繃',
+ };
+ return statusMap[status] || status || '--';
+ };
+
+ onMounted(() => {
+ getList();
+ });
</script>
<style scoped lang="scss">
-
-.table_list {
- width: 50%;
-}
+ .table_list {
+ width: 100%;
+ }
</style>
--
Gitblit v1.9.3