From a5cba2d1b3f63a6e854d3fd2fa947c4b4e9c5ca1 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Mon, 19 May 2025 11:43:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=8F=91=E8=B4=A7=E7=9A=84?=
 =?UTF-8?q?=E4=B8=8D=E8=AE=A1=E7=AE=97=E5=9C=A8=E5=90=88=E8=AE=A1=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/ecss/codelnotify.vue        | 17 ++++++++++-------
 src/views/modules/ecss/codelnotifyConfirm.vue | 13 +++++++------
 src/views/modules/ecss/createDeclaration.vue  | 13 +++++++------
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/views/modules/ecss/codelnotify.vue b/src/views/modules/ecss/codelnotify.vue
index 349b435..c54c35e 100644
--- a/src/views/modules/ecss/codelnotify.vue
+++ b/src/views/modules/ecss/codelnotify.vue
@@ -141,8 +141,13 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
-              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+              <template v-if="item.columnProp === 'ttlAmount' || item.columnProp === 'sumPrice'">
+                <span>{{!!scope.row[item.columnProp]?scope.row[item.columnProp].toFixed(2):''}}</span>
+              </template>
+              <template v-else>
+                <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+                <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+              </template>
             </template>
           </el-table-column>
           <el-table-column
@@ -1650,10 +1655,7 @@
             //区分请求成功和失败的状况
             if (data && data.code == 0) {
               this.dataList2 = data.rows
-              this.dataList2.forEach(o => {
-                o.ttlAmount = o.ttlAmount.toFixed(2);
-                o.sumPrice = o.sumPrice.toFixed(2);
-              });
+
             } else {
               this.dataList2 = [];
             }
@@ -2019,7 +2021,8 @@
             sums[index] = '合计';
             return;
           }
-          const values = this.dataList2.map(item => Number(item[column.property]));
+          let sumDataList = this.dataList2.filter(item => item.qty>0);
+          const values = sumDataList.map(item => Number(item[column.property]));
           if (!values.every(value => isNaN(value))) {
             switch(column.property) {
               case 'qty':
diff --git a/src/views/modules/ecss/codelnotifyConfirm.vue b/src/views/modules/ecss/codelnotifyConfirm.vue
index 2283cce..d6f8372 100644
--- a/src/views/modules/ecss/codelnotifyConfirm.vue
+++ b/src/views/modules/ecss/codelnotifyConfirm.vue
@@ -119,8 +119,13 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
-              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+              <template v-if="item.columnProp === 'ttlAmount' || item.columnProp === 'sumPrice'">
+                <span>{{!!scope.row[item.columnProp]?scope.row[item.columnProp].toFixed(2):''}}</span>
+              </template>
+              <template v-else>
+                <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+                <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+              </template>
             </template>
           </el-table-column>
 <!--          <el-table-column-->
@@ -2056,10 +2061,6 @@
             //区分请求成功和失败的状况
             if (data && data.code == 0) {
               this.dataList2 = data.rows
-              this.dataList2.forEach(o => {
-                o.ttlAmount = o.ttlAmount.toFixed(2);
-                o.sumPrice = o.sumPrice.toFixed(2);
-              });
             } else {
               this.dataList2 = [];
             }
diff --git a/src/views/modules/ecss/createDeclaration.vue b/src/views/modules/ecss/createDeclaration.vue
index 7192af8..b8c2fb0 100644
--- a/src/views/modules/ecss/createDeclaration.vue
+++ b/src/views/modules/ecss/createDeclaration.vue
@@ -120,8 +120,13 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
-              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+              <template v-if="item.columnProp === 'ttlAmount' || item.columnProp === 'sumPrice'">
+                <span>{{!!scope.row[item.columnProp]?scope.row[item.columnProp].toFixed(2):''}}</span>
+              </template>
+              <template v-else>
+                <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+                <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+              </template>
             </template>
           </el-table-column>
         </el-table>
@@ -1584,10 +1589,6 @@
             //区分请求成功和失败的状况
             if (data && data.code == 0) {
               this.dataList2 = data.rows
-              this.dataList2.forEach(o => {
-                o.ttlAmount = o.ttlAmount.toFixed(2);
-                o.sumPrice = o.sumPrice.toFixed(2);
-              });
             } else {
               this.dataList2 = [];
             }