From 19962d419bed90116fd1480bb861f11101f5f2c4 Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Wed, 19 Jun 2024 16:03:28 +0800
Subject: [PATCH] '123'

---
 .../web/controller/quot/QuotController.java   |  2 ++
 .../statisticsQuot/statisticsQuot/index.vue   | 20 ++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
index ba11e8d..34d48a3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
@@ -392,6 +392,8 @@ public class QuotController extends BaseController
             if(Integer.valueOf(count)>=Integer.valueOf(quotCommitCount)){
                 return error("当前报价量已达极限，无法继续提供报价单");
             }
+
+            // 提交报价时间限制
         }
 
         String quot_id = quot.getQuotId();
diff --git a/ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue b/ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue
index 8289cd3..0d4ce2d 100644
--- a/ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue
+++ b/ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue
@@ -52,13 +52,15 @@
     </el-form>
     <el-row>
       <el-col :span="4">
-        <span>总条数:{{sumQuotMaterialsCount}}</span>
+        总条数:<span style="font-size: 18px">{{sumQuotMaterialsCount}}</span>
       </el-col>
       <el-col :span="4">
-        <span>总价:{{sumQuotTotalPrice}}</span>
+        总价:<span style="font-size: 18px">{{sumQuotTotalPrice}}</span>
+      </el-col>
+      <el-col :span="4">
+        总单量:<span style="font-size: 18px">{{sumQuotCount}}</span>
       </el-col>
     </el-row>
-
     <el-table v-loading="loading" :data="quotList" style="width: 100%;margin-top: 10px;" :height="tableHeight">
       <el-table-column fixed label="报价单号" align="center" prop="quotCode" width="250px"/>
       <el-table-column fixed label="业务员" align="center" prop="quotSalesmanName" width="150px"/>
@@ -77,13 +79,13 @@
           <span>{{ parseTime(scope.row.quotQuotationDate) }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="审核人" align="center" prop="quotCheckUserNickname" width="160" />
       <el-table-column label="创建人" align="center" prop="createName" width="150px"/>
       <el-table-column label="创建时间" align="center" prop="createTime" width="160">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="审核人" align="center" prop="quotCheckUserNickname" width="160" />
     </el-table>
   </div>
 </template>
@@ -107,7 +109,7 @@ export default {
       // 报价表格数据
       quotList: [],
       // 表格高度设置
-      tableHeight: window.innerHeight - 240, //表格动态高度
+      tableHeight: window.innerHeight - 280, //表格动态高度
       screenHeight: window.innerHeight, //内容区域高度
       // 查询参数
       queryParams: {
@@ -151,15 +153,19 @@ export default {
     },
     // 总价
     sumQuotTotalPrice() {
-      const quotTotalPrice = this.quotList.reduce((sum, row) => sum + parseFloat(row.quotTotalPrice==null?0:row.quotTotalPrice), 0);
+      const quotTotalPrice = this.quotList.reduce((sum, row) => sum + parseFloat((isNaN(row.quotTotalPrice)||row.quotTotalPrice==null)?0:row.quotTotalPrice), 0);
       return toDecimal(quotTotalPrice);
     },
+    // 总单量
+    sumQuotCount() {
+      return this.quotList.length;
+    }
   },
   watch: {
     // 监听screenHeight从而改变table的高度
     screenHeight(val) {
       this.screenHeight = val
-      this.tableHeight = this.screenHeight - 260
+      this.tableHeight = this.screenHeight - 280
     }
   },
   mounted: function() {