Эх сурвалжийг харах

fixed:修改单位产生的一系列问题

nahida 1 жил өмнө
parent
commit
cd037897a1

+ 24 - 7
src/views/BusDynamics/sjtjzl/index.vue

@@ -30,13 +30,21 @@
       <template v-if="needShow.filter(key => key.includes('b')).length >= 2">
         <el-table-column label="企业产值" header-align="center">
           <template v-for="(col, index) in needShow" :key="index">
-            <el-table-column v-if="col.includes('b')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
+            <el-table-column v-if="col.includes('b')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right">
+              <template #default="{row}">
+                {{toFixedWithoutRounding(row[col],2)}}
+              </template>
+            </el-table-column>
           </template>
         </el-table-column>
       </template>
       <template v-if="needShow.filter(key => key.includes('b')).length < 2">
         <template v-for="(col, index) in needShow" :key="index">
-          <el-table-column v-if="col.includes('b')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
+          <el-table-column v-if="col.includes('b')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right">
+            <template #default="{row}">
+              {{toFixedWithoutRounding(row[col],2)}}
+            </template>
+          </el-table-column>
         </template>
       </template>
       <template v-if="needShow.filter(key => key.includes('b')).length >= 2">
@@ -52,13 +60,21 @@
       <template v-if="needShow.filter(key => key.includes('c')).length >= 2">
         <el-table-column label="企业税收" header-align="center">
           <template v-for="(col, index) in needShow" :key="index">
-            <el-table-column v-if="col.includes('c')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
+            <el-table-column v-if="col.includes('c')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right">
+              <template #default="{row}">
+                {{toFixedWithoutRounding(row[col],2)}}
+              </template>
+            </el-table-column>
           </template>
         </el-table-column>
       </template>
       <template v-if="needShow.filter(key => key.includes('c')).length < 2">
         <template v-for="(col, index) in needShow" :key="index">
-          <el-table-column v-if="col.includes('c')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
+          <el-table-column v-if="col.includes('c')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right">
+            <template #default="{row}">
+              {{toFixedWithoutRounding(row[col],2)}}
+            </template>
+          </el-table-column>
         </template>
       </template>
       <template v-if="needShow.filter(key => key.includes('c')).length >= 2">
@@ -246,7 +262,7 @@
           v-model:current-page="pageNum"
           v-model:page-size="pageSize"
           :background="true"
-          :page-sizes="[10, 20, 100, 200]"
+          :page-sizes="[10, 20, 130, 200]"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"
           @size-change="getData"
@@ -741,7 +757,8 @@ const getData = async () => {
       b5,
       c5,
       dw5,
-      dx5
+      dx5,
+      dy5
     }
   })
   total.value = res?.total;
@@ -756,7 +773,7 @@ const getSummaries = (param) => {
       return;
     }
     const values = data.map(item => Number(item[column.property]));
-    // console.log(values);
+    console.log(values);
     if (!values.every(value => isNaN(value))) {
       sums[index] = values.reduce((prev, curr) => {
         const value = Number(curr);