From df2b17ebca11ee77c6cca21ef8ae27044416be1e Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Tue, 18 Jun 2024 11:58:52 +0800
Subject: [PATCH] '123'

---
 .../main/java/com/ruoyi/quot/domain/Quot.java |  7 ++-
 .../main/resources/mapper/quot/QuotMapper.xml |  6 +-
 ruoyi-ui/src/directive/dialog/dragDialog.js   |  2 +-
 ruoyi-ui/src/views/quot/quot/index.vue        | 15 ++---
 .../statisticsQuot/statisticsQuot/index.vue   | 55 ++++++++++++++++---
 5 files changed, 65 insertions(+), 20 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java
index d6b3daa..c14c84c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java
@@ -96,8 +96,10 @@ public class Quot extends BaseEntity
 
     /** 是否打印 */
     private String quotPrint;
-    /** 打印人 */
+    /** 打印人账号 */
     private String quotPrintUserName;
+    /** 打印人 */
+    private String quotPrintUserNickName;
 
     /** 总价 */
     private String quotTotalPrice;
@@ -309,6 +311,9 @@ public class Quot extends BaseEntity
     public String getQuotPrintUserName() { return quotPrintUserName; }
 
     public void setQuotPrintUserName(String quotPrintUserName) { this.quotPrintUserName = quotPrintUserName; }
+    public String getQuotPrintUserNickName() { return quotPrintUserNickName; }
+
+    public void setQuotPrintUserNickName(String quotPrintUserNickName) { this.quotPrintUserNickName = quotPrintUserNickName; }
     public void setQuotQuantity(String quotQuantity)
     {
         this.quotQuantity = quotQuantity;
diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
index 43b5a4c..d82c02c 100644
--- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
@@ -35,6 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="quotMatpriceDiff"    column="quot_matprice_diff"    />
         <result property="quotPrint"    column="quot_print"    />
         <result property="quotPrintUserName"    column="quot_print_user_name"    />
+        <result property="quotPrintUserNickName"    column="quot_print_user_nickName"    />
+
         <result property="createBy"    column="create_by"    />
         <result property="createName"     column="create_name"    />
         <result property="createTime"    column="create_time"    />
@@ -111,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a.quot_phone, a.quot_inquiry_date, a.quot_project, a.quot_quotation_date, a.quot_quotation_from,
                a.quot_quotation_require, a.quot_feedback_explanation, a.quot_quantity, a.quot_total_price,
                a.quot_check_user_name, u2.nick_name quot_check_user_nickname, a.quot_approval_status,a.quot_materials_count,
-               a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_print,u3.nick_name quot_print_user_name,
+               a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_print,a.quot_print_user_name,u3.nick_name quot_print_user_nickName,
                a.create_by, a.create_time, a.update_by, a.update_time, u.nick_name create_name,
 
                 a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter,
@@ -156,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a.quot_salesman_dept_id, a.quot_salesman_dept_name, a.quot_address, a.quot_contacts, a.quot_phone, a.quot_inquiry_date,
                a.quot_project, a.quot_quotation_date, a.quot_quotation_from, a.quot_quotation_require, a.quot_feedback_explanation,
                a.quot_quantity, a.quot_total_price, a.quot_check_user_name, u2.nick_name quot_check_user_nickname, a.quot_approval_status,
-                a.quot_materials_count,a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_print,u3.nick_name quot_print_user_name,
+                a.quot_materials_count,a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_print,a.quot_print_user_name,u3.nick_name quot_print_user_nickName,
                a.create_by, a.create_time, a.update_by, a.update_time,
 
                 a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter,
diff --git a/ruoyi-ui/src/directive/dialog/dragDialog.js b/ruoyi-ui/src/directive/dialog/dragDialog.js
index 37d24ae..aef2197 100644
--- a/ruoyi-ui/src/directive/dialog/dragDialog.js
+++ b/ruoyi-ui/src/directive/dialog/dragDialog.js
@@ -107,7 +107,7 @@ export default {
         dialogHeaderEl.onmousedown = null;
         if (!hasSetBodyHight) {
           let footerHeight = dragDom.querySelector('.el-dialog__footer') && dragDom.querySelector('.el-dialog__footer').offsetHeight;
-          dragDom.querySelector('.el-dialog__body').style.height = 'calc(100% - ' + (dialogHeaderEl.offsetHeight + footerHeight) + 'px)';
+          dragDom.querySelector('.el-dialog__body').style.height = 'calc(100% - 110px)';
           dragDom.querySelector('.el-dialog__body').style.maxHeight = dragDom.style.height
           hasSetBodyHight = true;
         }
diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue
index 17f52f2..2701ac4 100644
--- a/ruoyi-ui/src/views/quot/quot/index.vue
+++ b/ruoyi-ui/src/views/quot/quot/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="报价单号" prop="quotCode">
+      <el-form-item label="询价单号" prop="quotCode">
         <el-input
           v-model="queryParams.quotCode"
-          placeholder="请输入报价单号"
+          placeholder="请输入询价单号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -141,7 +141,7 @@
     <el-table v-loading="loading" :data="quotList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="报价单ID" align="center" prop="quotId" v-if="false"/>
-      <el-table-column fixed label="报价单号" align="center" prop="quotCode" width="250px">
+      <el-table-column fixed label="询价单号" align="center" prop="quotCode" width="250px">
         <template slot-scope="scope">
           <el-link :underline="false" type="primary" @click="handleUpdate(scope.row)">{{scope.row.quotCode}}</el-link>
         </template>
@@ -162,7 +162,7 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="打印人" align="center" prop="quotPrintUserName" width="150px" v-if="$auth.hasPermi('quot:quot:changQuotPrintStatus')"/>
+      <el-table-column label="打印人" align="center" prop="quotPrintUserNickName" width="150px" v-if="$auth.hasPermi('quot:quot:changQuotPrintStatus')"/>
       <el-table-column label="业务员" align="center" prop="quotSalesmanName" width="150px"/>
       <el-table-column label="客户名称" align="center" prop="quotCustomerName" width="250px"/>
       <el-table-column label="项目名称" align="center" prop="quotProject" width="250px"/>
@@ -256,7 +256,7 @@
         <el-divider content-position="left" class="customer_divider_text">报价信息</el-divider>
         <el-row :gutter="8">
           <el-col :span="8">
-            <el-form-item label="报价单号" prop="quotCode">
+            <el-form-item label="询价单号" prop="quotCode">
               <el-input v-model="form.quotCode" placeholder="系统自动生成" :disabled="true"/>
             </el-form-item>
           </el-col>
@@ -362,8 +362,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
-            <el-form-item label="打印人" prop="quotPrintUserName">
-              <el-input v-model="form.quotPrintUserName" :disabled="true"/>
+            <el-form-item label="打印人" prop="quotPrintUserNickName">
+              <el-input v-model="form.quotPrintUserNickName" :disabled="true"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -1232,6 +1232,7 @@ export default {
         quotApprovalStatus: null,
 
         quotPrintUserName: null,
+        quotPrintUserNickName: null,
         quotMaterialsCount: null,
         quotTongPrice: null,
         quotLvPrice: null,
diff --git a/ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue b/ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue
index 631e208..2d30504 100644
--- a/ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue
+++ b/ruoyi-ui/src/views/statisticsQuot/statisticsQuot/index.vue
@@ -38,17 +38,21 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+    <el-row>
+      <el-col :span="2">
+        <span>总条数:{{sumQuotMaterialsCount}}</span>
+      </el-col>
+      <el-col :span="2">
+        <span>总价:{{sumQuotTotalPrice}}</span>
+      </el-col>
+    </el-row>
 
-    <el-table v-loading="loading" :data="quotList" @selection-change="handleSelectionChange">
-      <el-table-column fixed label="报价单号" align="center" prop="quotCode" width="250px">
-        <template slot-scope="scope">
-          <el-link :underline="false" type="primary" @click="handleUpdate(scope.row)">{{scope.row.quotCode}}</el-link>
-        </template>
-      </el-table-column>
+    <el-table v-loading="loading" :data="quotList" style="width: 100%;margin-top: 10px;" show-summary :summary-method="getSummaries">
+      <el-table-column fixed label="报价单号" align="center" prop="quotCode" width="250px"/>
       <el-table-column fixed label="业务员" align="center" prop="quotSalesmanName" width="150px"/>
       <el-table-column fixed label="客户名称" align="center" prop="quotCustomerName" width="250px"/>
       <el-table-column fixed label="项目名称" align="center" prop="quotProject" width="250px"/>
-      <el-table-column label="金思维报价单号" align="center" prop="quotJswCode" width="280px" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])"/>
+      <!--<el-table-column label="金思维报价单号" align="center" prop="quotJswCode" width="280px"/>-->
       <el-table-column label="询价日期" align="center" prop="quotInquiryDate" width="160">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.quotInquiryDate) }}</span>
@@ -81,7 +85,7 @@
 </template>
 <script>
 import { listStatisticsQuotQuot } from "@/api/quot/quot"; // 有效报价单统计
-
+import { NumberAdd }  from '@/utils/number';// 数值计算
 export default {
   name: "statisticsQuot",
   data() {
@@ -94,6 +98,10 @@ export default {
       total: 0,
       // 报价表格数据
       quotList: [],
+      //总条数
+      sumQuotMaterialsCount: 0,
+      //总价
+      sumQuotTotalPrice: 0,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -128,7 +136,36 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.handleQuery();
-    }
+    },
+
+    /** 对产品数据-数量、金额进行合算 */
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计';
+          return;
+        }
+        const values = data.map(item => Number(item[column.property]));
+
+        if (column.property === 'quotMaterialsCount' || column.property === 'quotTotalPrice') {
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return NumberAdd(prev,curr);
+              }else {
+                return prev;
+              }
+            }, 0);
+          } else {
+            sums[index] = ''
+          }
+        }
+      });
+      return sums;
+    },
   }
 };
 </script>