diff --git a/src/views/claimAndreturn/return/receive/component/addReturn1.vue b/src/views/claimAndreturn/return/receive/component/addReturn1.vue
index a2891a8..314f2d4 100644
--- a/src/views/claimAndreturn/return/receive/component/addReturn1.vue
+++ b/src/views/claimAndreturn/return/receive/component/addReturn1.vue
@@ -178,7 +178,7 @@
{{ row.manageType == '0' ? '编码退料' : '数量退料' }}
-
+
{{
Number(row.maintenanceNum || 0) + Number(row.passNum || 0)
@@ -949,9 +949,15 @@ export default {
// );
this.queryParams.leaseApplyDetails.forEach((item) => {
- if (item.num) {
- item.backNum = item.num
+ console.log("jjjjjjjjjj",item)
+
+ if (item.manageType == 1) {
+ item.num1 = Number(item.maintenanceNum || 0) + Number(item.passNum || 0);
+
+ } else {
+ item.num1 = item.numList && item.numList.length > 0 ? item.numList.length : 0;
}
+ item.backNum = item.num1
if (item.manageType == 0) {
item.backNum = item.numList.length
if (item.passMaCodeDtoList) {
diff --git a/src/views/cost/csotSettlement/component/monthRecord.vue b/src/views/cost/csotSettlement/component/monthRecord.vue
index 3e5b792..ebc75df 100644
--- a/src/views/cost/csotSettlement/component/monthRecord.vue
+++ b/src/views/cost/csotSettlement/component/monthRecord.vue
@@ -135,7 +135,7 @@
-
+
+
@@ -244,6 +249,36 @@ export default {
this.getMonthRecordList()
},
methods: {
+ getSummaries(param) {
+ const { columns, data } = param;
+ const sums = [];
+ const columnsToSum = ['costs', 'realCosts']; // 定义需要求和的列
+
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = ''; // 第一列留空
+ return;
+ }
+ if (index === 1) {
+ sums[index] = '合计'; // 第二列显示合计
+ return;
+ }
+ if (columnsToSum.includes(column.property)) {
+ const values = data.map(item => Number(item[column.property]));
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr);
+ if (!isNaN(value)) {
+ return prev + curr;
+ }
+ return prev;
+ }, 0);
+ sums[index] = sums[index].toFixed(2);
+ } else {
+ sums[index] = '';
+ }
+ });
+ return sums;
+ },
/** 获取月结记录列表数据 */
async getMonthRecordList() {
this.monthRecordParams.agreementId = this.agreementId
diff --git a/src/views/cost/csotSettlement/costApplyList.vue b/src/views/cost/csotSettlement/costApplyList.vue
index 70bf512..b668773 100644
--- a/src/views/cost/csotSettlement/costApplyList.vue
+++ b/src/views/cost/csotSettlement/costApplyList.vue
@@ -52,6 +52,9 @@
查询
重置
+ 批量导出结算表
批量导出月结明细表