From 0705cb6170a9ba77ba48bbb6dcebb9cf3d73cbea Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 14 十月 2025 02:12:25 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
index 6091790..141bacc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
@@ -14,13 +14,13 @@
<span>宸查�変腑 {{ selection.length }} 椤�</span>
</el-col>
<el-col :span="8">
- <el-link
+ <!-- <el-link
type="primary"
size="small"
style="float: right; height: 20px"
@click="lockstocks"
>閿佸畾搴撳瓨</el-link
- >
+ > -->
<el-link
type="primary"
size="small"
@@ -43,6 +43,8 @@
<el-table
ref="singleTable"
:data="tableData"
+ :summary-method="getSummaries"
+ show-summary
style="width: 100%; height: 100%"
highlight-current-row
@current-change="handleCurrentChange"
@@ -227,11 +229,11 @@
Foots: "",
total: 0,
// 2020.08.29澧炲姞鑷畾涔夊垎椤垫潯澶у皬
- sizes: [30, 60, 100, 120],
- size: 30, // 榛樿鍒嗛〉澶у皬
+ sizes: [60, 100, 120],
+ size: 60, // 榛樿鍒嗛〉澶у皬
Wheres: [],
page: 1,
- rows: 30,
+ rows: 60,
},
searchFormOptions: [
[
@@ -271,6 +273,34 @@
this.getDictionaryData();
this.getData();
},
+ getSummaries(param) {
+ const { columns, data } = param
+ const sums = []
+
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '鍚堣'
+ return
+ }
+
+ // 浠呭鏁板�煎垪姹傚拰
+ // 浠呭鏌愪竴鍒楁眰鍜�
+ if (column.property === 'lockQuantity' || column.property === 'overOutQuantity' || column.property === 'orderQuantity') {
+ const values = data.map(item => Number(item[column.property]))
+ console.log(values);
+ if (!values.every(value => isNaN(value))) {
+ sums[index] = values.reduce((prev, curr) => {
+ return prev + (isNaN(curr) ? 0 : curr)
+ }, 0)
+ } else {
+ sums[index] = '-'
+ }
+ }
+
+ })
+
+ return sums
+ },
getData() {
var wheres = [{ name: "orderId", value: this.row.id }];
var param = {
--
Gitblit v1.9.3