From efe125921e37d031d6ff31018c1d4e4e133c60d5 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期二, 21 四月 2026 13:25:35 +0800
Subject: [PATCH] 添加产品宽高搜索功能，优化销售台账数据处理逻辑，新增面积和数量列
---
src/views/salesManagement/salesLedger/index.vue | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 110 insertions(+), 1 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index e5ca3d6..5f36cee 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -32,6 +32,20 @@
prefix-icon="Search"
@change="handleQuery" />
</el-form-item>
+ <el-form-item label="浜у搧瀹�(mm)锛�">
+ <el-input v-model="searchForm.width"
+ placeholder="璇疯緭鍏�"
+ clearable
+ prefix-icon="Search"
+ @change="handleQuery" />
+ </el-form-item>
+ <el-form-item label="浜у搧楂�(mm)锛�">
+ <el-input v-model="searchForm.height"
+ placeholder="璇疯緭鍏�"
+ clearable
+ prefix-icon="Search"
+ @change="handleQuery" />
+ </el-form-item>
<el-form-item label="褰曞叆鏃ユ湡锛�">
<el-date-picker v-model="searchForm.entryDate"
value-format="YYYY-MM-DD"
@@ -319,6 +333,14 @@
width="220"
show-overflow-tooltip
:formatter="formattedNumber" />
+ <el-table-column label="闈㈢Н"
+ prop="productTotalArea"
+ width="120"
+ show-overflow-tooltip />
+ <el-table-column label="鏁伴噺"
+ prop="productTotalQuantity"
+ width="120"
+ show-overflow-tooltip />
<el-table-column label="鍙戣揣鐘舵��"
width="140"
align="center">
@@ -415,6 +437,7 @@
label-width="140px"
label-position="top"
:rules="rules"
+ @keydown.capture="handleTabScrollFollow"
ref="formRef">
<!-- 鎶ヤ环鍗曞鍏ュ叆鍙ｏ細鏀惧湪琛ㄥ崟椤堕儴锛岄�夋嫨鍚庡弽鏄惧鎴�/涓氬姟鍛樼瓑 -->
<el-row v-if="operationType === 'add'"
@@ -1908,6 +1931,8 @@
customerName: "", // 瀹㈡埛鍚嶇О
customerId: "", // 瀹㈡埛ID锛堟煡璇笅鎷夛級
salesContractNo: "", // 閿�鍞悎鍚岀紪鍙�
+ width: undefined, // 浜у搧瀹�(mm)
+ height: undefined, // 浜у搧楂�(mm)
entryDate: null, // 褰曞叆鏃ユ湡
entryDateStart: undefined,
entryDateEnd: undefined,
@@ -2866,14 +2891,44 @@
delete params.customerName;
}
}
+ const widthValue =
+ params.width != null ? String(params.width).trim() : "";
+ if (widthValue) {
+ params.width = widthValue;
+ } else {
+ delete params.width;
+ }
+ const heightValue =
+ params.height != null ? String(params.height).trim() : "";
+ if (heightValue) {
+ params.height = heightValue;
+ } else {
+ delete params.height;
+ }
+ const shouldAutoExpandBySize = Boolean(params.width || params.height);
delete params.customerId;
return ledgerListPage(params)
- .then(res => {
+ .then(async res => {
tableLoading.value = false;
tableData.value = res.records;
tableData.value.map(item => {
item.children = [];
});
+ if (shouldAutoExpandBySize && tableData.value.length > 0) {
+ const loadChildrenTasks = tableData.value.map(item =>
+ productList({ salesLedgerId: item.id, type: 1 })
+ .then(productRes => {
+ item.children = Array.isArray(productRes?.data)
+ ? productRes.data
+ : [];
+ })
+ .catch(() => {
+ item.children = [];
+ })
+ );
+ await Promise.all(loadChildrenTasks);
+ expandedRowKeys.value = tableData.value.map(item => item.id);
+ }
total.value = res.total;
return res;
})
@@ -3041,6 +3096,58 @@
const num = Number(cellValue);
return Number.isFinite(num) ? num.toFixed(2) : "";
};
+
+ const scrollElementIntoVisibleArea = target => {
+ if (!target || !(target instanceof HTMLElement)) return;
+ let parent = target.parentElement;
+ while (parent && parent !== document.body) {
+ const style = window.getComputedStyle(parent);
+ const canScrollX =
+ (style.overflowX === "auto" ||
+ style.overflowX === "scroll" ||
+ style.overflowX === "overlay") &&
+ parent.scrollWidth > parent.clientWidth;
+ const canScrollY =
+ (style.overflowY === "auto" ||
+ style.overflowY === "scroll" ||
+ style.overflowY === "overlay") &&
+ parent.scrollHeight > parent.clientHeight;
+
+ if (canScrollX || canScrollY) {
+ const parentRect = parent.getBoundingClientRect();
+ const targetRect = target.getBoundingClientRect();
+ if (canScrollX) {
+ const targetCenterX = targetRect.left + targetRect.width / 2;
+ const parentCenterX = parentRect.left + parentRect.width / 2;
+ const deltaX = targetCenterX - parentCenterX;
+ if (Math.abs(deltaX) > 2) {
+ parent.scrollLeft += deltaX;
+ }
+ }
+
+ if (canScrollY) {
+ const targetCenterY = targetRect.top + targetRect.height / 2;
+ const parentCenterY = parentRect.top + parentRect.height / 2;
+ const deltaY = targetCenterY - parentCenterY;
+ if (Math.abs(deltaY) > 2) {
+ parent.scrollTop += deltaY;
+ }
+ }
+ }
+
+ parent = parent.parentElement;
+ }
+ };
+
+ const handleTabScrollFollow = e => {
+ if (!e || e.key !== "Tab") return;
+ requestAnimationFrame(() => {
+ const active = document.activeElement;
+ if (active instanceof HTMLElement) {
+ scrollElementIntoVisibleArea(active);
+ }
+ });
+ };
// 鑾峰彇tree瀛愭暟鎹�
const getModels = value => {
// 浜у搧澶х被鍙樺寲鏃讹紝閲嶇疆瑙勬牸鍨嬪彿涓庡帤搴︼紝閬垮厤鏃у�兼畫鐣�
@@ -3180,6 +3287,8 @@
const summarizeMainTable = param => {
return proxy.summarizeTable(param, [
"contractAmount",
+ "productTotalQuantity",
+ "productTotalArea",
"taxInclusiveTotalPrice",
"taxExclusiveTotalPrice",
]);
--
Gitblit v1.9.3