From 7f177f5915a1dbdf8ad6cd840b4d7408b9f3598f Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 14 九月 2024 15:16:41 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2
---
components/order/print-list.vue | 50 +++++++++++++++++++++-----------------------------
1 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/components/order/print-list.vue b/components/order/print-list.vue
index 03c71b2..2e270b4 100644
--- a/components/order/print-list.vue
+++ b/components/order/print-list.vue
@@ -1,12 +1,7 @@
<template>
<div class="print-list">
- <div v-for="(list, i) in groupList" :key="i" class="break-page">
- <div
- v-for="(item, index) in list"
- :key="index"
- ref="orderTable"
- class="print-item"
- >
+ <div v-for="(item, i) in orderList" :key="i" class="break-page">
+ <div ref="orderTable" class="print-item">
<el-row :gutter="10" class="mb-15">
<el-col :span="24">
<div class="area-text">
@@ -36,21 +31,20 @@
</div>
</div>
</el-col>
- <el-col :span="24">
- <div class="desc-info">
- <div>备注：</div>
- <div class="desc-info__value">{{ item.remarks }}</div>
- </div>
- </el-col>
</el-row>
<el-table-print
:data="item.items"
- :summary-method="getSummaries"
+ :summary-method="getSummaries.bind(this, item.totalAmount)"
show-summary
border
style="width: 100%"
>
<el-table-column label="序号" type="index"></el-table-column>
+ <el-table-column
+ prop="orderNo"
+ label="订单号"
+ align="center"
+ ></el-table-column>
<el-table-column
label="下单品种"
:formatter="
@@ -80,7 +74,7 @@
</template>
<script>
-import groupBy from 'lodash.groupby'
+// import groupBy from 'lodash.groupby'
export default {
props: {
orderList: {
@@ -89,13 +83,13 @@
},
},
computed: {
- groupList() {
- const sanhuList = this.orderList.filter((i) => !i.partnerId)
- const partnerList = this.orderList.filter((i) => !!i.partnerId)
- const sList = groupBy(sanhuList, (i) => i.createBy)
- const pList = groupBy(partnerList, (i) => i.partnerId)
- return [...Object.values(pList), ...Object.values(sList)]
- },
+ // groupList() {
+ // const sanhuList = this.orderList.filter((i) => !i.partnerId)
+ // const partnerList = this.orderList.filter((i) => !!i.partnerId)
+ // const sList = groupBy(sanhuList, (i) => i.createBy)
+ // const pList = groupBy(partnerList, (i) => i.partnerId)
+ // return [...Object.values(pList), ...Object.values(sList)]
+ // },
},
methods: {
objectSpanMethod(len, { rowIndex, columnIndex }) {
@@ -113,17 +107,15 @@
}
}
},
- getSummaries(param) {
+ getSummaries(totalAmount, param) {
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
- sums[index] =
- '总扎数合计：' +
- data.reduce((total, current) => {
- total += current.num
- return total
- }, 0)
+ sums[index] = `总扎数合计：${data.reduce((total, current) => {
+ total += current.num
+ return total
+ }, 0)} 总金额：¥${totalAmount}`
} else {
sums[index] = ''
}
--
Gitblit v1.9.3