From c94826da81b6ebed4a62ed44f6e6bc30cb65f467 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期日, 21 六月 2026 10:39:24 +0800
Subject: [PATCH] fix: 已审核订单的分页组件不展示
---
src/assets/styles/index.scss | 2
src/views/salesManagement/salesLedger/index.vue | 87 +++++++++++++++++++++++++++++--------------
2 files changed, 59 insertions(+), 30 deletions(-)
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 13d26ee..55c8fb2 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -123,7 +123,7 @@
//main-container鍏ㄥ眬鏍峰紡
.app-container {
- padding: 20px;
+ padding: 10px;
}
.search_form {
display: flex;
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 5cc2a89..2b907dd 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -883,15 +883,7 @@
@click="handleBulkDelivery"
:disabled="isBatchButtonDisabled('delivery')">鍙戣揣</el-button>
<el-button @click="handleOut">瀵煎嚭</el-button>
- <el-date-picker v-model="processRouteExportDateRange"
- type="datetimerange"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
- value-format="YYYY-MM-DD HH:mm:ss"
- format="YYYY-MM-DD HH:mm:ss"
- clearable
- style="width: 340px;" />
+
<el-button @click="handleExportProcessRoute"
:disabled="isBatchButtonDisabled('export')">瀵煎嚭宸ヨ壓璺嚎</el-button>
</el-space>
@@ -988,8 +980,8 @@
:row-class-name="tableRowClassName"
show-summary
style="width: 100%"
- :summary-method="summarizeMainTable"
- height="calc(100vh - 22em)">
+ height="calc(100vh - 23em)"
+ :summary-method="summarizeMainTable">
<el-table-column align="center"
type="selection"
width="55"
@@ -1000,7 +992,7 @@
width="60" />
<el-table-column label="璁㈠崟鍙�"
prop="salesContractNo"
- width="180"
+ min-width="160"
show-overflow-tooltip>
<template #default="scope">
<el-button link
@@ -1010,27 +1002,27 @@
</el-table-column>
<el-table-column label="瀹㈡埛鍚嶇О"
prop="customerName"
- width="300"
+ min-width="200"
show-overflow-tooltip />
<el-table-column label="涓氬姟鍛�"
prop="salesman"
- width="100"
+ min-width="80"
show-overflow-tooltip />
<el-table-column label="鍚堝悓閲戦(鍏�)"
prop="contractAmount"
- width="220"
+ min-width="120"
show-overflow-tooltip
:formatter="formattedNumber" />
<el-table-column label="闈㈢Н"
prop="productTotalArea"
- width="120"
+ min-width="80"
show-overflow-tooltip />
<el-table-column label="鏁伴噺"
prop="productTotalQuantity"
- width="120"
+ min-width="80"
show-overflow-tooltip />
<el-table-column label="鍙戣揣鐘舵��"
- width="140"
+ min-width="100"
align="center">
<template #default="scope">
<el-tag v-if="Number(scope.row.deliveryStatus) === 1"
@@ -1050,19 +1042,21 @@
</template>
</el-table-column>
<el-table-column label="瀹℃牳鐘舵��"
- width="120"
+ min-width="90"
align="center">
<template #default="scope">
<el-tag v-if="Number(scope.row.reviewStatus) === 0"
type="warning">寰呭鏍�</el-tag>
<el-tag v-else-if="Number(scope.row.reviewStatus) === 1"
type="success">宸插鏍�</el-tag>
+ <el-tag v-else-if="Number(scope.row.reviewStatus) === 2"
+ type="danger">宸插弽瀹�</el-tag>
<el-tag v-else
type="info">寰呭鏍�</el-tag>
</template>
</el-table-column>
<el-table-column label="鍏ュ簱鐘舵��"
- width="120"
+ min-width="90"
align="center">
<template #default="scope">
<el-tag v-if="Number(scope.row.stockStatus) === 0"
@@ -1078,7 +1072,7 @@
</template>
</el-table-column>
<el-table-column label="璁㈠崟鐘舵��"
- width="120"
+ min-width="90"
align="center">
<template #default="scope">
<el-tag v-if="Number(scope.row.orderStatus) === 1"
@@ -1088,14 +1082,14 @@
</template>
</el-table-column>
<el-table-column label="鏍囩鎵撳嵃"
- width="90"
+ min-width="90"
align="center">
<template #default="scope">
<span>{{ scope.row.labelPrintCount ?? 0 }}</span>
</template>
</el-table-column>
<el-table-column label="鍗曟嵁鎵撳嵃"
- width="90"
+ min-width="90"
align="center">
<template #default="scope">
<span>{{ scope.row.documentPrintCount ?? 0 }}</span>
@@ -1103,27 +1097,27 @@
</el-table-column>
<el-table-column label="褰曞叆浜�"
prop="entryPersonName"
- width="100"
+ min-width="80"
show-overflow-tooltip />
<el-table-column label="褰曞叆鏃ユ湡"
prop="entryDate"
- width="120"
+ min-width="110"
show-overflow-tooltip />
<el-table-column label="浜や粯鏃ユ湡"
prop="deliveryDate"
- width="120"
+ min-width="110"
show-overflow-tooltip />
<el-table-column label="澶囨敞"
prop="remarks"
- width="200"
+ min-width="120"
show-overflow-tooltip />
<el-table-column label="瀹㈡埛澶囨敞"
prop="customerRemarks"
- width="200"
+ min-width="120"
show-overflow-tooltip />
<el-table-column fixed="right"
label="鎿嶄綔"
- width="280"
+ width="250"
align="center">
<template #default="scope">
<el-button link
@@ -1152,6 +1146,31 @@
@pagination="paginationChange" />
</div>
</div>
+ <!-- 瀵煎嚭宸ヨ壓璺嚎 寮圭獥 -->
+ <el-dialog title="閫夋嫨瀵煎嚭鏃堕棿鑼冨洿"
+ v-model="exportProcessRouteDialogVisible"
+ width="450px"
+ append-to-body>
+ <el-form>
+ <el-form-item label="瀹屾垚鏃堕棿锛�">
+ <el-date-picker v-model="processRouteExportDateRange"
+ type="datetimerange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫椂闂�"
+ end-placeholder="缁撴潫鏃堕棿"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD HH:mm:ss"
+ clearable
+ style="width: 100%;" />
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <div style="text-align: right">
+ <el-button @click="exportProcessRouteDialogVisible = false">鍙栨秷</el-button>
+ <el-button type="primary" @click="confirmExportProcessRoute">纭瀵煎嚭</el-button>
+ </div>
+ </template>
+ </el-dialog>
</template>
<FormDialog v-if="!isFormPageMode"
v-model="dialogFormVisible"
@@ -5380,6 +5399,8 @@
proxy.download("/sales/ledger/exportWithProducts", params, "閿�鍞彴璐�.xlsx");
};
+ const exportProcessRouteDialogVisible = ref(false);
+
const handleExportProcessRoute = () => {
if (selectedRows.value.length === 0) {
proxy?.$modal?.msgWarning?.("璇烽�夋嫨瑕佸鍑虹殑閿�鍞彴璐�");
@@ -5392,6 +5413,13 @@
proxy?.$modal?.msgWarning?.("璇烽�夋嫨瑕佸鍑虹殑閿�鍞彴璐�");
return;
}
+ exportProcessRouteDialogVisible.value = true;
+ };
+
+ const confirmExportProcessRoute = () => {
+ const salesLedgerIds = selectedRows.value
+ .map(item => item.id)
+ .filter(id => id !== null && id !== undefined && id !== "");
const params = {
salesLedgerIds: salesLedgerIds.join(","),
@@ -5409,6 +5437,7 @@
params,
"閿�鍞彴璐﹀伐鑹鸿矾绾垮鍑�.xlsx"
);
+ exportProcessRouteDialogVisible.value = false;
};
/** 鍒ゆ柇鍗曚釜浜у搧鏄惁宸插彂璐э紙鏍规嵁shippingStatus鍒ゆ柇锛屽凡鍙戣揣鎴栧鏍搁�氳繃涓嶅彲缂栬緫鍜屽垹闄わ級 */
const isProductShipped = product => {
--
Gitblit v1.9.3